Restructure modules to support parent artifact.

noboomu · Nov 21, 2019 · e529d9e · e529d9e
1 parent 36b065e
commit e529d9e
Show file tree

Hide file tree

Showing 94 changed files with 15 additions and 7 deletions.
diff --git 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
@@ -6,15 +6,16 @@
     <artifactId>proteus-project</artifactId>
     <packaging>pom</packaging>
     <version>0.4.3-SNAPSHOT</version>
+    <name>Proteus Project</name>
 
     <description>Proteus is an extremely light, fast, and flexible Java REST API framework built atop Undertow.</description>
     <url>http://github.com/noboomu/proteus</url>
 
 
     <modules>
-        <module>core</module>
-        <module>swagger</module>
-        <module>openapi</module>
+        <module>proteus-core</module>
+        <module>proteus-swagger</module>
+        <module>proteus-openapi</module>
     </modules>
 
     <licenses>

diff --git a/core/conf/logback.xml → proteus-core/conf/logback.xml b/core/conf/logback.xml → proteus-core/conf/logback.xml
diff --git a/core/pom.xml → proteus-core/pom.xml b/core/pom.xml → proteus-core/pom.xml
@@ -4,7 +4,6 @@
         <artifactId>proteus-project</artifactId>
         <groupId>io.sinistral</groupId>
         <version>0.4.3-SNAPSHOT</version>
-        <relativePath> ../pom.xml</relativePath>
 
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/...sinistral/proteus/ProteusApplication.java → ...sinistral/proteus/ProteusApplication.java b/...sinistral/proteus/ProteusApplication.java → ...sinistral/proteus/ProteusApplication.java
diff --git a/...nistral/proteus/annotations/Blocking.java → ...nistral/proteus/annotations/Blocking.java b/...nistral/proteus/annotations/Blocking.java → ...nistral/proteus/annotations/Blocking.java
diff --git a/.../sinistral/proteus/annotations/Chain.java → .../sinistral/proteus/annotations/Chain.java b/.../sinistral/proteus/annotations/Chain.java → .../sinistral/proteus/annotations/Chain.java
diff --git a/.../sinistral/proteus/annotations/Debug.java → .../sinistral/proteus/annotations/Debug.java b/.../sinistral/proteus/annotations/Debug.java → .../sinistral/proteus/annotations/Debug.java
diff --git a/...al/proteus/modules/ApplicationModule.java → ...al/proteus/modules/ApplicationModule.java b/...al/proteus/modules/ApplicationModule.java → ...al/proteus/modules/ApplicationModule.java
diff --git a/...nistral/proteus/modules/ConfigModule.java → ...nistral/proteus/modules/ConfigModule.java b/...nistral/proteus/modules/ConfigModule.java → ...nistral/proteus/modules/ConfigModule.java
diff --git a/...istral/proteus/modules/JacksonModule.java → ...istral/proteus/modules/JacksonModule.java b/...istral/proteus/modules/JacksonModule.java → ...istral/proteus/modules/JacksonModule.java
diff --git a/.../sinistral/proteus/server/Extractors.java → .../sinistral/proteus/server/Extractors.java b/.../sinistral/proteus/server/Extractors.java → .../sinistral/proteus/server/Extractors.java
diff --git a/...o/sinistral/proteus/server/MediaType.java → ...o/sinistral/proteus/server/MediaType.java b/...o/sinistral/proteus/server/MediaType.java → ...o/sinistral/proteus/server/MediaType.java
diff --git a/...nistral/proteus/server/ServerRequest.java → ...nistral/proteus/server/ServerRequest.java b/...nistral/proteus/server/ServerRequest.java → ...nistral/proteus/server/ServerRequest.java
diff --git a/...istral/proteus/server/ServerResponse.java → ...istral/proteus/server/ServerResponse.java b/...istral/proteus/server/ServerResponse.java → ...istral/proteus/server/ServerResponse.java
diff --git a/...roteus/server/endpoints/EndpointInfo.java → ...roteus/server/endpoints/EndpointInfo.java b/...roteus/server/endpoints/EndpointInfo.java → ...roteus/server/endpoints/EndpointInfo.java
diff --git a/...us/server/exceptions/ServerException.java → ...us/server/exceptions/ServerException.java b/...us/server/exceptions/ServerException.java → ...us/server/exceptions/ServerException.java
diff --git a/...eus/server/handlers/HandlerGenerator.java → ...eus/server/handlers/HandlerGenerator.java b/...eus/server/handlers/HandlerGenerator.java → ...eus/server/handlers/HandlerGenerator.java
diff --git a/...oteus/server/handlers/ProteusHandler.java → ...oteus/server/handlers/ProteusHandler.java b/...oteus/server/handlers/ProteusHandler.java → ...oteus/server/handlers/ProteusHandler.java
diff --git a/...er/handlers/ServerDefaultHttpHandler.java → ...er/handlers/ServerDefaultHttpHandler.java b/...er/handlers/ServerDefaultHttpHandler.java → ...er/handlers/ServerDefaultHttpHandler.java
diff --git a/...ndlers/ServerDefaultResponseListener.java → ...ndlers/ServerDefaultResponseListener.java b/...ndlers/ServerDefaultResponseListener.java → ...ndlers/ServerDefaultResponseListener.java
diff --git a/...erver/handlers/ServerFallbackHandler.java → ...erver/handlers/ServerFallbackHandler.java b/...erver/handlers/ServerFallbackHandler.java → ...erver/handlers/ServerFallbackHandler.java
diff --git a/.../proteus/server/handlers/TypeHandler.java → .../proteus/server/handlers/TypeHandler.java b/.../proteus/server/handlers/TypeHandler.java → .../proteus/server/handlers/TypeHandler.java
diff --git a/...tes/MaxRequestContentLengthPredicate.java → ...tes/MaxRequestContentLengthPredicate.java b/...tes/MaxRequestContentLengthPredicate.java → ...tes/MaxRequestContentLengthPredicate.java
diff --git a/...s/server/predicates/ServerPredicates.java → ...s/server/predicates/ServerPredicates.java b/...s/server/predicates/ServerPredicates.java → ...s/server/predicates/ServerPredicates.java
diff --git a/...s/server/security/MapIdentityManager.java → ...s/server/security/MapIdentityManager.java b/...s/server/security/MapIdentityManager.java → ...s/server/security/MapIdentityManager.java
diff --git a/...stral/proteus/services/AssetsService.java → ...stral/proteus/services/AssetsService.java b/...stral/proteus/services/AssetsService.java → ...stral/proteus/services/AssetsService.java
diff --git a/...nistral/proteus/services/BaseService.java → ...nistral/proteus/services/BaseService.java b/...nistral/proteus/services/BaseService.java → ...nistral/proteus/services/BaseService.java
diff --git a/...tral/proteus/services/DefaultService.java → ...tral/proteus/services/DefaultService.java b/...tral/proteus/services/DefaultService.java → ...tral/proteus/services/DefaultService.java
diff --git a/...istral/proteus/utilities/SecurityOps.java → ...istral/proteus/utilities/SecurityOps.java b/...istral/proteus/utilities/SecurityOps.java → ...istral/proteus/utilities/SecurityOps.java
diff --git a/...stral/proteus/utilities/TablePrinter.java → ...stral/proteus/utilities/TablePrinter.java b/...stral/proteus/utilities/TablePrinter.java → ...stral/proteus/utilities/TablePrinter.java
diff --git a/...ral/proteus/wrappers/JsonViewWrapper.java → ...ral/proteus/wrappers/JsonViewWrapper.java b/...ral/proteus/wrappers/JsonViewWrapper.java → ...ral/proteus/wrappers/JsonViewWrapper.java
diff --git a/core/src/main/resources/META-INF/MANIFEST.MF → ...e/src/main/resources/META-INF/MANIFEST.MF b/core/src/main/resources/META-INF/MANIFEST.MF → ...e/src/main/resources/META-INF/MANIFEST.MF
diff --git a/...s/io.undertow.protocols.alpn.ALPNProvider → ...s/io.undertow.protocols.alpn.ALPNProvider b/...s/io.undertow.protocols.alpn.ALPNProvider → ...s/io.undertow.protocols.alpn.ALPNProvider
diff --git a/core/src/main/resources/development.cer → ...s-core/src/main/resources/development.cer b/core/src/main/resources/development.cer → ...s-core/src/main/resources/development.cer
diff --git a/core/src/main/resources/development.jks → ...s-core/src/main/resources/development.jks b/core/src/main/resources/development.jks → ...s-core/src/main/resources/development.jks
diff --git a/core/src/main/resources/development.ts → ...us-core/src/main/resources/development.ts b/core/src/main/resources/development.ts → ...us-core/src/main/resources/development.ts
diff --git a/...esources/io/sinistral/proteus/favicon.ico → ...esources/io/sinistral/proteus/favicon.ico b/...esources/io/sinistral/proteus/favicon.ico → ...esources/io/sinistral/proteus/favicon.ico
diff --git a/...ces/io/sinistral/proteus/proteus-logo.svg → ...ces/io/sinistral/proteus/proteus-logo.svg b/...ces/io/sinistral/proteus/proteus-logo.svg → ...ces/io/sinistral/proteus/proteus-logo.svg
diff --git a/core/src/main/resources/proteus-logo.svg → ...-core/src/main/resources/proteus-logo.svg b/core/src/main/resources/proteus-logo.svg → ...-core/src/main/resources/proteus-logo.svg
diff --git a/core/src/main/resources/reference.conf → ...us-core/src/main/resources/reference.conf b/core/src/main/resources/reference.conf → ...us-core/src/main/resources/reference.conf
diff --git a/...stral/proteus/test/controllers/Tests.java → ...stral/proteus/test/controllers/Tests.java b/...stral/proteus/test/controllers/Tests.java → ...stral/proteus/test/controllers/Tests.java
diff --git a/...o/sinistral/proteus/test/models/User.java → ...o/sinistral/proteus/test/models/User.java b/...o/sinistral/proteus/test/models/User.java → ...o/sinistral/proteus/test/models/User.java
diff --git a/...al/proteus/test/server/DefaultServer.java → ...al/proteus/test/server/DefaultServer.java b/...al/proteus/test/server/DefaultServer.java → ...al/proteus/test/server/DefaultServer.java
diff --git a/.../test/server/TestControllerEndpoints.java → .../test/server/TestControllerEndpoints.java b/.../test/server/TestControllerEndpoints.java → .../test/server/TestControllerEndpoints.java
diff --git a/...oteus/test/wrappers/TestClassWrapper.java → ...oteus/test/wrappers/TestClassWrapper.java b/...oteus/test/wrappers/TestClassWrapper.java → ...oteus/test/wrappers/TestClassWrapper.java
diff --git a/...al/proteus/test/wrappers/TestWrapper.java → ...al/proteus/test/wrappers/TestWrapper.java b/...al/proteus/test/wrappers/TestWrapper.java → ...al/proteus/test/wrappers/TestWrapper.java
diff --git a/core/src/test/resources/application.conf → ...-core/src/test/resources/application.conf b/core/src/test/resources/application.conf → ...-core/src/test/resources/application.conf
diff --git a/core/src/test/resources/development.jks → ...s-core/src/test/resources/development.jks b/core/src/test/resources/development.jks → ...s-core/src/test/resources/development.jks
diff --git a/core/src/test/resources/development.ts → ...us-core/src/test/resources/development.ts b/core/src/test/resources/development.ts → ...us-core/src/test/resources/development.ts
diff --git a/core/src/test/resources/logback-test.xml → ...-core/src/test/resources/logback-test.xml b/core/src/test/resources/logback-test.xml → ...-core/src/test/resources/logback-test.xml
diff --git a/openapi/pom.xml → proteus-openapi/pom.xml b/openapi/pom.xml → proteus-openapi/pom.xml
@@ -4,14 +4,13 @@
         <artifactId>proteus-project</artifactId>
         <groupId>io.sinistral</groupId>
         <version>0.4.3-SNAPSHOT</version>
-        <relativePath> ../pom.xml</relativePath>
 
     </parent>
+
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>proteus-openapi</artifactId>
 
-
     <name>Proteus OpenAPI</name>
 
     <packaging>jar</packaging>

diff --git a/...istral/proteus/openapi/jaxrs2/Reader.java → ...istral/proteus/openapi/jaxrs2/Reader.java b/...istral/proteus/openapi/jaxrs2/Reader.java → ...istral/proteus/openapi/jaxrs2/Reader.java
diff --git a/...s/openapi/jaxrs2/ServerModelResolver.java → ...s/openapi/jaxrs2/ServerModelResolver.java b/...s/openapi/jaxrs2/ServerModelResolver.java → ...s/openapi/jaxrs2/ServerModelResolver.java
diff --git a/...napi/jaxrs2/ServerParameterExtension.java → ...napi/jaxrs2/ServerParameterExtension.java b/...napi/jaxrs2/ServerParameterExtension.java → ...napi/jaxrs2/ServerParameterExtension.java
diff --git a/...teus/openapi/services/OpenAPIService.java → ...teus/openapi/services/OpenAPIService.java b/...teus/openapi/services/OpenAPIService.java → ...teus/openapi/services/OpenAPIService.java
diff --git a/...s/io/sinistral/proteus/openapi/index.html → ...s/io/sinistral/proteus/openapi/index.html b/...s/io/sinistral/proteus/openapi/index.html → ...s/io/sinistral/proteus/openapi/index.html
diff --git a/...s/io/sinistral/proteus/openapi/redoc.html → ...s/io/sinistral/proteus/openapi/redoc.html b/...s/io/sinistral/proteus/openapi/redoc.html → ...s/io/sinistral/proteus/openapi/redoc.html
diff --git a/.../sinistral/proteus/openapi/swagger-ui.css → .../sinistral/proteus/openapi/swagger-ui.css b/.../sinistral/proteus/openapi/swagger-ui.css → .../sinistral/proteus/openapi/swagger-ui.css
diff --git a/...penapi/test/controllers/OpenAPITests.java → ...penapi/test/controllers/OpenAPITests.java b/...penapi/test/controllers/OpenAPITests.java → ...penapi/test/controllers/OpenAPITests.java
diff --git a/.../test/converters/MoneyModelConverter.java → .../test/converters/MoneyModelConverter.java b/.../test/converters/MoneyModelConverter.java → .../test/converters/MoneyModelConverter.java
diff --git a/...ral/proteus/openapi/test/models/Pojo.java → ...ral/proteus/openapi/test/models/Pojo.java b/...ral/proteus/openapi/test/models/Pojo.java → ...ral/proteus/openapi/test/models/Pojo.java
diff --git a/...s/openapi/test/modules/JacksonModule.java → ...s/openapi/test/modules/JacksonModule.java b/...s/openapi/test/modules/JacksonModule.java → ...s/openapi/test/modules/JacksonModule.java
diff --git a/...api/test/server/OpenAPIDefaultServer.java → ...api/test/server/OpenAPIDefaultServer.java b/...api/test/server/OpenAPIDefaultServer.java → ...api/test/server/OpenAPIDefaultServer.java
diff --git a/...erver/TestOpenAPIControllerEndpoints.java → ...erver/TestOpenAPIControllerEndpoints.java b/...erver/TestOpenAPIControllerEndpoints.java → ...erver/TestOpenAPIControllerEndpoints.java
diff --git a/openapi/src/test/resources/application.conf → ...enapi/src/test/resources/application.conf b/openapi/src/test/resources/application.conf → ...enapi/src/test/resources/application.conf
diff --git a/openapi/src/test/resources/development.jks → ...penapi/src/test/resources/development.jks b/openapi/src/test/resources/development.jks → ...penapi/src/test/resources/development.jks
diff --git a/openapi/src/test/resources/development.ts → ...openapi/src/test/resources/development.ts b/openapi/src/test/resources/development.ts → ...openapi/src/test/resources/development.ts
diff --git a/openapi/src/test/resources/logback-test.xml → ...enapi/src/test/resources/logback-test.xml b/openapi/src/test/resources/logback-test.xml → ...enapi/src/test/resources/logback-test.xml
diff --git a/swagger/pom.xml → proteus-swagger/pom.xml b/swagger/pom.xml → proteus-swagger/pom.xml
@@ -4,7 +4,6 @@
         <artifactId>proteus-project</artifactId>
         <groupId>io.sinistral</groupId>
         <version>0.4.3-SNAPSHOT</version>
-        <relativePath> ../pom.xml</relativePath>
 
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/...teus/swagger/jaxrs2/AnnotationHelper.java → ...teus/swagger/jaxrs2/AnnotationHelper.java b/...teus/swagger/jaxrs2/AnnotationHelper.java → ...teus/swagger/jaxrs2/AnnotationHelper.java
diff --git a/...istral/proteus/swagger/jaxrs2/Reader.java → ...istral/proteus/swagger/jaxrs2/Reader.java b/...istral/proteus/swagger/jaxrs2/Reader.java → ...istral/proteus/swagger/jaxrs2/Reader.java
diff --git a/...gger/jaxrs2/ServerParameterExtension.java → ...gger/jaxrs2/ServerParameterExtension.java b/...gger/jaxrs2/ServerParameterExtension.java → ...gger/jaxrs2/ServerParameterExtension.java
diff --git a/...teus/swagger/services/SwaggerService.java → ...teus/swagger/services/SwaggerService.java b/...teus/swagger/services/SwaggerService.java → ...teus/swagger/services/SwaggerService.java
diff --git a/swagger/src/main/resources/application.conf → ...agger/src/main/resources/application.conf b/swagger/src/main/resources/application.conf → ...agger/src/main/resources/application.conf
diff --git a/...s/io/sinistral/proteus/swagger/index.html → ...s/io/sinistral/proteus/swagger/index.html b/...s/io/sinistral/proteus/swagger/index.html → ...s/io/sinistral/proteus/swagger/index.html
diff --git a/...inistral/proteus/swagger/proteus-logo.svg → ...inistral/proteus/swagger/proteus-logo.svg b/...inistral/proteus/swagger/proteus-logo.svg → ...inistral/proteus/swagger/proteus-logo.svg
diff --git a/...s/io/sinistral/proteus/swagger/redoc.html → ...s/io/sinistral/proteus/swagger/redoc.html b/...s/io/sinistral/proteus/swagger/redoc.html → ...s/io/sinistral/proteus/swagger/redoc.html
diff --git a/...tral/proteus/swagger/swagger-ui-bundle.js → ...tral/proteus/swagger/swagger-ui-bundle.js b/...tral/proteus/swagger/swagger-ui-bundle.js → ...tral/proteus/swagger/swagger-ui-bundle.js
diff --git a/...s/swagger/swagger-ui-standalone-preset.js → ...s/swagger/swagger-ui-standalone-preset.js b/...s/swagger/swagger-ui-standalone-preset.js → ...s/swagger/swagger-ui-standalone-preset.js
diff --git a/.../sinistral/proteus/swagger/swagger-ui.css → .../sinistral/proteus/swagger/swagger-ui.css b/.../sinistral/proteus/swagger/swagger-ui.css → .../sinistral/proteus/swagger/swagger-ui.css
diff --git a/...o/sinistral/proteus/swagger/swagger-ui.js → ...o/sinistral/proteus/swagger/swagger-ui.js b/...o/sinistral/proteus/swagger/swagger-ui.js → ...o/sinistral/proteus/swagger/swagger-ui.js
diff --git a/...eus/swagger/themes/theme-feeling-blue.css → ...eus/swagger/themes/theme-feeling-blue.css b/...eus/swagger/themes/theme-feeling-blue.css → ...eus/swagger/themes/theme-feeling-blue.css
diff --git a/.../proteus/swagger/themes/theme-flattop.css → .../proteus/swagger/themes/theme-flattop.css b/.../proteus/swagger/themes/theme-flattop.css → .../proteus/swagger/themes/theme-flattop.css
diff --git a/...proteus/swagger/themes/theme-material.css → ...proteus/swagger/themes/theme-material.css b/...proteus/swagger/themes/theme-material.css → ...proteus/swagger/themes/theme-material.css
diff --git a/.../proteus/swagger/themes/theme-monokai.css → .../proteus/swagger/themes/theme-monokai.css b/.../proteus/swagger/themes/theme-monokai.css → .../proteus/swagger/themes/theme-monokai.css
diff --git a/...al/proteus/swagger/themes/theme-muted.css → ...al/proteus/swagger/themes/theme-muted.css b/...al/proteus/swagger/themes/theme-muted.css → ...al/proteus/swagger/themes/theme-muted.css
diff --git a/...roteus/swagger/themes/theme-newspaper.css → ...roteus/swagger/themes/theme-newspaper.css b/...roteus/swagger/themes/theme-newspaper.css → ...roteus/swagger/themes/theme-newspaper.css
diff --git a/.../proteus/swagger/themes/theme-outline.css → .../proteus/swagger/themes/theme-outline.css b/.../proteus/swagger/themes/theme-outline.css → .../proteus/swagger/themes/theme-outline.css
diff --git a/...oteus/swagger/test/controllers/Tests.java → ...oteus/swagger/test/controllers/Tests.java b/...oteus/swagger/test/controllers/Tests.java → ...oteus/swagger/test/controllers/Tests.java
diff --git a/...us/swagger/test/server/DefaultServer.java → ...us/swagger/test/server/DefaultServer.java b/...us/swagger/test/server/DefaultServer.java → ...us/swagger/test/server/DefaultServer.java
diff --git a/.../test/server/TestControllerEndpoints.java → .../test/server/TestControllerEndpoints.java b/.../test/server/TestControllerEndpoints.java → .../test/server/TestControllerEndpoints.java
diff --git a/swagger/src/test/resources/application.conf → ...agger/src/test/resources/application.conf b/swagger/src/test/resources/application.conf → ...agger/src/test/resources/application.conf
diff --git a/swagger/src/test/resources/logback-test.xml → ...agger/src/test/resources/logback-test.xml b/swagger/src/test/resources/logback-test.xml → ...agger/src/test/resources/logback-test.xml