diff --git a/maxkey-authentications/build.gradle b/maxkey-authentications/build.gradle index bc1f804f8..db007659e 100644 --- a/maxkey-authentications/build.gradle +++ b/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") diff --git a/maxkey-connectors/maxkey-connector-activedirectory/.settings/org.eclipse.wst.common.component b/maxkey-connectors/maxkey-connector-activedirectory/.settings/org.eclipse.wst.common.component index 0378cad10..2972a0e7e 100644 --- a/maxkey-connectors/maxkey-connector-activedirectory/.settings/org.eclipse.wst.common.component +++ b/maxkey-connectors/maxkey-connector-activedirectory/.settings/org.eclipse.wst.common.component @@ -6,7 +6,7 @@ uses - + uses diff --git a/maxkey-connectors/maxkey-connector-activedirectory/build.gradle b/maxkey-connectors/maxkey-connector-activedirectory/build.gradle index dfac86e67..3c87c5618 100644 --- a/maxkey-connectors/maxkey-connector-activedirectory/build.gradle +++ b/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") diff --git a/maxkey-connectors/maxkey-connector-base/.settings/org.eclipse.wst.common.component b/maxkey-connectors/maxkey-connector-base/.settings/org.eclipse.wst.common.component index 15251077e..9a5f7e0a8 100644 --- a/maxkey-connectors/maxkey-connector-base/.settings/org.eclipse.wst.common.component +++ b/maxkey-connectors/maxkey-connector-base/.settings/org.eclipse.wst.common.component @@ -6,7 +6,7 @@ uses - + uses diff --git a/maxkey-connectors/maxkey-connector-base/build.gradle b/maxkey-connectors/maxkey-connector-base/build.gradle index 817503184..d727ab605 100644 --- a/maxkey-connectors/maxkey-connector-base/build.gradle +++ b/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") diff --git a/maxkey-connectors/maxkey-connector-ldap/.settings/org.eclipse.wst.common.component b/maxkey-connectors/maxkey-connector-ldap/.settings/org.eclipse.wst.common.component index fdd64accc..9169e826c 100644 --- a/maxkey-connectors/maxkey-connector-ldap/.settings/org.eclipse.wst.common.component +++ b/maxkey-connectors/maxkey-connector-ldap/.settings/org.eclipse.wst.common.component @@ -6,7 +6,7 @@ uses - + uses diff --git a/maxkey-connectors/maxkey-connector-ldap/build.gradle b/maxkey-connectors/maxkey-connector-ldap/build.gradle index ce5fa95ee..9952b29b6 100644 --- a/maxkey-connectors/maxkey-connector-ldap/build.gradle +++ b/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") diff --git a/maxkey-dao/.gitignore b/maxkey-dao/.gitignore deleted file mode 100644 index 84c048a73..000000000 --- a/maxkey-dao/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build/ diff --git a/maxkey-dao/.settings/org.eclipse.buildship.core.prefs b/maxkey-dao/.settings/org.eclipse.buildship.core.prefs deleted file mode 100644 index 487f11a98..000000000 --- a/maxkey-dao/.settings/org.eclipse.buildship.core.prefs +++ /dev/null @@ -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 diff --git a/maxkey-dao/.settings/org.eclipse.core.resources.prefs b/maxkey-dao/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 896a9a53a..000000000 --- a/maxkey-dao/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 \ No newline at end of file diff --git a/maxkey-dao/.settings/org.eclipse.jdt.core.prefs b/maxkey-dao/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 8ce52bbdc..000000000 --- a/maxkey-dao/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -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 diff --git a/maxkey-dao/.settings/org.eclipse.wst.common.component b/maxkey-dao/.settings/org.eclipse.wst.common.component deleted file mode 100644 index b9758908e..000000000 --- a/maxkey-dao/.settings/org.eclipse.wst.common.component +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/maxkey-dao/.settings/org.eclipse.wst.common.project.facet.core.xml b/maxkey-dao/.settings/org.eclipse.wst.common.project.facet.core.xml deleted file mode 100644 index fd0227a68..000000000 --- a/maxkey-dao/.settings/org.eclipse.wst.common.project.facet.core.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/maxkey-dao/.settings/org.eclipse.wst.validation.prefs b/maxkey-dao/.settings/org.eclipse.wst.validation.prefs deleted file mode 100644 index 23e101c3e..000000000 --- a/maxkey-dao/.settings/org.eclipse.wst.validation.prefs +++ /dev/null @@ -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 diff --git a/maxkey-dao/.settings/org.springframework.ide.eclipse.prefs b/maxkey-dao/.settings/org.springframework.ide.eclipse.prefs deleted file mode 100644 index a12794d68..000000000 --- a/maxkey-dao/.settings/org.springframework.ide.eclipse.prefs +++ /dev/null @@ -1,2 +0,0 @@ -boot.validation.initialized=true -eclipse.preferences.version=1 diff --git a/maxkey-identitys/maxkey-identity-rest/.settings/org.eclipse.wst.common.component b/maxkey-identitys/maxkey-identity-rest/.settings/org.eclipse.wst.common.component index ab948f2be..ece70642c 100644 --- a/maxkey-identitys/maxkey-identity-rest/.settings/org.eclipse.wst.common.component +++ b/maxkey-identitys/maxkey-identity-rest/.settings/org.eclipse.wst.common.component @@ -6,7 +6,7 @@ uses - + uses diff --git a/maxkey-identitys/maxkey-identity-rest/build.gradle b/maxkey-identitys/maxkey-identity-rest/build.gradle index 95861151c..f3b5076a7 100644 --- a/maxkey-identitys/maxkey-identity-rest/build.gradle +++ b/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") } \ No newline at end of file diff --git a/maxkey-identitys/maxkey-identity-rest/src/main/java/org/maxkey/identity/rest/RestApiOrgController.java b/maxkey-identitys/maxkey-identity-rest/src/main/java/org/maxkey/identity/rest/RestApiOrgController.java index 897ced9d9..44d799ba7 100644 --- a/maxkey-identitys/maxkey-identity-rest/src/main/java/org/maxkey/identity/rest/RestApiOrgController.java +++ b/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; diff --git a/maxkey-identitys/maxkey-identity-rest/src/main/java/org/maxkey/identity/rest/RestApiUserInfoController.java b/maxkey-identitys/maxkey-identity-rest/src/main/java/org/maxkey/identity/rest/RestApiUserInfoController.java index 1c58eb1ed..b06b540a5 100644 --- a/maxkey-identitys/maxkey-identity-rest/src/main/java/org/maxkey/identity/rest/RestApiUserInfoController.java +++ b/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; diff --git a/maxkey-identitys/maxkey-identity-scim/.settings/org.eclipse.wst.common.component b/maxkey-identitys/maxkey-identity-scim/.settings/org.eclipse.wst.common.component index 1e2b16776..ee55793d0 100644 --- a/maxkey-identitys/maxkey-identity-scim/.settings/org.eclipse.wst.common.component +++ b/maxkey-identitys/maxkey-identity-scim/.settings/org.eclipse.wst.common.component @@ -6,7 +6,7 @@ uses - + uses diff --git a/maxkey-identitys/maxkey-identity-scim/build.gradle b/maxkey-identitys/maxkey-identity-scim/build.gradle index 2c7b2b798..da59b114b 100644 --- a/maxkey-identitys/maxkey-identity-scim/build.gradle +++ b/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") } \ No newline at end of file diff --git a/maxkey-dao/.classpath b/maxkey-persistence/.classpath similarity index 100% rename from maxkey-dao/.classpath rename to maxkey-persistence/.classpath diff --git a/maxkey-dao/.project b/maxkey-persistence/.project similarity index 96% rename from maxkey-dao/.project rename to maxkey-persistence/.project index 694bc5003..685f0a5c7 100644 --- a/maxkey-dao/.project +++ b/maxkey-persistence/.project @@ -1,6 +1,6 @@ - maxkey-dao + maxkey-persistence maxkey-dao diff --git a/maxkey-dao/build.gradle b/maxkey-persistence/build.gradle similarity index 84% rename from maxkey-dao/build.gradle rename to maxkey-persistence/build.gradle index 75cf737dd..4beee0e74 100644 --- a/maxkey-dao/build.gradle +++ b/maxkey-persistence/build.gradle @@ -1,4 +1,4 @@ -description = "maxkey-dao" +description = "maxkey-persistence" dependencies { //local jars diff --git a/maxkey-dao/src/main/java/META-INF/MANIFEST.MF b/maxkey-persistence/src/main/java/META-INF/MANIFEST.MF similarity index 100% rename from maxkey-dao/src/main/java/META-INF/MANIFEST.MF rename to maxkey-persistence/src/main/java/META-INF/MANIFEST.MF diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/AccountsMapper.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AccountsMapper.java similarity index 84% rename from maxkey-dao/src/main/java/org/maxkey/dao/persistence/AccountsMapper.java rename to maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AccountsMapper.java index 5f37e65cc..ea351e2fc 100644 --- a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/AccountsMapper.java +++ b/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; diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/AppsCasDetailsMapper.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AppsCasDetailsMapper.java similarity index 88% rename from maxkey-dao/src/main/java/org/maxkey/dao/persistence/AppsCasDetailsMapper.java rename to maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AppsCasDetailsMapper.java index cdb44aee2..f8a4c47e2 100644 --- a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/AppsCasDetailsMapper.java +++ b/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; diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/AppsDesktopDetailsMapper.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AppsDesktopDetailsMapper.java similarity index 88% rename from maxkey-dao/src/main/java/org/maxkey/dao/persistence/AppsDesktopDetailsMapper.java rename to maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AppsDesktopDetailsMapper.java index 441fcf3ac..a229d98bb 100644 --- a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/AppsDesktopDetailsMapper.java +++ b/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; diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/AppsFormBasedDetailsMapper.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AppsFormBasedDetailsMapper.java similarity index 88% rename from maxkey-dao/src/main/java/org/maxkey/dao/persistence/AppsFormBasedDetailsMapper.java rename to maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AppsFormBasedDetailsMapper.java index 1278614c5..db3741d26 100644 --- a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/AppsFormBasedDetailsMapper.java +++ b/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; diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/AppsMapper.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AppsMapper.java similarity index 93% rename from maxkey-dao/src/main/java/org/maxkey/dao/persistence/AppsMapper.java rename to maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AppsMapper.java index e4c665433..0648d175b 100644 --- a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/AppsMapper.java +++ b/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; diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/AppsSaml20DetailsMapper.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AppsSaml20DetailsMapper.java similarity index 88% rename from maxkey-dao/src/main/java/org/maxkey/dao/persistence/AppsSaml20DetailsMapper.java rename to maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AppsSaml20DetailsMapper.java index da2c0f2bd..a275f0cfc 100644 --- a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/AppsSaml20DetailsMapper.java +++ b/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; diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/AppsTokenBasedDetailsMapper.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AppsTokenBasedDetailsMapper.java similarity index 88% rename from maxkey-dao/src/main/java/org/maxkey/dao/persistence/AppsTokenBasedDetailsMapper.java rename to maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AppsTokenBasedDetailsMapper.java index 90e3f6628..e74552f23 100644 --- a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/AppsTokenBasedDetailsMapper.java +++ b/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; diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/GroupMemberMapper.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/GroupMemberMapper.java similarity index 92% rename from maxkey-dao/src/main/java/org/maxkey/dao/persistence/GroupMemberMapper.java rename to maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/GroupMemberMapper.java index cbf1a3518..fd5ce741a 100644 --- a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/GroupMemberMapper.java +++ b/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; diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/GroupPrivilegesMapper.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/GroupPrivilegesMapper.java similarity index 91% rename from maxkey-dao/src/main/java/org/maxkey/dao/persistence/GroupPrivilegesMapper.java rename to maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/GroupPrivilegesMapper.java index cceabc38a..16245bdb1 100644 --- a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/GroupPrivilegesMapper.java +++ b/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; diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/GroupsMapper.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/GroupsMapper.java similarity index 84% rename from maxkey-dao/src/main/java/org/maxkey/dao/persistence/GroupsMapper.java rename to maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/GroupsMapper.java index 3787b7d60..d4a032dc2 100644 --- a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/GroupsMapper.java +++ b/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; diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/HistoryLoginAppsMapper.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/HistoryLoginAppsMapper.java similarity index 85% rename from maxkey-dao/src/main/java/org/maxkey/dao/persistence/HistoryLoginAppsMapper.java rename to maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/HistoryLoginAppsMapper.java index e169819f6..9be40d147 100644 --- a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/HistoryLoginAppsMapper.java +++ b/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; diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/HistoryLoginMapper.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/HistoryLoginMapper.java similarity index 84% rename from maxkey-dao/src/main/java/org/maxkey/dao/persistence/HistoryLoginMapper.java rename to maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/HistoryLoginMapper.java index 8737a30ed..9ccab22a2 100644 --- a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/HistoryLoginMapper.java +++ b/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; diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/HistoryLogsMapper.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/HistoryLogsMapper.java similarity index 85% rename from maxkey-dao/src/main/java/org/maxkey/dao/persistence/HistoryLogsMapper.java rename to maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/HistoryLogsMapper.java index 9a0f77709..6e90115ba 100644 --- a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/HistoryLogsMapper.java +++ b/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; diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/OrganizationsMapper.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/OrganizationsMapper.java similarity index 82% rename from maxkey-dao/src/main/java/org/maxkey/dao/persistence/OrganizationsMapper.java rename to maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/OrganizationsMapper.java index ef3a9cea2..2fcecf8ad 100644 --- a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/OrganizationsMapper.java +++ b/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; diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/PasswordPolicyMapper.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/PasswordPolicyMapper.java similarity index 85% rename from maxkey-dao/src/main/java/org/maxkey/dao/persistence/PasswordPolicyMapper.java rename to maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/PasswordPolicyMapper.java index 8a4be7d9b..c7a8696e5 100644 --- a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/PasswordPolicyMapper.java +++ b/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; diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/RegistrationMapper.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/RegistrationMapper.java similarity index 89% rename from maxkey-dao/src/main/java/org/maxkey/dao/persistence/RegistrationMapper.java rename to maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/RegistrationMapper.java index 0b51fc0af..32d67d9d1 100644 --- a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/RegistrationMapper.java +++ b/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; diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/ReportMapper.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/ReportMapper.java similarity index 95% rename from maxkey-dao/src/main/java/org/maxkey/dao/persistence/ReportMapper.java rename to maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/ReportMapper.java index 11a996bf8..f35d2d461 100644 --- a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/ReportMapper.java +++ b/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; diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/ResourcesMapper.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/ResourcesMapper.java similarity index 84% rename from maxkey-dao/src/main/java/org/maxkey/dao/persistence/ResourcesMapper.java rename to maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/ResourcesMapper.java index 237a34903..a3950086d 100644 --- a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/ResourcesMapper.java +++ b/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; diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/RoleMemberMapper.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/RoleMemberMapper.java similarity index 92% rename from maxkey-dao/src/main/java/org/maxkey/dao/persistence/RoleMemberMapper.java rename to maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/RoleMemberMapper.java index 9e1e692c4..7f5a57a21 100644 --- a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/RoleMemberMapper.java +++ b/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; diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/RolesMapper.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/RolesMapper.java similarity index 93% rename from maxkey-dao/src/main/java/org/maxkey/dao/persistence/RolesMapper.java rename to maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/RolesMapper.java index 6c8f5fada..a8aa07b9b 100644 --- a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/RolesMapper.java +++ b/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; diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/UserInfoMapper.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/UserInfoMapper.java similarity index 96% rename from maxkey-dao/src/main/java/org/maxkey/dao/persistence/UserInfoMapper.java rename to maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/UserInfoMapper.java index 835dca4b6..1c521fde5 100644 --- a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/UserInfoMapper.java +++ b/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; diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/package-info.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/package-info.java similarity index 55% rename from maxkey-dao/src/main/java/org/maxkey/dao/persistence/package-info.java rename to maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/package-info.java index 7ae84f922..00fc8e6e0 100644 --- a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/package-info.java +++ b/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; diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/service/AccountsService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AccountsService.java similarity index 84% rename from maxkey-dao/src/main/java/org/maxkey/dao/service/AccountsService.java rename to maxkey-persistence/src/main/java/org/maxkey/persistence/service/AccountsService.java index f177a7b48..8b4b282ab 100644 --- a/maxkey-dao/src/main/java/org/maxkey/dao/service/AccountsService.java +++ b/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 diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/service/AppsCasDetailsService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsCasDetailsService.java similarity index 86% rename from maxkey-dao/src/main/java/org/maxkey/dao/service/AppsCasDetailsService.java rename to maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsCasDetailsService.java index 965f42972..0a973a80e 100644 --- a/maxkey-dao/src/main/java/org/maxkey/dao/service/AppsCasDetailsService.java +++ b/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 diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/service/AppsDesktopDetailsService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsDesktopDetailsService.java similarity index 86% rename from maxkey-dao/src/main/java/org/maxkey/dao/service/AppsDesktopDetailsService.java rename to maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsDesktopDetailsService.java index 57e94078a..e34e10d75 100644 --- a/maxkey-dao/src/main/java/org/maxkey/dao/service/AppsDesktopDetailsService.java +++ b/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 diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/service/AppsFormBasedDetailsService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsFormBasedDetailsService.java similarity index 86% rename from maxkey-dao/src/main/java/org/maxkey/dao/service/AppsFormBasedDetailsService.java rename to maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsFormBasedDetailsService.java index ffe827c41..0392aa3df 100644 --- a/maxkey-dao/src/main/java/org/maxkey/dao/service/AppsFormBasedDetailsService.java +++ b/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 diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/service/AppsSaml20DetailsService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsSaml20DetailsService.java similarity index 86% rename from maxkey-dao/src/main/java/org/maxkey/dao/service/AppsSaml20DetailsService.java rename to maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsSaml20DetailsService.java index 1dd5efc48..b30a1b00e 100644 --- a/maxkey-dao/src/main/java/org/maxkey/dao/service/AppsSaml20DetailsService.java +++ b/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 diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/service/AppsService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsService.java similarity index 91% rename from maxkey-dao/src/main/java/org/maxkey/dao/service/AppsService.java rename to maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsService.java index b4c943180..3aa9980c9 100644 --- a/maxkey-dao/src/main/java/org/maxkey/dao/service/AppsService.java +++ b/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 diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/service/AppsTokenBasedDetailsService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsTokenBasedDetailsService.java similarity index 86% rename from maxkey-dao/src/main/java/org/maxkey/dao/service/AppsTokenBasedDetailsService.java rename to maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsTokenBasedDetailsService.java index c397ecd12..3aea6c47e 100644 --- a/maxkey-dao/src/main/java/org/maxkey/dao/service/AppsTokenBasedDetailsService.java +++ b/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 diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/service/GroupMemberService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/GroupMemberService.java similarity index 84% rename from maxkey-dao/src/main/java/org/maxkey/dao/service/GroupMemberService.java rename to maxkey-persistence/src/main/java/org/maxkey/persistence/service/GroupMemberService.java index 0ee975d92..803e35373 100644 --- a/maxkey-dao/src/main/java/org/maxkey/dao/service/GroupMemberService.java +++ b/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 diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/service/GroupPrivilegesService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/GroupPrivilegesService.java similarity index 84% rename from maxkey-dao/src/main/java/org/maxkey/dao/service/GroupPrivilegesService.java rename to maxkey-persistence/src/main/java/org/maxkey/persistence/service/GroupPrivilegesService.java index 3269411aa..bc2abed9e 100644 --- a/maxkey-dao/src/main/java/org/maxkey/dao/service/GroupPrivilegesService.java +++ b/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 diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/service/GroupsService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/GroupsService.java similarity index 84% rename from maxkey-dao/src/main/java/org/maxkey/dao/service/GroupsService.java rename to maxkey-persistence/src/main/java/org/maxkey/persistence/service/GroupsService.java index 9105deb66..02492b709 100644 --- a/maxkey-dao/src/main/java/org/maxkey/dao/service/GroupsService.java +++ b/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 diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/service/HistoryLoginAppsService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/HistoryLoginAppsService.java similarity index 86% rename from maxkey-dao/src/main/java/org/maxkey/dao/service/HistoryLoginAppsService.java rename to maxkey-persistence/src/main/java/org/maxkey/persistence/service/HistoryLoginAppsService.java index 332464b18..329661b35 100644 --- a/maxkey-dao/src/main/java/org/maxkey/dao/service/HistoryLoginAppsService.java +++ b/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 diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/service/HistoryLoginService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/HistoryLoginService.java similarity index 84% rename from maxkey-dao/src/main/java/org/maxkey/dao/service/HistoryLoginService.java rename to maxkey-persistence/src/main/java/org/maxkey/persistence/service/HistoryLoginService.java index f5a041622..5f1f7aabb 100644 --- a/maxkey-dao/src/main/java/org/maxkey/dao/service/HistoryLoginService.java +++ b/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 diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/service/HistoryLogsService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/HistoryLogsService.java similarity index 84% rename from maxkey-dao/src/main/java/org/maxkey/dao/service/HistoryLogsService.java rename to maxkey-persistence/src/main/java/org/maxkey/persistence/service/HistoryLogsService.java index 897331f25..5f4a8f800 100644 --- a/maxkey-dao/src/main/java/org/maxkey/dao/service/HistoryLogsService.java +++ b/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 diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/service/OrganizationsService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/OrganizationsService.java similarity index 94% rename from maxkey-dao/src/main/java/org/maxkey/dao/service/OrganizationsService.java rename to maxkey-persistence/src/main/java/org/maxkey/persistence/service/OrganizationsService.java index 3d20038b4..b5cbae3fd 100644 --- a/maxkey-dao/src/main/java/org/maxkey/dao/service/OrganizationsService.java +++ b/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; diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/service/PasswordPolicyService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/PasswordPolicyService.java similarity index 84% rename from maxkey-dao/src/main/java/org/maxkey/dao/service/PasswordPolicyService.java rename to maxkey-persistence/src/main/java/org/maxkey/persistence/service/PasswordPolicyService.java index 9e4ba00a9..6998c278d 100644 --- a/maxkey-dao/src/main/java/org/maxkey/dao/service/PasswordPolicyService.java +++ b/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 diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/service/RegistrationService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/RegistrationService.java similarity index 88% rename from maxkey-dao/src/main/java/org/maxkey/dao/service/RegistrationService.java rename to maxkey-persistence/src/main/java/org/maxkey/persistence/service/RegistrationService.java index 3023cc052..9e3750740 100644 --- a/maxkey-dao/src/main/java/org/maxkey/dao/service/RegistrationService.java +++ b/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 diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/service/ReportService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/ReportService.java similarity index 94% rename from maxkey-dao/src/main/java/org/maxkey/dao/service/ReportService.java rename to maxkey-persistence/src/main/java/org/maxkey/persistence/service/ReportService.java index ce6e9215d..947d1b3da 100644 --- a/maxkey-dao/src/main/java/org/maxkey/dao/service/ReportService.java +++ b/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 diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/service/ResourcesService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/ResourcesService.java similarity index 84% rename from maxkey-dao/src/main/java/org/maxkey/dao/service/ResourcesService.java rename to maxkey-persistence/src/main/java/org/maxkey/persistence/service/ResourcesService.java index 49ee3c909..03b91a6ae 100644 --- a/maxkey-dao/src/main/java/org/maxkey/dao/service/ResourcesService.java +++ b/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 diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/service/RoleMemberService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/RoleMemberService.java similarity index 84% rename from maxkey-dao/src/main/java/org/maxkey/dao/service/RoleMemberService.java rename to maxkey-persistence/src/main/java/org/maxkey/persistence/service/RoleMemberService.java index c050c94b9..09b177366 100644 --- a/maxkey-dao/src/main/java/org/maxkey/dao/service/RoleMemberService.java +++ b/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 diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/service/RolesService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/RolesService.java similarity index 91% rename from maxkey-dao/src/main/java/org/maxkey/dao/service/RolesService.java rename to maxkey-persistence/src/main/java/org/maxkey/persistence/service/RolesService.java index 8a62d49f9..167f74cd0 100644 --- a/maxkey-dao/src/main/java/org/maxkey/dao/service/RolesService.java +++ b/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 diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/service/UserInfoService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/UserInfoService.java similarity index 98% rename from maxkey-dao/src/main/java/org/maxkey/dao/service/UserInfoService.java rename to maxkey-persistence/src/main/java/org/maxkey/persistence/service/UserInfoService.java index 3e1f3d014..eee38af29 100644 --- a/maxkey-dao/src/main/java/org/maxkey/dao/service/UserInfoService.java +++ b/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; diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/service/package-info.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/package-info.java similarity index 55% rename from maxkey-dao/src/main/java/org/maxkey/dao/service/package-info.java rename to maxkey-persistence/src/main/java/org/maxkey/persistence/service/package-info.java index 019203eb7..e960ed982 100644 --- a/maxkey-dao/src/main/java/org/maxkey/dao/service/package-info.java +++ b/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; diff --git a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/AccountsMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AccountsMapper.xml similarity index 91% rename from maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/AccountsMapper.xml rename to maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AccountsMapper.xml index f9a1f0261..58d1173f8 100644 --- a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/AccountsMapper.xml +++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AccountsMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/AppsCasDetailsMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsCasDetailsMapper.xml similarity index 85% rename from maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/AppsCasDetailsMapper.xml rename to maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsCasDetailsMapper.xml index 0f0269324..6bec9dfbf 100644 --- a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/AppsCasDetailsMapper.xml +++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsCasDetailsMapper.xml @@ -1,6 +1,6 @@ - + SELECT diff --git a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/AppsFormBasedDetailsMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsFormBasedDetailsMapper.xml similarity index 85% rename from maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/AppsFormBasedDetailsMapper.xml rename to maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsFormBasedDetailsMapper.xml index 7f47096fc..57d7d38dc 100644 --- a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/AppsFormBasedDetailsMapper.xml +++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsFormBasedDetailsMapper.xml @@ -1,6 +1,6 @@ - + SELECT diff --git a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/AppsTokenBasedDetailsMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsTokenBasedDetailsMapper.xml similarity index 85% rename from maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/AppsTokenBasedDetailsMapper.xml rename to maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsTokenBasedDetailsMapper.xml index 1df316a89..60b3f9341 100644 --- a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/AppsTokenBasedDetailsMapper.xml +++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsTokenBasedDetailsMapper.xml @@ -1,6 +1,6 @@ - + SELECT diff --git a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/ReportMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/ReportMapper.xml similarity index 97% rename from maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/ReportMapper.xml rename to maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/ReportMapper.xml index 90cd5a00d..34a796714 100644 --- a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/ReportMapper.xml +++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/ReportMapper.xml @@ -1,6 +1,6 @@ - + SELECT diff --git a/maxkey-dao/src/test/java/org/apache/mybatis/jpa/test/AccountsServiceTest.java b/maxkey-persistence/src/test/java/org/apache/mybatis/jpa/test/AccountsServiceTest.java similarity index 95% rename from maxkey-dao/src/test/java/org/apache/mybatis/jpa/test/AccountsServiceTest.java rename to maxkey-persistence/src/test/java/org/apache/mybatis/jpa/test/AccountsServiceTest.java index 899952ade..fdef5c8ff 100644 --- a/maxkey-dao/src/test/java/org/apache/mybatis/jpa/test/AccountsServiceTest.java +++ b/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; diff --git a/maxkey-dao/src/test/java/org/apache/mybatis/jpa/test/AppsServiceTest.java b/maxkey-persistence/src/test/java/org/apache/mybatis/jpa/test/AppsServiceTest.java similarity index 91% rename from maxkey-dao/src/test/java/org/apache/mybatis/jpa/test/AppsServiceTest.java rename to maxkey-persistence/src/test/java/org/apache/mybatis/jpa/test/AppsServiceTest.java index cb77b7b3e..675e251d2 100644 --- a/maxkey-dao/src/test/java/org/apache/mybatis/jpa/test/AppsServiceTest.java +++ b/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; diff --git a/maxkey-dao/src/test/java/org/apache/mybatis/jpa/test/FormBasedDetailsServiceTest.java b/maxkey-persistence/src/test/java/org/apache/mybatis/jpa/test/FormBasedDetailsServiceTest.java similarity index 98% rename from maxkey-dao/src/test/java/org/apache/mybatis/jpa/test/FormBasedDetailsServiceTest.java rename to maxkey-persistence/src/test/java/org/apache/mybatis/jpa/test/FormBasedDetailsServiceTest.java index 49c328772..90ab49810 100644 --- a/maxkey-dao/src/test/java/org/apache/mybatis/jpa/test/FormBasedDetailsServiceTest.java +++ b/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; diff --git a/maxkey-dao/src/test/resources/application.properties b/maxkey-persistence/src/test/resources/application.properties similarity index 100% rename from maxkey-dao/src/test/resources/application.properties rename to maxkey-persistence/src/test/resources/application.properties diff --git a/maxkey-dao/src/test/resources/log4j2.xml b/maxkey-persistence/src/test/resources/log4j2.xml similarity index 100% rename from maxkey-dao/src/test/resources/log4j2.xml rename to maxkey-persistence/src/test/resources/log4j2.xml diff --git a/maxkey-dao/src/test/resources/maxkey.properties b/maxkey-persistence/src/test/resources/maxkey.properties similarity index 100% rename from maxkey-dao/src/test/resources/maxkey.properties rename to maxkey-persistence/src/test/resources/maxkey.properties diff --git a/maxkey-dao/src/test/resources/spring/applicationContext-database.xml b/maxkey-persistence/src/test/resources/spring/applicationContext-database.xml similarity index 100% rename from maxkey-dao/src/test/resources/spring/applicationContext-database.xml rename to maxkey-persistence/src/test/resources/spring/applicationContext-database.xml diff --git a/maxkey-dao/src/test/resources/spring/applicationContext-persist.xml b/maxkey-persistence/src/test/resources/spring/applicationContext-persist.xml similarity index 95% rename from maxkey-dao/src/test/resources/spring/applicationContext-persist.xml rename to maxkey-persistence/src/test/resources/spring/applicationContext-persist.xml index 3e13a15f4..d9d9941ce 100644 --- a/maxkey-dao/src/test/resources/spring/applicationContext-persist.xml +++ b/maxkey-persistence/src/test/resources/spring/applicationContext-persist.xml @@ -36,7 +36,7 @@ - + - +