diff --git a/CHANGELOG.md b/CHANGELOG.md index e26456d..f7349d4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,16 @@ Proteus Changelog. ## Unreleased ### No issue +**Bumped version in README.md** + + +[36b065e4fe3efad](https://github.com/noboomu/proteus/commit/36b065e4fe3efad) Joshua Bauer *2019-11-20 19:47:34* + +**Support wrapping ServerResponse in a CompletableFuture** + + +[e9ea1af37128516](https://github.com/noboomu/proteus/commit/e9ea1af37128516) Joshua Bauer *2019-10-16 23:49:35* + **Added max min annotation support.** diff --git a/pom.xml b/pom.xml index 82dd05c..b5b04a4 100644 --- a/pom.xml +++ b/pom.xml @@ -6,15 +6,16 @@ proteus-project pom 0.4.3-SNAPSHOT + Proteus Project Proteus is an extremely light, fast, and flexible Java REST API framework built atop Undertow. http://github.com/noboomu/proteus - core - swagger - openapi + proteus-core + proteus-swagger + proteus-openapi diff --git a/core/conf/logback.xml b/proteus-core/conf/logback.xml similarity index 100% rename from core/conf/logback.xml rename to proteus-core/conf/logback.xml diff --git a/core/pom.xml b/proteus-core/pom.xml similarity index 99% rename from core/pom.xml rename to proteus-core/pom.xml index 6f4fbbb..dc82faf 100644 --- a/core/pom.xml +++ b/proteus-core/pom.xml @@ -4,7 +4,6 @@ proteus-project io.sinistral 0.4.3-SNAPSHOT - ../pom.xml 4.0.0 diff --git a/core/src/main/java/io/sinistral/proteus/ProteusApplication.java b/proteus-core/src/main/java/io/sinistral/proteus/ProteusApplication.java similarity index 100% rename from core/src/main/java/io/sinistral/proteus/ProteusApplication.java rename to proteus-core/src/main/java/io/sinistral/proteus/ProteusApplication.java diff --git a/core/src/main/java/io/sinistral/proteus/annotations/Blocking.java b/proteus-core/src/main/java/io/sinistral/proteus/annotations/Blocking.java similarity index 100% rename from core/src/main/java/io/sinistral/proteus/annotations/Blocking.java rename to proteus-core/src/main/java/io/sinistral/proteus/annotations/Blocking.java diff --git a/core/src/main/java/io/sinistral/proteus/annotations/Chain.java b/proteus-core/src/main/java/io/sinistral/proteus/annotations/Chain.java similarity index 100% rename from core/src/main/java/io/sinistral/proteus/annotations/Chain.java rename to proteus-core/src/main/java/io/sinistral/proteus/annotations/Chain.java diff --git a/core/src/main/java/io/sinistral/proteus/annotations/Debug.java b/proteus-core/src/main/java/io/sinistral/proteus/annotations/Debug.java similarity index 100% rename from core/src/main/java/io/sinistral/proteus/annotations/Debug.java rename to proteus-core/src/main/java/io/sinistral/proteus/annotations/Debug.java diff --git a/core/src/main/java/io/sinistral/proteus/modules/ApplicationModule.java b/proteus-core/src/main/java/io/sinistral/proteus/modules/ApplicationModule.java similarity index 100% rename from core/src/main/java/io/sinistral/proteus/modules/ApplicationModule.java rename to proteus-core/src/main/java/io/sinistral/proteus/modules/ApplicationModule.java diff --git a/core/src/main/java/io/sinistral/proteus/modules/ConfigModule.java b/proteus-core/src/main/java/io/sinistral/proteus/modules/ConfigModule.java similarity index 100% rename from core/src/main/java/io/sinistral/proteus/modules/ConfigModule.java rename to proteus-core/src/main/java/io/sinistral/proteus/modules/ConfigModule.java diff --git a/core/src/main/java/io/sinistral/proteus/modules/JacksonModule.java b/proteus-core/src/main/java/io/sinistral/proteus/modules/JacksonModule.java similarity index 100% rename from core/src/main/java/io/sinistral/proteus/modules/JacksonModule.java rename to proteus-core/src/main/java/io/sinistral/proteus/modules/JacksonModule.java diff --git a/core/src/main/java/io/sinistral/proteus/server/Extractors.java b/proteus-core/src/main/java/io/sinistral/proteus/server/Extractors.java similarity index 100% rename from core/src/main/java/io/sinistral/proteus/server/Extractors.java rename to proteus-core/src/main/java/io/sinistral/proteus/server/Extractors.java diff --git a/core/src/main/java/io/sinistral/proteus/server/MediaType.java b/proteus-core/src/main/java/io/sinistral/proteus/server/MediaType.java similarity index 100% rename from core/src/main/java/io/sinistral/proteus/server/MediaType.java rename to proteus-core/src/main/java/io/sinistral/proteus/server/MediaType.java diff --git a/core/src/main/java/io/sinistral/proteus/server/ServerRequest.java b/proteus-core/src/main/java/io/sinistral/proteus/server/ServerRequest.java similarity index 100% rename from core/src/main/java/io/sinistral/proteus/server/ServerRequest.java rename to proteus-core/src/main/java/io/sinistral/proteus/server/ServerRequest.java diff --git a/core/src/main/java/io/sinistral/proteus/server/ServerResponse.java b/proteus-core/src/main/java/io/sinistral/proteus/server/ServerResponse.java similarity index 100% rename from core/src/main/java/io/sinistral/proteus/server/ServerResponse.java rename to proteus-core/src/main/java/io/sinistral/proteus/server/ServerResponse.java diff --git a/core/src/main/java/io/sinistral/proteus/server/endpoints/EndpointInfo.java b/proteus-core/src/main/java/io/sinistral/proteus/server/endpoints/EndpointInfo.java similarity index 100% rename from core/src/main/java/io/sinistral/proteus/server/endpoints/EndpointInfo.java rename to proteus-core/src/main/java/io/sinistral/proteus/server/endpoints/EndpointInfo.java diff --git a/core/src/main/java/io/sinistral/proteus/server/exceptions/ServerException.java b/proteus-core/src/main/java/io/sinistral/proteus/server/exceptions/ServerException.java similarity index 100% rename from core/src/main/java/io/sinistral/proteus/server/exceptions/ServerException.java rename to proteus-core/src/main/java/io/sinistral/proteus/server/exceptions/ServerException.java diff --git a/core/src/main/java/io/sinistral/proteus/server/handlers/HandlerGenerator.java b/proteus-core/src/main/java/io/sinistral/proteus/server/handlers/HandlerGenerator.java similarity index 100% rename from core/src/main/java/io/sinistral/proteus/server/handlers/HandlerGenerator.java rename to proteus-core/src/main/java/io/sinistral/proteus/server/handlers/HandlerGenerator.java diff --git a/core/src/main/java/io/sinistral/proteus/server/handlers/ProteusHandler.java b/proteus-core/src/main/java/io/sinistral/proteus/server/handlers/ProteusHandler.java similarity index 100% rename from core/src/main/java/io/sinistral/proteus/server/handlers/ProteusHandler.java rename to proteus-core/src/main/java/io/sinistral/proteus/server/handlers/ProteusHandler.java diff --git a/core/src/main/java/io/sinistral/proteus/server/handlers/ServerDefaultHttpHandler.java b/proteus-core/src/main/java/io/sinistral/proteus/server/handlers/ServerDefaultHttpHandler.java similarity index 100% rename from core/src/main/java/io/sinistral/proteus/server/handlers/ServerDefaultHttpHandler.java rename to proteus-core/src/main/java/io/sinistral/proteus/server/handlers/ServerDefaultHttpHandler.java diff --git a/core/src/main/java/io/sinistral/proteus/server/handlers/ServerDefaultResponseListener.java b/proteus-core/src/main/java/io/sinistral/proteus/server/handlers/ServerDefaultResponseListener.java similarity index 100% rename from core/src/main/java/io/sinistral/proteus/server/handlers/ServerDefaultResponseListener.java rename to proteus-core/src/main/java/io/sinistral/proteus/server/handlers/ServerDefaultResponseListener.java diff --git a/core/src/main/java/io/sinistral/proteus/server/handlers/ServerFallbackHandler.java b/proteus-core/src/main/java/io/sinistral/proteus/server/handlers/ServerFallbackHandler.java similarity index 100% rename from core/src/main/java/io/sinistral/proteus/server/handlers/ServerFallbackHandler.java rename to proteus-core/src/main/java/io/sinistral/proteus/server/handlers/ServerFallbackHandler.java diff --git a/core/src/main/java/io/sinistral/proteus/server/handlers/TypeHandler.java b/proteus-core/src/main/java/io/sinistral/proteus/server/handlers/TypeHandler.java similarity index 100% rename from core/src/main/java/io/sinistral/proteus/server/handlers/TypeHandler.java rename to proteus-core/src/main/java/io/sinistral/proteus/server/handlers/TypeHandler.java diff --git a/core/src/main/java/io/sinistral/proteus/server/predicates/MaxRequestContentLengthPredicate.java b/proteus-core/src/main/java/io/sinistral/proteus/server/predicates/MaxRequestContentLengthPredicate.java similarity index 100% rename from core/src/main/java/io/sinistral/proteus/server/predicates/MaxRequestContentLengthPredicate.java rename to proteus-core/src/main/java/io/sinistral/proteus/server/predicates/MaxRequestContentLengthPredicate.java diff --git a/core/src/main/java/io/sinistral/proteus/server/predicates/ServerPredicates.java b/proteus-core/src/main/java/io/sinistral/proteus/server/predicates/ServerPredicates.java similarity index 100% rename from core/src/main/java/io/sinistral/proteus/server/predicates/ServerPredicates.java rename to proteus-core/src/main/java/io/sinistral/proteus/server/predicates/ServerPredicates.java diff --git a/core/src/main/java/io/sinistral/proteus/server/security/MapIdentityManager.java b/proteus-core/src/main/java/io/sinistral/proteus/server/security/MapIdentityManager.java similarity index 100% rename from core/src/main/java/io/sinistral/proteus/server/security/MapIdentityManager.java rename to proteus-core/src/main/java/io/sinistral/proteus/server/security/MapIdentityManager.java diff --git a/core/src/main/java/io/sinistral/proteus/services/AssetsService.java b/proteus-core/src/main/java/io/sinistral/proteus/services/AssetsService.java similarity index 100% rename from core/src/main/java/io/sinistral/proteus/services/AssetsService.java rename to proteus-core/src/main/java/io/sinistral/proteus/services/AssetsService.java diff --git a/core/src/main/java/io/sinistral/proteus/services/BaseService.java b/proteus-core/src/main/java/io/sinistral/proteus/services/BaseService.java similarity index 100% rename from core/src/main/java/io/sinistral/proteus/services/BaseService.java rename to proteus-core/src/main/java/io/sinistral/proteus/services/BaseService.java diff --git a/core/src/main/java/io/sinistral/proteus/services/DefaultService.java b/proteus-core/src/main/java/io/sinistral/proteus/services/DefaultService.java similarity index 100% rename from core/src/main/java/io/sinistral/proteus/services/DefaultService.java rename to proteus-core/src/main/java/io/sinistral/proteus/services/DefaultService.java diff --git a/core/src/main/java/io/sinistral/proteus/utilities/SecurityOps.java b/proteus-core/src/main/java/io/sinistral/proteus/utilities/SecurityOps.java similarity index 100% rename from core/src/main/java/io/sinistral/proteus/utilities/SecurityOps.java rename to proteus-core/src/main/java/io/sinistral/proteus/utilities/SecurityOps.java diff --git a/core/src/main/java/io/sinistral/proteus/utilities/TablePrinter.java b/proteus-core/src/main/java/io/sinistral/proteus/utilities/TablePrinter.java similarity index 100% rename from core/src/main/java/io/sinistral/proteus/utilities/TablePrinter.java rename to proteus-core/src/main/java/io/sinistral/proteus/utilities/TablePrinter.java diff --git a/core/src/main/java/io/sinistral/proteus/wrappers/JsonViewWrapper.java b/proteus-core/src/main/java/io/sinistral/proteus/wrappers/JsonViewWrapper.java similarity index 100% rename from core/src/main/java/io/sinistral/proteus/wrappers/JsonViewWrapper.java rename to proteus-core/src/main/java/io/sinistral/proteus/wrappers/JsonViewWrapper.java diff --git a/core/src/main/resources/META-INF/MANIFEST.MF b/proteus-core/src/main/resources/META-INF/MANIFEST.MF similarity index 100% rename from core/src/main/resources/META-INF/MANIFEST.MF rename to proteus-core/src/main/resources/META-INF/MANIFEST.MF diff --git a/core/src/main/resources/META-INF/services/io.undertow.protocols.alpn.ALPNProvider b/proteus-core/src/main/resources/META-INF/services/io.undertow.protocols.alpn.ALPNProvider similarity index 100% rename from core/src/main/resources/META-INF/services/io.undertow.protocols.alpn.ALPNProvider rename to proteus-core/src/main/resources/META-INF/services/io.undertow.protocols.alpn.ALPNProvider diff --git a/core/src/main/resources/development.cer b/proteus-core/src/main/resources/development.cer similarity index 100% rename from core/src/main/resources/development.cer rename to proteus-core/src/main/resources/development.cer diff --git a/core/src/main/resources/development.jks b/proteus-core/src/main/resources/development.jks similarity index 100% rename from core/src/main/resources/development.jks rename to proteus-core/src/main/resources/development.jks diff --git a/core/src/main/resources/development.ts b/proteus-core/src/main/resources/development.ts similarity index 100% rename from core/src/main/resources/development.ts rename to proteus-core/src/main/resources/development.ts diff --git a/core/src/main/resources/io/sinistral/proteus/favicon.ico b/proteus-core/src/main/resources/io/sinistral/proteus/favicon.ico similarity index 100% rename from core/src/main/resources/io/sinistral/proteus/favicon.ico rename to proteus-core/src/main/resources/io/sinistral/proteus/favicon.ico diff --git a/core/src/main/resources/io/sinistral/proteus/proteus-logo.svg b/proteus-core/src/main/resources/io/sinistral/proteus/proteus-logo.svg similarity index 100% rename from core/src/main/resources/io/sinistral/proteus/proteus-logo.svg rename to proteus-core/src/main/resources/io/sinistral/proteus/proteus-logo.svg diff --git a/core/src/main/resources/proteus-logo.svg b/proteus-core/src/main/resources/proteus-logo.svg similarity index 100% rename from core/src/main/resources/proteus-logo.svg rename to proteus-core/src/main/resources/proteus-logo.svg diff --git a/core/src/main/resources/reference.conf b/proteus-core/src/main/resources/reference.conf similarity index 100% rename from core/src/main/resources/reference.conf rename to proteus-core/src/main/resources/reference.conf diff --git a/core/src/test/java/io/sinistral/proteus/test/controllers/Tests.java b/proteus-core/src/test/java/io/sinistral/proteus/test/controllers/Tests.java similarity index 100% rename from core/src/test/java/io/sinistral/proteus/test/controllers/Tests.java rename to proteus-core/src/test/java/io/sinistral/proteus/test/controllers/Tests.java diff --git a/core/src/test/java/io/sinistral/proteus/test/models/User.java b/proteus-core/src/test/java/io/sinistral/proteus/test/models/User.java similarity index 100% rename from core/src/test/java/io/sinistral/proteus/test/models/User.java rename to proteus-core/src/test/java/io/sinistral/proteus/test/models/User.java diff --git a/core/src/test/java/io/sinistral/proteus/test/server/DefaultServer.java b/proteus-core/src/test/java/io/sinistral/proteus/test/server/DefaultServer.java similarity index 100% rename from core/src/test/java/io/sinistral/proteus/test/server/DefaultServer.java rename to proteus-core/src/test/java/io/sinistral/proteus/test/server/DefaultServer.java diff --git a/core/src/test/java/io/sinistral/proteus/test/server/TestControllerEndpoints.java b/proteus-core/src/test/java/io/sinistral/proteus/test/server/TestControllerEndpoints.java similarity index 100% rename from core/src/test/java/io/sinistral/proteus/test/server/TestControllerEndpoints.java rename to proteus-core/src/test/java/io/sinistral/proteus/test/server/TestControllerEndpoints.java diff --git a/core/src/test/java/io/sinistral/proteus/test/wrappers/TestClassWrapper.java b/proteus-core/src/test/java/io/sinistral/proteus/test/wrappers/TestClassWrapper.java similarity index 100% rename from core/src/test/java/io/sinistral/proteus/test/wrappers/TestClassWrapper.java rename to proteus-core/src/test/java/io/sinistral/proteus/test/wrappers/TestClassWrapper.java diff --git a/core/src/test/java/io/sinistral/proteus/test/wrappers/TestWrapper.java b/proteus-core/src/test/java/io/sinistral/proteus/test/wrappers/TestWrapper.java similarity index 100% rename from core/src/test/java/io/sinistral/proteus/test/wrappers/TestWrapper.java rename to proteus-core/src/test/java/io/sinistral/proteus/test/wrappers/TestWrapper.java diff --git a/core/src/test/resources/application.conf b/proteus-core/src/test/resources/application.conf similarity index 100% rename from core/src/test/resources/application.conf rename to proteus-core/src/test/resources/application.conf diff --git a/core/src/test/resources/development.jks b/proteus-core/src/test/resources/development.jks similarity index 100% rename from core/src/test/resources/development.jks rename to proteus-core/src/test/resources/development.jks diff --git a/core/src/test/resources/development.ts b/proteus-core/src/test/resources/development.ts similarity index 100% rename from core/src/test/resources/development.ts rename to proteus-core/src/test/resources/development.ts diff --git a/core/src/test/resources/logback-test.xml b/proteus-core/src/test/resources/logback-test.xml similarity index 100% rename from core/src/test/resources/logback-test.xml rename to proteus-core/src/test/resources/logback-test.xml diff --git a/openapi/pom.xml b/proteus-openapi/pom.xml similarity index 98% rename from openapi/pom.xml rename to proteus-openapi/pom.xml index a003e88..007f378 100644 --- a/openapi/pom.xml +++ b/proteus-openapi/pom.xml @@ -4,14 +4,13 @@ proteus-project io.sinistral 0.4.3-SNAPSHOT - ../pom.xml + 4.0.0 proteus-openapi - Proteus OpenAPI jar diff --git a/openapi/src/main/java/io/sinistral/proteus/openapi/jaxrs2/Reader.java b/proteus-openapi/src/main/java/io/sinistral/proteus/openapi/jaxrs2/Reader.java similarity index 100% rename from openapi/src/main/java/io/sinistral/proteus/openapi/jaxrs2/Reader.java rename to proteus-openapi/src/main/java/io/sinistral/proteus/openapi/jaxrs2/Reader.java diff --git a/openapi/src/main/java/io/sinistral/proteus/openapi/jaxrs2/ServerModelResolver.java b/proteus-openapi/src/main/java/io/sinistral/proteus/openapi/jaxrs2/ServerModelResolver.java similarity index 100% rename from openapi/src/main/java/io/sinistral/proteus/openapi/jaxrs2/ServerModelResolver.java rename to proteus-openapi/src/main/java/io/sinistral/proteus/openapi/jaxrs2/ServerModelResolver.java diff --git a/openapi/src/main/java/io/sinistral/proteus/openapi/jaxrs2/ServerParameterExtension.java b/proteus-openapi/src/main/java/io/sinistral/proteus/openapi/jaxrs2/ServerParameterExtension.java similarity index 100% rename from openapi/src/main/java/io/sinistral/proteus/openapi/jaxrs2/ServerParameterExtension.java rename to proteus-openapi/src/main/java/io/sinistral/proteus/openapi/jaxrs2/ServerParameterExtension.java diff --git a/openapi/src/main/java/io/sinistral/proteus/openapi/services/OpenAPIService.java b/proteus-openapi/src/main/java/io/sinistral/proteus/openapi/services/OpenAPIService.java similarity index 100% rename from openapi/src/main/java/io/sinistral/proteus/openapi/services/OpenAPIService.java rename to proteus-openapi/src/main/java/io/sinistral/proteus/openapi/services/OpenAPIService.java diff --git a/openapi/src/main/resources/io/sinistral/proteus/openapi/index.html b/proteus-openapi/src/main/resources/io/sinistral/proteus/openapi/index.html similarity index 100% rename from openapi/src/main/resources/io/sinistral/proteus/openapi/index.html rename to proteus-openapi/src/main/resources/io/sinistral/proteus/openapi/index.html diff --git a/openapi/src/main/resources/io/sinistral/proteus/openapi/redoc.html b/proteus-openapi/src/main/resources/io/sinistral/proteus/openapi/redoc.html similarity index 100% rename from openapi/src/main/resources/io/sinistral/proteus/openapi/redoc.html rename to proteus-openapi/src/main/resources/io/sinistral/proteus/openapi/redoc.html diff --git a/openapi/src/main/resources/io/sinistral/proteus/openapi/swagger-ui.css b/proteus-openapi/src/main/resources/io/sinistral/proteus/openapi/swagger-ui.css similarity index 100% rename from openapi/src/main/resources/io/sinistral/proteus/openapi/swagger-ui.css rename to proteus-openapi/src/main/resources/io/sinistral/proteus/openapi/swagger-ui.css diff --git a/openapi/src/test/java/io/sinistral/proteus/openapi/test/controllers/OpenAPITests.java b/proteus-openapi/src/test/java/io/sinistral/proteus/openapi/test/controllers/OpenAPITests.java similarity index 100% rename from openapi/src/test/java/io/sinistral/proteus/openapi/test/controllers/OpenAPITests.java rename to proteus-openapi/src/test/java/io/sinistral/proteus/openapi/test/controllers/OpenAPITests.java diff --git a/openapi/src/test/java/io/sinistral/proteus/openapi/test/converters/MoneyModelConverter.java b/proteus-openapi/src/test/java/io/sinistral/proteus/openapi/test/converters/MoneyModelConverter.java similarity index 100% rename from openapi/src/test/java/io/sinistral/proteus/openapi/test/converters/MoneyModelConverter.java rename to proteus-openapi/src/test/java/io/sinistral/proteus/openapi/test/converters/MoneyModelConverter.java diff --git a/openapi/src/test/java/io/sinistral/proteus/openapi/test/models/Pojo.java b/proteus-openapi/src/test/java/io/sinistral/proteus/openapi/test/models/Pojo.java similarity index 100% rename from openapi/src/test/java/io/sinistral/proteus/openapi/test/models/Pojo.java rename to proteus-openapi/src/test/java/io/sinistral/proteus/openapi/test/models/Pojo.java diff --git a/openapi/src/test/java/io/sinistral/proteus/openapi/test/modules/JacksonModule.java b/proteus-openapi/src/test/java/io/sinistral/proteus/openapi/test/modules/JacksonModule.java similarity index 100% rename from openapi/src/test/java/io/sinistral/proteus/openapi/test/modules/JacksonModule.java rename to proteus-openapi/src/test/java/io/sinistral/proteus/openapi/test/modules/JacksonModule.java diff --git a/openapi/src/test/java/io/sinistral/proteus/openapi/test/server/OpenAPIDefaultServer.java b/proteus-openapi/src/test/java/io/sinistral/proteus/openapi/test/server/OpenAPIDefaultServer.java similarity index 100% rename from openapi/src/test/java/io/sinistral/proteus/openapi/test/server/OpenAPIDefaultServer.java rename to proteus-openapi/src/test/java/io/sinistral/proteus/openapi/test/server/OpenAPIDefaultServer.java diff --git a/openapi/src/test/java/io/sinistral/proteus/openapi/test/server/TestOpenAPIControllerEndpoints.java b/proteus-openapi/src/test/java/io/sinistral/proteus/openapi/test/server/TestOpenAPIControllerEndpoints.java similarity index 100% rename from openapi/src/test/java/io/sinistral/proteus/openapi/test/server/TestOpenAPIControllerEndpoints.java rename to proteus-openapi/src/test/java/io/sinistral/proteus/openapi/test/server/TestOpenAPIControllerEndpoints.java diff --git a/openapi/src/test/resources/application.conf b/proteus-openapi/src/test/resources/application.conf similarity index 100% rename from openapi/src/test/resources/application.conf rename to proteus-openapi/src/test/resources/application.conf diff --git a/openapi/src/test/resources/development.jks b/proteus-openapi/src/test/resources/development.jks similarity index 100% rename from openapi/src/test/resources/development.jks rename to proteus-openapi/src/test/resources/development.jks diff --git a/openapi/src/test/resources/development.ts b/proteus-openapi/src/test/resources/development.ts similarity index 100% rename from openapi/src/test/resources/development.ts rename to proteus-openapi/src/test/resources/development.ts diff --git a/openapi/src/test/resources/logback-test.xml b/proteus-openapi/src/test/resources/logback-test.xml similarity index 100% rename from openapi/src/test/resources/logback-test.xml rename to proteus-openapi/src/test/resources/logback-test.xml diff --git a/swagger/pom.xml b/proteus-swagger/pom.xml similarity index 98% rename from swagger/pom.xml rename to proteus-swagger/pom.xml index 0a72720..23e9988 100644 --- a/swagger/pom.xml +++ b/proteus-swagger/pom.xml @@ -4,7 +4,6 @@ proteus-project io.sinistral 0.4.3-SNAPSHOT - ../pom.xml 4.0.0 diff --git a/swagger/src/main/java/io/sinistral/proteus/swagger/jaxrs2/AnnotationHelper.java b/proteus-swagger/src/main/java/io/sinistral/proteus/swagger/jaxrs2/AnnotationHelper.java similarity index 100% rename from swagger/src/main/java/io/sinistral/proteus/swagger/jaxrs2/AnnotationHelper.java rename to proteus-swagger/src/main/java/io/sinistral/proteus/swagger/jaxrs2/AnnotationHelper.java diff --git a/swagger/src/main/java/io/sinistral/proteus/swagger/jaxrs2/Reader.java b/proteus-swagger/src/main/java/io/sinistral/proteus/swagger/jaxrs2/Reader.java similarity index 100% rename from swagger/src/main/java/io/sinistral/proteus/swagger/jaxrs2/Reader.java rename to proteus-swagger/src/main/java/io/sinistral/proteus/swagger/jaxrs2/Reader.java diff --git a/swagger/src/main/java/io/sinistral/proteus/swagger/jaxrs2/ServerParameterExtension.java b/proteus-swagger/src/main/java/io/sinistral/proteus/swagger/jaxrs2/ServerParameterExtension.java similarity index 100% rename from swagger/src/main/java/io/sinistral/proteus/swagger/jaxrs2/ServerParameterExtension.java rename to proteus-swagger/src/main/java/io/sinistral/proteus/swagger/jaxrs2/ServerParameterExtension.java diff --git a/swagger/src/main/java/io/sinistral/proteus/swagger/services/SwaggerService.java b/proteus-swagger/src/main/java/io/sinistral/proteus/swagger/services/SwaggerService.java similarity index 100% rename from swagger/src/main/java/io/sinistral/proteus/swagger/services/SwaggerService.java rename to proteus-swagger/src/main/java/io/sinistral/proteus/swagger/services/SwaggerService.java diff --git a/swagger/src/main/resources/application.conf b/proteus-swagger/src/main/resources/application.conf similarity index 100% rename from swagger/src/main/resources/application.conf rename to proteus-swagger/src/main/resources/application.conf diff --git a/swagger/src/main/resources/io/sinistral/proteus/swagger/index.html b/proteus-swagger/src/main/resources/io/sinistral/proteus/swagger/index.html similarity index 100% rename from swagger/src/main/resources/io/sinistral/proteus/swagger/index.html rename to proteus-swagger/src/main/resources/io/sinistral/proteus/swagger/index.html diff --git a/swagger/src/main/resources/io/sinistral/proteus/swagger/proteus-logo.svg b/proteus-swagger/src/main/resources/io/sinistral/proteus/swagger/proteus-logo.svg similarity index 100% rename from swagger/src/main/resources/io/sinistral/proteus/swagger/proteus-logo.svg rename to proteus-swagger/src/main/resources/io/sinistral/proteus/swagger/proteus-logo.svg diff --git a/swagger/src/main/resources/io/sinistral/proteus/swagger/redoc.html b/proteus-swagger/src/main/resources/io/sinistral/proteus/swagger/redoc.html similarity index 100% rename from swagger/src/main/resources/io/sinistral/proteus/swagger/redoc.html rename to proteus-swagger/src/main/resources/io/sinistral/proteus/swagger/redoc.html diff --git a/swagger/src/main/resources/io/sinistral/proteus/swagger/swagger-ui-bundle.js b/proteus-swagger/src/main/resources/io/sinistral/proteus/swagger/swagger-ui-bundle.js similarity index 100% rename from swagger/src/main/resources/io/sinistral/proteus/swagger/swagger-ui-bundle.js rename to proteus-swagger/src/main/resources/io/sinistral/proteus/swagger/swagger-ui-bundle.js diff --git a/swagger/src/main/resources/io/sinistral/proteus/swagger/swagger-ui-standalone-preset.js b/proteus-swagger/src/main/resources/io/sinistral/proteus/swagger/swagger-ui-standalone-preset.js similarity index 100% rename from swagger/src/main/resources/io/sinistral/proteus/swagger/swagger-ui-standalone-preset.js rename to proteus-swagger/src/main/resources/io/sinistral/proteus/swagger/swagger-ui-standalone-preset.js diff --git a/swagger/src/main/resources/io/sinistral/proteus/swagger/swagger-ui.css b/proteus-swagger/src/main/resources/io/sinistral/proteus/swagger/swagger-ui.css similarity index 100% rename from swagger/src/main/resources/io/sinistral/proteus/swagger/swagger-ui.css rename to proteus-swagger/src/main/resources/io/sinistral/proteus/swagger/swagger-ui.css diff --git a/swagger/src/main/resources/io/sinistral/proteus/swagger/swagger-ui.js b/proteus-swagger/src/main/resources/io/sinistral/proteus/swagger/swagger-ui.js similarity index 100% rename from swagger/src/main/resources/io/sinistral/proteus/swagger/swagger-ui.js rename to proteus-swagger/src/main/resources/io/sinistral/proteus/swagger/swagger-ui.js diff --git a/swagger/src/main/resources/io/sinistral/proteus/swagger/themes/theme-feeling-blue.css b/proteus-swagger/src/main/resources/io/sinistral/proteus/swagger/themes/theme-feeling-blue.css similarity index 100% rename from swagger/src/main/resources/io/sinistral/proteus/swagger/themes/theme-feeling-blue.css rename to proteus-swagger/src/main/resources/io/sinistral/proteus/swagger/themes/theme-feeling-blue.css diff --git a/swagger/src/main/resources/io/sinistral/proteus/swagger/themes/theme-flattop.css b/proteus-swagger/src/main/resources/io/sinistral/proteus/swagger/themes/theme-flattop.css similarity index 100% rename from swagger/src/main/resources/io/sinistral/proteus/swagger/themes/theme-flattop.css rename to proteus-swagger/src/main/resources/io/sinistral/proteus/swagger/themes/theme-flattop.css diff --git a/swagger/src/main/resources/io/sinistral/proteus/swagger/themes/theme-material.css b/proteus-swagger/src/main/resources/io/sinistral/proteus/swagger/themes/theme-material.css similarity index 100% rename from swagger/src/main/resources/io/sinistral/proteus/swagger/themes/theme-material.css rename to proteus-swagger/src/main/resources/io/sinistral/proteus/swagger/themes/theme-material.css diff --git a/swagger/src/main/resources/io/sinistral/proteus/swagger/themes/theme-monokai.css b/proteus-swagger/src/main/resources/io/sinistral/proteus/swagger/themes/theme-monokai.css similarity index 100% rename from swagger/src/main/resources/io/sinistral/proteus/swagger/themes/theme-monokai.css rename to proteus-swagger/src/main/resources/io/sinistral/proteus/swagger/themes/theme-monokai.css diff --git a/swagger/src/main/resources/io/sinistral/proteus/swagger/themes/theme-muted.css b/proteus-swagger/src/main/resources/io/sinistral/proteus/swagger/themes/theme-muted.css similarity index 100% rename from swagger/src/main/resources/io/sinistral/proteus/swagger/themes/theme-muted.css rename to proteus-swagger/src/main/resources/io/sinistral/proteus/swagger/themes/theme-muted.css diff --git a/swagger/src/main/resources/io/sinistral/proteus/swagger/themes/theme-newspaper.css b/proteus-swagger/src/main/resources/io/sinistral/proteus/swagger/themes/theme-newspaper.css similarity index 100% rename from swagger/src/main/resources/io/sinistral/proteus/swagger/themes/theme-newspaper.css rename to proteus-swagger/src/main/resources/io/sinistral/proteus/swagger/themes/theme-newspaper.css diff --git a/swagger/src/main/resources/io/sinistral/proteus/swagger/themes/theme-outline.css b/proteus-swagger/src/main/resources/io/sinistral/proteus/swagger/themes/theme-outline.css similarity index 100% rename from swagger/src/main/resources/io/sinistral/proteus/swagger/themes/theme-outline.css rename to proteus-swagger/src/main/resources/io/sinistral/proteus/swagger/themes/theme-outline.css diff --git a/swagger/src/test/java/io/sinistral/proteus/swagger/test/controllers/Tests.java b/proteus-swagger/src/test/java/io/sinistral/proteus/swagger/test/controllers/Tests.java similarity index 100% rename from swagger/src/test/java/io/sinistral/proteus/swagger/test/controllers/Tests.java rename to proteus-swagger/src/test/java/io/sinistral/proteus/swagger/test/controllers/Tests.java diff --git a/swagger/src/test/java/io/sinistral/proteus/swagger/test/server/DefaultServer.java b/proteus-swagger/src/test/java/io/sinistral/proteus/swagger/test/server/DefaultServer.java similarity index 100% rename from swagger/src/test/java/io/sinistral/proteus/swagger/test/server/DefaultServer.java rename to proteus-swagger/src/test/java/io/sinistral/proteus/swagger/test/server/DefaultServer.java diff --git a/swagger/src/test/java/io/sinistral/proteus/swagger/test/server/TestControllerEndpoints.java b/proteus-swagger/src/test/java/io/sinistral/proteus/swagger/test/server/TestControllerEndpoints.java similarity index 100% rename from swagger/src/test/java/io/sinistral/proteus/swagger/test/server/TestControllerEndpoints.java rename to proteus-swagger/src/test/java/io/sinistral/proteus/swagger/test/server/TestControllerEndpoints.java diff --git a/swagger/src/test/resources/application.conf b/proteus-swagger/src/test/resources/application.conf similarity index 100% rename from swagger/src/test/resources/application.conf rename to proteus-swagger/src/test/resources/application.conf diff --git a/swagger/src/test/resources/logback-test.xml b/proteus-swagger/src/test/resources/logback-test.xml similarity index 100% rename from swagger/src/test/resources/logback-test.xml rename to proteus-swagger/src/test/resources/logback-test.xml