commit | 00ec147174d5973cf9ba8409888640fb02ca0409 | [log] [tgz] |
---|---|---|
author | Les Hazlewood <lhazlewood@apache.org> | Tue Mar 24 15:20:56 2009 +0000 |
committer | Les Hazlewood <lhazlewood@apache.org> | Tue Mar 24 15:20:56 2009 +0000 |
tree | e2673eed580e024797d691df6e0abfe21bd4853d | |
parent | 4850e665b8f20b81d395fff0b28c3461b6dde0ea [diff] |
moved files to maven standard directory layout git-svn-id: https://svn.apache.org/repos/asf/incubator/jsecurity/trunk@757841 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/core/src/org/apache/ki/KiException.java b/core/src/main/java/org/apache/ki/KiException.java similarity index 100% rename from core/src/org/apache/ki/KiException.java rename to core/src/main/java/org/apache/ki/KiException.java
diff --git a/core/src/org/apache/ki/SecurityUtils.java b/core/src/main/java/org/apache/ki/SecurityUtils.java similarity index 100% rename from core/src/org/apache/ki/SecurityUtils.java rename to core/src/main/java/org/apache/ki/SecurityUtils.java
diff --git a/core/src/org/apache/ki/aop/AnnotationHandler.java b/core/src/main/java/org/apache/ki/aop/AnnotationHandler.java similarity index 100% rename from core/src/org/apache/ki/aop/AnnotationHandler.java rename to core/src/main/java/org/apache/ki/aop/AnnotationHandler.java
diff --git a/core/src/org/apache/ki/aop/AnnotationMethodInterceptor.java b/core/src/main/java/org/apache/ki/aop/AnnotationMethodInterceptor.java similarity index 100% rename from core/src/org/apache/ki/aop/AnnotationMethodInterceptor.java rename to core/src/main/java/org/apache/ki/aop/AnnotationMethodInterceptor.java
diff --git a/core/src/org/apache/ki/aop/MethodInterceptor.java b/core/src/main/java/org/apache/ki/aop/MethodInterceptor.java similarity index 100% rename from core/src/org/apache/ki/aop/MethodInterceptor.java rename to core/src/main/java/org/apache/ki/aop/MethodInterceptor.java
diff --git a/core/src/org/apache/ki/aop/MethodInterceptorSupport.java b/core/src/main/java/org/apache/ki/aop/MethodInterceptorSupport.java similarity index 100% rename from core/src/org/apache/ki/aop/MethodInterceptorSupport.java rename to core/src/main/java/org/apache/ki/aop/MethodInterceptorSupport.java
diff --git a/core/src/org/apache/ki/aop/MethodInvocation.java b/core/src/main/java/org/apache/ki/aop/MethodInvocation.java similarity index 100% rename from core/src/org/apache/ki/aop/MethodInvocation.java rename to core/src/main/java/org/apache/ki/aop/MethodInvocation.java
diff --git a/core/src/org/apache/ki/aop/package-info.java b/core/src/main/java/org/apache/ki/aop/package-info.java similarity index 100% rename from core/src/org/apache/ki/aop/package-info.java rename to core/src/main/java/org/apache/ki/aop/package-info.java
diff --git a/core/src/org/apache/ki/authc/AbstractAuthenticator.java b/core/src/main/java/org/apache/ki/authc/AbstractAuthenticator.java similarity index 100% rename from core/src/org/apache/ki/authc/AbstractAuthenticator.java rename to core/src/main/java/org/apache/ki/authc/AbstractAuthenticator.java
diff --git a/core/src/org/apache/ki/authc/Account.java b/core/src/main/java/org/apache/ki/authc/Account.java similarity index 100% rename from core/src/org/apache/ki/authc/Account.java rename to core/src/main/java/org/apache/ki/authc/Account.java
diff --git a/core/src/org/apache/ki/authc/AccountException.java b/core/src/main/java/org/apache/ki/authc/AccountException.java similarity index 100% rename from core/src/org/apache/ki/authc/AccountException.java rename to core/src/main/java/org/apache/ki/authc/AccountException.java
diff --git a/core/src/org/apache/ki/authc/AuthenticationException.java b/core/src/main/java/org/apache/ki/authc/AuthenticationException.java similarity index 100% rename from core/src/org/apache/ki/authc/AuthenticationException.java rename to core/src/main/java/org/apache/ki/authc/AuthenticationException.java
diff --git a/core/src/org/apache/ki/authc/AuthenticationInfo.java b/core/src/main/java/org/apache/ki/authc/AuthenticationInfo.java similarity index 100% rename from core/src/org/apache/ki/authc/AuthenticationInfo.java rename to core/src/main/java/org/apache/ki/authc/AuthenticationInfo.java
diff --git a/core/src/org/apache/ki/authc/AuthenticationListener.java b/core/src/main/java/org/apache/ki/authc/AuthenticationListener.java similarity index 100% rename from core/src/org/apache/ki/authc/AuthenticationListener.java rename to core/src/main/java/org/apache/ki/authc/AuthenticationListener.java
diff --git a/core/src/org/apache/ki/authc/AuthenticationListenerRegistrar.java b/core/src/main/java/org/apache/ki/authc/AuthenticationListenerRegistrar.java similarity index 100% rename from core/src/org/apache/ki/authc/AuthenticationListenerRegistrar.java rename to core/src/main/java/org/apache/ki/authc/AuthenticationListenerRegistrar.java
diff --git a/core/src/org/apache/ki/authc/AuthenticationToken.java b/core/src/main/java/org/apache/ki/authc/AuthenticationToken.java similarity index 100% rename from core/src/org/apache/ki/authc/AuthenticationToken.java rename to core/src/main/java/org/apache/ki/authc/AuthenticationToken.java
diff --git a/core/src/org/apache/ki/authc/Authenticator.java b/core/src/main/java/org/apache/ki/authc/Authenticator.java similarity index 100% rename from core/src/org/apache/ki/authc/Authenticator.java rename to core/src/main/java/org/apache/ki/authc/Authenticator.java
diff --git a/core/src/org/apache/ki/authc/ConcurrentAccessException.java b/core/src/main/java/org/apache/ki/authc/ConcurrentAccessException.java similarity index 100% rename from core/src/org/apache/ki/authc/ConcurrentAccessException.java rename to core/src/main/java/org/apache/ki/authc/ConcurrentAccessException.java
diff --git a/core/src/org/apache/ki/authc/CredentialsException.java b/core/src/main/java/org/apache/ki/authc/CredentialsException.java similarity index 100% rename from core/src/org/apache/ki/authc/CredentialsException.java rename to core/src/main/java/org/apache/ki/authc/CredentialsException.java
diff --git a/core/src/org/apache/ki/authc/DisabledAccountException.java b/core/src/main/java/org/apache/ki/authc/DisabledAccountException.java similarity index 100% rename from core/src/org/apache/ki/authc/DisabledAccountException.java rename to core/src/main/java/org/apache/ki/authc/DisabledAccountException.java
diff --git a/core/src/org/apache/ki/authc/ExcessiveAttemptsException.java b/core/src/main/java/org/apache/ki/authc/ExcessiveAttemptsException.java similarity index 100% rename from core/src/org/apache/ki/authc/ExcessiveAttemptsException.java rename to core/src/main/java/org/apache/ki/authc/ExcessiveAttemptsException.java
diff --git a/core/src/org/apache/ki/authc/ExpiredCredentialsException.java b/core/src/main/java/org/apache/ki/authc/ExpiredCredentialsException.java similarity index 100% rename from core/src/org/apache/ki/authc/ExpiredCredentialsException.java rename to core/src/main/java/org/apache/ki/authc/ExpiredCredentialsException.java
diff --git a/core/src/org/apache/ki/authc/IncorrectCredentialsException.java b/core/src/main/java/org/apache/ki/authc/IncorrectCredentialsException.java similarity index 100% rename from core/src/org/apache/ki/authc/IncorrectCredentialsException.java rename to core/src/main/java/org/apache/ki/authc/IncorrectCredentialsException.java
diff --git a/core/src/org/apache/ki/authc/InetAuthenticationToken.java b/core/src/main/java/org/apache/ki/authc/InetAuthenticationToken.java similarity index 100% rename from core/src/org/apache/ki/authc/InetAuthenticationToken.java rename to core/src/main/java/org/apache/ki/authc/InetAuthenticationToken.java
diff --git a/core/src/org/apache/ki/authc/LockedAccountException.java b/core/src/main/java/org/apache/ki/authc/LockedAccountException.java similarity index 100% rename from core/src/org/apache/ki/authc/LockedAccountException.java rename to core/src/main/java/org/apache/ki/authc/LockedAccountException.java
diff --git a/core/src/org/apache/ki/authc/LogoutAware.java b/core/src/main/java/org/apache/ki/authc/LogoutAware.java similarity index 100% rename from core/src/org/apache/ki/authc/LogoutAware.java rename to core/src/main/java/org/apache/ki/authc/LogoutAware.java
diff --git a/core/src/org/apache/ki/authc/MergableAuthenticationInfo.java b/core/src/main/java/org/apache/ki/authc/MergableAuthenticationInfo.java similarity index 100% rename from core/src/org/apache/ki/authc/MergableAuthenticationInfo.java rename to core/src/main/java/org/apache/ki/authc/MergableAuthenticationInfo.java
diff --git a/core/src/org/apache/ki/authc/RememberMeAuthenticationToken.java b/core/src/main/java/org/apache/ki/authc/RememberMeAuthenticationToken.java similarity index 100% rename from core/src/org/apache/ki/authc/RememberMeAuthenticationToken.java rename to core/src/main/java/org/apache/ki/authc/RememberMeAuthenticationToken.java
diff --git a/core/src/org/apache/ki/authc/SimpleAccount.java b/core/src/main/java/org/apache/ki/authc/SimpleAccount.java similarity index 100% rename from core/src/org/apache/ki/authc/SimpleAccount.java rename to core/src/main/java/org/apache/ki/authc/SimpleAccount.java
diff --git a/core/src/org/apache/ki/authc/SimpleAuthenticationInfo.java b/core/src/main/java/org/apache/ki/authc/SimpleAuthenticationInfo.java similarity index 100% rename from core/src/org/apache/ki/authc/SimpleAuthenticationInfo.java rename to core/src/main/java/org/apache/ki/authc/SimpleAuthenticationInfo.java
diff --git a/core/src/org/apache/ki/authc/UnknownAccountException.java b/core/src/main/java/org/apache/ki/authc/UnknownAccountException.java similarity index 100% rename from core/src/org/apache/ki/authc/UnknownAccountException.java rename to core/src/main/java/org/apache/ki/authc/UnknownAccountException.java
diff --git a/core/src/org/apache/ki/authc/UsernamePasswordToken.java b/core/src/main/java/org/apache/ki/authc/UsernamePasswordToken.java similarity index 100% rename from core/src/org/apache/ki/authc/UsernamePasswordToken.java rename to core/src/main/java/org/apache/ki/authc/UsernamePasswordToken.java
diff --git a/core/src/org/apache/ki/authc/credential/AllowAllCredentialsMatcher.java b/core/src/main/java/org/apache/ki/authc/credential/AllowAllCredentialsMatcher.java similarity index 100% rename from core/src/org/apache/ki/authc/credential/AllowAllCredentialsMatcher.java rename to core/src/main/java/org/apache/ki/authc/credential/AllowAllCredentialsMatcher.java
diff --git a/core/src/org/apache/ki/authc/credential/CredentialsMatcher.java b/core/src/main/java/org/apache/ki/authc/credential/CredentialsMatcher.java similarity index 100% rename from core/src/org/apache/ki/authc/credential/CredentialsMatcher.java rename to core/src/main/java/org/apache/ki/authc/credential/CredentialsMatcher.java
diff --git a/core/src/org/apache/ki/authc/credential/HashedCredentialsMatcher.java b/core/src/main/java/org/apache/ki/authc/credential/HashedCredentialsMatcher.java similarity index 100% rename from core/src/org/apache/ki/authc/credential/HashedCredentialsMatcher.java rename to core/src/main/java/org/apache/ki/authc/credential/HashedCredentialsMatcher.java
diff --git a/core/src/org/apache/ki/authc/credential/Md2CredentialsMatcher.java b/core/src/main/java/org/apache/ki/authc/credential/Md2CredentialsMatcher.java similarity index 100% rename from core/src/org/apache/ki/authc/credential/Md2CredentialsMatcher.java rename to core/src/main/java/org/apache/ki/authc/credential/Md2CredentialsMatcher.java
diff --git a/core/src/org/apache/ki/authc/credential/Md5CredentialsMatcher.java b/core/src/main/java/org/apache/ki/authc/credential/Md5CredentialsMatcher.java similarity index 100% rename from core/src/org/apache/ki/authc/credential/Md5CredentialsMatcher.java rename to core/src/main/java/org/apache/ki/authc/credential/Md5CredentialsMatcher.java
diff --git a/core/src/org/apache/ki/authc/credential/Sha1CredentialsMatcher.java b/core/src/main/java/org/apache/ki/authc/credential/Sha1CredentialsMatcher.java similarity index 100% rename from core/src/org/apache/ki/authc/credential/Sha1CredentialsMatcher.java rename to core/src/main/java/org/apache/ki/authc/credential/Sha1CredentialsMatcher.java
diff --git a/core/src/org/apache/ki/authc/credential/Sha256CredentialsMatcher.java b/core/src/main/java/org/apache/ki/authc/credential/Sha256CredentialsMatcher.java similarity index 100% rename from core/src/org/apache/ki/authc/credential/Sha256CredentialsMatcher.java rename to core/src/main/java/org/apache/ki/authc/credential/Sha256CredentialsMatcher.java
diff --git a/core/src/org/apache/ki/authc/credential/Sha384CredentialsMatcher.java b/core/src/main/java/org/apache/ki/authc/credential/Sha384CredentialsMatcher.java similarity index 100% rename from core/src/org/apache/ki/authc/credential/Sha384CredentialsMatcher.java rename to core/src/main/java/org/apache/ki/authc/credential/Sha384CredentialsMatcher.java
diff --git a/core/src/org/apache/ki/authc/credential/Sha512CredentialsMatcher.java b/core/src/main/java/org/apache/ki/authc/credential/Sha512CredentialsMatcher.java similarity index 100% rename from core/src/org/apache/ki/authc/credential/Sha512CredentialsMatcher.java rename to core/src/main/java/org/apache/ki/authc/credential/Sha512CredentialsMatcher.java
diff --git a/core/src/org/apache/ki/authc/credential/SimpleCredentialsMatcher.java b/core/src/main/java/org/apache/ki/authc/credential/SimpleCredentialsMatcher.java similarity index 100% rename from core/src/org/apache/ki/authc/credential/SimpleCredentialsMatcher.java rename to core/src/main/java/org/apache/ki/authc/credential/SimpleCredentialsMatcher.java
diff --git a/core/src/org/apache/ki/authc/credential/package-info.java b/core/src/main/java/org/apache/ki/authc/credential/package-info.java similarity index 100% rename from core/src/org/apache/ki/authc/credential/package-info.java rename to core/src/main/java/org/apache/ki/authc/credential/package-info.java
diff --git a/core/src/org/apache/ki/authc/package-info.java b/core/src/main/java/org/apache/ki/authc/package-info.java similarity index 100% rename from core/src/org/apache/ki/authc/package-info.java rename to core/src/main/java/org/apache/ki/authc/package-info.java
diff --git a/core/src/org/apache/ki/authc/pam/AbstractAuthenticationStrategy.java b/core/src/main/java/org/apache/ki/authc/pam/AbstractAuthenticationStrategy.java similarity index 100% rename from core/src/org/apache/ki/authc/pam/AbstractAuthenticationStrategy.java rename to core/src/main/java/org/apache/ki/authc/pam/AbstractAuthenticationStrategy.java
diff --git a/core/src/org/apache/ki/authc/pam/AllSuccessfulStrategy.java b/core/src/main/java/org/apache/ki/authc/pam/AllSuccessfulStrategy.java similarity index 100% rename from core/src/org/apache/ki/authc/pam/AllSuccessfulStrategy.java rename to core/src/main/java/org/apache/ki/authc/pam/AllSuccessfulStrategy.java
diff --git a/core/src/org/apache/ki/authc/pam/AtLeastOneSuccessfulStrategy.java b/core/src/main/java/org/apache/ki/authc/pam/AtLeastOneSuccessfulStrategy.java similarity index 100% rename from core/src/org/apache/ki/authc/pam/AtLeastOneSuccessfulStrategy.java rename to core/src/main/java/org/apache/ki/authc/pam/AtLeastOneSuccessfulStrategy.java
diff --git a/core/src/org/apache/ki/authc/pam/AuthenticationStrategy.java b/core/src/main/java/org/apache/ki/authc/pam/AuthenticationStrategy.java similarity index 100% rename from core/src/org/apache/ki/authc/pam/AuthenticationStrategy.java rename to core/src/main/java/org/apache/ki/authc/pam/AuthenticationStrategy.java
diff --git a/core/src/org/apache/ki/authc/pam/FirstSuccessfulStrategy.java b/core/src/main/java/org/apache/ki/authc/pam/FirstSuccessfulStrategy.java similarity index 100% rename from core/src/org/apache/ki/authc/pam/FirstSuccessfulStrategy.java rename to core/src/main/java/org/apache/ki/authc/pam/FirstSuccessfulStrategy.java
diff --git a/core/src/org/apache/ki/authc/pam/ModularRealmAuthenticator.java b/core/src/main/java/org/apache/ki/authc/pam/ModularRealmAuthenticator.java similarity index 100% rename from core/src/org/apache/ki/authc/pam/ModularRealmAuthenticator.java rename to core/src/main/java/org/apache/ki/authc/pam/ModularRealmAuthenticator.java
diff --git a/core/src/org/apache/ki/authc/pam/UnsupportedTokenException.java b/core/src/main/java/org/apache/ki/authc/pam/UnsupportedTokenException.java similarity index 100% rename from core/src/org/apache/ki/authc/pam/UnsupportedTokenException.java rename to core/src/main/java/org/apache/ki/authc/pam/UnsupportedTokenException.java
diff --git a/core/src/org/apache/ki/authc/pam/package-info.java b/core/src/main/java/org/apache/ki/authc/pam/package-info.java similarity index 100% rename from core/src/org/apache/ki/authc/pam/package-info.java rename to core/src/main/java/org/apache/ki/authc/pam/package-info.java
diff --git a/core/src/org/apache/ki/authz/AuthorizationException.java b/core/src/main/java/org/apache/ki/authz/AuthorizationException.java similarity index 100% rename from core/src/org/apache/ki/authz/AuthorizationException.java rename to core/src/main/java/org/apache/ki/authz/AuthorizationException.java
diff --git a/core/src/org/apache/ki/authz/AuthorizationInfo.java b/core/src/main/java/org/apache/ki/authz/AuthorizationInfo.java similarity index 100% rename from core/src/org/apache/ki/authz/AuthorizationInfo.java rename to core/src/main/java/org/apache/ki/authz/AuthorizationInfo.java
diff --git a/core/src/org/apache/ki/authz/Authorizer.java b/core/src/main/java/org/apache/ki/authz/Authorizer.java similarity index 100% rename from core/src/org/apache/ki/authz/Authorizer.java rename to core/src/main/java/org/apache/ki/authz/Authorizer.java
diff --git a/core/src/org/apache/ki/authz/AuthorizingAccount.java b/core/src/main/java/org/apache/ki/authz/AuthorizingAccount.java similarity index 100% rename from core/src/org/apache/ki/authz/AuthorizingAccount.java rename to core/src/main/java/org/apache/ki/authz/AuthorizingAccount.java
diff --git a/core/src/org/apache/ki/authz/HostUnauthorizedException.java b/core/src/main/java/org/apache/ki/authz/HostUnauthorizedException.java similarity index 100% rename from core/src/org/apache/ki/authz/HostUnauthorizedException.java rename to core/src/main/java/org/apache/ki/authz/HostUnauthorizedException.java
diff --git a/core/src/org/apache/ki/authz/ModularRealmAuthorizer.java b/core/src/main/java/org/apache/ki/authz/ModularRealmAuthorizer.java similarity index 100% rename from core/src/org/apache/ki/authz/ModularRealmAuthorizer.java rename to core/src/main/java/org/apache/ki/authz/ModularRealmAuthorizer.java
diff --git a/core/src/org/apache/ki/authz/Permission.java b/core/src/main/java/org/apache/ki/authz/Permission.java similarity index 100% rename from core/src/org/apache/ki/authz/Permission.java rename to core/src/main/java/org/apache/ki/authz/Permission.java
diff --git a/core/src/org/apache/ki/authz/SimpleAuthorizationInfo.java b/core/src/main/java/org/apache/ki/authz/SimpleAuthorizationInfo.java similarity index 100% rename from core/src/org/apache/ki/authz/SimpleAuthorizationInfo.java rename to core/src/main/java/org/apache/ki/authz/SimpleAuthorizationInfo.java
diff --git a/core/src/org/apache/ki/authz/SimpleAuthorizingAccount.java b/core/src/main/java/org/apache/ki/authz/SimpleAuthorizingAccount.java similarity index 100% rename from core/src/org/apache/ki/authz/SimpleAuthorizingAccount.java rename to core/src/main/java/org/apache/ki/authz/SimpleAuthorizingAccount.java
diff --git a/core/src/org/apache/ki/authz/SimpleRole.java b/core/src/main/java/org/apache/ki/authz/SimpleRole.java similarity index 100% rename from core/src/org/apache/ki/authz/SimpleRole.java rename to core/src/main/java/org/apache/ki/authz/SimpleRole.java
diff --git a/core/src/org/apache/ki/authz/UnauthenticatedException.java b/core/src/main/java/org/apache/ki/authz/UnauthenticatedException.java similarity index 100% rename from core/src/org/apache/ki/authz/UnauthenticatedException.java rename to core/src/main/java/org/apache/ki/authz/UnauthenticatedException.java
diff --git a/core/src/org/apache/ki/authz/UnauthorizedException.java b/core/src/main/java/org/apache/ki/authz/UnauthorizedException.java similarity index 100% rename from core/src/org/apache/ki/authz/UnauthorizedException.java rename to core/src/main/java/org/apache/ki/authz/UnauthorizedException.java
diff --git a/core/src/org/apache/ki/authz/annotation/RequiresAuthentication.java b/core/src/main/java/org/apache/ki/authz/annotation/RequiresAuthentication.java similarity index 100% rename from core/src/org/apache/ki/authz/annotation/RequiresAuthentication.java rename to core/src/main/java/org/apache/ki/authz/annotation/RequiresAuthentication.java
diff --git a/core/src/org/apache/ki/authz/annotation/RequiresGuest.java b/core/src/main/java/org/apache/ki/authz/annotation/RequiresGuest.java similarity index 100% rename from core/src/org/apache/ki/authz/annotation/RequiresGuest.java rename to core/src/main/java/org/apache/ki/authz/annotation/RequiresGuest.java
diff --git a/core/src/org/apache/ki/authz/annotation/RequiresPermissions.java b/core/src/main/java/org/apache/ki/authz/annotation/RequiresPermissions.java similarity index 100% rename from core/src/org/apache/ki/authz/annotation/RequiresPermissions.java rename to core/src/main/java/org/apache/ki/authz/annotation/RequiresPermissions.java
diff --git a/core/src/org/apache/ki/authz/annotation/RequiresRoles.java b/core/src/main/java/org/apache/ki/authz/annotation/RequiresRoles.java similarity index 100% rename from core/src/org/apache/ki/authz/annotation/RequiresRoles.java rename to core/src/main/java/org/apache/ki/authz/annotation/RequiresRoles.java
diff --git a/core/src/org/apache/ki/authz/annotation/RequiresUser.java b/core/src/main/java/org/apache/ki/authz/annotation/RequiresUser.java similarity index 100% rename from core/src/org/apache/ki/authz/annotation/RequiresUser.java rename to core/src/main/java/org/apache/ki/authz/annotation/RequiresUser.java
diff --git a/core/src/org/apache/ki/authz/annotation/package-info.java b/core/src/main/java/org/apache/ki/authz/annotation/package-info.java similarity index 100% rename from core/src/org/apache/ki/authz/annotation/package-info.java rename to core/src/main/java/org/apache/ki/authz/annotation/package-info.java
diff --git a/core/src/org/apache/ki/authz/aop/AnnotationsAuthorizingMethodInterceptor.java b/core/src/main/java/org/apache/ki/authz/aop/AnnotationsAuthorizingMethodInterceptor.java similarity index 100% rename from core/src/org/apache/ki/authz/aop/AnnotationsAuthorizingMethodInterceptor.java rename to core/src/main/java/org/apache/ki/authz/aop/AnnotationsAuthorizingMethodInterceptor.java
diff --git a/core/src/org/apache/ki/authz/aop/AuthenticatedAnnotationHandler.java b/core/src/main/java/org/apache/ki/authz/aop/AuthenticatedAnnotationHandler.java similarity index 100% rename from core/src/org/apache/ki/authz/aop/AuthenticatedAnnotationHandler.java rename to core/src/main/java/org/apache/ki/authz/aop/AuthenticatedAnnotationHandler.java
diff --git a/core/src/org/apache/ki/authz/aop/AuthenticatedAnnotationMethodInterceptor.java b/core/src/main/java/org/apache/ki/authz/aop/AuthenticatedAnnotationMethodInterceptor.java similarity index 100% rename from core/src/org/apache/ki/authz/aop/AuthenticatedAnnotationMethodInterceptor.java rename to core/src/main/java/org/apache/ki/authz/aop/AuthenticatedAnnotationMethodInterceptor.java
diff --git a/core/src/org/apache/ki/authz/aop/AuthorizingAnnotationHandler.java b/core/src/main/java/org/apache/ki/authz/aop/AuthorizingAnnotationHandler.java similarity index 100% rename from core/src/org/apache/ki/authz/aop/AuthorizingAnnotationHandler.java rename to core/src/main/java/org/apache/ki/authz/aop/AuthorizingAnnotationHandler.java
diff --git a/core/src/org/apache/ki/authz/aop/AuthorizingAnnotationMethodInterceptor.java b/core/src/main/java/org/apache/ki/authz/aop/AuthorizingAnnotationMethodInterceptor.java similarity index 100% rename from core/src/org/apache/ki/authz/aop/AuthorizingAnnotationMethodInterceptor.java rename to core/src/main/java/org/apache/ki/authz/aop/AuthorizingAnnotationMethodInterceptor.java
diff --git a/core/src/org/apache/ki/authz/aop/AuthorizingMethodInterceptor.java b/core/src/main/java/org/apache/ki/authz/aop/AuthorizingMethodInterceptor.java similarity index 100% rename from core/src/org/apache/ki/authz/aop/AuthorizingMethodInterceptor.java rename to core/src/main/java/org/apache/ki/authz/aop/AuthorizingMethodInterceptor.java
diff --git a/core/src/org/apache/ki/authz/aop/GuestAnnotationHandler.java b/core/src/main/java/org/apache/ki/authz/aop/GuestAnnotationHandler.java similarity index 100% rename from core/src/org/apache/ki/authz/aop/GuestAnnotationHandler.java rename to core/src/main/java/org/apache/ki/authz/aop/GuestAnnotationHandler.java
diff --git a/core/src/org/apache/ki/authz/aop/GuestAnnotationMethodInterceptor.java b/core/src/main/java/org/apache/ki/authz/aop/GuestAnnotationMethodInterceptor.java similarity index 100% rename from core/src/org/apache/ki/authz/aop/GuestAnnotationMethodInterceptor.java rename to core/src/main/java/org/apache/ki/authz/aop/GuestAnnotationMethodInterceptor.java
diff --git a/core/src/org/apache/ki/authz/aop/PermissionAnnotationHandler.java b/core/src/main/java/org/apache/ki/authz/aop/PermissionAnnotationHandler.java similarity index 100% rename from core/src/org/apache/ki/authz/aop/PermissionAnnotationHandler.java rename to core/src/main/java/org/apache/ki/authz/aop/PermissionAnnotationHandler.java
diff --git a/core/src/org/apache/ki/authz/aop/PermissionAnnotationMethodInterceptor.java b/core/src/main/java/org/apache/ki/authz/aop/PermissionAnnotationMethodInterceptor.java similarity index 100% rename from core/src/org/apache/ki/authz/aop/PermissionAnnotationMethodInterceptor.java rename to core/src/main/java/org/apache/ki/authz/aop/PermissionAnnotationMethodInterceptor.java
diff --git a/core/src/org/apache/ki/authz/aop/RoleAnnotationHandler.java b/core/src/main/java/org/apache/ki/authz/aop/RoleAnnotationHandler.java similarity index 100% rename from core/src/org/apache/ki/authz/aop/RoleAnnotationHandler.java rename to core/src/main/java/org/apache/ki/authz/aop/RoleAnnotationHandler.java
diff --git a/core/src/org/apache/ki/authz/aop/RoleAnnotationMethodInterceptor.java b/core/src/main/java/org/apache/ki/authz/aop/RoleAnnotationMethodInterceptor.java similarity index 100% rename from core/src/org/apache/ki/authz/aop/RoleAnnotationMethodInterceptor.java rename to core/src/main/java/org/apache/ki/authz/aop/RoleAnnotationMethodInterceptor.java
diff --git a/core/src/org/apache/ki/authz/aop/UserAnnotationHandler.java b/core/src/main/java/org/apache/ki/authz/aop/UserAnnotationHandler.java similarity index 100% rename from core/src/org/apache/ki/authz/aop/UserAnnotationHandler.java rename to core/src/main/java/org/apache/ki/authz/aop/UserAnnotationHandler.java
diff --git a/core/src/org/apache/ki/authz/aop/UserAnnotationMethodInterceptor.java b/core/src/main/java/org/apache/ki/authz/aop/UserAnnotationMethodInterceptor.java similarity index 100% rename from core/src/org/apache/ki/authz/aop/UserAnnotationMethodInterceptor.java rename to core/src/main/java/org/apache/ki/authz/aop/UserAnnotationMethodInterceptor.java
diff --git a/core/src/org/apache/ki/authz/aop/package-info.java b/core/src/main/java/org/apache/ki/authz/aop/package-info.java similarity index 100% rename from core/src/org/apache/ki/authz/aop/package-info.java rename to core/src/main/java/org/apache/ki/authz/aop/package-info.java
diff --git a/core/src/org/apache/ki/authz/package-info.java b/core/src/main/java/org/apache/ki/authz/package-info.java similarity index 100% rename from core/src/org/apache/ki/authz/package-info.java rename to core/src/main/java/org/apache/ki/authz/package-info.java
diff --git a/core/src/org/apache/ki/authz/permission/AllPermission.java b/core/src/main/java/org/apache/ki/authz/permission/AllPermission.java similarity index 100% rename from core/src/org/apache/ki/authz/permission/AllPermission.java rename to core/src/main/java/org/apache/ki/authz/permission/AllPermission.java
diff --git a/core/src/org/apache/ki/authz/permission/InvalidPermissionStringException.java b/core/src/main/java/org/apache/ki/authz/permission/InvalidPermissionStringException.java similarity index 100% rename from core/src/org/apache/ki/authz/permission/InvalidPermissionStringException.java rename to core/src/main/java/org/apache/ki/authz/permission/InvalidPermissionStringException.java
diff --git a/core/src/org/apache/ki/authz/permission/PermissionResolver.java b/core/src/main/java/org/apache/ki/authz/permission/PermissionResolver.java similarity index 100% rename from core/src/org/apache/ki/authz/permission/PermissionResolver.java rename to core/src/main/java/org/apache/ki/authz/permission/PermissionResolver.java
diff --git a/core/src/org/apache/ki/authz/permission/PermissionResolverAware.java b/core/src/main/java/org/apache/ki/authz/permission/PermissionResolverAware.java similarity index 100% rename from core/src/org/apache/ki/authz/permission/PermissionResolverAware.java rename to core/src/main/java/org/apache/ki/authz/permission/PermissionResolverAware.java
diff --git a/core/src/org/apache/ki/authz/permission/WildcardPermission.java b/core/src/main/java/org/apache/ki/authz/permission/WildcardPermission.java similarity index 100% rename from core/src/org/apache/ki/authz/permission/WildcardPermission.java rename to core/src/main/java/org/apache/ki/authz/permission/WildcardPermission.java
diff --git a/core/src/org/apache/ki/authz/permission/WildcardPermissionResolver.java b/core/src/main/java/org/apache/ki/authz/permission/WildcardPermissionResolver.java similarity index 100% rename from core/src/org/apache/ki/authz/permission/WildcardPermissionResolver.java rename to core/src/main/java/org/apache/ki/authz/permission/WildcardPermissionResolver.java
diff --git a/core/src/org/apache/ki/authz/permission/package-info.java b/core/src/main/java/org/apache/ki/authz/permission/package-info.java similarity index 100% rename from core/src/org/apache/ki/authz/permission/package-info.java rename to core/src/main/java/org/apache/ki/authz/permission/package-info.java
diff --git a/core/src/org/apache/ki/cache/Cache.java b/core/src/main/java/org/apache/ki/cache/Cache.java similarity index 100% rename from core/src/org/apache/ki/cache/Cache.java rename to core/src/main/java/org/apache/ki/cache/Cache.java
diff --git a/core/src/org/apache/ki/cache/CacheException.java b/core/src/main/java/org/apache/ki/cache/CacheException.java similarity index 100% rename from core/src/org/apache/ki/cache/CacheException.java rename to core/src/main/java/org/apache/ki/cache/CacheException.java
diff --git a/core/src/org/apache/ki/cache/CacheManager.java b/core/src/main/java/org/apache/ki/cache/CacheManager.java similarity index 100% rename from core/src/org/apache/ki/cache/CacheManager.java rename to core/src/main/java/org/apache/ki/cache/CacheManager.java
diff --git a/core/src/org/apache/ki/cache/CacheManagerAware.java b/core/src/main/java/org/apache/ki/cache/CacheManagerAware.java similarity index 100% rename from core/src/org/apache/ki/cache/CacheManagerAware.java rename to core/src/main/java/org/apache/ki/cache/CacheManagerAware.java
diff --git a/core/src/org/apache/ki/cache/DefaultCacheManager.java b/core/src/main/java/org/apache/ki/cache/DefaultCacheManager.java similarity index 100% rename from core/src/org/apache/ki/cache/DefaultCacheManager.java rename to core/src/main/java/org/apache/ki/cache/DefaultCacheManager.java
diff --git a/core/src/org/apache/ki/cache/HashtableCache.java b/core/src/main/java/org/apache/ki/cache/HashtableCache.java similarity index 100% rename from core/src/org/apache/ki/cache/HashtableCache.java rename to core/src/main/java/org/apache/ki/cache/HashtableCache.java
diff --git a/core/src/org/apache/ki/cache/HashtableCacheManager.java b/core/src/main/java/org/apache/ki/cache/HashtableCacheManager.java similarity index 100% rename from core/src/org/apache/ki/cache/HashtableCacheManager.java rename to core/src/main/java/org/apache/ki/cache/HashtableCacheManager.java
diff --git a/core/src/org/apache/ki/cache/MapCache.java b/core/src/main/java/org/apache/ki/cache/MapCache.java similarity index 100% rename from core/src/org/apache/ki/cache/MapCache.java rename to core/src/main/java/org/apache/ki/cache/MapCache.java
diff --git a/core/src/org/apache/ki/cache/SoftHashMapCache.java b/core/src/main/java/org/apache/ki/cache/SoftHashMapCache.java similarity index 100% rename from core/src/org/apache/ki/cache/SoftHashMapCache.java rename to core/src/main/java/org/apache/ki/cache/SoftHashMapCache.java
diff --git a/core/src/org/apache/ki/cache/package-info.java b/core/src/main/java/org/apache/ki/cache/package-info.java similarity index 100% rename from core/src/org/apache/ki/cache/package-info.java rename to core/src/main/java/org/apache/ki/cache/package-info.java
diff --git a/core/src/org/apache/ki/codec/Base64.java b/core/src/main/java/org/apache/ki/codec/Base64.java similarity index 100% rename from core/src/org/apache/ki/codec/Base64.java rename to core/src/main/java/org/apache/ki/codec/Base64.java
diff --git a/core/src/org/apache/ki/codec/CodecException.java b/core/src/main/java/org/apache/ki/codec/CodecException.java similarity index 100% rename from core/src/org/apache/ki/codec/CodecException.java rename to core/src/main/java/org/apache/ki/codec/CodecException.java
diff --git a/core/src/org/apache/ki/codec/CodecSupport.java b/core/src/main/java/org/apache/ki/codec/CodecSupport.java similarity index 100% rename from core/src/org/apache/ki/codec/CodecSupport.java rename to core/src/main/java/org/apache/ki/codec/CodecSupport.java
diff --git a/core/src/org/apache/ki/codec/Hex.java b/core/src/main/java/org/apache/ki/codec/Hex.java similarity index 100% rename from core/src/org/apache/ki/codec/Hex.java rename to core/src/main/java/org/apache/ki/codec/Hex.java
diff --git a/core/src/org/apache/ki/codec/package-info.java b/core/src/main/java/org/apache/ki/codec/package-info.java similarity index 100% rename from core/src/org/apache/ki/codec/package-info.java rename to core/src/main/java/org/apache/ki/codec/package-info.java
diff --git a/core/src/org/apache/ki/config/Configuration.java b/core/src/main/java/org/apache/ki/config/Configuration.java similarity index 100% rename from core/src/org/apache/ki/config/Configuration.java rename to core/src/main/java/org/apache/ki/config/Configuration.java
diff --git a/core/src/org/apache/ki/config/ConfigurationException.java b/core/src/main/java/org/apache/ki/config/ConfigurationException.java similarity index 100% rename from core/src/org/apache/ki/config/ConfigurationException.java rename to core/src/main/java/org/apache/ki/config/ConfigurationException.java
diff --git a/core/src/org/apache/ki/config/IniConfiguration.java b/core/src/main/java/org/apache/ki/config/IniConfiguration.java similarity index 100% rename from core/src/org/apache/ki/config/IniConfiguration.java rename to core/src/main/java/org/apache/ki/config/IniConfiguration.java
diff --git a/core/src/org/apache/ki/config/ReflectionBuilder.java b/core/src/main/java/org/apache/ki/config/ReflectionBuilder.java similarity index 100% rename from core/src/org/apache/ki/config/ReflectionBuilder.java rename to core/src/main/java/org/apache/ki/config/ReflectionBuilder.java
diff --git a/core/src/org/apache/ki/config/ResourceConfiguration.java b/core/src/main/java/org/apache/ki/config/ResourceConfiguration.java similarity index 100% rename from core/src/org/apache/ki/config/ResourceConfiguration.java rename to core/src/main/java/org/apache/ki/config/ResourceConfiguration.java
diff --git a/core/src/org/apache/ki/config/TextConfiguration.java b/core/src/main/java/org/apache/ki/config/TextConfiguration.java similarity index 100% rename from core/src/org/apache/ki/config/TextConfiguration.java rename to core/src/main/java/org/apache/ki/config/TextConfiguration.java
diff --git a/core/src/org/apache/ki/config/UnresolveableReferenceException.java b/core/src/main/java/org/apache/ki/config/UnresolveableReferenceException.java similarity index 100% rename from core/src/org/apache/ki/config/UnresolveableReferenceException.java rename to core/src/main/java/org/apache/ki/config/UnresolveableReferenceException.java
diff --git a/core/src/org/apache/ki/config/package-info.java b/core/src/main/java/org/apache/ki/config/package-info.java similarity index 100% rename from core/src/org/apache/ki/config/package-info.java rename to core/src/main/java/org/apache/ki/config/package-info.java
diff --git a/core/src/org/apache/ki/crypto/BlowfishCipher.java b/core/src/main/java/org/apache/ki/crypto/BlowfishCipher.java similarity index 100% rename from core/src/org/apache/ki/crypto/BlowfishCipher.java rename to core/src/main/java/org/apache/ki/crypto/BlowfishCipher.java
diff --git a/core/src/org/apache/ki/crypto/Cipher.java b/core/src/main/java/org/apache/ki/crypto/Cipher.java similarity index 100% rename from core/src/org/apache/ki/crypto/Cipher.java rename to core/src/main/java/org/apache/ki/crypto/Cipher.java
diff --git a/core/src/org/apache/ki/crypto/hash/AbstractHash.java b/core/src/main/java/org/apache/ki/crypto/hash/AbstractHash.java similarity index 100% rename from core/src/org/apache/ki/crypto/hash/AbstractHash.java rename to core/src/main/java/org/apache/ki/crypto/hash/AbstractHash.java
diff --git a/core/src/org/apache/ki/crypto/hash/Hash.java b/core/src/main/java/org/apache/ki/crypto/hash/Hash.java similarity index 100% rename from core/src/org/apache/ki/crypto/hash/Hash.java rename to core/src/main/java/org/apache/ki/crypto/hash/Hash.java
diff --git a/core/src/org/apache/ki/crypto/hash/Md2Hash.java b/core/src/main/java/org/apache/ki/crypto/hash/Md2Hash.java similarity index 100% rename from core/src/org/apache/ki/crypto/hash/Md2Hash.java rename to core/src/main/java/org/apache/ki/crypto/hash/Md2Hash.java
diff --git a/core/src/org/apache/ki/crypto/hash/Md5Hash.java b/core/src/main/java/org/apache/ki/crypto/hash/Md5Hash.java similarity index 100% rename from core/src/org/apache/ki/crypto/hash/Md5Hash.java rename to core/src/main/java/org/apache/ki/crypto/hash/Md5Hash.java
diff --git a/core/src/org/apache/ki/crypto/hash/Sha1Hash.java b/core/src/main/java/org/apache/ki/crypto/hash/Sha1Hash.java similarity index 100% rename from core/src/org/apache/ki/crypto/hash/Sha1Hash.java rename to core/src/main/java/org/apache/ki/crypto/hash/Sha1Hash.java
diff --git a/core/src/org/apache/ki/crypto/hash/Sha256Hash.java b/core/src/main/java/org/apache/ki/crypto/hash/Sha256Hash.java similarity index 100% rename from core/src/org/apache/ki/crypto/hash/Sha256Hash.java rename to core/src/main/java/org/apache/ki/crypto/hash/Sha256Hash.java
diff --git a/core/src/org/apache/ki/crypto/hash/Sha384Hash.java b/core/src/main/java/org/apache/ki/crypto/hash/Sha384Hash.java similarity index 100% rename from core/src/org/apache/ki/crypto/hash/Sha384Hash.java rename to core/src/main/java/org/apache/ki/crypto/hash/Sha384Hash.java
diff --git a/core/src/org/apache/ki/crypto/hash/Sha512Hash.java b/core/src/main/java/org/apache/ki/crypto/hash/Sha512Hash.java similarity index 100% rename from core/src/org/apache/ki/crypto/hash/Sha512Hash.java rename to core/src/main/java/org/apache/ki/crypto/hash/Sha512Hash.java
diff --git a/core/src/org/apache/ki/crypto/hash/package-info.java b/core/src/main/java/org/apache/ki/crypto/hash/package-info.java similarity index 100% rename from core/src/org/apache/ki/crypto/hash/package-info.java rename to core/src/main/java/org/apache/ki/crypto/hash/package-info.java
diff --git a/core/src/org/apache/ki/crypto/package-info.java b/core/src/main/java/org/apache/ki/crypto/package-info.java similarity index 100% rename from core/src/org/apache/ki/crypto/package-info.java rename to core/src/main/java/org/apache/ki/crypto/package-info.java
diff --git a/core/src/org/apache/ki/io/AbstractResource.java b/core/src/main/java/org/apache/ki/io/AbstractResource.java similarity index 100% rename from core/src/org/apache/ki/io/AbstractResource.java rename to core/src/main/java/org/apache/ki/io/AbstractResource.java
diff --git a/core/src/org/apache/ki/io/DefaultSerializer.java b/core/src/main/java/org/apache/ki/io/DefaultSerializer.java similarity index 100% rename from core/src/org/apache/ki/io/DefaultSerializer.java rename to core/src/main/java/org/apache/ki/io/DefaultSerializer.java
diff --git a/core/src/org/apache/ki/io/IniResource.java b/core/src/main/java/org/apache/ki/io/IniResource.java similarity index 100% rename from core/src/org/apache/ki/io/IniResource.java rename to core/src/main/java/org/apache/ki/io/IniResource.java
diff --git a/core/src/org/apache/ki/io/ResourceException.java b/core/src/main/java/org/apache/ki/io/ResourceException.java similarity index 100% rename from core/src/org/apache/ki/io/ResourceException.java rename to core/src/main/java/org/apache/ki/io/ResourceException.java
diff --git a/core/src/org/apache/ki/io/ResourceUtils.java b/core/src/main/java/org/apache/ki/io/ResourceUtils.java similarity index 100% rename from core/src/org/apache/ki/io/ResourceUtils.java rename to core/src/main/java/org/apache/ki/io/ResourceUtils.java
diff --git a/core/src/org/apache/ki/io/SerializationException.java b/core/src/main/java/org/apache/ki/io/SerializationException.java similarity index 100% rename from core/src/org/apache/ki/io/SerializationException.java rename to core/src/main/java/org/apache/ki/io/SerializationException.java
diff --git a/core/src/org/apache/ki/io/Serializer.java b/core/src/main/java/org/apache/ki/io/Serializer.java similarity index 100% rename from core/src/org/apache/ki/io/Serializer.java rename to core/src/main/java/org/apache/ki/io/Serializer.java
diff --git a/core/src/org/apache/ki/io/TextResource.java b/core/src/main/java/org/apache/ki/io/TextResource.java similarity index 100% rename from core/src/org/apache/ki/io/TextResource.java rename to core/src/main/java/org/apache/ki/io/TextResource.java
diff --git a/core/src/org/apache/ki/io/XmlSerializer.java b/core/src/main/java/org/apache/ki/io/XmlSerializer.java similarity index 100% rename from core/src/org/apache/ki/io/XmlSerializer.java rename to core/src/main/java/org/apache/ki/io/XmlSerializer.java
diff --git a/core/src/org/apache/ki/io/package-info.java b/core/src/main/java/org/apache/ki/io/package-info.java similarity index 100% rename from core/src/org/apache/ki/io/package-info.java rename to core/src/main/java/org/apache/ki/io/package-info.java
diff --git a/core/src/org/apache/ki/jndi/JndiCallback.java b/core/src/main/java/org/apache/ki/jndi/JndiCallback.java similarity index 100% rename from core/src/org/apache/ki/jndi/JndiCallback.java rename to core/src/main/java/org/apache/ki/jndi/JndiCallback.java
diff --git a/core/src/org/apache/ki/jndi/JndiLocator.java b/core/src/main/java/org/apache/ki/jndi/JndiLocator.java similarity index 100% rename from core/src/org/apache/ki/jndi/JndiLocator.java rename to core/src/main/java/org/apache/ki/jndi/JndiLocator.java
diff --git a/core/src/org/apache/ki/jndi/JndiTemplate.java b/core/src/main/java/org/apache/ki/jndi/JndiTemplate.java similarity index 100% rename from core/src/org/apache/ki/jndi/JndiTemplate.java rename to core/src/main/java/org/apache/ki/jndi/JndiTemplate.java
diff --git a/core/src/org/apache/ki/jndi/package-info.java b/core/src/main/java/org/apache/ki/jndi/package-info.java similarity index 100% rename from core/src/org/apache/ki/jndi/package-info.java rename to core/src/main/java/org/apache/ki/jndi/package-info.java
diff --git a/core/src/org/apache/ki/mgt/AbstractRememberMeManager.java b/core/src/main/java/org/apache/ki/mgt/AbstractRememberMeManager.java similarity index 100% rename from core/src/org/apache/ki/mgt/AbstractRememberMeManager.java rename to core/src/main/java/org/apache/ki/mgt/AbstractRememberMeManager.java
diff --git a/core/src/org/apache/ki/mgt/AuthenticatingSecurityManager.java b/core/src/main/java/org/apache/ki/mgt/AuthenticatingSecurityManager.java similarity index 100% rename from core/src/org/apache/ki/mgt/AuthenticatingSecurityManager.java rename to core/src/main/java/org/apache/ki/mgt/AuthenticatingSecurityManager.java
diff --git a/core/src/org/apache/ki/mgt/AuthorizingSecurityManager.java b/core/src/main/java/org/apache/ki/mgt/AuthorizingSecurityManager.java similarity index 100% rename from core/src/org/apache/ki/mgt/AuthorizingSecurityManager.java rename to core/src/main/java/org/apache/ki/mgt/AuthorizingSecurityManager.java
diff --git a/core/src/org/apache/ki/mgt/CachingSecurityManager.java b/core/src/main/java/org/apache/ki/mgt/CachingSecurityManager.java similarity index 100% rename from core/src/org/apache/ki/mgt/CachingSecurityManager.java rename to core/src/main/java/org/apache/ki/mgt/CachingSecurityManager.java
diff --git a/core/src/org/apache/ki/mgt/DefaultSecurityManager.java b/core/src/main/java/org/apache/ki/mgt/DefaultSecurityManager.java similarity index 100% rename from core/src/org/apache/ki/mgt/DefaultSecurityManager.java rename to core/src/main/java/org/apache/ki/mgt/DefaultSecurityManager.java
diff --git a/core/src/org/apache/ki/mgt/DefaultSubjectFactory.java b/core/src/main/java/org/apache/ki/mgt/DefaultSubjectFactory.java similarity index 100% rename from core/src/org/apache/ki/mgt/DefaultSubjectFactory.java rename to core/src/main/java/org/apache/ki/mgt/DefaultSubjectFactory.java
diff --git a/core/src/org/apache/ki/mgt/RealmSecurityManager.java b/core/src/main/java/org/apache/ki/mgt/RealmSecurityManager.java similarity index 100% rename from core/src/org/apache/ki/mgt/RealmSecurityManager.java rename to core/src/main/java/org/apache/ki/mgt/RealmSecurityManager.java
diff --git a/core/src/org/apache/ki/mgt/RememberMeManager.java b/core/src/main/java/org/apache/ki/mgt/RememberMeManager.java similarity index 100% rename from core/src/org/apache/ki/mgt/RememberMeManager.java rename to core/src/main/java/org/apache/ki/mgt/RememberMeManager.java
diff --git a/core/src/org/apache/ki/mgt/SecurityManager.java b/core/src/main/java/org/apache/ki/mgt/SecurityManager.java similarity index 100% rename from core/src/org/apache/ki/mgt/SecurityManager.java rename to core/src/main/java/org/apache/ki/mgt/SecurityManager.java
diff --git a/core/src/org/apache/ki/mgt/SecurityManagerAware.java b/core/src/main/java/org/apache/ki/mgt/SecurityManagerAware.java similarity index 100% rename from core/src/org/apache/ki/mgt/SecurityManagerAware.java rename to core/src/main/java/org/apache/ki/mgt/SecurityManagerAware.java
diff --git a/core/src/org/apache/ki/mgt/SecurityManagerFactory.java b/core/src/main/java/org/apache/ki/mgt/SecurityManagerFactory.java similarity index 100% rename from core/src/org/apache/ki/mgt/SecurityManagerFactory.java rename to core/src/main/java/org/apache/ki/mgt/SecurityManagerFactory.java
diff --git a/core/src/org/apache/ki/mgt/SessionSubjectBinder.java b/core/src/main/java/org/apache/ki/mgt/SessionSubjectBinder.java similarity index 100% rename from core/src/org/apache/ki/mgt/SessionSubjectBinder.java rename to core/src/main/java/org/apache/ki/mgt/SessionSubjectBinder.java
diff --git a/core/src/org/apache/ki/mgt/SessionsSecurityManager.java b/core/src/main/java/org/apache/ki/mgt/SessionsSecurityManager.java similarity index 100% rename from core/src/org/apache/ki/mgt/SessionsSecurityManager.java rename to core/src/main/java/org/apache/ki/mgt/SessionsSecurityManager.java
diff --git a/core/src/org/apache/ki/mgt/SubjectBinder.java b/core/src/main/java/org/apache/ki/mgt/SubjectBinder.java similarity index 100% rename from core/src/org/apache/ki/mgt/SubjectBinder.java rename to core/src/main/java/org/apache/ki/mgt/SubjectBinder.java
diff --git a/core/src/org/apache/ki/mgt/SubjectFactory.java b/core/src/main/java/org/apache/ki/mgt/SubjectFactory.java similarity index 100% rename from core/src/org/apache/ki/mgt/SubjectFactory.java rename to core/src/main/java/org/apache/ki/mgt/SubjectFactory.java
diff --git a/core/src/org/apache/ki/mgt/ThreadContextSubjectBinder.java b/core/src/main/java/org/apache/ki/mgt/ThreadContextSubjectBinder.java similarity index 100% rename from core/src/org/apache/ki/mgt/ThreadContextSubjectBinder.java rename to core/src/main/java/org/apache/ki/mgt/ThreadContextSubjectBinder.java
diff --git a/core/src/org/apache/ki/mgt/package-info.java b/core/src/main/java/org/apache/ki/mgt/package-info.java similarity index 100% rename from core/src/org/apache/ki/mgt/package-info.java rename to core/src/main/java/org/apache/ki/mgt/package-info.java
diff --git a/core/src/org/apache/ki/package-info.java b/core/src/main/java/org/apache/ki/package-info.java similarity index 100% rename from core/src/org/apache/ki/package-info.java rename to core/src/main/java/org/apache/ki/package-info.java
diff --git a/core/src/org/apache/ki/realm/AuthenticatingRealm.java b/core/src/main/java/org/apache/ki/realm/AuthenticatingRealm.java similarity index 100% rename from core/src/org/apache/ki/realm/AuthenticatingRealm.java rename to core/src/main/java/org/apache/ki/realm/AuthenticatingRealm.java
diff --git a/core/src/org/apache/ki/realm/AuthorizingRealm.java b/core/src/main/java/org/apache/ki/realm/AuthorizingRealm.java similarity index 100% rename from core/src/org/apache/ki/realm/AuthorizingRealm.java rename to core/src/main/java/org/apache/ki/realm/AuthorizingRealm.java
diff --git a/core/src/org/apache/ki/realm/CachingRealm.java b/core/src/main/java/org/apache/ki/realm/CachingRealm.java similarity index 100% rename from core/src/org/apache/ki/realm/CachingRealm.java rename to core/src/main/java/org/apache/ki/realm/CachingRealm.java
diff --git a/core/src/org/apache/ki/realm/Realm.java b/core/src/main/java/org/apache/ki/realm/Realm.java similarity index 100% rename from core/src/org/apache/ki/realm/Realm.java rename to core/src/main/java/org/apache/ki/realm/Realm.java
diff --git a/core/src/org/apache/ki/realm/RealmFactory.java b/core/src/main/java/org/apache/ki/realm/RealmFactory.java similarity index 100% rename from core/src/org/apache/ki/realm/RealmFactory.java rename to core/src/main/java/org/apache/ki/realm/RealmFactory.java
diff --git a/core/src/org/apache/ki/realm/SimpleAccountRealm.java b/core/src/main/java/org/apache/ki/realm/SimpleAccountRealm.java similarity index 100% rename from core/src/org/apache/ki/realm/SimpleAccountRealm.java rename to core/src/main/java/org/apache/ki/realm/SimpleAccountRealm.java
diff --git a/core/src/org/apache/ki/realm/activedirectory/ActiveDirectoryRealm.java b/core/src/main/java/org/apache/ki/realm/activedirectory/ActiveDirectoryRealm.java similarity index 100% rename from core/src/org/apache/ki/realm/activedirectory/ActiveDirectoryRealm.java rename to core/src/main/java/org/apache/ki/realm/activedirectory/ActiveDirectoryRealm.java
diff --git a/core/src/org/apache/ki/realm/activedirectory/package-info.java b/core/src/main/java/org/apache/ki/realm/activedirectory/package-info.java similarity index 100% rename from core/src/org/apache/ki/realm/activedirectory/package-info.java rename to core/src/main/java/org/apache/ki/realm/activedirectory/package-info.java
diff --git a/core/src/org/apache/ki/realm/jdbc/JdbcRealm.java b/core/src/main/java/org/apache/ki/realm/jdbc/JdbcRealm.java similarity index 100% rename from core/src/org/apache/ki/realm/jdbc/JdbcRealm.java rename to core/src/main/java/org/apache/ki/realm/jdbc/JdbcRealm.java
diff --git a/core/src/org/apache/ki/realm/jdbc/package-info.java b/core/src/main/java/org/apache/ki/realm/jdbc/package-info.java similarity index 100% rename from core/src/org/apache/ki/realm/jdbc/package-info.java rename to core/src/main/java/org/apache/ki/realm/jdbc/package-info.java
diff --git a/core/src/org/apache/ki/realm/jndi/JndiRealmFactory.java b/core/src/main/java/org/apache/ki/realm/jndi/JndiRealmFactory.java similarity index 100% rename from core/src/org/apache/ki/realm/jndi/JndiRealmFactory.java rename to core/src/main/java/org/apache/ki/realm/jndi/JndiRealmFactory.java
diff --git a/core/src/org/apache/ki/realm/jndi/package-info.java b/core/src/main/java/org/apache/ki/realm/jndi/package-info.java similarity index 100% rename from core/src/org/apache/ki/realm/jndi/package-info.java rename to core/src/main/java/org/apache/ki/realm/jndi/package-info.java
diff --git a/core/src/org/apache/ki/realm/ldap/AbstractLdapRealm.java b/core/src/main/java/org/apache/ki/realm/ldap/AbstractLdapRealm.java similarity index 100% rename from core/src/org/apache/ki/realm/ldap/AbstractLdapRealm.java rename to core/src/main/java/org/apache/ki/realm/ldap/AbstractLdapRealm.java
diff --git a/core/src/org/apache/ki/realm/ldap/DefaultLdapContextFactory.java b/core/src/main/java/org/apache/ki/realm/ldap/DefaultLdapContextFactory.java similarity index 100% rename from core/src/org/apache/ki/realm/ldap/DefaultLdapContextFactory.java rename to core/src/main/java/org/apache/ki/realm/ldap/DefaultLdapContextFactory.java
diff --git a/core/src/org/apache/ki/realm/ldap/LdapContextFactory.java b/core/src/main/java/org/apache/ki/realm/ldap/LdapContextFactory.java similarity index 100% rename from core/src/org/apache/ki/realm/ldap/LdapContextFactory.java rename to core/src/main/java/org/apache/ki/realm/ldap/LdapContextFactory.java
diff --git a/core/src/org/apache/ki/realm/ldap/LdapUtils.java b/core/src/main/java/org/apache/ki/realm/ldap/LdapUtils.java similarity index 100% rename from core/src/org/apache/ki/realm/ldap/LdapUtils.java rename to core/src/main/java/org/apache/ki/realm/ldap/LdapUtils.java
diff --git a/core/src/org/apache/ki/realm/ldap/package-info.java b/core/src/main/java/org/apache/ki/realm/ldap/package-info.java similarity index 100% rename from core/src/org/apache/ki/realm/ldap/package-info.java rename to core/src/main/java/org/apache/ki/realm/ldap/package-info.java
diff --git a/core/src/org/apache/ki/realm/package-info.java b/core/src/main/java/org/apache/ki/realm/package-info.java similarity index 100% rename from core/src/org/apache/ki/realm/package-info.java rename to core/src/main/java/org/apache/ki/realm/package-info.java
diff --git a/core/src/org/apache/ki/realm/text/PropertiesRealm.java b/core/src/main/java/org/apache/ki/realm/text/PropertiesRealm.java similarity index 100% rename from core/src/org/apache/ki/realm/text/PropertiesRealm.java rename to core/src/main/java/org/apache/ki/realm/text/PropertiesRealm.java
diff --git a/core/src/org/apache/ki/realm/text/TextConfigurationRealm.java b/core/src/main/java/org/apache/ki/realm/text/TextConfigurationRealm.java similarity index 100% rename from core/src/org/apache/ki/realm/text/TextConfigurationRealm.java rename to core/src/main/java/org/apache/ki/realm/text/TextConfigurationRealm.java
diff --git a/core/src/org/apache/ki/realm/text/default-ki-users.properties b/core/src/main/java/org/apache/ki/realm/text/default-ki-users.properties similarity index 100% rename from core/src/org/apache/ki/realm/text/default-ki-users.properties rename to core/src/main/java/org/apache/ki/realm/text/default-ki-users.properties
diff --git a/core/src/org/apache/ki/realm/text/package-info.java b/core/src/main/java/org/apache/ki/realm/text/package-info.java similarity index 100% rename from core/src/org/apache/ki/realm/text/package-info.java rename to core/src/main/java/org/apache/ki/realm/text/package-info.java
diff --git a/core/src/org/apache/ki/session/ExpiredSessionException.java b/core/src/main/java/org/apache/ki/session/ExpiredSessionException.java similarity index 100% rename from core/src/org/apache/ki/session/ExpiredSessionException.java rename to core/src/main/java/org/apache/ki/session/ExpiredSessionException.java
diff --git a/core/src/org/apache/ki/session/InvalidSessionException.java b/core/src/main/java/org/apache/ki/session/InvalidSessionException.java similarity index 100% rename from core/src/org/apache/ki/session/InvalidSessionException.java rename to core/src/main/java/org/apache/ki/session/InvalidSessionException.java
diff --git a/core/src/org/apache/ki/session/ProxiedSession.java b/core/src/main/java/org/apache/ki/session/ProxiedSession.java similarity index 100% rename from core/src/org/apache/ki/session/ProxiedSession.java rename to core/src/main/java/org/apache/ki/session/ProxiedSession.java
diff --git a/core/src/org/apache/ki/session/ReplacedSessionException.java b/core/src/main/java/org/apache/ki/session/ReplacedSessionException.java similarity index 100% rename from core/src/org/apache/ki/session/ReplacedSessionException.java rename to core/src/main/java/org/apache/ki/session/ReplacedSessionException.java
diff --git a/core/src/org/apache/ki/session/Session.java b/core/src/main/java/org/apache/ki/session/Session.java similarity index 100% rename from core/src/org/apache/ki/session/Session.java rename to core/src/main/java/org/apache/ki/session/Session.java
diff --git a/core/src/org/apache/ki/session/SessionException.java b/core/src/main/java/org/apache/ki/session/SessionException.java similarity index 100% rename from core/src/org/apache/ki/session/SessionException.java rename to core/src/main/java/org/apache/ki/session/SessionException.java
diff --git a/core/src/org/apache/ki/session/SessionListener.java b/core/src/main/java/org/apache/ki/session/SessionListener.java similarity index 100% rename from core/src/org/apache/ki/session/SessionListener.java rename to core/src/main/java/org/apache/ki/session/SessionListener.java
diff --git a/core/src/org/apache/ki/session/SessionListenerRegistrar.java b/core/src/main/java/org/apache/ki/session/SessionListenerRegistrar.java similarity index 100% rename from core/src/org/apache/ki/session/SessionListenerRegistrar.java rename to core/src/main/java/org/apache/ki/session/SessionListenerRegistrar.java
diff --git a/core/src/org/apache/ki/session/StoppedSessionException.java b/core/src/main/java/org/apache/ki/session/StoppedSessionException.java similarity index 100% rename from core/src/org/apache/ki/session/StoppedSessionException.java rename to core/src/main/java/org/apache/ki/session/StoppedSessionException.java
diff --git a/core/src/org/apache/ki/session/UnknownSessionException.java b/core/src/main/java/org/apache/ki/session/UnknownSessionException.java similarity index 100% rename from core/src/org/apache/ki/session/UnknownSessionException.java rename to core/src/main/java/org/apache/ki/session/UnknownSessionException.java
diff --git a/core/src/org/apache/ki/session/mgt/AbstractSessionManager.java b/core/src/main/java/org/apache/ki/session/mgt/AbstractSessionManager.java similarity index 100% rename from core/src/org/apache/ki/session/mgt/AbstractSessionManager.java rename to core/src/main/java/org/apache/ki/session/mgt/AbstractSessionManager.java
diff --git a/core/src/org/apache/ki/session/mgt/AbstractValidatingSessionManager.java b/core/src/main/java/org/apache/ki/session/mgt/AbstractValidatingSessionManager.java similarity index 100% rename from core/src/org/apache/ki/session/mgt/AbstractValidatingSessionManager.java rename to core/src/main/java/org/apache/ki/session/mgt/AbstractValidatingSessionManager.java
diff --git a/core/src/org/apache/ki/session/mgt/DefaultSessionManager.java b/core/src/main/java/org/apache/ki/session/mgt/DefaultSessionManager.java similarity index 100% rename from core/src/org/apache/ki/session/mgt/DefaultSessionManager.java rename to core/src/main/java/org/apache/ki/session/mgt/DefaultSessionManager.java
diff --git a/core/src/org/apache/ki/session/mgt/DelegatingSession.java b/core/src/main/java/org/apache/ki/session/mgt/DelegatingSession.java similarity index 100% rename from core/src/org/apache/ki/session/mgt/DelegatingSession.java rename to core/src/main/java/org/apache/ki/session/mgt/DelegatingSession.java
diff --git a/core/src/org/apache/ki/session/mgt/ExecutorServiceSessionValidationScheduler.java b/core/src/main/java/org/apache/ki/session/mgt/ExecutorServiceSessionValidationScheduler.java similarity index 100% rename from core/src/org/apache/ki/session/mgt/ExecutorServiceSessionValidationScheduler.java rename to core/src/main/java/org/apache/ki/session/mgt/ExecutorServiceSessionValidationScheduler.java
diff --git a/core/src/org/apache/ki/session/mgt/ImmutableProxiedSession.java b/core/src/main/java/org/apache/ki/session/mgt/ImmutableProxiedSession.java similarity index 100% rename from core/src/org/apache/ki/session/mgt/ImmutableProxiedSession.java rename to core/src/main/java/org/apache/ki/session/mgt/ImmutableProxiedSession.java
diff --git a/core/src/org/apache/ki/session/mgt/SessionManager.java b/core/src/main/java/org/apache/ki/session/mgt/SessionManager.java similarity index 100% rename from core/src/org/apache/ki/session/mgt/SessionManager.java rename to core/src/main/java/org/apache/ki/session/mgt/SessionManager.java
diff --git a/core/src/org/apache/ki/session/mgt/SessionValidationScheduler.java b/core/src/main/java/org/apache/ki/session/mgt/SessionValidationScheduler.java similarity index 100% rename from core/src/org/apache/ki/session/mgt/SessionValidationScheduler.java rename to core/src/main/java/org/apache/ki/session/mgt/SessionValidationScheduler.java
diff --git a/core/src/org/apache/ki/session/mgt/SimpleSession.java b/core/src/main/java/org/apache/ki/session/mgt/SimpleSession.java similarity index 100% rename from core/src/org/apache/ki/session/mgt/SimpleSession.java rename to core/src/main/java/org/apache/ki/session/mgt/SimpleSession.java
diff --git a/core/src/org/apache/ki/session/mgt/ValidatingSession.java b/core/src/main/java/org/apache/ki/session/mgt/ValidatingSession.java similarity index 100% rename from core/src/org/apache/ki/session/mgt/ValidatingSession.java rename to core/src/main/java/org/apache/ki/session/mgt/ValidatingSession.java
diff --git a/core/src/org/apache/ki/session/mgt/ValidatingSessionManager.java b/core/src/main/java/org/apache/ki/session/mgt/ValidatingSessionManager.java similarity index 100% rename from core/src/org/apache/ki/session/mgt/ValidatingSessionManager.java rename to core/src/main/java/org/apache/ki/session/mgt/ValidatingSessionManager.java
diff --git a/core/src/org/apache/ki/session/mgt/eis/CachingSessionDAO.java b/core/src/main/java/org/apache/ki/session/mgt/eis/CachingSessionDAO.java similarity index 100% rename from core/src/org/apache/ki/session/mgt/eis/CachingSessionDAO.java rename to core/src/main/java/org/apache/ki/session/mgt/eis/CachingSessionDAO.java
diff --git a/core/src/org/apache/ki/session/mgt/eis/MemorySessionDAO.java b/core/src/main/java/org/apache/ki/session/mgt/eis/MemorySessionDAO.java similarity index 100% rename from core/src/org/apache/ki/session/mgt/eis/MemorySessionDAO.java rename to core/src/main/java/org/apache/ki/session/mgt/eis/MemorySessionDAO.java
diff --git a/core/src/org/apache/ki/session/mgt/eis/SessionDAO.java b/core/src/main/java/org/apache/ki/session/mgt/eis/SessionDAO.java similarity index 100% rename from core/src/org/apache/ki/session/mgt/eis/SessionDAO.java rename to core/src/main/java/org/apache/ki/session/mgt/eis/SessionDAO.java
diff --git a/core/src/org/apache/ki/session/mgt/eis/package-info.java b/core/src/main/java/org/apache/ki/session/mgt/eis/package-info.java similarity index 100% rename from core/src/org/apache/ki/session/mgt/eis/package-info.java rename to core/src/main/java/org/apache/ki/session/mgt/eis/package-info.java
diff --git a/core/src/org/apache/ki/session/mgt/package-info.java b/core/src/main/java/org/apache/ki/session/mgt/package-info.java similarity index 100% rename from core/src/org/apache/ki/session/mgt/package-info.java rename to core/src/main/java/org/apache/ki/session/mgt/package-info.java
diff --git a/core/src/org/apache/ki/session/package-info.java b/core/src/main/java/org/apache/ki/session/package-info.java similarity index 100% rename from core/src/org/apache/ki/session/package-info.java rename to core/src/main/java/org/apache/ki/session/package-info.java
diff --git a/core/src/org/apache/ki/subject/DelegatingSubject.java b/core/src/main/java/org/apache/ki/subject/DelegatingSubject.java similarity index 100% rename from core/src/org/apache/ki/subject/DelegatingSubject.java rename to core/src/main/java/org/apache/ki/subject/DelegatingSubject.java
diff --git a/core/src/org/apache/ki/subject/InvalidSubjectException.java b/core/src/main/java/org/apache/ki/subject/InvalidSubjectException.java similarity index 100% rename from core/src/org/apache/ki/subject/InvalidSubjectException.java rename to core/src/main/java/org/apache/ki/subject/InvalidSubjectException.java
diff --git a/core/src/org/apache/ki/subject/MutablePrincipalCollection.java b/core/src/main/java/org/apache/ki/subject/MutablePrincipalCollection.java similarity index 100% rename from core/src/org/apache/ki/subject/MutablePrincipalCollection.java rename to core/src/main/java/org/apache/ki/subject/MutablePrincipalCollection.java
diff --git a/core/src/org/apache/ki/subject/PrincipalCollection.java b/core/src/main/java/org/apache/ki/subject/PrincipalCollection.java similarity index 100% rename from core/src/org/apache/ki/subject/PrincipalCollection.java rename to core/src/main/java/org/apache/ki/subject/PrincipalCollection.java
diff --git a/core/src/org/apache/ki/subject/SimplePrincipalCollection.java b/core/src/main/java/org/apache/ki/subject/SimplePrincipalCollection.java similarity index 100% rename from core/src/org/apache/ki/subject/SimplePrincipalCollection.java rename to core/src/main/java/org/apache/ki/subject/SimplePrincipalCollection.java
diff --git a/core/src/org/apache/ki/subject/Subject.java b/core/src/main/java/org/apache/ki/subject/Subject.java similarity index 100% rename from core/src/org/apache/ki/subject/Subject.java rename to core/src/main/java/org/apache/ki/subject/Subject.java
diff --git a/core/src/org/apache/ki/subject/SubjectException.java b/core/src/main/java/org/apache/ki/subject/SubjectException.java similarity index 100% rename from core/src/org/apache/ki/subject/SubjectException.java rename to core/src/main/java/org/apache/ki/subject/SubjectException.java
diff --git a/core/src/org/apache/ki/subject/package-info.java b/core/src/main/java/org/apache/ki/subject/package-info.java similarity index 100% rename from core/src/org/apache/ki/subject/package-info.java rename to core/src/main/java/org/apache/ki/subject/package-info.java
diff --git a/core/src/org/apache/ki/util/AntPathMatcher.java b/core/src/main/java/org/apache/ki/util/AntPathMatcher.java similarity index 100% rename from core/src/org/apache/ki/util/AntPathMatcher.java rename to core/src/main/java/org/apache/ki/util/AntPathMatcher.java
diff --git a/core/src/org/apache/ki/util/ClassUtils.java b/core/src/main/java/org/apache/ki/util/ClassUtils.java similarity index 100% rename from core/src/org/apache/ki/util/ClassUtils.java rename to core/src/main/java/org/apache/ki/util/ClassUtils.java
diff --git a/core/src/org/apache/ki/util/CollectionUtils.java b/core/src/main/java/org/apache/ki/util/CollectionUtils.java similarity index 100% rename from core/src/org/apache/ki/util/CollectionUtils.java rename to core/src/main/java/org/apache/ki/util/CollectionUtils.java
diff --git a/core/src/org/apache/ki/util/Destroyable.java b/core/src/main/java/org/apache/ki/util/Destroyable.java similarity index 100% rename from core/src/org/apache/ki/util/Destroyable.java rename to core/src/main/java/org/apache/ki/util/Destroyable.java
diff --git a/core/src/org/apache/ki/util/Initializable.java b/core/src/main/java/org/apache/ki/util/Initializable.java similarity index 100% rename from core/src/org/apache/ki/util/Initializable.java rename to core/src/main/java/org/apache/ki/util/Initializable.java
diff --git a/core/src/org/apache/ki/util/InstantiationException.java b/core/src/main/java/org/apache/ki/util/InstantiationException.java similarity index 100% rename from core/src/org/apache/ki/util/InstantiationException.java rename to core/src/main/java/org/apache/ki/util/InstantiationException.java
diff --git a/core/src/org/apache/ki/util/JavaEnvironment.java b/core/src/main/java/org/apache/ki/util/JavaEnvironment.java similarity index 100% rename from core/src/org/apache/ki/util/JavaEnvironment.java rename to core/src/main/java/org/apache/ki/util/JavaEnvironment.java
diff --git a/core/src/org/apache/ki/util/JdbcUtils.java b/core/src/main/java/org/apache/ki/util/JdbcUtils.java similarity index 100% rename from core/src/org/apache/ki/util/JdbcUtils.java rename to core/src/main/java/org/apache/ki/util/JdbcUtils.java
diff --git a/core/src/org/apache/ki/util/LifecycleUtils.java b/core/src/main/java/org/apache/ki/util/LifecycleUtils.java similarity index 100% rename from core/src/org/apache/ki/util/LifecycleUtils.java rename to core/src/main/java/org/apache/ki/util/LifecycleUtils.java
diff --git a/core/src/org/apache/ki/util/Nameable.java b/core/src/main/java/org/apache/ki/util/Nameable.java similarity index 100% rename from core/src/org/apache/ki/util/Nameable.java rename to core/src/main/java/org/apache/ki/util/Nameable.java
diff --git a/core/src/org/apache/ki/util/PatternMatcher.java b/core/src/main/java/org/apache/ki/util/PatternMatcher.java similarity index 100% rename from core/src/org/apache/ki/util/PatternMatcher.java rename to core/src/main/java/org/apache/ki/util/PatternMatcher.java
diff --git a/core/src/org/apache/ki/util/PermissionUtils.java b/core/src/main/java/org/apache/ki/util/PermissionUtils.java similarity index 100% rename from core/src/org/apache/ki/util/PermissionUtils.java rename to core/src/main/java/org/apache/ki/util/PermissionUtils.java
diff --git a/core/src/org/apache/ki/util/SoftHashMap.java b/core/src/main/java/org/apache/ki/util/SoftHashMap.java similarity index 100% rename from core/src/org/apache/ki/util/SoftHashMap.java rename to core/src/main/java/org/apache/ki/util/SoftHashMap.java
diff --git a/core/src/org/apache/ki/util/StringUtils.java b/core/src/main/java/org/apache/ki/util/StringUtils.java similarity index 100% rename from core/src/org/apache/ki/util/StringUtils.java rename to core/src/main/java/org/apache/ki/util/StringUtils.java
diff --git a/core/src/org/apache/ki/util/ThreadContext.java b/core/src/main/java/org/apache/ki/util/ThreadContext.java similarity index 100% rename from core/src/org/apache/ki/util/ThreadContext.java rename to core/src/main/java/org/apache/ki/util/ThreadContext.java
diff --git a/core/src/org/apache/ki/util/UnavailableConstructorException.java b/core/src/main/java/org/apache/ki/util/UnavailableConstructorException.java similarity index 100% rename from core/src/org/apache/ki/util/UnavailableConstructorException.java rename to core/src/main/java/org/apache/ki/util/UnavailableConstructorException.java
diff --git a/core/src/org/apache/ki/util/UnknownClassException.java b/core/src/main/java/org/apache/ki/util/UnknownClassException.java similarity index 100% rename from core/src/org/apache/ki/util/UnknownClassException.java rename to core/src/main/java/org/apache/ki/util/UnknownClassException.java
diff --git a/core/src/org/apache/ki/util/package-info.java b/core/src/main/java/org/apache/ki/util/package-info.java similarity index 100% rename from core/src/org/apache/ki/util/package-info.java rename to core/src/main/java/org/apache/ki/util/package-info.java
diff --git a/core/test/org/apache/ki/AtUnitTestBase.java b/core/src/test/java/org/apache/ki/AtUnitTestBase.java similarity index 100% rename from core/test/org/apache/ki/AtUnitTestBase.java rename to core/src/test/java/org/apache/ki/AtUnitTestBase.java
diff --git a/core/test/org/apache/ki/ExceptionTest.java b/core/src/test/java/org/apache/ki/ExceptionTest.java similarity index 100% rename from core/test/org/apache/ki/ExceptionTest.java rename to core/src/test/java/org/apache/ki/ExceptionTest.java
diff --git a/core/test/org/apache/ki/authc/ConcurrentAccessExceptionTest.java b/core/src/test/java/org/apache/ki/authc/ConcurrentAccessExceptionTest.java similarity index 100% rename from core/test/org/apache/ki/authc/ConcurrentAccessExceptionTest.java rename to core/src/test/java/org/apache/ki/authc/ConcurrentAccessExceptionTest.java
diff --git a/core/test/org/apache/ki/authc/ExcessiveAttemptsExceptionTest.java b/core/src/test/java/org/apache/ki/authc/ExcessiveAttemptsExceptionTest.java similarity index 100% rename from core/test/org/apache/ki/authc/ExcessiveAttemptsExceptionTest.java rename to core/src/test/java/org/apache/ki/authc/ExcessiveAttemptsExceptionTest.java
diff --git a/core/test/org/apache/ki/authc/ExpiredCredentialsExceptionTest.java b/core/src/test/java/org/apache/ki/authc/ExpiredCredentialsExceptionTest.java similarity index 100% rename from core/test/org/apache/ki/authc/ExpiredCredentialsExceptionTest.java rename to core/src/test/java/org/apache/ki/authc/ExpiredCredentialsExceptionTest.java
diff --git a/core/test/org/apache/ki/authc/IncorrectCredentialsExceptionTest.java b/core/src/test/java/org/apache/ki/authc/IncorrectCredentialsExceptionTest.java similarity index 100% rename from core/test/org/apache/ki/authc/IncorrectCredentialsExceptionTest.java rename to core/src/test/java/org/apache/ki/authc/IncorrectCredentialsExceptionTest.java
diff --git a/core/test/org/apache/ki/authc/LockedAccountExceptionTest.java b/core/src/test/java/org/apache/ki/authc/LockedAccountExceptionTest.java similarity index 100% rename from core/test/org/apache/ki/authc/LockedAccountExceptionTest.java rename to core/src/test/java/org/apache/ki/authc/LockedAccountExceptionTest.java
diff --git a/core/test/org/apache/ki/authc/SimpleAuthenticationInfoTest.java b/core/src/test/java/org/apache/ki/authc/SimpleAuthenticationInfoTest.java similarity index 100% rename from core/test/org/apache/ki/authc/SimpleAuthenticationInfoTest.java rename to core/src/test/java/org/apache/ki/authc/SimpleAuthenticationInfoTest.java
diff --git a/core/test/org/apache/ki/authc/UnknownAccountExceptionTest.java b/core/src/test/java/org/apache/ki/authc/UnknownAccountExceptionTest.java similarity index 100% rename from core/test/org/apache/ki/authc/UnknownAccountExceptionTest.java rename to core/src/test/java/org/apache/ki/authc/UnknownAccountExceptionTest.java
diff --git a/core/test/org/apache/ki/authc/credential/AllowAllCredentialsMatcherTest.java b/core/src/test/java/org/apache/ki/authc/credential/AllowAllCredentialsMatcherTest.java similarity index 100% rename from core/test/org/apache/ki/authc/credential/AllowAllCredentialsMatcherTest.java rename to core/src/test/java/org/apache/ki/authc/credential/AllowAllCredentialsMatcherTest.java
diff --git a/core/test/org/apache/ki/authc/credential/HashedCredentialsMatcherTest.java b/core/src/test/java/org/apache/ki/authc/credential/HashedCredentialsMatcherTest.java similarity index 100% rename from core/test/org/apache/ki/authc/credential/HashedCredentialsMatcherTest.java rename to core/src/test/java/org/apache/ki/authc/credential/HashedCredentialsMatcherTest.java
diff --git a/core/test/org/apache/ki/authc/credential/Md2CredentialsMatcherTest.java b/core/src/test/java/org/apache/ki/authc/credential/Md2CredentialsMatcherTest.java similarity index 100% rename from core/test/org/apache/ki/authc/credential/Md2CredentialsMatcherTest.java rename to core/src/test/java/org/apache/ki/authc/credential/Md2CredentialsMatcherTest.java
diff --git a/core/test/org/apache/ki/authc/credential/Md5CredentialsMatcherTest.java b/core/src/test/java/org/apache/ki/authc/credential/Md5CredentialsMatcherTest.java similarity index 100% rename from core/test/org/apache/ki/authc/credential/Md5CredentialsMatcherTest.java rename to core/src/test/java/org/apache/ki/authc/credential/Md5CredentialsMatcherTest.java
diff --git a/core/test/org/apache/ki/authc/credential/Sha1CredentialsMatcherTest.java b/core/src/test/java/org/apache/ki/authc/credential/Sha1CredentialsMatcherTest.java similarity index 100% rename from core/test/org/apache/ki/authc/credential/Sha1CredentialsMatcherTest.java rename to core/src/test/java/org/apache/ki/authc/credential/Sha1CredentialsMatcherTest.java
diff --git a/core/test/org/apache/ki/authc/credential/Sha256CredentialsMatcherTest.java b/core/src/test/java/org/apache/ki/authc/credential/Sha256CredentialsMatcherTest.java similarity index 100% rename from core/test/org/apache/ki/authc/credential/Sha256CredentialsMatcherTest.java rename to core/src/test/java/org/apache/ki/authc/credential/Sha256CredentialsMatcherTest.java
diff --git a/core/test/org/apache/ki/authc/credential/Sha384CredentialsMatcherTest.java b/core/src/test/java/org/apache/ki/authc/credential/Sha384CredentialsMatcherTest.java similarity index 100% rename from core/test/org/apache/ki/authc/credential/Sha384CredentialsMatcherTest.java rename to core/src/test/java/org/apache/ki/authc/credential/Sha384CredentialsMatcherTest.java
diff --git a/core/test/org/apache/ki/authc/credential/Sha512CredentialsMatcherTest.java b/core/src/test/java/org/apache/ki/authc/credential/Sha512CredentialsMatcherTest.java similarity index 100% rename from core/test/org/apache/ki/authc/credential/Sha512CredentialsMatcherTest.java rename to core/src/test/java/org/apache/ki/authc/credential/Sha512CredentialsMatcherTest.java
diff --git a/core/test/org/apache/ki/authc/pam/AllSuccessfulStrategyTest.java b/core/src/test/java/org/apache/ki/authc/pam/AllSuccessfulStrategyTest.java similarity index 100% rename from core/test/org/apache/ki/authc/pam/AllSuccessfulStrategyTest.java rename to core/src/test/java/org/apache/ki/authc/pam/AllSuccessfulStrategyTest.java
diff --git a/core/test/org/apache/ki/authc/support/AbstractAuthenticatorTest.java b/core/src/test/java/org/apache/ki/authc/support/AbstractAuthenticatorTest.java similarity index 100% rename from core/test/org/apache/ki/authc/support/AbstractAuthenticatorTest.java rename to core/src/test/java/org/apache/ki/authc/support/AbstractAuthenticatorTest.java
diff --git a/core/test/org/apache/ki/authz/AuthorizationExceptionTest.java b/core/src/test/java/org/apache/ki/authz/AuthorizationExceptionTest.java similarity index 100% rename from core/test/org/apache/ki/authz/AuthorizationExceptionTest.java rename to core/src/test/java/org/apache/ki/authz/AuthorizationExceptionTest.java
diff --git a/core/test/org/apache/ki/authz/HostUnauthorizedExceptionTest.java b/core/src/test/java/org/apache/ki/authz/HostUnauthorizedExceptionTest.java similarity index 100% rename from core/test/org/apache/ki/authz/HostUnauthorizedExceptionTest.java rename to core/src/test/java/org/apache/ki/authz/HostUnauthorizedExceptionTest.java
diff --git a/core/test/org/apache/ki/authz/UnauthenticatedExceptionTest.java b/core/src/test/java/org/apache/ki/authz/UnauthenticatedExceptionTest.java similarity index 100% rename from core/test/org/apache/ki/authz/UnauthenticatedExceptionTest.java rename to core/src/test/java/org/apache/ki/authz/UnauthenticatedExceptionTest.java
diff --git a/core/test/org/apache/ki/authz/UnauthorizedExceptionTest.java b/core/src/test/java/org/apache/ki/authz/UnauthorizedExceptionTest.java similarity index 100% rename from core/test/org/apache/ki/authz/UnauthorizedExceptionTest.java rename to core/src/test/java/org/apache/ki/authz/UnauthorizedExceptionTest.java
diff --git a/core/test/org/apache/ki/authz/permission/AllPermissionTest.java b/core/src/test/java/org/apache/ki/authz/permission/AllPermissionTest.java similarity index 100% rename from core/test/org/apache/ki/authz/permission/AllPermissionTest.java rename to core/src/test/java/org/apache/ki/authz/permission/AllPermissionTest.java
diff --git a/core/test/org/apache/ki/authz/permission/WildcardPermissionTest.java b/core/src/test/java/org/apache/ki/authz/permission/WildcardPermissionTest.java similarity index 100% rename from core/test/org/apache/ki/authz/permission/WildcardPermissionTest.java rename to core/src/test/java/org/apache/ki/authz/permission/WildcardPermissionTest.java
diff --git a/core/test/org/apache/ki/config/CompositeBean.java b/core/src/test/java/org/apache/ki/config/CompositeBean.java similarity index 100% rename from core/test/org/apache/ki/config/CompositeBean.java rename to core/src/test/java/org/apache/ki/config/CompositeBean.java
diff --git a/core/test/org/apache/ki/config/ReflectionBuilderTest.java b/core/src/test/java/org/apache/ki/config/ReflectionBuilderTest.java similarity index 100% rename from core/test/org/apache/ki/config/ReflectionBuilderTest.java rename to core/src/test/java/org/apache/ki/config/ReflectionBuilderTest.java
diff --git a/core/test/org/apache/ki/config/SimpleBean.java b/core/src/test/java/org/apache/ki/config/SimpleBean.java similarity index 100% rename from core/test/org/apache/ki/config/SimpleBean.java rename to core/src/test/java/org/apache/ki/config/SimpleBean.java
diff --git a/core/test/org/apache/ki/io/ResourceExceptionTest.java b/core/src/test/java/org/apache/ki/io/ResourceExceptionTest.java similarity index 100% rename from core/test/org/apache/ki/io/ResourceExceptionTest.java rename to core/src/test/java/org/apache/ki/io/ResourceExceptionTest.java
diff --git a/core/test/org/apache/ki/io/SerializationExceptionTest.java b/core/src/test/java/org/apache/ki/io/SerializationExceptionTest.java similarity index 100% rename from core/test/org/apache/ki/io/SerializationExceptionTest.java rename to core/src/test/java/org/apache/ki/io/SerializationExceptionTest.java
diff --git a/core/test/org/apache/ki/mgt/DefaultSecurityManagerTest.java b/core/src/test/java/org/apache/ki/mgt/DefaultSecurityManagerTest.java similarity index 100% rename from core/test/org/apache/ki/mgt/DefaultSecurityManagerTest.java rename to core/src/test/java/org/apache/ki/mgt/DefaultSecurityManagerTest.java
diff --git a/core/test/org/apache/ki/mgt/VMSingletonDefaultSecurityManagerTest.java b/core/src/test/java/org/apache/ki/mgt/VMSingletonDefaultSecurityManagerTest.java similarity index 100% rename from core/test/org/apache/ki/mgt/VMSingletonDefaultSecurityManagerTest.java rename to core/src/test/java/org/apache/ki/mgt/VMSingletonDefaultSecurityManagerTest.java
diff --git a/core/test/org/apache/ki/realm/AuthorizingRealmTest.java b/core/src/test/java/org/apache/ki/realm/AuthorizingRealmTest.java similarity index 100% rename from core/test/org/apache/ki/realm/AuthorizingRealmTest.java rename to core/src/test/java/org/apache/ki/realm/AuthorizingRealmTest.java
diff --git a/core/test/org/apache/ki/realm/UserIdPrincipal.java b/core/src/test/java/org/apache/ki/realm/UserIdPrincipal.java similarity index 100% rename from core/test/org/apache/ki/realm/UserIdPrincipal.java rename to core/src/test/java/org/apache/ki/realm/UserIdPrincipal.java
diff --git a/core/test/org/apache/ki/realm/UsernamePrincipal.java b/core/src/test/java/org/apache/ki/realm/UsernamePrincipal.java similarity index 100% rename from core/test/org/apache/ki/realm/UsernamePrincipal.java rename to core/src/test/java/org/apache/ki/realm/UsernamePrincipal.java
diff --git a/core/test/org/apache/ki/realm/activedirectory/ActiveDirectoryRealmTest.java b/core/src/test/java/org/apache/ki/realm/activedirectory/ActiveDirectoryRealmTest.java similarity index 100% rename from core/test/org/apache/ki/realm/activedirectory/ActiveDirectoryRealmTest.java rename to core/src/test/java/org/apache/ki/realm/activedirectory/ActiveDirectoryRealmTest.java
diff --git a/core/test/org/apache/ki/subject/DelegatingSubjectTest.java b/core/src/test/java/org/apache/ki/subject/DelegatingSubjectTest.java similarity index 100% rename from core/test/org/apache/ki/subject/DelegatingSubjectTest.java rename to core/src/test/java/org/apache/ki/subject/DelegatingSubjectTest.java
diff --git a/core/test/org/apache/ki/util/StringUtilsTest.java b/core/src/test/java/org/apache/ki/util/StringUtilsTest.java similarity index 100% rename from core/test/org/apache/ki/util/StringUtilsTest.java rename to core/src/test/java/org/apache/ki/util/StringUtilsTest.java
diff --git a/core/test/log4j.properties b/core/src/test/resources/log4j.properties similarity index 100% rename from core/test/log4j.properties rename to core/src/test/resources/log4j.properties