Use standard Gradle source locations

kbase · Apr 18, 2024 · 16a9afb · 16a9afb
1 parent 644f76b
commit 16a9afb
Show file tree

Hide file tree

Showing 180 changed files with 0 additions and 88 deletions.
diff --git a/.classpath b/.classpath
diff --git a/build.gradle b/build.gradle
@@ -9,7 +9,6 @@ plugins {
 	id 'org.ajoberstar.grgit' version '4.1.1'
 }
 
-// TODO NOW run tests from Eclipse w/o specifying classpath manually & remove sourceSets & classpath
 // TODO NOW update any ant refs in docs to gradle
 
 repositories {
@@ -67,26 +66,6 @@ war {
 	webXml = file('war/web.xml')
 }
 
-// Custom java project layout
-sourceSets {
-	main {
-		java {
-			srcDirs = ["src"]
-			exclude '**/test/**'
-		}
-	}
-	test {
-		java {
-			srcDirs = ["src"]
-			include '**/test/**'
-		}
-		resources {
-			srcDirs = ["src"]
-			include "**/*wsjars"
-		}
-	}
-}
-
 configurations {
 	// can't directly access testImplementation, so extend and access
 	testimpl.extendsFrom testImplementation

diff --git a/src/us/kbase/groups/GitCommit.java → src/main/java/us/kbase/groups/GitCommit.java b/src/us/kbase/groups/GitCommit.java → src/main/java/us/kbase/groups/GitCommit.java
diff --git a/src/us/kbase/groups/build/GroupsBuilder.java → .../us/kbase/groups/build/GroupsBuilder.java b/src/us/kbase/groups/build/GroupsBuilder.java → .../us/kbase/groups/build/GroupsBuilder.java
diff --git a/...taloghandler/SDKClientCatalogHandler.java → ...taloghandler/SDKClientCatalogHandler.java b/...taloghandler/SDKClientCatalogHandler.java → ...taloghandler/SDKClientCatalogHandler.java
diff --git a/src/us/kbase/groups/config/GroupsConfig.java → .../us/kbase/groups/config/GroupsConfig.java b/src/us/kbase/groups/config/GroupsConfig.java → .../us/kbase/groups/config/GroupsConfig.java
diff --git a/.../config/GroupsConfigurationException.java → .../config/GroupsConfigurationException.java b/.../config/GroupsConfigurationException.java → .../config/GroupsConfigurationException.java
diff --git a/.../kbase/groups/core/CreateAndModTimes.java → .../kbase/groups/core/CreateAndModTimes.java b/.../kbase/groups/core/CreateAndModTimes.java → .../kbase/groups/core/CreateAndModTimes.java
diff --git a/.../groups/core/CreateModAndExpireTimes.java → .../groups/core/CreateModAndExpireTimes.java b/.../groups/core/CreateModAndExpireTimes.java → .../groups/core/CreateModAndExpireTimes.java
diff --git a/src/us/kbase/groups/core/FieldItem.java → .../java/us/kbase/groups/core/FieldItem.java b/src/us/kbase/groups/core/FieldItem.java → .../java/us/kbase/groups/core/FieldItem.java
diff --git a/...us/kbase/groups/core/GetGroupsParams.java → ...us/kbase/groups/core/GetGroupsParams.java b/...us/kbase/groups/core/GetGroupsParams.java → ...us/kbase/groups/core/GetGroupsParams.java
diff --git a/.../kbase/groups/core/GetRequestsParams.java → .../kbase/groups/core/GetRequestsParams.java b/.../kbase/groups/core/GetRequestsParams.java → .../kbase/groups/core/GetRequestsParams.java
diff --git a/src/us/kbase/groups/core/Group.java → ...main/java/us/kbase/groups/core/Group.java b/src/us/kbase/groups/core/Group.java → ...main/java/us/kbase/groups/core/Group.java
diff --git a/...base/groups/core/GroupCreationParams.java → ...base/groups/core/GroupCreationParams.java b/...base/groups/core/GroupCreationParams.java → ...base/groups/core/GroupCreationParams.java
diff --git a/...s/kbase/groups/core/GroupHasRequests.java → ...s/kbase/groups/core/GroupHasRequests.java b/...s/kbase/groups/core/GroupHasRequests.java → ...s/kbase/groups/core/GroupHasRequests.java
diff --git a/src/us/kbase/groups/core/GroupID.java → ...in/java/us/kbase/groups/core/GroupID.java b/src/us/kbase/groups/core/GroupID.java → ...in/java/us/kbase/groups/core/GroupID.java
diff --git a/src/us/kbase/groups/core/GroupIDAndName.java → .../us/kbase/groups/core/GroupIDAndName.java b/src/us/kbase/groups/core/GroupIDAndName.java → .../us/kbase/groups/core/GroupIDAndName.java
diff --git a/...se/groups/core/GroupIDNameMembership.java → ...se/groups/core/GroupIDNameMembership.java b/...se/groups/core/GroupIDNameMembership.java → ...se/groups/core/GroupIDNameMembership.java
diff --git a/src/us/kbase/groups/core/GroupName.java → .../java/us/kbase/groups/core/GroupName.java b/src/us/kbase/groups/core/GroupName.java → .../java/us/kbase/groups/core/GroupName.java
diff --git a/.../kbase/groups/core/GroupUpdateParams.java → .../kbase/groups/core/GroupUpdateParams.java b/.../kbase/groups/core/GroupUpdateParams.java → .../kbase/groups/core/GroupUpdateParams.java
diff --git a/src/us/kbase/groups/core/GroupUser.java → .../java/us/kbase/groups/core/GroupUser.java b/src/us/kbase/groups/core/GroupUser.java → .../java/us/kbase/groups/core/GroupUser.java
diff --git a/src/us/kbase/groups/core/GroupView.java → .../java/us/kbase/groups/core/GroupView.java b/src/us/kbase/groups/core/GroupView.java → .../java/us/kbase/groups/core/GroupView.java
diff --git a/src/us/kbase/groups/core/Groups.java → ...ain/java/us/kbase/groups/core/Groups.java b/src/us/kbase/groups/core/Groups.java → ...ain/java/us/kbase/groups/core/Groups.java
diff --git a/src/us/kbase/groups/core/Name.java → src/main/java/us/kbase/groups/core/Name.java b/src/us/kbase/groups/core/Name.java → src/main/java/us/kbase/groups/core/Name.java
diff --git a/...base/groups/core/OptionalGroupFields.java → ...base/groups/core/OptionalGroupFields.java b/...base/groups/core/OptionalGroupFields.java → ...base/groups/core/OptionalGroupFields.java
diff --git a/src/us/kbase/groups/core/OptionalString.java → .../us/kbase/groups/core/OptionalString.java b/src/us/kbase/groups/core/OptionalString.java → .../us/kbase/groups/core/OptionalString.java
diff --git a/src/us/kbase/groups/core/Token.java → ...main/java/us/kbase/groups/core/Token.java b/src/us/kbase/groups/core/Token.java → ...main/java/us/kbase/groups/core/Token.java
diff --git a/src/us/kbase/groups/core/UUIDGenerator.java → ...a/us/kbase/groups/core/UUIDGenerator.java b/src/us/kbase/groups/core/UUIDGenerator.java → ...a/us/kbase/groups/core/UUIDGenerator.java
diff --git a/src/us/kbase/groups/core/UserHandler.java → ...ava/us/kbase/groups/core/UserHandler.java b/src/us/kbase/groups/core/UserHandler.java → ...ava/us/kbase/groups/core/UserHandler.java
diff --git a/src/us/kbase/groups/core/UserName.java → ...n/java/us/kbase/groups/core/UserName.java b/src/us/kbase/groups/core/UserName.java → ...n/java/us/kbase/groups/core/UserName.java
diff --git a/...e/exceptions/AuthenticationException.java → ...e/exceptions/AuthenticationException.java b/...e/exceptions/AuthenticationException.java → ...e/exceptions/AuthenticationException.java
diff --git a/...re/exceptions/ClosedRequestException.java → ...re/exceptions/ClosedRequestException.java b/...re/exceptions/ClosedRequestException.java → ...re/exceptions/ClosedRequestException.java
diff --git a/...ase/groups/core/exceptions/ErrorType.java → ...ase/groups/core/exceptions/ErrorType.java b/...ase/groups/core/exceptions/ErrorType.java → ...ase/groups/core/exceptions/ErrorType.java
diff --git a/...core/exceptions/GroupExistsException.java → ...core/exceptions/GroupExistsException.java b/...core/exceptions/GroupExistsException.java → ...core/exceptions/GroupExistsException.java
diff --git a/...oups/core/exceptions/GroupsException.java → ...oups/core/exceptions/GroupsException.java b/...oups/core/exceptions/GroupsException.java → ...oups/core/exceptions/GroupsException.java
diff --git a/...exceptions/IllegalParameterException.java → ...exceptions/IllegalParameterException.java b/...exceptions/IllegalParameterException.java → ...exceptions/IllegalParameterException.java
diff --git a/...xceptions/IllegalResourceIDException.java → ...xceptions/IllegalResourceIDException.java b/...xceptions/IllegalResourceIDException.java → ...xceptions/IllegalResourceIDException.java
diff --git a/...ore/exceptions/InvalidTokenException.java → ...ore/exceptions/InvalidTokenException.java b/...ore/exceptions/InvalidTokenException.java → ...ore/exceptions/InvalidTokenException.java
diff --git a/...exceptions/MissingParameterException.java → ...exceptions/MissingParameterException.java b/...exceptions/MissingParameterException.java → ...exceptions/MissingParameterException.java
diff --git a/...oups/core/exceptions/NoDataException.java → ...oups/core/exceptions/NoDataException.java b/...oups/core/exceptions/NoDataException.java → ...oups/core/exceptions/NoDataException.java
diff --git a/...xceptions/NoSuchCustomFieldException.java → ...xceptions/NoSuchCustomFieldException.java b/...xceptions/NoSuchCustomFieldException.java → ...xceptions/NoSuchCustomFieldException.java
diff --git a/...core/exceptions/NoSuchGroupException.java → ...core/exceptions/NoSuchGroupException.java b/...core/exceptions/NoSuchGroupException.java → ...core/exceptions/NoSuchGroupException.java
diff --git a/...re/exceptions/NoSuchRequestException.java → ...re/exceptions/NoSuchRequestException.java b/...re/exceptions/NoSuchRequestException.java → ...re/exceptions/NoSuchRequestException.java
diff --git a/...e/exceptions/NoSuchResourceException.java → ...e/exceptions/NoSuchResourceException.java b/...e/exceptions/NoSuchResourceException.java → ...e/exceptions/NoSuchResourceException.java
diff --git a/...ceptions/NoSuchResourceTypeException.java → ...ceptions/NoSuchResourceTypeException.java b/...ceptions/NoSuchResourceTypeException.java → ...ceptions/NoSuchResourceTypeException.java
diff --git a/.../core/exceptions/NoSuchUserException.java → .../core/exceptions/NoSuchUserException.java b/.../core/exceptions/NoSuchUserException.java → .../core/exceptions/NoSuchUserException.java
diff --git a/.../exceptions/NoTokenProvidedException.java → .../exceptions/NoTokenProvidedException.java b/.../exceptions/NoTokenProvidedException.java → .../exceptions/NoTokenProvidedException.java
diff --git a/...re/exceptions/RequestExistsException.java → ...re/exceptions/RequestExistsException.java b/...re/exceptions/RequestExistsException.java → ...re/exceptions/RequestExistsException.java
diff --git a/...e/exceptions/ResourceExistsException.java → ...e/exceptions/ResourceExistsException.java b/...e/exceptions/ResourceExistsException.java → ...e/exceptions/ResourceExistsException.java
diff --git a/.../exceptions/ResourceHandlerException.java → .../exceptions/ResourceHandlerException.java b/.../exceptions/ResourceHandlerException.java → .../exceptions/ResourceHandlerException.java
diff --git a/...ore/exceptions/UnauthorizedException.java → ...ore/exceptions/UnauthorizedException.java b/...ore/exceptions/UnauthorizedException.java → ...ore/exceptions/UnauthorizedException.java
diff --git a/...ore/exceptions/UserIsMemberException.java → ...ore/exceptions/UserIsMemberException.java b/...ore/exceptions/UserIsMemberException.java → ...ore/exceptions/UserIsMemberException.java
diff --git a/...ups/core/fieldvalidation/CustomField.java → ...ups/core/fieldvalidation/CustomField.java b/...ups/core/fieldvalidation/CustomField.java → ...ups/core/fieldvalidation/CustomField.java
diff --git a/...e/fieldvalidation/FieldConfiguration.java → ...e/fieldvalidation/FieldConfiguration.java b/...e/fieldvalidation/FieldConfiguration.java → ...e/fieldvalidation/FieldConfiguration.java
diff --git a/.../core/fieldvalidation/FieldValidator.java → .../core/fieldvalidation/FieldValidator.java b/.../core/fieldvalidation/FieldValidator.java → .../core/fieldvalidation/FieldValidator.java
diff --git a/...lidation/FieldValidatorConfiguration.java → ...lidation/FieldValidatorConfiguration.java b/...lidation/FieldValidatorConfiguration.java → ...lidation/FieldValidatorConfiguration.java
diff --git a/...ldvalidation/FieldValidatorException.java → ...ldvalidation/FieldValidatorException.java b/...ldvalidation/FieldValidatorException.java → ...ldvalidation/FieldValidatorException.java
diff --git a/...ieldvalidation/FieldValidatorFactory.java → ...ieldvalidation/FieldValidatorFactory.java b/...ieldvalidation/FieldValidatorFactory.java → ...ieldvalidation/FieldValidatorFactory.java
diff --git a/...core/fieldvalidation/FieldValidators.java → ...core/fieldvalidation/FieldValidators.java b/...core/fieldvalidation/FieldValidators.java → ...core/fieldvalidation/FieldValidators.java
diff --git a/...alidation/IllegalFieldValueException.java → ...alidation/IllegalFieldValueException.java b/...alidation/IllegalFieldValueException.java → ...alidation/IllegalFieldValueException.java
diff --git a/.../fieldvalidation/NumberedCustomField.java → .../fieldvalidation/NumberedCustomField.java b/.../fieldvalidation/NumberedCustomField.java → .../fieldvalidation/NumberedCustomField.java
diff --git a/...ups/core/notifications/Notifications.java → ...ups/core/notifications/Notifications.java b/...ups/core/notifications/Notifications.java → ...ups/core/notifications/Notifications.java
diff --git a/...e/notifications/NotificationsFactory.java → ...e/notifications/NotificationsFactory.java b/...e/notifications/NotificationsFactory.java → ...e/notifications/NotificationsFactory.java
diff --git a/...ase/groups/core/request/GroupRequest.java → ...ase/groups/core/request/GroupRequest.java b/...ase/groups/core/request/GroupRequest.java → ...ase/groups/core/request/GroupRequest.java
diff --git a/...oups/core/request/GroupRequestStatus.java → ...oups/core/request/GroupRequestStatus.java b/...oups/core/request/GroupRequestStatus.java → ...oups/core/request/GroupRequestStatus.java
diff --git a/.../core/request/GroupRequestStatusType.java → .../core/request/GroupRequestStatusType.java b/.../core/request/GroupRequestStatusType.java → .../core/request/GroupRequestStatusType.java
diff --git a/.../core/request/GroupRequestUserAction.java → .../core/request/GroupRequestUserAction.java b/.../core/request/GroupRequestUserAction.java → .../core/request/GroupRequestUserAction.java
diff --git a/...core/request/GroupRequestWithActions.java → ...core/request/GroupRequestWithActions.java b/...core/request/GroupRequestWithActions.java → ...core/request/GroupRequestWithActions.java
diff --git a/.../kbase/groups/core/request/RequestID.java → .../kbase/groups/core/request/RequestID.java b/.../kbase/groups/core/request/RequestID.java → .../kbase/groups/core/request/RequestID.java
diff --git a/...base/groups/core/request/RequestType.java → ...base/groups/core/request/RequestType.java b/...base/groups/core/request/RequestType.java → ...base/groups/core/request/RequestType.java
diff --git a/.../groups/core/resource/ResourceAccess.java → .../groups/core/resource/ResourceAccess.java b/.../groups/core/resource/ResourceAccess.java → .../groups/core/resource/ResourceAccess.java
diff --git a/...re/resource/ResourceAdministrativeID.java → ...re/resource/ResourceAdministrativeID.java b/...re/resource/ResourceAdministrativeID.java → ...re/resource/ResourceAdministrativeID.java
diff --git a/...ups/core/resource/ResourceDescriptor.java → ...ups/core/resource/ResourceDescriptor.java b/...ups/core/resource/ResourceDescriptor.java → ...ups/core/resource/ResourceDescriptor.java
diff --git a/...groups/core/resource/ResourceHandler.java → ...groups/core/resource/ResourceHandler.java b/...groups/core/resource/ResourceHandler.java → ...groups/core/resource/ResourceHandler.java
diff --git a/...base/groups/core/resource/ResourceID.java → ...base/groups/core/resource/ResourceID.java b/...base/groups/core/resource/ResourceID.java → ...base/groups/core/resource/ResourceID.java
diff --git a/...ps/core/resource/ResourceInformation.java → ...ps/core/resource/ResourceInformation.java b/...ps/core/resource/ResourceInformation.java → ...ps/core/resource/ResourceInformation.java
diff --git a/...core/resource/ResourceInformationSet.java → ...core/resource/ResourceInformationSet.java b/...core/resource/ResourceInformationSet.java → ...core/resource/ResourceInformationSet.java
diff --git a/...se/groups/core/resource/ResourceType.java → ...se/groups/core/resource/ResourceType.java b/...se/groups/core/resource/ResourceType.java → ...se/groups/core/resource/ResourceType.java
diff --git a/...validators/EnumFieldValidatorFactory.java → ...validators/EnumFieldValidatorFactory.java b/...validators/EnumFieldValidatorFactory.java → ...validators/EnumFieldValidatorFactory.java
diff --git a/...dators/GravatarFieldValidatorFactory.java → ...dators/GravatarFieldValidatorFactory.java b/...dators/GravatarFieldValidatorFactory.java → ...dators/GravatarFieldValidatorFactory.java
diff --git a/...lidators/SimpleFieldValidatorFactory.java → ...lidators/SimpleFieldValidatorFactory.java b/...lidators/SimpleFieldValidatorFactory.java → ...lidators/SimpleFieldValidatorFactory.java
diff --git a/...ns/DirectFeedsServiceNotifierFactory.java → ...ns/DirectFeedsServiceNotifierFactory.java b/...ns/DirectFeedsServiceNotifierFactory.java → ...ns/DirectFeedsServiceNotifierFactory.java
diff --git a/...ifications/KafkaFeedsNotifierFactory.java → ...ifications/KafkaFeedsNotifierFactory.java b/...ifications/KafkaFeedsNotifierFactory.java → ...ifications/KafkaFeedsNotifierFactory.java
diff --git a/...s/notifications/SLF4JNotifierFactory.java → ...s/notifications/SLF4JNotifierFactory.java b/...s/notifications/SLF4JNotifierFactory.java → ...s/notifications/SLF4JNotifierFactory.java
diff --git a/...base/groups/service/AppEventListener.java → ...base/groups/service/AppEventListener.java b/...base/groups/service/AppEventListener.java → ...base/groups/service/AppEventListener.java
diff --git a/src/us/kbase/groups/service/Fields.java → .../java/us/kbase/groups/service/Fields.java b/src/us/kbase/groups/service/Fields.java → .../java/us/kbase/groups/service/Fields.java
diff --git a/...s/kbase/groups/service/GroupsService.java → ...s/kbase/groups/service/GroupsService.java b/...s/kbase/groups/service/GroupsService.java → ...s/kbase/groups/service/GroupsService.java
diff --git a/.../kbase/groups/service/JacksonFeature.java → .../kbase/groups/service/JacksonFeature.java b/.../kbase/groups/service/JacksonFeature.java → .../kbase/groups/service/JacksonFeature.java
diff --git a/...s/kbase/groups/service/LoggingFilter.java → ...s/kbase/groups/service/LoggingFilter.java b/...s/kbase/groups/service/LoggingFilter.java → ...s/kbase/groups/service/LoggingFilter.java
diff --git a/...kbase/groups/service/SLF4JAutoLogger.java → ...kbase/groups/service/SLF4JAutoLogger.java b/...kbase/groups/service/SLF4JAutoLogger.java → ...kbase/groups/service/SLF4JAutoLogger.java
diff --git a/...s/kbase/groups/service/api/APICommon.java → ...s/kbase/groups/service/api/APICommon.java b/...s/kbase/groups/service/api/APICommon.java → ...s/kbase/groups/service/api/APICommon.java
diff --git a/...base/groups/service/api/APIConstants.java → ...base/groups/service/api/APIConstants.java b/...base/groups/service/api/APIConstants.java → ...base/groups/service/api/APIConstants.java
diff --git a/src/us/kbase/groups/service/api/Fields.java → ...a/us/kbase/groups/service/api/Fields.java b/src/us/kbase/groups/service/api/Fields.java → ...a/us/kbase/groups/service/api/Fields.java
diff --git a/...s/kbase/groups/service/api/GroupsAPI.java → ...s/kbase/groups/service/api/GroupsAPI.java b/...s/kbase/groups/service/api/GroupsAPI.java → ...s/kbase/groups/service/api/GroupsAPI.java
diff --git a/...base/groups/service/api/IncomingJSON.java → ...base/groups/service/api/IncomingJSON.java b/...base/groups/service/api/IncomingJSON.java → ...base/groups/service/api/IncomingJSON.java
diff --git a/...s/kbase/groups/service/api/MemberAPI.java → ...s/kbase/groups/service/api/MemberAPI.java b/...s/kbase/groups/service/api/MemberAPI.java → ...s/kbase/groups/service/api/MemberAPI.java
diff --git a/...us/kbase/groups/service/api/NamesAPI.java → ...us/kbase/groups/service/api/NamesAPI.java b/...us/kbase/groups/service/api/NamesAPI.java → ...us/kbase/groups/service/api/NamesAPI.java
diff --git a/.../kbase/groups/service/api/RequestAPI.java → .../kbase/groups/service/api/RequestAPI.java b/.../kbase/groups/service/api/RequestAPI.java → .../kbase/groups/service/api/RequestAPI.java
diff --git a/src/us/kbase/groups/service/api/Root.java → ...ava/us/kbase/groups/service/api/Root.java b/src/us/kbase/groups/service/api/Root.java → ...ava/us/kbase/groups/service/api/Root.java
diff --git a/...base/groups/service/api/ServicePaths.java → ...base/groups/service/api/ServicePaths.java b/...base/groups/service/api/ServicePaths.java → ...base/groups/service/api/ServicePaths.java
diff --git a/...oups/service/exceptions/ErrorMessage.java → ...oups/service/exceptions/ErrorMessage.java b/...oups/service/exceptions/ErrorMessage.java → ...oups/service/exceptions/ErrorMessage.java
diff --git a/.../service/exceptions/ExceptionHandler.java → .../service/exceptions/ExceptionHandler.java b/.../service/exceptions/ExceptionHandler.java → .../service/exceptions/ExceptionHandler.java
diff --git a/...s/kbase/groups/storage/GroupsStorage.java → ...s/kbase/groups/storage/GroupsStorage.java b/...s/kbase/groups/storage/GroupsStorage.java → ...s/kbase/groups/storage/GroupsStorage.java
diff --git a/...ge/exceptions/GroupsStorageException.java → ...ge/exceptions/GroupsStorageException.java b/...ge/exceptions/GroupsStorageException.java → ...ge/exceptions/GroupsStorageException.java
diff --git a/...rage/exceptions/StorageInitException.java → ...rage/exceptions/StorageInitException.java b/...rage/exceptions/StorageInitException.java → ...rage/exceptions/StorageInitException.java
diff --git a/...us/kbase/groups/storage/mongo/Fields.java → ...us/kbase/groups/storage/mongo/Fields.java b/...us/kbase/groups/storage/mongo/Fields.java → ...us/kbase/groups/storage/mongo/Fields.java
diff --git a/...ups/storage/mongo/MongoGroupsStorage.java → ...ups/storage/mongo/MongoGroupsStorage.java b/...ups/storage/mongo/MongoGroupsStorage.java → ...ups/storage/mongo/MongoGroupsStorage.java
diff --git a/.../groups/userhandler/KBaseUserHandler.java → .../groups/userhandler/KBaseUserHandler.java b/.../groups/userhandler/KBaseUserHandler.java → .../groups/userhandler/KBaseUserHandler.java
diff --git a/src/us/kbase/groups/util/FileOpener.java → ...java/us/kbase/groups/util/FileOpener.java b/src/us/kbase/groups/util/FileOpener.java → ...java/us/kbase/groups/util/FileOpener.java
diff --git a/src/us/kbase/groups/util/Util.java → src/main/java/us/kbase/groups/util/Util.java b/src/us/kbase/groups/util/Util.java → src/main/java/us/kbase/groups/util/Util.java
diff --git a/...acehandler/SDKClientWorkspaceHandler.java → ...acehandler/SDKClientWorkspaceHandler.java b/...acehandler/SDKClientWorkspaceHandler.java → ...acehandler/SDKClientWorkspaceHandler.java
diff --git a/...workspacehandler/WorkspacePermission.java → ...workspacehandler/WorkspacePermission.java b/...workspacehandler/WorkspacePermission.java → ...workspacehandler/WorkspacePermission.java
diff --git a/src/us/kbase/test/groups/MapBuilder.java → ...java/us/kbase/test/groups/MapBuilder.java b/src/us/kbase/test/groups/MapBuilder.java → ...java/us/kbase/test/groups/MapBuilder.java
diff --git a/.../test/groups/MongoStorageTestManager.java → .../test/groups/MongoStorageTestManager.java b/.../test/groups/MongoStorageTestManager.java → .../test/groups/MongoStorageTestManager.java
diff --git a/...e/test/groups/StandaloneGroupsServer.java → ...e/test/groups/StandaloneGroupsServer.java b/...e/test/groups/StandaloneGroupsServer.java → ...e/test/groups/StandaloneGroupsServer.java
diff --git a/src/us/kbase/test/groups/TestCommon.java → ...java/us/kbase/test/groups/TestCommon.java b/src/us/kbase/test/groups/TestCommon.java → ...java/us/kbase/test/groups/TestCommon.java
diff --git a/...ghandler/SDKClientCatalogHandlerTest.java → ...ghandler/SDKClientCatalogHandlerTest.java b/...ghandler/SDKClientCatalogHandlerTest.java → ...ghandler/SDKClientCatalogHandlerTest.java
diff --git a/.../test/groups/config/GroupsConfigTest.java → .../test/groups/config/GroupsConfigTest.java b/.../test/groups/config/GroupsConfigTest.java → .../test/groups/config/GroupsConfigTest.java
diff --git a/...ollers/workspace/WorkspaceController.java → ...ollers/workspace/WorkspaceController.java b/...ollers/workspace/WorkspaceController.java → ...ollers/workspace/WorkspaceController.java
diff --git a/...groups/core/CreateModExpireTimesTest.java → ...groups/core/CreateModExpireTimesTest.java b/...groups/core/CreateModExpireTimesTest.java → ...groups/core/CreateModExpireTimesTest.java
diff --git a/...kbase/test/groups/core/FieldItemTest.java → ...kbase/test/groups/core/FieldItemTest.java b/...kbase/test/groups/core/FieldItemTest.java → ...kbase/test/groups/core/FieldItemTest.java
diff --git a/...test/groups/core/GetGroupsParamsTest.java → ...test/groups/core/GetGroupsParamsTest.java b/...test/groups/core/GetGroupsParamsTest.java → ...test/groups/core/GetGroupsParamsTest.java
diff --git a/...est/groups/core/GetRequestParamsTest.java → ...est/groups/core/GetRequestParamsTest.java b/...est/groups/core/GetRequestParamsTest.java → ...est/groups/core/GetRequestParamsTest.java
diff --git a/.../groups/core/GroupCreationParamsTest.java → .../groups/core/GroupCreationParamsTest.java b/.../groups/core/GroupCreationParamsTest.java → .../groups/core/GroupCreationParamsTest.java
diff --git a/...est/groups/core/GroupHasRequestsTest.java → ...est/groups/core/GroupHasRequestsTest.java b/...est/groups/core/GroupHasRequestsTest.java → ...est/groups/core/GroupHasRequestsTest.java
diff --git a/.../test/groups/core/GroupIDAndNameTest.java → .../test/groups/core/GroupIDAndNameTest.java b/.../test/groups/core/GroupIDAndNameTest.java → .../test/groups/core/GroupIDAndNameTest.java
diff --git a/...roups/core/GroupIDNameMembershipTest.java → ...roups/core/GroupIDNameMembershipTest.java b/...roups/core/GroupIDNameMembershipTest.java → ...roups/core/GroupIDNameMembershipTest.java
diff --git a/...s/kbase/test/groups/core/GroupIDTest.java → ...s/kbase/test/groups/core/GroupIDTest.java b/...s/kbase/test/groups/core/GroupIDTest.java → ...s/kbase/test/groups/core/GroupIDTest.java
diff --git a/...kbase/test/groups/core/GroupNameTest.java → ...kbase/test/groups/core/GroupNameTest.java b/...kbase/test/groups/core/GroupNameTest.java → ...kbase/test/groups/core/GroupNameTest.java
diff --git a/src/us/kbase/test/groups/core/GroupTest.java → .../us/kbase/test/groups/core/GroupTest.java b/src/us/kbase/test/groups/core/GroupTest.java → .../us/kbase/test/groups/core/GroupTest.java
diff --git a/...st/groups/core/GroupUpdateParamsTest.java → ...st/groups/core/GroupUpdateParamsTest.java b/...st/groups/core/GroupUpdateParamsTest.java → ...st/groups/core/GroupUpdateParamsTest.java
diff --git a/...kbase/test/groups/core/GroupUserTest.java → ...kbase/test/groups/core/GroupUserTest.java b/...kbase/test/groups/core/GroupUserTest.java → ...kbase/test/groups/core/GroupUserTest.java
diff --git a/...kbase/test/groups/core/GroupViewTest.java → ...kbase/test/groups/core/GroupViewTest.java b/...kbase/test/groups/core/GroupViewTest.java → ...kbase/test/groups/core/GroupViewTest.java
diff --git a/...us/kbase/test/groups/core/GroupsTest.java → ...us/kbase/test/groups/core/GroupsTest.java b/...us/kbase/test/groups/core/GroupsTest.java → ...us/kbase/test/groups/core/GroupsTest.java
diff --git a/src/us/kbase/test/groups/core/NameTest.java → ...a/us/kbase/test/groups/core/NameTest.java b/src/us/kbase/test/groups/core/NameTest.java → ...a/us/kbase/test/groups/core/NameTest.java
diff --git a/.../groups/core/OptionalGroupFieldsTest.java → .../groups/core/OptionalGroupFieldsTest.java b/.../groups/core/OptionalGroupFieldsTest.java → .../groups/core/OptionalGroupFieldsTest.java
diff --git a/.../test/groups/core/OptionalStringTest.java → .../test/groups/core/OptionalStringTest.java b/.../test/groups/core/OptionalStringTest.java → .../test/groups/core/OptionalStringTest.java
diff --git a/src/us/kbase/test/groups/core/TokenTest.java → .../us/kbase/test/groups/core/TokenTest.java b/src/us/kbase/test/groups/core/TokenTest.java → .../us/kbase/test/groups/core/TokenTest.java
diff --git a/.../kbase/test/groups/core/UserNameTest.java → .../kbase/test/groups/core/UserNameTest.java b/.../kbase/test/groups/core/UserNameTest.java → .../kbase/test/groups/core/UserNameTest.java
diff --git a/...core/fieldvalidation/CustomFieldTest.java → ...core/fieldvalidation/CustomFieldTest.java b/...core/fieldvalidation/CustomFieldTest.java → ...core/fieldvalidation/CustomFieldTest.java
diff --git a/...eldvalidation/FieldConfigurationTest.java → ...eldvalidation/FieldConfigurationTest.java b/...eldvalidation/FieldConfigurationTest.java → ...eldvalidation/FieldConfigurationTest.java
diff --git a/...tion/FieldValidatorConfigurationTest.java → ...tion/FieldValidatorConfigurationTest.java b/...tion/FieldValidatorConfigurationTest.java → ...tion/FieldValidatorConfigurationTest.java
diff --git a/.../fieldvalidation/FieldValidatorsTest.java → .../fieldvalidation/FieldValidatorsTest.java b/.../fieldvalidation/FieldValidatorsTest.java → .../fieldvalidation/FieldValidatorsTest.java
diff --git a/...ldvalidation/NumberedCustomFieldTest.java → ...ldvalidation/NumberedCustomFieldTest.java b/...ldvalidation/NumberedCustomFieldTest.java → ...ldvalidation/NumberedCustomFieldTest.java
diff --git a/.../core/request/GroupRequestStatusTest.java → .../core/request/GroupRequestStatusTest.java b/.../core/request/GroupRequestStatusTest.java → .../core/request/GroupRequestStatusTest.java
diff --git a/...e/request/GroupRequestStatusTypeTest.java → ...e/request/GroupRequestStatusTypeTest.java b/...e/request/GroupRequestStatusTypeTest.java → ...e/request/GroupRequestStatusTypeTest.java
diff --git a/...groups/core/request/GroupRequestTest.java → ...groups/core/request/GroupRequestTest.java b/...groups/core/request/GroupRequestTest.java → ...groups/core/request/GroupRequestTest.java
diff --git a/...e/request/GroupRequestUserActionTest.java → ...e/request/GroupRequestUserActionTest.java b/...e/request/GroupRequestUserActionTest.java → ...e/request/GroupRequestUserActionTest.java
diff --git a/.../request/GroupRequestWithActionsTest.java → .../request/GroupRequestWithActionsTest.java b/.../request/GroupRequestWithActionsTest.java → .../request/GroupRequestWithActionsTest.java
diff --git a/...st/groups/core/request/RequestIDTest.java → ...st/groups/core/request/RequestIDTest.java b/...st/groups/core/request/RequestIDTest.java → ...st/groups/core/request/RequestIDTest.java
diff --git a/.../groups/core/request/RequestTypeTest.java → .../groups/core/request/RequestTypeTest.java b/.../groups/core/request/RequestTypeTest.java → .../groups/core/request/RequestTypeTest.java
diff --git a/.../groups/core/resource/ResourceIDTest.java → .../groups/core/resource/ResourceIDTest.java b/.../groups/core/resource/ResourceIDTest.java → .../groups/core/resource/ResourceIDTest.java
diff --git a/.../resource/ResourceInformationSetTest.java → .../resource/ResourceInformationSetTest.java b/.../resource/ResourceInformationSetTest.java → .../resource/ResourceInformationSetTest.java
diff --git a/...ore/resource/ResourceInformationTest.java → ...ore/resource/ResourceInformationTest.java b/...ore/resource/ResourceInformationTest.java → ...ore/resource/ResourceInformationTest.java
diff --git a/...roups/core/resource/ResourceTypeTest.java → ...roups/core/resource/ResourceTypeTest.java b/...roups/core/resource/ResourceTypeTest.java → ...roups/core/resource/ResourceTypeTest.java
diff --git a/...dators/EnumFieldValidatorFactoryTest.java → ...dators/EnumFieldValidatorFactoryTest.java b/...dators/EnumFieldValidatorFactoryTest.java → ...dators/EnumFieldValidatorFactoryTest.java
diff --git a/...rs/GravatarFieldValidatorFactoryTest.java → ...rs/GravatarFieldValidatorFactoryTest.java b/...rs/GravatarFieldValidatorFactoryTest.java → ...rs/GravatarFieldValidatorFactoryTest.java
diff --git a/...tors/SimpleFieldValidatorFactoryTest.java → ...tors/SimpleFieldValidatorFactoryTest.java b/...tors/SimpleFieldValidatorFactoryTest.java → ...tors/SimpleFieldValidatorFactoryTest.java
diff --git a/...s/integration/ServiceIntegrationTest.java → ...s/integration/ServiceIntegrationTest.java b/...s/integration/ServiceIntegrationTest.java → ...s/integration/ServiceIntegrationTest.java
diff --git a/...ations/KafkaFeedsNotifierFactoryTest.java → ...ations/KafkaFeedsNotifierFactoryTest.java b/...ations/KafkaFeedsNotifierFactoryTest.java → ...ations/KafkaFeedsNotifierFactoryTest.java
diff --git a/...est/groups/service/LoggingFilterTest.java → ...est/groups/service/LoggingFilterTest.java b/...est/groups/service/LoggingFilterTest.java → ...est/groups/service/LoggingFilterTest.java
diff --git a/...est/groups/service/api/APICommonTest.java → ...est/groups/service/api/APICommonTest.java b/...est/groups/service/api/APICommonTest.java → ...est/groups/service/api/APICommonTest.java
diff --git a/...est/groups/service/api/GroupsAPITest.java → ...est/groups/service/api/GroupsAPITest.java b/...est/groups/service/api/GroupsAPITest.java → ...est/groups/service/api/GroupsAPITest.java
diff --git a/.../groups/service/api/IncomingJSONTest.java → .../groups/service/api/IncomingJSONTest.java b/.../groups/service/api/IncomingJSONTest.java → .../groups/service/api/IncomingJSONTest.java
diff --git a/...est/groups/service/api/MemberAPITest.java → ...est/groups/service/api/MemberAPITest.java b/...est/groups/service/api/MemberAPITest.java → ...est/groups/service/api/MemberAPITest.java
diff --git a/...test/groups/service/api/NamesAPITest.java → ...test/groups/service/api/NamesAPITest.java b/...test/groups/service/api/NamesAPITest.java → ...test/groups/service/api/NamesAPITest.java
diff --git a/...st/groups/service/api/RequestAPITest.java → ...st/groups/service/api/RequestAPITest.java b/...st/groups/service/api/RequestAPITest.java → ...st/groups/service/api/RequestAPITest.java
diff --git a/...ase/test/groups/service/api/RootTest.java → ...ase/test/groups/service/api/RootTest.java b/...ase/test/groups/service/api/RootTest.java → ...ase/test/groups/service/api/RootTest.java
diff --git a/.../service/exceptions/ErrorMessageTest.java → .../service/exceptions/ErrorMessageTest.java b/.../service/exceptions/ErrorMessageTest.java → .../service/exceptions/ErrorMessageTest.java
diff --git a/...vice/exceptions/ExceptionHandlerTest.java → ...vice/exceptions/ExceptionHandlerTest.java b/...vice/exceptions/ExceptionHandlerTest.java → ...vice/exceptions/ExceptionHandlerTest.java
diff --git a/...GroupsStorageDuplicateKeyCheckerTest.java → ...GroupsStorageDuplicateKeyCheckerTest.java b/...GroupsStorageDuplicateKeyCheckerTest.java → ...GroupsStorageDuplicateKeyCheckerTest.java
diff --git a/...rage/mongo/MongoGroupsStorageOpsTest.java → ...rage/mongo/MongoGroupsStorageOpsTest.java b/...rage/mongo/MongoGroupsStorageOpsTest.java → ...rage/mongo/MongoGroupsStorageOpsTest.java
diff --git a/.../mongo/MongoGroupsStorageStartupTest.java → .../mongo/MongoGroupsStorageStartupTest.java b/.../mongo/MongoGroupsStorageStartupTest.java → .../mongo/MongoGroupsStorageStartupTest.java
diff --git a/...test/groups/util/FailOnInstantiation.java → ...test/groups/util/FailOnInstantiation.java b/...test/groups/util/FailOnInstantiation.java → ...test/groups/util/FailOnInstantiation.java
diff --git a/...lOnInstantiationNoNullaryConstructor.java → ...lOnInstantiationNoNullaryConstructor.java b/...lOnInstantiationNoNullaryConstructor.java → ...lOnInstantiationNoNullaryConstructor.java
diff --git a/...ailOnInstantiationPrivateConstructor.java → ...ailOnInstantiationPrivateConstructor.java b/...ailOnInstantiationPrivateConstructor.java → ...ailOnInstantiationPrivateConstructor.java
diff --git a/src/us/kbase/test/groups/util/UtilTest.java → ...a/us/kbase/test/groups/util/UtilTest.java b/src/us/kbase/test/groups/util/UtilTest.java → ...a/us/kbase/test/groups/util/UtilTest.java
diff --git a/...andler/SDKClientWorkspaceHandlerTest.java → ...andler/SDKClientWorkspaceHandlerTest.java b/...andler/SDKClientWorkspaceHandlerTest.java → ...andler/SDKClientWorkspaceHandlerTest.java
diff --git a/...spacehandler/WorkspacePermissionTest.java → ...spacehandler/WorkspacePermissionTest.java b/...spacehandler/WorkspacePermissionTest.java → ...spacehandler/WorkspacePermissionTest.java
diff --git a/.../test/groups/controllers/workspace/wsjars → .../test/groups/controllers/workspace/wsjars b/.../test/groups/controllers/workspace/wsjars → .../test/groups/controllers/workspace/wsjars