From 16a9afbb52817891d80386eca9d81ba02c989ebe Mon Sep 17 00:00:00 2001 From: Gavin Date: Fri, 12 Apr 2024 21:15:11 -0700 Subject: [PATCH] Use standard Gradle source locations --- .classpath | 67 ------------------- build.gradle | 21 ------ .../java}/us/kbase/groups/GitCommit.java | 0 .../us/kbase/groups/build/GroupsBuilder.java | 0 .../SDKClientCatalogHandler.java | 0 .../us/kbase/groups/config/GroupsConfig.java | 0 .../config/GroupsConfigurationException.java | 0 .../kbase/groups/core/CreateAndModTimes.java | 0 .../groups/core/CreateModAndExpireTimes.java | 0 .../java}/us/kbase/groups/core/FieldItem.java | 0 .../us/kbase/groups/core/GetGroupsParams.java | 0 .../kbase/groups/core/GetRequestsParams.java | 0 .../java}/us/kbase/groups/core/Group.java | 0 .../groups/core/GroupCreationParams.java | 0 .../kbase/groups/core/GroupHasRequests.java | 0 .../java}/us/kbase/groups/core/GroupID.java | 0 .../us/kbase/groups/core/GroupIDAndName.java | 0 .../groups/core/GroupIDNameMembership.java | 0 .../java}/us/kbase/groups/core/GroupName.java | 0 .../kbase/groups/core/GroupUpdateParams.java | 0 .../java}/us/kbase/groups/core/GroupUser.java | 0 .../java}/us/kbase/groups/core/GroupView.java | 0 .../java}/us/kbase/groups/core/Groups.java | 0 .../java}/us/kbase/groups/core/Name.java | 0 .../groups/core/OptionalGroupFields.java | 0 .../us/kbase/groups/core/OptionalString.java | 0 .../java}/us/kbase/groups/core/Token.java | 0 .../us/kbase/groups/core/UUIDGenerator.java | 0 .../us/kbase/groups/core/UserHandler.java | 0 .../java}/us/kbase/groups/core/UserName.java | 0 .../exceptions/AuthenticationException.java | 0 .../exceptions/ClosedRequestException.java | 0 .../groups/core/exceptions/ErrorType.java | 0 .../core/exceptions/GroupExistsException.java | 0 .../core/exceptions/GroupsException.java | 0 .../exceptions/IllegalParameterException.java | 0 .../IllegalResourceIDException.java | 0 .../exceptions/InvalidTokenException.java | 0 .../exceptions/MissingParameterException.java | 0 .../core/exceptions/NoDataException.java | 0 .../NoSuchCustomFieldException.java | 0 .../core/exceptions/NoSuchGroupException.java | 0 .../exceptions/NoSuchRequestException.java | 0 .../exceptions/NoSuchResourceException.java | 0 .../NoSuchResourceTypeException.java | 0 .../core/exceptions/NoSuchUserException.java | 0 .../exceptions/NoTokenProvidedException.java | 0 .../exceptions/RequestExistsException.java | 0 .../exceptions/ResourceExistsException.java | 0 .../exceptions/ResourceHandlerException.java | 0 .../exceptions/UnauthorizedException.java | 0 .../exceptions/UserIsMemberException.java | 0 .../core/fieldvalidation/CustomField.java | 0 .../fieldvalidation/FieldConfiguration.java | 0 .../core/fieldvalidation/FieldValidator.java | 0 .../FieldValidatorConfiguration.java | 0 .../FieldValidatorException.java | 0 .../FieldValidatorFactory.java | 0 .../core/fieldvalidation/FieldValidators.java | 0 .../IllegalFieldValueException.java | 0 .../fieldvalidation/NumberedCustomField.java | 0 .../core/notifications/Notifications.java | 0 .../notifications/NotificationsFactory.java | 0 .../groups/core/request/GroupRequest.java | 0 .../core/request/GroupRequestStatus.java | 0 .../core/request/GroupRequestStatusType.java | 0 .../core/request/GroupRequestUserAction.java | 0 .../core/request/GroupRequestWithActions.java | 0 .../kbase/groups/core/request/RequestID.java | 0 .../groups/core/request/RequestType.java | 0 .../groups/core/resource/ResourceAccess.java | 0 .../resource/ResourceAdministrativeID.java | 0 .../core/resource/ResourceDescriptor.java | 0 .../groups/core/resource/ResourceHandler.java | 0 .../groups/core/resource/ResourceID.java | 0 .../core/resource/ResourceInformation.java | 0 .../core/resource/ResourceInformationSet.java | 0 .../groups/core/resource/ResourceType.java | 0 .../EnumFieldValidatorFactory.java | 0 .../GravatarFieldValidatorFactory.java | 0 .../SimpleFieldValidatorFactory.java | 0 .../DirectFeedsServiceNotifierFactory.java | 0 .../KafkaFeedsNotifierFactory.java | 0 .../notifications/SLF4JNotifierFactory.java | 0 .../groups/service/AppEventListener.java | 0 .../java}/us/kbase/groups/service/Fields.java | 0 .../kbase/groups/service/GroupsService.java | 0 .../kbase/groups/service/JacksonFeature.java | 0 .../kbase/groups/service/LoggingFilter.java | 0 .../kbase/groups/service/SLF4JAutoLogger.java | 0 .../kbase/groups/service/api/APICommon.java | 0 .../groups/service/api/APIConstants.java | 0 .../us/kbase/groups/service/api/Fields.java | 0 .../kbase/groups/service/api/GroupsAPI.java | 0 .../groups/service/api/IncomingJSON.java | 0 .../kbase/groups/service/api/MemberAPI.java | 0 .../us/kbase/groups/service/api/NamesAPI.java | 0 .../kbase/groups/service/api/RequestAPI.java | 0 .../us/kbase/groups/service/api/Root.java | 0 .../groups/service/api/ServicePaths.java | 0 .../service/exceptions/ErrorMessage.java | 0 .../service/exceptions/ExceptionHandler.java | 0 .../kbase/groups/storage/GroupsStorage.java | 0 .../exceptions/GroupsStorageException.java | 0 .../exceptions/StorageInitException.java | 0 .../us/kbase/groups/storage/mongo/Fields.java | 0 .../storage/mongo/MongoGroupsStorage.java | 0 .../groups/userhandler/KBaseUserHandler.java | 0 .../us/kbase/groups/util/FileOpener.java | 0 .../java}/us/kbase/groups/util/Util.java | 0 .../SDKClientWorkspaceHandler.java | 0 .../workspacehandler/WorkspacePermission.java | 0 .../us/kbase/test/groups/MapBuilder.java | 0 .../test/groups/MongoStorageTestManager.java | 0 .../test/groups/StandaloneGroupsServer.java | 0 .../us/kbase/test/groups/TestCommon.java | 0 .../SDKClientCatalogHandlerTest.java | 0 .../test/groups/config/GroupsConfigTest.java | 0 .../workspace/WorkspaceController.java | 0 .../groups/core/CreateModExpireTimesTest.java | 0 .../kbase/test/groups/core/FieldItemTest.java | 0 .../test/groups/core/GetGroupsParamsTest.java | 0 .../groups/core/GetRequestParamsTest.java | 0 .../groups/core/GroupCreationParamsTest.java | 0 .../groups/core/GroupHasRequestsTest.java | 0 .../test/groups/core/GroupIDAndNameTest.java | 0 .../core/GroupIDNameMembershipTest.java | 0 .../kbase/test/groups/core/GroupIDTest.java | 0 .../kbase/test/groups/core/GroupNameTest.java | 0 .../us/kbase/test/groups/core/GroupTest.java | 0 .../groups/core/GroupUpdateParamsTest.java | 0 .../kbase/test/groups/core/GroupUserTest.java | 0 .../kbase/test/groups/core/GroupViewTest.java | 0 .../us/kbase/test/groups/core/GroupsTest.java | 0 .../us/kbase/test/groups/core/NameTest.java | 0 .../groups/core/OptionalGroupFieldsTest.java | 0 .../test/groups/core/OptionalStringTest.java | 0 .../us/kbase/test/groups/core/TokenTest.java | 0 .../kbase/test/groups/core/UserNameTest.java | 0 .../core/fieldvalidation/CustomFieldTest.java | 0 .../FieldConfigurationTest.java | 0 .../FieldValidatorConfigurationTest.java | 0 .../fieldvalidation/FieldValidatorsTest.java | 0 .../NumberedCustomFieldTest.java | 0 .../core/request/GroupRequestStatusTest.java | 0 .../request/GroupRequestStatusTypeTest.java | 0 .../groups/core/request/GroupRequestTest.java | 0 .../request/GroupRequestUserActionTest.java | 0 .../request/GroupRequestWithActionsTest.java | 0 .../groups/core/request/RequestIDTest.java | 0 .../groups/core/request/RequestTypeTest.java | 0 .../groups/core/resource/ResourceIDTest.java | 0 .../resource/ResourceInformationSetTest.java | 0 .../resource/ResourceInformationTest.java | 0 .../core/resource/ResourceTypeTest.java | 0 .../EnumFieldValidatorFactoryTest.java | 0 .../GravatarFieldValidatorFactoryTest.java | 0 .../SimpleFieldValidatorFactoryTest.java | 0 .../integration/ServiceIntegrationTest.java | 0 .../KafkaFeedsNotifierFactoryTest.java | 0 .../groups/service/LoggingFilterTest.java | 0 .../groups/service/api/APICommonTest.java | 0 .../groups/service/api/GroupsAPITest.java | 0 .../groups/service/api/IncomingJSONTest.java | 0 .../groups/service/api/MemberAPITest.java | 0 .../test/groups/service/api/NamesAPITest.java | 0 .../groups/service/api/RequestAPITest.java | 0 .../test/groups/service/api/RootTest.java | 0 .../service/exceptions/ErrorMessageTest.java | 0 .../exceptions/ExceptionHandlerTest.java | 0 ...oGroupsStorageDuplicateKeyCheckerTest.java | 0 .../mongo/MongoGroupsStorageOpsTest.java | 0 .../mongo/MongoGroupsStorageStartupTest.java | 0 .../test/groups/util/FailOnInstantiation.java | 0 ...ilOnInstantiationNoNullaryConstructor.java | 0 ...FailOnInstantiationPrivateConstructor.java | 0 .../us/kbase/test/groups/util/UtilTest.java | 0 .../SDKClientWorkspaceHandlerTest.java | 0 .../WorkspacePermissionTest.java | 0 .../test/groups/controllers/workspace/wsjars | 0 180 files changed, 88 deletions(-) delete mode 100644 .classpath rename src/{ => main/java}/us/kbase/groups/GitCommit.java (100%) rename src/{ => main/java}/us/kbase/groups/build/GroupsBuilder.java (100%) rename src/{ => main/java}/us/kbase/groups/cataloghandler/SDKClientCatalogHandler.java (100%) rename src/{ => main/java}/us/kbase/groups/config/GroupsConfig.java (100%) rename src/{ => main/java}/us/kbase/groups/config/GroupsConfigurationException.java (100%) rename src/{ => main/java}/us/kbase/groups/core/CreateAndModTimes.java (100%) rename src/{ => main/java}/us/kbase/groups/core/CreateModAndExpireTimes.java (100%) rename src/{ => main/java}/us/kbase/groups/core/FieldItem.java (100%) rename src/{ => main/java}/us/kbase/groups/core/GetGroupsParams.java (100%) rename src/{ => main/java}/us/kbase/groups/core/GetRequestsParams.java (100%) rename src/{ => main/java}/us/kbase/groups/core/Group.java (100%) rename src/{ => main/java}/us/kbase/groups/core/GroupCreationParams.java (100%) rename src/{ => main/java}/us/kbase/groups/core/GroupHasRequests.java (100%) rename src/{ => main/java}/us/kbase/groups/core/GroupID.java (100%) rename src/{ => main/java}/us/kbase/groups/core/GroupIDAndName.java (100%) rename src/{ => main/java}/us/kbase/groups/core/GroupIDNameMembership.java (100%) rename src/{ => main/java}/us/kbase/groups/core/GroupName.java (100%) rename src/{ => main/java}/us/kbase/groups/core/GroupUpdateParams.java (100%) rename src/{ => main/java}/us/kbase/groups/core/GroupUser.java (100%) rename src/{ => main/java}/us/kbase/groups/core/GroupView.java (100%) rename src/{ => main/java}/us/kbase/groups/core/Groups.java (100%) rename src/{ => main/java}/us/kbase/groups/core/Name.java (100%) rename src/{ => main/java}/us/kbase/groups/core/OptionalGroupFields.java (100%) rename src/{ => main/java}/us/kbase/groups/core/OptionalString.java (100%) rename src/{ => main/java}/us/kbase/groups/core/Token.java (100%) rename src/{ => main/java}/us/kbase/groups/core/UUIDGenerator.java (100%) rename src/{ => main/java}/us/kbase/groups/core/UserHandler.java (100%) rename src/{ => main/java}/us/kbase/groups/core/UserName.java (100%) rename src/{ => main/java}/us/kbase/groups/core/exceptions/AuthenticationException.java (100%) rename src/{ => main/java}/us/kbase/groups/core/exceptions/ClosedRequestException.java (100%) rename src/{ => main/java}/us/kbase/groups/core/exceptions/ErrorType.java (100%) rename src/{ => main/java}/us/kbase/groups/core/exceptions/GroupExistsException.java (100%) rename src/{ => main/java}/us/kbase/groups/core/exceptions/GroupsException.java (100%) rename src/{ => main/java}/us/kbase/groups/core/exceptions/IllegalParameterException.java (100%) rename src/{ => main/java}/us/kbase/groups/core/exceptions/IllegalResourceIDException.java (100%) rename src/{ => main/java}/us/kbase/groups/core/exceptions/InvalidTokenException.java (100%) rename src/{ => main/java}/us/kbase/groups/core/exceptions/MissingParameterException.java (100%) rename src/{ => main/java}/us/kbase/groups/core/exceptions/NoDataException.java (100%) rename src/{ => main/java}/us/kbase/groups/core/exceptions/NoSuchCustomFieldException.java (100%) rename src/{ => main/java}/us/kbase/groups/core/exceptions/NoSuchGroupException.java (100%) rename src/{ => main/java}/us/kbase/groups/core/exceptions/NoSuchRequestException.java (100%) rename src/{ => main/java}/us/kbase/groups/core/exceptions/NoSuchResourceException.java (100%) rename src/{ => main/java}/us/kbase/groups/core/exceptions/NoSuchResourceTypeException.java (100%) rename src/{ => main/java}/us/kbase/groups/core/exceptions/NoSuchUserException.java (100%) rename src/{ => main/java}/us/kbase/groups/core/exceptions/NoTokenProvidedException.java (100%) rename src/{ => main/java}/us/kbase/groups/core/exceptions/RequestExistsException.java (100%) rename src/{ => main/java}/us/kbase/groups/core/exceptions/ResourceExistsException.java (100%) rename src/{ => main/java}/us/kbase/groups/core/exceptions/ResourceHandlerException.java (100%) rename src/{ => main/java}/us/kbase/groups/core/exceptions/UnauthorizedException.java (100%) rename src/{ => main/java}/us/kbase/groups/core/exceptions/UserIsMemberException.java (100%) rename src/{ => main/java}/us/kbase/groups/core/fieldvalidation/CustomField.java (100%) rename src/{ => main/java}/us/kbase/groups/core/fieldvalidation/FieldConfiguration.java (100%) rename src/{ => main/java}/us/kbase/groups/core/fieldvalidation/FieldValidator.java (100%) rename src/{ => main/java}/us/kbase/groups/core/fieldvalidation/FieldValidatorConfiguration.java (100%) rename src/{ => main/java}/us/kbase/groups/core/fieldvalidation/FieldValidatorException.java (100%) rename src/{ => main/java}/us/kbase/groups/core/fieldvalidation/FieldValidatorFactory.java (100%) rename src/{ => main/java}/us/kbase/groups/core/fieldvalidation/FieldValidators.java (100%) rename src/{ => main/java}/us/kbase/groups/core/fieldvalidation/IllegalFieldValueException.java (100%) rename src/{ => main/java}/us/kbase/groups/core/fieldvalidation/NumberedCustomField.java (100%) rename src/{ => main/java}/us/kbase/groups/core/notifications/Notifications.java (100%) rename src/{ => main/java}/us/kbase/groups/core/notifications/NotificationsFactory.java (100%) rename src/{ => main/java}/us/kbase/groups/core/request/GroupRequest.java (100%) rename src/{ => main/java}/us/kbase/groups/core/request/GroupRequestStatus.java (100%) rename src/{ => main/java}/us/kbase/groups/core/request/GroupRequestStatusType.java (100%) rename src/{ => main/java}/us/kbase/groups/core/request/GroupRequestUserAction.java (100%) rename src/{ => main/java}/us/kbase/groups/core/request/GroupRequestWithActions.java (100%) rename src/{ => main/java}/us/kbase/groups/core/request/RequestID.java (100%) rename src/{ => main/java}/us/kbase/groups/core/request/RequestType.java (100%) rename src/{ => main/java}/us/kbase/groups/core/resource/ResourceAccess.java (100%) rename src/{ => main/java}/us/kbase/groups/core/resource/ResourceAdministrativeID.java (100%) rename src/{ => main/java}/us/kbase/groups/core/resource/ResourceDescriptor.java (100%) rename src/{ => main/java}/us/kbase/groups/core/resource/ResourceHandler.java (100%) rename src/{ => main/java}/us/kbase/groups/core/resource/ResourceID.java (100%) rename src/{ => main/java}/us/kbase/groups/core/resource/ResourceInformation.java (100%) rename src/{ => main/java}/us/kbase/groups/core/resource/ResourceInformationSet.java (100%) rename src/{ => main/java}/us/kbase/groups/core/resource/ResourceType.java (100%) rename src/{ => main/java}/us/kbase/groups/fieldvalidators/EnumFieldValidatorFactory.java (100%) rename src/{ => main/java}/us/kbase/groups/fieldvalidators/GravatarFieldValidatorFactory.java (100%) rename src/{ => main/java}/us/kbase/groups/fieldvalidators/SimpleFieldValidatorFactory.java (100%) rename src/{ => main/java}/us/kbase/groups/notifications/DirectFeedsServiceNotifierFactory.java (100%) rename src/{ => main/java}/us/kbase/groups/notifications/KafkaFeedsNotifierFactory.java (100%) rename src/{ => main/java}/us/kbase/groups/notifications/SLF4JNotifierFactory.java (100%) rename src/{ => main/java}/us/kbase/groups/service/AppEventListener.java (100%) rename src/{ => main/java}/us/kbase/groups/service/Fields.java (100%) rename src/{ => main/java}/us/kbase/groups/service/GroupsService.java (100%) rename src/{ => main/java}/us/kbase/groups/service/JacksonFeature.java (100%) rename src/{ => main/java}/us/kbase/groups/service/LoggingFilter.java (100%) rename src/{ => main/java}/us/kbase/groups/service/SLF4JAutoLogger.java (100%) rename src/{ => main/java}/us/kbase/groups/service/api/APICommon.java (100%) rename src/{ => main/java}/us/kbase/groups/service/api/APIConstants.java (100%) rename src/{ => main/java}/us/kbase/groups/service/api/Fields.java (100%) rename src/{ => main/java}/us/kbase/groups/service/api/GroupsAPI.java (100%) rename src/{ => main/java}/us/kbase/groups/service/api/IncomingJSON.java (100%) rename src/{ => main/java}/us/kbase/groups/service/api/MemberAPI.java (100%) rename src/{ => main/java}/us/kbase/groups/service/api/NamesAPI.java (100%) rename src/{ => main/java}/us/kbase/groups/service/api/RequestAPI.java (100%) rename src/{ => main/java}/us/kbase/groups/service/api/Root.java (100%) rename src/{ => main/java}/us/kbase/groups/service/api/ServicePaths.java (100%) rename src/{ => main/java}/us/kbase/groups/service/exceptions/ErrorMessage.java (100%) rename src/{ => main/java}/us/kbase/groups/service/exceptions/ExceptionHandler.java (100%) rename src/{ => main/java}/us/kbase/groups/storage/GroupsStorage.java (100%) rename src/{ => main/java}/us/kbase/groups/storage/exceptions/GroupsStorageException.java (100%) rename src/{ => main/java}/us/kbase/groups/storage/exceptions/StorageInitException.java (100%) rename src/{ => main/java}/us/kbase/groups/storage/mongo/Fields.java (100%) rename src/{ => main/java}/us/kbase/groups/storage/mongo/MongoGroupsStorage.java (100%) rename src/{ => main/java}/us/kbase/groups/userhandler/KBaseUserHandler.java (100%) rename src/{ => main/java}/us/kbase/groups/util/FileOpener.java (100%) rename src/{ => main/java}/us/kbase/groups/util/Util.java (100%) rename src/{ => main/java}/us/kbase/groups/workspacehandler/SDKClientWorkspaceHandler.java (100%) rename src/{ => main/java}/us/kbase/groups/workspacehandler/WorkspacePermission.java (100%) rename src/{ => test/java}/us/kbase/test/groups/MapBuilder.java (100%) rename src/{ => test/java}/us/kbase/test/groups/MongoStorageTestManager.java (100%) rename src/{ => test/java}/us/kbase/test/groups/StandaloneGroupsServer.java (100%) rename src/{ => test/java}/us/kbase/test/groups/TestCommon.java (100%) rename src/{ => test/java}/us/kbase/test/groups/cataloghandler/SDKClientCatalogHandlerTest.java (100%) rename src/{ => test/java}/us/kbase/test/groups/config/GroupsConfigTest.java (100%) rename src/{ => test/java}/us/kbase/test/groups/controllers/workspace/WorkspaceController.java (100%) rename src/{ => test/java}/us/kbase/test/groups/core/CreateModExpireTimesTest.java (100%) rename src/{ => test/java}/us/kbase/test/groups/core/FieldItemTest.java (100%) rename src/{ => test/java}/us/kbase/test/groups/core/GetGroupsParamsTest.java (100%) rename src/{ => test/java}/us/kbase/test/groups/core/GetRequestParamsTest.java (100%) rename src/{ => test/java}/us/kbase/test/groups/core/GroupCreationParamsTest.java (100%) rename src/{ => test/java}/us/kbase/test/groups/core/GroupHasRequestsTest.java (100%) rename src/{ => test/java}/us/kbase/test/groups/core/GroupIDAndNameTest.java (100%) rename src/{ => test/java}/us/kbase/test/groups/core/GroupIDNameMembershipTest.java (100%) rename src/{ => test/java}/us/kbase/test/groups/core/GroupIDTest.java (100%) rename src/{ => test/java}/us/kbase/test/groups/core/GroupNameTest.java (100%) rename src/{ => test/java}/us/kbase/test/groups/core/GroupTest.java (100%) rename src/{ => test/java}/us/kbase/test/groups/core/GroupUpdateParamsTest.java (100%) rename src/{ => test/java}/us/kbase/test/groups/core/GroupUserTest.java (100%) rename src/{ => test/java}/us/kbase/test/groups/core/GroupViewTest.java (100%) rename src/{ => test/java}/us/kbase/test/groups/core/GroupsTest.java (100%) rename src/{ => test/java}/us/kbase/test/groups/core/NameTest.java (100%) rename src/{ => test/java}/us/kbase/test/groups/core/OptionalGroupFieldsTest.java (100%) rename src/{ => test/java}/us/kbase/test/groups/core/OptionalStringTest.java (100%) rename src/{ => test/java}/us/kbase/test/groups/core/TokenTest.java (100%) rename src/{ => test/java}/us/kbase/test/groups/core/UserNameTest.java (100%) rename src/{ => test/java}/us/kbase/test/groups/core/fieldvalidation/CustomFieldTest.java (100%) rename src/{ => test/java}/us/kbase/test/groups/core/fieldvalidation/FieldConfigurationTest.java (100%) rename src/{ => test/java}/us/kbase/test/groups/core/fieldvalidation/FieldValidatorConfigurationTest.java (100%) rename src/{ => test/java}/us/kbase/test/groups/core/fieldvalidation/FieldValidatorsTest.java (100%) rename src/{ => test/java}/us/kbase/test/groups/core/fieldvalidation/NumberedCustomFieldTest.java (100%) rename src/{ => test/java}/us/kbase/test/groups/core/request/GroupRequestStatusTest.java (100%) rename src/{ => test/java}/us/kbase/test/groups/core/request/GroupRequestStatusTypeTest.java (100%) rename src/{ => test/java}/us/kbase/test/groups/core/request/GroupRequestTest.java (100%) rename src/{ => test/java}/us/kbase/test/groups/core/request/GroupRequestUserActionTest.java (100%) rename src/{ => test/java}/us/kbase/test/groups/core/request/GroupRequestWithActionsTest.java (100%) rename src/{ => test/java}/us/kbase/test/groups/core/request/RequestIDTest.java (100%) rename src/{ => test/java}/us/kbase/test/groups/core/request/RequestTypeTest.java (100%) rename src/{ => test/java}/us/kbase/test/groups/core/resource/ResourceIDTest.java (100%) rename src/{ => test/java}/us/kbase/test/groups/core/resource/ResourceInformationSetTest.java (100%) rename src/{ => test/java}/us/kbase/test/groups/core/resource/ResourceInformationTest.java (100%) rename src/{ => test/java}/us/kbase/test/groups/core/resource/ResourceTypeTest.java (100%) rename src/{ => test/java}/us/kbase/test/groups/fieldvalidators/EnumFieldValidatorFactoryTest.java (100%) rename src/{ => test/java}/us/kbase/test/groups/fieldvalidators/GravatarFieldValidatorFactoryTest.java (100%) rename src/{ => test/java}/us/kbase/test/groups/fieldvalidators/SimpleFieldValidatorFactoryTest.java (100%) rename src/{ => test/java}/us/kbase/test/groups/integration/ServiceIntegrationTest.java (100%) rename src/{ => test/java}/us/kbase/test/groups/notifications/KafkaFeedsNotifierFactoryTest.java (100%) rename src/{ => test/java}/us/kbase/test/groups/service/LoggingFilterTest.java (100%) rename src/{ => test/java}/us/kbase/test/groups/service/api/APICommonTest.java (100%) rename src/{ => test/java}/us/kbase/test/groups/service/api/GroupsAPITest.java (100%) rename src/{ => test/java}/us/kbase/test/groups/service/api/IncomingJSONTest.java (100%) rename src/{ => test/java}/us/kbase/test/groups/service/api/MemberAPITest.java (100%) rename src/{ => test/java}/us/kbase/test/groups/service/api/NamesAPITest.java (100%) rename src/{ => test/java}/us/kbase/test/groups/service/api/RequestAPITest.java (100%) rename src/{ => test/java}/us/kbase/test/groups/service/api/RootTest.java (100%) rename src/{ => test/java}/us/kbase/test/groups/service/exceptions/ErrorMessageTest.java (100%) rename src/{ => test/java}/us/kbase/test/groups/service/exceptions/ExceptionHandlerTest.java (100%) rename src/{ => test/java}/us/kbase/test/groups/storage/mongo/MongoGroupsStorageDuplicateKeyCheckerTest.java (100%) rename src/{ => test/java}/us/kbase/test/groups/storage/mongo/MongoGroupsStorageOpsTest.java (100%) rename src/{ => test/java}/us/kbase/test/groups/storage/mongo/MongoGroupsStorageStartupTest.java (100%) rename src/{ => test/java}/us/kbase/test/groups/util/FailOnInstantiation.java (100%) rename src/{ => test/java}/us/kbase/test/groups/util/FailOnInstantiationNoNullaryConstructor.java (100%) rename src/{ => test/java}/us/kbase/test/groups/util/FailOnInstantiationPrivateConstructor.java (100%) rename src/{ => test/java}/us/kbase/test/groups/util/UtilTest.java (100%) rename src/{ => test/java}/us/kbase/test/groups/workspacehandler/SDKClientWorkspaceHandlerTest.java (100%) rename src/{ => test/java}/us/kbase/test/groups/workspacehandler/WorkspacePermissionTest.java (100%) rename src/{ => test/resources}/us/kbase/test/groups/controllers/workspace/wsjars (100%) diff --git a/.classpath b/.classpath deleted file mode 100644 index 5bd65dd8..00000000 --- a/.classpath +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build.gradle b/build.gradle index 7365ba76..67319fe0 100644 --- 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 b/src/main/java/us/kbase/groups/GitCommit.java similarity index 100% rename from src/us/kbase/groups/GitCommit.java rename to src/main/java/us/kbase/groups/GitCommit.java diff --git a/src/us/kbase/groups/build/GroupsBuilder.java b/src/main/java/us/kbase/groups/build/GroupsBuilder.java similarity index 100% rename from src/us/kbase/groups/build/GroupsBuilder.java rename to src/main/java/us/kbase/groups/build/GroupsBuilder.java diff --git a/src/us/kbase/groups/cataloghandler/SDKClientCatalogHandler.java b/src/main/java/us/kbase/groups/cataloghandler/SDKClientCatalogHandler.java similarity index 100% rename from src/us/kbase/groups/cataloghandler/SDKClientCatalogHandler.java rename to src/main/java/us/kbase/groups/cataloghandler/SDKClientCatalogHandler.java diff --git a/src/us/kbase/groups/config/GroupsConfig.java b/src/main/java/us/kbase/groups/config/GroupsConfig.java similarity index 100% rename from src/us/kbase/groups/config/GroupsConfig.java rename to src/main/java/us/kbase/groups/config/GroupsConfig.java diff --git a/src/us/kbase/groups/config/GroupsConfigurationException.java b/src/main/java/us/kbase/groups/config/GroupsConfigurationException.java similarity index 100% rename from src/us/kbase/groups/config/GroupsConfigurationException.java rename to src/main/java/us/kbase/groups/config/GroupsConfigurationException.java diff --git a/src/us/kbase/groups/core/CreateAndModTimes.java b/src/main/java/us/kbase/groups/core/CreateAndModTimes.java similarity index 100% rename from src/us/kbase/groups/core/CreateAndModTimes.java rename to src/main/java/us/kbase/groups/core/CreateAndModTimes.java diff --git a/src/us/kbase/groups/core/CreateModAndExpireTimes.java b/src/main/java/us/kbase/groups/core/CreateModAndExpireTimes.java similarity index 100% rename from src/us/kbase/groups/core/CreateModAndExpireTimes.java rename to src/main/java/us/kbase/groups/core/CreateModAndExpireTimes.java diff --git a/src/us/kbase/groups/core/FieldItem.java b/src/main/java/us/kbase/groups/core/FieldItem.java similarity index 100% rename from src/us/kbase/groups/core/FieldItem.java rename to src/main/java/us/kbase/groups/core/FieldItem.java diff --git a/src/us/kbase/groups/core/GetGroupsParams.java b/src/main/java/us/kbase/groups/core/GetGroupsParams.java similarity index 100% rename from src/us/kbase/groups/core/GetGroupsParams.java rename to src/main/java/us/kbase/groups/core/GetGroupsParams.java diff --git a/src/us/kbase/groups/core/GetRequestsParams.java b/src/main/java/us/kbase/groups/core/GetRequestsParams.java similarity index 100% rename from src/us/kbase/groups/core/GetRequestsParams.java rename to src/main/java/us/kbase/groups/core/GetRequestsParams.java diff --git a/src/us/kbase/groups/core/Group.java b/src/main/java/us/kbase/groups/core/Group.java similarity index 100% rename from src/us/kbase/groups/core/Group.java rename to src/main/java/us/kbase/groups/core/Group.java diff --git a/src/us/kbase/groups/core/GroupCreationParams.java b/src/main/java/us/kbase/groups/core/GroupCreationParams.java similarity index 100% rename from src/us/kbase/groups/core/GroupCreationParams.java rename to src/main/java/us/kbase/groups/core/GroupCreationParams.java diff --git a/src/us/kbase/groups/core/GroupHasRequests.java b/src/main/java/us/kbase/groups/core/GroupHasRequests.java similarity index 100% rename from src/us/kbase/groups/core/GroupHasRequests.java rename to src/main/java/us/kbase/groups/core/GroupHasRequests.java diff --git a/src/us/kbase/groups/core/GroupID.java b/src/main/java/us/kbase/groups/core/GroupID.java similarity index 100% rename from src/us/kbase/groups/core/GroupID.java rename to src/main/java/us/kbase/groups/core/GroupID.java diff --git a/src/us/kbase/groups/core/GroupIDAndName.java b/src/main/java/us/kbase/groups/core/GroupIDAndName.java similarity index 100% rename from src/us/kbase/groups/core/GroupIDAndName.java rename to src/main/java/us/kbase/groups/core/GroupIDAndName.java diff --git a/src/us/kbase/groups/core/GroupIDNameMembership.java b/src/main/java/us/kbase/groups/core/GroupIDNameMembership.java similarity index 100% rename from src/us/kbase/groups/core/GroupIDNameMembership.java rename to src/main/java/us/kbase/groups/core/GroupIDNameMembership.java diff --git a/src/us/kbase/groups/core/GroupName.java b/src/main/java/us/kbase/groups/core/GroupName.java similarity index 100% rename from src/us/kbase/groups/core/GroupName.java rename to src/main/java/us/kbase/groups/core/GroupName.java diff --git a/src/us/kbase/groups/core/GroupUpdateParams.java b/src/main/java/us/kbase/groups/core/GroupUpdateParams.java similarity index 100% rename from src/us/kbase/groups/core/GroupUpdateParams.java rename to src/main/java/us/kbase/groups/core/GroupUpdateParams.java diff --git a/src/us/kbase/groups/core/GroupUser.java b/src/main/java/us/kbase/groups/core/GroupUser.java similarity index 100% rename from src/us/kbase/groups/core/GroupUser.java rename to src/main/java/us/kbase/groups/core/GroupUser.java diff --git a/src/us/kbase/groups/core/GroupView.java b/src/main/java/us/kbase/groups/core/GroupView.java similarity index 100% rename from src/us/kbase/groups/core/GroupView.java rename to src/main/java/us/kbase/groups/core/GroupView.java diff --git a/src/us/kbase/groups/core/Groups.java b/src/main/java/us/kbase/groups/core/Groups.java similarity index 100% rename from src/us/kbase/groups/core/Groups.java rename to src/main/java/us/kbase/groups/core/Groups.java diff --git a/src/us/kbase/groups/core/Name.java b/src/main/java/us/kbase/groups/core/Name.java similarity index 100% rename from src/us/kbase/groups/core/Name.java rename to src/main/java/us/kbase/groups/core/Name.java diff --git a/src/us/kbase/groups/core/OptionalGroupFields.java b/src/main/java/us/kbase/groups/core/OptionalGroupFields.java similarity index 100% rename from src/us/kbase/groups/core/OptionalGroupFields.java rename to src/main/java/us/kbase/groups/core/OptionalGroupFields.java diff --git a/src/us/kbase/groups/core/OptionalString.java b/src/main/java/us/kbase/groups/core/OptionalString.java similarity index 100% rename from src/us/kbase/groups/core/OptionalString.java rename to src/main/java/us/kbase/groups/core/OptionalString.java diff --git a/src/us/kbase/groups/core/Token.java b/src/main/java/us/kbase/groups/core/Token.java similarity index 100% rename from src/us/kbase/groups/core/Token.java rename to src/main/java/us/kbase/groups/core/Token.java diff --git a/src/us/kbase/groups/core/UUIDGenerator.java b/src/main/java/us/kbase/groups/core/UUIDGenerator.java similarity index 100% rename from src/us/kbase/groups/core/UUIDGenerator.java rename to src/main/java/us/kbase/groups/core/UUIDGenerator.java diff --git a/src/us/kbase/groups/core/UserHandler.java b/src/main/java/us/kbase/groups/core/UserHandler.java similarity index 100% rename from src/us/kbase/groups/core/UserHandler.java rename to src/main/java/us/kbase/groups/core/UserHandler.java diff --git a/src/us/kbase/groups/core/UserName.java b/src/main/java/us/kbase/groups/core/UserName.java similarity index 100% rename from src/us/kbase/groups/core/UserName.java rename to src/main/java/us/kbase/groups/core/UserName.java diff --git a/src/us/kbase/groups/core/exceptions/AuthenticationException.java b/src/main/java/us/kbase/groups/core/exceptions/AuthenticationException.java similarity index 100% rename from src/us/kbase/groups/core/exceptions/AuthenticationException.java rename to src/main/java/us/kbase/groups/core/exceptions/AuthenticationException.java diff --git a/src/us/kbase/groups/core/exceptions/ClosedRequestException.java b/src/main/java/us/kbase/groups/core/exceptions/ClosedRequestException.java similarity index 100% rename from src/us/kbase/groups/core/exceptions/ClosedRequestException.java rename to src/main/java/us/kbase/groups/core/exceptions/ClosedRequestException.java diff --git a/src/us/kbase/groups/core/exceptions/ErrorType.java b/src/main/java/us/kbase/groups/core/exceptions/ErrorType.java similarity index 100% rename from src/us/kbase/groups/core/exceptions/ErrorType.java rename to src/main/java/us/kbase/groups/core/exceptions/ErrorType.java diff --git a/src/us/kbase/groups/core/exceptions/GroupExistsException.java b/src/main/java/us/kbase/groups/core/exceptions/GroupExistsException.java similarity index 100% rename from src/us/kbase/groups/core/exceptions/GroupExistsException.java rename to src/main/java/us/kbase/groups/core/exceptions/GroupExistsException.java diff --git a/src/us/kbase/groups/core/exceptions/GroupsException.java b/src/main/java/us/kbase/groups/core/exceptions/GroupsException.java similarity index 100% rename from src/us/kbase/groups/core/exceptions/GroupsException.java rename to src/main/java/us/kbase/groups/core/exceptions/GroupsException.java diff --git a/src/us/kbase/groups/core/exceptions/IllegalParameterException.java b/src/main/java/us/kbase/groups/core/exceptions/IllegalParameterException.java similarity index 100% rename from src/us/kbase/groups/core/exceptions/IllegalParameterException.java rename to src/main/java/us/kbase/groups/core/exceptions/IllegalParameterException.java diff --git a/src/us/kbase/groups/core/exceptions/IllegalResourceIDException.java b/src/main/java/us/kbase/groups/core/exceptions/IllegalResourceIDException.java similarity index 100% rename from src/us/kbase/groups/core/exceptions/IllegalResourceIDException.java rename to src/main/java/us/kbase/groups/core/exceptions/IllegalResourceIDException.java diff --git a/src/us/kbase/groups/core/exceptions/InvalidTokenException.java b/src/main/java/us/kbase/groups/core/exceptions/InvalidTokenException.java similarity index 100% rename from src/us/kbase/groups/core/exceptions/InvalidTokenException.java rename to src/main/java/us/kbase/groups/core/exceptions/InvalidTokenException.java diff --git a/src/us/kbase/groups/core/exceptions/MissingParameterException.java b/src/main/java/us/kbase/groups/core/exceptions/MissingParameterException.java similarity index 100% rename from src/us/kbase/groups/core/exceptions/MissingParameterException.java rename to src/main/java/us/kbase/groups/core/exceptions/MissingParameterException.java diff --git a/src/us/kbase/groups/core/exceptions/NoDataException.java b/src/main/java/us/kbase/groups/core/exceptions/NoDataException.java similarity index 100% rename from src/us/kbase/groups/core/exceptions/NoDataException.java rename to src/main/java/us/kbase/groups/core/exceptions/NoDataException.java diff --git a/src/us/kbase/groups/core/exceptions/NoSuchCustomFieldException.java b/src/main/java/us/kbase/groups/core/exceptions/NoSuchCustomFieldException.java similarity index 100% rename from src/us/kbase/groups/core/exceptions/NoSuchCustomFieldException.java rename to src/main/java/us/kbase/groups/core/exceptions/NoSuchCustomFieldException.java diff --git a/src/us/kbase/groups/core/exceptions/NoSuchGroupException.java b/src/main/java/us/kbase/groups/core/exceptions/NoSuchGroupException.java similarity index 100% rename from src/us/kbase/groups/core/exceptions/NoSuchGroupException.java rename to src/main/java/us/kbase/groups/core/exceptions/NoSuchGroupException.java diff --git a/src/us/kbase/groups/core/exceptions/NoSuchRequestException.java b/src/main/java/us/kbase/groups/core/exceptions/NoSuchRequestException.java similarity index 100% rename from src/us/kbase/groups/core/exceptions/NoSuchRequestException.java rename to src/main/java/us/kbase/groups/core/exceptions/NoSuchRequestException.java diff --git a/src/us/kbase/groups/core/exceptions/NoSuchResourceException.java b/src/main/java/us/kbase/groups/core/exceptions/NoSuchResourceException.java similarity index 100% rename from src/us/kbase/groups/core/exceptions/NoSuchResourceException.java rename to src/main/java/us/kbase/groups/core/exceptions/NoSuchResourceException.java diff --git a/src/us/kbase/groups/core/exceptions/NoSuchResourceTypeException.java b/src/main/java/us/kbase/groups/core/exceptions/NoSuchResourceTypeException.java similarity index 100% rename from src/us/kbase/groups/core/exceptions/NoSuchResourceTypeException.java rename to src/main/java/us/kbase/groups/core/exceptions/NoSuchResourceTypeException.java diff --git a/src/us/kbase/groups/core/exceptions/NoSuchUserException.java b/src/main/java/us/kbase/groups/core/exceptions/NoSuchUserException.java similarity index 100% rename from src/us/kbase/groups/core/exceptions/NoSuchUserException.java rename to src/main/java/us/kbase/groups/core/exceptions/NoSuchUserException.java diff --git a/src/us/kbase/groups/core/exceptions/NoTokenProvidedException.java b/src/main/java/us/kbase/groups/core/exceptions/NoTokenProvidedException.java similarity index 100% rename from src/us/kbase/groups/core/exceptions/NoTokenProvidedException.java rename to src/main/java/us/kbase/groups/core/exceptions/NoTokenProvidedException.java diff --git a/src/us/kbase/groups/core/exceptions/RequestExistsException.java b/src/main/java/us/kbase/groups/core/exceptions/RequestExistsException.java similarity index 100% rename from src/us/kbase/groups/core/exceptions/RequestExistsException.java rename to src/main/java/us/kbase/groups/core/exceptions/RequestExistsException.java diff --git a/src/us/kbase/groups/core/exceptions/ResourceExistsException.java b/src/main/java/us/kbase/groups/core/exceptions/ResourceExistsException.java similarity index 100% rename from src/us/kbase/groups/core/exceptions/ResourceExistsException.java rename to src/main/java/us/kbase/groups/core/exceptions/ResourceExistsException.java diff --git a/src/us/kbase/groups/core/exceptions/ResourceHandlerException.java b/src/main/java/us/kbase/groups/core/exceptions/ResourceHandlerException.java similarity index 100% rename from src/us/kbase/groups/core/exceptions/ResourceHandlerException.java rename to src/main/java/us/kbase/groups/core/exceptions/ResourceHandlerException.java diff --git a/src/us/kbase/groups/core/exceptions/UnauthorizedException.java b/src/main/java/us/kbase/groups/core/exceptions/UnauthorizedException.java similarity index 100% rename from src/us/kbase/groups/core/exceptions/UnauthorizedException.java rename to src/main/java/us/kbase/groups/core/exceptions/UnauthorizedException.java diff --git a/src/us/kbase/groups/core/exceptions/UserIsMemberException.java b/src/main/java/us/kbase/groups/core/exceptions/UserIsMemberException.java similarity index 100% rename from src/us/kbase/groups/core/exceptions/UserIsMemberException.java rename to src/main/java/us/kbase/groups/core/exceptions/UserIsMemberException.java diff --git a/src/us/kbase/groups/core/fieldvalidation/CustomField.java b/src/main/java/us/kbase/groups/core/fieldvalidation/CustomField.java similarity index 100% rename from src/us/kbase/groups/core/fieldvalidation/CustomField.java rename to src/main/java/us/kbase/groups/core/fieldvalidation/CustomField.java diff --git a/src/us/kbase/groups/core/fieldvalidation/FieldConfiguration.java b/src/main/java/us/kbase/groups/core/fieldvalidation/FieldConfiguration.java similarity index 100% rename from src/us/kbase/groups/core/fieldvalidation/FieldConfiguration.java rename to src/main/java/us/kbase/groups/core/fieldvalidation/FieldConfiguration.java diff --git a/src/us/kbase/groups/core/fieldvalidation/FieldValidator.java b/src/main/java/us/kbase/groups/core/fieldvalidation/FieldValidator.java similarity index 100% rename from src/us/kbase/groups/core/fieldvalidation/FieldValidator.java rename to src/main/java/us/kbase/groups/core/fieldvalidation/FieldValidator.java diff --git a/src/us/kbase/groups/core/fieldvalidation/FieldValidatorConfiguration.java b/src/main/java/us/kbase/groups/core/fieldvalidation/FieldValidatorConfiguration.java similarity index 100% rename from src/us/kbase/groups/core/fieldvalidation/FieldValidatorConfiguration.java rename to src/main/java/us/kbase/groups/core/fieldvalidation/FieldValidatorConfiguration.java diff --git a/src/us/kbase/groups/core/fieldvalidation/FieldValidatorException.java b/src/main/java/us/kbase/groups/core/fieldvalidation/FieldValidatorException.java similarity index 100% rename from src/us/kbase/groups/core/fieldvalidation/FieldValidatorException.java rename to src/main/java/us/kbase/groups/core/fieldvalidation/FieldValidatorException.java diff --git a/src/us/kbase/groups/core/fieldvalidation/FieldValidatorFactory.java b/src/main/java/us/kbase/groups/core/fieldvalidation/FieldValidatorFactory.java similarity index 100% rename from src/us/kbase/groups/core/fieldvalidation/FieldValidatorFactory.java rename to src/main/java/us/kbase/groups/core/fieldvalidation/FieldValidatorFactory.java diff --git a/src/us/kbase/groups/core/fieldvalidation/FieldValidators.java b/src/main/java/us/kbase/groups/core/fieldvalidation/FieldValidators.java similarity index 100% rename from src/us/kbase/groups/core/fieldvalidation/FieldValidators.java rename to src/main/java/us/kbase/groups/core/fieldvalidation/FieldValidators.java diff --git a/src/us/kbase/groups/core/fieldvalidation/IllegalFieldValueException.java b/src/main/java/us/kbase/groups/core/fieldvalidation/IllegalFieldValueException.java similarity index 100% rename from src/us/kbase/groups/core/fieldvalidation/IllegalFieldValueException.java rename to src/main/java/us/kbase/groups/core/fieldvalidation/IllegalFieldValueException.java diff --git a/src/us/kbase/groups/core/fieldvalidation/NumberedCustomField.java b/src/main/java/us/kbase/groups/core/fieldvalidation/NumberedCustomField.java similarity index 100% rename from src/us/kbase/groups/core/fieldvalidation/NumberedCustomField.java rename to src/main/java/us/kbase/groups/core/fieldvalidation/NumberedCustomField.java diff --git a/src/us/kbase/groups/core/notifications/Notifications.java b/src/main/java/us/kbase/groups/core/notifications/Notifications.java similarity index 100% rename from src/us/kbase/groups/core/notifications/Notifications.java rename to src/main/java/us/kbase/groups/core/notifications/Notifications.java diff --git a/src/us/kbase/groups/core/notifications/NotificationsFactory.java b/src/main/java/us/kbase/groups/core/notifications/NotificationsFactory.java similarity index 100% rename from src/us/kbase/groups/core/notifications/NotificationsFactory.java rename to src/main/java/us/kbase/groups/core/notifications/NotificationsFactory.java diff --git a/src/us/kbase/groups/core/request/GroupRequest.java b/src/main/java/us/kbase/groups/core/request/GroupRequest.java similarity index 100% rename from src/us/kbase/groups/core/request/GroupRequest.java rename to src/main/java/us/kbase/groups/core/request/GroupRequest.java diff --git a/src/us/kbase/groups/core/request/GroupRequestStatus.java b/src/main/java/us/kbase/groups/core/request/GroupRequestStatus.java similarity index 100% rename from src/us/kbase/groups/core/request/GroupRequestStatus.java rename to src/main/java/us/kbase/groups/core/request/GroupRequestStatus.java diff --git a/src/us/kbase/groups/core/request/GroupRequestStatusType.java b/src/main/java/us/kbase/groups/core/request/GroupRequestStatusType.java similarity index 100% rename from src/us/kbase/groups/core/request/GroupRequestStatusType.java rename to src/main/java/us/kbase/groups/core/request/GroupRequestStatusType.java diff --git a/src/us/kbase/groups/core/request/GroupRequestUserAction.java b/src/main/java/us/kbase/groups/core/request/GroupRequestUserAction.java similarity index 100% rename from src/us/kbase/groups/core/request/GroupRequestUserAction.java rename to src/main/java/us/kbase/groups/core/request/GroupRequestUserAction.java diff --git a/src/us/kbase/groups/core/request/GroupRequestWithActions.java b/src/main/java/us/kbase/groups/core/request/GroupRequestWithActions.java similarity index 100% rename from src/us/kbase/groups/core/request/GroupRequestWithActions.java rename to src/main/java/us/kbase/groups/core/request/GroupRequestWithActions.java diff --git a/src/us/kbase/groups/core/request/RequestID.java b/src/main/java/us/kbase/groups/core/request/RequestID.java similarity index 100% rename from src/us/kbase/groups/core/request/RequestID.java rename to src/main/java/us/kbase/groups/core/request/RequestID.java diff --git a/src/us/kbase/groups/core/request/RequestType.java b/src/main/java/us/kbase/groups/core/request/RequestType.java similarity index 100% rename from src/us/kbase/groups/core/request/RequestType.java rename to src/main/java/us/kbase/groups/core/request/RequestType.java diff --git a/src/us/kbase/groups/core/resource/ResourceAccess.java b/src/main/java/us/kbase/groups/core/resource/ResourceAccess.java similarity index 100% rename from src/us/kbase/groups/core/resource/ResourceAccess.java rename to src/main/java/us/kbase/groups/core/resource/ResourceAccess.java diff --git a/src/us/kbase/groups/core/resource/ResourceAdministrativeID.java b/src/main/java/us/kbase/groups/core/resource/ResourceAdministrativeID.java similarity index 100% rename from src/us/kbase/groups/core/resource/ResourceAdministrativeID.java rename to src/main/java/us/kbase/groups/core/resource/ResourceAdministrativeID.java diff --git a/src/us/kbase/groups/core/resource/ResourceDescriptor.java b/src/main/java/us/kbase/groups/core/resource/ResourceDescriptor.java similarity index 100% rename from src/us/kbase/groups/core/resource/ResourceDescriptor.java rename to src/main/java/us/kbase/groups/core/resource/ResourceDescriptor.java diff --git a/src/us/kbase/groups/core/resource/ResourceHandler.java b/src/main/java/us/kbase/groups/core/resource/ResourceHandler.java similarity index 100% rename from src/us/kbase/groups/core/resource/ResourceHandler.java rename to src/main/java/us/kbase/groups/core/resource/ResourceHandler.java diff --git a/src/us/kbase/groups/core/resource/ResourceID.java b/src/main/java/us/kbase/groups/core/resource/ResourceID.java similarity index 100% rename from src/us/kbase/groups/core/resource/ResourceID.java rename to src/main/java/us/kbase/groups/core/resource/ResourceID.java diff --git a/src/us/kbase/groups/core/resource/ResourceInformation.java b/src/main/java/us/kbase/groups/core/resource/ResourceInformation.java similarity index 100% rename from src/us/kbase/groups/core/resource/ResourceInformation.java rename to src/main/java/us/kbase/groups/core/resource/ResourceInformation.java diff --git a/src/us/kbase/groups/core/resource/ResourceInformationSet.java b/src/main/java/us/kbase/groups/core/resource/ResourceInformationSet.java similarity index 100% rename from src/us/kbase/groups/core/resource/ResourceInformationSet.java rename to src/main/java/us/kbase/groups/core/resource/ResourceInformationSet.java diff --git a/src/us/kbase/groups/core/resource/ResourceType.java b/src/main/java/us/kbase/groups/core/resource/ResourceType.java similarity index 100% rename from src/us/kbase/groups/core/resource/ResourceType.java rename to src/main/java/us/kbase/groups/core/resource/ResourceType.java diff --git a/src/us/kbase/groups/fieldvalidators/EnumFieldValidatorFactory.java b/src/main/java/us/kbase/groups/fieldvalidators/EnumFieldValidatorFactory.java similarity index 100% rename from src/us/kbase/groups/fieldvalidators/EnumFieldValidatorFactory.java rename to src/main/java/us/kbase/groups/fieldvalidators/EnumFieldValidatorFactory.java diff --git a/src/us/kbase/groups/fieldvalidators/GravatarFieldValidatorFactory.java b/src/main/java/us/kbase/groups/fieldvalidators/GravatarFieldValidatorFactory.java similarity index 100% rename from src/us/kbase/groups/fieldvalidators/GravatarFieldValidatorFactory.java rename to src/main/java/us/kbase/groups/fieldvalidators/GravatarFieldValidatorFactory.java diff --git a/src/us/kbase/groups/fieldvalidators/SimpleFieldValidatorFactory.java b/src/main/java/us/kbase/groups/fieldvalidators/SimpleFieldValidatorFactory.java similarity index 100% rename from src/us/kbase/groups/fieldvalidators/SimpleFieldValidatorFactory.java rename to src/main/java/us/kbase/groups/fieldvalidators/SimpleFieldValidatorFactory.java diff --git a/src/us/kbase/groups/notifications/DirectFeedsServiceNotifierFactory.java b/src/main/java/us/kbase/groups/notifications/DirectFeedsServiceNotifierFactory.java similarity index 100% rename from src/us/kbase/groups/notifications/DirectFeedsServiceNotifierFactory.java rename to src/main/java/us/kbase/groups/notifications/DirectFeedsServiceNotifierFactory.java diff --git a/src/us/kbase/groups/notifications/KafkaFeedsNotifierFactory.java b/src/main/java/us/kbase/groups/notifications/KafkaFeedsNotifierFactory.java similarity index 100% rename from src/us/kbase/groups/notifications/KafkaFeedsNotifierFactory.java rename to src/main/java/us/kbase/groups/notifications/KafkaFeedsNotifierFactory.java diff --git a/src/us/kbase/groups/notifications/SLF4JNotifierFactory.java b/src/main/java/us/kbase/groups/notifications/SLF4JNotifierFactory.java similarity index 100% rename from src/us/kbase/groups/notifications/SLF4JNotifierFactory.java rename to src/main/java/us/kbase/groups/notifications/SLF4JNotifierFactory.java diff --git a/src/us/kbase/groups/service/AppEventListener.java b/src/main/java/us/kbase/groups/service/AppEventListener.java similarity index 100% rename from src/us/kbase/groups/service/AppEventListener.java rename to src/main/java/us/kbase/groups/service/AppEventListener.java diff --git a/src/us/kbase/groups/service/Fields.java b/src/main/java/us/kbase/groups/service/Fields.java similarity index 100% rename from src/us/kbase/groups/service/Fields.java rename to src/main/java/us/kbase/groups/service/Fields.java diff --git a/src/us/kbase/groups/service/GroupsService.java b/src/main/java/us/kbase/groups/service/GroupsService.java similarity index 100% rename from src/us/kbase/groups/service/GroupsService.java rename to src/main/java/us/kbase/groups/service/GroupsService.java diff --git a/src/us/kbase/groups/service/JacksonFeature.java b/src/main/java/us/kbase/groups/service/JacksonFeature.java similarity index 100% rename from src/us/kbase/groups/service/JacksonFeature.java rename to src/main/java/us/kbase/groups/service/JacksonFeature.java diff --git a/src/us/kbase/groups/service/LoggingFilter.java b/src/main/java/us/kbase/groups/service/LoggingFilter.java similarity index 100% rename from src/us/kbase/groups/service/LoggingFilter.java rename to src/main/java/us/kbase/groups/service/LoggingFilter.java diff --git a/src/us/kbase/groups/service/SLF4JAutoLogger.java b/src/main/java/us/kbase/groups/service/SLF4JAutoLogger.java similarity index 100% rename from src/us/kbase/groups/service/SLF4JAutoLogger.java rename to src/main/java/us/kbase/groups/service/SLF4JAutoLogger.java diff --git a/src/us/kbase/groups/service/api/APICommon.java b/src/main/java/us/kbase/groups/service/api/APICommon.java similarity index 100% rename from src/us/kbase/groups/service/api/APICommon.java rename to src/main/java/us/kbase/groups/service/api/APICommon.java diff --git a/src/us/kbase/groups/service/api/APIConstants.java b/src/main/java/us/kbase/groups/service/api/APIConstants.java similarity index 100% rename from src/us/kbase/groups/service/api/APIConstants.java rename to src/main/java/us/kbase/groups/service/api/APIConstants.java diff --git a/src/us/kbase/groups/service/api/Fields.java b/src/main/java/us/kbase/groups/service/api/Fields.java similarity index 100% rename from src/us/kbase/groups/service/api/Fields.java rename to src/main/java/us/kbase/groups/service/api/Fields.java diff --git a/src/us/kbase/groups/service/api/GroupsAPI.java b/src/main/java/us/kbase/groups/service/api/GroupsAPI.java similarity index 100% rename from src/us/kbase/groups/service/api/GroupsAPI.java rename to src/main/java/us/kbase/groups/service/api/GroupsAPI.java diff --git a/src/us/kbase/groups/service/api/IncomingJSON.java b/src/main/java/us/kbase/groups/service/api/IncomingJSON.java similarity index 100% rename from src/us/kbase/groups/service/api/IncomingJSON.java rename to src/main/java/us/kbase/groups/service/api/IncomingJSON.java diff --git a/src/us/kbase/groups/service/api/MemberAPI.java b/src/main/java/us/kbase/groups/service/api/MemberAPI.java similarity index 100% rename from src/us/kbase/groups/service/api/MemberAPI.java rename to src/main/java/us/kbase/groups/service/api/MemberAPI.java diff --git a/src/us/kbase/groups/service/api/NamesAPI.java b/src/main/java/us/kbase/groups/service/api/NamesAPI.java similarity index 100% rename from src/us/kbase/groups/service/api/NamesAPI.java rename to src/main/java/us/kbase/groups/service/api/NamesAPI.java diff --git a/src/us/kbase/groups/service/api/RequestAPI.java b/src/main/java/us/kbase/groups/service/api/RequestAPI.java similarity index 100% rename from src/us/kbase/groups/service/api/RequestAPI.java rename to src/main/java/us/kbase/groups/service/api/RequestAPI.java diff --git a/src/us/kbase/groups/service/api/Root.java b/src/main/java/us/kbase/groups/service/api/Root.java similarity index 100% rename from src/us/kbase/groups/service/api/Root.java rename to src/main/java/us/kbase/groups/service/api/Root.java diff --git a/src/us/kbase/groups/service/api/ServicePaths.java b/src/main/java/us/kbase/groups/service/api/ServicePaths.java similarity index 100% rename from src/us/kbase/groups/service/api/ServicePaths.java rename to src/main/java/us/kbase/groups/service/api/ServicePaths.java diff --git a/src/us/kbase/groups/service/exceptions/ErrorMessage.java b/src/main/java/us/kbase/groups/service/exceptions/ErrorMessage.java similarity index 100% rename from src/us/kbase/groups/service/exceptions/ErrorMessage.java rename to src/main/java/us/kbase/groups/service/exceptions/ErrorMessage.java diff --git a/src/us/kbase/groups/service/exceptions/ExceptionHandler.java b/src/main/java/us/kbase/groups/service/exceptions/ExceptionHandler.java similarity index 100% rename from src/us/kbase/groups/service/exceptions/ExceptionHandler.java rename to src/main/java/us/kbase/groups/service/exceptions/ExceptionHandler.java diff --git a/src/us/kbase/groups/storage/GroupsStorage.java b/src/main/java/us/kbase/groups/storage/GroupsStorage.java similarity index 100% rename from src/us/kbase/groups/storage/GroupsStorage.java rename to src/main/java/us/kbase/groups/storage/GroupsStorage.java diff --git a/src/us/kbase/groups/storage/exceptions/GroupsStorageException.java b/src/main/java/us/kbase/groups/storage/exceptions/GroupsStorageException.java similarity index 100% rename from src/us/kbase/groups/storage/exceptions/GroupsStorageException.java rename to src/main/java/us/kbase/groups/storage/exceptions/GroupsStorageException.java diff --git a/src/us/kbase/groups/storage/exceptions/StorageInitException.java b/src/main/java/us/kbase/groups/storage/exceptions/StorageInitException.java similarity index 100% rename from src/us/kbase/groups/storage/exceptions/StorageInitException.java rename to src/main/java/us/kbase/groups/storage/exceptions/StorageInitException.java diff --git a/src/us/kbase/groups/storage/mongo/Fields.java b/src/main/java/us/kbase/groups/storage/mongo/Fields.java similarity index 100% rename from src/us/kbase/groups/storage/mongo/Fields.java rename to src/main/java/us/kbase/groups/storage/mongo/Fields.java diff --git a/src/us/kbase/groups/storage/mongo/MongoGroupsStorage.java b/src/main/java/us/kbase/groups/storage/mongo/MongoGroupsStorage.java similarity index 100% rename from src/us/kbase/groups/storage/mongo/MongoGroupsStorage.java rename to src/main/java/us/kbase/groups/storage/mongo/MongoGroupsStorage.java diff --git a/src/us/kbase/groups/userhandler/KBaseUserHandler.java b/src/main/java/us/kbase/groups/userhandler/KBaseUserHandler.java similarity index 100% rename from src/us/kbase/groups/userhandler/KBaseUserHandler.java rename to src/main/java/us/kbase/groups/userhandler/KBaseUserHandler.java diff --git a/src/us/kbase/groups/util/FileOpener.java b/src/main/java/us/kbase/groups/util/FileOpener.java similarity index 100% rename from src/us/kbase/groups/util/FileOpener.java rename to src/main/java/us/kbase/groups/util/FileOpener.java diff --git a/src/us/kbase/groups/util/Util.java b/src/main/java/us/kbase/groups/util/Util.java similarity index 100% rename from src/us/kbase/groups/util/Util.java rename to src/main/java/us/kbase/groups/util/Util.java diff --git a/src/us/kbase/groups/workspacehandler/SDKClientWorkspaceHandler.java b/src/main/java/us/kbase/groups/workspacehandler/SDKClientWorkspaceHandler.java similarity index 100% rename from src/us/kbase/groups/workspacehandler/SDKClientWorkspaceHandler.java rename to src/main/java/us/kbase/groups/workspacehandler/SDKClientWorkspaceHandler.java diff --git a/src/us/kbase/groups/workspacehandler/WorkspacePermission.java b/src/main/java/us/kbase/groups/workspacehandler/WorkspacePermission.java similarity index 100% rename from src/us/kbase/groups/workspacehandler/WorkspacePermission.java rename to src/main/java/us/kbase/groups/workspacehandler/WorkspacePermission.java diff --git a/src/us/kbase/test/groups/MapBuilder.java b/src/test/java/us/kbase/test/groups/MapBuilder.java similarity index 100% rename from src/us/kbase/test/groups/MapBuilder.java rename to src/test/java/us/kbase/test/groups/MapBuilder.java diff --git a/src/us/kbase/test/groups/MongoStorageTestManager.java b/src/test/java/us/kbase/test/groups/MongoStorageTestManager.java similarity index 100% rename from src/us/kbase/test/groups/MongoStorageTestManager.java rename to src/test/java/us/kbase/test/groups/MongoStorageTestManager.java diff --git a/src/us/kbase/test/groups/StandaloneGroupsServer.java b/src/test/java/us/kbase/test/groups/StandaloneGroupsServer.java similarity index 100% rename from src/us/kbase/test/groups/StandaloneGroupsServer.java rename to src/test/java/us/kbase/test/groups/StandaloneGroupsServer.java diff --git a/src/us/kbase/test/groups/TestCommon.java b/src/test/java/us/kbase/test/groups/TestCommon.java similarity index 100% rename from src/us/kbase/test/groups/TestCommon.java rename to src/test/java/us/kbase/test/groups/TestCommon.java diff --git a/src/us/kbase/test/groups/cataloghandler/SDKClientCatalogHandlerTest.java b/src/test/java/us/kbase/test/groups/cataloghandler/SDKClientCatalogHandlerTest.java similarity index 100% rename from src/us/kbase/test/groups/cataloghandler/SDKClientCatalogHandlerTest.java rename to src/test/java/us/kbase/test/groups/cataloghandler/SDKClientCatalogHandlerTest.java diff --git a/src/us/kbase/test/groups/config/GroupsConfigTest.java b/src/test/java/us/kbase/test/groups/config/GroupsConfigTest.java similarity index 100% rename from src/us/kbase/test/groups/config/GroupsConfigTest.java rename to src/test/java/us/kbase/test/groups/config/GroupsConfigTest.java diff --git a/src/us/kbase/test/groups/controllers/workspace/WorkspaceController.java b/src/test/java/us/kbase/test/groups/controllers/workspace/WorkspaceController.java similarity index 100% rename from src/us/kbase/test/groups/controllers/workspace/WorkspaceController.java rename to src/test/java/us/kbase/test/groups/controllers/workspace/WorkspaceController.java diff --git a/src/us/kbase/test/groups/core/CreateModExpireTimesTest.java b/src/test/java/us/kbase/test/groups/core/CreateModExpireTimesTest.java similarity index 100% rename from src/us/kbase/test/groups/core/CreateModExpireTimesTest.java rename to src/test/java/us/kbase/test/groups/core/CreateModExpireTimesTest.java diff --git a/src/us/kbase/test/groups/core/FieldItemTest.java b/src/test/java/us/kbase/test/groups/core/FieldItemTest.java similarity index 100% rename from src/us/kbase/test/groups/core/FieldItemTest.java rename to src/test/java/us/kbase/test/groups/core/FieldItemTest.java diff --git a/src/us/kbase/test/groups/core/GetGroupsParamsTest.java b/src/test/java/us/kbase/test/groups/core/GetGroupsParamsTest.java similarity index 100% rename from src/us/kbase/test/groups/core/GetGroupsParamsTest.java rename to src/test/java/us/kbase/test/groups/core/GetGroupsParamsTest.java diff --git a/src/us/kbase/test/groups/core/GetRequestParamsTest.java b/src/test/java/us/kbase/test/groups/core/GetRequestParamsTest.java similarity index 100% rename from src/us/kbase/test/groups/core/GetRequestParamsTest.java rename to src/test/java/us/kbase/test/groups/core/GetRequestParamsTest.java diff --git a/src/us/kbase/test/groups/core/GroupCreationParamsTest.java b/src/test/java/us/kbase/test/groups/core/GroupCreationParamsTest.java similarity index 100% rename from src/us/kbase/test/groups/core/GroupCreationParamsTest.java rename to src/test/java/us/kbase/test/groups/core/GroupCreationParamsTest.java diff --git a/src/us/kbase/test/groups/core/GroupHasRequestsTest.java b/src/test/java/us/kbase/test/groups/core/GroupHasRequestsTest.java similarity index 100% rename from src/us/kbase/test/groups/core/GroupHasRequestsTest.java rename to src/test/java/us/kbase/test/groups/core/GroupHasRequestsTest.java diff --git a/src/us/kbase/test/groups/core/GroupIDAndNameTest.java b/src/test/java/us/kbase/test/groups/core/GroupIDAndNameTest.java similarity index 100% rename from src/us/kbase/test/groups/core/GroupIDAndNameTest.java rename to src/test/java/us/kbase/test/groups/core/GroupIDAndNameTest.java diff --git a/src/us/kbase/test/groups/core/GroupIDNameMembershipTest.java b/src/test/java/us/kbase/test/groups/core/GroupIDNameMembershipTest.java similarity index 100% rename from src/us/kbase/test/groups/core/GroupIDNameMembershipTest.java rename to src/test/java/us/kbase/test/groups/core/GroupIDNameMembershipTest.java diff --git a/src/us/kbase/test/groups/core/GroupIDTest.java b/src/test/java/us/kbase/test/groups/core/GroupIDTest.java similarity index 100% rename from src/us/kbase/test/groups/core/GroupIDTest.java rename to src/test/java/us/kbase/test/groups/core/GroupIDTest.java diff --git a/src/us/kbase/test/groups/core/GroupNameTest.java b/src/test/java/us/kbase/test/groups/core/GroupNameTest.java similarity index 100% rename from src/us/kbase/test/groups/core/GroupNameTest.java rename to src/test/java/us/kbase/test/groups/core/GroupNameTest.java diff --git a/src/us/kbase/test/groups/core/GroupTest.java b/src/test/java/us/kbase/test/groups/core/GroupTest.java similarity index 100% rename from src/us/kbase/test/groups/core/GroupTest.java rename to src/test/java/us/kbase/test/groups/core/GroupTest.java diff --git a/src/us/kbase/test/groups/core/GroupUpdateParamsTest.java b/src/test/java/us/kbase/test/groups/core/GroupUpdateParamsTest.java similarity index 100% rename from src/us/kbase/test/groups/core/GroupUpdateParamsTest.java rename to src/test/java/us/kbase/test/groups/core/GroupUpdateParamsTest.java diff --git a/src/us/kbase/test/groups/core/GroupUserTest.java b/src/test/java/us/kbase/test/groups/core/GroupUserTest.java similarity index 100% rename from src/us/kbase/test/groups/core/GroupUserTest.java rename to src/test/java/us/kbase/test/groups/core/GroupUserTest.java diff --git a/src/us/kbase/test/groups/core/GroupViewTest.java b/src/test/java/us/kbase/test/groups/core/GroupViewTest.java similarity index 100% rename from src/us/kbase/test/groups/core/GroupViewTest.java rename to src/test/java/us/kbase/test/groups/core/GroupViewTest.java diff --git a/src/us/kbase/test/groups/core/GroupsTest.java b/src/test/java/us/kbase/test/groups/core/GroupsTest.java similarity index 100% rename from src/us/kbase/test/groups/core/GroupsTest.java rename to src/test/java/us/kbase/test/groups/core/GroupsTest.java diff --git a/src/us/kbase/test/groups/core/NameTest.java b/src/test/java/us/kbase/test/groups/core/NameTest.java similarity index 100% rename from src/us/kbase/test/groups/core/NameTest.java rename to src/test/java/us/kbase/test/groups/core/NameTest.java diff --git a/src/us/kbase/test/groups/core/OptionalGroupFieldsTest.java b/src/test/java/us/kbase/test/groups/core/OptionalGroupFieldsTest.java similarity index 100% rename from src/us/kbase/test/groups/core/OptionalGroupFieldsTest.java rename to src/test/java/us/kbase/test/groups/core/OptionalGroupFieldsTest.java diff --git a/src/us/kbase/test/groups/core/OptionalStringTest.java b/src/test/java/us/kbase/test/groups/core/OptionalStringTest.java similarity index 100% rename from src/us/kbase/test/groups/core/OptionalStringTest.java rename to src/test/java/us/kbase/test/groups/core/OptionalStringTest.java diff --git a/src/us/kbase/test/groups/core/TokenTest.java b/src/test/java/us/kbase/test/groups/core/TokenTest.java similarity index 100% rename from src/us/kbase/test/groups/core/TokenTest.java rename to src/test/java/us/kbase/test/groups/core/TokenTest.java diff --git a/src/us/kbase/test/groups/core/UserNameTest.java b/src/test/java/us/kbase/test/groups/core/UserNameTest.java similarity index 100% rename from src/us/kbase/test/groups/core/UserNameTest.java rename to src/test/java/us/kbase/test/groups/core/UserNameTest.java diff --git a/src/us/kbase/test/groups/core/fieldvalidation/CustomFieldTest.java b/src/test/java/us/kbase/test/groups/core/fieldvalidation/CustomFieldTest.java similarity index 100% rename from src/us/kbase/test/groups/core/fieldvalidation/CustomFieldTest.java rename to src/test/java/us/kbase/test/groups/core/fieldvalidation/CustomFieldTest.java diff --git a/src/us/kbase/test/groups/core/fieldvalidation/FieldConfigurationTest.java b/src/test/java/us/kbase/test/groups/core/fieldvalidation/FieldConfigurationTest.java similarity index 100% rename from src/us/kbase/test/groups/core/fieldvalidation/FieldConfigurationTest.java rename to src/test/java/us/kbase/test/groups/core/fieldvalidation/FieldConfigurationTest.java diff --git a/src/us/kbase/test/groups/core/fieldvalidation/FieldValidatorConfigurationTest.java b/src/test/java/us/kbase/test/groups/core/fieldvalidation/FieldValidatorConfigurationTest.java similarity index 100% rename from src/us/kbase/test/groups/core/fieldvalidation/FieldValidatorConfigurationTest.java rename to src/test/java/us/kbase/test/groups/core/fieldvalidation/FieldValidatorConfigurationTest.java diff --git a/src/us/kbase/test/groups/core/fieldvalidation/FieldValidatorsTest.java b/src/test/java/us/kbase/test/groups/core/fieldvalidation/FieldValidatorsTest.java similarity index 100% rename from src/us/kbase/test/groups/core/fieldvalidation/FieldValidatorsTest.java rename to src/test/java/us/kbase/test/groups/core/fieldvalidation/FieldValidatorsTest.java diff --git a/src/us/kbase/test/groups/core/fieldvalidation/NumberedCustomFieldTest.java b/src/test/java/us/kbase/test/groups/core/fieldvalidation/NumberedCustomFieldTest.java similarity index 100% rename from src/us/kbase/test/groups/core/fieldvalidation/NumberedCustomFieldTest.java rename to src/test/java/us/kbase/test/groups/core/fieldvalidation/NumberedCustomFieldTest.java diff --git a/src/us/kbase/test/groups/core/request/GroupRequestStatusTest.java b/src/test/java/us/kbase/test/groups/core/request/GroupRequestStatusTest.java similarity index 100% rename from src/us/kbase/test/groups/core/request/GroupRequestStatusTest.java rename to src/test/java/us/kbase/test/groups/core/request/GroupRequestStatusTest.java diff --git a/src/us/kbase/test/groups/core/request/GroupRequestStatusTypeTest.java b/src/test/java/us/kbase/test/groups/core/request/GroupRequestStatusTypeTest.java similarity index 100% rename from src/us/kbase/test/groups/core/request/GroupRequestStatusTypeTest.java rename to src/test/java/us/kbase/test/groups/core/request/GroupRequestStatusTypeTest.java diff --git a/src/us/kbase/test/groups/core/request/GroupRequestTest.java b/src/test/java/us/kbase/test/groups/core/request/GroupRequestTest.java similarity index 100% rename from src/us/kbase/test/groups/core/request/GroupRequestTest.java rename to src/test/java/us/kbase/test/groups/core/request/GroupRequestTest.java diff --git a/src/us/kbase/test/groups/core/request/GroupRequestUserActionTest.java b/src/test/java/us/kbase/test/groups/core/request/GroupRequestUserActionTest.java similarity index 100% rename from src/us/kbase/test/groups/core/request/GroupRequestUserActionTest.java rename to src/test/java/us/kbase/test/groups/core/request/GroupRequestUserActionTest.java diff --git a/src/us/kbase/test/groups/core/request/GroupRequestWithActionsTest.java b/src/test/java/us/kbase/test/groups/core/request/GroupRequestWithActionsTest.java similarity index 100% rename from src/us/kbase/test/groups/core/request/GroupRequestWithActionsTest.java rename to src/test/java/us/kbase/test/groups/core/request/GroupRequestWithActionsTest.java diff --git a/src/us/kbase/test/groups/core/request/RequestIDTest.java b/src/test/java/us/kbase/test/groups/core/request/RequestIDTest.java similarity index 100% rename from src/us/kbase/test/groups/core/request/RequestIDTest.java rename to src/test/java/us/kbase/test/groups/core/request/RequestIDTest.java diff --git a/src/us/kbase/test/groups/core/request/RequestTypeTest.java b/src/test/java/us/kbase/test/groups/core/request/RequestTypeTest.java similarity index 100% rename from src/us/kbase/test/groups/core/request/RequestTypeTest.java rename to src/test/java/us/kbase/test/groups/core/request/RequestTypeTest.java diff --git a/src/us/kbase/test/groups/core/resource/ResourceIDTest.java b/src/test/java/us/kbase/test/groups/core/resource/ResourceIDTest.java similarity index 100% rename from src/us/kbase/test/groups/core/resource/ResourceIDTest.java rename to src/test/java/us/kbase/test/groups/core/resource/ResourceIDTest.java diff --git a/src/us/kbase/test/groups/core/resource/ResourceInformationSetTest.java b/src/test/java/us/kbase/test/groups/core/resource/ResourceInformationSetTest.java similarity index 100% rename from src/us/kbase/test/groups/core/resource/ResourceInformationSetTest.java rename to src/test/java/us/kbase/test/groups/core/resource/ResourceInformationSetTest.java diff --git a/src/us/kbase/test/groups/core/resource/ResourceInformationTest.java b/src/test/java/us/kbase/test/groups/core/resource/ResourceInformationTest.java similarity index 100% rename from src/us/kbase/test/groups/core/resource/ResourceInformationTest.java rename to src/test/java/us/kbase/test/groups/core/resource/ResourceInformationTest.java diff --git a/src/us/kbase/test/groups/core/resource/ResourceTypeTest.java b/src/test/java/us/kbase/test/groups/core/resource/ResourceTypeTest.java similarity index 100% rename from src/us/kbase/test/groups/core/resource/ResourceTypeTest.java rename to src/test/java/us/kbase/test/groups/core/resource/ResourceTypeTest.java diff --git a/src/us/kbase/test/groups/fieldvalidators/EnumFieldValidatorFactoryTest.java b/src/test/java/us/kbase/test/groups/fieldvalidators/EnumFieldValidatorFactoryTest.java similarity index 100% rename from src/us/kbase/test/groups/fieldvalidators/EnumFieldValidatorFactoryTest.java rename to src/test/java/us/kbase/test/groups/fieldvalidators/EnumFieldValidatorFactoryTest.java diff --git a/src/us/kbase/test/groups/fieldvalidators/GravatarFieldValidatorFactoryTest.java b/src/test/java/us/kbase/test/groups/fieldvalidators/GravatarFieldValidatorFactoryTest.java similarity index 100% rename from src/us/kbase/test/groups/fieldvalidators/GravatarFieldValidatorFactoryTest.java rename to src/test/java/us/kbase/test/groups/fieldvalidators/GravatarFieldValidatorFactoryTest.java diff --git a/src/us/kbase/test/groups/fieldvalidators/SimpleFieldValidatorFactoryTest.java b/src/test/java/us/kbase/test/groups/fieldvalidators/SimpleFieldValidatorFactoryTest.java similarity index 100% rename from src/us/kbase/test/groups/fieldvalidators/SimpleFieldValidatorFactoryTest.java rename to src/test/java/us/kbase/test/groups/fieldvalidators/SimpleFieldValidatorFactoryTest.java diff --git a/src/us/kbase/test/groups/integration/ServiceIntegrationTest.java b/src/test/java/us/kbase/test/groups/integration/ServiceIntegrationTest.java similarity index 100% rename from src/us/kbase/test/groups/integration/ServiceIntegrationTest.java rename to src/test/java/us/kbase/test/groups/integration/ServiceIntegrationTest.java diff --git a/src/us/kbase/test/groups/notifications/KafkaFeedsNotifierFactoryTest.java b/src/test/java/us/kbase/test/groups/notifications/KafkaFeedsNotifierFactoryTest.java similarity index 100% rename from src/us/kbase/test/groups/notifications/KafkaFeedsNotifierFactoryTest.java rename to src/test/java/us/kbase/test/groups/notifications/KafkaFeedsNotifierFactoryTest.java diff --git a/src/us/kbase/test/groups/service/LoggingFilterTest.java b/src/test/java/us/kbase/test/groups/service/LoggingFilterTest.java similarity index 100% rename from src/us/kbase/test/groups/service/LoggingFilterTest.java rename to src/test/java/us/kbase/test/groups/service/LoggingFilterTest.java diff --git a/src/us/kbase/test/groups/service/api/APICommonTest.java b/src/test/java/us/kbase/test/groups/service/api/APICommonTest.java similarity index 100% rename from src/us/kbase/test/groups/service/api/APICommonTest.java rename to src/test/java/us/kbase/test/groups/service/api/APICommonTest.java diff --git a/src/us/kbase/test/groups/service/api/GroupsAPITest.java b/src/test/java/us/kbase/test/groups/service/api/GroupsAPITest.java similarity index 100% rename from src/us/kbase/test/groups/service/api/GroupsAPITest.java rename to src/test/java/us/kbase/test/groups/service/api/GroupsAPITest.java diff --git a/src/us/kbase/test/groups/service/api/IncomingJSONTest.java b/src/test/java/us/kbase/test/groups/service/api/IncomingJSONTest.java similarity index 100% rename from src/us/kbase/test/groups/service/api/IncomingJSONTest.java rename to src/test/java/us/kbase/test/groups/service/api/IncomingJSONTest.java diff --git a/src/us/kbase/test/groups/service/api/MemberAPITest.java b/src/test/java/us/kbase/test/groups/service/api/MemberAPITest.java similarity index 100% rename from src/us/kbase/test/groups/service/api/MemberAPITest.java rename to src/test/java/us/kbase/test/groups/service/api/MemberAPITest.java diff --git a/src/us/kbase/test/groups/service/api/NamesAPITest.java b/src/test/java/us/kbase/test/groups/service/api/NamesAPITest.java similarity index 100% rename from src/us/kbase/test/groups/service/api/NamesAPITest.java rename to src/test/java/us/kbase/test/groups/service/api/NamesAPITest.java diff --git a/src/us/kbase/test/groups/service/api/RequestAPITest.java b/src/test/java/us/kbase/test/groups/service/api/RequestAPITest.java similarity index 100% rename from src/us/kbase/test/groups/service/api/RequestAPITest.java rename to src/test/java/us/kbase/test/groups/service/api/RequestAPITest.java diff --git a/src/us/kbase/test/groups/service/api/RootTest.java b/src/test/java/us/kbase/test/groups/service/api/RootTest.java similarity index 100% rename from src/us/kbase/test/groups/service/api/RootTest.java rename to src/test/java/us/kbase/test/groups/service/api/RootTest.java diff --git a/src/us/kbase/test/groups/service/exceptions/ErrorMessageTest.java b/src/test/java/us/kbase/test/groups/service/exceptions/ErrorMessageTest.java similarity index 100% rename from src/us/kbase/test/groups/service/exceptions/ErrorMessageTest.java rename to src/test/java/us/kbase/test/groups/service/exceptions/ErrorMessageTest.java diff --git a/src/us/kbase/test/groups/service/exceptions/ExceptionHandlerTest.java b/src/test/java/us/kbase/test/groups/service/exceptions/ExceptionHandlerTest.java similarity index 100% rename from src/us/kbase/test/groups/service/exceptions/ExceptionHandlerTest.java rename to src/test/java/us/kbase/test/groups/service/exceptions/ExceptionHandlerTest.java diff --git a/src/us/kbase/test/groups/storage/mongo/MongoGroupsStorageDuplicateKeyCheckerTest.java b/src/test/java/us/kbase/test/groups/storage/mongo/MongoGroupsStorageDuplicateKeyCheckerTest.java similarity index 100% rename from src/us/kbase/test/groups/storage/mongo/MongoGroupsStorageDuplicateKeyCheckerTest.java rename to src/test/java/us/kbase/test/groups/storage/mongo/MongoGroupsStorageDuplicateKeyCheckerTest.java diff --git a/src/us/kbase/test/groups/storage/mongo/MongoGroupsStorageOpsTest.java b/src/test/java/us/kbase/test/groups/storage/mongo/MongoGroupsStorageOpsTest.java similarity index 100% rename from src/us/kbase/test/groups/storage/mongo/MongoGroupsStorageOpsTest.java rename to src/test/java/us/kbase/test/groups/storage/mongo/MongoGroupsStorageOpsTest.java diff --git a/src/us/kbase/test/groups/storage/mongo/MongoGroupsStorageStartupTest.java b/src/test/java/us/kbase/test/groups/storage/mongo/MongoGroupsStorageStartupTest.java similarity index 100% rename from src/us/kbase/test/groups/storage/mongo/MongoGroupsStorageStartupTest.java rename to src/test/java/us/kbase/test/groups/storage/mongo/MongoGroupsStorageStartupTest.java diff --git a/src/us/kbase/test/groups/util/FailOnInstantiation.java b/src/test/java/us/kbase/test/groups/util/FailOnInstantiation.java similarity index 100% rename from src/us/kbase/test/groups/util/FailOnInstantiation.java rename to src/test/java/us/kbase/test/groups/util/FailOnInstantiation.java diff --git a/src/us/kbase/test/groups/util/FailOnInstantiationNoNullaryConstructor.java b/src/test/java/us/kbase/test/groups/util/FailOnInstantiationNoNullaryConstructor.java similarity index 100% rename from src/us/kbase/test/groups/util/FailOnInstantiationNoNullaryConstructor.java rename to src/test/java/us/kbase/test/groups/util/FailOnInstantiationNoNullaryConstructor.java diff --git a/src/us/kbase/test/groups/util/FailOnInstantiationPrivateConstructor.java b/src/test/java/us/kbase/test/groups/util/FailOnInstantiationPrivateConstructor.java similarity index 100% rename from src/us/kbase/test/groups/util/FailOnInstantiationPrivateConstructor.java rename to src/test/java/us/kbase/test/groups/util/FailOnInstantiationPrivateConstructor.java diff --git a/src/us/kbase/test/groups/util/UtilTest.java b/src/test/java/us/kbase/test/groups/util/UtilTest.java similarity index 100% rename from src/us/kbase/test/groups/util/UtilTest.java rename to src/test/java/us/kbase/test/groups/util/UtilTest.java diff --git a/src/us/kbase/test/groups/workspacehandler/SDKClientWorkspaceHandlerTest.java b/src/test/java/us/kbase/test/groups/workspacehandler/SDKClientWorkspaceHandlerTest.java similarity index 100% rename from src/us/kbase/test/groups/workspacehandler/SDKClientWorkspaceHandlerTest.java rename to src/test/java/us/kbase/test/groups/workspacehandler/SDKClientWorkspaceHandlerTest.java diff --git a/src/us/kbase/test/groups/workspacehandler/WorkspacePermissionTest.java b/src/test/java/us/kbase/test/groups/workspacehandler/WorkspacePermissionTest.java similarity index 100% rename from src/us/kbase/test/groups/workspacehandler/WorkspacePermissionTest.java rename to src/test/java/us/kbase/test/groups/workspacehandler/WorkspacePermissionTest.java diff --git a/src/us/kbase/test/groups/controllers/workspace/wsjars b/src/test/resources/us/kbase/test/groups/controllers/workspace/wsjars similarity index 100% rename from src/us/kbase/test/groups/controllers/workspace/wsjars rename to src/test/resources/us/kbase/test/groups/controllers/workspace/wsjars