diff --git a/maxkey-core/src/main/java/org/maxkey/authn/AbstractAuthenticationProvider.java b/maxkey-core/src/main/java/org/maxkey/authn/AbstractAuthenticationProvider.java index 33556e3cd..d26046e8c 100644 --- a/maxkey-core/src/main/java/org/maxkey/authn/AbstractAuthenticationProvider.java +++ b/maxkey-core/src/main/java/org/maxkey/authn/AbstractAuthenticationProvider.java @@ -2,7 +2,7 @@ package org.maxkey.authn; import org.maxkey.authn.realm.AbstractAuthenticationRealm; import org.maxkey.authn.support.rememberme.AbstractRemeberMeService; -import org.maxkey.config.ApplicationConfig; +import org.maxkey.configuration.ApplicationConfig; import org.maxkey.constants.ConstantsLoginType; import org.maxkey.crypto.password.PasswordReciprocal; import org.maxkey.crypto.password.opt.AbstractOptAuthn; diff --git a/maxkey-core/src/main/java/org/maxkey/authn/support/jwt/JwtLoginService.java b/maxkey-core/src/main/java/org/maxkey/authn/support/jwt/JwtLoginService.java index d436c4919..45ceadb98 100644 --- a/maxkey-core/src/main/java/org/maxkey/authn/support/jwt/JwtLoginService.java +++ b/maxkey-core/src/main/java/org/maxkey/authn/support/jwt/JwtLoginService.java @@ -13,8 +13,8 @@ import java.util.Date; import java.util.UUID; import javax.servlet.http.HttpServletResponse; import org.joda.time.DateTime; -import org.maxkey.config.ApplicationConfig; -import org.maxkey.config.oidc.OIDCProviderMetadataDetails; +import org.maxkey.configuration.ApplicationConfig; +import org.maxkey.configuration.oidc.OIDCProviderMetadataDetails; import org.maxkey.constants.ConstantsLoginType; import org.maxkey.crypto.jwt.signer.service.impl.DefaultJwtSigningAndValidationService; import org.maxkey.web.WebContext; diff --git a/maxkey-core/src/main/java/org/maxkey/authn/support/rememberme/AbstractRemeberMeService.java b/maxkey-core/src/main/java/org/maxkey/authn/support/rememberme/AbstractRemeberMeService.java index 76b8ccfa2..2750ae42d 100644 --- a/maxkey-core/src/main/java/org/maxkey/authn/support/rememberme/AbstractRemeberMeService.java +++ b/maxkey-core/src/main/java/org/maxkey/authn/support/rememberme/AbstractRemeberMeService.java @@ -6,7 +6,7 @@ import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.joda.time.DateTime; -import org.maxkey.config.ApplicationConfig; +import org.maxkey.configuration.ApplicationConfig; import org.maxkey.constants.ConstantsLoginType; import org.maxkey.constants.ConstantsTimeInterval; import org.maxkey.crypto.Base64Utils; diff --git a/maxkey-core/src/main/java/org/maxkey/autoconfigure/JwtAuthnAutoConfiguration.java b/maxkey-core/src/main/java/org/maxkey/autoconfigure/JwtAuthnAutoConfiguration.java index f4184ff80..920517c6b 100644 --- a/maxkey-core/src/main/java/org/maxkey/autoconfigure/JwtAuthnAutoConfiguration.java +++ b/maxkey-core/src/main/java/org/maxkey/autoconfigure/JwtAuthnAutoConfiguration.java @@ -6,7 +6,7 @@ import java.net.URI; import java.security.NoSuchAlgorithmException; import java.security.spec.InvalidKeySpecException; import org.maxkey.authn.support.jwt.JwtLoginService; -import org.maxkey.config.oidc.OIDCProviderMetadataDetails; +import org.maxkey.configuration.oidc.OIDCProviderMetadataDetails; import org.maxkey.constants.ConstantsProperties; import org.maxkey.crypto.jose.keystore.JWKSetKeyStore; import org.maxkey.crypto.jwt.encryption.service.impl.DefaultJwtEncryptionAndDecryptionService; diff --git a/maxkey-core/src/main/java/org/maxkey/config/ApplicationConfig.java b/maxkey-core/src/main/java/org/maxkey/configuration/ApplicationConfig.java similarity index 99% rename from maxkey-core/src/main/java/org/maxkey/config/ApplicationConfig.java rename to maxkey-core/src/main/java/org/maxkey/configuration/ApplicationConfig.java index a57793215..e82a51e6a 100644 --- a/maxkey-core/src/main/java/org/maxkey/config/ApplicationConfig.java +++ b/maxkey-core/src/main/java/org/maxkey/configuration/ApplicationConfig.java @@ -1,4 +1,4 @@ -package org.maxkey.config; +package org.maxkey.configuration; import org.maxkey.constants.ConstantsProperties; import org.slf4j.Logger; diff --git a/maxkey-core/src/main/java/org/maxkey/config/CharacterEncodingConfig.java b/maxkey-core/src/main/java/org/maxkey/configuration/CharacterEncodingConfig.java similarity index 98% rename from maxkey-core/src/main/java/org/maxkey/config/CharacterEncodingConfig.java rename to maxkey-core/src/main/java/org/maxkey/configuration/CharacterEncodingConfig.java index 224182d37..9f4f365a0 100644 --- a/maxkey-core/src/main/java/org/maxkey/config/CharacterEncodingConfig.java +++ b/maxkey-core/src/main/java/org/maxkey/configuration/CharacterEncodingConfig.java @@ -1,4 +1,4 @@ -package org.maxkey.config; +package org.maxkey.configuration; import java.io.UnsupportedEncodingException; diff --git a/maxkey-core/src/main/java/org/maxkey/config/EmailConfig.java b/maxkey-core/src/main/java/org/maxkey/configuration/EmailConfig.java similarity index 98% rename from maxkey-core/src/main/java/org/maxkey/config/EmailConfig.java rename to maxkey-core/src/main/java/org/maxkey/configuration/EmailConfig.java index d435274db..aff3e0616 100644 --- a/maxkey-core/src/main/java/org/maxkey/config/EmailConfig.java +++ b/maxkey-core/src/main/java/org/maxkey/configuration/EmailConfig.java @@ -1,4 +1,4 @@ -package org.maxkey.config; +package org.maxkey.configuration; import org.maxkey.constants.ConstantsProperties; import org.springframework.beans.factory.annotation.Value; diff --git a/maxkey-core/src/main/java/org/maxkey/config/LoginConfig.java b/maxkey-core/src/main/java/org/maxkey/configuration/LoginConfig.java similarity index 98% rename from maxkey-core/src/main/java/org/maxkey/config/LoginConfig.java rename to maxkey-core/src/main/java/org/maxkey/configuration/LoginConfig.java index f9c40645a..11b446557 100644 --- a/maxkey-core/src/main/java/org/maxkey/config/LoginConfig.java +++ b/maxkey-core/src/main/java/org/maxkey/configuration/LoginConfig.java @@ -1,4 +1,4 @@ -package org.maxkey.config; +package org.maxkey.configuration; import org.maxkey.constants.ConstantsProperties; import org.springframework.beans.factory.annotation.Value; diff --git a/maxkey-core/src/main/java/org/maxkey/config/oidc/OIDCProviderMetadata.java b/maxkey-core/src/main/java/org/maxkey/configuration/oidc/OIDCProviderMetadata.java similarity index 95% rename from maxkey-core/src/main/java/org/maxkey/config/oidc/OIDCProviderMetadata.java rename to maxkey-core/src/main/java/org/maxkey/configuration/oidc/OIDCProviderMetadata.java index 57dea27e0..9c5484496 100644 --- a/maxkey-core/src/main/java/org/maxkey/config/oidc/OIDCProviderMetadata.java +++ b/maxkey-core/src/main/java/org/maxkey/configuration/oidc/OIDCProviderMetadata.java @@ -1,4 +1,4 @@ -package org.maxkey.config.oidc; +package org.maxkey.configuration.oidc; import java.net.URI; import java.util.Set; diff --git a/maxkey-core/src/main/java/org/maxkey/config/oidc/OIDCProviderMetadataDetails.java b/maxkey-core/src/main/java/org/maxkey/configuration/oidc/OIDCProviderMetadataDetails.java similarity index 98% rename from maxkey-core/src/main/java/org/maxkey/config/oidc/OIDCProviderMetadataDetails.java rename to maxkey-core/src/main/java/org/maxkey/configuration/oidc/OIDCProviderMetadataDetails.java index be01a63d7..6d58b4252 100644 --- a/maxkey-core/src/main/java/org/maxkey/config/oidc/OIDCProviderMetadataDetails.java +++ b/maxkey-core/src/main/java/org/maxkey/configuration/oidc/OIDCProviderMetadataDetails.java @@ -1,4 +1,4 @@ -package org.maxkey.config.oidc; +package org.maxkey.configuration.oidc; import java.net.URI; import java.util.Set; diff --git a/maxkey-core/src/main/java/org/maxkey/crypto/password/opt/impl/MailOtpAuthn.java b/maxkey-core/src/main/java/org/maxkey/crypto/password/opt/impl/MailOtpAuthn.java index a3414f7ee..faaea45e4 100644 --- a/maxkey-core/src/main/java/org/maxkey/crypto/password/opt/impl/MailOtpAuthn.java +++ b/maxkey-core/src/main/java/org/maxkey/crypto/password/opt/impl/MailOtpAuthn.java @@ -4,7 +4,7 @@ import java.text.MessageFormat; import org.apache.commons.mail.DefaultAuthenticator; import org.apache.commons.mail.Email; import org.apache.commons.mail.SimpleEmail; -import org.maxkey.config.EmailConfig; +import org.maxkey.configuration.EmailConfig; import org.maxkey.crypto.password.opt.AbstractOptAuthn; import org.maxkey.domain.UserInfo; import org.slf4j.Logger; diff --git a/maxkey-core/src/main/java/org/maxkey/web/WebContext.java b/maxkey-core/src/main/java/org/maxkey/web/WebContext.java index 4d9d45964..d6824b554 100644 --- a/maxkey-core/src/main/java/org/maxkey/web/WebContext.java +++ b/maxkey-core/src/main/java/org/maxkey/web/WebContext.java @@ -13,7 +13,7 @@ import javax.servlet.http.HttpSession; import org.apache.commons.logging.LogFactory; import org.maxkey.authn.BasicAuthentication; import org.maxkey.authn.realm.AbstractAuthenticationRealm; -import org.maxkey.config.ApplicationConfig; +import org.maxkey.configuration.ApplicationConfig; import org.maxkey.domain.UserInfo; import org.maxkey.util.DateUtils; import org.maxkey.util.StringGenerator; diff --git a/maxkey-core/src/main/java/org/maxkey/web/image/AbstractImageEndpoint.java b/maxkey-core/src/main/java/org/maxkey/web/image/AbstractImageEndpoint.java index de6c01edd..64c5c76d6 100644 --- a/maxkey-core/src/main/java/org/maxkey/web/image/AbstractImageEndpoint.java +++ b/maxkey-core/src/main/java/org/maxkey/web/image/AbstractImageEndpoint.java @@ -9,7 +9,8 @@ import javax.imageio.ImageIO; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.maxkey.config.ApplicationConfig; + +import org.maxkey.configuration.ApplicationConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-identitys/maxkey-identity-kafka/src/main/java/org/maxkey/identity/kafka/KafkaProvisioningService.java b/maxkey-identitys/maxkey-identity-kafka/src/main/java/org/maxkey/identity/kafka/KafkaProvisioningService.java index 89b8ddecc..507d7db5c 100644 --- a/maxkey-identitys/maxkey-identity-kafka/src/main/java/org/maxkey/identity/kafka/KafkaProvisioningService.java +++ b/maxkey-identitys/maxkey-identity-kafka/src/main/java/org/maxkey/identity/kafka/KafkaProvisioningService.java @@ -2,7 +2,7 @@ package org.maxkey.identity.kafka; import java.util.UUID; -import org.maxkey.config.ApplicationConfig; +import org.maxkey.configuration.ApplicationConfig; import org.maxkey.util.DateUtils; import org.maxkey.util.JsonUtils; import org.slf4j.Logger; diff --git a/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/AuthorizeBaseEndpoint.java b/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/AuthorizeBaseEndpoint.java index 172b4aeee..e7c51d2b9 100644 --- a/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/AuthorizeBaseEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/AuthorizeBaseEndpoint.java @@ -3,7 +3,7 @@ */ package org.maxkey.authz.endpoint; -import org.maxkey.config.ApplicationConfig; +import org.maxkey.configuration.ApplicationConfig; import org.maxkey.crypto.ReciprocalUtils; import org.maxkey.dao.service.AccountsService; import org.maxkey.dao.service.AppsService; diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/Cas10AuthorizeEndpoint.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/Cas10AuthorizeEndpoint.java index e29153af3..7763de229 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/Cas10AuthorizeEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/Cas10AuthorizeEndpoint.java @@ -12,7 +12,7 @@ import org.maxkey.authz.cas.endpoint.ticket.CasConstants; import org.maxkey.authz.cas.endpoint.ticket.Ticket; import org.maxkey.authz.cas.endpoint.ticket.service.TicketServices; import org.maxkey.authz.endpoint.AuthorizeBaseEndpoint; -import org.maxkey.config.ApplicationConfig; +import org.maxkey.configuration.ApplicationConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/Cas20AuthorizeEndpoint.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/Cas20AuthorizeEndpoint.java index b9ff8faa0..d05ec25e8 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/Cas20AuthorizeEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/Cas20AuthorizeEndpoint.java @@ -14,7 +14,7 @@ import org.maxkey.authz.cas.endpoint.ticket.Ticket; import org.maxkey.authz.cas.endpoint.ticket.service.TicketServices; import org.maxkey.authz.endpoint.AuthorizeBaseEndpoint; import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; -import org.maxkey.config.ApplicationConfig; +import org.maxkey.configuration.ApplicationConfig; import org.maxkey.constants.Boolean; import org.maxkey.dao.service.AppsCasDetailsService; import org.maxkey.dao.service.UserInfoService; diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/Cas30AuthorizeEndpoint.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/Cas30AuthorizeEndpoint.java index d53a1587c..f67883f08 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/Cas30AuthorizeEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/Cas30AuthorizeEndpoint.java @@ -13,7 +13,7 @@ import org.maxkey.authz.cas.endpoint.ticket.Ticket; import org.maxkey.authz.cas.endpoint.ticket.service.TicketServices; import org.maxkey.authz.endpoint.AuthorizeBaseEndpoint; import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; -import org.maxkey.config.ApplicationConfig; +import org.maxkey.configuration.ApplicationConfig; import org.maxkey.constants.Boolean; import org.maxkey.dao.service.AppsCasDetailsService; import org.maxkey.dao.service.UserInfoService; diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/CasAuthorizeEndpoint.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/CasAuthorizeEndpoint.java index 735178762..233a11c42 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/CasAuthorizeEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/CasAuthorizeEndpoint.java @@ -12,7 +12,7 @@ import org.maxkey.authz.cas.endpoint.ticket.CasConstants; import org.maxkey.authz.cas.endpoint.ticket.ServiceTicketImpl; import org.maxkey.authz.cas.endpoint.ticket.service.TicketServices; import org.maxkey.authz.endpoint.AuthorizeBaseEndpoint; -import org.maxkey.config.ApplicationConfig; +import org.maxkey.configuration.ApplicationConfig; import org.maxkey.dao.service.AppsCasDetailsService; import org.maxkey.domain.apps.AppsCasDetails; import org.maxkey.web.WebConstants; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/endpoint/AuthorizationEndpoint.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/endpoint/AuthorizationEndpoint.java index 118adc4ac..bf3771130 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/endpoint/AuthorizationEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/endpoint/AuthorizationEndpoint.java @@ -46,7 +46,7 @@ import org.maxkey.authz.oauth2.provider.code.InMemoryAuthorizationCodeServices; import org.maxkey.authz.oauth2.provider.implicit.ImplicitTokenRequest; import org.maxkey.authz.oauth2.provider.request.DefaultOAuth2RequestValidator; import org.maxkey.client.utils.HttpEncoder; -import org.maxkey.config.ApplicationConfig; +import org.maxkey.configuration.ApplicationConfig; import org.maxkey.domain.apps.oauth2.provider.ClientDetails; import org.maxkey.web.WebContext; import org.slf4j.Logger; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oidc/idtoken/OIDCIdTokenEnhancer.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oidc/idtoken/OIDCIdTokenEnhancer.java index 4dc0f1b6e..d4968da28 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oidc/idtoken/OIDCIdTokenEnhancer.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oidc/idtoken/OIDCIdTokenEnhancer.java @@ -16,7 +16,7 @@ import org.maxkey.authz.oauth2.provider.ClientDetailsService; import org.maxkey.authz.oauth2.provider.OAuth2Authentication; import org.maxkey.authz.oauth2.provider.OAuth2Request; import org.maxkey.authz.oauth2.provider.token.TokenEnhancer; -import org.maxkey.config.oidc.OIDCProviderMetadata; +import org.maxkey.configuration.oidc.OIDCProviderMetadata; import org.maxkey.crypto.ReciprocalUtils; import org.maxkey.crypto.jwt.encryption.service.JwtEncryptionAndDecryptionService; import org.maxkey.crypto.jwt.encryption.service.impl.RecipientJwtEncryptionAndDecryptionServiceBuilder; diff --git a/maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/maxkey/authz/token/endpoint/TokenBasedAuthorizeEndpoint.java b/maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/maxkey/authz/token/endpoint/TokenBasedAuthorizeEndpoint.java index bc4254f82..9e9a0b184 100644 --- a/maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/maxkey/authz/token/endpoint/TokenBasedAuthorizeEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/maxkey/authz/token/endpoint/TokenBasedAuthorizeEndpoint.java @@ -10,7 +10,7 @@ import javax.servlet.http.HttpServletResponse; import org.maxkey.authz.endpoint.AuthorizeBaseEndpoint; import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; import org.maxkey.authz.token.endpoint.adapter.TokenBasedDefaultAdapter; -import org.maxkey.config.ApplicationConfig; +import org.maxkey.configuration.ApplicationConfig; import org.maxkey.constants.Boolean; import org.maxkey.dao.service.AppsTokenBasedDetailsService; import org.maxkey.domain.apps.Apps; diff --git a/maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/maxkey/authz/token/endpoint/adapter/TokenBasedJWTAdapter.java b/maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/maxkey/authz/token/endpoint/adapter/TokenBasedJWTAdapter.java index 4a4bfeb7b..fe4958e10 100644 --- a/maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/maxkey/authz/token/endpoint/adapter/TokenBasedJWTAdapter.java +++ b/maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/maxkey/authz/token/endpoint/adapter/TokenBasedJWTAdapter.java @@ -6,7 +6,7 @@ import java.util.UUID; import org.joda.time.DateTime; import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; -import org.maxkey.config.oidc.OIDCProviderMetadata; +import org.maxkey.configuration.oidc.OIDCProviderMetadata; import org.maxkey.crypto.jwt.signer.service.JwtSigningAndValidationService; import org.maxkey.domain.UserInfo; import org.maxkey.domain.apps.Apps; diff --git a/maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/maxkey/authz/token/endpoint/adapter/TokenBasedJWTHS256Adapter.java b/maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/maxkey/authz/token/endpoint/adapter/TokenBasedJWTHS256Adapter.java index dc27e76f6..16efdf212 100644 --- a/maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/maxkey/authz/token/endpoint/adapter/TokenBasedJWTHS256Adapter.java +++ b/maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/maxkey/authz/token/endpoint/adapter/TokenBasedJWTHS256Adapter.java @@ -6,7 +6,7 @@ import java.util.UUID; import org.joda.time.DateTime; import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; -import org.maxkey.config.oidc.OIDCProviderMetadata; +import org.maxkey.configuration.oidc.OIDCProviderMetadata; import org.maxkey.crypto.ReciprocalUtils; import org.maxkey.crypto.jwt.signer.service.JwtSigningAndValidationService; import org.maxkey.crypto.jwt.signer.service.impl.SymmetricSigningAndValidationServiceBuilder; diff --git a/maxkey-web-manage/src/main/java/org/maxkey/MaxKeyMgtApplication.java b/maxkey-web-manage/src/main/java/org/maxkey/MaxKeyMgtApplication.java index 563576ea0..2cb9e7ec6 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/MaxKeyMgtApplication.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/MaxKeyMgtApplication.java @@ -3,7 +3,7 @@ package org.maxkey; import java.util.Date; import javax.servlet.ServletException; -import org.maxkey.config.ApplicationConfig; +import org.maxkey.configuration.ApplicationConfig; import org.maxkey.web.InitializeContext; import org.mybatis.spring.annotation.MapperScan; import org.slf4j.Logger; diff --git a/maxkey-web-manage/src/main/java/org/maxkey/web/endpoint/LoginEndpoint.java b/maxkey-web-manage/src/main/java/org/maxkey/web/endpoint/LoginEndpoint.java index 0d4f7bfb7..455d27b0f 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/web/endpoint/LoginEndpoint.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/web/endpoint/LoginEndpoint.java @@ -7,7 +7,7 @@ import org.maxkey.authn.BasicAuthentication; import org.maxkey.authn.RealmAuthenticationProvider; import org.maxkey.authn.support.jwt.JwtLoginService; import org.maxkey.authn.support.rememberme.AbstractRemeberMeService; -import org.maxkey.config.ApplicationConfig; +import org.maxkey.configuration.ApplicationConfig; import org.maxkey.web.WebConstants; import org.maxkey.web.WebContext; import org.slf4j.Logger; diff --git a/maxkey-web-manage/src/main/java/org/maxkey/web/interceptor/PermissionAdapter.java b/maxkey-web-manage/src/main/java/org/maxkey/web/interceptor/PermissionAdapter.java index 1efac9deb..4224c0c14 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/web/interceptor/PermissionAdapter.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/web/interceptor/PermissionAdapter.java @@ -6,7 +6,7 @@ import javax.servlet.RequestDispatcher; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.maxkey.config.ApplicationConfig; +import org.maxkey.configuration.ApplicationConfig; import org.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyApplication.java b/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyApplication.java index 54b284083..94c19c05f 100644 --- a/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyApplication.java +++ b/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyApplication.java @@ -4,7 +4,7 @@ import java.util.Date; import javax.servlet.ServletException; import org.apache.ibatis.io.VFS; import org.apache.mybatis.jpa.SpringBootVFS; -import org.maxkey.config.ApplicationConfig; +import org.maxkey.configuration.ApplicationConfig; import org.maxkey.web.InitializeContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-web-maxkey/src/main/java/org/maxkey/autoconfigure/Oauth20AutoConfiguration.java b/maxkey-web-maxkey/src/main/java/org/maxkey/autoconfigure/Oauth20AutoConfiguration.java index 88f56da42..b5a8ff482 100644 --- a/maxkey-web-maxkey/src/main/java/org/maxkey/autoconfigure/Oauth20AutoConfiguration.java +++ b/maxkey-web-maxkey/src/main/java/org/maxkey/autoconfigure/Oauth20AutoConfiguration.java @@ -24,7 +24,7 @@ import org.maxkey.authz.oauth2.provider.token.store.JdbcTokenStore; import org.maxkey.authz.oauth2.provider.token.store.JwtAccessTokenConverter; import org.maxkey.authz.oauth2.provider.token.store.RedisTokenStore; import org.maxkey.authz.oidc.idtoken.OIDCIdTokenEnhancer; -import org.maxkey.config.oidc.OIDCProviderMetadataDetails; +import org.maxkey.configuration.oidc.OIDCProviderMetadataDetails; import org.maxkey.constants.ConstantsProperties; import org.maxkey.crypto.jose.keystore.JWKSetKeyStore; import org.maxkey.crypto.jwt.encryption.service.impl.DefaultJwtEncryptionAndDecryptionService; diff --git a/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/RegistrationController.java b/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/RegistrationController.java index 224d9479a..324f18f54 100644 --- a/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/RegistrationController.java +++ b/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/RegistrationController.java @@ -5,7 +5,7 @@ import java.util.Date; import org.apache.commons.mail.DefaultAuthenticator; import org.apache.commons.mail.EmailException; import org.apache.commons.mail.HtmlEmail; -import org.maxkey.config.ApplicationConfig; +import org.maxkey.configuration.ApplicationConfig; import org.maxkey.constants.ConstantsStatus; import org.maxkey.crypto.ReciprocalUtils; import org.maxkey.crypto.password.PasswordReciprocal; diff --git a/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/SocialSignOnListController.java b/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/SocialSignOnListController.java index fdbfc2aaf..7ab89c66a 100644 --- a/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/SocialSignOnListController.java +++ b/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/SocialSignOnListController.java @@ -7,7 +7,7 @@ import org.maxkey.authn.support.socialsignon.service.SocialSignOnProvider; import org.maxkey.authn.support.socialsignon.service.SocialSignOnProviderService; import org.maxkey.authn.support.socialsignon.service.SocialsAssociate; import org.maxkey.authn.support.socialsignon.service.SocialsAssociateService; -import org.maxkey.config.ApplicationConfig; +import org.maxkey.configuration.ApplicationConfig; import org.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-web-maxkey/src/main/java/org/maxkey/web/endpoint/IndexEndpoint.java b/maxkey-web-maxkey/src/main/java/org/maxkey/web/endpoint/IndexEndpoint.java index 2b6abef45..eb74599f6 100644 --- a/maxkey-web-maxkey/src/main/java/org/maxkey/web/endpoint/IndexEndpoint.java +++ b/maxkey-web-maxkey/src/main/java/org/maxkey/web/endpoint/IndexEndpoint.java @@ -5,7 +5,8 @@ import java.io.IOException; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.maxkey.config.ApplicationConfig; + +import org.maxkey.configuration.ApplicationConfig; import org.maxkey.constants.ConstantsPasswordSetType; import org.maxkey.domain.UserInfo; import org.maxkey.web.WebConstants; diff --git a/maxkey-web-maxkey/src/main/java/org/maxkey/web/endpoint/LoginEndpoint.java b/maxkey-web-maxkey/src/main/java/org/maxkey/web/endpoint/LoginEndpoint.java index 6375c6223..3ae91f9bd 100644 --- a/maxkey-web-maxkey/src/main/java/org/maxkey/web/endpoint/LoginEndpoint.java +++ b/maxkey-web-maxkey/src/main/java/org/maxkey/web/endpoint/LoginEndpoint.java @@ -13,7 +13,7 @@ import org.maxkey.authn.support.kerberos.KerberosService; import org.maxkey.authn.support.rememberme.AbstractRemeberMeService; import org.maxkey.authn.support.socialsignon.service.SocialSignOnProviderService; import org.maxkey.authn.support.wsfederation.WsFederationConstants; -import org.maxkey.config.ApplicationConfig; +import org.maxkey.configuration.ApplicationConfig; import org.maxkey.crypto.password.opt.AbstractOptAuthn; import org.maxkey.dao.service.UserInfoService; import org.maxkey.domain.UserInfo; diff --git a/maxkey-web-maxkey/src/main/java/org/maxkey/web/endpoint/LogoutEndpoint.java b/maxkey-web-maxkey/src/main/java/org/maxkey/web/endpoint/LogoutEndpoint.java index 8a3bc578d..74fcdd1d9 100644 --- a/maxkey-web-maxkey/src/main/java/org/maxkey/web/endpoint/LogoutEndpoint.java +++ b/maxkey-web-maxkey/src/main/java/org/maxkey/web/endpoint/LogoutEndpoint.java @@ -4,7 +4,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.maxkey.authn.realm.AbstractAuthenticationRealm; -import org.maxkey.config.ApplicationConfig; +import org.maxkey.configuration.ApplicationConfig; import org.maxkey.web.WebConstants; import org.maxkey.web.WebContext; import org.slf4j.Logger; diff --git a/maxkey-web-maxkey/src/main/java/org/maxkey/web/interceptor/PermissionAdapter.java b/maxkey-web-maxkey/src/main/java/org/maxkey/web/interceptor/PermissionAdapter.java index 1438348ac..faed59f34 100644 --- a/maxkey-web-maxkey/src/main/java/org/maxkey/web/interceptor/PermissionAdapter.java +++ b/maxkey-web-maxkey/src/main/java/org/maxkey/web/interceptor/PermissionAdapter.java @@ -6,7 +6,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.maxkey.authn.SavedRequestAwareAuthenticationSuccessHandler; -import org.maxkey.config.ApplicationConfig; +import org.maxkey.configuration.ApplicationConfig; import org.maxkey.web.WebConstants; import org.maxkey.web.WebContext; import org.slf4j.Logger;