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 0c163c538 Move org.apache.juneau.http into a separate module.
0c163c538 is described below
commit 0c163c538e5b210f63b36fc06d7ff955b67d39b8
Author: JamesBognar <[email protected]>
AuthorDate: Sun Jun 26 13:17:47 2022 -0400
Move org.apache.juneau.http into a separate module.
---
juneau-core/juneau-config/pom.xml | 2 +-
juneau-core/juneau-dto/pom.xml | 61 ----------------
juneau-core/juneau-marshall-rdf/pom.xml | 60 ----------------
juneau-core/juneau-marshall/pom.xml | 72 -------------------
juneau-examples/juneau-examples-rest/pom.xml | 6 +-
.../juneau-microservice-core/pom.xml | 52 --------------
.../juneau-microservice-jetty/pom.xml | 52 --------------
juneau-rest/juneau-rest-client/pom.xml | 65 ++---------------
juneau-rest/juneau-rest-common/.gitignore | 6 ++
.../pom.xml | 47 +++---------
.../org/apache/juneau/http/BasicStatusLine.java | 0
.../java/org/apache/juneau/http/HttpEntities.java | 0
.../java/org/apache/juneau/http/HttpHeaders.java | 0
.../java/org/apache/juneau/http/HttpMethod.java | 0
.../java/org/apache/juneau/http/HttpParts.java | 0
.../java/org/apache/juneau/http/HttpResources.java | 0
.../java/org/apache/juneau/http/HttpResponses.java | 0
.../apache/juneau/http/entity/BasicHttpEntity.java | 0
.../apache/juneau/http/entity/ByteArrayEntity.java | 0
.../org/apache/juneau/http/entity/FileEntity.java | 0
.../juneau/http/entity/HttpEntityBuilder.java | 0
.../juneau/http/entity/InputStreamEntity.java | 0
.../apache/juneau/http/entity/ReaderEntity.java | 0
.../juneau/http/entity/SerializedEntity.java | 0
.../http/entity/SerializedEntityBuilder.java | 0
.../apache/juneau/http/entity/StringEntity.java | 0
.../apache/juneau/http/entity/package-info.java | 0
.../java/org/apache/juneau/http/header/Accept.java | 0
.../apache/juneau/http/header/AcceptCharset.java | 0
.../apache/juneau/http/header/AcceptEncoding.java | 0
.../apache/juneau/http/header/AcceptLanguage.java | 0
.../apache/juneau/http/header/AcceptRanges.java | 0
.../java/org/apache/juneau/http/header/Age.java | 0
.../java/org/apache/juneau/http/header/Allow.java | 0
.../apache/juneau/http/header/Authorization.java | 0
.../juneau/http/header/BasicBooleanHeader.java | 0
.../apache/juneau/http/header/BasicCsvHeader.java | 0
.../apache/juneau/http/header/BasicDateHeader.java | 0
.../juneau/http/header/BasicEntityTagHeader.java | 0
.../juneau/http/header/BasicEntityTagsHeader.java | 0
.../org/apache/juneau/http/header/BasicHeader.java | 0
.../juneau/http/header/BasicHeaderIterator.java | 0
.../juneau/http/header/BasicIntegerHeader.java | 0
.../apache/juneau/http/header/BasicLongHeader.java | 0
.../juneau/http/header/BasicMediaRangesHeader.java | 0
.../juneau/http/header/BasicMediaTypeHeader.java | 0
.../juneau/http/header/BasicStringHeader.java | 0
.../http/header/BasicStringRangesHeader.java | 0
.../apache/juneau/http/header/BasicUriHeader.java | 0
.../apache/juneau/http/header/CacheControl.java | 0
.../apache/juneau/http/header/ClientVersion.java | 0
.../org/apache/juneau/http/header/Connection.java | 0
.../juneau/http/header/ContentDisposition.java | 0
.../apache/juneau/http/header/ContentEncoding.java | 0
.../apache/juneau/http/header/ContentLanguage.java | 0
.../apache/juneau/http/header/ContentLength.java | 0
.../apache/juneau/http/header/ContentLocation.java | 0
.../apache/juneau/http/header/ContentRange.java | 0
.../org/apache/juneau/http/header/ContentType.java | 0
.../java/org/apache/juneau/http/header/Date.java | 0
.../java/org/apache/juneau/http/header/Debug.java | 0
.../java/org/apache/juneau/http/header/ETag.java | 0
.../org/apache/juneau/http/header/EntityTag.java | 0
.../org/apache/juneau/http/header/EntityTags.java | 0
.../java/org/apache/juneau/http/header/Expect.java | 0
.../org/apache/juneau/http/header/Expires.java | 0
.../org/apache/juneau/http/header/Forwarded.java | 0
.../java/org/apache/juneau/http/header/From.java | 0
.../apache/juneau/http/header/HeaderBeanMeta.java | 0
.../org/apache/juneau/http/header/HeaderList.java | 0
.../org/apache/juneau/http/header/Headerable.java | 0
.../java/org/apache/juneau/http/header/Host.java | 0
.../org/apache/juneau/http/header/IfMatch.java | 0
.../apache/juneau/http/header/IfModifiedSince.java | 0
.../org/apache/juneau/http/header/IfNoneMatch.java | 0
.../org/apache/juneau/http/header/IfRange.java | 0
.../juneau/http/header/IfUnmodifiedSince.java | 0
.../apache/juneau/http/header/LastModified.java | 0
.../org/apache/juneau/http/header/Location.java | 0
.../org/apache/juneau/http/header/MaxForwards.java | 0
.../org/apache/juneau/http/header/NoTrace.java | 0
.../java/org/apache/juneau/http/header/Origin.java | 0
.../java/org/apache/juneau/http/header/Pragma.java | 0
.../juneau/http/header/ProxyAuthenticate.java | 0
.../juneau/http/header/ProxyAuthorization.java | 0
.../java/org/apache/juneau/http/header/Range.java | 0
.../org/apache/juneau/http/header/Referer.java | 0
.../org/apache/juneau/http/header/RetryAfter.java | 0
.../juneau/http/header/SerializedHeader.java | 0
.../java/org/apache/juneau/http/header/Server.java | 0
.../java/org/apache/juneau/http/header/TE.java | 0
.../java/org/apache/juneau/http/header/Thrown.java | 0
.../org/apache/juneau/http/header/Trailer.java | 0
.../juneau/http/header/TransferEncoding.java | 0
.../org/apache/juneau/http/header/Upgrade.java | 0
.../org/apache/juneau/http/header/UserAgent.java | 0
.../java/org/apache/juneau/http/header/Vary.java | 0
.../java/org/apache/juneau/http/header/Via.java | 0
.../org/apache/juneau/http/header/Warning.java | 0
.../apache/juneau/http/header/WwwAuthenticate.java | 0
.../apache/juneau/http/header/package-info.java | 0
.../java/org/apache/juneau/http/package-info.java | 0
.../apache/juneau/http/part/BasicBooleanPart.java | 0
.../apache/juneau/http/part/BasicCsvArrayPart.java | 0
.../org/apache/juneau/http/part/BasicDatePart.java | 0
.../apache/juneau/http/part/BasicIntegerPart.java | 0
.../org/apache/juneau/http/part/BasicLongPart.java | 0
.../org/apache/juneau/http/part/BasicPart.java | 0
.../apache/juneau/http/part/BasicPartIterator.java | 0
.../apache/juneau/http/part/BasicStringPart.java | 0
.../org/apache/juneau/http/part/BasicUriPart.java | 0
.../apache/juneau/http/part/NameValuePairable.java | 0
.../org/apache/juneau/http/part/PartBeanMeta.java | 0
.../org/apache/juneau/http/part/PartIterator.java | 0
.../java/org/apache/juneau/http/part/PartList.java | 0
.../apache/juneau/http/part/SerializedPart.java | 0
.../org/apache/juneau/http/part/package-info.java | 0
.../java/org/apache/juneau/http/remote/Remote.java | 0
.../apache/juneau/http/remote/RemoteDelete.java | 0
.../org/apache/juneau/http/remote/RemoteGet.java | 0
.../org/apache/juneau/http/remote/RemoteOp.java | 0
.../org/apache/juneau/http/remote/RemotePost.java | 0
.../org/apache/juneau/http/remote/RemotePut.java | 0
.../apache/juneau/http/remote/RemoteReturn.java | 0
.../org/apache/juneau/http/remote/RemoteUtils.java | 0
.../juneau/http/remote/RrpcInterfaceMeta.java | 0
.../http/remote/RrpcInterfaceMethodMeta.java | 0
.../apache/juneau/http/remote/package-info.java | 0
.../apache/juneau/http/resource/BasicResource.java | 0
.../juneau/http/resource/ByteArrayResource.java | 0
.../apache/juneau/http/resource/FileResource.java | 0
.../apache/juneau/http/resource/HttpResource.java | 0
.../juneau/http/resource/HttpResourceBuilder.java | 0
.../juneau/http/resource/InputStreamResource.java | 0
.../juneau/http/resource/ReaderResource.java | 0
.../juneau/http/resource/StringResource.java | 0
.../apache/juneau/http/resource/package-info.java | 0
.../org/apache/juneau/http/response/Accepted.java | 0
.../juneau/http/response/AlreadyReported.java | 0
.../apache/juneau/http/response/BadRequest.java | 0
.../juneau/http/response/BasicHttpException.java | 0
.../juneau/http/response/BasicHttpResponse.java | 0
.../org/apache/juneau/http/response/Conflict.java | 0
.../org/apache/juneau/http/response/Continue.java | 0
.../org/apache/juneau/http/response/Created.java | 0
.../apache/juneau/http/response/EarlyHints.java | 0
.../juneau/http/response/ExpectationFailed.java | 0
.../juneau/http/response/FailedDependency.java | 0
.../org/apache/juneau/http/response/Forbidden.java | 0
.../org/apache/juneau/http/response/Found.java | 0
.../java/org/apache/juneau/http/response/Gone.java | 0
.../juneau/http/response/HttpExceptionBuilder.java | 0
.../juneau/http/response/HttpResponseBuilder.java | 0
.../http/response/HttpVersionNotSupported.java | 0
.../org/apache/juneau/http/response/IMUsed.java | 0
.../juneau/http/response/InsufficientStorage.java | 0
.../juneau/http/response/InternalServerError.java | 0
.../juneau/http/response/LengthRequired.java | 0
.../org/apache/juneau/http/response/Locked.java | 0
.../apache/juneau/http/response/LoopDetected.java | 0
.../juneau/http/response/MethodNotAllowed.java | 0
.../juneau/http/response/MisdirectedRequest.java | 0
.../juneau/http/response/MovedPermanently.java | 0
.../apache/juneau/http/response/MultiStatus.java | 0
.../juneau/http/response/MultipleChoices.java | 0
.../response/NetworkAuthenticationRequired.java | 0
.../org/apache/juneau/http/response/NoContent.java | 0
.../http/response/NonAuthoritiveInformation.java | 0
.../apache/juneau/http/response/NotAcceptable.java | 0
.../apache/juneau/http/response/NotExtended.java | 0
.../org/apache/juneau/http/response/NotFound.java | 0
.../juneau/http/response/NotImplemented.java | 0
.../apache/juneau/http/response/NotModified.java | 0
.../java/org/apache/juneau/http/response/Ok.java | 0
.../juneau/http/response/PartialContent.java | 0
.../juneau/http/response/PayloadTooLarge.java | 0
.../juneau/http/response/PermanentRedirect.java | 0
.../juneau/http/response/PreconditionFailed.java | 0
.../juneau/http/response/PreconditionRequired.java | 0
.../apache/juneau/http/response/Processing.java | 0
.../juneau/http/response/RangeNotSatisfiable.java | 0
.../http/response/RequestHeaderFieldsTooLarge.java | 0
.../apache/juneau/http/response/ResetContent.java | 0
.../org/apache/juneau/http/response/SeeOther.java | 0
.../juneau/http/response/ServiceUnavailable.java | 0
.../juneau/http/response/SwitchingProtocols.java | 0
.../juneau/http/response/TemporaryRedirect.java | 0
.../juneau/http/response/TooManyRequests.java | 0
.../apache/juneau/http/response/Unauthorized.java | 0
.../http/response/UnavailableForLegalReasons.java | 0
.../juneau/http/response/UnprocessableEntity.java | 0
.../juneau/http/response/UnsupportedMediaType.java | 0
.../juneau/http/response/UpgradeRequired.java | 0
.../apache/juneau/http/response/UriTooLong.java | 0
.../org/apache/juneau/http/response/UseProxy.java | 0
.../http/response/VariantAlsoNegotiates.java | 0
.../apache/juneau/http/response/package-info.java | 0
juneau-rest/juneau-rest-mock/pom.xml | 51 -------------
juneau-rest/juneau-rest-server-jaxrs/pom.xml | 60 ----------------
juneau-rest/juneau-rest-server-rdf/pom.xml | 9 ---
juneau-rest/juneau-rest-server-springboot/pom.xml | 84 ++++------------------
juneau-rest/juneau-rest-server/pom.xml | 81 ++-------------------
juneau-rest/pom.xml | 1 +
juneau-sc/juneau-sc-server/pom.xml | 4 --
pom.xml | 5 --
205 files changed, 44 insertions(+), 674 deletions(-)
diff --git a/juneau-core/juneau-config/pom.xml
b/juneau-core/juneau-config/pom.xml
index 64e7a22b9..0fdf248d4 100644
--- a/juneau-core/juneau-config/pom.xml
+++ b/juneau-core/juneau-config/pom.xml
@@ -42,7 +42,7 @@
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
- </properties>
+ </properties>
<build>
<plugins>
diff --git a/juneau-core/juneau-dto/pom.xml b/juneau-core/juneau-dto/pom.xml
index 1dcab03d7..6b9657156 100644
--- a/juneau-core/juneau-dto/pom.xml
+++ b/juneau-core/juneau-dto/pom.xml
@@ -61,15 +61,6 @@
</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-source-plugin</artifactId>
@@ -103,58 +94,6 @@
</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>
-
<exclude>org.apache.juneau.dto.swagger.SchemaInfo</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>
-
</overrideCompatibilityChangeParameters>
- </parameter>
- </configuration>
- <executions>
- <execution>
- <phase>verify</phase>
- <goals>
- <goal>cmp</goal>
- </goals>
- </execution>
- </executions>
- </plugin-->
</plugins>
</build>
</project>
diff --git a/juneau-core/juneau-marshall-rdf/pom.xml
b/juneau-core/juneau-marshall-rdf/pom.xml
index 1369e0434..97d54bd4c 100644
--- a/juneau-core/juneau-marshall-rdf/pom.xml
+++ b/juneau-core/juneau-marshall-rdf/pom.xml
@@ -66,15 +66,6 @@
</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-source-plugin</artifactId>
@@ -108,57 +99,6 @@
</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-core/juneau-marshall/pom.xml
b/juneau-core/juneau-marshall/pom.xml
index 6bcfd935d..1abaacdf5 100644
--- a/juneau-core/juneau-marshall/pom.xml
+++ b/juneau-core/juneau-marshall/pom.xml
@@ -60,15 +60,6 @@
</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-source-plugin</artifactId>
@@ -102,69 +93,6 @@
</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>
-
<exclude>org.apache.juneau.internal</exclude>
-
<exclude>org.apache.juneau.yaml.proto</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>
-
<overrideCompatibilityChangeParameter>
-
<binaryCompatible>true</binaryCompatible>
-
<compatibilityChange>FIELD_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-examples/juneau-examples-rest/pom.xml
b/juneau-examples/juneau-examples-rest/pom.xml
index 2ac8583df..7df9346e9 100644
--- a/juneau-examples/juneau-examples-rest/pom.xml
+++ b/juneau-examples/juneau-examples-rest/pom.xml
@@ -75,9 +75,9 @@
<version>${hibernate.version}</version>
</dependency>
<dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <version>${xml.apis.version}</version>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>${xml.apis.version}</version>
</dependency>
<dependency>
diff --git a/juneau-microservice/juneau-microservice-core/pom.xml
b/juneau-microservice/juneau-microservice-core/pom.xml
index 62463c0ff..a7b9425ff 100644
--- a/juneau-microservice/juneau-microservice-core/pom.xml
+++ b/juneau-microservice/juneau-microservice-core/pom.xml
@@ -68,58 +68,6 @@
</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>juneau-microservice-core</artifactId>
- <version>7.1.0</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.microservice.resources</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>
-
</overrideCompatibilityChangeParameters>
- </parameter>
- </configuration>
- <executions>
- <execution>
- <phase>verify</phase>
- <goals>
- <goal>cmp</goal>
- </goals>
- </execution>
- </executions>
- </plugin-->
</plugins>
</build>
diff --git a/juneau-microservice/juneau-microservice-jetty/pom.xml
b/juneau-microservice/juneau-microservice-jetty/pom.xml
index 90dc5b06e..1700fbbfe 100644
--- a/juneau-microservice/juneau-microservice-jetty/pom.xml
+++ b/juneau-microservice/juneau-microservice-jetty/pom.xml
@@ -83,58 +83,6 @@
</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>juneau-microservice-jetty</artifactId>
- <version>7.1.0</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.microservice.jetty.resources</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>
-
</overrideCompatibilityChangeParameters>
- </parameter>
- </configuration>
- <executions>
- <execution>
- <phase>verify</phase>
- <goals>
- <goal>cmp</goal>
- </goals>
- </execution>
- </executions>
- </plugin-->
</plugins>
</build>
diff --git a/juneau-rest/juneau-rest-client/pom.xml
b/juneau-rest/juneau-rest-client/pom.xml
index 2360ecc04..f17059a9b 100644
--- a/juneau-rest/juneau-rest-client/pom.xml
+++ b/juneau-rest/juneau-rest-client/pom.xml
@@ -34,6 +34,11 @@
<artifactId>juneau-marshall</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.juneau</groupId>
+ <artifactId>juneau-rest-common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
@@ -82,66 +87,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>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-common/.gitignore
b/juneau-rest/juneau-rest-common/.gitignore
new file mode 100644
index 000000000..34acf885c
--- /dev/null
+++ b/juneau-rest/juneau-rest-common/.gitignore
@@ -0,0 +1,6 @@
+/target/
+**/.DS_Store
+.classpath
+.project
+/.settings/
+/bin/
diff --git a/juneau-rest/juneau-rest-server-rdf/pom.xml
b/juneau-rest/juneau-rest-common/pom.xml
similarity index 74%
copy from juneau-rest/juneau-rest-server-rdf/pom.xml
copy to juneau-rest/juneau-rest-common/pom.xml
index 6e12ce48d..6dbb06807 100644
--- a/juneau-rest/juneau-rest-server-rdf/pom.xml
+++ b/juneau-rest/juneau-rest-common/pom.xml
@@ -23,25 +23,20 @@
<version>9.0.0-SNAPSHOT</version>
</parent>
- <artifactId>juneau-rest-server-rdf</artifactId>
- <name>juneau/rest/rest-server-rdf</name>
- <description>Apache Juneau REST Servlet RDF support</description>
+ <artifactId>juneau-rest-common</artifactId>
+ <name>juneau/rest/rest-common</name>
+ <description>Apache Juneau REST Common API</description>
<packaging>bundle</packaging>
<dependencies>
<dependency>
<groupId>org.apache.juneau</groupId>
- <artifactId>juneau-rest-server</artifactId>
+ <artifactId>juneau-marshall</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.juneau</groupId>
- <artifactId>juneau-marshall-rdf</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
</dependency>
</dependencies>
@@ -55,19 +50,6 @@
<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>
@@ -75,26 +57,19 @@
<extensions>true</extensions>
<configuration>
<instructions>
-
<Automatic-Module-Name>org.apache.juneau.rest.server.rdf</Automatic-Module-Name>
+
<Automatic-Module-Name>org.apache.juneau.rest.common</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>
+ <artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
+ <id>attach-sources</id>
+ <phase>verify</phase>
<goals>
- <goal>test-jar</goal>
+ <goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/BasicStatusLine.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/BasicStatusLine.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/BasicStatusLine.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/BasicStatusLine.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpEntities.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/HttpEntities.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpEntities.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/HttpEntities.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpHeaders.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/HttpHeaders.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpHeaders.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/HttpHeaders.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpMethod.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/HttpMethod.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpMethod.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/HttpMethod.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpParts.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/HttpParts.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpParts.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/HttpParts.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpResources.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/HttpResources.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpResources.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/HttpResources.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpResponses.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/HttpResponses.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpResponses.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/HttpResponses.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/entity/BasicHttpEntity.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/BasicHttpEntity.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/entity/BasicHttpEntity.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/BasicHttpEntity.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/entity/ByteArrayEntity.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/ByteArrayEntity.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/entity/ByteArrayEntity.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/ByteArrayEntity.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/entity/FileEntity.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/FileEntity.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/entity/FileEntity.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/FileEntity.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/entity/HttpEntityBuilder.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/HttpEntityBuilder.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/entity/HttpEntityBuilder.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/HttpEntityBuilder.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/entity/InputStreamEntity.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/InputStreamEntity.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/entity/InputStreamEntity.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/InputStreamEntity.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/entity/ReaderEntity.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/ReaderEntity.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/entity/ReaderEntity.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/ReaderEntity.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/entity/SerializedEntity.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/SerializedEntity.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/entity/SerializedEntity.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/SerializedEntity.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/entity/SerializedEntityBuilder.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/SerializedEntityBuilder.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/entity/SerializedEntityBuilder.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/SerializedEntityBuilder.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/entity/StringEntity.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/StringEntity.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/entity/StringEntity.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/StringEntity.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/entity/package-info.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/package-info.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/entity/package-info.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/package-info.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Accept.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/Accept.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Accept.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/Accept.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/AcceptCharset.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/AcceptCharset.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/AcceptCharset.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/AcceptCharset.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/AcceptEncoding.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/AcceptEncoding.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/AcceptEncoding.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/AcceptEncoding.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/AcceptLanguage.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/AcceptLanguage.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/AcceptLanguage.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/AcceptLanguage.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/AcceptRanges.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/AcceptRanges.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/AcceptRanges.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/AcceptRanges.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Age.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/Age.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Age.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/Age.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Allow.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/Allow.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Allow.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/Allow.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Authorization.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/Authorization.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Authorization.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/Authorization.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/BasicBooleanHeader.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicBooleanHeader.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/BasicBooleanHeader.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicBooleanHeader.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/BasicCsvHeader.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicCsvHeader.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/BasicCsvHeader.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicCsvHeader.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/BasicDateHeader.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicDateHeader.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/BasicDateHeader.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicDateHeader.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/BasicEntityTagHeader.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicEntityTagHeader.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/BasicEntityTagHeader.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicEntityTagHeader.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/BasicEntityTagsHeader.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicEntityTagsHeader.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/BasicEntityTagsHeader.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicEntityTagsHeader.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/BasicHeader.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicHeader.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/BasicHeader.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicHeader.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/BasicHeaderIterator.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicHeaderIterator.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/BasicHeaderIterator.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicHeaderIterator.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/BasicIntegerHeader.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicIntegerHeader.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/BasicIntegerHeader.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicIntegerHeader.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/BasicLongHeader.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicLongHeader.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/BasicLongHeader.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicLongHeader.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/BasicMediaRangesHeader.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicMediaRangesHeader.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/BasicMediaRangesHeader.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicMediaRangesHeader.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/BasicMediaTypeHeader.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicMediaTypeHeader.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/BasicMediaTypeHeader.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicMediaTypeHeader.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/BasicStringHeader.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicStringHeader.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/BasicStringHeader.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicStringHeader.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/BasicStringRangesHeader.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicStringRangesHeader.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/BasicStringRangesHeader.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicStringRangesHeader.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/BasicUriHeader.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicUriHeader.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/BasicUriHeader.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicUriHeader.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/CacheControl.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/CacheControl.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/CacheControl.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/CacheControl.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/ClientVersion.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/ClientVersion.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/ClientVersion.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/ClientVersion.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Connection.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/Connection.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Connection.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/Connection.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/ContentDisposition.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/ContentDisposition.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/ContentDisposition.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/ContentDisposition.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/ContentEncoding.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/ContentEncoding.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/ContentEncoding.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/ContentEncoding.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/ContentLanguage.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/ContentLanguage.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/ContentLanguage.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/ContentLanguage.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/ContentLength.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/ContentLength.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/ContentLength.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/ContentLength.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/ContentLocation.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/ContentLocation.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/ContentLocation.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/ContentLocation.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/ContentRange.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/ContentRange.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/ContentRange.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/ContentRange.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/ContentType.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/ContentType.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/ContentType.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/ContentType.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Date.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/Date.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Date.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/Date.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Debug.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/Debug.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Debug.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/Debug.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/ETag.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/ETag.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/ETag.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/ETag.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/EntityTag.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/EntityTag.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/EntityTag.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/EntityTag.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/EntityTags.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/EntityTags.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/EntityTags.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/EntityTags.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Expect.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/Expect.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Expect.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/Expect.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Expires.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/Expires.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Expires.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/Expires.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Forwarded.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/Forwarded.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Forwarded.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/Forwarded.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/From.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/From.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/From.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/From.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/HeaderBeanMeta.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/HeaderBeanMeta.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/HeaderBeanMeta.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/HeaderBeanMeta.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/HeaderList.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/HeaderList.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/HeaderList.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/HeaderList.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Headerable.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/Headerable.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Headerable.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/Headerable.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Host.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/Host.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Host.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/Host.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/IfMatch.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/IfMatch.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/IfMatch.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/IfMatch.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/IfModifiedSince.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/IfModifiedSince.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/IfModifiedSince.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/IfModifiedSince.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/IfNoneMatch.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/IfNoneMatch.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/IfNoneMatch.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/IfNoneMatch.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/IfRange.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/IfRange.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/IfRange.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/IfRange.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/IfUnmodifiedSince.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/IfUnmodifiedSince.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/IfUnmodifiedSince.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/IfUnmodifiedSince.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/LastModified.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/LastModified.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/LastModified.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/LastModified.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Location.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/Location.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Location.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/Location.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/MaxForwards.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/MaxForwards.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/MaxForwards.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/MaxForwards.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/NoTrace.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/NoTrace.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/NoTrace.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/NoTrace.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Origin.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/Origin.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Origin.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/Origin.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Pragma.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/Pragma.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Pragma.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/Pragma.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/ProxyAuthenticate.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/ProxyAuthenticate.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/ProxyAuthenticate.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/ProxyAuthenticate.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/ProxyAuthorization.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/ProxyAuthorization.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/ProxyAuthorization.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/ProxyAuthorization.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Range.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/Range.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Range.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/Range.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Referer.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/Referer.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Referer.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/Referer.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/RetryAfter.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/RetryAfter.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/RetryAfter.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/RetryAfter.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/SerializedHeader.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/SerializedHeader.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/SerializedHeader.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/SerializedHeader.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Server.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/Server.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Server.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/Server.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/TE.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/TE.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/TE.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/TE.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Thrown.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/Thrown.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Thrown.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/Thrown.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Trailer.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/Trailer.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Trailer.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/Trailer.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/TransferEncoding.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/TransferEncoding.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/TransferEncoding.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/TransferEncoding.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Upgrade.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/Upgrade.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Upgrade.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/Upgrade.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/UserAgent.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/UserAgent.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/UserAgent.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/UserAgent.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Vary.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/Vary.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Vary.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/Vary.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Via.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/Via.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Via.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/Via.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Warning.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/Warning.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Warning.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/Warning.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/WwwAuthenticate.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/WwwAuthenticate.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/WwwAuthenticate.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/WwwAuthenticate.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/package-info.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/package-info.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/package-info.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/package-info.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/package-info.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/package-info.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/package-info.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/package-info.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/part/BasicBooleanPart.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/BasicBooleanPart.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/part/BasicBooleanPart.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/BasicBooleanPart.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/part/BasicCsvArrayPart.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/BasicCsvArrayPart.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/part/BasicCsvArrayPart.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/BasicCsvArrayPart.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/part/BasicDatePart.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/BasicDatePart.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/part/BasicDatePart.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/BasicDatePart.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/part/BasicIntegerPart.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/BasicIntegerPart.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/part/BasicIntegerPart.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/BasicIntegerPart.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/part/BasicLongPart.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/BasicLongPart.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/part/BasicLongPart.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/BasicLongPart.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/part/BasicPart.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/BasicPart.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/part/BasicPart.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/BasicPart.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/part/BasicPartIterator.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/BasicPartIterator.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/part/BasicPartIterator.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/BasicPartIterator.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/part/BasicStringPart.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/BasicStringPart.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/part/BasicStringPart.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/BasicStringPart.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/part/BasicUriPart.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/BasicUriPart.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/part/BasicUriPart.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/BasicUriPart.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/part/NameValuePairable.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/NameValuePairable.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/part/NameValuePairable.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/NameValuePairable.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/part/PartBeanMeta.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/PartBeanMeta.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/part/PartBeanMeta.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/PartBeanMeta.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/part/PartIterator.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/PartIterator.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/part/PartIterator.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/PartIterator.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/part/PartList.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/PartList.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/part/PartList.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/PartList.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/part/SerializedPart.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/SerializedPart.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/part/SerializedPart.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/SerializedPart.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/part/package-info.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/package-info.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/part/package-info.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/package-info.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/remote/Remote.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/remote/Remote.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/remote/Remote.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/remote/Remote.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/remote/RemoteDelete.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/remote/RemoteDelete.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/remote/RemoteDelete.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/remote/RemoteDelete.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/remote/RemoteGet.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/remote/RemoteGet.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/remote/RemoteGet.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/remote/RemoteGet.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/remote/RemoteOp.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/remote/RemoteOp.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/remote/RemoteOp.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/remote/RemoteOp.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/remote/RemotePost.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/remote/RemotePost.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/remote/RemotePost.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/remote/RemotePost.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/remote/RemotePut.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/remote/RemotePut.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/remote/RemotePut.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/remote/RemotePut.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/remote/RemoteReturn.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/remote/RemoteReturn.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/remote/RemoteReturn.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/remote/RemoteReturn.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/remote/RemoteUtils.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/remote/RemoteUtils.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/remote/RemoteUtils.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/remote/RemoteUtils.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/remote/RrpcInterfaceMeta.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/remote/RrpcInterfaceMeta.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/remote/RrpcInterfaceMeta.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/remote/RrpcInterfaceMeta.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/remote/RrpcInterfaceMethodMeta.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/remote/RrpcInterfaceMethodMeta.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/remote/RrpcInterfaceMethodMeta.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/remote/RrpcInterfaceMethodMeta.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/remote/package-info.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/remote/package-info.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/remote/package-info.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/remote/package-info.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/resource/BasicResource.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/resource/BasicResource.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/resource/BasicResource.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/resource/BasicResource.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/resource/ByteArrayResource.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/resource/ByteArrayResource.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/resource/ByteArrayResource.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/resource/ByteArrayResource.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/resource/FileResource.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/resource/FileResource.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/resource/FileResource.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/resource/FileResource.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/resource/HttpResource.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/resource/HttpResource.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/resource/HttpResource.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/resource/HttpResource.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/resource/HttpResourceBuilder.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/resource/HttpResourceBuilder.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/resource/HttpResourceBuilder.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/resource/HttpResourceBuilder.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/resource/InputStreamResource.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/resource/InputStreamResource.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/resource/InputStreamResource.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/resource/InputStreamResource.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/resource/ReaderResource.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/resource/ReaderResource.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/resource/ReaderResource.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/resource/ReaderResource.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/resource/StringResource.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/resource/StringResource.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/resource/StringResource.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/resource/StringResource.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/resource/package-info.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/resource/package-info.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/resource/package-info.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/resource/package-info.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/Accepted.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/Accepted.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/Accepted.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/Accepted.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/AlreadyReported.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/AlreadyReported.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/AlreadyReported.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/AlreadyReported.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/BadRequest.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/BadRequest.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/BadRequest.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/BadRequest.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/BasicHttpException.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/BasicHttpException.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/BasicHttpException.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/BasicHttpException.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/BasicHttpResponse.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/BasicHttpResponse.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/BasicHttpResponse.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/BasicHttpResponse.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/Conflict.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/Conflict.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/Conflict.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/Conflict.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/Continue.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/Continue.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/Continue.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/Continue.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/Created.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/Created.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/Created.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/Created.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/EarlyHints.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/EarlyHints.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/EarlyHints.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/EarlyHints.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/ExpectationFailed.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/ExpectationFailed.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/ExpectationFailed.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/ExpectationFailed.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/FailedDependency.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/FailedDependency.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/FailedDependency.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/FailedDependency.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/Forbidden.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/Forbidden.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/Forbidden.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/Forbidden.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/Found.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/Found.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/Found.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/Found.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/Gone.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/Gone.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/Gone.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/Gone.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/HttpExceptionBuilder.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/HttpExceptionBuilder.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/HttpExceptionBuilder.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/HttpExceptionBuilder.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/HttpResponseBuilder.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/HttpResponseBuilder.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/HttpResponseBuilder.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/HttpResponseBuilder.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/HttpVersionNotSupported.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/HttpVersionNotSupported.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/HttpVersionNotSupported.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/HttpVersionNotSupported.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/IMUsed.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/IMUsed.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/IMUsed.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/IMUsed.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/InsufficientStorage.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/InsufficientStorage.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/InsufficientStorage.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/InsufficientStorage.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/InternalServerError.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/InternalServerError.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/InternalServerError.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/InternalServerError.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/LengthRequired.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/LengthRequired.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/LengthRequired.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/LengthRequired.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/Locked.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/Locked.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/Locked.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/Locked.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/LoopDetected.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/LoopDetected.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/LoopDetected.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/LoopDetected.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/MethodNotAllowed.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/MethodNotAllowed.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/MethodNotAllowed.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/MethodNotAllowed.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/MisdirectedRequest.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/MisdirectedRequest.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/MisdirectedRequest.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/MisdirectedRequest.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/MovedPermanently.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/MovedPermanently.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/MovedPermanently.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/MovedPermanently.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/MultiStatus.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/MultiStatus.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/MultiStatus.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/MultiStatus.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/MultipleChoices.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/MultipleChoices.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/MultipleChoices.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/MultipleChoices.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/NetworkAuthenticationRequired.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/NetworkAuthenticationRequired.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/NetworkAuthenticationRequired.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/NetworkAuthenticationRequired.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/NoContent.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/NoContent.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/NoContent.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/NoContent.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/NonAuthoritiveInformation.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/NonAuthoritiveInformation.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/NonAuthoritiveInformation.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/NonAuthoritiveInformation.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/NotAcceptable.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/NotAcceptable.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/NotAcceptable.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/NotAcceptable.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/NotExtended.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/NotExtended.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/NotExtended.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/NotExtended.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/NotFound.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/NotFound.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/NotFound.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/NotFound.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/NotImplemented.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/NotImplemented.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/NotImplemented.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/NotImplemented.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/NotModified.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/NotModified.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/NotModified.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/NotModified.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/Ok.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/Ok.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/Ok.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/Ok.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/PartialContent.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/PartialContent.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/PartialContent.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/PartialContent.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/PayloadTooLarge.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/PayloadTooLarge.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/PayloadTooLarge.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/PayloadTooLarge.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/PermanentRedirect.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/PermanentRedirect.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/PermanentRedirect.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/PermanentRedirect.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/PreconditionFailed.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/PreconditionFailed.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/PreconditionFailed.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/PreconditionFailed.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/PreconditionRequired.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/PreconditionRequired.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/PreconditionRequired.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/PreconditionRequired.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/Processing.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/Processing.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/Processing.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/Processing.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/RangeNotSatisfiable.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/RangeNotSatisfiable.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/RangeNotSatisfiable.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/RangeNotSatisfiable.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/RequestHeaderFieldsTooLarge.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/RequestHeaderFieldsTooLarge.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/RequestHeaderFieldsTooLarge.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/RequestHeaderFieldsTooLarge.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/ResetContent.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/ResetContent.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/ResetContent.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/ResetContent.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/SeeOther.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/SeeOther.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/SeeOther.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/SeeOther.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/ServiceUnavailable.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/ServiceUnavailable.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/ServiceUnavailable.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/ServiceUnavailable.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/SwitchingProtocols.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/SwitchingProtocols.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/SwitchingProtocols.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/SwitchingProtocols.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/TemporaryRedirect.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/TemporaryRedirect.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/TemporaryRedirect.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/TemporaryRedirect.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/TooManyRequests.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/TooManyRequests.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/TooManyRequests.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/TooManyRequests.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/Unauthorized.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/Unauthorized.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/Unauthorized.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/Unauthorized.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/UnavailableForLegalReasons.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/UnavailableForLegalReasons.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/UnavailableForLegalReasons.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/UnavailableForLegalReasons.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/UnprocessableEntity.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/UnprocessableEntity.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/UnprocessableEntity.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/UnprocessableEntity.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/UnsupportedMediaType.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/UnsupportedMediaType.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/UnsupportedMediaType.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/UnsupportedMediaType.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/UpgradeRequired.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/UpgradeRequired.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/UpgradeRequired.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/UpgradeRequired.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/UriTooLong.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/UriTooLong.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/UriTooLong.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/UriTooLong.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/UseProxy.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/UseProxy.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/UseProxy.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/UseProxy.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/VariantAlsoNegotiates.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/VariantAlsoNegotiates.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/VariantAlsoNegotiates.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/VariantAlsoNegotiates.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/package-info.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/package-info.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/package-info.java
rename to
juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/package-info.java
diff --git a/juneau-rest/juneau-rest-mock/pom.xml
b/juneau-rest/juneau-rest-mock/pom.xml
index 809901a53..cf5c86cc9 100644
--- a/juneau-rest/juneau-rest-mock/pom.xml
+++ b/juneau-rest/juneau-rest-mock/pom.xml
@@ -91,57 +91,6 @@
</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-jaxrs/pom.xml
b/juneau-rest/juneau-rest-server-jaxrs/pom.xml
index 881cd6d9d..80fca444b 100644
--- a/juneau-rest/juneau-rest-server-jaxrs/pom.xml
+++ b/juneau-rest/juneau-rest-server-jaxrs/pom.xml
@@ -89,66 +89,6 @@
</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>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-rdf/pom.xml
b/juneau-rest/juneau-rest-server-rdf/pom.xml
index 6e12ce48d..17f301da2 100644
--- a/juneau-rest/juneau-rest-server-rdf/pom.xml
+++ b/juneau-rest/juneau-rest-server-rdf/pom.xml
@@ -79,15 +79,6 @@
</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>
diff --git a/juneau-rest/juneau-rest-server-springboot/pom.xml
b/juneau-rest/juneau-rest-server-springboot/pom.xml
index a3da36f22..588449193 100644
--- a/juneau-rest/juneau-rest-server-springboot/pom.xml
+++ b/juneau-rest/juneau-rest-server-springboot/pom.xml
@@ -35,18 +35,18 @@
<version>${project.version}</version>
</dependency>
- <!-- Spring Boot dependencies-->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- <version>${springboot.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
+ <!-- Spring Boot dependencies-->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ <version>${springboot.version}</version>
+ <exclusions>
+ <exclusion>
+
<groupId>org.springframework.boot</groupId>
+
<artifactId>spring-boot-starter-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
<properties>
@@ -83,66 +83,6 @@
</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>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/pom.xml
b/juneau-rest/juneau-rest-server/pom.xml
index 3045bff1a..53e9082dc 100644
--- a/juneau-rest/juneau-rest-server/pom.xml
+++ b/juneau-rest/juneau-rest-server/pom.xml
@@ -34,6 +34,11 @@
<artifactId>juneau-marshall</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.juneau</groupId>
+ <artifactId>juneau-rest-common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.juneau</groupId>
<artifactId>juneau-config</artifactId>
@@ -105,15 +110,6 @@
</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>
@@ -125,73 +121,6 @@
</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/pom.xml b/juneau-rest/pom.xml
index e632b5790..616d52da6 100644
--- a/juneau-rest/pom.xml
+++ b/juneau-rest/pom.xml
@@ -29,6 +29,7 @@
<description>Apache Juneau REST APIs</description>
<modules>
+ <module>juneau-rest-common</module>
<module>juneau-rest-server</module>
<module>juneau-rest-server-jaxrs</module>
<module>juneau-rest-server-rdf</module>
diff --git a/juneau-sc/juneau-sc-server/pom.xml
b/juneau-sc/juneau-sc-server/pom.xml
index 463bde38b..e4aecaf49 100644
--- a/juneau-sc/juneau-sc-server/pom.xml
+++ b/juneau-sc/juneau-sc-server/pom.xml
@@ -41,10 +41,6 @@
<version>4.7.0.201704051617-r</version>
</dependency>
- <!-- Juneau dependencies -->
- <!-- <dependency> <groupId>org.apache.juneau</groupId>
<artifactId>juneau-examples-rest</artifactId>
- <version>8.0.0-SNAPSHOT</version> </dependency> -->
-
<dependency>
<groupId>org.apache.juneau</groupId>
<artifactId>juneau-rest-server</artifactId>
diff --git a/pom.xml b/pom.xml
index 378ac9122..2a1a6638a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -95,11 +95,6 @@
<artifactId>httpcore</artifactId>
<version>${httpcore.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpmime</artifactId>
- <version>${httpclient.version}</version>
- </dependency>
<dependency>
<!-- Java 11 -->
<groupId>javax.activation</groupId>
