This is an automated email from the ASF dual-hosted git repository.
jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
The following commit(s) were added to refs/heads/master by this push:
new ae288bb Aggregate unit tests into a single project.
ae288bb is described below
commit ae288bbe611f6b022c2f9dd5e6b15d4a73a70966
Author: JamesBognar <[email protected]>
AuthorDate: Fri Feb 5 13:54:24 2021 -0500
Aggregate unit tests into a single project.
---
.../src/test/java/org/apache/juneau/rest/Header_AcceptCharset_Test.java | 0
.../src/test/java/org/apache/juneau/rest/Header_AcceptEncoding_Test.java | 0
.../src/test/java/org/apache/juneau/rest/Header_Accept_Test.java | 0
.../src/test/java/org/apache/juneau/rest/Header_ContentType_Test.java | 0
.../juneau-core-utest}/src/test/java/org/apache/juneau/rest/Nls_Test.java | 0
.../src/test/java/org/apache/juneau/rest/Paths_Test.java | 0
.../test/java/org/apache/juneau/rest/RestContext_ThreadLocals_Test.java | 0
.../src/test/java/org/apache/juneau/rest/RestOp_Params_Test.java | 0
.../src/test/java/org/apache/juneau/rest/RestOp_Returns_Test.java | 0
.../src/test/java/org/apache/juneau/rest/RestOp_Throws_Test.java | 0
.../test/java/org/apache/juneau/rest/Rest_PredefinedStatusCodes_Test.java | 0
.../src/test/java/org/apache/juneau/rest/Swagger_Test.java | 0
.../java/org/apache/juneau/rest/annotation/BeanConfig_Swaps_Test.java | 0
.../src/test/java/org/apache/juneau/rest/annotation/Body_Test.java | 0
.../src/test/java/org/apache/juneau/rest/annotation/FormData_Test.java | 0
.../src/test/java/org/apache/juneau/rest/annotation/HasFormData_Test.java | 0
.../src/test/java/org/apache/juneau/rest/annotation/HasQuery_Test.java | 0
.../src/test/java/org/apache/juneau/rest/annotation/Header_Test.java | 0
.../java/org/apache/juneau/rest/annotation/OpSwaggerAnnotation_Test.java | 0
.../test/java/org/apache/juneau/rest/annotation/PathRemainder_Test.java | 0
.../src/test/java/org/apache/juneau/rest/annotation/Path_Test.java | 0
.../src/test/java/org/apache/juneau/rest/annotation/Query_Test.java | 0
.../test/java/org/apache/juneau/rest/annotation/ResponseBody_Test.java | 0
.../test/java/org/apache/juneau/rest/annotation/ResponseHeader_Test.java | 0
.../test/java/org/apache/juneau/rest/annotation/ResponseStatus_Test.java | 0
.../src/test/java/org/apache/juneau/rest/annotation/Response_Test.java | 0
.../test/java/org/apache/juneau/rest/annotation/RestAnnotation_Test.java | 0
.../java/org/apache/juneau/rest/annotation/RestHookAnnotation_Test.java | 0
.../src/test/java/org/apache/juneau/rest/annotation/RestHook_Test.java | 0
.../java/org/apache/juneau/rest/annotation/RestOpAnnotation_Test.java | 0
.../java/org/apache/juneau/rest/annotation/RestOp_BeanConfig_Test.java | 0
.../java/org/apache/juneau/rest/annotation/RestOp_ClientVersion_Test.java | 0
.../test/java/org/apache/juneau/rest/annotation/RestOp_Guards_Test.java | 0
.../test/java/org/apache/juneau/rest/annotation/RestOp_Matchers_Test.java | 0
.../java/org/apache/juneau/rest/annotation/RestOp_ReqHeaders_Test.java | 0
.../java/org/apache/juneau/rest/annotation/Rest_AllowBodyParam_Test.java | 0
.../org/apache/juneau/rest/annotation/Rest_AllowedHeaderParams_Test.java | 0
.../org/apache/juneau/rest/annotation/Rest_AllowedMethodHeaders_Test.java | 0
.../org/apache/juneau/rest/annotation/Rest_AllowedMethodParams_Test.java | 0
.../apache/juneau/rest/annotation/Rest_AnnotationInheritance_Test.java | 0
.../test/java/org/apache/juneau/rest/annotation/Rest_Context_Test.java | 0
.../src/test/java/org/apache/juneau/rest/annotation/Rest_Debug_Test.java | 0
.../test/java/org/apache/juneau/rest/annotation/Rest_Encoders_Test.java | 0
.../test/java/org/apache/juneau/rest/annotation/Rest_Messages_Test.java | 0
.../src/test/java/org/apache/juneau/rest/annotation/Rest_RVars_Test.java | 0
.../test/java/org/apache/juneau/rest/annotation/Restx_Parsers_Test.java | 0
.../src/test/java/org/apache/juneau/rest/annotation/Restx_Path_Test.java | 0
.../test/java/org/apache/juneau/rest/annotation/Restx_ReqAttrs_Test.java | 0
.../test/java/org/apache/juneau/rest/annotation/Restx_RoleGuard_Test.java | 0
.../java/org/apache/juneau/rest/annotation/Restx_Serializers_Test.java | 0
.../java/org/apache/juneau/rest/annotation/SwaggerAnnotation_Test.java | 0
.../test/java/org/apache/juneau/rest/annotation/Swagger_Body_Test.java | 0
.../java/org/apache/juneau/rest/annotation/Swagger_FormData_Test.java | 0
.../test/java/org/apache/juneau/rest/annotation/Swagger_Header_Test.java | 0
.../test/java/org/apache/juneau/rest/annotation/Swagger_Path_Test.java | 0
.../test/java/org/apache/juneau/rest/annotation/Swagger_Query_Test.java | 0
.../java/org/apache/juneau/rest/annotation/Swagger_Response_Test.java | 0
.../java/org/apache/juneau/rest/annotation/Swagger_RestOp_Parameters.java | 0
.../org/apache/juneau/rest/client/BasicHttpRequestRetryHandler_Test.java | 0
.../test/java/org/apache/juneau/rest/client/RestCallException_Test.java | 0
.../java/org/apache/juneau/rest/client/RestClient_BasicCalls_Test.java | 0
.../src/test/java/org/apache/juneau/rest/client/RestClient_Body_Test.java | 0
.../org/apache/juneau/rest/client/RestClient_CallbackStrings_Test.java | 0
.../org/apache/juneau/rest/client/RestClient_Config_BeanContext_Test.java | 0
.../org/apache/juneau/rest/client/RestClient_Config_Context_Test.java | 0
.../org/apache/juneau/rest/client/RestClient_Config_OpenApi_Test.java | 0
.../java/org/apache/juneau/rest/client/RestClient_Config_Parser_Test.java | 0
.../org/apache/juneau/rest/client/RestClient_Config_RestClient_Test.java | 0
.../org/apache/juneau/rest/client/RestClient_Config_Serializer_Test.java | 0
.../test/java/org/apache/juneau/rest/client/RestClient_FormData_Test.java | 0
.../test/java/org/apache/juneau/rest/client/RestClient_Headers_Test.java | 0
.../test/java/org/apache/juneau/rest/client/RestClient_Logging_Test.java | 0
.../java/org/apache/juneau/rest/client/RestClient_Marshalls_Test.java | 0
.../test/java/org/apache/juneau/rest/client/RestClient_Paths_Test.java | 0
.../test/java/org/apache/juneau/rest/client/RestClient_Query_Test.java | 0
.../java/org/apache/juneau/rest/client/RestClient_Response_Body_Test.java | 0
.../org/apache/juneau/rest/client/RestClient_Response_Headers_Test.java | 0
.../test/java/org/apache/juneau/rest/client/RestClient_Response_Test.java | 0
.../src/test/java/org/apache/juneau/rest/client/RestClient_Test.java | 0
.../src/test/java/org/apache/juneau/rest/guards/RoleMatcher_Test.java | 0
.../src/test/java/org/apache/juneau/rest/helper/Hyperlink_Test.java | 0
.../test/java/org/apache/juneau/rest/helper/ResourceDescription_Test.java | 0
.../java/org/apache/juneau/rest/mock/MockRestClient_PathVars_Test.java | 0
.../src/test/java/org/apache/juneau/rest/mock/PathResolverTest.java | 0
.../test/java/org/apache/juneau/rest/mock2/MockServletRequest_Test.java | 0
.../src/test/java/org/apache/juneau/rest/testutils/TestUtils.java | 0
.../src/test/java/org/apache/juneau/rest/util/RestUtils_Test.java | 0
.../src/test/java/org/apache/juneau/rest/util/UrlPathMatcher_Test.java | 0
.../resources/org/apache/juneau/rest/BasicRestInfoProviderTest.properties | 0
.../org/apache/juneau/rest/BasicRestInfoProviderTest_swagger.json | 0
.../src/test/resources/org/apache/juneau/rest/NlsTest.properties | 0
.../src/test/resources/org/apache/juneau/rest/RestParamsTest.properties | 0
.../test/resources/org/apache/juneau/rest/RestParamsTest_ja_JP.properties | 0
.../src/test/resources/org/apache/juneau/rest/annotation/A1.properties | 0
.../src/test/resources/org/apache/juneau/rest/annotation/A2.properties | 0
.../src/test/resources/org/apache/juneau/rest/annotation/B1x.properties | 0
.../src/test/resources/org/apache/juneau/rest/annotation/B2x.properties | 0
.../src/test/resources/org/apache/juneau/rest/annotation/xdocs/test.txt | 0
.../resources/org/apache/juneau/rest/annotation/xdocs/xsubdocs/test.txt | 0
.../juneau-core-utest}/src/test/resources/xdocs/test.txt | 0
.../juneau-core-utest}/src/test/resources/xdocs/xsubdocs/test.txt | 0
101 files changed, 0 insertions(+), 0 deletions(-)
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/Header_AcceptCharset_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/Header_AcceptCharset_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/Header_AcceptCharset_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/Header_AcceptCharset_Test.java
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/Header_AcceptEncoding_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/Header_AcceptEncoding_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/Header_AcceptEncoding_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/Header_AcceptEncoding_Test.java
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/Header_Accept_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/Header_Accept_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/Header_Accept_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/Header_Accept_Test.java
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/Header_ContentType_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/Header_ContentType_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/Header_ContentType_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/Header_ContentType_Test.java
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/Nls_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/Nls_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/Nls_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/Nls_Test.java
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/Paths_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/Paths_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/Paths_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/Paths_Test.java
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/RestContext_ThreadLocals_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/RestContext_ThreadLocals_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/RestContext_ThreadLocals_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/RestContext_ThreadLocals_Test.java
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/RestOp_Params_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/RestOp_Params_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/RestOp_Params_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/RestOp_Params_Test.java
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/RestOp_Returns_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/RestOp_Returns_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/RestOp_Returns_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/RestOp_Returns_Test.java
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/RestOp_Throws_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/RestOp_Throws_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/RestOp_Throws_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/RestOp_Throws_Test.java
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/Rest_PredefinedStatusCodes_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/Rest_PredefinedStatusCodes_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/Rest_PredefinedStatusCodes_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/Rest_PredefinedStatusCodes_Test.java
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/Swagger_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/Swagger_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/Swagger_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/Swagger_Test.java
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/BeanConfig_Swaps_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/BeanConfig_Swaps_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/BeanConfig_Swaps_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/BeanConfig_Swaps_Test.java
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Body_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/Body_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Body_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/Body_Test.java
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/FormData_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/FormData_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/FormData_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/FormData_Test.java
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/HasFormData_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/HasFormData_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/HasFormData_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/HasFormData_Test.java
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/HasQuery_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/HasQuery_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/HasQuery_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/HasQuery_Test.java
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Header_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/Header_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Header_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/Header_Test.java
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/OpSwaggerAnnotation_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/OpSwaggerAnnotation_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/OpSwaggerAnnotation_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/OpSwaggerAnnotation_Test.java
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/PathRemainder_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/PathRemainder_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/PathRemainder_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/PathRemainder_Test.java
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Path_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/Path_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Path_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/Path_Test.java
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Query_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/Query_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Query_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/Query_Test.java
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/ResponseBody_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/ResponseBody_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/ResponseBody_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/ResponseBody_Test.java
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/ResponseHeader_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/ResponseHeader_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/ResponseHeader_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/ResponseHeader_Test.java
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/ResponseStatus_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/ResponseStatus_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/ResponseStatus_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/ResponseStatus_Test.java
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Response_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/Response_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Response_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/Response_Test.java
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestAnnotation_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/RestAnnotation_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestAnnotation_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/RestAnnotation_Test.java
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestHookAnnotation_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/RestHookAnnotation_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestHookAnnotation_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/RestHookAnnotation_Test.java
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestHook_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/RestHook_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestHook_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/RestHook_Test.java
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestOpAnnotation_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/RestOpAnnotation_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestOpAnnotation_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/RestOpAnnotation_Test.java
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestOp_BeanConfig_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/RestOp_BeanConfig_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestOp_BeanConfig_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/RestOp_BeanConfig_Test.java
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestOp_ClientVersion_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/RestOp_ClientVersion_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestOp_ClientVersion_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/RestOp_ClientVersion_Test.java
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestOp_Guards_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/RestOp_Guards_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestOp_Guards_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/RestOp_Guards_Test.java
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestOp_Matchers_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/RestOp_Matchers_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestOp_Matchers_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/RestOp_Matchers_Test.java
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestOp_ReqHeaders_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/RestOp_ReqHeaders_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestOp_ReqHeaders_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/RestOp_ReqHeaders_Test.java
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_AllowBodyParam_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_AllowBodyParam_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_AllowBodyParam_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_AllowBodyParam_Test.java
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_AllowedHeaderParams_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_AllowedHeaderParams_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_AllowedHeaderParams_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_AllowedHeaderParams_Test.java
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_AllowedMethodHeaders_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_AllowedMethodHeaders_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_AllowedMethodHeaders_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_AllowedMethodHeaders_Test.java
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_AllowedMethodParams_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_AllowedMethodParams_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_AllowedMethodParams_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_AllowedMethodParams_Test.java
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_AnnotationInheritance_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_AnnotationInheritance_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_AnnotationInheritance_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_AnnotationInheritance_Test.java
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_Context_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_Context_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_Context_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_Context_Test.java
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_Debug_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_Debug_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_Debug_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_Debug_Test.java
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_Encoders_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_Encoders_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_Encoders_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_Encoders_Test.java
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_Messages_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_Messages_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_Messages_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_Messages_Test.java
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_RVars_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_RVars_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_RVars_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_RVars_Test.java
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Restx_Parsers_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/Restx_Parsers_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Restx_Parsers_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/Restx_Parsers_Test.java
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Restx_Path_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/Restx_Path_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Restx_Path_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/Restx_Path_Test.java
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Restx_ReqAttrs_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/Restx_ReqAttrs_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Restx_ReqAttrs_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/Restx_ReqAttrs_Test.java
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Restx_RoleGuard_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/Restx_RoleGuard_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Restx_RoleGuard_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/Restx_RoleGuard_Test.java
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Restx_Serializers_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/Restx_Serializers_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Restx_Serializers_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/Restx_Serializers_Test.java
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/SwaggerAnnotation_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/SwaggerAnnotation_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/SwaggerAnnotation_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/SwaggerAnnotation_Test.java
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Swagger_Body_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/Swagger_Body_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Swagger_Body_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/Swagger_Body_Test.java
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Swagger_FormData_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/Swagger_FormData_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Swagger_FormData_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/Swagger_FormData_Test.java
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Swagger_Header_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/Swagger_Header_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Swagger_Header_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/Swagger_Header_Test.java
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Swagger_Path_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/Swagger_Path_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Swagger_Path_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/Swagger_Path_Test.java
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Swagger_Query_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/Swagger_Query_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Swagger_Query_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/Swagger_Query_Test.java
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Swagger_Response_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/Swagger_Response_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Swagger_Response_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/Swagger_Response_Test.java
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Swagger_RestOp_Parameters.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/Swagger_RestOp_Parameters.java
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Swagger_RestOp_Parameters.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/annotation/Swagger_RestOp_Parameters.java
diff --git
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/BasicHttpRequestRetryHandler_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/client/BasicHttpRequestRetryHandler_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/BasicHttpRequestRetryHandler_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/client/BasicHttpRequestRetryHandler_Test.java
diff --git
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/RestCallException_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/client/RestCallException_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/RestCallException_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/client/RestCallException_Test.java
diff --git
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/RestClient_BasicCalls_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/client/RestClient_BasicCalls_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/RestClient_BasicCalls_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/client/RestClient_BasicCalls_Test.java
diff --git
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Body_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Body_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Body_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Body_Test.java
diff --git
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/RestClient_CallbackStrings_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/client/RestClient_CallbackStrings_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/RestClient_CallbackStrings_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/client/RestClient_CallbackStrings_Test.java
diff --git
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_BeanContext_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_BeanContext_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_BeanContext_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_BeanContext_Test.java
diff --git
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_Context_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_Context_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_Context_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_Context_Test.java
diff --git
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_OpenApi_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_OpenApi_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_OpenApi_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_OpenApi_Test.java
diff --git
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_Parser_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_Parser_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_Parser_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_Parser_Test.java
diff --git
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_RestClient_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_RestClient_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_RestClient_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_RestClient_Test.java
diff --git
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_Serializer_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_Serializer_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_Serializer_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_Serializer_Test.java
diff --git
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/RestClient_FormData_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/client/RestClient_FormData_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/RestClient_FormData_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/client/RestClient_FormData_Test.java
diff --git
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Headers_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Headers_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Headers_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Headers_Test.java
diff --git
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Logging_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Logging_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Logging_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Logging_Test.java
diff --git
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Marshalls_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Marshalls_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Marshalls_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Marshalls_Test.java
diff --git
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Paths_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Paths_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Paths_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Paths_Test.java
diff --git
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Query_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Query_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Query_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Query_Test.java
diff --git
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Body_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Body_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Body_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Body_Test.java
diff --git
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Headers_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Headers_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Headers_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Headers_Test.java
diff --git
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Test.java
diff --git
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Test.java
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/guards/RoleMatcher_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/guards/RoleMatcher_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/guards/RoleMatcher_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/guards/RoleMatcher_Test.java
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/helper/Hyperlink_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/helper/Hyperlink_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/helper/Hyperlink_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/helper/Hyperlink_Test.java
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/helper/ResourceDescription_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/helper/ResourceDescription_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/helper/ResourceDescription_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/helper/ResourceDescription_Test.java
diff --git
a/juneau-rest/juneau-rest-mock-utest/src/test/java/org/apache/juneau/rest/mock/MockRestClient_PathVars_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/mock/MockRestClient_PathVars_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-mock-utest/src/test/java/org/apache/juneau/rest/mock/MockRestClient_PathVars_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/mock/MockRestClient_PathVars_Test.java
diff --git
a/juneau-rest/juneau-rest-mock-utest/src/test/java/org/apache/juneau/rest/mock/PathResolverTest.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/mock/PathResolverTest.java
similarity index 100%
rename from
juneau-rest/juneau-rest-mock-utest/src/test/java/org/apache/juneau/rest/mock/PathResolverTest.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/mock/PathResolverTest.java
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/mock2/MockServletRequest_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/mock2/MockServletRequest_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/mock2/MockServletRequest_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/mock2/MockServletRequest_Test.java
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/testutils/TestUtils.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/testutils/TestUtils.java
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/testutils/TestUtils.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/testutils/TestUtils.java
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/util/RestUtils_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/util/RestUtils_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/util/RestUtils_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/util/RestUtils_Test.java
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/util/UrlPathMatcher_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/util/UrlPathMatcher_Test.java
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/util/UrlPathMatcher_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/rest/util/UrlPathMatcher_Test.java
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/resources/org/apache/juneau/rest/BasicRestInfoProviderTest.properties
b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/rest/BasicRestInfoProviderTest.properties
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/resources/org/apache/juneau/rest/BasicRestInfoProviderTest.properties
rename to
juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/rest/BasicRestInfoProviderTest.properties
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/resources/org/apache/juneau/rest/BasicRestInfoProviderTest_swagger.json
b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/rest/BasicRestInfoProviderTest_swagger.json
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/resources/org/apache/juneau/rest/BasicRestInfoProviderTest_swagger.json
rename to
juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/rest/BasicRestInfoProviderTest_swagger.json
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/resources/org/apache/juneau/rest/NlsTest.properties
b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/rest/NlsTest.properties
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/resources/org/apache/juneau/rest/NlsTest.properties
rename to
juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/rest/NlsTest.properties
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/resources/org/apache/juneau/rest/RestParamsTest.properties
b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/rest/RestParamsTest.properties
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/resources/org/apache/juneau/rest/RestParamsTest.properties
rename to
juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/rest/RestParamsTest.properties
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/resources/org/apache/juneau/rest/RestParamsTest_ja_JP.properties
b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/rest/RestParamsTest_ja_JP.properties
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/resources/org/apache/juneau/rest/RestParamsTest_ja_JP.properties
rename to
juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/rest/RestParamsTest_ja_JP.properties
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/resources/org/apache/juneau/rest/annotation/A1.properties
b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/rest/annotation/A1.properties
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/resources/org/apache/juneau/rest/annotation/A1.properties
rename to
juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/rest/annotation/A1.properties
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/resources/org/apache/juneau/rest/annotation/A2.properties
b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/rest/annotation/A2.properties
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/resources/org/apache/juneau/rest/annotation/A2.properties
rename to
juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/rest/annotation/A2.properties
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/resources/org/apache/juneau/rest/annotation/B1x.properties
b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/rest/annotation/B1x.properties
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/resources/org/apache/juneau/rest/annotation/B1x.properties
rename to
juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/rest/annotation/B1x.properties
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/resources/org/apache/juneau/rest/annotation/B2x.properties
b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/rest/annotation/B2x.properties
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/resources/org/apache/juneau/rest/annotation/B2x.properties
rename to
juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/rest/annotation/B2x.properties
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/resources/org/apache/juneau/rest/annotation/xdocs/test.txt
b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/rest/annotation/xdocs/test.txt
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/resources/org/apache/juneau/rest/annotation/xdocs/test.txt
rename to
juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/rest/annotation/xdocs/test.txt
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/resources/org/apache/juneau/rest/annotation/xdocs/xsubdocs/test.txt
b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/rest/annotation/xdocs/xsubdocs/test.txt
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/resources/org/apache/juneau/rest/annotation/xdocs/xsubdocs/test.txt
rename to
juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/rest/annotation/xdocs/xsubdocs/test.txt
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/resources/xdocs/test.txt
b/juneau-core/juneau-core-utest/src/test/resources/xdocs/test.txt
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/resources/xdocs/test.txt
rename to juneau-core/juneau-core-utest/src/test/resources/xdocs/test.txt
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/resources/xdocs/xsubdocs/test.txt
b/juneau-core/juneau-core-utest/src/test/resources/xdocs/xsubdocs/test.txt
similarity index 100%
rename from
juneau-rest/juneau-rest-server-utest/src/test/resources/xdocs/xsubdocs/test.txt
rename to
juneau-core/juneau-core-utest/src/test/resources/xdocs/xsubdocs/test.txt
