diff --git a/.classpath b/.classpath deleted file mode 100644 index b75439e9..00000000 --- a/.classpath +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/README.md b/README.md index 43eb77a8..0e692dae 100644 --- a/README.md +++ b/README.md @@ -301,7 +301,7 @@ Omit the stop key to have jetty generate one for you. * The master branch is the stable branch. Releases are made from the develop branch to the master branch. * Update the version as per the semantic version rules in - `src/us/kbase/auth2/service/common/ServiceCommon.java`. + `src/main/java/us/kbase/auth2/Version.java`. * Tag the version in git and github. ### Running tests diff --git a/build.gradle b/build.gradle index 6c7fd7a4..b03a2b6d 100644 --- a/build.gradle +++ b/build.gradle @@ -23,7 +23,7 @@ def TEMPLATE_LIST_FILE_NAME = "templates.manifest" task buildGitCommitFile { doLast { def commitId = grgit.head().id - // is there a varible for builddir/classe/java/main? + // is there a variable for builddir/classe/java/main? file("$buildDir/classes/java/main/us/kbase/auth2/gitcommit").text = commitId } } @@ -69,27 +69,10 @@ jacocoTestReport { } } -// TODO NOW run tests from Eclipse w/o specifying classpath manually - // Custom java project layout sourceSets { - main { - java { - srcDirs = ["src"] - exclude '**/test/**' - } - resources { - srcDirs = ["src"] - include "**/gitcommit" - } - } test { - java { - srcDirs = ["src"] - include '**/test/**' - } resources { - srcDirs = ["src"] include "**/*.testdata" } } @@ -105,8 +88,6 @@ javadoc { war { webXml = file('war/web.xml') - // For some reason the test directories are included in the war file - // although the files are gone. Not sure why } configurations { diff --git a/src/us/kbase/auth2/GitCommit.java b/src/main/java/us/kbase/auth2/GitCommit.java similarity index 100% rename from src/us/kbase/auth2/GitCommit.java rename to src/main/java/us/kbase/auth2/GitCommit.java diff --git a/src/us/kbase/auth2/Version.java b/src/main/java/us/kbase/auth2/Version.java similarity index 100% rename from src/us/kbase/auth2/Version.java rename to src/main/java/us/kbase/auth2/Version.java diff --git a/src/us/kbase/auth2/cli/AuthCLI.java b/src/main/java/us/kbase/auth2/cli/AuthCLI.java similarity index 100% rename from src/us/kbase/auth2/cli/AuthCLI.java rename to src/main/java/us/kbase/auth2/cli/AuthCLI.java diff --git a/src/us/kbase/auth2/cli/package-info.java b/src/main/java/us/kbase/auth2/cli/package-info.java similarity index 100% rename from src/us/kbase/auth2/cli/package-info.java rename to src/main/java/us/kbase/auth2/cli/package-info.java diff --git a/src/us/kbase/auth2/cryptutils/PasswordCrypt.java b/src/main/java/us/kbase/auth2/cryptutils/PasswordCrypt.java similarity index 100% rename from src/us/kbase/auth2/cryptutils/PasswordCrypt.java rename to src/main/java/us/kbase/auth2/cryptutils/PasswordCrypt.java diff --git a/src/us/kbase/auth2/cryptutils/RandomDataGenerator.java b/src/main/java/us/kbase/auth2/cryptutils/RandomDataGenerator.java similarity index 100% rename from src/us/kbase/auth2/cryptutils/RandomDataGenerator.java rename to src/main/java/us/kbase/auth2/cryptutils/RandomDataGenerator.java diff --git a/src/us/kbase/auth2/cryptutils/SHA1RandomDataGenerator.java b/src/main/java/us/kbase/auth2/cryptutils/SHA1RandomDataGenerator.java similarity index 100% rename from src/us/kbase/auth2/cryptutils/SHA1RandomDataGenerator.java rename to src/main/java/us/kbase/auth2/cryptutils/SHA1RandomDataGenerator.java diff --git a/src/us/kbase/auth2/kbase/KBaseAuthConfig.java b/src/main/java/us/kbase/auth2/kbase/KBaseAuthConfig.java similarity index 100% rename from src/us/kbase/auth2/kbase/KBaseAuthConfig.java rename to src/main/java/us/kbase/auth2/kbase/KBaseAuthConfig.java diff --git a/src/us/kbase/auth2/lib/Authentication.java b/src/main/java/us/kbase/auth2/lib/Authentication.java similarity index 100% rename from src/us/kbase/auth2/lib/Authentication.java rename to src/main/java/us/kbase/auth2/lib/Authentication.java diff --git a/src/us/kbase/auth2/lib/CustomRole.java b/src/main/java/us/kbase/auth2/lib/CustomRole.java similarity index 100% rename from src/us/kbase/auth2/lib/CustomRole.java rename to src/main/java/us/kbase/auth2/lib/CustomRole.java diff --git a/src/us/kbase/auth2/lib/DisplayName.java b/src/main/java/us/kbase/auth2/lib/DisplayName.java similarity index 100% rename from src/us/kbase/auth2/lib/DisplayName.java rename to src/main/java/us/kbase/auth2/lib/DisplayName.java diff --git a/src/us/kbase/auth2/lib/EmailAddress.java b/src/main/java/us/kbase/auth2/lib/EmailAddress.java similarity index 100% rename from src/us/kbase/auth2/lib/EmailAddress.java rename to src/main/java/us/kbase/auth2/lib/EmailAddress.java diff --git a/src/us/kbase/auth2/lib/LinkIdentities.java b/src/main/java/us/kbase/auth2/lib/LinkIdentities.java similarity index 100% rename from src/us/kbase/auth2/lib/LinkIdentities.java rename to src/main/java/us/kbase/auth2/lib/LinkIdentities.java diff --git a/src/us/kbase/auth2/lib/LinkToken.java b/src/main/java/us/kbase/auth2/lib/LinkToken.java similarity index 100% rename from src/us/kbase/auth2/lib/LinkToken.java rename to src/main/java/us/kbase/auth2/lib/LinkToken.java diff --git a/src/us/kbase/auth2/lib/LocalLoginResult.java b/src/main/java/us/kbase/auth2/lib/LocalLoginResult.java similarity index 100% rename from src/us/kbase/auth2/lib/LocalLoginResult.java rename to src/main/java/us/kbase/auth2/lib/LocalLoginResult.java diff --git a/src/us/kbase/auth2/lib/LoginState.java b/src/main/java/us/kbase/auth2/lib/LoginState.java similarity index 100% rename from src/us/kbase/auth2/lib/LoginState.java rename to src/main/java/us/kbase/auth2/lib/LoginState.java diff --git a/src/us/kbase/auth2/lib/LoginToken.java b/src/main/java/us/kbase/auth2/lib/LoginToken.java similarity index 100% rename from src/us/kbase/auth2/lib/LoginToken.java rename to src/main/java/us/kbase/auth2/lib/LoginToken.java diff --git a/src/us/kbase/auth2/lib/Name.java b/src/main/java/us/kbase/auth2/lib/Name.java similarity index 100% rename from src/us/kbase/auth2/lib/Name.java rename to src/main/java/us/kbase/auth2/lib/Name.java diff --git a/src/us/kbase/auth2/lib/OAuth2StartData.java b/src/main/java/us/kbase/auth2/lib/OAuth2StartData.java similarity index 100% rename from src/us/kbase/auth2/lib/OAuth2StartData.java rename to src/main/java/us/kbase/auth2/lib/OAuth2StartData.java diff --git a/src/us/kbase/auth2/lib/Password.java b/src/main/java/us/kbase/auth2/lib/Password.java similarity index 100% rename from src/us/kbase/auth2/lib/Password.java rename to src/main/java/us/kbase/auth2/lib/Password.java diff --git a/src/us/kbase/auth2/lib/PasswordHashAndSalt.java b/src/main/java/us/kbase/auth2/lib/PasswordHashAndSalt.java similarity index 100% rename from src/us/kbase/auth2/lib/PasswordHashAndSalt.java rename to src/main/java/us/kbase/auth2/lib/PasswordHashAndSalt.java diff --git a/src/us/kbase/auth2/lib/PolicyID.java b/src/main/java/us/kbase/auth2/lib/PolicyID.java similarity index 100% rename from src/us/kbase/auth2/lib/PolicyID.java rename to src/main/java/us/kbase/auth2/lib/PolicyID.java diff --git a/src/us/kbase/auth2/lib/Role.java b/src/main/java/us/kbase/auth2/lib/Role.java similarity index 100% rename from src/us/kbase/auth2/lib/Role.java rename to src/main/java/us/kbase/auth2/lib/Role.java diff --git a/src/us/kbase/auth2/lib/TemporarySessionData.java b/src/main/java/us/kbase/auth2/lib/TemporarySessionData.java similarity index 100% rename from src/us/kbase/auth2/lib/TemporarySessionData.java rename to src/main/java/us/kbase/auth2/lib/TemporarySessionData.java diff --git a/src/us/kbase/auth2/lib/TokenCreationContext.java b/src/main/java/us/kbase/auth2/lib/TokenCreationContext.java similarity index 100% rename from src/us/kbase/auth2/lib/TokenCreationContext.java rename to src/main/java/us/kbase/auth2/lib/TokenCreationContext.java diff --git a/src/us/kbase/auth2/lib/UserDisabledState.java b/src/main/java/us/kbase/auth2/lib/UserDisabledState.java similarity index 100% rename from src/us/kbase/auth2/lib/UserDisabledState.java rename to src/main/java/us/kbase/auth2/lib/UserDisabledState.java diff --git a/src/us/kbase/auth2/lib/UserName.java b/src/main/java/us/kbase/auth2/lib/UserName.java similarity index 100% rename from src/us/kbase/auth2/lib/UserName.java rename to src/main/java/us/kbase/auth2/lib/UserName.java diff --git a/src/us/kbase/auth2/lib/UserSearchSpec.java b/src/main/java/us/kbase/auth2/lib/UserSearchSpec.java similarity index 100% rename from src/us/kbase/auth2/lib/UserSearchSpec.java rename to src/main/java/us/kbase/auth2/lib/UserSearchSpec.java diff --git a/src/us/kbase/auth2/lib/UserUpdate.java b/src/main/java/us/kbase/auth2/lib/UserUpdate.java similarity index 100% rename from src/us/kbase/auth2/lib/UserUpdate.java rename to src/main/java/us/kbase/auth2/lib/UserUpdate.java diff --git a/src/us/kbase/auth2/lib/Utils.java b/src/main/java/us/kbase/auth2/lib/Utils.java similarity index 100% rename from src/us/kbase/auth2/lib/Utils.java rename to src/main/java/us/kbase/auth2/lib/Utils.java diff --git a/src/us/kbase/auth2/lib/ViewableUser.java b/src/main/java/us/kbase/auth2/lib/ViewableUser.java similarity index 100% rename from src/us/kbase/auth2/lib/ViewableUser.java rename to src/main/java/us/kbase/auth2/lib/ViewableUser.java diff --git a/src/us/kbase/auth2/lib/config/AuthConfig.java b/src/main/java/us/kbase/auth2/lib/config/AuthConfig.java similarity index 100% rename from src/us/kbase/auth2/lib/config/AuthConfig.java rename to src/main/java/us/kbase/auth2/lib/config/AuthConfig.java diff --git a/src/us/kbase/auth2/lib/config/AuthConfigSet.java b/src/main/java/us/kbase/auth2/lib/config/AuthConfigSet.java similarity index 100% rename from src/us/kbase/auth2/lib/config/AuthConfigSet.java rename to src/main/java/us/kbase/auth2/lib/config/AuthConfigSet.java diff --git a/src/us/kbase/auth2/lib/config/AuthConfigSetWithUpdateTime.java b/src/main/java/us/kbase/auth2/lib/config/AuthConfigSetWithUpdateTime.java similarity index 100% rename from src/us/kbase/auth2/lib/config/AuthConfigSetWithUpdateTime.java rename to src/main/java/us/kbase/auth2/lib/config/AuthConfigSetWithUpdateTime.java diff --git a/src/us/kbase/auth2/lib/config/AuthConfigUpdate.java b/src/main/java/us/kbase/auth2/lib/config/AuthConfigUpdate.java similarity index 100% rename from src/us/kbase/auth2/lib/config/AuthConfigUpdate.java rename to src/main/java/us/kbase/auth2/lib/config/AuthConfigUpdate.java diff --git a/src/us/kbase/auth2/lib/config/CollectingExternalConfig.java b/src/main/java/us/kbase/auth2/lib/config/CollectingExternalConfig.java similarity index 100% rename from src/us/kbase/auth2/lib/config/CollectingExternalConfig.java rename to src/main/java/us/kbase/auth2/lib/config/CollectingExternalConfig.java diff --git a/src/us/kbase/auth2/lib/config/ConfigAction.java b/src/main/java/us/kbase/auth2/lib/config/ConfigAction.java similarity index 100% rename from src/us/kbase/auth2/lib/config/ConfigAction.java rename to src/main/java/us/kbase/auth2/lib/config/ConfigAction.java diff --git a/src/us/kbase/auth2/lib/config/ConfigItem.java b/src/main/java/us/kbase/auth2/lib/config/ConfigItem.java similarity index 100% rename from src/us/kbase/auth2/lib/config/ConfigItem.java rename to src/main/java/us/kbase/auth2/lib/config/ConfigItem.java diff --git a/src/us/kbase/auth2/lib/config/ExternalConfig.java b/src/main/java/us/kbase/auth2/lib/config/ExternalConfig.java similarity index 100% rename from src/us/kbase/auth2/lib/config/ExternalConfig.java rename to src/main/java/us/kbase/auth2/lib/config/ExternalConfig.java diff --git a/src/us/kbase/auth2/lib/config/ExternalConfigMapper.java b/src/main/java/us/kbase/auth2/lib/config/ExternalConfigMapper.java similarity index 100% rename from src/us/kbase/auth2/lib/config/ExternalConfigMapper.java rename to src/main/java/us/kbase/auth2/lib/config/ExternalConfigMapper.java diff --git a/src/us/kbase/auth2/lib/config/package-info.java b/src/main/java/us/kbase/auth2/lib/config/package-info.java similarity index 100% rename from src/us/kbase/auth2/lib/config/package-info.java rename to src/main/java/us/kbase/auth2/lib/config/package-info.java diff --git a/src/us/kbase/auth2/lib/exceptions/AuthException.java b/src/main/java/us/kbase/auth2/lib/exceptions/AuthException.java similarity index 100% rename from src/us/kbase/auth2/lib/exceptions/AuthException.java rename to src/main/java/us/kbase/auth2/lib/exceptions/AuthException.java diff --git a/src/us/kbase/auth2/lib/exceptions/AuthenticationException.java b/src/main/java/us/kbase/auth2/lib/exceptions/AuthenticationException.java similarity index 100% rename from src/us/kbase/auth2/lib/exceptions/AuthenticationException.java rename to src/main/java/us/kbase/auth2/lib/exceptions/AuthenticationException.java diff --git a/src/us/kbase/auth2/lib/exceptions/DisabledUserException.java b/src/main/java/us/kbase/auth2/lib/exceptions/DisabledUserException.java similarity index 100% rename from src/us/kbase/auth2/lib/exceptions/DisabledUserException.java rename to src/main/java/us/kbase/auth2/lib/exceptions/DisabledUserException.java diff --git a/src/us/kbase/auth2/lib/exceptions/ErrorType.java b/src/main/java/us/kbase/auth2/lib/exceptions/ErrorType.java similarity index 100% rename from src/us/kbase/auth2/lib/exceptions/ErrorType.java rename to src/main/java/us/kbase/auth2/lib/exceptions/ErrorType.java diff --git a/src/us/kbase/auth2/lib/exceptions/ExternalConfigMappingException.java b/src/main/java/us/kbase/auth2/lib/exceptions/ExternalConfigMappingException.java similarity index 100% rename from src/us/kbase/auth2/lib/exceptions/ExternalConfigMappingException.java rename to src/main/java/us/kbase/auth2/lib/exceptions/ExternalConfigMappingException.java diff --git a/src/us/kbase/auth2/lib/exceptions/IdentityLinkedException.java b/src/main/java/us/kbase/auth2/lib/exceptions/IdentityLinkedException.java similarity index 100% rename from src/us/kbase/auth2/lib/exceptions/IdentityLinkedException.java rename to src/main/java/us/kbase/auth2/lib/exceptions/IdentityLinkedException.java diff --git a/src/us/kbase/auth2/lib/exceptions/IdentityProviderErrorException.java b/src/main/java/us/kbase/auth2/lib/exceptions/IdentityProviderErrorException.java similarity index 100% rename from src/us/kbase/auth2/lib/exceptions/IdentityProviderErrorException.java rename to src/main/java/us/kbase/auth2/lib/exceptions/IdentityProviderErrorException.java diff --git a/src/us/kbase/auth2/lib/exceptions/IdentityRetrievalException.java b/src/main/java/us/kbase/auth2/lib/exceptions/IdentityRetrievalException.java similarity index 100% rename from src/us/kbase/auth2/lib/exceptions/IdentityRetrievalException.java rename to src/main/java/us/kbase/auth2/lib/exceptions/IdentityRetrievalException.java diff --git a/src/us/kbase/auth2/lib/exceptions/IllegalParameterException.java b/src/main/java/us/kbase/auth2/lib/exceptions/IllegalParameterException.java similarity index 100% rename from src/us/kbase/auth2/lib/exceptions/IllegalParameterException.java rename to src/main/java/us/kbase/auth2/lib/exceptions/IllegalParameterException.java diff --git a/src/us/kbase/auth2/lib/exceptions/IllegalPasswordException.java b/src/main/java/us/kbase/auth2/lib/exceptions/IllegalPasswordException.java similarity index 100% rename from src/us/kbase/auth2/lib/exceptions/IllegalPasswordException.java rename to src/main/java/us/kbase/auth2/lib/exceptions/IllegalPasswordException.java diff --git a/src/us/kbase/auth2/lib/exceptions/InvalidTokenException.java b/src/main/java/us/kbase/auth2/lib/exceptions/InvalidTokenException.java similarity index 100% rename from src/us/kbase/auth2/lib/exceptions/InvalidTokenException.java rename to src/main/java/us/kbase/auth2/lib/exceptions/InvalidTokenException.java diff --git a/src/us/kbase/auth2/lib/exceptions/LinkFailedException.java b/src/main/java/us/kbase/auth2/lib/exceptions/LinkFailedException.java similarity index 100% rename from src/us/kbase/auth2/lib/exceptions/LinkFailedException.java rename to src/main/java/us/kbase/auth2/lib/exceptions/LinkFailedException.java diff --git a/src/us/kbase/auth2/lib/exceptions/MissingParameterException.java b/src/main/java/us/kbase/auth2/lib/exceptions/MissingParameterException.java similarity index 100% rename from src/us/kbase/auth2/lib/exceptions/MissingParameterException.java rename to src/main/java/us/kbase/auth2/lib/exceptions/MissingParameterException.java diff --git a/src/us/kbase/auth2/lib/exceptions/NoDataException.java b/src/main/java/us/kbase/auth2/lib/exceptions/NoDataException.java similarity index 100% rename from src/us/kbase/auth2/lib/exceptions/NoDataException.java rename to src/main/java/us/kbase/auth2/lib/exceptions/NoDataException.java diff --git a/src/us/kbase/auth2/lib/exceptions/NoSuchEnvironmentException.java b/src/main/java/us/kbase/auth2/lib/exceptions/NoSuchEnvironmentException.java similarity index 100% rename from src/us/kbase/auth2/lib/exceptions/NoSuchEnvironmentException.java rename to src/main/java/us/kbase/auth2/lib/exceptions/NoSuchEnvironmentException.java diff --git a/src/us/kbase/auth2/lib/exceptions/NoSuchIdentityException.java b/src/main/java/us/kbase/auth2/lib/exceptions/NoSuchIdentityException.java similarity index 100% rename from src/us/kbase/auth2/lib/exceptions/NoSuchIdentityException.java rename to src/main/java/us/kbase/auth2/lib/exceptions/NoSuchIdentityException.java diff --git a/src/us/kbase/auth2/lib/exceptions/NoSuchIdentityProviderException.java b/src/main/java/us/kbase/auth2/lib/exceptions/NoSuchIdentityProviderException.java similarity index 100% rename from src/us/kbase/auth2/lib/exceptions/NoSuchIdentityProviderException.java rename to src/main/java/us/kbase/auth2/lib/exceptions/NoSuchIdentityProviderException.java diff --git a/src/us/kbase/auth2/lib/exceptions/NoSuchLocalUserException.java b/src/main/java/us/kbase/auth2/lib/exceptions/NoSuchLocalUserException.java similarity index 100% rename from src/us/kbase/auth2/lib/exceptions/NoSuchLocalUserException.java rename to src/main/java/us/kbase/auth2/lib/exceptions/NoSuchLocalUserException.java diff --git a/src/us/kbase/auth2/lib/exceptions/NoSuchRoleException.java b/src/main/java/us/kbase/auth2/lib/exceptions/NoSuchRoleException.java similarity index 100% rename from src/us/kbase/auth2/lib/exceptions/NoSuchRoleException.java rename to src/main/java/us/kbase/auth2/lib/exceptions/NoSuchRoleException.java diff --git a/src/us/kbase/auth2/lib/exceptions/NoSuchTokenException.java b/src/main/java/us/kbase/auth2/lib/exceptions/NoSuchTokenException.java similarity index 100% rename from src/us/kbase/auth2/lib/exceptions/NoSuchTokenException.java rename to src/main/java/us/kbase/auth2/lib/exceptions/NoSuchTokenException.java diff --git a/src/us/kbase/auth2/lib/exceptions/NoSuchUserException.java b/src/main/java/us/kbase/auth2/lib/exceptions/NoSuchUserException.java similarity index 100% rename from src/us/kbase/auth2/lib/exceptions/NoSuchUserException.java rename to src/main/java/us/kbase/auth2/lib/exceptions/NoSuchUserException.java diff --git a/src/us/kbase/auth2/lib/exceptions/NoTokenProvidedException.java b/src/main/java/us/kbase/auth2/lib/exceptions/NoTokenProvidedException.java similarity index 100% rename from src/us/kbase/auth2/lib/exceptions/NoTokenProvidedException.java rename to src/main/java/us/kbase/auth2/lib/exceptions/NoTokenProvidedException.java diff --git a/src/us/kbase/auth2/lib/exceptions/PasswordMismatchException.java b/src/main/java/us/kbase/auth2/lib/exceptions/PasswordMismatchException.java similarity index 100% rename from src/us/kbase/auth2/lib/exceptions/PasswordMismatchException.java rename to src/main/java/us/kbase/auth2/lib/exceptions/PasswordMismatchException.java diff --git a/src/us/kbase/auth2/lib/exceptions/TestModeException.java b/src/main/java/us/kbase/auth2/lib/exceptions/TestModeException.java similarity index 100% rename from src/us/kbase/auth2/lib/exceptions/TestModeException.java rename to src/main/java/us/kbase/auth2/lib/exceptions/TestModeException.java diff --git a/src/us/kbase/auth2/lib/exceptions/UnLinkFailedException.java b/src/main/java/us/kbase/auth2/lib/exceptions/UnLinkFailedException.java similarity index 100% rename from src/us/kbase/auth2/lib/exceptions/UnLinkFailedException.java rename to src/main/java/us/kbase/auth2/lib/exceptions/UnLinkFailedException.java diff --git a/src/us/kbase/auth2/lib/exceptions/UnauthorizedException.java b/src/main/java/us/kbase/auth2/lib/exceptions/UnauthorizedException.java similarity index 100% rename from src/us/kbase/auth2/lib/exceptions/UnauthorizedException.java rename to src/main/java/us/kbase/auth2/lib/exceptions/UnauthorizedException.java diff --git a/src/us/kbase/auth2/lib/exceptions/UserExistsException.java b/src/main/java/us/kbase/auth2/lib/exceptions/UserExistsException.java similarity index 100% rename from src/us/kbase/auth2/lib/exceptions/UserExistsException.java rename to src/main/java/us/kbase/auth2/lib/exceptions/UserExistsException.java diff --git a/src/us/kbase/auth2/lib/identity/IdentityProvider.java b/src/main/java/us/kbase/auth2/lib/identity/IdentityProvider.java similarity index 100% rename from src/us/kbase/auth2/lib/identity/IdentityProvider.java rename to src/main/java/us/kbase/auth2/lib/identity/IdentityProvider.java diff --git a/src/us/kbase/auth2/lib/identity/IdentityProviderConfig.java b/src/main/java/us/kbase/auth2/lib/identity/IdentityProviderConfig.java similarity index 100% rename from src/us/kbase/auth2/lib/identity/IdentityProviderConfig.java rename to src/main/java/us/kbase/auth2/lib/identity/IdentityProviderConfig.java diff --git a/src/us/kbase/auth2/lib/identity/IdentityProviderFactory.java b/src/main/java/us/kbase/auth2/lib/identity/IdentityProviderFactory.java similarity index 100% rename from src/us/kbase/auth2/lib/identity/IdentityProviderFactory.java rename to src/main/java/us/kbase/auth2/lib/identity/IdentityProviderFactory.java diff --git a/src/us/kbase/auth2/lib/identity/RemoteIdentity.java b/src/main/java/us/kbase/auth2/lib/identity/RemoteIdentity.java similarity index 100% rename from src/us/kbase/auth2/lib/identity/RemoteIdentity.java rename to src/main/java/us/kbase/auth2/lib/identity/RemoteIdentity.java diff --git a/src/us/kbase/auth2/lib/identity/RemoteIdentityDetails.java b/src/main/java/us/kbase/auth2/lib/identity/RemoteIdentityDetails.java similarity index 100% rename from src/us/kbase/auth2/lib/identity/RemoteIdentityDetails.java rename to src/main/java/us/kbase/auth2/lib/identity/RemoteIdentityDetails.java diff --git a/src/us/kbase/auth2/lib/identity/RemoteIdentityID.java b/src/main/java/us/kbase/auth2/lib/identity/RemoteIdentityID.java similarity index 100% rename from src/us/kbase/auth2/lib/identity/RemoteIdentityID.java rename to src/main/java/us/kbase/auth2/lib/identity/RemoteIdentityID.java diff --git a/src/us/kbase/auth2/lib/storage/AuthStorage.java b/src/main/java/us/kbase/auth2/lib/storage/AuthStorage.java similarity index 100% rename from src/us/kbase/auth2/lib/storage/AuthStorage.java rename to src/main/java/us/kbase/auth2/lib/storage/AuthStorage.java diff --git a/src/us/kbase/auth2/lib/storage/exceptions/AuthStorageException.java b/src/main/java/us/kbase/auth2/lib/storage/exceptions/AuthStorageException.java similarity index 100% rename from src/us/kbase/auth2/lib/storage/exceptions/AuthStorageException.java rename to src/main/java/us/kbase/auth2/lib/storage/exceptions/AuthStorageException.java diff --git a/src/us/kbase/auth2/lib/storage/exceptions/StorageInitException.java b/src/main/java/us/kbase/auth2/lib/storage/exceptions/StorageInitException.java similarity index 100% rename from src/us/kbase/auth2/lib/storage/exceptions/StorageInitException.java rename to src/main/java/us/kbase/auth2/lib/storage/exceptions/StorageInitException.java diff --git a/src/us/kbase/auth2/lib/storage/mongo/Fields.java b/src/main/java/us/kbase/auth2/lib/storage/mongo/Fields.java similarity index 100% rename from src/us/kbase/auth2/lib/storage/mongo/Fields.java rename to src/main/java/us/kbase/auth2/lib/storage/mongo/Fields.java diff --git a/src/us/kbase/auth2/lib/storage/mongo/MongoStorage.java b/src/main/java/us/kbase/auth2/lib/storage/mongo/MongoStorage.java similarity index 100% rename from src/us/kbase/auth2/lib/storage/mongo/MongoStorage.java rename to src/main/java/us/kbase/auth2/lib/storage/mongo/MongoStorage.java diff --git a/src/us/kbase/auth2/lib/token/IncomingHashedToken.java b/src/main/java/us/kbase/auth2/lib/token/IncomingHashedToken.java similarity index 100% rename from src/us/kbase/auth2/lib/token/IncomingHashedToken.java rename to src/main/java/us/kbase/auth2/lib/token/IncomingHashedToken.java diff --git a/src/us/kbase/auth2/lib/token/IncomingToken.java b/src/main/java/us/kbase/auth2/lib/token/IncomingToken.java similarity index 100% rename from src/us/kbase/auth2/lib/token/IncomingToken.java rename to src/main/java/us/kbase/auth2/lib/token/IncomingToken.java diff --git a/src/us/kbase/auth2/lib/token/NewToken.java b/src/main/java/us/kbase/auth2/lib/token/NewToken.java similarity index 100% rename from src/us/kbase/auth2/lib/token/NewToken.java rename to src/main/java/us/kbase/auth2/lib/token/NewToken.java diff --git a/src/us/kbase/auth2/lib/token/StoredToken.java b/src/main/java/us/kbase/auth2/lib/token/StoredToken.java similarity index 100% rename from src/us/kbase/auth2/lib/token/StoredToken.java rename to src/main/java/us/kbase/auth2/lib/token/StoredToken.java diff --git a/src/us/kbase/auth2/lib/token/TemporaryToken.java b/src/main/java/us/kbase/auth2/lib/token/TemporaryToken.java similarity index 100% rename from src/us/kbase/auth2/lib/token/TemporaryToken.java rename to src/main/java/us/kbase/auth2/lib/token/TemporaryToken.java diff --git a/src/us/kbase/auth2/lib/token/TokenName.java b/src/main/java/us/kbase/auth2/lib/token/TokenName.java similarity index 100% rename from src/us/kbase/auth2/lib/token/TokenName.java rename to src/main/java/us/kbase/auth2/lib/token/TokenName.java diff --git a/src/us/kbase/auth2/lib/token/TokenSet.java b/src/main/java/us/kbase/auth2/lib/token/TokenSet.java similarity index 100% rename from src/us/kbase/auth2/lib/token/TokenSet.java rename to src/main/java/us/kbase/auth2/lib/token/TokenSet.java diff --git a/src/us/kbase/auth2/lib/token/TokenType.java b/src/main/java/us/kbase/auth2/lib/token/TokenType.java similarity index 100% rename from src/us/kbase/auth2/lib/token/TokenType.java rename to src/main/java/us/kbase/auth2/lib/token/TokenType.java diff --git a/src/us/kbase/auth2/lib/user/AuthUser.java b/src/main/java/us/kbase/auth2/lib/user/AuthUser.java similarity index 100% rename from src/us/kbase/auth2/lib/user/AuthUser.java rename to src/main/java/us/kbase/auth2/lib/user/AuthUser.java diff --git a/src/us/kbase/auth2/lib/user/LocalUser.java b/src/main/java/us/kbase/auth2/lib/user/LocalUser.java similarity index 100% rename from src/us/kbase/auth2/lib/user/LocalUser.java rename to src/main/java/us/kbase/auth2/lib/user/LocalUser.java diff --git a/src/us/kbase/auth2/lib/user/NewUser.java b/src/main/java/us/kbase/auth2/lib/user/NewUser.java similarity index 100% rename from src/us/kbase/auth2/lib/user/NewUser.java rename to src/main/java/us/kbase/auth2/lib/user/NewUser.java diff --git a/src/us/kbase/auth2/providers/GlobusIdentityProviderFactory.java b/src/main/java/us/kbase/auth2/providers/GlobusIdentityProviderFactory.java similarity index 100% rename from src/us/kbase/auth2/providers/GlobusIdentityProviderFactory.java rename to src/main/java/us/kbase/auth2/providers/GlobusIdentityProviderFactory.java diff --git a/src/us/kbase/auth2/providers/GoogleIdentityProviderFactory.java b/src/main/java/us/kbase/auth2/providers/GoogleIdentityProviderFactory.java similarity index 100% rename from src/us/kbase/auth2/providers/GoogleIdentityProviderFactory.java rename to src/main/java/us/kbase/auth2/providers/GoogleIdentityProviderFactory.java diff --git a/src/us/kbase/auth2/providers/OrcIDIdentityProviderFactory.java b/src/main/java/us/kbase/auth2/providers/OrcIDIdentityProviderFactory.java similarity index 100% rename from src/us/kbase/auth2/providers/OrcIDIdentityProviderFactory.java rename to src/main/java/us/kbase/auth2/providers/OrcIDIdentityProviderFactory.java diff --git a/src/us/kbase/auth2/providers/package-info.java b/src/main/java/us/kbase/auth2/providers/package-info.java similarity index 100% rename from src/us/kbase/auth2/providers/package-info.java rename to src/main/java/us/kbase/auth2/providers/package-info.java diff --git a/src/us/kbase/auth2/service/AppEventListener.java b/src/main/java/us/kbase/auth2/service/AppEventListener.java similarity index 100% rename from src/us/kbase/auth2/service/AppEventListener.java rename to src/main/java/us/kbase/auth2/service/AppEventListener.java diff --git a/src/us/kbase/auth2/service/AuthAPIStaticConfig.java b/src/main/java/us/kbase/auth2/service/AuthAPIStaticConfig.java similarity index 100% rename from src/us/kbase/auth2/service/AuthAPIStaticConfig.java rename to src/main/java/us/kbase/auth2/service/AuthAPIStaticConfig.java diff --git a/src/us/kbase/auth2/service/AuthBuilder.java b/src/main/java/us/kbase/auth2/service/AuthBuilder.java similarity index 100% rename from src/us/kbase/auth2/service/AuthBuilder.java rename to src/main/java/us/kbase/auth2/service/AuthBuilder.java diff --git a/src/us/kbase/auth2/service/AuthExternalConfig.java b/src/main/java/us/kbase/auth2/service/AuthExternalConfig.java similarity index 100% rename from src/us/kbase/auth2/service/AuthExternalConfig.java rename to src/main/java/us/kbase/auth2/service/AuthExternalConfig.java diff --git a/src/us/kbase/auth2/service/AuthStartupConfig.java b/src/main/java/us/kbase/auth2/service/AuthStartupConfig.java similarity index 100% rename from src/us/kbase/auth2/service/AuthStartupConfig.java rename to src/main/java/us/kbase/auth2/service/AuthStartupConfig.java diff --git a/src/us/kbase/auth2/service/AuthenticationService.java b/src/main/java/us/kbase/auth2/service/AuthenticationService.java similarity index 100% rename from src/us/kbase/auth2/service/AuthenticationService.java rename to src/main/java/us/kbase/auth2/service/AuthenticationService.java diff --git a/src/us/kbase/auth2/service/ContextFields.java b/src/main/java/us/kbase/auth2/service/ContextFields.java similarity index 100% rename from src/us/kbase/auth2/service/ContextFields.java rename to src/main/java/us/kbase/auth2/service/ContextFields.java diff --git a/src/us/kbase/auth2/service/LoggingFilter.java b/src/main/java/us/kbase/auth2/service/LoggingFilter.java similarity index 100% rename from src/us/kbase/auth2/service/LoggingFilter.java rename to src/main/java/us/kbase/auth2/service/LoggingFilter.java diff --git a/src/us/kbase/auth2/service/SLF4JAutoLogger.java b/src/main/java/us/kbase/auth2/service/SLF4JAutoLogger.java similarity index 100% rename from src/us/kbase/auth2/service/SLF4JAutoLogger.java rename to src/main/java/us/kbase/auth2/service/SLF4JAutoLogger.java diff --git a/src/us/kbase/auth2/service/UserAgentParser.java b/src/main/java/us/kbase/auth2/service/UserAgentParser.java similarity index 100% rename from src/us/kbase/auth2/service/UserAgentParser.java rename to src/main/java/us/kbase/auth2/service/UserAgentParser.java diff --git a/src/us/kbase/auth2/service/api/APIConstants.java b/src/main/java/us/kbase/auth2/service/api/APIConstants.java similarity index 100% rename from src/us/kbase/auth2/service/api/APIConstants.java rename to src/main/java/us/kbase/auth2/service/api/APIConstants.java diff --git a/src/us/kbase/auth2/service/api/APIPaths.java b/src/main/java/us/kbase/auth2/service/api/APIPaths.java similarity index 100% rename from src/us/kbase/auth2/service/api/APIPaths.java rename to src/main/java/us/kbase/auth2/service/api/APIPaths.java diff --git a/src/us/kbase/auth2/service/api/APIToken.java b/src/main/java/us/kbase/auth2/service/api/APIToken.java similarity index 100% rename from src/us/kbase/auth2/service/api/APIToken.java rename to src/main/java/us/kbase/auth2/service/api/APIToken.java diff --git a/src/us/kbase/auth2/service/api/Admin.java b/src/main/java/us/kbase/auth2/service/api/Admin.java similarity index 100% rename from src/us/kbase/auth2/service/api/Admin.java rename to src/main/java/us/kbase/auth2/service/api/Admin.java diff --git a/src/us/kbase/auth2/service/api/LegacyGlobus.java b/src/main/java/us/kbase/auth2/service/api/LegacyGlobus.java similarity index 100% rename from src/us/kbase/auth2/service/api/LegacyGlobus.java rename to src/main/java/us/kbase/auth2/service/api/LegacyGlobus.java diff --git a/src/us/kbase/auth2/service/api/LegacyKBase.java b/src/main/java/us/kbase/auth2/service/api/LegacyKBase.java similarity index 100% rename from src/us/kbase/auth2/service/api/LegacyKBase.java rename to src/main/java/us/kbase/auth2/service/api/LegacyKBase.java diff --git a/src/us/kbase/auth2/service/api/Me.java b/src/main/java/us/kbase/auth2/service/api/Me.java similarity index 100% rename from src/us/kbase/auth2/service/api/Me.java rename to src/main/java/us/kbase/auth2/service/api/Me.java diff --git a/src/us/kbase/auth2/service/api/NewAPIToken.java b/src/main/java/us/kbase/auth2/service/api/NewAPIToken.java similarity index 100% rename from src/us/kbase/auth2/service/api/NewAPIToken.java rename to src/main/java/us/kbase/auth2/service/api/NewAPIToken.java diff --git a/src/us/kbase/auth2/service/api/TestMode.java b/src/main/java/us/kbase/auth2/service/api/TestMode.java similarity index 100% rename from src/us/kbase/auth2/service/api/TestMode.java rename to src/main/java/us/kbase/auth2/service/api/TestMode.java diff --git a/src/us/kbase/auth2/service/api/Token.java b/src/main/java/us/kbase/auth2/service/api/Token.java similarity index 100% rename from src/us/kbase/auth2/service/api/Token.java rename to src/main/java/us/kbase/auth2/service/api/Token.java diff --git a/src/us/kbase/auth2/service/api/Users.java b/src/main/java/us/kbase/auth2/service/api/Users.java similarity index 100% rename from src/us/kbase/auth2/service/api/Users.java rename to src/main/java/us/kbase/auth2/service/api/Users.java diff --git a/src/us/kbase/auth2/service/common/ExternalToken.java b/src/main/java/us/kbase/auth2/service/common/ExternalToken.java similarity index 100% rename from src/us/kbase/auth2/service/common/ExternalToken.java rename to src/main/java/us/kbase/auth2/service/common/ExternalToken.java diff --git a/src/us/kbase/auth2/service/common/Fields.java b/src/main/java/us/kbase/auth2/service/common/Fields.java similarity index 100% rename from src/us/kbase/auth2/service/common/Fields.java rename to src/main/java/us/kbase/auth2/service/common/Fields.java diff --git a/src/us/kbase/auth2/service/common/IncomingJSON.java b/src/main/java/us/kbase/auth2/service/common/IncomingJSON.java similarity index 100% rename from src/us/kbase/auth2/service/common/IncomingJSON.java rename to src/main/java/us/kbase/auth2/service/common/IncomingJSON.java diff --git a/src/us/kbase/auth2/service/common/ServiceCommon.java b/src/main/java/us/kbase/auth2/service/common/ServiceCommon.java similarity index 100% rename from src/us/kbase/auth2/service/common/ServiceCommon.java rename to src/main/java/us/kbase/auth2/service/common/ServiceCommon.java diff --git a/src/us/kbase/auth2/service/exceptions/AuthConfigurationException.java b/src/main/java/us/kbase/auth2/service/exceptions/AuthConfigurationException.java similarity index 100% rename from src/us/kbase/auth2/service/exceptions/AuthConfigurationException.java rename to src/main/java/us/kbase/auth2/service/exceptions/AuthConfigurationException.java diff --git a/src/us/kbase/auth2/service/exceptions/ErrorMessage.java b/src/main/java/us/kbase/auth2/service/exceptions/ErrorMessage.java similarity index 100% rename from src/us/kbase/auth2/service/exceptions/ErrorMessage.java rename to src/main/java/us/kbase/auth2/service/exceptions/ErrorMessage.java diff --git a/src/us/kbase/auth2/service/exceptions/ExceptionHandler.java b/src/main/java/us/kbase/auth2/service/exceptions/ExceptionHandler.java similarity index 100% rename from src/us/kbase/auth2/service/exceptions/ExceptionHandler.java rename to src/main/java/us/kbase/auth2/service/exceptions/ExceptionHandler.java diff --git a/src/us/kbase/auth2/service/template/TemplateProcessor.java b/src/main/java/us/kbase/auth2/service/template/TemplateProcessor.java similarity index 100% rename from src/us/kbase/auth2/service/template/TemplateProcessor.java rename to src/main/java/us/kbase/auth2/service/template/TemplateProcessor.java diff --git a/src/us/kbase/auth2/service/template/mustache/MustacheProcessor.java b/src/main/java/us/kbase/auth2/service/template/mustache/MustacheProcessor.java similarity index 100% rename from src/us/kbase/auth2/service/template/mustache/MustacheProcessor.java rename to src/main/java/us/kbase/auth2/service/template/mustache/MustacheProcessor.java diff --git a/src/us/kbase/auth2/service/ui/Admin.java b/src/main/java/us/kbase/auth2/service/ui/Admin.java similarity index 100% rename from src/us/kbase/auth2/service/ui/Admin.java rename to src/main/java/us/kbase/auth2/service/ui/Admin.java diff --git a/src/us/kbase/auth2/service/ui/CustomRoles.java b/src/main/java/us/kbase/auth2/service/ui/CustomRoles.java similarity index 100% rename from src/us/kbase/auth2/service/ui/CustomRoles.java rename to src/main/java/us/kbase/auth2/service/ui/CustomRoles.java diff --git a/src/us/kbase/auth2/service/ui/Link.java b/src/main/java/us/kbase/auth2/service/ui/Link.java similarity index 100% rename from src/us/kbase/auth2/service/ui/Link.java rename to src/main/java/us/kbase/auth2/service/ui/Link.java diff --git a/src/us/kbase/auth2/service/ui/LocalAccounts.java b/src/main/java/us/kbase/auth2/service/ui/LocalAccounts.java similarity index 100% rename from src/us/kbase/auth2/service/ui/LocalAccounts.java rename to src/main/java/us/kbase/auth2/service/ui/LocalAccounts.java diff --git a/src/us/kbase/auth2/service/ui/Login.java b/src/main/java/us/kbase/auth2/service/ui/Login.java similarity index 100% rename from src/us/kbase/auth2/service/ui/Login.java rename to src/main/java/us/kbase/auth2/service/ui/Login.java diff --git a/src/us/kbase/auth2/service/ui/Logout.java b/src/main/java/us/kbase/auth2/service/ui/Logout.java similarity index 100% rename from src/us/kbase/auth2/service/ui/Logout.java rename to src/main/java/us/kbase/auth2/service/ui/Logout.java diff --git a/src/us/kbase/auth2/service/ui/Me.java b/src/main/java/us/kbase/auth2/service/ui/Me.java similarity index 100% rename from src/us/kbase/auth2/service/ui/Me.java rename to src/main/java/us/kbase/auth2/service/ui/Me.java diff --git a/src/us/kbase/auth2/service/ui/NewUIToken.java b/src/main/java/us/kbase/auth2/service/ui/NewUIToken.java similarity index 100% rename from src/us/kbase/auth2/service/ui/NewUIToken.java rename to src/main/java/us/kbase/auth2/service/ui/NewUIToken.java diff --git a/src/us/kbase/auth2/service/ui/Root.java b/src/main/java/us/kbase/auth2/service/ui/Root.java similarity index 100% rename from src/us/kbase/auth2/service/ui/Root.java rename to src/main/java/us/kbase/auth2/service/ui/Root.java diff --git a/src/us/kbase/auth2/service/ui/Tokens.java b/src/main/java/us/kbase/auth2/service/ui/Tokens.java similarity index 100% rename from src/us/kbase/auth2/service/ui/Tokens.java rename to src/main/java/us/kbase/auth2/service/ui/Tokens.java diff --git a/src/us/kbase/auth2/service/ui/UIConstants.java b/src/main/java/us/kbase/auth2/service/ui/UIConstants.java similarity index 100% rename from src/us/kbase/auth2/service/ui/UIConstants.java rename to src/main/java/us/kbase/auth2/service/ui/UIConstants.java diff --git a/src/us/kbase/auth2/service/ui/UIPaths.java b/src/main/java/us/kbase/auth2/service/ui/UIPaths.java similarity index 100% rename from src/us/kbase/auth2/service/ui/UIPaths.java rename to src/main/java/us/kbase/auth2/service/ui/UIPaths.java diff --git a/src/us/kbase/auth2/service/ui/UIToken.java b/src/main/java/us/kbase/auth2/service/ui/UIToken.java similarity index 100% rename from src/us/kbase/auth2/service/ui/UIToken.java rename to src/main/java/us/kbase/auth2/service/ui/UIToken.java diff --git a/src/us/kbase/auth2/service/ui/UIUtils.java b/src/main/java/us/kbase/auth2/service/ui/UIUtils.java similarity index 100% rename from src/us/kbase/auth2/service/ui/UIUtils.java rename to src/main/java/us/kbase/auth2/service/ui/UIUtils.java diff --git a/src/us/kbase/test/auth2/MapBuilder.java b/src/test/java/us/kbase/test/auth2/MapBuilder.java similarity index 100% rename from src/us/kbase/test/auth2/MapBuilder.java rename to src/test/java/us/kbase/test/auth2/MapBuilder.java diff --git a/src/us/kbase/test/auth2/MockIdentityProviderFactory.java b/src/test/java/us/kbase/test/auth2/MockIdentityProviderFactory.java similarity index 100% rename from src/us/kbase/test/auth2/MockIdentityProviderFactory.java rename to src/test/java/us/kbase/test/auth2/MockIdentityProviderFactory.java diff --git a/src/us/kbase/test/auth2/MongoStorageTestManager.java b/src/test/java/us/kbase/test/auth2/MongoStorageTestManager.java similarity index 100% rename from src/us/kbase/test/auth2/MongoStorageTestManager.java rename to src/test/java/us/kbase/test/auth2/MongoStorageTestManager.java diff --git a/src/us/kbase/test/auth2/StandaloneAuthServer.java b/src/test/java/us/kbase/test/auth2/StandaloneAuthServer.java similarity index 100% rename from src/us/kbase/test/auth2/StandaloneAuthServer.java rename to src/test/java/us/kbase/test/auth2/StandaloneAuthServer.java diff --git a/src/us/kbase/test/auth2/TestCommon.java b/src/test/java/us/kbase/test/auth2/TestCommon.java similarity index 100% rename from src/us/kbase/test/auth2/TestCommon.java rename to src/test/java/us/kbase/test/auth2/TestCommon.java diff --git a/src/us/kbase/test/auth2/TestConfigurator.java b/src/test/java/us/kbase/test/auth2/TestConfigurator.java similarity index 100% rename from src/us/kbase/test/auth2/TestConfigurator.java rename to src/test/java/us/kbase/test/auth2/TestConfigurator.java diff --git a/src/us/kbase/test/auth2/authcontroller/AuthController.java b/src/test/java/us/kbase/test/auth2/authcontroller/AuthController.java similarity index 100% rename from src/us/kbase/test/auth2/authcontroller/AuthController.java rename to src/test/java/us/kbase/test/auth2/authcontroller/AuthController.java diff --git a/src/us/kbase/test/auth2/cli/AuthCLITest.java b/src/test/java/us/kbase/test/auth2/cli/AuthCLITest.java similarity index 100% rename from src/us/kbase/test/auth2/cli/AuthCLITest.java rename to src/test/java/us/kbase/test/auth2/cli/AuthCLITest.java diff --git a/src/us/kbase/test/auth2/cryptutils/CryptUtilsTest.java b/src/test/java/us/kbase/test/auth2/cryptutils/CryptUtilsTest.java similarity index 100% rename from src/us/kbase/test/auth2/cryptutils/CryptUtilsTest.java rename to src/test/java/us/kbase/test/auth2/cryptutils/CryptUtilsTest.java diff --git a/src/us/kbase/test/auth2/cryptutils/SHA1RandomDataGeneratorTest.java b/src/test/java/us/kbase/test/auth2/cryptutils/SHA1RandomDataGeneratorTest.java similarity index 100% rename from src/us/kbase/test/auth2/cryptutils/SHA1RandomDataGeneratorTest.java rename to src/test/java/us/kbase/test/auth2/cryptutils/SHA1RandomDataGeneratorTest.java diff --git a/src/us/kbase/test/auth2/kbase/KBaseAuthConfigTest.java b/src/test/java/us/kbase/test/auth2/kbase/KBaseAuthConfigTest.java similarity index 100% rename from src/us/kbase/test/auth2/kbase/KBaseAuthConfigTest.java rename to src/test/java/us/kbase/test/auth2/kbase/KBaseAuthConfigTest.java diff --git a/src/us/kbase/test/auth2/lib/AuthenticationAnonymousIDsTest.java b/src/test/java/us/kbase/test/auth2/lib/AuthenticationAnonymousIDsTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/AuthenticationAnonymousIDsTest.java rename to src/test/java/us/kbase/test/auth2/lib/AuthenticationAnonymousIDsTest.java diff --git a/src/us/kbase/test/auth2/lib/AuthenticationConfigTest.java b/src/test/java/us/kbase/test/auth2/lib/AuthenticationConfigTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/AuthenticationConfigTest.java rename to src/test/java/us/kbase/test/auth2/lib/AuthenticationConfigTest.java diff --git a/src/us/kbase/test/auth2/lib/AuthenticationConstructorTest.java b/src/test/java/us/kbase/test/auth2/lib/AuthenticationConstructorTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/AuthenticationConstructorTest.java rename to src/test/java/us/kbase/test/auth2/lib/AuthenticationConstructorTest.java diff --git a/src/us/kbase/test/auth2/lib/AuthenticationCreateLocalUserTest.java b/src/test/java/us/kbase/test/auth2/lib/AuthenticationCreateLocalUserTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/AuthenticationCreateLocalUserTest.java rename to src/test/java/us/kbase/test/auth2/lib/AuthenticationCreateLocalUserTest.java diff --git a/src/us/kbase/test/auth2/lib/AuthenticationCreateRootTest.java b/src/test/java/us/kbase/test/auth2/lib/AuthenticationCreateRootTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/AuthenticationCreateRootTest.java rename to src/test/java/us/kbase/test/auth2/lib/AuthenticationCreateRootTest.java diff --git a/src/us/kbase/test/auth2/lib/AuthenticationCustomRoleTest.java b/src/test/java/us/kbase/test/auth2/lib/AuthenticationCustomRoleTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/AuthenticationCustomRoleTest.java rename to src/test/java/us/kbase/test/auth2/lib/AuthenticationCustomRoleTest.java diff --git a/src/us/kbase/test/auth2/lib/AuthenticationDisableUserTest.java b/src/test/java/us/kbase/test/auth2/lib/AuthenticationDisableUserTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/AuthenticationDisableUserTest.java rename to src/test/java/us/kbase/test/auth2/lib/AuthenticationDisableUserTest.java diff --git a/src/us/kbase/test/auth2/lib/AuthenticationGetAvailableUserNameTest.java b/src/test/java/us/kbase/test/auth2/lib/AuthenticationGetAvailableUserNameTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/AuthenticationGetAvailableUserNameTest.java rename to src/test/java/us/kbase/test/auth2/lib/AuthenticationGetAvailableUserNameTest.java diff --git a/src/us/kbase/test/auth2/lib/AuthenticationGetUserDisplayNamesTest.java b/src/test/java/us/kbase/test/auth2/lib/AuthenticationGetUserDisplayNamesTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/AuthenticationGetUserDisplayNamesTest.java rename to src/test/java/us/kbase/test/auth2/lib/AuthenticationGetUserDisplayNamesTest.java diff --git a/src/us/kbase/test/auth2/lib/AuthenticationGetUserTest.java b/src/test/java/us/kbase/test/auth2/lib/AuthenticationGetUserTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/AuthenticationGetUserTest.java rename to src/test/java/us/kbase/test/auth2/lib/AuthenticationGetUserTest.java diff --git a/src/us/kbase/test/auth2/lib/AuthenticationIdentityProviderTest.java b/src/test/java/us/kbase/test/auth2/lib/AuthenticationIdentityProviderTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/AuthenticationIdentityProviderTest.java rename to src/test/java/us/kbase/test/auth2/lib/AuthenticationIdentityProviderTest.java diff --git a/src/us/kbase/test/auth2/lib/AuthenticationImportUserTest.java b/src/test/java/us/kbase/test/auth2/lib/AuthenticationImportUserTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/AuthenticationImportUserTest.java rename to src/test/java/us/kbase/test/auth2/lib/AuthenticationImportUserTest.java diff --git a/src/us/kbase/test/auth2/lib/AuthenticationLinkTest.java b/src/test/java/us/kbase/test/auth2/lib/AuthenticationLinkTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/AuthenticationLinkTest.java rename to src/test/java/us/kbase/test/auth2/lib/AuthenticationLinkTest.java diff --git a/src/us/kbase/test/auth2/lib/AuthenticationLoginTest.java b/src/test/java/us/kbase/test/auth2/lib/AuthenticationLoginTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/AuthenticationLoginTest.java rename to src/test/java/us/kbase/test/auth2/lib/AuthenticationLoginTest.java diff --git a/src/us/kbase/test/auth2/lib/AuthenticationPasswordLoginTest.java b/src/test/java/us/kbase/test/auth2/lib/AuthenticationPasswordLoginTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/AuthenticationPasswordLoginTest.java rename to src/test/java/us/kbase/test/auth2/lib/AuthenticationPasswordLoginTest.java diff --git a/src/us/kbase/test/auth2/lib/AuthenticationPolicyIDTest.java b/src/test/java/us/kbase/test/auth2/lib/AuthenticationPolicyIDTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/AuthenticationPolicyIDTest.java rename to src/test/java/us/kbase/test/auth2/lib/AuthenticationPolicyIDTest.java diff --git a/src/us/kbase/test/auth2/lib/AuthenticationRoleTest.java b/src/test/java/us/kbase/test/auth2/lib/AuthenticationRoleTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/AuthenticationRoleTest.java rename to src/test/java/us/kbase/test/auth2/lib/AuthenticationRoleTest.java diff --git a/src/us/kbase/test/auth2/lib/AuthenticationTestModeGetUserDisplayNamesTest.java b/src/test/java/us/kbase/test/auth2/lib/AuthenticationTestModeGetUserDisplayNamesTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/AuthenticationTestModeGetUserDisplayNamesTest.java rename to src/test/java/us/kbase/test/auth2/lib/AuthenticationTestModeGetUserDisplayNamesTest.java diff --git a/src/us/kbase/test/auth2/lib/AuthenticationTestModeRoleTest.java b/src/test/java/us/kbase/test/auth2/lib/AuthenticationTestModeRoleTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/AuthenticationTestModeRoleTest.java rename to src/test/java/us/kbase/test/auth2/lib/AuthenticationTestModeRoleTest.java diff --git a/src/us/kbase/test/auth2/lib/AuthenticationTestModeTokenTest.java b/src/test/java/us/kbase/test/auth2/lib/AuthenticationTestModeTokenTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/AuthenticationTestModeTokenTest.java rename to src/test/java/us/kbase/test/auth2/lib/AuthenticationTestModeTokenTest.java diff --git a/src/us/kbase/test/auth2/lib/AuthenticationTestModeUserTest.java b/src/test/java/us/kbase/test/auth2/lib/AuthenticationTestModeUserTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/AuthenticationTestModeUserTest.java rename to src/test/java/us/kbase/test/auth2/lib/AuthenticationTestModeUserTest.java diff --git a/src/us/kbase/test/auth2/lib/AuthenticationTester.java b/src/test/java/us/kbase/test/auth2/lib/AuthenticationTester.java similarity index 100% rename from src/us/kbase/test/auth2/lib/AuthenticationTester.java rename to src/test/java/us/kbase/test/auth2/lib/AuthenticationTester.java diff --git a/src/us/kbase/test/auth2/lib/AuthenticationTokenTest.java b/src/test/java/us/kbase/test/auth2/lib/AuthenticationTokenTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/AuthenticationTokenTest.java rename to src/test/java/us/kbase/test/auth2/lib/AuthenticationTokenTest.java diff --git a/src/us/kbase/test/auth2/lib/AuthenticationUserUpdateTest.java b/src/test/java/us/kbase/test/auth2/lib/AuthenticationUserUpdateTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/AuthenticationUserUpdateTest.java rename to src/test/java/us/kbase/test/auth2/lib/AuthenticationUserUpdateTest.java diff --git a/src/us/kbase/test/auth2/lib/CustomRoleTest.java b/src/test/java/us/kbase/test/auth2/lib/CustomRoleTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/CustomRoleTest.java rename to src/test/java/us/kbase/test/auth2/lib/CustomRoleTest.java diff --git a/src/us/kbase/test/auth2/lib/DisplayNameTest.java b/src/test/java/us/kbase/test/auth2/lib/DisplayNameTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/DisplayNameTest.java rename to src/test/java/us/kbase/test/auth2/lib/DisplayNameTest.java diff --git a/src/us/kbase/test/auth2/lib/EmailAddressTest.java b/src/test/java/us/kbase/test/auth2/lib/EmailAddressTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/EmailAddressTest.java rename to src/test/java/us/kbase/test/auth2/lib/EmailAddressTest.java diff --git a/src/us/kbase/test/auth2/lib/LinkIdentitiesTest.java b/src/test/java/us/kbase/test/auth2/lib/LinkIdentitiesTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/LinkIdentitiesTest.java rename to src/test/java/us/kbase/test/auth2/lib/LinkIdentitiesTest.java diff --git a/src/us/kbase/test/auth2/lib/LinkTokenTest.java b/src/test/java/us/kbase/test/auth2/lib/LinkTokenTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/LinkTokenTest.java rename to src/test/java/us/kbase/test/auth2/lib/LinkTokenTest.java diff --git a/src/us/kbase/test/auth2/lib/LocalLoginResultTest.java b/src/test/java/us/kbase/test/auth2/lib/LocalLoginResultTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/LocalLoginResultTest.java rename to src/test/java/us/kbase/test/auth2/lib/LocalLoginResultTest.java diff --git a/src/us/kbase/test/auth2/lib/LoginStateTest.java b/src/test/java/us/kbase/test/auth2/lib/LoginStateTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/LoginStateTest.java rename to src/test/java/us/kbase/test/auth2/lib/LoginStateTest.java diff --git a/src/us/kbase/test/auth2/lib/LoginTokenTest.java b/src/test/java/us/kbase/test/auth2/lib/LoginTokenTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/LoginTokenTest.java rename to src/test/java/us/kbase/test/auth2/lib/LoginTokenTest.java diff --git a/src/us/kbase/test/auth2/lib/NameTest.java b/src/test/java/us/kbase/test/auth2/lib/NameTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/NameTest.java rename to src/test/java/us/kbase/test/auth2/lib/NameTest.java diff --git a/src/us/kbase/test/auth2/lib/OAuth2StartDataTest.java b/src/test/java/us/kbase/test/auth2/lib/OAuth2StartDataTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/OAuth2StartDataTest.java rename to src/test/java/us/kbase/test/auth2/lib/OAuth2StartDataTest.java diff --git a/src/us/kbase/test/auth2/lib/PasswordHashAndSaltTest.java b/src/test/java/us/kbase/test/auth2/lib/PasswordHashAndSaltTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/PasswordHashAndSaltTest.java rename to src/test/java/us/kbase/test/auth2/lib/PasswordHashAndSaltTest.java diff --git a/src/us/kbase/test/auth2/lib/PasswordTest.java b/src/test/java/us/kbase/test/auth2/lib/PasswordTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/PasswordTest.java rename to src/test/java/us/kbase/test/auth2/lib/PasswordTest.java diff --git a/src/us/kbase/test/auth2/lib/PolicyIDTest.java b/src/test/java/us/kbase/test/auth2/lib/PolicyIDTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/PolicyIDTest.java rename to src/test/java/us/kbase/test/auth2/lib/PolicyIDTest.java diff --git a/src/us/kbase/test/auth2/lib/RoleTest.java b/src/test/java/us/kbase/test/auth2/lib/RoleTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/RoleTest.java rename to src/test/java/us/kbase/test/auth2/lib/RoleTest.java diff --git a/src/us/kbase/test/auth2/lib/TemporarySessionDataTest.java b/src/test/java/us/kbase/test/auth2/lib/TemporarySessionDataTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/TemporarySessionDataTest.java rename to src/test/java/us/kbase/test/auth2/lib/TemporarySessionDataTest.java diff --git a/src/us/kbase/test/auth2/lib/TokenCreationContextTest.java b/src/test/java/us/kbase/test/auth2/lib/TokenCreationContextTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/TokenCreationContextTest.java rename to src/test/java/us/kbase/test/auth2/lib/TokenCreationContextTest.java diff --git a/src/us/kbase/test/auth2/lib/UserDisabledStateTest.java b/src/test/java/us/kbase/test/auth2/lib/UserDisabledStateTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/UserDisabledStateTest.java rename to src/test/java/us/kbase/test/auth2/lib/UserDisabledStateTest.java diff --git a/src/us/kbase/test/auth2/lib/UserNameTest.java b/src/test/java/us/kbase/test/auth2/lib/UserNameTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/UserNameTest.java rename to src/test/java/us/kbase/test/auth2/lib/UserNameTest.java diff --git a/src/us/kbase/test/auth2/lib/UserSearchSpecTest.java b/src/test/java/us/kbase/test/auth2/lib/UserSearchSpecTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/UserSearchSpecTest.java rename to src/test/java/us/kbase/test/auth2/lib/UserSearchSpecTest.java diff --git a/src/us/kbase/test/auth2/lib/UserUpdateTest.java b/src/test/java/us/kbase/test/auth2/lib/UserUpdateTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/UserUpdateTest.java rename to src/test/java/us/kbase/test/auth2/lib/UserUpdateTest.java diff --git a/src/us/kbase/test/auth2/lib/UtilsTest.java b/src/test/java/us/kbase/test/auth2/lib/UtilsTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/UtilsTest.java rename to src/test/java/us/kbase/test/auth2/lib/UtilsTest.java diff --git a/src/us/kbase/test/auth2/lib/ViewableUserTest.java b/src/test/java/us/kbase/test/auth2/lib/ViewableUserTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/ViewableUserTest.java rename to src/test/java/us/kbase/test/auth2/lib/ViewableUserTest.java diff --git a/src/us/kbase/test/auth2/lib/config/AuthConfigTest.java b/src/test/java/us/kbase/test/auth2/lib/config/AuthConfigTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/config/AuthConfigTest.java rename to src/test/java/us/kbase/test/auth2/lib/config/AuthConfigTest.java diff --git a/src/us/kbase/test/auth2/lib/config/CollectingExternalConfigTest.java b/src/test/java/us/kbase/test/auth2/lib/config/CollectingExternalConfigTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/config/CollectingExternalConfigTest.java rename to src/test/java/us/kbase/test/auth2/lib/config/CollectingExternalConfigTest.java diff --git a/src/us/kbase/test/auth2/lib/config/FailConfig.java b/src/test/java/us/kbase/test/auth2/lib/config/FailConfig.java similarity index 100% rename from src/us/kbase/test/auth2/lib/config/FailConfig.java rename to src/test/java/us/kbase/test/auth2/lib/config/FailConfig.java diff --git a/src/us/kbase/test/auth2/lib/config/TestExternalConfig.java b/src/test/java/us/kbase/test/auth2/lib/config/TestExternalConfig.java similarity index 100% rename from src/us/kbase/test/auth2/lib/config/TestExternalConfig.java rename to src/test/java/us/kbase/test/auth2/lib/config/TestExternalConfig.java diff --git a/src/us/kbase/test/auth2/lib/exceptions/ExceptionTest.java b/src/test/java/us/kbase/test/auth2/lib/exceptions/ExceptionTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/exceptions/ExceptionTest.java rename to src/test/java/us/kbase/test/auth2/lib/exceptions/ExceptionTest.java diff --git a/src/us/kbase/test/auth2/lib/identity/IdentityProviderConfigTest.java b/src/test/java/us/kbase/test/auth2/lib/identity/IdentityProviderConfigTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/identity/IdentityProviderConfigTest.java rename to src/test/java/us/kbase/test/auth2/lib/identity/IdentityProviderConfigTest.java diff --git a/src/us/kbase/test/auth2/lib/identity/RemoteIdentityTest.java b/src/test/java/us/kbase/test/auth2/lib/identity/RemoteIdentityTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/identity/RemoteIdentityTest.java rename to src/test/java/us/kbase/test/auth2/lib/identity/RemoteIdentityTest.java diff --git a/src/us/kbase/test/auth2/lib/storage/mongo/MongoStorageAnonymousIDTest.java b/src/test/java/us/kbase/test/auth2/lib/storage/mongo/MongoStorageAnonymousIDTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/storage/mongo/MongoStorageAnonymousIDTest.java rename to src/test/java/us/kbase/test/auth2/lib/storage/mongo/MongoStorageAnonymousIDTest.java diff --git a/src/us/kbase/test/auth2/lib/storage/mongo/MongoStorageConfigTest.java b/src/test/java/us/kbase/test/auth2/lib/storage/mongo/MongoStorageConfigTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/storage/mongo/MongoStorageConfigTest.java rename to src/test/java/us/kbase/test/auth2/lib/storage/mongo/MongoStorageConfigTest.java diff --git a/src/us/kbase/test/auth2/lib/storage/mongo/MongoStorageCustomRoleTest.java b/src/test/java/us/kbase/test/auth2/lib/storage/mongo/MongoStorageCustomRoleTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/storage/mongo/MongoStorageCustomRoleTest.java rename to src/test/java/us/kbase/test/auth2/lib/storage/mongo/MongoStorageCustomRoleTest.java diff --git a/src/us/kbase/test/auth2/lib/storage/mongo/MongoStorageDisableAccountTest.java b/src/test/java/us/kbase/test/auth2/lib/storage/mongo/MongoStorageDisableAccountTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/storage/mongo/MongoStorageDisableAccountTest.java rename to src/test/java/us/kbase/test/auth2/lib/storage/mongo/MongoStorageDisableAccountTest.java diff --git a/src/us/kbase/test/auth2/lib/storage/mongo/MongoStorageDuplicateKeyCheckerTest.java b/src/test/java/us/kbase/test/auth2/lib/storage/mongo/MongoStorageDuplicateKeyCheckerTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/storage/mongo/MongoStorageDuplicateKeyCheckerTest.java rename to src/test/java/us/kbase/test/auth2/lib/storage/mongo/MongoStorageDuplicateKeyCheckerTest.java diff --git a/src/us/kbase/test/auth2/lib/storage/mongo/MongoStorageGetDisplayNamesTest.java b/src/test/java/us/kbase/test/auth2/lib/storage/mongo/MongoStorageGetDisplayNamesTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/storage/mongo/MongoStorageGetDisplayNamesTest.java rename to src/test/java/us/kbase/test/auth2/lib/storage/mongo/MongoStorageGetDisplayNamesTest.java diff --git a/src/us/kbase/test/auth2/lib/storage/mongo/MongoStorageInvalidDBDataTest.java b/src/test/java/us/kbase/test/auth2/lib/storage/mongo/MongoStorageInvalidDBDataTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/storage/mongo/MongoStorageInvalidDBDataTest.java rename to src/test/java/us/kbase/test/auth2/lib/storage/mongo/MongoStorageInvalidDBDataTest.java diff --git a/src/us/kbase/test/auth2/lib/storage/mongo/MongoStorageLinkTest.java b/src/test/java/us/kbase/test/auth2/lib/storage/mongo/MongoStorageLinkTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/storage/mongo/MongoStorageLinkTest.java rename to src/test/java/us/kbase/test/auth2/lib/storage/mongo/MongoStorageLinkTest.java diff --git a/src/us/kbase/test/auth2/lib/storage/mongo/MongoStoragePasswordTest.java b/src/test/java/us/kbase/test/auth2/lib/storage/mongo/MongoStoragePasswordTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/storage/mongo/MongoStoragePasswordTest.java rename to src/test/java/us/kbase/test/auth2/lib/storage/mongo/MongoStoragePasswordTest.java diff --git a/src/us/kbase/test/auth2/lib/storage/mongo/MongoStorageRecanonicalizationTest.java b/src/test/java/us/kbase/test/auth2/lib/storage/mongo/MongoStorageRecanonicalizationTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/storage/mongo/MongoStorageRecanonicalizationTest.java rename to src/test/java/us/kbase/test/auth2/lib/storage/mongo/MongoStorageRecanonicalizationTest.java diff --git a/src/us/kbase/test/auth2/lib/storage/mongo/MongoStorageRolesTest.java b/src/test/java/us/kbase/test/auth2/lib/storage/mongo/MongoStorageRolesTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/storage/mongo/MongoStorageRolesTest.java rename to src/test/java/us/kbase/test/auth2/lib/storage/mongo/MongoStorageRolesTest.java diff --git a/src/us/kbase/test/auth2/lib/storage/mongo/MongoStorageStartUpTest.java b/src/test/java/us/kbase/test/auth2/lib/storage/mongo/MongoStorageStartUpTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/storage/mongo/MongoStorageStartUpTest.java rename to src/test/java/us/kbase/test/auth2/lib/storage/mongo/MongoStorageStartUpTest.java diff --git a/src/us/kbase/test/auth2/lib/storage/mongo/MongoStorageTempSessionDataTest.java b/src/test/java/us/kbase/test/auth2/lib/storage/mongo/MongoStorageTempSessionDataTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/storage/mongo/MongoStorageTempSessionDataTest.java rename to src/test/java/us/kbase/test/auth2/lib/storage/mongo/MongoStorageTempSessionDataTest.java diff --git a/src/us/kbase/test/auth2/lib/storage/mongo/MongoStorageTestCommon.java b/src/test/java/us/kbase/test/auth2/lib/storage/mongo/MongoStorageTestCommon.java similarity index 100% rename from src/us/kbase/test/auth2/lib/storage/mongo/MongoStorageTestCommon.java rename to src/test/java/us/kbase/test/auth2/lib/storage/mongo/MongoStorageTestCommon.java diff --git a/src/us/kbase/test/auth2/lib/storage/mongo/MongoStorageTestGetDisplayNamesTest.java b/src/test/java/us/kbase/test/auth2/lib/storage/mongo/MongoStorageTestGetDisplayNamesTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/storage/mongo/MongoStorageTestGetDisplayNamesTest.java rename to src/test/java/us/kbase/test/auth2/lib/storage/mongo/MongoStorageTestGetDisplayNamesTest.java diff --git a/src/us/kbase/test/auth2/lib/storage/mongo/MongoStorageTestRoleTest.java b/src/test/java/us/kbase/test/auth2/lib/storage/mongo/MongoStorageTestRoleTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/storage/mongo/MongoStorageTestRoleTest.java rename to src/test/java/us/kbase/test/auth2/lib/storage/mongo/MongoStorageTestRoleTest.java diff --git a/src/us/kbase/test/auth2/lib/storage/mongo/MongoStorageTestTokensTest.java b/src/test/java/us/kbase/test/auth2/lib/storage/mongo/MongoStorageTestTokensTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/storage/mongo/MongoStorageTestTokensTest.java rename to src/test/java/us/kbase/test/auth2/lib/storage/mongo/MongoStorageTestTokensTest.java diff --git a/src/us/kbase/test/auth2/lib/storage/mongo/MongoStorageTestUserCreateGetTest.java b/src/test/java/us/kbase/test/auth2/lib/storage/mongo/MongoStorageTestUserCreateGetTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/storage/mongo/MongoStorageTestUserCreateGetTest.java rename to src/test/java/us/kbase/test/auth2/lib/storage/mongo/MongoStorageTestUserCreateGetTest.java diff --git a/src/us/kbase/test/auth2/lib/storage/mongo/MongoStorageTester.java b/src/test/java/us/kbase/test/auth2/lib/storage/mongo/MongoStorageTester.java similarity index 100% rename from src/us/kbase/test/auth2/lib/storage/mongo/MongoStorageTester.java rename to src/test/java/us/kbase/test/auth2/lib/storage/mongo/MongoStorageTester.java diff --git a/src/us/kbase/test/auth2/lib/storage/mongo/MongoStorageTokensTest.java b/src/test/java/us/kbase/test/auth2/lib/storage/mongo/MongoStorageTokensTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/storage/mongo/MongoStorageTokensTest.java rename to src/test/java/us/kbase/test/auth2/lib/storage/mongo/MongoStorageTokensTest.java diff --git a/src/us/kbase/test/auth2/lib/storage/mongo/MongoStorageUpdateUserFieldsTest.java b/src/test/java/us/kbase/test/auth2/lib/storage/mongo/MongoStorageUpdateUserFieldsTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/storage/mongo/MongoStorageUpdateUserFieldsTest.java rename to src/test/java/us/kbase/test/auth2/lib/storage/mongo/MongoStorageUpdateUserFieldsTest.java diff --git a/src/us/kbase/test/auth2/lib/storage/mongo/MongoStorageUserCreateGetTest.java b/src/test/java/us/kbase/test/auth2/lib/storage/mongo/MongoStorageUserCreateGetTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/storage/mongo/MongoStorageUserCreateGetTest.java rename to src/test/java/us/kbase/test/auth2/lib/storage/mongo/MongoStorageUserCreateGetTest.java diff --git a/src/us/kbase/test/auth2/lib/token/TokenNameTest.java b/src/test/java/us/kbase/test/auth2/lib/token/TokenNameTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/token/TokenNameTest.java rename to src/test/java/us/kbase/test/auth2/lib/token/TokenNameTest.java diff --git a/src/us/kbase/test/auth2/lib/token/TokenTest.java b/src/test/java/us/kbase/test/auth2/lib/token/TokenTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/token/TokenTest.java rename to src/test/java/us/kbase/test/auth2/lib/token/TokenTest.java diff --git a/src/us/kbase/test/auth2/lib/user/AuthUserTest.java b/src/test/java/us/kbase/test/auth2/lib/user/AuthUserTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/user/AuthUserTest.java rename to src/test/java/us/kbase/test/auth2/lib/user/AuthUserTest.java diff --git a/src/us/kbase/test/auth2/lib/user/LocalUserTest.java b/src/test/java/us/kbase/test/auth2/lib/user/LocalUserTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/user/LocalUserTest.java rename to src/test/java/us/kbase/test/auth2/lib/user/LocalUserTest.java diff --git a/src/us/kbase/test/auth2/lib/user/NewUserTest.java b/src/test/java/us/kbase/test/auth2/lib/user/NewUserTest.java similarity index 100% rename from src/us/kbase/test/auth2/lib/user/NewUserTest.java rename to src/test/java/us/kbase/test/auth2/lib/user/NewUserTest.java diff --git a/src/us/kbase/test/auth2/providers/GlobusIdentityProviderTest.java b/src/test/java/us/kbase/test/auth2/providers/GlobusIdentityProviderTest.java similarity index 100% rename from src/us/kbase/test/auth2/providers/GlobusIdentityProviderTest.java rename to src/test/java/us/kbase/test/auth2/providers/GlobusIdentityProviderTest.java diff --git a/src/us/kbase/test/auth2/providers/GoogleIdentityProviderTest.java b/src/test/java/us/kbase/test/auth2/providers/GoogleIdentityProviderTest.java similarity index 100% rename from src/us/kbase/test/auth2/providers/GoogleIdentityProviderTest.java rename to src/test/java/us/kbase/test/auth2/providers/GoogleIdentityProviderTest.java diff --git a/src/us/kbase/test/auth2/providers/OrcIDIdentityProviderTest.java b/src/test/java/us/kbase/test/auth2/providers/OrcIDIdentityProviderTest.java similarity index 100% rename from src/us/kbase/test/auth2/providers/OrcIDIdentityProviderTest.java rename to src/test/java/us/kbase/test/auth2/providers/OrcIDIdentityProviderTest.java diff --git a/src/us/kbase/test/auth2/service/AuthExternalConfigTest.java b/src/test/java/us/kbase/test/auth2/service/AuthExternalConfigTest.java similarity index 100% rename from src/us/kbase/test/auth2/service/AuthExternalConfigTest.java rename to src/test/java/us/kbase/test/auth2/service/AuthExternalConfigTest.java diff --git a/src/us/kbase/test/auth2/service/LoggingFilterTest.java b/src/test/java/us/kbase/test/auth2/service/LoggingFilterTest.java similarity index 100% rename from src/us/kbase/test/auth2/service/LoggingFilterTest.java rename to src/test/java/us/kbase/test/auth2/service/LoggingFilterTest.java diff --git a/src/us/kbase/test/auth2/service/ServiceTestUtils.java b/src/test/java/us/kbase/test/auth2/service/ServiceTestUtils.java similarity index 100% rename from src/us/kbase/test/auth2/service/ServiceTestUtils.java rename to src/test/java/us/kbase/test/auth2/service/ServiceTestUtils.java diff --git a/src/us/kbase/test/auth2/service/api/APITokenTest.java b/src/test/java/us/kbase/test/auth2/service/api/APITokenTest.java similarity index 100% rename from src/us/kbase/test/auth2/service/api/APITokenTest.java rename to src/test/java/us/kbase/test/auth2/service/api/APITokenTest.java diff --git a/src/us/kbase/test/auth2/service/api/AdminIntegrationTest.java b/src/test/java/us/kbase/test/auth2/service/api/AdminIntegrationTest.java similarity index 100% rename from src/us/kbase/test/auth2/service/api/AdminIntegrationTest.java rename to src/test/java/us/kbase/test/auth2/service/api/AdminIntegrationTest.java diff --git a/src/us/kbase/test/auth2/service/api/AdminTest.java b/src/test/java/us/kbase/test/auth2/service/api/AdminTest.java similarity index 100% rename from src/us/kbase/test/auth2/service/api/AdminTest.java rename to src/test/java/us/kbase/test/auth2/service/api/AdminTest.java diff --git a/src/us/kbase/test/auth2/service/api/TestModeIntegrationTest.java b/src/test/java/us/kbase/test/auth2/service/api/TestModeIntegrationTest.java similarity index 100% rename from src/us/kbase/test/auth2/service/api/TestModeIntegrationTest.java rename to src/test/java/us/kbase/test/auth2/service/api/TestModeIntegrationTest.java diff --git a/src/us/kbase/test/auth2/service/api/TestModeTest.java b/src/test/java/us/kbase/test/auth2/service/api/TestModeTest.java similarity index 100% rename from src/us/kbase/test/auth2/service/api/TestModeTest.java rename to src/test/java/us/kbase/test/auth2/service/api/TestModeTest.java diff --git a/src/us/kbase/test/auth2/service/api/TokenEndpointTest.java b/src/test/java/us/kbase/test/auth2/service/api/TokenEndpointTest.java similarity index 100% rename from src/us/kbase/test/auth2/service/api/TokenEndpointTest.java rename to src/test/java/us/kbase/test/auth2/service/api/TokenEndpointTest.java diff --git a/src/us/kbase/test/auth2/service/api/UserEndpointTest.java b/src/test/java/us/kbase/test/auth2/service/api/UserEndpointTest.java similarity index 100% rename from src/us/kbase/test/auth2/service/api/UserEndpointTest.java rename to src/test/java/us/kbase/test/auth2/service/api/UserEndpointTest.java diff --git a/src/us/kbase/test/auth2/service/api/package-info.java b/src/test/java/us/kbase/test/auth2/service/api/package-info.java similarity index 100% rename from src/us/kbase/test/auth2/service/api/package-info.java rename to src/test/java/us/kbase/test/auth2/service/api/package-info.java diff --git a/src/us/kbase/test/auth2/service/common/ExternalTokenTest.java b/src/test/java/us/kbase/test/auth2/service/common/ExternalTokenTest.java similarity index 100% rename from src/us/kbase/test/auth2/service/common/ExternalTokenTest.java rename to src/test/java/us/kbase/test/auth2/service/common/ExternalTokenTest.java diff --git a/src/us/kbase/test/auth2/service/common/FailOnInstantiation.java b/src/test/java/us/kbase/test/auth2/service/common/FailOnInstantiation.java similarity index 100% rename from src/us/kbase/test/auth2/service/common/FailOnInstantiation.java rename to src/test/java/us/kbase/test/auth2/service/common/FailOnInstantiation.java diff --git a/src/us/kbase/test/auth2/service/common/FailOnInstantiationNoNullaryConstructor.java b/src/test/java/us/kbase/test/auth2/service/common/FailOnInstantiationNoNullaryConstructor.java similarity index 100% rename from src/us/kbase/test/auth2/service/common/FailOnInstantiationNoNullaryConstructor.java rename to src/test/java/us/kbase/test/auth2/service/common/FailOnInstantiationNoNullaryConstructor.java diff --git a/src/us/kbase/test/auth2/service/common/FailOnInstantiationPrivateConstructor.java b/src/test/java/us/kbase/test/auth2/service/common/FailOnInstantiationPrivateConstructor.java similarity index 100% rename from src/us/kbase/test/auth2/service/common/FailOnInstantiationPrivateConstructor.java rename to src/test/java/us/kbase/test/auth2/service/common/FailOnInstantiationPrivateConstructor.java diff --git a/src/us/kbase/test/auth2/service/common/IncomingJSONTest.java b/src/test/java/us/kbase/test/auth2/service/common/IncomingJSONTest.java similarity index 100% rename from src/us/kbase/test/auth2/service/common/IncomingJSONTest.java rename to src/test/java/us/kbase/test/auth2/service/common/IncomingJSONTest.java diff --git a/src/us/kbase/test/auth2/service/common/ServiceCommonTest.java b/src/test/java/us/kbase/test/auth2/service/common/ServiceCommonTest.java similarity index 100% rename from src/us/kbase/test/auth2/service/common/ServiceCommonTest.java rename to src/test/java/us/kbase/test/auth2/service/common/ServiceCommonTest.java diff --git a/src/us/kbase/test/auth2/service/common/package-info.java b/src/test/java/us/kbase/test/auth2/service/common/package-info.java similarity index 100% rename from src/us/kbase/test/auth2/service/common/package-info.java rename to src/test/java/us/kbase/test/auth2/service/common/package-info.java diff --git a/src/us/kbase/test/auth2/service/ui/AdminIntegrationTest.java b/src/test/java/us/kbase/test/auth2/service/ui/AdminIntegrationTest.java similarity index 100% rename from src/us/kbase/test/auth2/service/ui/AdminIntegrationTest.java rename to src/test/java/us/kbase/test/auth2/service/ui/AdminIntegrationTest.java diff --git a/src/us/kbase/test/auth2/service/ui/AdminTest.java b/src/test/java/us/kbase/test/auth2/service/ui/AdminTest.java similarity index 100% rename from src/us/kbase/test/auth2/service/ui/AdminTest.java rename to src/test/java/us/kbase/test/auth2/service/ui/AdminTest.java diff --git a/src/us/kbase/test/auth2/service/ui/LinkTest.java b/src/test/java/us/kbase/test/auth2/service/ui/LinkTest.java similarity index 100% rename from src/us/kbase/test/auth2/service/ui/LinkTest.java rename to src/test/java/us/kbase/test/auth2/service/ui/LinkTest.java diff --git a/src/us/kbase/test/auth2/service/ui/LoginTest.java b/src/test/java/us/kbase/test/auth2/service/ui/LoginTest.java similarity index 100% rename from src/us/kbase/test/auth2/service/ui/LoginTest.java rename to src/test/java/us/kbase/test/auth2/service/ui/LoginTest.java diff --git a/src/us/kbase/test/auth2/service/ui/MeTest.java b/src/test/java/us/kbase/test/auth2/service/ui/MeTest.java similarity index 100% rename from src/us/kbase/test/auth2/service/ui/MeTest.java rename to src/test/java/us/kbase/test/auth2/service/ui/MeTest.java diff --git a/src/us/kbase/test/auth2/service/ui/PKCEChallengeMatcher.java b/src/test/java/us/kbase/test/auth2/service/ui/PKCEChallengeMatcher.java similarity index 100% rename from src/us/kbase/test/auth2/service/ui/PKCEChallengeMatcher.java rename to src/test/java/us/kbase/test/auth2/service/ui/PKCEChallengeMatcher.java diff --git a/src/us/kbase/test/auth2/service/ui/SimpleEndpointsTest.java b/src/test/java/us/kbase/test/auth2/service/ui/SimpleEndpointsTest.java similarity index 100% rename from src/us/kbase/test/auth2/service/ui/SimpleEndpointsTest.java rename to src/test/java/us/kbase/test/auth2/service/ui/SimpleEndpointsTest.java diff --git a/src/us/kbase/test/auth2/service/ui/StateMatcher.java b/src/test/java/us/kbase/test/auth2/service/ui/StateMatcher.java similarity index 100% rename from src/us/kbase/test/auth2/service/ui/StateMatcher.java rename to src/test/java/us/kbase/test/auth2/service/ui/StateMatcher.java diff --git a/src/us/kbase/test/auth2/service/ui/TokensTest.java b/src/test/java/us/kbase/test/auth2/service/ui/TokensTest.java similarity index 100% rename from src/us/kbase/test/auth2/service/ui/TokensTest.java rename to src/test/java/us/kbase/test/auth2/service/ui/TokensTest.java diff --git a/src/us/kbase/test/auth2/service/ui/UITokensTest.java b/src/test/java/us/kbase/test/auth2/service/ui/UITokensTest.java similarity index 100% rename from src/us/kbase/test/auth2/service/ui/UITokensTest.java rename to src/test/java/us/kbase/test/auth2/service/ui/UITokensTest.java diff --git a/src/us/kbase/test/auth2/service/ui/UIUtilsTest.java b/src/test/java/us/kbase/test/auth2/service/ui/UIUtilsTest.java similarity index 100% rename from src/us/kbase/test/auth2/service/ui/UIUtilsTest.java rename to src/test/java/us/kbase/test/auth2/service/ui/UIUtilsTest.java diff --git a/src/us/kbase/test/auth2/service/ui/package-info.java b/src/test/java/us/kbase/test/auth2/service/ui/package-info.java similarity index 100% rename from src/us/kbase/test/auth2/service/ui/package-info.java rename to src/test/java/us/kbase/test/auth2/service/ui/package-info.java diff --git a/src/us/kbase/test/auth2/service/ui/AdminIntegrationTest_userDisplay.testdata b/src/test/resources/us/kbase/test/auth2/service/ui/AdminIntegrationTest_userDisplay.testdata similarity index 100% rename from src/us/kbase/test/auth2/service/ui/AdminIntegrationTest_userDisplay.testdata rename to src/test/resources/us/kbase/test/auth2/service/ui/AdminIntegrationTest_userDisplay.testdata diff --git a/src/us/kbase/test/auth2/service/ui/LinkTest_linkChoiceHTML.testdata b/src/test/resources/us/kbase/test/auth2/service/ui/LinkTest_linkChoiceHTML.testdata similarity index 100% rename from src/us/kbase/test/auth2/service/ui/LinkTest_linkChoiceHTML.testdata rename to src/test/resources/us/kbase/test/auth2/service/ui/LinkTest_linkChoiceHTML.testdata diff --git a/src/us/kbase/test/auth2/service/ui/LinkTest_linkChoiceHTMLNoLinks.testdata b/src/test/resources/us/kbase/test/auth2/service/ui/LinkTest_linkChoiceHTMLNoLinks.testdata similarity index 100% rename from src/us/kbase/test/auth2/service/ui/LinkTest_linkChoiceHTMLNoLinks.testdata rename to src/test/resources/us/kbase/test/auth2/service/ui/LinkTest_linkChoiceHTMLNoLinks.testdata diff --git a/src/us/kbase/test/auth2/service/ui/LinkTest_linkChoiceHTMLOnlyLinks.testdata b/src/test/resources/us/kbase/test/auth2/service/ui/LinkTest_linkChoiceHTMLOnlyLinks.testdata similarity index 100% rename from src/us/kbase/test/auth2/service/ui/LinkTest_linkChoiceHTMLOnlyLinks.testdata rename to src/test/resources/us/kbase/test/auth2/service/ui/LinkTest_linkChoiceHTMLOnlyLinks.testdata diff --git a/src/us/kbase/test/auth2/service/ui/LinkTest_linkChoiceHTMLTrailingSlash.testdata b/src/test/resources/us/kbase/test/auth2/service/ui/LinkTest_linkChoiceHTMLTrailingSlash.testdata similarity index 100% rename from src/us/kbase/test/auth2/service/ui/LinkTest_linkChoiceHTMLTrailingSlash.testdata rename to src/test/resources/us/kbase/test/auth2/service/ui/LinkTest_linkChoiceHTMLTrailingSlash.testdata diff --git a/src/us/kbase/test/auth2/service/ui/LinkTest_linkDisplayNoProviders.testdata b/src/test/resources/us/kbase/test/auth2/service/ui/LinkTest_linkDisplayNoProviders.testdata similarity index 100% rename from src/us/kbase/test/auth2/service/ui/LinkTest_linkDisplayNoProviders.testdata rename to src/test/resources/us/kbase/test/auth2/service/ui/LinkTest_linkDisplayNoProviders.testdata diff --git a/src/us/kbase/test/auth2/service/ui/LinkTest_linkDisplayWithLocalUser.testdata b/src/test/resources/us/kbase/test/auth2/service/ui/LinkTest_linkDisplayWithLocalUser.testdata similarity index 100% rename from src/us/kbase/test/auth2/service/ui/LinkTest_linkDisplayWithLocalUser.testdata rename to src/test/resources/us/kbase/test/auth2/service/ui/LinkTest_linkDisplayWithLocalUser.testdata diff --git a/src/us/kbase/test/auth2/service/ui/LinkTest_linkDisplayWithOneProvider.testdata b/src/test/resources/us/kbase/test/auth2/service/ui/LinkTest_linkDisplayWithOneProvider.testdata similarity index 100% rename from src/us/kbase/test/auth2/service/ui/LinkTest_linkDisplayWithOneProvider.testdata rename to src/test/resources/us/kbase/test/auth2/service/ui/LinkTest_linkDisplayWithOneProvider.testdata diff --git a/src/us/kbase/test/auth2/service/ui/LinkTest_linkDisplayWithTwoProviders.testdata b/src/test/resources/us/kbase/test/auth2/service/ui/LinkTest_linkDisplayWithTwoProviders.testdata similarity index 100% rename from src/us/kbase/test/auth2/service/ui/LinkTest_linkDisplayWithTwoProviders.testdata rename to src/test/resources/us/kbase/test/auth2/service/ui/LinkTest_linkDisplayWithTwoProviders.testdata diff --git a/src/us/kbase/test/auth2/service/ui/LoginTest_loginChoice2CreateAndLoginDisabled.testdata b/src/test/resources/us/kbase/test/auth2/service/ui/LoginTest_loginChoice2CreateAndLoginDisabled.testdata similarity index 100% rename from src/us/kbase/test/auth2/service/ui/LoginTest_loginChoice2CreateAndLoginDisabled.testdata rename to src/test/resources/us/kbase/test/auth2/service/ui/LoginTest_loginChoice2CreateAndLoginDisabled.testdata diff --git a/src/us/kbase/test/auth2/service/ui/LoginTest_loginChoice2CreateWithRedirectURL.testdata b/src/test/resources/us/kbase/test/auth2/service/ui/LoginTest_loginChoice2CreateWithRedirectURL.testdata similarity index 100% rename from src/us/kbase/test/auth2/service/ui/LoginTest_loginChoice2CreateWithRedirectURL.testdata rename to src/test/resources/us/kbase/test/auth2/service/ui/LoginTest_loginChoice2CreateWithRedirectURL.testdata diff --git a/src/us/kbase/test/auth2/service/ui/LoginTest_loginChoice2LoginWithRedirectAndLoginDisabled.testdata b/src/test/resources/us/kbase/test/auth2/service/ui/LoginTest_loginChoice2LoginWithRedirectAndLoginDisabled.testdata similarity index 100% rename from src/us/kbase/test/auth2/service/ui/LoginTest_loginChoice2LoginWithRedirectAndLoginDisabled.testdata rename to src/test/resources/us/kbase/test/auth2/service/ui/LoginTest_loginChoice2LoginWithRedirectAndLoginDisabled.testdata diff --git a/src/us/kbase/test/auth2/service/ui/LoginTest_loginChoice3Create2Login.testdata b/src/test/resources/us/kbase/test/auth2/service/ui/LoginTest_loginChoice3Create2Login.testdata similarity index 100% rename from src/us/kbase/test/auth2/service/ui/LoginTest_loginChoice3Create2Login.testdata rename to src/test/resources/us/kbase/test/auth2/service/ui/LoginTest_loginChoice3Create2Login.testdata diff --git a/src/us/kbase/test/auth2/service/ui/LoginTest_startDisplayLoginDisabled.testdata b/src/test/resources/us/kbase/test/auth2/service/ui/LoginTest_startDisplayLoginDisabled.testdata similarity index 100% rename from src/us/kbase/test/auth2/service/ui/LoginTest_startDisplayLoginDisabled.testdata rename to src/test/resources/us/kbase/test/auth2/service/ui/LoginTest_startDisplayLoginDisabled.testdata diff --git a/src/us/kbase/test/auth2/service/ui/LoginTest_startDisplayWithOneProvider.testdata b/src/test/resources/us/kbase/test/auth2/service/ui/LoginTest_startDisplayWithOneProvider.testdata similarity index 100% rename from src/us/kbase/test/auth2/service/ui/LoginTest_startDisplayWithOneProvider.testdata rename to src/test/resources/us/kbase/test/auth2/service/ui/LoginTest_startDisplayWithOneProvider.testdata diff --git a/src/us/kbase/test/auth2/service/ui/LoginTest_startDisplayWithTwoProviders.testdata b/src/test/resources/us/kbase/test/auth2/service/ui/LoginTest_startDisplayWithTwoProviders.testdata similarity index 100% rename from src/us/kbase/test/auth2/service/ui/LoginTest_startDisplayWithTwoProviders.testdata rename to src/test/resources/us/kbase/test/auth2/service/ui/LoginTest_startDisplayWithTwoProviders.testdata diff --git a/src/us/kbase/test/auth2/service/ui/MeTest_getMeMaximalInput.testdata b/src/test/resources/us/kbase/test/auth2/service/ui/MeTest_getMeMaximalInput.testdata similarity index 100% rename from src/us/kbase/test/auth2/service/ui/MeTest_getMeMaximalInput.testdata rename to src/test/resources/us/kbase/test/auth2/service/ui/MeTest_getMeMaximalInput.testdata diff --git a/src/us/kbase/test/auth2/service/ui/MeTest_getMeMinimalInput.testdata b/src/test/resources/us/kbase/test/auth2/service/ui/MeTest_getMeMinimalInput.testdata similarity index 100% rename from src/us/kbase/test/auth2/service/ui/MeTest_getMeMinimalInput.testdata rename to src/test/resources/us/kbase/test/auth2/service/ui/MeTest_getMeMinimalInput.testdata diff --git a/src/us/kbase/test/auth2/service/ui/SimpleEndpointsTest_customRolesEmpty.testdata b/src/test/resources/us/kbase/test/auth2/service/ui/SimpleEndpointsTest_customRolesEmpty.testdata similarity index 100% rename from src/us/kbase/test/auth2/service/ui/SimpleEndpointsTest_customRolesEmpty.testdata rename to src/test/resources/us/kbase/test/auth2/service/ui/SimpleEndpointsTest_customRolesEmpty.testdata diff --git a/src/us/kbase/test/auth2/service/ui/SimpleEndpointsTest_customRolesFull.testdata b/src/test/resources/us/kbase/test/auth2/service/ui/SimpleEndpointsTest_customRolesFull.testdata similarity index 100% rename from src/us/kbase/test/auth2/service/ui/SimpleEndpointsTest_customRolesFull.testdata rename to src/test/resources/us/kbase/test/auth2/service/ui/SimpleEndpointsTest_customRolesFull.testdata diff --git a/src/us/kbase/test/auth2/service/ui/SimpleEndpointsTest_localLoginDisplay.testdata b/src/test/resources/us/kbase/test/auth2/service/ui/SimpleEndpointsTest_localLoginDisplay.testdata similarity index 100% rename from src/us/kbase/test/auth2/service/ui/SimpleEndpointsTest_localLoginDisplay.testdata rename to src/test/resources/us/kbase/test/auth2/service/ui/SimpleEndpointsTest_localLoginDisplay.testdata diff --git a/src/us/kbase/test/auth2/service/ui/SimpleEndpointsTest_localLoginResetDisplayNoUser.testdata b/src/test/resources/us/kbase/test/auth2/service/ui/SimpleEndpointsTest_localLoginResetDisplayNoUser.testdata similarity index 100% rename from src/us/kbase/test/auth2/service/ui/SimpleEndpointsTest_localLoginResetDisplayNoUser.testdata rename to src/test/resources/us/kbase/test/auth2/service/ui/SimpleEndpointsTest_localLoginResetDisplayNoUser.testdata diff --git a/src/us/kbase/test/auth2/service/ui/SimpleEndpointsTest_localLoginResetDisplayWithUser.testdata b/src/test/resources/us/kbase/test/auth2/service/ui/SimpleEndpointsTest_localLoginResetDisplayWithUser.testdata similarity index 100% rename from src/us/kbase/test/auth2/service/ui/SimpleEndpointsTest_localLoginResetDisplayWithUser.testdata rename to src/test/resources/us/kbase/test/auth2/service/ui/SimpleEndpointsTest_localLoginResetDisplayWithUser.testdata diff --git a/src/us/kbase/test/auth2/service/ui/SimpleEndpointsTest_logoutDisplay.testdata b/src/test/resources/us/kbase/test/auth2/service/ui/SimpleEndpointsTest_logoutDisplay.testdata similarity index 100% rename from src/us/kbase/test/auth2/service/ui/SimpleEndpointsTest_logoutDisplay.testdata rename to src/test/resources/us/kbase/test/auth2/service/ui/SimpleEndpointsTest_logoutDisplay.testdata diff --git a/src/us/kbase/test/auth2/service/ui/SimpleEndpointsTest_logoutWithBadTokenHTML.testdata b/src/test/resources/us/kbase/test/auth2/service/ui/SimpleEndpointsTest_logoutWithBadTokenHTML.testdata similarity index 100% rename from src/us/kbase/test/auth2/service/ui/SimpleEndpointsTest_logoutWithBadTokenHTML.testdata rename to src/test/resources/us/kbase/test/auth2/service/ui/SimpleEndpointsTest_logoutWithBadTokenHTML.testdata diff --git a/src/us/kbase/test/auth2/service/ui/SimpleEndpointsTest_logoutWithGoodTokenHTML.testdata b/src/test/resources/us/kbase/test/auth2/service/ui/SimpleEndpointsTest_logoutWithGoodTokenHTML.testdata similarity index 100% rename from src/us/kbase/test/auth2/service/ui/SimpleEndpointsTest_logoutWithGoodTokenHTML.testdata rename to src/test/resources/us/kbase/test/auth2/service/ui/SimpleEndpointsTest_logoutWithGoodTokenHTML.testdata diff --git a/src/us/kbase/test/auth2/service/ui/SimpleEndpointsTest_rootHTML.testdata b/src/test/resources/us/kbase/test/auth2/service/ui/SimpleEndpointsTest_rootHTML.testdata similarity index 100% rename from src/us/kbase/test/auth2/service/ui/SimpleEndpointsTest_rootHTML.testdata rename to src/test/resources/us/kbase/test/auth2/service/ui/SimpleEndpointsTest_rootHTML.testdata diff --git a/src/us/kbase/test/auth2/service/ui/TokensTest_createTokenMaximalInput.testdata b/src/test/resources/us/kbase/test/auth2/service/ui/TokensTest_createTokenMaximalInput.testdata similarity index 100% rename from src/us/kbase/test/auth2/service/ui/TokensTest_createTokenMaximalInput.testdata rename to src/test/resources/us/kbase/test/auth2/service/ui/TokensTest_createTokenMaximalInput.testdata diff --git a/src/us/kbase/test/auth2/service/ui/TokensTest_createTokenMinimalInput.testdata b/src/test/resources/us/kbase/test/auth2/service/ui/TokensTest_createTokenMinimalInput.testdata similarity index 100% rename from src/us/kbase/test/auth2/service/ui/TokensTest_createTokenMinimalInput.testdata rename to src/test/resources/us/kbase/test/auth2/service/ui/TokensTest_createTokenMinimalInput.testdata diff --git a/src/us/kbase/test/auth2/service/ui/TokensTest_getTokensMaximalInput.testdata b/src/test/resources/us/kbase/test/auth2/service/ui/TokensTest_getTokensMaximalInput.testdata similarity index 100% rename from src/us/kbase/test/auth2/service/ui/TokensTest_getTokensMaximalInput.testdata rename to src/test/resources/us/kbase/test/auth2/service/ui/TokensTest_getTokensMaximalInput.testdata diff --git a/src/us/kbase/test/auth2/service/ui/TokensTest_getTokensMinimalInput.testdata b/src/test/resources/us/kbase/test/auth2/service/ui/TokensTest_getTokensMinimalInput.testdata similarity index 100% rename from src/us/kbase/test/auth2/service/ui/TokensTest_getTokensMinimalInput.testdata rename to src/test/resources/us/kbase/test/auth2/service/ui/TokensTest_getTokensMinimalInput.testdata