You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2019/06/27 21:52:14 UTC
[juneau] branch master updated: Organize test projects.
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 3be120d Organize test projects.
3be120d is described below
commit 3be120d53722fc621e2d8cfab0b7bd8072a5b34d
Author: JamesBognar <ja...@apache.org>
AuthorDate: Thu Jun 27 17:50:55 2019 -0400
Organize test projects.
---
juneau-core/juneau-core-test/.classpath | 33 ---
juneau-core/juneau-core-test/.project | 22 --
.../.settings/org.eclipse.core.resources.prefs | 5 -
.../.settings/org.eclipse.jdt.core.prefs | 319 ---------------------
.../.settings/org.eclipse.jdt.ui.prefs | 68 -----
.../juneau-core-test/src/main/java/.gitkeep | 14 -
.../juneau-core-utest}/.gitignore | 0
.../juneau-core-utest}/.project | 2 +-
.../files/test2.txt | 0
.../pom.xml | 28 +-
.../java/org/apache/juneau/AnnotationsTest.java | 0
.../apache/juneau/BeanConfigAnnotationTest.java | 0
.../java/org/apache/juneau/BeanConfigTest.java | 0
.../java/org/apache/juneau/BeanFilterTest.java | 0
.../java/org/apache/juneau/BeanMapErrorsTest.java | 0
.../test/java/org/apache/juneau/BeanMapTest.java | 0
.../test/java/org/apache/juneau/ClassMetaTest.java | 0
.../juneau/CloseableByteArrayInputStream.java | 0
.../org/apache/juneau/CloseableStringReader.java | 0
.../test/java/org/apache/juneau/ComboInput.java | 0
.../java/org/apache/juneau/ComboRoundTripTest.java | 0
.../java/org/apache/juneau/ComboSerializeTest.java | 0
.../java/org/apache/juneau/ContextCacheTest.java | 0
.../java/org/apache/juneau/DataConversionTest.java | 0
.../java/org/apache/juneau/DynaBeanComboTest.java | 0
.../java/org/apache/juneau/IgnoredClassesTest.java | 0
.../java/org/apache/juneau/JacocoDummyTest.java | 0
.../test/java/org/apache/juneau/MaxIndentTest.java | 0
.../java/org/apache/juneau/ObjectListTest.java | 0
.../test/java/org/apache/juneau/ObjectMapTest.java | 0
.../java/org/apache/juneau/ParserGenericsTest.java | 0
.../java/org/apache/juneau/ParserReaderTest.java | 0
.../java/org/apache/juneau/PojoExamplesTest.java | 0
.../test/java/org/apache/juneau/PojoSwapTest.java | 0
.../java/org/apache/juneau/PropertyNamerTest.java | 0
.../java/org/apache/juneau/PropertyStoreTest.java | 0
.../src/test/java/org/apache/juneau/ValueTest.java | 0
.../java/org/apache/juneau/VisibilityTest.java | 0
.../src/test/java/org/apache/juneau/XVar.java | 0
.../java/org/apache/juneau/XmlValidatorParser.java | 0
.../apache/juneau/XmlValidatorParserBuilder.java | 0
.../src/test/java/org/apache/juneau/a/A1.java | 0
.../a/rttests/RoundTripAddClassAttrsTest.java | 0
.../a/rttests/RoundTripBeanInheritanceTest.java | 0
.../juneau/a/rttests/RoundTripBeanMapsTest.java | 0
.../juneau/a/rttests/RoundTripClassesTest.java | 0
.../apache/juneau/a/rttests/RoundTripDTOsTest.java | 0
.../apache/juneau/a/rttests/RoundTripEnumTest.java | 0
.../juneau/a/rttests/RoundTripGenericsTest.java | 0
.../a/rttests/RoundTripLargeObjectsTest.java | 0
.../apache/juneau/a/rttests/RoundTripMapsTest.java | 0
.../rttests/RoundTripNumericConstructorsTest.java | 0
.../a/rttests/RoundTripObjectsAsStringsTest.java | 0
.../RoundTripObjectsWithSpecialMethodsTest.java | 0
.../rttests/RoundTripPrimitiveObjectBeansTest.java | 0
.../a/rttests/RoundTripPrimitivesBeansTest.java | 0
.../a/rttests/RoundTripReadOnlyBeansTest.java | 0
.../a/rttests/RoundTripSimpleObjectsTest.java | 0
.../org/apache/juneau/a/rttests/RoundTripTest.java | 0
.../a/rttests/RoundTripToObjectMapsTest.java | 0
.../a/rttests/RoundTripTransformBeansTest.java | 0
.../juneau/a/rttests/RoundTripTrimStringsTest.java | 0
.../a/rttests/RountTripBeansWithBuilders.java | 0
.../apache/juneau/annotation/BeanIgnoreTest.java | 0
.../apache/juneau/config/ConfigBuilderTest.java | 0
.../apache/juneau/config/ConfigImportsTest.java | 0
.../apache/juneau/config/ConfigInterfaceTest.java | 0
.../juneau/config/ConfigMapListenerTest.java | 0
.../org/apache/juneau/config/ConfigMapTest.java | 0
.../java/org/apache/juneau/config/ConfigTest.java | 0
.../config/store/ConfigClasspathStoreTest.java | 0
.../juneau/config/store/ConfigFileStoreTest.java | 0
.../juneau/config/store/ConfigMemoryStoreTest.java | 0
.../apache/juneau/csv/CsvConfigAnnotationTest.java | 0
.../test/java/org/apache/juneau/csv/CsvTest.java | 0
.../java/org/apache/juneau/dto/atom/AtomTest.java | 0
.../apache/juneau/dto/cognos/CognosXmlTest.java | 0
.../apache/juneau/dto/html5/Html5BasicTest.java | 0
.../apache/juneau/dto/html5/Html5ComboTest.java | 0
.../juneau/dto/html5/Html5TemplateComboTest.java | 0
.../juneau/dto/jsonschema/JsonSchemaTest.java | 0
.../org/apache/juneau/dto/swagger/ContactTest.java | 0
.../dto/swagger/ExternalDocumentationTest.java | 0
.../apache/juneau/dto/swagger/HeaderInfoTest.java | 0
.../org/apache/juneau/dto/swagger/InfoTest.java | 0
.../org/apache/juneau/dto/swagger/ItemsTest.java | 0
.../org/apache/juneau/dto/swagger/LicenseTest.java | 0
.../apache/juneau/dto/swagger/OperationTest.java | 0
.../juneau/dto/swagger/ParameterInfoTest.java | 0
.../juneau/dto/swagger/ResponseInfoTest.java | 0
.../apache/juneau/dto/swagger/SchemaInfoTest.java | 0
.../juneau/dto/swagger/SecuritySchemeTest.java | 0
.../juneau/dto/swagger/SwaggerBuilderTest.java | 0
.../org/apache/juneau/dto/swagger/SwaggerTest.java | 0
.../org/apache/juneau/dto/swagger/TagTest.java | 0
.../org/apache/juneau/dto/swagger/XmlTest.java | 0
.../apache/juneau/encoders/EncoderGroupTest.java | 0
.../java/org/apache/juneau/html/BasicHtmlTest.java | 0
.../org/apache/juneau/html/CommonParserTest.java | 0
.../java/org/apache/juneau/html/CommonTest.java | 0
.../juneau/html/HtmlConfigAnnotationTest.java | 0
.../juneau/html/HtmlDocConfigAnnotationTest.java | 0
.../juneau/html/HtmlSchemaSerializerTest.java | 0
.../test/java/org/apache/juneau/html/HtmlTest.java | 0
.../http/annotation/AnnotationUtilsTest.java | 0
.../juneau/httppart/HttpPartSchemaTest_Body.java | 0
.../httppart/HttpPartSchemaTest_FormData.java | 0
.../juneau/httppart/HttpPartSchemaTest_Header.java | 0
.../juneau/httppart/HttpPartSchemaTest_Path.java | 0
.../juneau/httppart/HttpPartSchemaTest_Query.java | 0
.../httppart/HttpPartSchemaTest_Response.java | 0
.../HttpPartSchemaTest_ResponseHeader.java | 0
.../juneau/httppart/OpenApiPartParserTest.java | 0
.../juneau/httppart/OpenApiPartSerializerTest.java | 0
.../apache/juneau/httppart/UonPartParserTest.java | 0
.../apache/juneau/https/AcceptExtensionsTest.java | 0
.../java/org/apache/juneau/https/AcceptTest.java | 0
.../org/apache/juneau/https/ContentTypeTest.java | 0
.../org/apache/juneau/https/MediaRangeTest.java | 0
.../apache/juneau/internal/VersionRangeTest.java | 0
.../org/apache/juneau/jena/CommonParserTest.java | 0
.../java/org/apache/juneau/jena/CommonTest.java | 0
.../java/org/apache/juneau/jena/CommonXmlTest.java | 0
.../juneau/jena/RdfConfigAnnotationTest.java | 0
.../java/org/apache/juneau/jena/RdfParserTest.java | 0
.../test/java/org/apache/juneau/jena/RdfTest.java | 0
.../apache/juneau/jso/JsoConfigAnnotationTest.java | 0
.../org/apache/juneau/json/CommonParserTest.java | 0
.../java/org/apache/juneau/json/CommonTest.java | 0
.../juneau/json/JsonConfigAnnotationTest.java | 0
.../juneau/json/JsonParserEdgeCasesTest.java | 0
.../org/apache/juneau/json/JsonParserTest.java | 0
.../juneau/json/JsonSchemaSerializerTest.java | 0
.../test/java/org/apache/juneau/json/JsonTest.java | 0
.../jsonschema/JsonSchemaConfigAnnotationTest.java | 0
.../juneau/jsonschema/JsonSchemaGeneratorTest.java | 0
.../java/org/apache/juneau/marshall/HtmlTest.java | 0
.../java/org/apache/juneau/marshall/JsoTest.java | 0
.../java/org/apache/juneau/marshall/JsonTest.java | 0
.../org/apache/juneau/marshall/MsgPackTest.java | 0
.../java/org/apache/juneau/marshall/N3Test.java | 0
.../org/apache/juneau/marshall/NTripleTest.java | 0
.../org/apache/juneau/marshall/PlainTextTest.java | 0
.../apache/juneau/marshall/RdfXmlAbbrevTest.java | 0
.../org/apache/juneau/marshall/RdfXmlTest.java | 0
.../org/apache/juneau/marshall/SimpleJsonTest.java | 0
.../org/apache/juneau/marshall/TurtleTest.java | 0
.../java/org/apache/juneau/marshall/UonTest.java | 0
.../apache/juneau/marshall/UrlEncodingTest.java | 0
.../java/org/apache/juneau/marshall/XmlTest.java | 0
.../msgpack/MsgPackConfigAnnotationTest.java | 0
.../apache/juneau/msgpack/MsgPackParserTest.java | 0
.../juneau/msgpack/MsgPackSerializerTest.java | 0
.../juneau/oapi/OpenApiConfigAnnotationTest.java | 0
.../juneau/parser/ParserConfigAnnotationTest.java | 0
.../org/apache/juneau/parser/ParserGroupTest.java | 0
.../plaintext/PlainTextConfigAnnotationTest.java | 0
.../apache/juneau/pojotools/PojoSearcherTest.java | 0
.../apache/juneau/pojotools/PojoSorterTest.java | 0
.../apache/juneau/pojotools/PojoViewerTest.java | 0
.../java/org/apache/juneau/reflection/AClass.java | 0
.../org/apache/juneau/reflection/AInterface.java | 0
.../juneau/reflection/AnnotationInfoTest.java | 0
.../apache/juneau/reflection/ClassInfoTest.java | 0
.../juneau/reflection/ConstructorInfoTest.java | 0
.../juneau/reflection/ExecutableInfoTest.java | 0
.../apache/juneau/reflection/FieldInfoTest.java | 0
.../apache/juneau/reflection/MethodInfoTest.java | 0
.../test/java/org/apache/juneau/reflection/PA.java | 0
.../apache/juneau/reflection/ParamInfoTest.java | 0
.../org/apache/juneau/reflection/package-info.java | 0
.../juneau/serializer/ReaderObjectComboTest.java | 0
.../serializer/SerializerConfigAnnotationTest.java | 0
.../juneau/serializer/SerializerGroupTest.java | 0
.../java/org/apache/juneau/serializer/TestURI.java | 0
.../juneau/serializer/UriResolutionTest.java | 0
.../juneau/soap/SoapXmlConfigAnnotationTest.java | 0
.../apache/juneau/svl/ResolvingObjectMapTest.java | 0
.../java/org/apache/juneau/svl/vars/IfVarTest.java | 0
.../org/apache/juneau/svl/vars/LenVarTest.java | 0
.../apache/juneau/svl/vars/LowerCaseVarTest.java | 0
.../apache/juneau/svl/vars/NotEmptyVarTest.java | 0
.../juneau/svl/vars/PatternExtractVarTest.java | 0
.../juneau/svl/vars/PatternMatchVarTest.java | 0
.../juneau/svl/vars/PatternReplaceVarTest.java | 0
.../apache/juneau/svl/vars/RestrictedVarsTest.java | 0
.../apache/juneau/svl/vars/SubstringVarTest.java | 0
.../org/apache/juneau/svl/vars/SwitchVarTest.java | 0
.../apache/juneau/svl/vars/UpperCaseVarTest.java | 0
.../org/apache/juneau/testutils/TestUtils.java | 0
.../org/apache/juneau/testutils/pojos/ABean.java | 0
.../apache/juneau/testutils/pojos/Constants.java | 0
.../testutils/pojos/ImplicitSwappedPojo.java | 0
.../apache/juneau/testutils/pojos/LargePojo.java | 0
.../pojos/PrimitiveAtomicObjectsBean.java | 0
.../testutils/pojos/PrimitiveObjectsBean.java | 0
.../apache/juneau/testutils/pojos/SwappedPojo.java | 0
.../juneau/testutils/pojos/SwappedPojoSwap.java | 0
.../apache/juneau/testutils/pojos/TestEnum.java | 0
.../juneau/testutils/pojos/TestEnumToString.java | 0
.../org/apache/juneau/testutils/pojos/TestURI.java | 0
.../apache/juneau/testutils/pojos/TypedBean.java | 0
.../juneau/testutils/pojos/TypedBeanImpl.java | 0
.../juneau/transforms/BeanDictionaryComboTest.java | 0
.../apache/juneau/transforms/BeanFilterTest.java | 0
.../org/apache/juneau/transforms/BeanMapTest.java | 0
.../apache/juneau/transforms/BuilderComboTest.java | 0
.../transforms/ByteArrayBase64SwapComboTest.java | 0
.../juneau/transforms/CalendarSwapComboTest.java | 0
.../apache/juneau/transforms/CalendarSwapTest.java | 0
.../juneau/transforms/DateSwapComboTest.java | 0
.../org/apache/juneau/transforms/DateSwapTest.java | 0
.../juneau/transforms/EnumerationSwapTest.java | 0
.../apache/juneau/transforms/IteratorSwapTest.java | 0
.../juneau/transforms/LocalizedDatesTest.java | 0
.../org/apache/juneau/transforms/PojoSwapTest.java | 0
.../apache/juneau/transforms/ReaderFilterTest.java | 0
.../juneau/transforms/ReaderObjectSwapTest.java | 0
.../transforms/SwapsAnnotationComboTest.java | 0
.../apache/juneau/uon/CommonParser_UonTest.java | 0
.../java/org/apache/juneau/uon/Common_UonTest.java | 0
.../apache/juneau/uon/UonConfigAnnotationTest.java | 0
.../org/apache/juneau/uon/UonParserReaderTest.java | 0
.../java/org/apache/juneau/uon/UonParserTest.java | 0
.../org/apache/juneau/uon/UonSerializerTest.java | 0
.../urlencoding/CommonParser_UrlEncodingTest.java | 0
.../juneau/urlencoding/Common_UrlEncodingTest.java | 0
.../java/org/apache/juneau/urlencoding/DTOs.java | 0
.../UrlEncodingConfigAnnotationTest.java | 0
.../juneau/urlencoding/UrlEncodingParserTest.java | 0
.../urlencoding/UrlEncodingSerializerTest.java | 0
.../java/org/apache/juneau/utils/ArgsTest.java | 0
.../org/apache/juneau/utils/ArrayUtilsTest.java | 0
.../java/org/apache/juneau/utils/BeanDiffTest.java | 0
.../juneau/utils/ByteArrayInOutStreamTest.java | 0
.../java/org/apache/juneau/utils/CharSetTest.java | 0
.../org/apache/juneau/utils/ClassUtilsTest.java | 0
.../apache/juneau/utils/CollectionUtilsTest.java | 0
.../org/apache/juneau/utils/FilteredMapTest.java | 0
.../org/apache/juneau/utils/HttpUtilsTest.java | 0
.../java/org/apache/juneau/utils/IOPipeTest.java | 0
.../java/org/apache/juneau/utils/IOUtilsTest.java | 0
.../org/apache/juneau/utils/KeywordStoreTest.java | 0
.../org/apache/juneau/utils/MultiIterableTest.java | 0
.../java/org/apache/juneau/utils/MultiSetTest.java | 0
.../org/apache/juneau/utils/ParserReaderTest.java | 0
.../apache/juneau/utils/PojoIntrospectorTest.java | 0
.../org/apache/juneau/utils/PojoMergeTest.java | 0
.../org/apache/juneau/utils/PojoQueryTest.java | 0
.../java/org/apache/juneau/utils/PojoRestTest.java | 0
.../org/apache/juneau/utils/SimpleMapTest.java | 0
.../juneau/utils/StringBuilderWriterTest.java | 0
.../juneau/utils/StringExpressionMatcherTest.java | 0
.../org/apache/juneau/utils/StringUtilsTest.java | 0
.../apache/juneau/utils/StringVarResolverTest.java | 0
.../apache/juneau/utils/TransformCacheTest.java | 0
.../utils/UriContextResolutionComboTest.java | 0
.../juneau/utils/UriContextUriComboTest.java | 0
.../java/org/apache/juneau/xml/BasicXmlTest.java | 0
.../org/apache/juneau/xml/CommonParserTest.java | 0
.../java/org/apache/juneau/xml/CommonTest.java | 0
.../java/org/apache/juneau/xml/CommonXmlTest.java | 0
.../org/apache/juneau/xml/InvalidXmlBeansTest.java | 0
.../org/apache/juneau/xml/XmlCollapsedTest.java | 0
.../apache/juneau/xml/XmlConfigAnnotationTest.java | 0
.../java/org/apache/juneau/xml/XmlContentTest.java | 0
.../apache/juneau/xml/XmlIgnoreCommentsTest.java | 0
.../java/org/apache/juneau/xml/XmlParserTest.java | 0
.../test/java/org/apache/juneau/xml/XmlTest.java | 0
.../test/java/org/apache/juneau/xml/xml1a/T1.java | 0
.../test/java/org/apache/juneau/xml/xml1a/T2.java | 0
.../test/java/org/apache/juneau/xml/xml1b/T3.java | 0
.../test/java/org/apache/juneau/xml/xml1b/T4.java | 0
.../test/java/org/apache/juneau/xml/xml1b/T5.java | 0
.../test/java/org/apache/juneau/xml/xml1b/T6.java | 0
.../test/java/org/apache/juneau/xml/xml1b/T7.java | 0
.../org/apache/juneau/xml/xml1b/package-info.java | 0
.../test/java/org/apache/juneau/xml/xml1c/T8.java | 0
.../test/java/org/apache/juneau/xml/xml1c/T9.java | 0
.../org/apache/juneau/xml/xml1c/package-info.java | 0
.../src/test/resources/foo1.cfg | 0
.../src/test/resources/sub/foo2.cfg | 0
.../src/test/resources/sub/test4.txt | 0
.../src/test/resources/test3.txt | 0
.../test.cfg | 0
.../test1.txt | 0
juneau-core/pom.xml | 2 +-
.../juneau-examples-rest-jetty-ftest}/.gitignore | 2 +
.../juneau-examples-rest-jetty-ftest}/.project | 2 +-
.../pom.xml | 55 ++--
.../juneau/examples/rest/ContentComboTestBase.java | 0
.../apache/juneau/examples/rest/RestTestcase.java | 0
.../juneau/examples/rest/RootContentTest.java | 0
.../juneau/examples/rest/RootResourcesTest.java | 0
.../juneau/examples/rest/SamplesMicroservice.java | 2 +-
.../org/apache/juneau/examples/rest/TestUtils.java | 0
.../apache/juneau/examples/rest/_TestSuite.java | 0
.../juneau-examples-rest-jetty/.classpath | 7 -
juneau-examples/juneau-examples-rest-jetty/pom.xml | 12 -
.../src/main/resources/jetty.xml | 2 +-
juneau-examples/pom.xml | 1 +
.../apache/juneau/microservice/Microservice.java | 35 ++-
.../juneau/microservice/MicroserviceBuilder.java | 41 ++-
.../juneau-microservice-ftest}/.gitignore | 0
.../.project | 2 +-
.../files/jetty.xml | 0
.../juneau-microservice-test.cfg | 0
.../juneau-microservice-test.launch | 16 ++
.../pom.xml | 13 +-
.../rest/test/HtmlPropertiesResource.properties | 0
.../juneau/rest/test/ParamsResource.properties | 0
.../rest/test/ParamsResource_ja_JP.properties | 0
.../juneau/microservice/testutils/TestUtils.java | 0
.../apache/juneau/rest/test/ConfigResource.java | 0
.../org/apache/juneau/rest/test/ConfigTest.java | 0
.../juneau/rest/test/LargePojosResource.java | 0
.../org/apache/juneau/rest/test/MockRestTest.java | 0
.../org/apache/juneau/rest/test/RestTestcase.java | 0
.../java/org/apache/juneau/rest/test/Root.java | 0
.../apache/juneau/rest/test/TestMicroservice.java | 0
.../org/apache/juneau/rest/test/_TestSuite.java | 0
.../rest/test/client/CallbackStringsTest.java | 0
.../juneau/rest/test/client/ClientFuturesTest.java | 0
.../juneau/rest/test/client/FormDataTest.java | 0
.../rest/test/client/InterfaceProxyTest.java | 0
.../rest/test/client/RequestBeanProxyTest.java | 0
.../rest/test/client/RestClientResource.java | 0
.../juneau/rest/test/client/RestClientTest.java | 0
.../rest/test/client/ThirdPartyProxyResource.java | 0
.../rest/test/client/ThirdPartyProxyTest.java | 0
.../jetty/JettyMicroserviceBuilder.java | 15 +-
.../juneau-microservice-test/.classpath | 32 ---
.../.settings/org.eclipse.core.resources.prefs | 5 -
.../.settings/org.eclipse.jdt.core.prefs | 319 ---------------------
.../.settings/org.eclipse.jdt.ui.prefs | 68 -----
.../juneau-microservice-test.launch | 30 +-
juneau-microservice/pom.xml | 2 +-
juneau-rest/.DS_Store | Bin 6148 -> 6148 bytes
juneau-rest/juneau-rest-client-test/.classpath | 27 --
juneau-rest/juneau-rest-client-test/pom.xml | 196 -------------
.../.gitignore | 0
.../juneau-rest-client-utest}/.project | 2 +-
.../juneau-rest-client-utest}/pom.xml | 75 +++--
.../rest/client/remote/BodyAnnotationTest.java | 0
.../rest/client/remote/EndToEndInterfaceTest.java | 0
.../rest/client/remote/FormDataAnnotationTest.java | 0
.../rest/client/remote/HeaderAnnotationTest.java | 0
.../rest/client/remote/PathAnnotationTest.java | 0
.../rest/client/remote/QueryAnnotationTest.java | 0
.../client/remote/RemoteMethodAnnotationTest.java | 0
.../remote/RemoteResourceAnnotationTest.java | 0
.../rest/client/remote/RequestAnnotationTest.java | 0
.../rest/client/remote/ResponseAnnotationTest.java | 0
juneau-rest/juneau-rest-client/pom.xml | 24 --
juneau-rest/juneau-rest-mock-utest/.gitignore | 1 +
.../.project | 2 +-
.../pom.xml | 66 +++--
.../org/apache/juneau/rest/testutils/ABean.java | 0
.../apache/juneau/rest/testutils/Constants.java | 0
.../org/apache/juneau/rest/testutils/DTOs.java | 0
.../juneau/rest/testutils/ImplicitSwappedPojo.java | 0
.../apache/juneau/rest/testutils/SwappedPojo.java | 0
.../juneau/rest/testutils/SwappedPojoSwap.java | 0
.../org/apache/juneau/rest/testutils/TestEnum.java | 0
.../apache/juneau/rest/testutils/TestUtils.java | 0
.../apache/juneau/rest/testutils/TypedBean.java | 0
.../juneau/rest/testutils/TypedBeanImpl.java | 0
.../juneau/rest/testutils/XPartSerializer.java | 0
juneau-rest/juneau-rest-mock/.classpath | 7 -
juneau-rest/juneau-rest-mock/pom.xml | 34 +--
juneau-rest/juneau-rest-server-rdf/pom.xml | 13 -
juneau-rest/juneau-rest-server-test/.classpath | 34 ---
juneau-rest/juneau-rest-server-test/pom.xml | 217 --------------
.../.gitignore | 0
.../juneau-rest-server-utest}/.project | 2 +-
.../juneau-rest-server-utest}/pom.xml | 86 +++---
.../jueau/rest/helper/ReaderResourceTest.java | 0
.../jueau/rest/helper/StreamResourceTest.java | 0
.../juneau/rest/BasicRestInfoProviderTest.java | 0
.../juneau/rest/BeanContextPropertiesTest.java | 0
.../test/java/org/apache/juneau/rest/NlsTest.java | 0
.../java/org/apache/juneau/rest/PathsTest.java | 0
.../org/apache/juneau/rest/RestParamsTest.java | 0
.../org/apache/juneau/rest/StatusCodesTest.java | 0
.../apache/juneau/rest/ThreadLocalObjectsTest.java | 0
.../juneau/rest/annotation/HtmlDocAsideTest.java | 0
.../rest/annotation/HtmlDocConfigAsideTest.java | 0
.../rest/annotation/HtmlDocConfigFooterTest.java | 0
.../rest/annotation/HtmlDocConfigHeaderTest.java | 0
.../rest/annotation/HtmlDocConfigNavTest.java | 0
.../rest/annotation/HtmlDocConfigNavlinksTest.java | 0
.../rest/annotation/HtmlDocConfigScriptTest.java | 0
.../rest/annotation/HtmlDocConfigStyleTest.java | 0
.../juneau/rest/annotation/HtmlDocFooterTest.java | 0
.../juneau/rest/annotation/HtmlDocHeaderTest.java | 0
.../juneau/rest/annotation/HtmlDocNavTest.java | 0
.../rest/annotation/HtmlDocNavlinksTest.java | 0
.../juneau/rest/annotation/HtmlDocScriptTest.java | 0
.../juneau/rest/annotation/HtmlDocStyleTest.java | 0
.../annotation/ResponseBodyAnnotationTest.java | 0
.../annotation/ResponseHeaderAnnotationTest.java | 0
.../annotation/ResponseStatusAnnotationTest.java | 0
.../juneau/rest/annotation/RestMethodBpiTest.java | 0
.../rest/annotation/RestMethodGuardsTest.java | 0
.../rest/annotation/RestMethodMatchersTest.java | 0
.../juneau/rest/annotation/RestMethodPathTest.java | 0
.../rest/annotation/RestResourceMessagesTest.java | 0
.../rest/annotation/RestResourcePathTest.java | 0
.../annotation/RestResourcePropertiesTest.java | 0
.../annotation/RestResourceSerializersTest.java | 0
.../annotation/RestResourceStaticFilesTest.java | 0
.../annotation2/AnnotationInheritanceTest.java | 0
.../rest/annotation2/BodyAnnotationTest.java | 0
.../rest/annotation2/FormDataAnnotationTest.java | 0
.../annotation2/HasFormDataAnnotationTest.java | 0
.../rest/annotation2/HasQueryAnnotationTest.java | 0
.../rest/annotation2/HeaderAnnotationTest.java | 0
.../rest/annotation2/PathAnnotationTest.java | 0
.../annotation2/PathRemainderAnnotationTest.java | 0
.../rest/annotation2/QueryAnnotationTest.java | 0
.../rest/annotation2/ResponseAnnotationTest.java | 0
.../juneau/rest/annotation2/RestHookTest.java | 0
.../rest/annotation2/RestMethodInheritTest.java | 0
.../rest/annotation2/RestResourceParsersTest.java | 0
.../annotation2/RestResourcePojoSwapsTest.java | 0
.../juneau/rest/annotation2/RoleGuardTest.java | 0
.../apache/juneau/rest/exception/BasicTest.java | 0
.../apache/juneau/rest/guard/RoleMatcherTest.java | 0
.../juneau/rest/headers/AcceptCharsetTest.java | 0
.../juneau/rest/headers/AcceptEncodingTest.java | 0
.../org/apache/juneau/rest/headers/AcceptTest.java | 0
.../juneau/rest/headers/ClientVersionTest.java | 0
.../juneau/rest/headers/ContentEncodingTest.java | 0
.../juneau/rest/headers/ContentTypeTest.java | 0
.../apache/juneau/rest/headers/HeadersTest.java | 0
.../juneau/rest/mock2/MockServletRequestTest.java | 0
.../org/apache/juneau/rest/response/BasicTest.java | 0
.../org/apache/juneau/rest/util/RestUtilsTest.java | 0
.../juneau/rest/util/UrlPathPatternTest.java | 0
.../rest/BasicRestInfoProviderTest.properties | 0
.../rest/BasicRestInfoProviderTest_swagger.json | 0
.../org/apache/juneau/rest/NlsTest.properties | 0
.../apache/juneau/rest/RestParamsTest.properties | 0
.../juneau/rest/RestParamsTest_ja_JP.properties | 0
.../RestResourceMessagesTest1.properties | 0
.../RestResourceMessagesTest2.properties | 0
.../apache/juneau/rest/annotation/xdocs/test.txt | 0
.../juneau/rest/annotation/xdocs/xsubdocs/test.txt | 0
juneau-rest/juneau-rest-server/pom.xml | 12 -
juneau-rest/pom.xml | 5 +-
juneau-sc/juneau-server-config/pom.xml | 2 +-
juneau-sc/pom.xml | 4 +-
452 files changed, 297 insertions(+), 1666 deletions(-)
diff --git a/juneau-core/juneau-core-test/.classpath b/juneau-core/juneau-core-test/.classpath
deleted file mode 100644
index d87e123..0000000
--- a/juneau-core/juneau-core-test/.classpath
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" output="target/test-classes" path="src/test/java">
- <attributes>
- <attribute name="optional" value="true"/>
- <attribute name="maven.pomderived" value="true"/>
- <attribute name="test" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="src" output="target/classes" path="src/main/java">
- <attributes>
- <attribute name="optional" value="true"/>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
- <attributes>
- <attribute name="maven.pomderived" value="true"/>
- <attribute name="test" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
- <attributes>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
- <attributes>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/juneau-core/juneau-core-test/.project b/juneau-core/juneau-core-test/.project
deleted file mode 100644
index 0ff0c6a..0000000
--- a/juneau-core/juneau-core-test/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>juneau-core-test</name>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.m2e.core.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.m2e.core.maven2Nature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/juneau-core/juneau-core-test/.settings/org.eclipse.core.resources.prefs b/juneau-core/juneau-core-test/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index cdfe4f1..0000000
--- a/juneau-core/juneau-core-test/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/test/java=UTF-8
-encoding//src/test/resources=UTF-8
-encoding/<project>=UTF-8
diff --git a/juneau-core/juneau-core-test/.settings/org.eclipse.jdt.core.prefs b/juneau-core/juneau-core-test/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index bb79aba..0000000
--- a/juneau-core/juneau-core-test/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,319 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.methodParameters=generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.8
-org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0
-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
-org.eclipse.jdt.core.formatter.alignment_for_module_statements=16
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_type_arguments=0
-org.eclipse.jdt.core.formatter.alignment_for_type_parameters=0
-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
-org.eclipse.jdt.core.formatter.comment.line_length=200
-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=1
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1
-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
-org.eclipse.jdt.core.formatter.indentation.size=3
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=true
-org.eclipse.jdt.core.formatter.join_wrapped_lines=true
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=200
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_on_off_tags=false
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
-org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter
diff --git a/juneau-core/juneau-core-test/.settings/org.eclipse.jdt.ui.prefs b/juneau-core/juneau-core-test/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 7e24f3a..0000000
--- a/juneau-core/juneau-core-test/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,68 +0,0 @@
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_methods=false
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_missing_override_annotations_interface_methods=true
-cleanup.add_serial_version_id=false
-cleanup.always_use_blocks=false
-cleanup.always_use_parentheses_in_expressions=false
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_functional_interfaces=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=false
-cleanup.format_source_code=false
-cleanup.format_source_code_changes_only=false
-cleanup.insert_inferred_type_arguments=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=false
-cleanup.never_use_blocks=true
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=false
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=false
-cleanup.qualify_static_member_accesses_with_declaring_class=false
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_redundant_type_arguments=true
-cleanup.remove_trailing_whitespaces=true
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=true
-cleanup.remove_unnecessary_nls_tags=true
-cleanup.remove_unused_imports=false
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_anonymous_class_creation=false
-cleanup.use_blocks=false
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_lambda=true
-cleanup.use_parentheses_in_expressions=false
-cleanup.use_this_for_non_static_field_access=false
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=false
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup.use_type_arguments=false
-cleanup_profile=_juneau-cleanup-rules
-cleanup_settings_version=2
-eclipse.preferences.version=1
-formatter_profile=_juneau-formatter-rules
-formatter_settings_version=13
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;com;
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.ondemandthreshold=1
-org.eclipse.jdt.ui.staticondemandthreshold=1
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="false" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * Bean property getter\: <property>${bare_field_name}</property>.\n *\n * @return The value of the <property>${bare_field_name}</prop [...]
diff --git a/juneau-core/juneau-core-test/src/main/java/.gitkeep b/juneau-core/juneau-core-test/src/main/java/.gitkeep
deleted file mode 100644
index 2bbbc92..0000000
--- a/juneau-core/juneau-core-test/src/main/java/.gitkeep
+++ /dev/null
@@ -1,14 +0,0 @@
-<!--
- ***************************************************************************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file *
- * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file *
- * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance *
- * with the License. You may obtain a copy of the License at *
- * *
- * http://www.apache.org/licenses/LICENSE-2.0 *
- * *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the *
- * specific language governing permissions and limitations under the License. *
- ***************************************************************************************************************************
--->
\ No newline at end of file
diff --git a/juneau-microservice/juneau-microservice-test/.gitignore b/juneau-core/juneau-core-utest/.gitignore
similarity index 100%
copy from juneau-microservice/juneau-microservice-test/.gitignore
copy to juneau-core/juneau-core-utest/.gitignore
diff --git a/juneau-microservice/juneau-microservice-test/.project b/juneau-core/juneau-core-utest/.project
similarity index 92%
copy from juneau-microservice/juneau-microservice-test/.project
copy to juneau-core/juneau-core-utest/.project
index 5fb0d4c..9b2643e 100644
--- a/juneau-microservice/juneau-microservice-test/.project
+++ b/juneau-core/juneau-core-utest/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>juneau-microservice-test</name>
+ <name>juneau-core-utest</name>
<comment></comment>
<projects>
</projects>
diff --git a/juneau-core/juneau-core-test/files/test2.txt b/juneau-core/juneau-core-utest/files/test2.txt
similarity index 100%
rename from juneau-core/juneau-core-test/files/test2.txt
rename to juneau-core/juneau-core-utest/files/test2.txt
diff --git a/juneau-core/juneau-core-test/pom.xml b/juneau-core/juneau-core-utest/pom.xml
similarity index 98%
copy from juneau-core/juneau-core-test/pom.xml
copy to juneau-core/juneau-core-utest/pom.xml
index 84c6bd7..e064d7f 100644
--- a/juneau-core/juneau-core-test/pom.xml
+++ b/juneau-core/juneau-core-utest/pom.xml
@@ -23,8 +23,8 @@
<version>8.0.1-SNAPSHOT</version>
</parent>
- <artifactId>juneau-core-test</artifactId>
- <name>Apache Juneau Core Tests</name>
+ <artifactId>juneau-core-utest</artifactId>
+ <name>Apache Juneau Core (Unit Tests)</name>
<description>Core API tests.</description>
<packaging>bundle</packaging>
@@ -92,18 +92,6 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>**/*Test.class</include>
- </includes>
- <systemPropertyVariables>
- <java.locale.providers>JRE,COMPAT,SPI,CLDR</java.locale.providers>
- </systemPropertyVariables>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
@@ -127,6 +115,18 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>**/*Test.class</include>
+ </includes>
+ <systemPropertyVariables>
+ <java.locale.providers>JRE,COMPAT,SPI,CLDR</java.locale.providers>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.2</version>
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/AnnotationsTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/AnnotationsTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/AnnotationsTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/AnnotationsTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/BeanConfigAnnotationTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/BeanConfigAnnotationTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/BeanConfigAnnotationTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/BeanConfigAnnotationTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/BeanConfigTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/BeanConfigTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/BeanConfigTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/BeanConfigTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/BeanFilterTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/BeanFilterTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/BeanFilterTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/BeanFilterTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/BeanMapErrorsTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/BeanMapErrorsTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/BeanMapErrorsTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/BeanMapErrorsTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/BeanMapTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/BeanMapTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/BeanMapTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/BeanMapTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/ClassMetaTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/ClassMetaTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/ClassMetaTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/ClassMetaTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/CloseableByteArrayInputStream.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/CloseableByteArrayInputStream.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/CloseableByteArrayInputStream.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/CloseableByteArrayInputStream.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/CloseableStringReader.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/CloseableStringReader.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/CloseableStringReader.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/CloseableStringReader.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/ComboInput.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/ComboInput.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/ComboInput.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/ComboInput.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/ComboRoundTripTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/ComboRoundTripTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/ComboRoundTripTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/ComboRoundTripTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/ComboSerializeTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/ComboSerializeTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/ComboSerializeTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/ComboSerializeTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/ContextCacheTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/ContextCacheTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/ContextCacheTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/ContextCacheTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/DataConversionTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/DataConversionTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/DataConversionTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/DataConversionTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/DynaBeanComboTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/DynaBeanComboTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/DynaBeanComboTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/DynaBeanComboTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/IgnoredClassesTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/IgnoredClassesTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/IgnoredClassesTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/IgnoredClassesTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/JacocoDummyTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/JacocoDummyTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/JacocoDummyTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/JacocoDummyTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/MaxIndentTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/MaxIndentTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/MaxIndentTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/MaxIndentTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/ObjectListTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/ObjectListTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/ObjectListTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/ObjectListTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/ObjectMapTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/ObjectMapTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/ObjectMapTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/ObjectMapTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/ParserGenericsTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/ParserGenericsTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/ParserGenericsTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/ParserGenericsTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/ParserReaderTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/ParserReaderTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/ParserReaderTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/ParserReaderTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/PojoExamplesTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/PojoExamplesTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/PojoExamplesTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/PojoExamplesTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/PojoSwapTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/PojoSwapTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/PojoSwapTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/PojoSwapTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/PropertyNamerTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/PropertyNamerTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/PropertyNamerTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/PropertyNamerTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/PropertyStoreTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/PropertyStoreTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/PropertyStoreTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/PropertyStoreTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/ValueTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/ValueTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/ValueTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/ValueTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/VisibilityTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/VisibilityTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/VisibilityTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/VisibilityTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/XVar.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/XVar.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/XVar.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/XVar.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/XmlValidatorParser.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/XmlValidatorParser.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/XmlValidatorParser.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/XmlValidatorParser.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/XmlValidatorParserBuilder.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/XmlValidatorParserBuilder.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/XmlValidatorParserBuilder.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/XmlValidatorParserBuilder.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/a/A1.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/A1.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/a/A1.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/A1.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripAddClassAttrsTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripAddClassAttrsTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripAddClassAttrsTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripAddClassAttrsTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanInheritanceTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanInheritanceTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanInheritanceTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanInheritanceTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanMapsTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanMapsTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanMapsTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanMapsTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripClassesTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripClassesTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripClassesTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripClassesTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripDTOsTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripDTOsTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripDTOsTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripDTOsTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripEnumTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripEnumTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripEnumTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripEnumTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripGenericsTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripGenericsTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripGenericsTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripGenericsTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripLargeObjectsTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripLargeObjectsTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripLargeObjectsTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripLargeObjectsTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripMapsTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripMapsTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripMapsTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripMapsTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripNumericConstructorsTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripNumericConstructorsTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripNumericConstructorsTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripNumericConstructorsTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripObjectsAsStringsTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripObjectsAsStringsTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripObjectsAsStringsTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripObjectsAsStringsTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripObjectsWithSpecialMethodsTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripObjectsWithSpecialMethodsTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripObjectsWithSpecialMethodsTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripObjectsWithSpecialMethodsTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripPrimitiveObjectBeansTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripPrimitiveObjectBeansTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripPrimitiveObjectBeansTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripPrimitiveObjectBeansTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripPrimitivesBeansTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripPrimitivesBeansTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripPrimitivesBeansTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripPrimitivesBeansTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripReadOnlyBeansTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripReadOnlyBeansTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripReadOnlyBeansTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripReadOnlyBeansTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripSimpleObjectsTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripSimpleObjectsTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripSimpleObjectsTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripSimpleObjectsTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripToObjectMapsTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripToObjectMapsTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripToObjectMapsTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripToObjectMapsTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripTransformBeansTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripTransformBeansTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripTransformBeansTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripTransformBeansTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripTrimStringsTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripTrimStringsTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripTrimStringsTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripTrimStringsTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RountTripBeansWithBuilders.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RountTripBeansWithBuilders.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RountTripBeansWithBuilders.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RountTripBeansWithBuilders.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/annotation/BeanIgnoreTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/annotation/BeanIgnoreTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/annotation/BeanIgnoreTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/annotation/BeanIgnoreTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/config/ConfigBuilderTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/config/ConfigBuilderTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/config/ConfigBuilderTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/config/ConfigBuilderTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/config/ConfigImportsTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/config/ConfigImportsTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/config/ConfigImportsTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/config/ConfigImportsTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/config/ConfigInterfaceTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/config/ConfigInterfaceTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/config/ConfigInterfaceTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/config/ConfigInterfaceTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/config/ConfigMapListenerTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/config/ConfigMapListenerTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/config/ConfigMapListenerTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/config/ConfigMapListenerTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/config/ConfigMapTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/config/ConfigMapTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/config/ConfigMapTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/config/ConfigMapTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/config/ConfigTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/config/ConfigTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/config/ConfigTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/config/ConfigTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/config/store/ConfigClasspathStoreTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/config/store/ConfigClasspathStoreTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/config/store/ConfigClasspathStoreTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/config/store/ConfigClasspathStoreTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/config/store/ConfigFileStoreTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/config/store/ConfigFileStoreTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/config/store/ConfigFileStoreTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/config/store/ConfigFileStoreTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/config/store/ConfigMemoryStoreTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/config/store/ConfigMemoryStoreTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/config/store/ConfigMemoryStoreTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/config/store/ConfigMemoryStoreTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/csv/CsvConfigAnnotationTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/csv/CsvConfigAnnotationTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/csv/CsvConfigAnnotationTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/csv/CsvConfigAnnotationTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/csv/CsvTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/csv/CsvTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/csv/CsvTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/csv/CsvTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/dto/atom/AtomTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/dto/atom/AtomTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/dto/atom/AtomTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/dto/atom/AtomTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/dto/cognos/CognosXmlTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/dto/cognos/CognosXmlTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/dto/cognos/CognosXmlTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/dto/cognos/CognosXmlTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/dto/html5/Html5BasicTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/dto/html5/Html5BasicTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/dto/html5/Html5BasicTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/dto/html5/Html5BasicTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/dto/html5/Html5ComboTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/dto/html5/Html5ComboTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/dto/html5/Html5ComboTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/dto/html5/Html5ComboTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/dto/html5/Html5TemplateComboTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/dto/html5/Html5TemplateComboTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/dto/html5/Html5TemplateComboTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/dto/html5/Html5TemplateComboTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/dto/jsonschema/JsonSchemaTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/dto/jsonschema/JsonSchemaTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/dto/jsonschema/JsonSchemaTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/dto/jsonschema/JsonSchemaTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/dto/swagger/ContactTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/dto/swagger/ContactTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/dto/swagger/ContactTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/dto/swagger/ContactTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/dto/swagger/ExternalDocumentationTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/dto/swagger/ExternalDocumentationTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/dto/swagger/ExternalDocumentationTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/dto/swagger/ExternalDocumentationTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/dto/swagger/HeaderInfoTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/dto/swagger/HeaderInfoTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/dto/swagger/HeaderInfoTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/dto/swagger/HeaderInfoTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/dto/swagger/InfoTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/dto/swagger/InfoTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/dto/swagger/InfoTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/dto/swagger/InfoTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/dto/swagger/ItemsTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/dto/swagger/ItemsTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/dto/swagger/ItemsTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/dto/swagger/ItemsTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/dto/swagger/LicenseTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/dto/swagger/LicenseTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/dto/swagger/LicenseTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/dto/swagger/LicenseTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/dto/swagger/OperationTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/dto/swagger/OperationTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/dto/swagger/OperationTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/dto/swagger/OperationTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/dto/swagger/ParameterInfoTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/dto/swagger/ParameterInfoTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/dto/swagger/ParameterInfoTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/dto/swagger/ParameterInfoTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/dto/swagger/ResponseInfoTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/dto/swagger/ResponseInfoTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/dto/swagger/ResponseInfoTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/dto/swagger/ResponseInfoTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/dto/swagger/SchemaInfoTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/dto/swagger/SchemaInfoTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/dto/swagger/SchemaInfoTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/dto/swagger/SchemaInfoTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/dto/swagger/SecuritySchemeTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/dto/swagger/SecuritySchemeTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/dto/swagger/SecuritySchemeTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/dto/swagger/SecuritySchemeTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/dto/swagger/SwaggerBuilderTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/dto/swagger/SwaggerBuilderTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/dto/swagger/SwaggerBuilderTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/dto/swagger/SwaggerBuilderTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/dto/swagger/SwaggerTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/dto/swagger/SwaggerTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/dto/swagger/SwaggerTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/dto/swagger/SwaggerTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/dto/swagger/TagTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/dto/swagger/TagTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/dto/swagger/TagTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/dto/swagger/TagTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/dto/swagger/XmlTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/dto/swagger/XmlTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/dto/swagger/XmlTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/dto/swagger/XmlTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/encoders/EncoderGroupTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/encoders/EncoderGroupTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/encoders/EncoderGroupTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/encoders/EncoderGroupTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/html/BasicHtmlTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/html/BasicHtmlTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/html/BasicHtmlTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/html/BasicHtmlTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/html/CommonParserTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/html/CommonParserTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/html/CommonParserTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/html/CommonParserTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/html/CommonTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/html/CommonTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/html/CommonTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/html/CommonTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/html/HtmlConfigAnnotationTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/html/HtmlConfigAnnotationTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/html/HtmlConfigAnnotationTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/html/HtmlConfigAnnotationTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/html/HtmlDocConfigAnnotationTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/html/HtmlDocConfigAnnotationTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/html/HtmlDocConfigAnnotationTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/html/HtmlDocConfigAnnotationTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/html/HtmlSchemaSerializerTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/html/HtmlSchemaSerializerTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/html/HtmlSchemaSerializerTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/html/HtmlSchemaSerializerTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/html/HtmlTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/html/HtmlTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/html/HtmlTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/html/HtmlTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/http/annotation/AnnotationUtilsTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/http/annotation/AnnotationUtilsTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/http/annotation/AnnotationUtilsTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/http/annotation/AnnotationUtilsTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/httppart/HttpPartSchemaTest_Body.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/httppart/HttpPartSchemaTest_Body.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/httppart/HttpPartSchemaTest_Body.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/httppart/HttpPartSchemaTest_Body.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/httppart/HttpPartSchemaTest_FormData.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/httppart/HttpPartSchemaTest_FormData.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/httppart/HttpPartSchemaTest_FormData.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/httppart/HttpPartSchemaTest_FormData.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/httppart/HttpPartSchemaTest_Header.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/httppart/HttpPartSchemaTest_Header.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/httppart/HttpPartSchemaTest_Header.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/httppart/HttpPartSchemaTest_Header.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/httppart/HttpPartSchemaTest_Path.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/httppart/HttpPartSchemaTest_Path.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/httppart/HttpPartSchemaTest_Path.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/httppart/HttpPartSchemaTest_Path.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/httppart/HttpPartSchemaTest_Query.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/httppart/HttpPartSchemaTest_Query.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/httppart/HttpPartSchemaTest_Query.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/httppart/HttpPartSchemaTest_Query.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/httppart/HttpPartSchemaTest_Response.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/httppart/HttpPartSchemaTest_Response.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/httppart/HttpPartSchemaTest_Response.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/httppart/HttpPartSchemaTest_Response.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/httppart/HttpPartSchemaTest_ResponseHeader.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/httppart/HttpPartSchemaTest_ResponseHeader.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/httppart/HttpPartSchemaTest_ResponseHeader.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/httppart/HttpPartSchemaTest_ResponseHeader.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/httppart/OpenApiPartParserTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/httppart/OpenApiPartParserTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/httppart/OpenApiPartParserTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/httppart/OpenApiPartParserTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/httppart/OpenApiPartSerializerTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/httppart/OpenApiPartSerializerTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/httppart/OpenApiPartSerializerTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/httppart/OpenApiPartSerializerTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/httppart/UonPartParserTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/httppart/UonPartParserTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/httppart/UonPartParserTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/httppart/UonPartParserTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/https/AcceptExtensionsTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/https/AcceptExtensionsTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/https/AcceptExtensionsTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/https/AcceptExtensionsTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/https/AcceptTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/https/AcceptTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/https/AcceptTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/https/AcceptTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/https/ContentTypeTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/https/ContentTypeTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/https/ContentTypeTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/https/ContentTypeTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/https/MediaRangeTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/https/MediaRangeTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/https/MediaRangeTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/https/MediaRangeTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/internal/VersionRangeTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/internal/VersionRangeTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/internal/VersionRangeTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/internal/VersionRangeTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/jena/CommonParserTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/jena/CommonParserTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/jena/CommonParserTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/jena/CommonParserTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/jena/CommonTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/jena/CommonTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/jena/CommonTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/jena/CommonTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/jena/CommonXmlTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/jena/CommonXmlTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/jena/CommonXmlTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/jena/CommonXmlTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/jena/RdfConfigAnnotationTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/jena/RdfConfigAnnotationTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/jena/RdfConfigAnnotationTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/jena/RdfConfigAnnotationTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/jena/RdfParserTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/jena/RdfParserTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/jena/RdfParserTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/jena/RdfParserTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/jena/RdfTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/jena/RdfTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/jena/RdfTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/jena/RdfTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/jso/JsoConfigAnnotationTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/jso/JsoConfigAnnotationTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/jso/JsoConfigAnnotationTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/jso/JsoConfigAnnotationTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/json/CommonParserTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/json/CommonParserTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/json/CommonParserTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/json/CommonParserTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/json/CommonTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/json/CommonTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/json/CommonTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/json/CommonTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/json/JsonConfigAnnotationTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/json/JsonConfigAnnotationTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/json/JsonConfigAnnotationTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/json/JsonConfigAnnotationTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/json/JsonParserEdgeCasesTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/json/JsonParserEdgeCasesTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/json/JsonParserEdgeCasesTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/json/JsonParserEdgeCasesTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/json/JsonParserTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/json/JsonParserTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/json/JsonParserTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/json/JsonParserTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/json/JsonSchemaSerializerTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/json/JsonSchemaSerializerTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/json/JsonSchemaSerializerTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/json/JsonSchemaSerializerTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/json/JsonTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/json/JsonTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/json/JsonTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/json/JsonTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/jsonschema/JsonSchemaConfigAnnotationTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/jsonschema/JsonSchemaConfigAnnotationTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/jsonschema/JsonSchemaConfigAnnotationTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/jsonschema/JsonSchemaConfigAnnotationTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/marshall/HtmlTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/marshall/HtmlTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/marshall/HtmlTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/marshall/HtmlTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/marshall/JsoTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/marshall/JsoTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/marshall/JsoTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/marshall/JsoTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/marshall/JsonTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/marshall/JsonTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/marshall/JsonTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/marshall/JsonTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/marshall/MsgPackTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/marshall/MsgPackTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/marshall/MsgPackTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/marshall/MsgPackTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/marshall/N3Test.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/marshall/N3Test.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/marshall/N3Test.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/marshall/N3Test.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/marshall/NTripleTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/marshall/NTripleTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/marshall/NTripleTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/marshall/NTripleTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/marshall/PlainTextTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/marshall/PlainTextTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/marshall/PlainTextTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/marshall/PlainTextTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/marshall/RdfXmlAbbrevTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/marshall/RdfXmlAbbrevTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/marshall/RdfXmlAbbrevTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/marshall/RdfXmlAbbrevTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/marshall/RdfXmlTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/marshall/RdfXmlTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/marshall/RdfXmlTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/marshall/RdfXmlTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/marshall/SimpleJsonTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/marshall/SimpleJsonTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/marshall/SimpleJsonTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/marshall/SimpleJsonTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/marshall/TurtleTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/marshall/TurtleTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/marshall/TurtleTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/marshall/TurtleTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/marshall/UonTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/marshall/UonTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/marshall/UonTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/marshall/UonTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/marshall/UrlEncodingTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/marshall/UrlEncodingTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/marshall/UrlEncodingTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/marshall/UrlEncodingTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/marshall/XmlTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/marshall/XmlTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/marshall/XmlTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/marshall/XmlTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/msgpack/MsgPackConfigAnnotationTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/msgpack/MsgPackConfigAnnotationTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/msgpack/MsgPackConfigAnnotationTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/msgpack/MsgPackConfigAnnotationTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/msgpack/MsgPackParserTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/msgpack/MsgPackParserTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/msgpack/MsgPackParserTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/msgpack/MsgPackParserTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/msgpack/MsgPackSerializerTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/msgpack/MsgPackSerializerTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/msgpack/MsgPackSerializerTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/msgpack/MsgPackSerializerTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/oapi/OpenApiConfigAnnotationTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/oapi/OpenApiConfigAnnotationTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/oapi/OpenApiConfigAnnotationTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/oapi/OpenApiConfigAnnotationTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/parser/ParserConfigAnnotationTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/parser/ParserConfigAnnotationTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/parser/ParserConfigAnnotationTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/parser/ParserConfigAnnotationTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/parser/ParserGroupTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/parser/ParserGroupTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/parser/ParserGroupTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/parser/ParserGroupTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/plaintext/PlainTextConfigAnnotationTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/plaintext/PlainTextConfigAnnotationTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/plaintext/PlainTextConfigAnnotationTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/plaintext/PlainTextConfigAnnotationTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/pojotools/PojoSearcherTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/pojotools/PojoSearcherTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/pojotools/PojoSearcherTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/pojotools/PojoSearcherTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/pojotools/PojoSorterTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/pojotools/PojoSorterTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/pojotools/PojoSorterTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/pojotools/PojoSorterTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/pojotools/PojoViewerTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/pojotools/PojoViewerTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/pojotools/PojoViewerTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/pojotools/PojoViewerTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/reflection/AClass.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/reflection/AClass.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/reflection/AClass.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/reflection/AClass.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/reflection/AInterface.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/reflection/AInterface.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/reflection/AInterface.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/reflection/AInterface.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/reflection/AnnotationInfoTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/reflection/AnnotationInfoTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/reflection/AnnotationInfoTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/reflection/AnnotationInfoTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/reflection/ClassInfoTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/reflection/ClassInfoTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/reflection/ClassInfoTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/reflection/ClassInfoTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/reflection/ConstructorInfoTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/reflection/ConstructorInfoTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/reflection/ConstructorInfoTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/reflection/ConstructorInfoTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/reflection/ExecutableInfoTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/reflection/ExecutableInfoTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/reflection/ExecutableInfoTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/reflection/ExecutableInfoTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/reflection/FieldInfoTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/reflection/FieldInfoTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/reflection/FieldInfoTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/reflection/FieldInfoTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/reflection/MethodInfoTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/reflection/MethodInfoTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/reflection/MethodInfoTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/reflection/MethodInfoTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/reflection/PA.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/reflection/PA.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/reflection/PA.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/reflection/PA.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/reflection/ParamInfoTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/reflection/ParamInfoTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/reflection/ParamInfoTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/reflection/ParamInfoTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/reflection/package-info.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/reflection/package-info.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/reflection/package-info.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/reflection/package-info.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/serializer/ReaderObjectComboTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/serializer/ReaderObjectComboTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/serializer/ReaderObjectComboTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/serializer/ReaderObjectComboTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/serializer/SerializerConfigAnnotationTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/serializer/SerializerConfigAnnotationTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/serializer/SerializerConfigAnnotationTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/serializer/SerializerConfigAnnotationTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/serializer/SerializerGroupTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/serializer/SerializerGroupTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/serializer/SerializerGroupTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/serializer/SerializerGroupTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/serializer/TestURI.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/serializer/TestURI.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/serializer/TestURI.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/serializer/TestURI.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/serializer/UriResolutionTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/serializer/UriResolutionTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/serializer/UriResolutionTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/serializer/UriResolutionTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/soap/SoapXmlConfigAnnotationTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/soap/SoapXmlConfigAnnotationTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/soap/SoapXmlConfigAnnotationTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/soap/SoapXmlConfigAnnotationTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/svl/ResolvingObjectMapTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/svl/ResolvingObjectMapTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/svl/ResolvingObjectMapTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/svl/ResolvingObjectMapTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/svl/vars/IfVarTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/svl/vars/IfVarTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/svl/vars/IfVarTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/svl/vars/IfVarTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/svl/vars/LenVarTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/svl/vars/LenVarTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/svl/vars/LenVarTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/svl/vars/LenVarTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/svl/vars/LowerCaseVarTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/svl/vars/LowerCaseVarTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/svl/vars/LowerCaseVarTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/svl/vars/LowerCaseVarTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/svl/vars/NotEmptyVarTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/svl/vars/NotEmptyVarTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/svl/vars/NotEmptyVarTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/svl/vars/NotEmptyVarTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/svl/vars/PatternExtractVarTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/svl/vars/PatternExtractVarTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/svl/vars/PatternExtractVarTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/svl/vars/PatternExtractVarTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/svl/vars/PatternMatchVarTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/svl/vars/PatternMatchVarTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/svl/vars/PatternMatchVarTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/svl/vars/PatternMatchVarTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/svl/vars/PatternReplaceVarTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/svl/vars/PatternReplaceVarTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/svl/vars/PatternReplaceVarTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/svl/vars/PatternReplaceVarTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/svl/vars/RestrictedVarsTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/svl/vars/RestrictedVarsTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/svl/vars/RestrictedVarsTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/svl/vars/RestrictedVarsTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/svl/vars/SubstringVarTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/svl/vars/SubstringVarTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/svl/vars/SubstringVarTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/svl/vars/SubstringVarTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/svl/vars/SwitchVarTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/svl/vars/SwitchVarTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/svl/vars/SwitchVarTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/svl/vars/SwitchVarTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/svl/vars/UpperCaseVarTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/svl/vars/UpperCaseVarTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/svl/vars/UpperCaseVarTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/svl/vars/UpperCaseVarTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testutils/TestUtils.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/testutils/TestUtils.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testutils/TestUtils.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/testutils/TestUtils.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testutils/pojos/ABean.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/testutils/pojos/ABean.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testutils/pojos/ABean.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/testutils/pojos/ABean.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testutils/pojos/Constants.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/testutils/pojos/Constants.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testutils/pojos/Constants.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/testutils/pojos/Constants.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testutils/pojos/ImplicitSwappedPojo.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/testutils/pojos/ImplicitSwappedPojo.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testutils/pojos/ImplicitSwappedPojo.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/testutils/pojos/ImplicitSwappedPojo.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testutils/pojos/LargePojo.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/testutils/pojos/LargePojo.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testutils/pojos/LargePojo.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/testutils/pojos/LargePojo.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testutils/pojos/PrimitiveAtomicObjectsBean.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/testutils/pojos/PrimitiveAtomicObjectsBean.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testutils/pojos/PrimitiveAtomicObjectsBean.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/testutils/pojos/PrimitiveAtomicObjectsBean.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testutils/pojos/PrimitiveObjectsBean.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/testutils/pojos/PrimitiveObjectsBean.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testutils/pojos/PrimitiveObjectsBean.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/testutils/pojos/PrimitiveObjectsBean.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testutils/pojos/SwappedPojo.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/testutils/pojos/SwappedPojo.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testutils/pojos/SwappedPojo.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/testutils/pojos/SwappedPojo.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testutils/pojos/SwappedPojoSwap.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/testutils/pojos/SwappedPojoSwap.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testutils/pojos/SwappedPojoSwap.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/testutils/pojos/SwappedPojoSwap.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testutils/pojos/TestEnum.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/testutils/pojos/TestEnum.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testutils/pojos/TestEnum.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/testutils/pojos/TestEnum.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testutils/pojos/TestEnumToString.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/testutils/pojos/TestEnumToString.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testutils/pojos/TestEnumToString.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/testutils/pojos/TestEnumToString.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testutils/pojos/TestURI.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/testutils/pojos/TestURI.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testutils/pojos/TestURI.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/testutils/pojos/TestURI.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testutils/pojos/TypedBean.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/testutils/pojos/TypedBean.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testutils/pojos/TypedBean.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/testutils/pojos/TypedBean.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testutils/pojos/TypedBeanImpl.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/testutils/pojos/TypedBeanImpl.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testutils/pojos/TypedBeanImpl.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/testutils/pojos/TypedBeanImpl.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/transforms/BeanDictionaryComboTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/transforms/BeanDictionaryComboTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/transforms/BeanDictionaryComboTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/transforms/BeanDictionaryComboTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/transforms/BeanFilterTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/transforms/BeanFilterTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/transforms/BeanFilterTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/transforms/BeanFilterTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/transforms/BeanMapTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/transforms/BeanMapTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/transforms/BeanMapTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/transforms/BeanMapTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/transforms/BuilderComboTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/transforms/BuilderComboTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/transforms/BuilderComboTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/transforms/BuilderComboTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/transforms/ByteArrayBase64SwapComboTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/transforms/ByteArrayBase64SwapComboTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/transforms/ByteArrayBase64SwapComboTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/transforms/ByteArrayBase64SwapComboTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/transforms/CalendarSwapComboTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/transforms/CalendarSwapComboTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/transforms/CalendarSwapComboTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/transforms/CalendarSwapComboTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/transforms/CalendarSwapTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/transforms/CalendarSwapTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/transforms/CalendarSwapTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/transforms/CalendarSwapTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/transforms/DateSwapComboTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/transforms/DateSwapComboTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/transforms/DateSwapComboTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/transforms/DateSwapComboTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/transforms/DateSwapTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/transforms/DateSwapTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/transforms/DateSwapTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/transforms/DateSwapTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/transforms/EnumerationSwapTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/transforms/EnumerationSwapTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/transforms/EnumerationSwapTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/transforms/EnumerationSwapTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/transforms/IteratorSwapTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/transforms/IteratorSwapTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/transforms/IteratorSwapTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/transforms/IteratorSwapTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/transforms/LocalizedDatesTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/transforms/LocalizedDatesTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/transforms/LocalizedDatesTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/transforms/LocalizedDatesTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/transforms/PojoSwapTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/transforms/PojoSwapTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/transforms/PojoSwapTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/transforms/PojoSwapTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/transforms/ReaderFilterTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/transforms/ReaderFilterTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/transforms/ReaderFilterTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/transforms/ReaderFilterTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/transforms/ReaderObjectSwapTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/transforms/ReaderObjectSwapTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/transforms/ReaderObjectSwapTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/transforms/ReaderObjectSwapTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/transforms/SwapsAnnotationComboTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/transforms/SwapsAnnotationComboTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/transforms/SwapsAnnotationComboTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/transforms/SwapsAnnotationComboTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/uon/CommonParser_UonTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/uon/CommonParser_UonTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/uon/CommonParser_UonTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/uon/CommonParser_UonTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/uon/Common_UonTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/uon/Common_UonTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/uon/Common_UonTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/uon/Common_UonTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/uon/UonConfigAnnotationTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/uon/UonConfigAnnotationTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/uon/UonConfigAnnotationTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/uon/UonConfigAnnotationTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/uon/UonParserReaderTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/uon/UonParserReaderTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/uon/UonParserReaderTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/uon/UonParserReaderTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/uon/UonParserTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/uon/UonParserTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/uon/UonParserTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/uon/UonParserTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/uon/UonSerializerTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/uon/UonSerializerTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/uon/UonSerializerTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/uon/UonSerializerTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/urlencoding/CommonParser_UrlEncodingTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/urlencoding/CommonParser_UrlEncodingTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/urlencoding/CommonParser_UrlEncodingTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/urlencoding/CommonParser_UrlEncodingTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/urlencoding/Common_UrlEncodingTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/urlencoding/Common_UrlEncodingTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/urlencoding/Common_UrlEncodingTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/urlencoding/Common_UrlEncodingTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/urlencoding/DTOs.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/urlencoding/DTOs.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/urlencoding/DTOs.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/urlencoding/DTOs.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/urlencoding/UrlEncodingConfigAnnotationTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/urlencoding/UrlEncodingConfigAnnotationTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/urlencoding/UrlEncodingConfigAnnotationTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/urlencoding/UrlEncodingConfigAnnotationTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/urlencoding/UrlEncodingParserTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/urlencoding/UrlEncodingParserTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/urlencoding/UrlEncodingParserTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/urlencoding/UrlEncodingParserTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/urlencoding/UrlEncodingSerializerTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/urlencoding/UrlEncodingSerializerTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/urlencoding/UrlEncodingSerializerTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/urlencoding/UrlEncodingSerializerTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/utils/ArgsTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/utils/ArgsTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/utils/ArgsTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/utils/ArgsTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/utils/ArrayUtilsTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/utils/ArrayUtilsTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/utils/ArrayUtilsTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/utils/ArrayUtilsTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/utils/BeanDiffTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/utils/BeanDiffTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/utils/BeanDiffTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/utils/BeanDiffTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/utils/ByteArrayInOutStreamTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/utils/ByteArrayInOutStreamTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/utils/ByteArrayInOutStreamTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/utils/ByteArrayInOutStreamTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/utils/CharSetTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/utils/CharSetTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/utils/CharSetTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/utils/CharSetTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/utils/ClassUtilsTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/utils/ClassUtilsTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/utils/ClassUtilsTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/utils/ClassUtilsTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/utils/CollectionUtilsTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/utils/CollectionUtilsTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/utils/CollectionUtilsTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/utils/CollectionUtilsTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/utils/FilteredMapTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/utils/FilteredMapTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/utils/FilteredMapTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/utils/FilteredMapTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/utils/HttpUtilsTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/utils/HttpUtilsTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/utils/HttpUtilsTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/utils/HttpUtilsTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/utils/IOPipeTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/utils/IOPipeTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/utils/IOPipeTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/utils/IOPipeTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/utils/IOUtilsTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/utils/IOUtilsTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/utils/IOUtilsTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/utils/IOUtilsTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/utils/KeywordStoreTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/utils/KeywordStoreTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/utils/KeywordStoreTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/utils/KeywordStoreTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/utils/MultiIterableTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/utils/MultiIterableTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/utils/MultiIterableTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/utils/MultiIterableTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/utils/MultiSetTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/utils/MultiSetTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/utils/MultiSetTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/utils/MultiSetTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/utils/ParserReaderTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/utils/ParserReaderTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/utils/ParserReaderTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/utils/ParserReaderTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/utils/PojoIntrospectorTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/utils/PojoIntrospectorTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/utils/PojoIntrospectorTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/utils/PojoIntrospectorTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/utils/PojoMergeTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/utils/PojoMergeTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/utils/PojoMergeTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/utils/PojoMergeTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/utils/PojoQueryTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/utils/PojoQueryTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/utils/PojoQueryTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/utils/PojoQueryTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/utils/PojoRestTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/utils/PojoRestTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/utils/PojoRestTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/utils/PojoRestTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/utils/SimpleMapTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/utils/SimpleMapTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/utils/SimpleMapTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/utils/SimpleMapTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/utils/StringBuilderWriterTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/utils/StringBuilderWriterTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/utils/StringBuilderWriterTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/utils/StringBuilderWriterTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/utils/StringExpressionMatcherTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/utils/StringExpressionMatcherTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/utils/StringExpressionMatcherTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/utils/StringExpressionMatcherTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/utils/StringUtilsTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/utils/StringUtilsTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/utils/StringUtilsTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/utils/StringUtilsTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/utils/StringVarResolverTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/utils/StringVarResolverTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/utils/StringVarResolverTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/utils/StringVarResolverTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/utils/TransformCacheTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/utils/TransformCacheTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/utils/TransformCacheTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/utils/TransformCacheTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/utils/UriContextResolutionComboTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/utils/UriContextResolutionComboTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/utils/UriContextResolutionComboTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/utils/UriContextResolutionComboTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/utils/UriContextUriComboTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/utils/UriContextUriComboTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/utils/UriContextUriComboTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/utils/UriContextUriComboTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/xml/BasicXmlTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/xml/BasicXmlTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/xml/BasicXmlTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/xml/BasicXmlTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/xml/CommonParserTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/xml/CommonParserTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/xml/CommonParserTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/xml/CommonParserTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/xml/CommonTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/xml/CommonTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/xml/CommonTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/xml/CommonTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/xml/CommonXmlTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/xml/CommonXmlTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/xml/CommonXmlTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/xml/CommonXmlTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/xml/InvalidXmlBeansTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/xml/InvalidXmlBeansTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/xml/InvalidXmlBeansTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/xml/InvalidXmlBeansTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/xml/XmlCollapsedTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/xml/XmlCollapsedTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/xml/XmlCollapsedTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/xml/XmlCollapsedTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/xml/XmlConfigAnnotationTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/xml/XmlConfigAnnotationTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/xml/XmlConfigAnnotationTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/xml/XmlConfigAnnotationTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/xml/XmlContentTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/xml/XmlContentTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/xml/XmlContentTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/xml/XmlContentTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/xml/XmlIgnoreCommentsTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/xml/XmlIgnoreCommentsTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/xml/XmlIgnoreCommentsTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/xml/XmlIgnoreCommentsTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/xml/XmlParserTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/xml/XmlParserTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/xml/XmlParserTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/xml/XmlParserTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/xml/XmlTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/xml/XmlTest.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/xml/XmlTest.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/xml/XmlTest.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/xml/xml1a/T1.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/xml/xml1a/T1.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/xml/xml1a/T1.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/xml/xml1a/T1.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/xml/xml1a/T2.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/xml/xml1a/T2.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/xml/xml1a/T2.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/xml/xml1a/T2.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/xml/xml1b/T3.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/xml/xml1b/T3.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/xml/xml1b/T3.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/xml/xml1b/T3.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/xml/xml1b/T4.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/xml/xml1b/T4.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/xml/xml1b/T4.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/xml/xml1b/T4.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/xml/xml1b/T5.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/xml/xml1b/T5.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/xml/xml1b/T5.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/xml/xml1b/T5.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/xml/xml1b/T6.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/xml/xml1b/T6.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/xml/xml1b/T6.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/xml/xml1b/T6.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/xml/xml1b/T7.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/xml/xml1b/T7.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/xml/xml1b/T7.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/xml/xml1b/T7.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/xml/xml1b/package-info.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/xml/xml1b/package-info.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/xml/xml1b/package-info.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/xml/xml1b/package-info.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/xml/xml1c/T8.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/xml/xml1c/T8.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/xml/xml1c/T8.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/xml/xml1c/T8.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/xml/xml1c/T9.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/xml/xml1c/T9.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/xml/xml1c/T9.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/xml/xml1c/T9.java
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/xml/xml1c/package-info.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/xml/xml1c/package-info.java
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/xml/xml1c/package-info.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/xml/xml1c/package-info.java
diff --git a/juneau-core/juneau-core-test/src/test/resources/foo1.cfg b/juneau-core/juneau-core-utest/src/test/resources/foo1.cfg
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/resources/foo1.cfg
rename to juneau-core/juneau-core-utest/src/test/resources/foo1.cfg
diff --git a/juneau-core/juneau-core-test/src/test/resources/sub/foo2.cfg b/juneau-core/juneau-core-utest/src/test/resources/sub/foo2.cfg
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/resources/sub/foo2.cfg
rename to juneau-core/juneau-core-utest/src/test/resources/sub/foo2.cfg
diff --git a/juneau-core/juneau-core-test/src/test/resources/sub/test4.txt b/juneau-core/juneau-core-utest/src/test/resources/sub/test4.txt
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/resources/sub/test4.txt
rename to juneau-core/juneau-core-utest/src/test/resources/sub/test4.txt
diff --git a/juneau-core/juneau-core-test/src/test/resources/test3.txt b/juneau-core/juneau-core-utest/src/test/resources/test3.txt
similarity index 100%
rename from juneau-core/juneau-core-test/src/test/resources/test3.txt
rename to juneau-core/juneau-core-utest/src/test/resources/test3.txt
diff --git a/juneau-core/juneau-core-test/test.cfg b/juneau-core/juneau-core-utest/test.cfg
similarity index 100%
rename from juneau-core/juneau-core-test/test.cfg
rename to juneau-core/juneau-core-utest/test.cfg
diff --git a/juneau-core/juneau-core-test/test1.txt b/juneau-core/juneau-core-utest/test1.txt
similarity index 100%
rename from juneau-core/juneau-core-test/test1.txt
rename to juneau-core/juneau-core-utest/test1.txt
diff --git a/juneau-core/pom.xml b/juneau-core/pom.xml
index b5f368e..2c52cf1 100644
--- a/juneau-core/pom.xml
+++ b/juneau-core/pom.xml
@@ -34,6 +34,6 @@
<module>juneau-dto</module>
<module>juneau-svl</module>
<module>juneau-config</module>
- <module>juneau-core-test</module>
+ <module>juneau-core-utest</module>
</modules>
</project>
diff --git a/juneau-microservice/juneau-microservice-test/.gitignore b/juneau-examples/juneau-examples-rest-jetty-ftest/.gitignore
similarity index 67%
rename from juneau-microservice/juneau-microservice-test/.gitignore
rename to juneau-examples/juneau-examples-rest-jetty-ftest/.gitignore
index 497450c..08c8ec3 100644
--- a/juneau-microservice/juneau-microservice-test/.gitignore
+++ b/juneau-examples/juneau-examples-rest-jetty-ftest/.gitignore
@@ -1,3 +1,5 @@
**/.classpath
/target/
**/.DS_Store
+/derby.log
+/bin/
diff --git a/juneau-rest/juneau-rest-client-test/.project b/juneau-examples/juneau-examples-rest-jetty-ftest/.project
similarity index 92%
rename from juneau-rest/juneau-rest-client-test/.project
rename to juneau-examples/juneau-examples-rest-jetty-ftest/.project
index 0716e50..dafd7f5 100644
--- a/juneau-rest/juneau-rest-client-test/.project
+++ b/juneau-examples/juneau-examples-rest-jetty-ftest/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>juneau-rest-client</name>
+ <name>juneau-examples-rest-jetty-ftest</name>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
diff --git a/juneau-examples/juneau-examples-rest-jetty/pom.xml b/juneau-examples/juneau-examples-rest-jetty-ftest/pom.xml
similarity index 78%
copy from juneau-examples/juneau-examples-rest-jetty/pom.xml
copy to juneau-examples/juneau-examples-rest-jetty-ftest/pom.xml
index d26b072..549099d 100644
--- a/juneau-examples/juneau-examples-rest-jetty/pom.xml
+++ b/juneau-examples/juneau-examples-rest-jetty-ftest/pom.xml
@@ -23,9 +23,9 @@
<version>8.0.1-SNAPSHOT</version>
</parent>
- <artifactId>juneau-examples-rest-jetty</artifactId>
- <name>Apache Juneau REST Examples using Jetty</name>
- <description>Sample code deployed using Jetty.</description>
+ <artifactId>juneau-examples-rest-jetty-ftest</artifactId>
+ <name>Apache Juneau REST Examples (Function Tests)</name>
+ <description>Tests for the Juneau REST examples.</description>
<properties>
<encoding>UTF-8</encoding>
@@ -40,21 +40,21 @@
<!-- Juneau dependencies -->
<dependency>
<groupId>org.apache.juneau</groupId>
- <artifactId>juneau-examples-rest</artifactId>
+ <artifactId>juneau-examples-rest-jetty</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.juneau</groupId>
- <artifactId>juneau-microservice-jetty</artifactId>
+ <artifactId>juneau-rest-server</artifactId>
<version>${project.version}</version>
+ <type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.juneau</groupId>
- <artifactId>juneau-rest-server</artifactId>
+ <artifactId>juneau-core-utest</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
- <scope>test</scope>
</dependency>
<!-- Other -->
@@ -65,7 +65,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <scope>test</scope>
</dependency>
</dependencies>
@@ -74,36 +73,32 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>
+ **/_TestSuite.java
+ </include>
+ </includes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <version>0.8.2</version>
<executions>
<execution>
- <id>attach-sources</id>
- <phase>verify</phase>
+ <id>default-prepare-agent</id>
<goals>
- <goal>jar-no-fork</goal>
+ <goal>prepare-agent</goal>
</goals>
</execution>
- </executions>
- </plugin>
-
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <escapeString>\</escapeString>
- </configuration>
- <executions>
<execution>
- <id>juneau-assembly</id>
- <phase>package</phase>
+ <id>default-report</id>
+ <phase>prepare-package</phase>
<goals>
- <goal>single</goal>
+ <goal>report</goal>
</goals>
- <configuration>
- <finalName>juneau-examples-rest-jetty-${project.version}</finalName>
- <descriptors>
- <descriptor>src/assembly/bin.xml</descriptor>
- </descriptors>
- </configuration>
</execution>
</executions>
</plugin>
diff --git a/juneau-examples/juneau-examples-rest-jetty/src/test/java/org/apache/juneau/examples/rest/ContentComboTestBase.java b/juneau-examples/juneau-examples-rest-jetty-ftest/src/test/java/org/apache/juneau/examples/rest/ContentComboTestBase.java
similarity index 100%
rename from juneau-examples/juneau-examples-rest-jetty/src/test/java/org/apache/juneau/examples/rest/ContentComboTestBase.java
rename to juneau-examples/juneau-examples-rest-jetty-ftest/src/test/java/org/apache/juneau/examples/rest/ContentComboTestBase.java
diff --git a/juneau-examples/juneau-examples-rest-jetty/src/test/java/org/apache/juneau/examples/rest/RestTestcase.java b/juneau-examples/juneau-examples-rest-jetty-ftest/src/test/java/org/apache/juneau/examples/rest/RestTestcase.java
similarity index 100%
rename from juneau-examples/juneau-examples-rest-jetty/src/test/java/org/apache/juneau/examples/rest/RestTestcase.java
rename to juneau-examples/juneau-examples-rest-jetty-ftest/src/test/java/org/apache/juneau/examples/rest/RestTestcase.java
diff --git a/juneau-examples/juneau-examples-rest-jetty/src/test/java/org/apache/juneau/examples/rest/RootContentTest.java b/juneau-examples/juneau-examples-rest-jetty-ftest/src/test/java/org/apache/juneau/examples/rest/RootContentTest.java
similarity index 100%
rename from juneau-examples/juneau-examples-rest-jetty/src/test/java/org/apache/juneau/examples/rest/RootContentTest.java
rename to juneau-examples/juneau-examples-rest-jetty-ftest/src/test/java/org/apache/juneau/examples/rest/RootContentTest.java
diff --git a/juneau-examples/juneau-examples-rest-jetty/src/test/java/org/apache/juneau/examples/rest/RootResourcesTest.java b/juneau-examples/juneau-examples-rest-jetty-ftest/src/test/java/org/apache/juneau/examples/rest/RootResourcesTest.java
similarity index 100%
rename from juneau-examples/juneau-examples-rest-jetty/src/test/java/org/apache/juneau/examples/rest/RootResourcesTest.java
rename to juneau-examples/juneau-examples-rest-jetty-ftest/src/test/java/org/apache/juneau/examples/rest/RootResourcesTest.java
diff --git a/juneau-examples/juneau-examples-rest-jetty/src/test/java/org/apache/juneau/examples/rest/SamplesMicroservice.java b/juneau-examples/juneau-examples-rest-jetty-ftest/src/test/java/org/apache/juneau/examples/rest/SamplesMicroservice.java
similarity index 95%
rename from juneau-examples/juneau-examples-rest-jetty/src/test/java/org/apache/juneau/examples/rest/SamplesMicroservice.java
rename to juneau-examples/juneau-examples-rest-jetty-ftest/src/test/java/org/apache/juneau/examples/rest/SamplesMicroservice.java
index 3f715f8..ecd2eb3 100644
--- a/juneau-examples/juneau-examples-rest-jetty/src/test/java/org/apache/juneau/examples/rest/SamplesMicroservice.java
+++ b/juneau-examples/juneau-examples-rest-jetty-ftest/src/test/java/org/apache/juneau/examples/rest/SamplesMicroservice.java
@@ -43,7 +43,7 @@ public class SamplesMicroservice {
return false;
try {
Locale.setDefault(Locale.US);
- microservice = JettyMicroservice.create().configName("examples.cfg").servlet(RootResources.class).build();
+ microservice = JettyMicroservice.create().workingDir("../juneau-examples-rest-jetty").configName("juneau-examples-rest-jetty.cfg").servlet(RootResources.class).build();
microserviceURI = microservice.start().getURI();
DEFAULT_CLIENT = client().json().build();
DEFAULT_CLIENT_PLAINTEXT = client().plainText().build();
diff --git a/juneau-examples/juneau-examples-rest-jetty/src/test/java/org/apache/juneau/examples/rest/TestUtils.java b/juneau-examples/juneau-examples-rest-jetty-ftest/src/test/java/org/apache/juneau/examples/rest/TestUtils.java
similarity index 100%
rename from juneau-examples/juneau-examples-rest-jetty/src/test/java/org/apache/juneau/examples/rest/TestUtils.java
rename to juneau-examples/juneau-examples-rest-jetty-ftest/src/test/java/org/apache/juneau/examples/rest/TestUtils.java
diff --git a/juneau-examples/juneau-examples-rest-jetty/src/test/java/org/apache/juneau/examples/rest/_TestSuite.java b/juneau-examples/juneau-examples-rest-jetty-ftest/src/test/java/org/apache/juneau/examples/rest/_TestSuite.java
similarity index 100%
rename from juneau-examples/juneau-examples-rest-jetty/src/test/java/org/apache/juneau/examples/rest/_TestSuite.java
rename to juneau-examples/juneau-examples-rest-jetty-ftest/src/test/java/org/apache/juneau/examples/rest/_TestSuite.java
diff --git a/juneau-examples/juneau-examples-rest-jetty/.classpath b/juneau-examples/juneau-examples-rest-jetty/.classpath
index 67fbadd..b8f9eed 100644
--- a/juneau-examples/juneau-examples-rest-jetty/.classpath
+++ b/juneau-examples/juneau-examples-rest-jetty/.classpath
@@ -22,12 +22,5 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
- <classpathentry kind="src" output="target/test-classes" path="src/test/java">
- <attributes>
- <attribute name="optional" value="true"/>
- <attribute name="maven.pomderived" value="true"/>
- <attribute name="test" value="true"/>
- </attributes>
- </classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/juneau-examples/juneau-examples-rest-jetty/pom.xml b/juneau-examples/juneau-examples-rest-jetty/pom.xml
index d26b072..9e65506 100644
--- a/juneau-examples/juneau-examples-rest-jetty/pom.xml
+++ b/juneau-examples/juneau-examples-rest-jetty/pom.xml
@@ -49,24 +49,12 @@
<artifactId>juneau-microservice-jetty</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.juneau</groupId>
- <artifactId>juneau-rest-server</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
<!-- Other -->
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
diff --git a/juneau-examples/juneau-examples-rest-jetty/src/main/resources/jetty.xml b/juneau-examples/juneau-examples-rest-jetty/src/main/resources/jetty.xml
index 9ef28ea..9ded931 100644
--- a/juneau-examples/juneau-examples-rest-jetty/src/main/resources/jetty.xml
+++ b/juneau-examples/juneau-examples-rest-jetty/src/main/resources/jetty.xml
@@ -54,7 +54,7 @@
<Set name="requestLog">
<New id="RequestLogImpl" class="org.eclipse.jetty.server.NCSARequestLog">
- <Set name="filename"><Property name="jetty.logs" default="$C{Logging/logDir,logs}"/>/jetty-requests.log</Set>
+ <Set name="filename"><Property name="jetty.logs" default="$S{juneau.logDir,logs}"/>/jetty-requests.log</Set>
<Set name="filenameDateFormat">yyyy_MM_dd</Set>
<Set name="LogTimeZone">GMT</Set>
<Set name="retainDays">90</Set>
diff --git a/juneau-examples/pom.xml b/juneau-examples/pom.xml
index c9124a8..3d4b675 100644
--- a/juneau-examples/pom.xml
+++ b/juneau-examples/pom.xml
@@ -33,6 +33,7 @@
<module>juneau-examples-rest</module>
<module>juneau-examples-rest-jetty</module>
<module>juneau-examples-rest-springboot</module>
+ <module>juneau-examples-rest-jetty-ftest</module>
</modules>
</project>
diff --git a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/Microservice.java b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/Microservice.java
index b160d1b..11a7778 100755
--- a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/Microservice.java
+++ b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/Microservice.java
@@ -19,6 +19,7 @@ import static org.apache.juneau.internal.ObjectUtils.*;
import java.io.*;
import java.net.*;
+import java.nio.file.Paths;
import java.text.*;
import java.util.*;
import java.util.concurrent.*;
@@ -124,6 +125,8 @@ public class Microservice implements ConfigEventListener {
private final Scanner consoleReader;
private final PrintWriter consoleWriter;
private final Thread consoleThread;
+ protected final File workingDir;
+ private final String configName;
//-----------------------------------------------------------------------------------------------------------------
// Properties set in init()
@@ -148,8 +151,9 @@ public class Microservice implements ConfigEventListener {
@SuppressWarnings("resource")
protected Microservice(MicroserviceBuilder builder) throws Exception {
setInstance(this);
-
this.builder = builder.copy();
+ this.workingDir = builder.workingDir;
+ this.configName = builder.configName;
this.args = builder.args != null ? builder.args : new Args(new String[0]);
@@ -161,7 +165,7 @@ public class Microservice implements ConfigEventListener {
Manifest m = new Manifest();
// If running within an eclipse workspace, need to get it from the file system.
- File f = new File("META-INF/MANIFEST.MF");
+ File f = resolveFile("META-INF/MANIFEST.MF");
if (f.exists() && f.canRead()) {
try (FileInputStream fis = new FileInputStream(f)) {
m.read(fis);
@@ -191,6 +195,7 @@ public class Microservice implements ConfigEventListener {
ConfigBuilder configBuilder = builder.configBuilder.varResolver(builder.varResolverBuilder.build()).store(ConfigMemoryStore.DEFAULT);
if (config == null) {
ConfigStore store = builder.configStore;
+ ConfigFileStore cfs = workingDir == null ? ConfigFileStore.DEFAULT : ConfigFileStore.create().directory(workingDir).build();
for (String name : getCandidateConfigNames()) {
if (store != null) {
if (store.exists(name)) {
@@ -198,8 +203,8 @@ public class Microservice implements ConfigEventListener {
break;
}
} else {
- if (ConfigFileStore.DEFAULT.exists(name)) {
- configBuilder.store(ConfigFileStore.DEFAULT).name(name);
+ if (cfs.exists(name)) {
+ configBuilder.store(cfs).name(name);
break;
}
if (ConfigClasspathStore.DEFAULT.exists(name)) {
@@ -278,6 +283,9 @@ public class Microservice implements ConfigEventListener {
}
private List<String> getCandidateConfigNames() {
+ if (configName != null)
+ return Collections.singletonList(configName);
+
Args args = getArgs();
if (getArgs().hasArg("configFile"))
return Collections.singletonList(args.getArg("configFile"));
@@ -289,6 +297,20 @@ public class Microservice implements ConfigEventListener {
return Config.getCandidateSystemDefaultConfigNames();
}
+ /**
+ * Resolves the specified path.
+ *
+ * <p>
+ * If the working directory has been explicitly specified, relative paths are resolved relative to that.
+ */
+ protected File resolveFile(String path) {
+ if (Paths.get(path).isAbsolute())
+ return new File(path);
+ if (workingDir != null)
+ return new File(workingDir, path);
+ return new File(path);
+ }
+
//-----------------------------------------------------------------------------------------------------------------
// Abstract lifecycle methods.
//-----------------------------------------------------------------------------------------------------------------
@@ -327,7 +349,10 @@ public class Microservice implements ConfigEventListener {
if (isNotEmpty(logFile)) {
String logDir = firstNonNull(logConfig.logDir, config.getString("Logging/logDir", "."));
- mkdirs(new File(logDir), false);
+ File logDirFile = resolveFile(logDir);
+ mkdirs(logDirFile, false);
+ logDir = logDirFile.getAbsolutePath();
+ System.setProperty("juneau.logDir", logDir);
boolean append = firstNonNull(logConfig.append, config.getBoolean("Logging/append"));
int limit = firstNonNull(logConfig.limit, config.getInt("Logging/limit", 1024*1024));
diff --git a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/MicroserviceBuilder.java b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/MicroserviceBuilder.java
index 45b4429..70911cb 100644
--- a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/MicroserviceBuilder.java
+++ b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/MicroserviceBuilder.java
@@ -13,6 +13,7 @@
package org.apache.juneau.microservice;
import java.io.*;
+import java.nio.file.Paths;
import java.util.*;
import java.util.jar.*;
import java.util.logging.*;
@@ -46,6 +47,7 @@ public class MicroserviceBuilder {
Scanner consoleReader;
PrintWriter consoleWriter;
MicroserviceListener listener;
+ File workingDir = System.getProperty("juneau.workingDir") == null ? null : new File(System.getProperty("juneau.workingDir"));
/**
* Constructor.
@@ -68,6 +70,7 @@ public class MicroserviceBuilder {
this.varResolverBuilder = copyFrom.varResolverBuilder;
this.consoleReader = copyFrom.consoleReader;
this.consoleWriter = copyFrom.consoleWriter;
+ this.workingDir = copyFrom.workingDir;
}
/**
@@ -166,7 +169,7 @@ public class MicroserviceBuilder {
else if (value instanceof File)
this.manifest = new ManifestFile((File)value);
else if (value instanceof String)
- this.manifest = new ManifestFile(new File((String)value));
+ this.manifest = new ManifestFile(resolveFile((String)value));
else if (value instanceof Class)
this.manifest = new ManifestFile((Class<?>)value);
else
@@ -377,6 +380,28 @@ public class MicroserviceBuilder {
}
/**
+ * Specifies the directory to use to resolve the config file and other paths defined with the config file.
+ *
+ * @param workingDir The working directory, or <jk>null</jk> to use the underlying working directory.
+ * @return This object (for method chaining).
+ */
+ public MicroserviceBuilder workingDir(File workingDir) {
+ this.workingDir = workingDir;
+ return this;
+ }
+
+ /**
+ * Specifies the directory to use to resolve the config file and other paths defined with the config file.
+ *
+ * @param workingDir The working directory, or <jk>null</jk> to use the underlying working directory.
+ * @return This object (for method chaining).
+ */
+ public MicroserviceBuilder workingDir(String workingDir) {
+ this.workingDir = new File(workingDir);
+ return this;
+ }
+
+ /**
* Registers an event listener for this microservice.
*
* @param listener An event listener for this microservice.
@@ -386,4 +411,18 @@ public class MicroserviceBuilder {
this.listener = listener;
return this;
}
+
+ /**
+ * Resolves the specified path.
+ *
+ * <p>
+ * If the working directory has been explicitly specified, relative paths are resolved relative to that.
+ */
+ protected File resolveFile(String path) {
+ if (Paths.get(path).isAbsolute())
+ return new File(path);
+ if (workingDir != null)
+ return new File(workingDir, path);
+ return new File(path);
+ }
}
diff --git a/juneau-core/juneau-core-test/.gitignore b/juneau-microservice/juneau-microservice-ftest/.gitignore
similarity index 100%
rename from juneau-core/juneau-core-test/.gitignore
rename to juneau-microservice/juneau-microservice-ftest/.gitignore
diff --git a/juneau-microservice/juneau-microservice-test/.project b/juneau-microservice/juneau-microservice-ftest/.project
similarity index 92%
copy from juneau-microservice/juneau-microservice-test/.project
copy to juneau-microservice/juneau-microservice-ftest/.project
index 5fb0d4c..891bfa3 100644
--- a/juneau-microservice/juneau-microservice-test/.project
+++ b/juneau-microservice/juneau-microservice-ftest/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>juneau-microservice-test</name>
+ <name>juneau-microservice-ftest</name>
<comment></comment>
<projects>
</projects>
diff --git a/juneau-microservice/juneau-microservice-test/files/jetty.xml b/juneau-microservice/juneau-microservice-ftest/files/jetty.xml
similarity index 100%
rename from juneau-microservice/juneau-microservice-test/files/jetty.xml
rename to juneau-microservice/juneau-microservice-ftest/files/jetty.xml
diff --git a/juneau-microservice/juneau-microservice-test/juneau-microservice-test.cfg b/juneau-microservice/juneau-microservice-ftest/juneau-microservice-test.cfg
similarity index 100%
rename from juneau-microservice/juneau-microservice-test/juneau-microservice-test.cfg
rename to juneau-microservice/juneau-microservice-ftest/juneau-microservice-test.cfg
diff --git a/juneau-microservice/juneau-microservice-ftest/juneau-microservice-test.launch b/juneau-microservice/juneau-microservice-ftest/juneau-microservice-test.launch
new file mode 100644
index 0000000..76eaafc
--- /dev/null
+++ b/juneau-microservice/juneau-microservice-ftest/juneau-microservice-test.launch
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
+ <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+ <listEntry value="/juneau-microservice-ftest"/>
+ </listAttribute>
+ <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+ <listEntry value="4"/>
+ </listAttribute>
+ <booleanAttribute key="org.eclipse.jdt.debug.ui.CONSIDER_INHERITED_MAIN" value="true"/>
+ <booleanAttribute key="org.eclipse.jdt.debug.ui.INCLUDE_EXTERNAL_JARS" value="true"/>
+ <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+ <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.juneau.microservice.jetty.JettyMicroservice"/>
+ <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="juneau-microservice-test.cfg"/>
+ <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="juneau-microservice-ftest"/>
+</launchConfiguration>
diff --git a/juneau-microservice/juneau-microservice-test/pom.xml b/juneau-microservice/juneau-microservice-ftest/pom.xml
similarity index 92%
copy from juneau-microservice/juneau-microservice-test/pom.xml
copy to juneau-microservice/juneau-microservice-ftest/pom.xml
index 24f3fa5..9c45dc5 100644
--- a/juneau-microservice/juneau-microservice-test/pom.xml
+++ b/juneau-microservice/juneau-microservice-ftest/pom.xml
@@ -23,8 +23,8 @@
<version>8.0.1-SNAPSHOT</version>
</parent>
- <artifactId>juneau-microservice-test</artifactId>
- <name>Apache Juneau Microservice Tests</name>
+ <artifactId>juneau-microservice-ftest</artifactId>
+ <name>Apache Juneau Microservice (Function Tests)</name>
<description>Tests for Juneau Client/Server/Microservice.</description>
<properties>
@@ -48,6 +48,11 @@
</dependency>
<dependency>
<groupId>org.apache.juneau</groupId>
+ <artifactId>juneau-rest-mock-utest</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.juneau</groupId>
<artifactId>juneau-rest-mock</artifactId>
<version>${project.version}</version>
</dependency>
@@ -79,13 +84,13 @@
</dependency>
<dependency>
<groupId>org.apache.juneau</groupId>
- <artifactId>juneau-core-test</artifactId>
+ <artifactId>juneau-core-utest</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.juneau</groupId>
- <artifactId>juneau-rest-mock</artifactId>
+ <artifactId>juneau-rest-mock-utest</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
diff --git a/juneau-microservice/juneau-microservice-test/src/main/resources/org/apache/juneau/rest/test/HtmlPropertiesResource.properties b/juneau-microservice/juneau-microservice-ftest/src/main/resources/org/apache/juneau/rest/test/HtmlPropertiesResource.properties
similarity index 100%
rename from juneau-microservice/juneau-microservice-test/src/main/resources/org/apache/juneau/rest/test/HtmlPropertiesResource.properties
rename to juneau-microservice/juneau-microservice-ftest/src/main/resources/org/apache/juneau/rest/test/HtmlPropertiesResource.properties
diff --git a/juneau-microservice/juneau-microservice-test/src/main/resources/org/apache/juneau/rest/test/ParamsResource.properties b/juneau-microservice/juneau-microservice-ftest/src/main/resources/org/apache/juneau/rest/test/ParamsResource.properties
similarity index 100%
rename from juneau-microservice/juneau-microservice-test/src/main/resources/org/apache/juneau/rest/test/ParamsResource.properties
rename to juneau-microservice/juneau-microservice-ftest/src/main/resources/org/apache/juneau/rest/test/ParamsResource.properties
diff --git a/juneau-microservice/juneau-microservice-test/src/main/resources/org/apache/juneau/rest/test/ParamsResource_ja_JP.properties b/juneau-microservice/juneau-microservice-ftest/src/main/resources/org/apache/juneau/rest/test/ParamsResource_ja_JP.properties
similarity index 100%
rename from juneau-microservice/juneau-microservice-test/src/main/resources/org/apache/juneau/rest/test/ParamsResource_ja_JP.properties
rename to juneau-microservice/juneau-microservice-ftest/src/main/resources/org/apache/juneau/rest/test/ParamsResource_ja_JP.properties
diff --git a/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/microservice/testutils/TestUtils.java b/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/microservice/testutils/TestUtils.java
similarity index 100%
rename from juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/microservice/testutils/TestUtils.java
rename to juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/microservice/testutils/TestUtils.java
diff --git a/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/ConfigResource.java b/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/ConfigResource.java
similarity index 100%
rename from juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/ConfigResource.java
rename to juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/ConfigResource.java
diff --git a/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/ConfigTest.java b/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/ConfigTest.java
similarity index 100%
rename from juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/ConfigTest.java
rename to juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/ConfigTest.java
diff --git a/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/LargePojosResource.java b/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/LargePojosResource.java
similarity index 100%
rename from juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/LargePojosResource.java
rename to juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/LargePojosResource.java
diff --git a/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/MockRestTest.java b/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/MockRestTest.java
similarity index 100%
rename from juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/MockRestTest.java
rename to juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/MockRestTest.java
diff --git a/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/RestTestcase.java b/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/RestTestcase.java
similarity index 100%
rename from juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/RestTestcase.java
rename to juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/RestTestcase.java
diff --git a/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/Root.java b/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/Root.java
similarity index 100%
rename from juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/Root.java
rename to juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/Root.java
diff --git a/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/TestMicroservice.java b/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/TestMicroservice.java
similarity index 100%
rename from juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/TestMicroservice.java
rename to juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/TestMicroservice.java
diff --git a/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/_TestSuite.java b/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/_TestSuite.java
similarity index 100%
rename from juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/_TestSuite.java
rename to juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/_TestSuite.java
diff --git a/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/client/CallbackStringsTest.java b/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/client/CallbackStringsTest.java
similarity index 100%
rename from juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/client/CallbackStringsTest.java
rename to juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/client/CallbackStringsTest.java
diff --git a/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/client/ClientFuturesTest.java b/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/client/ClientFuturesTest.java
similarity index 100%
rename from juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/client/ClientFuturesTest.java
rename to juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/client/ClientFuturesTest.java
diff --git a/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/client/FormDataTest.java b/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/client/FormDataTest.java
similarity index 100%
rename from juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/client/FormDataTest.java
rename to juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/client/FormDataTest.java
diff --git a/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/client/InterfaceProxyTest.java b/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/client/InterfaceProxyTest.java
similarity index 100%
rename from juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/client/InterfaceProxyTest.java
rename to juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/client/InterfaceProxyTest.java
diff --git a/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/client/RequestBeanProxyTest.java b/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/client/RequestBeanProxyTest.java
similarity index 100%
rename from juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/client/RequestBeanProxyTest.java
rename to juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/client/RequestBeanProxyTest.java
diff --git a/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/client/RestClientResource.java b/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/client/RestClientResource.java
similarity index 100%
rename from juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/client/RestClientResource.java
rename to juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/client/RestClientResource.java
diff --git a/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/client/RestClientTest.java b/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/client/RestClientTest.java
similarity index 100%
rename from juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/client/RestClientTest.java
rename to juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/client/RestClientTest.java
diff --git a/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyResource.java b/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyResource.java
similarity index 100%
rename from juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyResource.java
rename to juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyResource.java
diff --git a/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyTest.java b/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyTest.java
similarity index 100%
rename from juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyTest.java
rename to juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyTest.java
diff --git a/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyMicroserviceBuilder.java b/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyMicroserviceBuilder.java
index 62df13e..11c681d 100644
--- a/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyMicroserviceBuilder.java
+++ b/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyMicroserviceBuilder.java
@@ -108,7 +108,7 @@ public class JettyMicroserviceBuilder extends MicroserviceBuilder {
*/
public JettyMicroserviceBuilder jettyXml(Object jettyXml, boolean resolveVars) throws IOException {
if (jettyXml instanceof String)
- this.jettyXml = IOUtils.read(new File(jettyXml.toString()));
+ this.jettyXml = IOUtils.read(resolveFile(jettyXml.toString()));
else if (jettyXml instanceof File)
this.jettyXml = IOUtils.read((File)jettyXml);
else if (jettyXml instanceof InputStream)
@@ -279,7 +279,6 @@ public class JettyMicroserviceBuilder extends MicroserviceBuilder {
return this;
}
-
@Override /* MicroserviceBuilder */
public JettyMicroserviceBuilder logConfig(LogConfig logConfig) {
return this;
@@ -334,6 +333,18 @@ public class JettyMicroserviceBuilder extends MicroserviceBuilder {
return this;
}
+ @Override /* MicroserviceBuilder */
+ public JettyMicroserviceBuilder workingDir(File path) {
+ super.workingDir(path);
+ return this;
+ }
+
+ @Override /* MicroserviceBuilder */
+ public JettyMicroserviceBuilder workingDir(String path) {
+ super.workingDir(path);
+ return this;
+ }
+
/**
* Registers an event listener for this microservice.
*
diff --git a/juneau-microservice/juneau-microservice-test/.classpath b/juneau-microservice/juneau-microservice-test/.classpath
deleted file mode 100644
index 1646965..0000000
--- a/juneau-microservice/juneau-microservice-test/.classpath
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" output="target/test-classes" path="src/test/java">
- <attributes>
- <attribute name="optional" value="true"/>
- <attribute name="maven.pomderived" value="true"/>
- <attribute name="test" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="src" output="target/classes" path="src/main/java">
- <attributes>
- <attribute name="optional" value="true"/>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
- <attributes>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
- <attributes>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
- <attributes>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/juneau-microservice/juneau-microservice-test/.settings/org.eclipse.core.resources.prefs b/juneau-microservice/juneau-microservice-test/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 839d647..0000000
--- a/juneau-microservice/juneau-microservice-test/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
-encoding/<project>=UTF-8
diff --git a/juneau-microservice/juneau-microservice-test/.settings/org.eclipse.jdt.core.prefs b/juneau-microservice/juneau-microservice-test/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index bb79aba..0000000
--- a/juneau-microservice/juneau-microservice-test/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,319 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.methodParameters=generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.8
-org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0
-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
-org.eclipse.jdt.core.formatter.alignment_for_module_statements=16
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_type_arguments=0
-org.eclipse.jdt.core.formatter.alignment_for_type_parameters=0
-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
-org.eclipse.jdt.core.formatter.comment.line_length=200
-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=1
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1
-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
-org.eclipse.jdt.core.formatter.indentation.size=3
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=true
-org.eclipse.jdt.core.formatter.join_wrapped_lines=true
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=200
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_on_off_tags=false
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
-org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter
diff --git a/juneau-microservice/juneau-microservice-test/.settings/org.eclipse.jdt.ui.prefs b/juneau-microservice/juneau-microservice-test/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 7e24f3a..0000000
--- a/juneau-microservice/juneau-microservice-test/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,68 +0,0 @@
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_methods=false
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_missing_override_annotations_interface_methods=true
-cleanup.add_serial_version_id=false
-cleanup.always_use_blocks=false
-cleanup.always_use_parentheses_in_expressions=false
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_functional_interfaces=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=false
-cleanup.format_source_code=false
-cleanup.format_source_code_changes_only=false
-cleanup.insert_inferred_type_arguments=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=false
-cleanup.never_use_blocks=true
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=false
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=false
-cleanup.qualify_static_member_accesses_with_declaring_class=false
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_redundant_type_arguments=true
-cleanup.remove_trailing_whitespaces=true
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=true
-cleanup.remove_unnecessary_nls_tags=true
-cleanup.remove_unused_imports=false
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_anonymous_class_creation=false
-cleanup.use_blocks=false
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_lambda=true
-cleanup.use_parentheses_in_expressions=false
-cleanup.use_this_for_non_static_field_access=false
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=false
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup.use_type_arguments=false
-cleanup_profile=_juneau-cleanup-rules
-cleanup_settings_version=2
-eclipse.preferences.version=1
-formatter_profile=_juneau-formatter-rules
-formatter_settings_version=13
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;com;
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.ondemandthreshold=1
-org.eclipse.jdt.ui.staticondemandthreshold=1
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="false" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * Bean property getter\: <property>${bare_field_name}</property>.\n *\n * @return The value of the <property>${bare_field_name}</prop [...]
diff --git a/juneau-microservice/juneau-microservice-test/juneau-microservice-test.launch b/juneau-microservice/juneau-microservice-test/juneau-microservice-test.launch
index 55fc1a5..d42cc79 100644
--- a/juneau-microservice/juneau-microservice-test/juneau-microservice-test.launch
+++ b/juneau-microservice/juneau-microservice-test/juneau-microservice-test.launch
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/juneau-microservice-test"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="4"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.jdt.debug.ui.CONSIDER_INHERITED_MAIN" value="true"/>
-<booleanAttribute key="org.eclipse.jdt.debug.ui.INCLUDE_EXTERNAL_JARS" value="true"/>
-<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.juneau.microservice.jetty.JettyMicroservice"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="juneau-microservice-test.cfg"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="juneau-microservice-test"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
+ <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+ <listEntry value="/juneau-microservice-ftest"/>
+ </listAttribute>
+ <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+ <listEntry value="4"/>
+ </listAttribute>
+ <booleanAttribute key="org.eclipse.jdt.debug.ui.CONSIDER_INHERITED_MAIN" value="true"/>
+ <booleanAttribute key="org.eclipse.jdt.debug.ui.INCLUDE_EXTERNAL_JARS" value="true"/>
+ <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+ <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
+ <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.juneau.microservice.jetty.JettyMicroservice"/>
+ <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="juneau-microservice-test.cfg"/>
+ <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="juneau-microservice-ftest"/>
+ <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
</launchConfiguration>
diff --git a/juneau-microservice/pom.xml b/juneau-microservice/pom.xml
index 29854d9..2bd0ca9 100644
--- a/juneau-microservice/pom.xml
+++ b/juneau-microservice/pom.xml
@@ -32,7 +32,7 @@
<module>juneau-microservice-core</module>
<module>juneau-microservice-jetty</module>
<module>juneau-my-jetty-microservice</module>
- <module>juneau-microservice-test</module>
+ <module>juneau-microservice-ftest</module>
<module>juneau-my-springboot-microservice</module>
</modules>
diff --git a/juneau-rest/.DS_Store b/juneau-rest/.DS_Store
index 739516e..ad464fd 100644
Binary files a/juneau-rest/.DS_Store and b/juneau-rest/.DS_Store differ
diff --git a/juneau-rest/juneau-rest-client-test/.classpath b/juneau-rest/juneau-rest-client-test/.classpath
deleted file mode 100644
index 319cf5d..0000000
--- a/juneau-rest/juneau-rest-client-test/.classpath
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" output="target/test-classes" path="src/test/java">
- <attributes>
- <attribute name="optional" value="true"/>
- <attribute name="maven.pomderived" value="true"/>
- <attribute name="test" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
- <attributes>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
- <attributes>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="src" output="target/classes" path="src/main/java">
- <attributes>
- <attribute name="optional" value="true"/>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/juneau-rest/juneau-rest-client-test/pom.xml b/juneau-rest/juneau-rest-client-test/pom.xml
deleted file mode 100644
index 201001b..0000000
--- a/juneau-rest/juneau-rest-client-test/pom.xml
+++ /dev/null
@@ -1,196 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ***************************************************************************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file *
- * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file *
- * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance *
- * with the License. You may obtain a copy of the License at *
- * *
- * http://www.apache.org/licenses/LICENSE-2.0 *
- * *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the *
- * specific language governing permissions and limitations under the License. *
- ***************************************************************************************************************************
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.juneau</groupId>
- <artifactId>juneau-rest</artifactId>
- <version>8.0.1-SNAPSHOT</version>
- </parent>
-
- <artifactId>juneau-rest-client-test</artifactId>
- <name>Apache Juneau REST Client API - Tests</name>
- <description>REST client API - Tests</description>
- <packaging>bundle</packaging>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.juneau</groupId>
- <artifactId>juneau-marshall</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>javax.activation-api</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.activation</groupId>
- <artifactId>javax.activation</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.juneau</groupId>
- <artifactId>juneau-rest-mock</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.juneau</groupId>
- <artifactId>juneau-core-test</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.juneau</groupId>
- <artifactId>juneau-rest-mock</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <properties>
- <!-- Skip javadoc generation since we generate them in the aggregate pom -->
- <maven.javadoc.skip>true</maven.javadoc.skip>
-
- <maven.compiler.source>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>3.2.0</version>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Automatic-Module-Name>org.apache.juneau.rest.client</Automatic-Module-Name>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-sources</id>
- <phase>verify</phase>
- <goals>
- <goal>jar-no-fork</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>**/*Test.class</include>
- </includes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <version>0.8.2</version>
- <executions>
- <execution>
- <id>default-prepare-agent</id>
- <goals>
- <goal>prepare-agent</goal>
- </goals>
- </execution>
- <execution>
- <id>default-report</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>report</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <!--plugin>
- <groupId>com.github.siom79.japicmp</groupId>
- <artifactId>japicmp-maven-plugin</artifactId>
- <version>0.13.0</version>
- <configuration>
- <oldVersion>
- <dependency>
- <groupId>org.apache.juneau</groupId>
- <artifactId>${project.artifactId}</artifactId>
- <version>${juneau.compare.version}</version>
- <type>jar</type>
- </dependency>
- </oldVersion>
- <newVersion>
- <file>
- <path>${project.build.directory}/${project.artifactId}-${project.version}.jar</path>
- </file>
- </newVersion>
- <parameter>
- <onlyModified>true</onlyModified>
- <accessModifier>public</accessModifier>
- <excludes>
- </excludes>
- <ignoreMissingClasses>true</ignoreMissingClasses>
- <onlyBinaryIncompatible>true</onlyBinaryIncompatible>
- <breakBuildOnBinaryIncompatibleModifications>true</breakBuildOnBinaryIncompatibleModifications>
- <breakBuildIfCausedByExclusion>false</breakBuildIfCausedByExclusion>
- <breakBuildBasedOnSemanticVersioning>true</breakBuildBasedOnSemanticVersioning>
- <overrideCompatibilityChangeParameters>
- <overrideCompatibilityChangeParameter>
- <binaryCompatible>true</binaryCompatible>
- <compatibilityChange>SUPERCLASS_REMOVED</compatibilityChange>
- <sourceCompatible>true</sourceCompatible>
- </overrideCompatibilityChangeParameter>
- <overrideCompatibilityChangeParameter>
- <binaryCompatible>true</binaryCompatible>
- <compatibilityChange>FIELD_REMOVED_IN_SUPERCLASS</compatibilityChange>
- <sourceCompatible>true</sourceCompatible>
- </overrideCompatibilityChangeParameter>
- </overrideCompatibilityChangeParameters>
- </parameter>
- </configuration>
- <executions>
- <execution>
- <phase>verify</phase>
- <goals>
- <goal>cmp</goal>
- </goals>
- </execution>
- </executions>
- </plugin-->
- </plugins>
- </build>
-</project>
diff --git a/juneau-rest/juneau-rest-server-test/.gitignore b/juneau-rest/juneau-rest-client-utest/.gitignore
similarity index 100%
rename from juneau-rest/juneau-rest-server-test/.gitignore
rename to juneau-rest/juneau-rest-client-utest/.gitignore
diff --git a/juneau-microservice/juneau-microservice-test/.project b/juneau-rest/juneau-rest-client-utest/.project
similarity index 92%
copy from juneau-microservice/juneau-microservice-test/.project
copy to juneau-rest/juneau-rest-client-utest/.project
index 5fb0d4c..b762f14 100644
--- a/juneau-microservice/juneau-microservice-test/.project
+++ b/juneau-rest/juneau-rest-client-utest/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>juneau-microservice-test</name>
+ <name>juneau-rest-client-utest</name>
<comment></comment>
<projects>
</projects>
diff --git a/juneau-microservice/juneau-microservice-test/pom.xml b/juneau-rest/juneau-rest-client-utest/pom.xml
similarity index 84%
rename from juneau-microservice/juneau-microservice-test/pom.xml
rename to juneau-rest/juneau-rest-client-utest/pom.xml
index 24f3fa5..d57a5e7 100644
--- a/juneau-microservice/juneau-microservice-test/pom.xml
+++ b/juneau-rest/juneau-rest-client-utest/pom.xml
@@ -19,78 +19,73 @@
<parent>
<groupId>org.apache.juneau</groupId>
- <artifactId>juneau-microservice</artifactId>
+ <artifactId>juneau-rest</artifactId>
<version>8.0.1-SNAPSHOT</version>
</parent>
- <artifactId>juneau-microservice-test</artifactId>
- <name>Apache Juneau Microservice Tests</name>
- <description>Tests for Juneau Client/Server/Microservice.</description>
-
- <properties>
- <maven.javadoc.skip>true</maven.javadoc.skip>
-
- <!-- Java 8 required because Jetty requires it. -->
- <maven.compiler.source>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target>
- </properties>
+ <artifactId>juneau-rest-client-utest</artifactId>
+ <name>Apache Juneau REST Client API (Unit Tests)</name>
+ <description>REST client API - Tests</description>
<dependencies>
<dependency>
<groupId>org.apache.juneau</groupId>
- <artifactId>juneau-examples-rest</artifactId>
+ <artifactId>juneau-marshall</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.juneau</groupId>
- <artifactId>juneau-rest-server-jaxrs</artifactId>
- <version>${project.version}</version>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.juneau</groupId>
- <artifactId>juneau-rest-mock</artifactId>
- <version>${project.version}</version>
+ <groupId>javax.activation</groupId>
+ <artifactId>javax.activation-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.juneau</groupId>
- <artifactId>juneau-marshall-rdf</artifactId>
- <version>${project.version}</version>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>javax.activation</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>jsr311-api</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
</dependency>
<dependency>
- <groupId>javax.activation</groupId>
- <artifactId>javax.activation-api</artifactId>
+ <groupId>org.apache.juneau</groupId>
+ <artifactId>juneau-rest-mock</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>com.sun.activation</groupId>
- <artifactId>javax.activation</artifactId>
+ <groupId>org.apache.juneau</groupId>
+ <artifactId>juneau-core-utest</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.juneau</groupId>
- <artifactId>juneau-core-test</artifactId>
+ <artifactId>juneau-rest-mock</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.juneau</groupId>
- <artifactId>juneau-rest-mock</artifactId>
+ <artifactId>juneau-rest-mock-utest</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ </dependency>
</dependencies>
-
+
+ <properties>
+ <!-- Skip javadoc generation since we generate them in the aggregate pom -->
+ <maven.javadoc.skip>true</maven.javadoc.skip>
+
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
+ </properties>
+
<build>
<plugins>
<plugin>
@@ -98,9 +93,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<includes>
- <include>
- **/_TestSuite.java
- </include>
+ <include>**/*Test.class</include>
</includes>
</configuration>
</plugin>
diff --git a/juneau-rest/juneau-rest-client-test/src/test/java/org/apache/juneau/rest/client/remote/BodyAnnotationTest.java b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/remote/BodyAnnotationTest.java
similarity index 100%
rename from juneau-rest/juneau-rest-client-test/src/test/java/org/apache/juneau/rest/client/remote/BodyAnnotationTest.java
rename to juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/remote/BodyAnnotationTest.java
diff --git a/juneau-rest/juneau-rest-client-test/src/test/java/org/apache/juneau/rest/client/remote/EndToEndInterfaceTest.java b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/remote/EndToEndInterfaceTest.java
similarity index 100%
rename from juneau-rest/juneau-rest-client-test/src/test/java/org/apache/juneau/rest/client/remote/EndToEndInterfaceTest.java
rename to juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/remote/EndToEndInterfaceTest.java
diff --git a/juneau-rest/juneau-rest-client-test/src/test/java/org/apache/juneau/rest/client/remote/FormDataAnnotationTest.java b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/remote/FormDataAnnotationTest.java
similarity index 100%
rename from juneau-rest/juneau-rest-client-test/src/test/java/org/apache/juneau/rest/client/remote/FormDataAnnotationTest.java
rename to juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/remote/FormDataAnnotationTest.java
diff --git a/juneau-rest/juneau-rest-client-test/src/test/java/org/apache/juneau/rest/client/remote/HeaderAnnotationTest.java b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/remote/HeaderAnnotationTest.java
similarity index 100%
rename from juneau-rest/juneau-rest-client-test/src/test/java/org/apache/juneau/rest/client/remote/HeaderAnnotationTest.java
rename to juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/remote/HeaderAnnotationTest.java
diff --git a/juneau-rest/juneau-rest-client-test/src/test/java/org/apache/juneau/rest/client/remote/PathAnnotationTest.java b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/remote/PathAnnotationTest.java
similarity index 100%
rename from juneau-rest/juneau-rest-client-test/src/test/java/org/apache/juneau/rest/client/remote/PathAnnotationTest.java
rename to juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/remote/PathAnnotationTest.java
diff --git a/juneau-rest/juneau-rest-client-test/src/test/java/org/apache/juneau/rest/client/remote/QueryAnnotationTest.java b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/remote/QueryAnnotationTest.java
similarity index 100%
rename from juneau-rest/juneau-rest-client-test/src/test/java/org/apache/juneau/rest/client/remote/QueryAnnotationTest.java
rename to juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/remote/QueryAnnotationTest.java
diff --git a/juneau-rest/juneau-rest-client-test/src/test/java/org/apache/juneau/rest/client/remote/RemoteMethodAnnotationTest.java b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/remote/RemoteMethodAnnotationTest.java
similarity index 100%
rename from juneau-rest/juneau-rest-client-test/src/test/java/org/apache/juneau/rest/client/remote/RemoteMethodAnnotationTest.java
rename to juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/remote/RemoteMethodAnnotationTest.java
diff --git a/juneau-rest/juneau-rest-client-test/src/test/java/org/apache/juneau/rest/client/remote/RemoteResourceAnnotationTest.java b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/remote/RemoteResourceAnnotationTest.java
similarity index 100%
rename from juneau-rest/juneau-rest-client-test/src/test/java/org/apache/juneau/rest/client/remote/RemoteResourceAnnotationTest.java
rename to juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/remote/RemoteResourceAnnotationTest.java
diff --git a/juneau-rest/juneau-rest-client-test/src/test/java/org/apache/juneau/rest/client/remote/RequestAnnotationTest.java b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/remote/RequestAnnotationTest.java
similarity index 100%
rename from juneau-rest/juneau-rest-client-test/src/test/java/org/apache/juneau/rest/client/remote/RequestAnnotationTest.java
rename to juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/remote/RequestAnnotationTest.java
diff --git a/juneau-rest/juneau-rest-client-test/src/test/java/org/apache/juneau/rest/client/remote/ResponseAnnotationTest.java b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/remote/ResponseAnnotationTest.java
similarity index 100%
rename from juneau-rest/juneau-rest-client-test/src/test/java/org/apache/juneau/rest/client/remote/ResponseAnnotationTest.java
rename to juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/remote/ResponseAnnotationTest.java
diff --git a/juneau-rest/juneau-rest-client/pom.xml b/juneau-rest/juneau-rest-client/pom.xml
index f68e05d..b5078cf 100644
--- a/juneau-rest/juneau-rest-client/pom.xml
+++ b/juneau-rest/juneau-rest-client/pom.xml
@@ -47,34 +47,10 @@
<artifactId>javax.activation</artifactId>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.juneau</groupId>
- <artifactId>juneau-core-test</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.juneau</groupId>
<artifactId>juneau-rest-server</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.juneau</groupId>
- <artifactId>juneau-rest-server</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<properties>
diff --git a/juneau-rest/juneau-rest-mock-utest/.gitignore b/juneau-rest/juneau-rest-mock-utest/.gitignore
new file mode 100644
index 0000000..ae3c172
--- /dev/null
+++ b/juneau-rest/juneau-rest-mock-utest/.gitignore
@@ -0,0 +1 @@
+/bin/
diff --git a/juneau-rest/juneau-rest-server-test/.project b/juneau-rest/juneau-rest-mock-utest/.project
similarity index 94%
rename from juneau-rest/juneau-rest-server-test/.project
rename to juneau-rest/juneau-rest-mock-utest/.project
index cdf338d..b7ed1cb 100644
--- a/juneau-rest/juneau-rest-server-test/.project
+++ b/juneau-rest/juneau-rest-mock-utest/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>juneau-rest-server</name>
+ <name>juneau-rest-mock</name>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
diff --git a/juneau-rest/juneau-rest-server-rdf/pom.xml b/juneau-rest/juneau-rest-mock-utest/pom.xml
similarity index 83%
copy from juneau-rest/juneau-rest-server-rdf/pom.xml
copy to juneau-rest/juneau-rest-mock-utest/pom.xml
index 25ad2fb..a1d25b6 100644
--- a/juneau-rest/juneau-rest-server-rdf/pom.xml
+++ b/juneau-rest/juneau-rest-mock-utest/pom.xml
@@ -23,38 +23,30 @@
<version>8.0.1-SNAPSHOT</version>
</parent>
- <artifactId>juneau-rest-server-rdf</artifactId>
- <name>Apache Juneau REST Servlet API, RDF support</name>
- <description>REST servlet API, RDF support</description>
+ <artifactId>juneau-rest-mock-utest</artifactId>
+ <name>Apache Juneau REST Mock API (Unit Tests)</name>
+ <description>REST mock API Tests</description>
<packaging>bundle</packaging>
<dependencies>
<dependency>
<groupId>org.apache.juneau</groupId>
- <artifactId>juneau-rest-server</artifactId>
+ <artifactId>juneau-rest-mock</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.juneau</groupId>
- <artifactId>juneau-marshall-rdf</artifactId>
- <version>${project.version}</version>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.juneau</groupId>
- <artifactId>juneau-core-test</artifactId>
+ <artifactId>juneau-core-utest</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
</dependency>
</dependencies>
@@ -69,6 +61,17 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>3.2.0</version>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Automatic-Module-Name>org.apache.juneau.rest.mock.utest</Automatic-Module-Name>
+ </instructions>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
@@ -82,15 +85,15 @@
</executions>
</plugin>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>3.2.0</version>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Automatic-Module-Name>org.apache.juneau.rest.server.rdf</Automatic-Module-Name>
- </instructions>
- </configuration>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -102,12 +105,21 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <version>0.8.2</version>
<executions>
<execution>
+ <id>default-prepare-agent</id>
<goals>
- <goal>test-jar</goal>
+ <goal>prepare-agent</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>default-report</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>report</goal>
</goals>
</execution>
</executions>
diff --git a/juneau-rest/juneau-rest-mock/src/test/java/org/apache/juneau/rest/testutils/ABean.java b/juneau-rest/juneau-rest-mock-utest/src/test/java/org/apache/juneau/rest/testutils/ABean.java
similarity index 100%
rename from juneau-rest/juneau-rest-mock/src/test/java/org/apache/juneau/rest/testutils/ABean.java
rename to juneau-rest/juneau-rest-mock-utest/src/test/java/org/apache/juneau/rest/testutils/ABean.java
diff --git a/juneau-rest/juneau-rest-mock/src/test/java/org/apache/juneau/rest/testutils/Constants.java b/juneau-rest/juneau-rest-mock-utest/src/test/java/org/apache/juneau/rest/testutils/Constants.java
similarity index 100%
rename from juneau-rest/juneau-rest-mock/src/test/java/org/apache/juneau/rest/testutils/Constants.java
rename to juneau-rest/juneau-rest-mock-utest/src/test/java/org/apache/juneau/rest/testutils/Constants.java
diff --git a/juneau-rest/juneau-rest-mock/src/test/java/org/apache/juneau/rest/testutils/DTOs.java b/juneau-rest/juneau-rest-mock-utest/src/test/java/org/apache/juneau/rest/testutils/DTOs.java
similarity index 100%
rename from juneau-rest/juneau-rest-mock/src/test/java/org/apache/juneau/rest/testutils/DTOs.java
rename to juneau-rest/juneau-rest-mock-utest/src/test/java/org/apache/juneau/rest/testutils/DTOs.java
diff --git a/juneau-rest/juneau-rest-mock/src/test/java/org/apache/juneau/rest/testutils/ImplicitSwappedPojo.java b/juneau-rest/juneau-rest-mock-utest/src/test/java/org/apache/juneau/rest/testutils/ImplicitSwappedPojo.java
similarity index 100%
rename from juneau-rest/juneau-rest-mock/src/test/java/org/apache/juneau/rest/testutils/ImplicitSwappedPojo.java
rename to juneau-rest/juneau-rest-mock-utest/src/test/java/org/apache/juneau/rest/testutils/ImplicitSwappedPojo.java
diff --git a/juneau-rest/juneau-rest-mock/src/test/java/org/apache/juneau/rest/testutils/SwappedPojo.java b/juneau-rest/juneau-rest-mock-utest/src/test/java/org/apache/juneau/rest/testutils/SwappedPojo.java
similarity index 100%
rename from juneau-rest/juneau-rest-mock/src/test/java/org/apache/juneau/rest/testutils/SwappedPojo.java
rename to juneau-rest/juneau-rest-mock-utest/src/test/java/org/apache/juneau/rest/testutils/SwappedPojo.java
diff --git a/juneau-rest/juneau-rest-mock/src/test/java/org/apache/juneau/rest/testutils/SwappedPojoSwap.java b/juneau-rest/juneau-rest-mock-utest/src/test/java/org/apache/juneau/rest/testutils/SwappedPojoSwap.java
similarity index 100%
rename from juneau-rest/juneau-rest-mock/src/test/java/org/apache/juneau/rest/testutils/SwappedPojoSwap.java
rename to juneau-rest/juneau-rest-mock-utest/src/test/java/org/apache/juneau/rest/testutils/SwappedPojoSwap.java
diff --git a/juneau-rest/juneau-rest-mock/src/test/java/org/apache/juneau/rest/testutils/TestEnum.java b/juneau-rest/juneau-rest-mock-utest/src/test/java/org/apache/juneau/rest/testutils/TestEnum.java
similarity index 100%
rename from juneau-rest/juneau-rest-mock/src/test/java/org/apache/juneau/rest/testutils/TestEnum.java
rename to juneau-rest/juneau-rest-mock-utest/src/test/java/org/apache/juneau/rest/testutils/TestEnum.java
diff --git a/juneau-rest/juneau-rest-mock/src/test/java/org/apache/juneau/rest/testutils/TestUtils.java b/juneau-rest/juneau-rest-mock-utest/src/test/java/org/apache/juneau/rest/testutils/TestUtils.java
similarity index 100%
rename from juneau-rest/juneau-rest-mock/src/test/java/org/apache/juneau/rest/testutils/TestUtils.java
rename to juneau-rest/juneau-rest-mock-utest/src/test/java/org/apache/juneau/rest/testutils/TestUtils.java
diff --git a/juneau-rest/juneau-rest-mock/src/test/java/org/apache/juneau/rest/testutils/TypedBean.java b/juneau-rest/juneau-rest-mock-utest/src/test/java/org/apache/juneau/rest/testutils/TypedBean.java
similarity index 100%
rename from juneau-rest/juneau-rest-mock/src/test/java/org/apache/juneau/rest/testutils/TypedBean.java
rename to juneau-rest/juneau-rest-mock-utest/src/test/java/org/apache/juneau/rest/testutils/TypedBean.java
diff --git a/juneau-rest/juneau-rest-mock/src/test/java/org/apache/juneau/rest/testutils/TypedBeanImpl.java b/juneau-rest/juneau-rest-mock-utest/src/test/java/org/apache/juneau/rest/testutils/TypedBeanImpl.java
similarity index 100%
rename from juneau-rest/juneau-rest-mock/src/test/java/org/apache/juneau/rest/testutils/TypedBeanImpl.java
rename to juneau-rest/juneau-rest-mock-utest/src/test/java/org/apache/juneau/rest/testutils/TypedBeanImpl.java
diff --git a/juneau-rest/juneau-rest-mock/src/test/java/org/apache/juneau/rest/testutils/XPartSerializer.java b/juneau-rest/juneau-rest-mock-utest/src/test/java/org/apache/juneau/rest/testutils/XPartSerializer.java
similarity index 100%
rename from juneau-rest/juneau-rest-mock/src/test/java/org/apache/juneau/rest/testutils/XPartSerializer.java
rename to juneau-rest/juneau-rest-mock-utest/src/test/java/org/apache/juneau/rest/testutils/XPartSerializer.java
diff --git a/juneau-rest/juneau-rest-mock/.classpath b/juneau-rest/juneau-rest-mock/.classpath
index 5e8a55f..7c632d2 100644
--- a/juneau-rest/juneau-rest-mock/.classpath
+++ b/juneau-rest/juneau-rest-mock/.classpath
@@ -6,13 +6,6 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
- <classpathentry kind="src" output="target/test-classes" path="src/test/java">
- <attributes>
- <attribute name="optional" value="true"/>
- <attribute name="maven.pomderived" value="true"/>
- <attribute name="test" value="true"/>
- </attributes>
- </classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<attributes>
<attribute name="maven.pomderived" value="true"/>
diff --git a/juneau-rest/juneau-rest-mock/pom.xml b/juneau-rest/juneau-rest-mock/pom.xml
index bac5215..41dee9b 100644
--- a/juneau-rest/juneau-rest-mock/pom.xml
+++ b/juneau-rest/juneau-rest-mock/pom.xml
@@ -52,18 +52,6 @@
<artifactId>javax.activation</artifactId>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.juneau</groupId>
- <artifactId>juneau-core-test</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
@@ -86,7 +74,7 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Automatic-Module-Name>org.apache.juneau.rest.client</Automatic-Module-Name>
+ <Automatic-Module-Name>org.apache.juneau.rest.mock</Automatic-Module-Name>
</instructions>
</configuration>
</plugin>
@@ -103,26 +91,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>**/*Test.class</include>
- </includes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
<!--plugin>
<groupId>com.github.siom79.japicmp</groupId>
<artifactId>japicmp-maven-plugin</artifactId>
diff --git a/juneau-rest/juneau-rest-server-rdf/pom.xml b/juneau-rest/juneau-rest-server-rdf/pom.xml
index 25ad2fb..c21e3f2 100644
--- a/juneau-rest/juneau-rest-server-rdf/pom.xml
+++ b/juneau-rest/juneau-rest-server-rdf/pom.xml
@@ -43,19 +43,6 @@
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.apache.juneau</groupId>
- <artifactId>juneau-core-test</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<properties>
diff --git a/juneau-rest/juneau-rest-server-test/.classpath b/juneau-rest/juneau-rest-server-test/.classpath
deleted file mode 100644
index 95cde83..0000000
--- a/juneau-rest/juneau-rest-server-test/.classpath
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" output="target/test-classes" path="src/test/java">
- <attributes>
- <attribute name="optional" value="true"/>
- <attribute name="maven.pomderived" value="true"/>
- <attribute name="test" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="src" output="target/classes" path="src/main/java">
- <attributes>
- <attribute name="optional" value="true"/>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
- <attributes>
- <attribute name="maven.pomderived" value="true"/>
- <attribute name="test" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
- <attributes>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
- <attributes>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/juneau-rest/juneau-rest-server-test/pom.xml b/juneau-rest/juneau-rest-server-test/pom.xml
deleted file mode 100644
index 0f85e43..0000000
--- a/juneau-rest/juneau-rest-server-test/pom.xml
+++ /dev/null
@@ -1,217 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ***************************************************************************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file *
- * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file *
- * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance *
- * with the License. You may obtain a copy of the License at *
- * *
- * http://www.apache.org/licenses/LICENSE-2.0 *
- * *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the *
- * specific language governing permissions and limitations under the License. *
- ***************************************************************************************************************************
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.juneau</groupId>
- <artifactId>juneau-rest</artifactId>
- <version>8.0.1-SNAPSHOT</version>
- </parent>
-
- <artifactId>juneau-rest-server-test</artifactId>
- <name>Apache Juneau REST Servlet API - Tests</name>
- <description>REST servlet API - Tests</description>
- <packaging>bundle</packaging>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.juneau</groupId>
- <artifactId>juneau-rest-mock</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>javax.activation-api</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.activation</groupId>
- <artifactId>javax.activation</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.juneau</groupId>
- <artifactId>juneau-core-test</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.juneau</groupId>
- <artifactId>juneau-rest-mock</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <properties>
- <!-- Skip javadoc generation since we generate them in the aggregate pom -->
- <maven.javadoc.skip>true</maven.javadoc.skip>
-
- <maven.compiler.source>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-sources</id>
- <phase>verify</phase>
- <goals>
- <goal>jar-no-fork</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>3.2.0</version>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Automatic-Module-Name>org.apache.juneau.rest.server</Automatic-Module-Name>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>**/*Test.class</include>
- </includes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <version>0.8.2</version>
- <executions>
- <execution>
- <id>default-prepare-agent</id>
- <goals>
- <goal>prepare-agent</goal>
- </goals>
- </execution>
- <execution>
- <id>default-report</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>report</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <!--plugin>
- <groupId>com.github.siom79.japicmp</groupId>
- <artifactId>japicmp-maven-plugin</artifactId>
- <version>0.13.0</version>
- <configuration>
- <skip>false</skip>
- <oldVersion>
- <dependency>
- <groupId>org.apache.juneau</groupId>
- <artifactId>${project.artifactId}</artifactId>
- <version>${juneau.compare.version}</version>
- <type>jar</type>
- </dependency>
- </oldVersion>
- <newVersion>
- <file>
- <path>${project.build.directory}/${project.artifactId}-${project.version}.jar</path>
- </file>
- </newVersion>
- <parameter>
- <onlyModified>true</onlyModified>
- <accessModifier>public</accessModifier>
- <excludes>
- <exclude>org.apache.juneau.rest.response.DefaultHandler</exclude>
- <exclude>org.apache.juneau.rest.response.InputStreamHandler</exclude>
- <exclude>org.apache.juneau.rest.response.ReaderHandler</exclude>
- <exclude>org.apache.juneau.rest.response.RedirectHandler</exclude>
- <exclude>org.apache.juneau.rest.response.StreamableHandler</exclude>
- <exclude>org.apache.juneau.rest.response.WritableHandler</exclude>
- <exclude>org.apache.juneau.rest.response.ZipFileListFileHandler</exclude>
- <exclude>org.apache.juneau.rest.ResponseHandler</exclude>
- <exclude>org.apache.juneau.rest.RestCallHandler</exclude>
- <exclude>org.apache.juneau.rest.RestException</exclude>
- </excludes>
- <ignoreMissingClasses>true</ignoreMissingClasses>
- <onlyBinaryIncompatible>true</onlyBinaryIncompatible>
- <breakBuildOnBinaryIncompatibleModifications>true</breakBuildOnBinaryIncompatibleModifications>
- <breakBuildIfCausedByExclusion>false</breakBuildIfCausedByExclusion>
- <breakBuildBasedOnSemanticVersioning>true</breakBuildBasedOnSemanticVersioning>
- <overrideCompatibilityChangeParameters>
- <overrideCompatibilityChangeParameter>
- <binaryCompatible>true</binaryCompatible>
- <compatibilityChange>SUPERCLASS_REMOVED</compatibilityChange>
- <sourceCompatible>true</sourceCompatible>
- </overrideCompatibilityChangeParameter>
- <overrideCompatibilityChangeParameter>
- <binaryCompatible>true</binaryCompatible>
- <compatibilityChange>FIELD_REMOVED_IN_SUPERCLASS</compatibilityChange>
- <sourceCompatible>true</sourceCompatible>
- </overrideCompatibilityChangeParameter>
- <overrideCompatibilityChangeParameter>
- <binaryCompatible>true</binaryCompatible>
- <compatibilityChange>METHOD_RETURN_TYPE_CHANGED</compatibilityChange>
- <sourceCompatible>true</sourceCompatible>
- </overrideCompatibilityChangeParameter>
- </overrideCompatibilityChangeParameters>
- </parameter>
- </configuration>
- <executions>
- <execution>
- <phase>verify</phase>
- <goals>
- <goal>cmp</goal>
- </goals>
- </execution>
- </executions>
- </plugin-->
- </plugins>
- </build>
-</project>
diff --git a/juneau-rest/juneau-rest-client-test/.gitignore b/juneau-rest/juneau-rest-server-utest/.gitignore
similarity index 100%
rename from juneau-rest/juneau-rest-client-test/.gitignore
rename to juneau-rest/juneau-rest-server-utest/.gitignore
diff --git a/juneau-microservice/juneau-microservice-test/.project b/juneau-rest/juneau-rest-server-utest/.project
similarity index 92%
rename from juneau-microservice/juneau-microservice-test/.project
rename to juneau-rest/juneau-rest-server-utest/.project
index 5fb0d4c..f8bbef6 100644
--- a/juneau-microservice/juneau-microservice-test/.project
+++ b/juneau-rest/juneau-rest-server-utest/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>juneau-microservice-test</name>
+ <name>juneau-rest-server-utest</name>
<comment></comment>
<projects>
</projects>
diff --git a/juneau-core/juneau-core-test/pom.xml b/juneau-rest/juneau-rest-server-utest/pom.xml
similarity index 83%
rename from juneau-core/juneau-core-test/pom.xml
rename to juneau-rest/juneau-rest-server-utest/pom.xml
index 84c6bd7..72c005a 100644
--- a/juneau-core/juneau-core-test/pom.xml
+++ b/juneau-rest/juneau-rest-server-utest/pom.xml
@@ -19,49 +19,48 @@
<parent>
<groupId>org.apache.juneau</groupId>
- <artifactId>juneau-core</artifactId>
+ <artifactId>juneau-rest</artifactId>
<version>8.0.1-SNAPSHOT</version>
</parent>
- <artifactId>juneau-core-test</artifactId>
- <name>Apache Juneau Core Tests</name>
- <description>Core API tests.</description>
+ <artifactId>juneau-rest-server-utest</artifactId>
+ <name>Apache Juneau REST Servlet API (Unit Tests)</name>
+ <description>Unit tests for REST servlet API</description>
<packaging>bundle</packaging>
<dependencies>
<dependency>
<groupId>org.apache.juneau</groupId>
- <artifactId>juneau-marshall</artifactId>
+ <artifactId>juneau-rest-mock</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.juneau</groupId>
- <artifactId>juneau-marshall-rdf</artifactId>
- <version>${project.version}</version>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.juneau</groupId>
- <artifactId>juneau-config</artifactId>
- <version>${project.version}</version>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.juneau</groupId>
- <artifactId>juneau-svl</artifactId>
- <version>${project.version}</version>
+ <groupId>javax.activation</groupId>
+ <artifactId>javax.activation-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.juneau</groupId>
- <artifactId>juneau-dto</artifactId>
- <version>${project.version}</version>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>javax.activation</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-core</artifactId>
- <optional>false</optional>
+ <groupId>org.apache.juneau</groupId>
+ <artifactId>juneau-core-utest</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>org.apache.juneau</groupId>
+ <artifactId>juneau-rest-mock-utest</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -80,29 +79,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>3.2.0</version>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Automatic-Module-Name>org.apache.juneau.core.test</Automatic-Module-Name>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>**/*Test.class</include>
- </includes>
- <systemPropertyVariables>
- <java.locale.providers>JRE,COMPAT,SPI,CLDR</java.locale.providers>
- </systemPropertyVariables>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
@@ -116,6 +92,17 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>3.2.0</version>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Automatic-Module-Name>org.apache.juneau.rest.server.utest</Automatic-Module-Name>
+ </instructions>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
@@ -127,6 +114,15 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>**/*Test.class</include>
+ </includes>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.2</version>
diff --git a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/jueau/rest/helper/ReaderResourceTest.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/jueau/rest/helper/ReaderResourceTest.java
similarity index 100%
rename from juneau-rest/juneau-rest-server-test/src/test/java/org/apache/jueau/rest/helper/ReaderResourceTest.java
rename to juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/jueau/rest/helper/ReaderResourceTest.java
diff --git a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/jueau/rest/helper/StreamResourceTest.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/jueau/rest/helper/StreamResourceTest.java
similarity index 100%
rename from juneau-rest/juneau-rest-server-test/src/test/java/org/apache/jueau/rest/helper/StreamResourceTest.java
rename to juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/jueau/rest/helper/StreamResourceTest.java
diff --git a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/BasicRestInfoProviderTest.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/BasicRestInfoProviderTest.java
similarity index 100%
rename from juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/BasicRestInfoProviderTest.java
rename to juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/BasicRestInfoProviderTest.java
diff --git a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/BeanContextPropertiesTest.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/BeanContextPropertiesTest.java
similarity index 100%
rename from juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/BeanContextPropertiesTest.java
rename to juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/BeanContextPropertiesTest.java
diff --git a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/NlsTest.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/NlsTest.java
similarity index 100%
rename from juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/NlsTest.java
rename to juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/NlsTest.java
diff --git a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/PathsTest.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/PathsTest.java
similarity index 100%
rename from juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/PathsTest.java
rename to juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/PathsTest.java
diff --git a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/RestParamsTest.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/RestParamsTest.java
similarity index 100%
rename from juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/RestParamsTest.java
rename to juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/RestParamsTest.java
diff --git a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/StatusCodesTest.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/StatusCodesTest.java
similarity index 100%
rename from juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/StatusCodesTest.java
rename to juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/StatusCodesTest.java
diff --git a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/ThreadLocalObjectsTest.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/ThreadLocalObjectsTest.java
similarity index 100%
rename from juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/ThreadLocalObjectsTest.java
rename to juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/ThreadLocalObjectsTest.java
diff --git a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocAsideTest.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/HtmlDocAsideTest.java
similarity index 100%
rename from juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocAsideTest.java
rename to juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/HtmlDocAsideTest.java
diff --git a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocConfigAsideTest.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/HtmlDocConfigAsideTest.java
similarity index 100%
rename from juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocConfigAsideTest.java
rename to juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/HtmlDocConfigAsideTest.java
diff --git a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocConfigFooterTest.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/HtmlDocConfigFooterTest.java
similarity index 100%
rename from juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocConfigFooterTest.java
rename to juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/HtmlDocConfigFooterTest.java
diff --git a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocConfigHeaderTest.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/HtmlDocConfigHeaderTest.java
similarity index 100%
rename from juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocConfigHeaderTest.java
rename to juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/HtmlDocConfigHeaderTest.java
diff --git a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocConfigNavTest.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/HtmlDocConfigNavTest.java
similarity index 100%
rename from juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocConfigNavTest.java
rename to juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/HtmlDocConfigNavTest.java
diff --git a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocConfigNavlinksTest.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/HtmlDocConfigNavlinksTest.java
similarity index 100%
rename from juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocConfigNavlinksTest.java
rename to juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/HtmlDocConfigNavlinksTest.java
diff --git a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocConfigScriptTest.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/HtmlDocConfigScriptTest.java
similarity index 100%
rename from juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocConfigScriptTest.java
rename to juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/HtmlDocConfigScriptTest.java
diff --git a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocConfigStyleTest.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/HtmlDocConfigStyleTest.java
similarity index 100%
rename from juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocConfigStyleTest.java
rename to juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/HtmlDocConfigStyleTest.java
diff --git a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocFooterTest.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/HtmlDocFooterTest.java
similarity index 100%
rename from juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocFooterTest.java
rename to juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/HtmlDocFooterTest.java
diff --git a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocHeaderTest.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/HtmlDocHeaderTest.java
similarity index 100%
rename from juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocHeaderTest.java
rename to juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/HtmlDocHeaderTest.java
diff --git a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocNavTest.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/HtmlDocNavTest.java
similarity index 100%
rename from juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocNavTest.java
rename to juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/HtmlDocNavTest.java
diff --git a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocNavlinksTest.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/HtmlDocNavlinksTest.java
similarity index 100%
rename from juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocNavlinksTest.java
rename to juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/HtmlDocNavlinksTest.java
diff --git a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocScriptTest.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/HtmlDocScriptTest.java
similarity index 100%
rename from juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocScriptTest.java
rename to juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/HtmlDocScriptTest.java
diff --git a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocStyleTest.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/HtmlDocStyleTest.java
similarity index 100%
rename from juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocStyleTest.java
rename to juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/HtmlDocStyleTest.java
diff --git a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/ResponseBodyAnnotationTest.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/ResponseBodyAnnotationTest.java
similarity index 100%
rename from juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/ResponseBodyAnnotationTest.java
rename to juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/ResponseBodyAnnotationTest.java
diff --git a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/ResponseHeaderAnnotationTest.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/ResponseHeaderAnnotationTest.java
similarity index 100%
rename from juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/ResponseHeaderAnnotationTest.java
rename to juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/ResponseHeaderAnnotationTest.java
diff --git a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/ResponseStatusAnnotationTest.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/ResponseStatusAnnotationTest.java
similarity index 100%
rename from juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/ResponseStatusAnnotationTest.java
rename to juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/ResponseStatusAnnotationTest.java
diff --git a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/RestMethodBpiTest.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestMethodBpiTest.java
similarity index 100%
rename from juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/RestMethodBpiTest.java
rename to juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestMethodBpiTest.java
diff --git a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/RestMethodGuardsTest.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestMethodGuardsTest.java
similarity index 100%
rename from juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/RestMethodGuardsTest.java
rename to juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestMethodGuardsTest.java
diff --git a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/RestMethodMatchersTest.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestMethodMatchersTest.java
similarity index 100%
rename from juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/RestMethodMatchersTest.java
rename to juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestMethodMatchersTest.java
diff --git a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/RestMethodPathTest.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestMethodPathTest.java
similarity index 100%
rename from juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/RestMethodPathTest.java
rename to juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestMethodPathTest.java
diff --git a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/RestResourceMessagesTest.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestResourceMessagesTest.java
similarity index 100%
rename from juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/RestResourceMessagesTest.java
rename to juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestResourceMessagesTest.java
diff --git a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/RestResourcePathTest.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestResourcePathTest.java
similarity index 100%
rename from juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/RestResourcePathTest.java
rename to juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestResourcePathTest.java
diff --git a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/RestResourcePropertiesTest.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestResourcePropertiesTest.java
similarity index 100%
rename from juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/RestResourcePropertiesTest.java
rename to juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestResourcePropertiesTest.java
diff --git a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/RestResourceSerializersTest.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestResourceSerializersTest.java
similarity index 100%
rename from juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/RestResourceSerializersTest.java
rename to juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestResourceSerializersTest.java
diff --git a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/RestResourceStaticFilesTest.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestResourceStaticFilesTest.java
similarity index 100%
rename from juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/RestResourceStaticFilesTest.java
rename to juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestResourceStaticFilesTest.java
diff --git a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation2/AnnotationInheritanceTest.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/AnnotationInheritanceTest.java
similarity index 100%
rename from juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation2/AnnotationInheritanceTest.java
rename to juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/AnnotationInheritanceTest.java
diff --git a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation2/BodyAnnotationTest.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/BodyAnnotationTest.java
similarity index 100%
rename from juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation2/BodyAnnotationTest.java
rename to juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/BodyAnnotationTest.java
diff --git a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation2/FormDataAnnotationTest.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/FormDataAnnotationTest.java
similarity index 100%
rename from juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation2/FormDataAnnotationTest.java
rename to juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/FormDataAnnotationTest.java
diff --git a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation2/HasFormDataAnnotationTest.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/HasFormDataAnnotationTest.java
similarity index 100%
rename from juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation2/HasFormDataAnnotationTest.java
rename to juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/HasFormDataAnnotationTest.java
diff --git a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation2/HasQueryAnnotationTest.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/HasQueryAnnotationTest.java
similarity index 100%
rename from juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation2/HasQueryAnnotationTest.java
rename to juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/HasQueryAnnotationTest.java
diff --git a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation2/HeaderAnnotationTest.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/HeaderAnnotationTest.java
similarity index 100%
rename from juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation2/HeaderAnnotationTest.java
rename to juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/HeaderAnnotationTest.java
diff --git a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation2/PathAnnotationTest.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/PathAnnotationTest.java
similarity index 100%
rename from juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation2/PathAnnotationTest.java
rename to juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/PathAnnotationTest.java
diff --git a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation2/PathRemainderAnnotationTest.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/PathRemainderAnnotationTest.java
similarity index 100%
rename from juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation2/PathRemainderAnnotationTest.java
rename to juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/PathRemainderAnnotationTest.java
diff --git a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation2/QueryAnnotationTest.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/QueryAnnotationTest.java
similarity index 100%
rename from juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation2/QueryAnnotationTest.java
rename to juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/QueryAnnotationTest.java
diff --git a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation2/ResponseAnnotationTest.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/ResponseAnnotationTest.java
similarity index 100%
rename from juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation2/ResponseAnnotationTest.java
rename to juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/ResponseAnnotationTest.java
diff --git a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation2/RestHookTest.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/RestHookTest.java
similarity index 100%
rename from juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation2/RestHookTest.java
rename to juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/RestHookTest.java
diff --git a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation2/RestMethodInheritTest.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/RestMethodInheritTest.java
similarity index 100%
rename from juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation2/RestMethodInheritTest.java
rename to juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/RestMethodInheritTest.java
diff --git a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation2/RestResourceParsersTest.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/RestResourceParsersTest.java
similarity index 100%
rename from juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation2/RestResourceParsersTest.java
rename to juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/RestResourceParsersTest.java
diff --git a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation2/RestResourcePojoSwapsTest.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/RestResourcePojoSwapsTest.java
similarity index 100%
rename from juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation2/RestResourcePojoSwapsTest.java
rename to juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/RestResourcePojoSwapsTest.java
diff --git a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation2/RoleGuardTest.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/RoleGuardTest.java
similarity index 100%
rename from juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation2/RoleGuardTest.java
rename to juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/RoleGuardTest.java
diff --git a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/exception/BasicTest.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/exception/BasicTest.java
similarity index 100%
rename from juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/exception/BasicTest.java
rename to juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/exception/BasicTest.java
diff --git a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/guard/RoleMatcherTest.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/guard/RoleMatcherTest.java
similarity index 100%
rename from juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/guard/RoleMatcherTest.java
rename to juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/guard/RoleMatcherTest.java
diff --git a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/headers/AcceptCharsetTest.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/headers/AcceptCharsetTest.java
similarity index 100%
rename from juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/headers/AcceptCharsetTest.java
rename to juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/headers/AcceptCharsetTest.java
diff --git a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/headers/AcceptEncodingTest.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/headers/AcceptEncodingTest.java
similarity index 100%
rename from juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/headers/AcceptEncodingTest.java
rename to juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/headers/AcceptEncodingTest.java
diff --git a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/headers/AcceptTest.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/headers/AcceptTest.java
similarity index 100%
rename from juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/headers/AcceptTest.java
rename to juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/headers/AcceptTest.java
diff --git a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/headers/ClientVersionTest.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/headers/ClientVersionTest.java
similarity index 100%
rename from juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/headers/ClientVersionTest.java
rename to juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/headers/ClientVersionTest.java
diff --git a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/headers/ContentEncodingTest.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/headers/ContentEncodingTest.java
similarity index 100%
rename from juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/headers/ContentEncodingTest.java
rename to juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/headers/ContentEncodingTest.java
diff --git a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/headers/ContentTypeTest.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/headers/ContentTypeTest.java
similarity index 100%
rename from juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/headers/ContentTypeTest.java
rename to juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/headers/ContentTypeTest.java
diff --git a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/headers/HeadersTest.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/headers/HeadersTest.java
similarity index 100%
rename from juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/headers/HeadersTest.java
rename to juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/headers/HeadersTest.java
diff --git a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/mock2/MockServletRequestTest.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/mock2/MockServletRequestTest.java
similarity index 100%
rename from juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/mock2/MockServletRequestTest.java
rename to juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/mock2/MockServletRequestTest.java
diff --git a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/response/BasicTest.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/response/BasicTest.java
similarity index 100%
rename from juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/response/BasicTest.java
rename to juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/response/BasicTest.java
diff --git a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/util/RestUtilsTest.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/util/RestUtilsTest.java
similarity index 100%
rename from juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/util/RestUtilsTest.java
rename to juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/util/RestUtilsTest.java
diff --git a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/util/UrlPathPatternTest.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/util/UrlPathPatternTest.java
similarity index 100%
rename from juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/util/UrlPathPatternTest.java
rename to juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/util/UrlPathPatternTest.java
diff --git a/juneau-rest/juneau-rest-server-test/src/test/resources/org/apache/juneau/rest/BasicRestInfoProviderTest.properties b/juneau-rest/juneau-rest-server-utest/src/test/resources/org/apache/juneau/rest/BasicRestInfoProviderTest.properties
similarity index 100%
rename from juneau-rest/juneau-rest-server-test/src/test/resources/org/apache/juneau/rest/BasicRestInfoProviderTest.properties
rename to juneau-rest/juneau-rest-server-utest/src/test/resources/org/apache/juneau/rest/BasicRestInfoProviderTest.properties
diff --git a/juneau-rest/juneau-rest-server-test/src/test/resources/org/apache/juneau/rest/BasicRestInfoProviderTest_swagger.json b/juneau-rest/juneau-rest-server-utest/src/test/resources/org/apache/juneau/rest/BasicRestInfoProviderTest_swagger.json
similarity index 100%
rename from juneau-rest/juneau-rest-server-test/src/test/resources/org/apache/juneau/rest/BasicRestInfoProviderTest_swagger.json
rename to juneau-rest/juneau-rest-server-utest/src/test/resources/org/apache/juneau/rest/BasicRestInfoProviderTest_swagger.json
diff --git a/juneau-rest/juneau-rest-server-test/src/test/resources/org/apache/juneau/rest/NlsTest.properties b/juneau-rest/juneau-rest-server-utest/src/test/resources/org/apache/juneau/rest/NlsTest.properties
similarity index 100%
rename from juneau-rest/juneau-rest-server-test/src/test/resources/org/apache/juneau/rest/NlsTest.properties
rename to juneau-rest/juneau-rest-server-utest/src/test/resources/org/apache/juneau/rest/NlsTest.properties
diff --git a/juneau-rest/juneau-rest-server-test/src/test/resources/org/apache/juneau/rest/RestParamsTest.properties b/juneau-rest/juneau-rest-server-utest/src/test/resources/org/apache/juneau/rest/RestParamsTest.properties
similarity index 100%
rename from juneau-rest/juneau-rest-server-test/src/test/resources/org/apache/juneau/rest/RestParamsTest.properties
rename to juneau-rest/juneau-rest-server-utest/src/test/resources/org/apache/juneau/rest/RestParamsTest.properties
diff --git a/juneau-rest/juneau-rest-server-test/src/test/resources/org/apache/juneau/rest/RestParamsTest_ja_JP.properties b/juneau-rest/juneau-rest-server-utest/src/test/resources/org/apache/juneau/rest/RestParamsTest_ja_JP.properties
similarity index 100%
rename from juneau-rest/juneau-rest-server-test/src/test/resources/org/apache/juneau/rest/RestParamsTest_ja_JP.properties
rename to juneau-rest/juneau-rest-server-utest/src/test/resources/org/apache/juneau/rest/RestParamsTest_ja_JP.properties
diff --git a/juneau-rest/juneau-rest-server-test/src/test/resources/org/apache/juneau/rest/annotation/RestResourceMessagesTest1.properties b/juneau-rest/juneau-rest-server-utest/src/test/resources/org/apache/juneau/rest/annotation/RestResourceMessagesTest1.properties
similarity index 100%
rename from juneau-rest/juneau-rest-server-test/src/test/resources/org/apache/juneau/rest/annotation/RestResourceMessagesTest1.properties
rename to juneau-rest/juneau-rest-server-utest/src/test/resources/org/apache/juneau/rest/annotation/RestResourceMessagesTest1.properties
diff --git a/juneau-rest/juneau-rest-server-test/src/test/resources/org/apache/juneau/rest/annotation/RestResourceMessagesTest2.properties b/juneau-rest/juneau-rest-server-utest/src/test/resources/org/apache/juneau/rest/annotation/RestResourceMessagesTest2.properties
similarity index 100%
rename from juneau-rest/juneau-rest-server-test/src/test/resources/org/apache/juneau/rest/annotation/RestResourceMessagesTest2.properties
rename to juneau-rest/juneau-rest-server-utest/src/test/resources/org/apache/juneau/rest/annotation/RestResourceMessagesTest2.properties
diff --git a/juneau-rest/juneau-rest-server-test/src/test/resources/org/apache/juneau/rest/annotation/xdocs/test.txt b/juneau-rest/juneau-rest-server-utest/src/test/resources/org/apache/juneau/rest/annotation/xdocs/test.txt
similarity index 100%
rename from juneau-rest/juneau-rest-server-test/src/test/resources/org/apache/juneau/rest/annotation/xdocs/test.txt
rename to juneau-rest/juneau-rest-server-utest/src/test/resources/org/apache/juneau/rest/annotation/xdocs/test.txt
diff --git a/juneau-rest/juneau-rest-server-test/src/test/resources/org/apache/juneau/rest/annotation/xdocs/xsubdocs/test.txt b/juneau-rest/juneau-rest-server-utest/src/test/resources/org/apache/juneau/rest/annotation/xdocs/xsubdocs/test.txt
similarity index 100%
rename from juneau-rest/juneau-rest-server-test/src/test/resources/org/apache/juneau/rest/annotation/xdocs/xsubdocs/test.txt
rename to juneau-rest/juneau-rest-server-utest/src/test/resources/org/apache/juneau/rest/annotation/xdocs/xsubdocs/test.txt
diff --git a/juneau-rest/juneau-rest-server/pom.xml b/juneau-rest/juneau-rest-server/pom.xml
index fedb8dc..048027a 100644
--- a/juneau-rest/juneau-rest-server/pom.xml
+++ b/juneau-rest/juneau-rest-server/pom.xml
@@ -60,18 +60,6 @@
<groupId>com.sun.activation</groupId>
<artifactId>javax.activation</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.juneau</groupId>
- <artifactId>juneau-core-test</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<properties>
diff --git a/juneau-rest/pom.xml b/juneau-rest/pom.xml
index edabeee..08deebd 100644
--- a/juneau-rest/pom.xml
+++ b/juneau-rest/pom.xml
@@ -35,8 +35,9 @@
<module>juneau-rest-server-springboot</module>
<module>juneau-rest-client</module>
<module>juneau-rest-mock</module>
- <module>juneau-rest-server-test</module>
- <module>juneau-rest-client-test</module>
+ <module>juneau-rest-mock-utest</module>
+ <module>juneau-rest-server-utest</module>
+ <module>juneau-rest-client-utest</module>
</modules>
</project>
diff --git a/juneau-sc/juneau-server-config/pom.xml b/juneau-sc/juneau-server-config/pom.xml
index add2dff..db4543d 100644
--- a/juneau-sc/juneau-server-config/pom.xml
+++ b/juneau-sc/juneau-server-config/pom.xml
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>juneau-server-config</artifactId>
- <name>Apache Juneau - SERVER CONFIG</name>
+ <name>Apache Juneau Configuration Server API</name>
<description>Apache Juneau Server Config</description>
<parent>
diff --git a/juneau-sc/pom.xml b/juneau-sc/pom.xml
index aecbccb..83d23b1 100644
--- a/juneau-sc/pom.xml
+++ b/juneau-sc/pom.xml
@@ -25,8 +25,8 @@
<artifactId>juneau-sc</artifactId>
<packaging>pom</packaging>
- <name>Apache Juneau - SERVER CONFIG</name>
- <description>Apache Juneau Server Config</description>
+ <name>Apache Juneau - Configuration Server</name>
+ <description>Apache Juneau Configuration Server</description>
<modules>
<module>juneau-server-config</module>