juneau-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jamesbog...@apache.org
Subject [juneau] branch master updated: Remove deprecated code.
Date Tue, 13 Oct 2020 21:11:48 GMT
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 c2baa85  Remove deprecated code.
c2baa85 is described below

commit c2baa85e9a41411420a12f32efa4440c0f8d357d
Author: JamesBognar <james.bognar@salesforce.com>
AuthorDate: Tue Oct 13 17:11:44 2020 -0400

    Remove deprecated code.
---
 .../org/apache/juneau/rest/BasicRestConfig.java    | 126 ---------------------
 .../org/apache/juneau/rest/response/Accepted.java  |  57 ----------
 .../juneau/rest/response/AlreadyReported.java      |  56 ---------
 .../org/apache/juneau/rest/response/Continue.java  |  60 ----------
 .../org/apache/juneau/rest/response/Created.java   |  56 ---------
 .../apache/juneau/rest/response/EarlyHints.java    |  56 ---------
 .../org/apache/juneau/rest/response/Found.java     |  96 ----------------
 .../apache/juneau/rest/response/HttpResponse.java  |  47 --------
 .../org/apache/juneau/rest/response/IMUsed.java    |  56 ---------
 .../juneau/rest/response/MovedPermanently.java     |  92 ---------------
 .../apache/juneau/rest/response/MultiStatus.java   |  56 ---------
 .../juneau/rest/response/MultipleChoices.java      |  57 ----------
 .../org/apache/juneau/rest/response/NoContent.java |  56 ---------
 .../rest/response/NonAuthoritiveInformation.java   |  56 ---------
 .../apache/juneau/rest/response/NotModified.java   |  57 ----------
 .../java/org/apache/juneau/rest/response/Ok.java   |  60 ----------
 .../juneau/rest/response/PartialContent.java       |  57 ----------
 .../juneau/rest/response/PermanentRedirect.java    |  93 ---------------
 .../apache/juneau/rest/response/Processing.java    |  58 ----------
 .../apache/juneau/rest/response/ResetContent.java  |  57 ----------
 .../org/apache/juneau/rest/response/SeeOther.java  | 118 -------------------
 .../juneau/rest/response/SwitchingProtocols.java   |  56 ---------
 .../juneau/rest/response/TemporaryRedirect.java    |  94 ---------------
 .../org/apache/juneau/rest/response/UseProxy.java  |  57 ----------
 .../apache/juneau/rest/response/package-info.java  |  18 ---
 25 files changed, 1652 deletions(-)

diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestConfig.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestConfig.java
deleted file mode 100644
index b269c46..0000000
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestConfig.java
+++ /dev/null
@@ -1,126 +0,0 @@
-// ***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *
-// * with the License.  You may obtain a copy of the License at                                                              *
-// *                                                                                                                         *
-// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-// *                                                                                                                         *
-// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-// * specific language governing permissions and limitations under the License.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.rest;
-
-import org.apache.juneau.annotation.*;
-import org.apache.juneau.html.*;
-import org.apache.juneau.html.annotation.*;
-import org.apache.juneau.json.*;
-import org.apache.juneau.msgpack.*;
-import org.apache.juneau.oapi.*;
-import org.apache.juneau.plaintext.*;
-import org.apache.juneau.rest.annotation.*;
-import org.apache.juneau.rest.config.*;
-import org.apache.juneau.serializer.annotation.*;
-import org.apache.juneau.soap.*;
-import org.apache.juneau.uon.*;
-import org.apache.juneau.urlencoding.*;
-import org.apache.juneau.xml.*;
-
-/**
- * Basic configuration for a REST resource that supports all languages.
- *
- * <p>
- * Classes that don't extend from {@link BasicRestServlet} can implement this interface to
- * be configured with the same serializers/parsers/etc... as {@link BasicRestServlet}.
- *
- * @deprecated Use {@link BasicUniversalRest}.
- */
-@Rest(
-
-	// Default serializers for all Java methods in the class.
-	serializers={
-		HtmlDocSerializer.class, // HTML must be listed first because Internet Explore does not include text/html in their Accept header.
-		HtmlStrippedDocSerializer.class,
-		HtmlSchemaDocSerializer.class,
-		JsonSerializer.class,
-		SimpleJsonSerializer.class,
-		JsonSchemaSerializer.class,
-		XmlDocSerializer.class,
-		UonSerializer.class,
-		UrlEncodingSerializer.class,
-		OpenApiSerializer.class,
-		MsgPackSerializer.class,
-		SoapXmlSerializer.class,
-		PlainTextSerializer.class
-	},
-
-	// Default parsers for all Java methods in the class.
-	parsers={
-		JsonParser.class,
-		SimpleJsonParser.class,
-		XmlParser.class,
-		HtmlParser.class,
-		UonParser.class,
-		UrlEncodingParser.class,
-		OpenApiParser.class,
-		MsgPackParser.class,
-		PlainTextParser.class
-	},
-
-	// Optional external configuration file.
-	config="$S{juneau.configFile,SYSTEM_DEFAULT}",
-
-	// These are static files that are served up by the servlet under the specified sub-paths.
-	// For example, "/servletPath/htdocs/javadoc.css" resolves to the file "[servlet-package]/htdocs/javadoc.css"
-	// By default, we define static files through the external configuration file.
-	staticFiles="$C{REST/staticFiles,htdocs:/htdocs,htdocs:htdocs}",
-
-	logging=@Logging(
-		level="INFO",
-		useStackTraceHashing="true",
-		rules={
-			@LoggingRule(codes="500-", level="WARNING")
-		}
-	)
-)
-@SerializerConfig(
-	// Enable automatic resolution of URI objects to root-relative values.
-	uriResolution="ROOT_RELATIVE"
-)
-@HtmlDocConfig(
-
-	// Default page header contents.
-	header={
-		"<h1>$R{resourceTitle}</h1>",  // Use @Rest(title)
-		"<h2>$R{methodSummary,resourceDescription}</h2>", // Use either @RestMethod(summary) or @Rest(description)
-		"$C{REST/header}"  // Extra header HTML defined in external config file.
-	},
-
-	// Basic page navigation links.
-	navlinks={
-		"up: request:/.."
-	},
-
-	// Default stylesheet to use for the page.
-	// Can be overridden from external config file.
-	// Default is DevOps look-and-feel (aka Depression look-and-feel).
-	stylesheet="$C{REST/theme,servlet:/htdocs/themes/devops.css}",
-
-	// Default contents to add to the <head> section of the HTML page.
-	// Use it to add a favicon link to the page.
-	head="$C{REST/head}",
-
-	// No default page footer contents.
-	// Can be overridden from external config file.
-	footer="$C{REST/footer}",
-
-	// By default, table cell contents should not wrap.
-	nowrap="true"
-)
-@BeanConfig(
-	// When parsing generated beans, ignore unknown properties that may only exist as getters and not setters.
-	ignoreUnknownBeanProperties="true"
-)
-@Deprecated
-public interface BasicRestConfig {}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/Accepted.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/Accepted.java
deleted file mode 100644
index 564dd18..0000000
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/Accepted.java
+++ /dev/null
@@ -1,57 +0,0 @@
-// ***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *
-// * with the License.  You may obtain a copy of the License at                                                              *
-// *                                                                                                                         *
-// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-// *                                                                                                                         *
-// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-// * specific language governing permissions and limitations under the License.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.rest.response;
-
-import static org.apache.juneau.rest.response.Accepted.*;
-
-import org.apache.juneau.http.annotation.*;
-
-/**
- * Represents an <c>HTTP 202 Accepted</c> response.
- *
- * <div class='warn'>
- * 	<b>Deprecated</b> - Use {@link org.apache.juneau.http.response.Accepted}
- * </div>
- *
- * <p>
- * The request has been accepted for processing, but the processing has not been completed.
- * The request might or might not be eventually acted upon, and may be disallowed when processing occurs.
- */
-@Response(code=CODE, description=MESSAGE)
-@Deprecated
-public class Accepted extends HttpResponse {
-
-	/** HTTP status code */
-	public static final int CODE = 202;
-
-	/** Default message */
-	public static final String MESSAGE = "Accepted";
-
-	/** Reusable instance. */
-	public static final Accepted INSTANCE = new Accepted();
-
-	/**
-	 * Constructor using HTTP-standard message.
-	 */
-	public Accepted() {
-		this(MESSAGE);
-	}
-
-	/**
-	 * Constructor using custom message.
-	 * @param message Message to send as the response.
-	 */
-	public Accepted(String message) {
-		super(message);
-	}
-}
\ No newline at end of file
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/AlreadyReported.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/AlreadyReported.java
deleted file mode 100644
index 494507a..0000000
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/AlreadyReported.java
+++ /dev/null
@@ -1,56 +0,0 @@
-// ***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *
-// * with the License.  You may obtain a copy of the License at                                                              *
-// *                                                                                                                         *
-// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-// *                                                                                                                         *
-// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-// * specific language governing permissions and limitations under the License.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.rest.response;
-
-import static org.apache.juneau.rest.response.AlreadyReported.*;
-
-import org.apache.juneau.http.annotation.*;
-
-/**
- * Represents an <c>HTTP 208 Already Reported</c> response.
- *
- * <div class='warn'>
- * 	<b>Deprecated</b> - Use {@link org.apache.juneau.http.response.AlreadyReported}
- * </div>
- *
- * <p>
- * The members of a DAV binding have already been enumerated in a preceding part of the (multistatus) response, and are not being included again.
- */
-@Response(code=CODE, description=MESSAGE)
-@Deprecated
-public class AlreadyReported extends HttpResponse {
-
-	/** HTTP status code */
-	public static final int CODE = 208;
-
-	/** Default message */
-	public static final String MESSAGE = "Already Reported";
-
-	/** Reusable instance. */
-	public static final AlreadyReported INSTANCE = new AlreadyReported();
-
-	/**
-	 * Constructor using HTTP-standard message.
-	 */
-	public AlreadyReported() {
-		this(MESSAGE);
-	}
-
-	/**
-	 * Constructor using custom message.
-	 * @param message Message to send as the response.
-	 */
-	public AlreadyReported(String message) {
-		super(message);
-	}
-}
\ No newline at end of file
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/Continue.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/Continue.java
deleted file mode 100644
index da645da..0000000
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/Continue.java
+++ /dev/null
@@ -1,60 +0,0 @@
-// ***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *
-// * with the License.  You may obtain a copy of the License at                                                              *
-// *                                                                                                                         *
-// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-// *                                                                                                                         *
-// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-// * specific language governing permissions and limitations under the License.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.rest.response;
-
-import static org.apache.juneau.rest.response.Continue.*;
-
-import org.apache.juneau.http.annotation.*;
-
-/**
- * Represents an <c>HTTP 100 Continue</c> response.
- *
- * <div class='warn'>
- * 	<b>Deprecated</b> - Use {@link org.apache.juneau.http.response.Continue}
- * </div>
- *
- * <p>
- * The server has received the request headers and the client should proceed to send the request body (in the case of a request for which a body needs to be sent; for example, a POST request).
- * Sending a large request body to a server after a request has been rejected for inappropriate headers would be inefficient.
- * To have a server check the request's headers, a client must send Expect: 100-continue as a header in its initial request and receive a 100 Continue status code in response before sending the body.
- * If the client receives an error code such as 403 (Forbidden) or 405 (Method Not Allowed) then it shouldn't send the request's body.
- * The response 417 Expectation Failed indicates that the request should be repeated without the Expect header as it indicates that the server doesn't support expectations (this is the case, for example, of HTTP/1.0 servers).
- */
-@Response(code=CODE, description=MESSAGE)
-@Deprecated
-public class Continue extends HttpResponse {
-
-	/** HTTP status code */
-	public static final int CODE = 100;
-
-	/** Default message */
-	public static final String MESSAGE = "Continue";
-
-	/** Reusable instance.*/
-	public static final Continue INSTANCE = new Continue();
-
-	/**
-	 * Constructor using HTTP-standard message.
-	 */
-	public Continue() {
-		this(MESSAGE);
-	}
-
-	/**
-	 * Constructor using custom message.
-	 * @param message Message to send as the response.
-	 */
-	public Continue(String message) {
-		super(message);
-	}
-}
\ No newline at end of file
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/Created.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/Created.java
deleted file mode 100644
index 6059714..0000000
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/Created.java
+++ /dev/null
@@ -1,56 +0,0 @@
-// ***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *
-// * with the License.  You may obtain a copy of the License at                                                              *
-// *                                                                                                                         *
-// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-// *                                                                                                                         *
-// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-// * specific language governing permissions and limitations under the License.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.rest.response;
-
-import static org.apache.juneau.rest.response.Created.*;
-
-import org.apache.juneau.http.annotation.*;
-
-/**
- * Represents an <c>HTTP 201 Created</c> response.
- *
- * <div class='warn'>
- * 	<b>Deprecated</b> - Use {@link org.apache.juneau.http.response.Created}
- * </div>
- *
- * <p>
- * The request has been fulfilled, resulting in the creation of a new resource.
- */
-@Response(code=CODE, description=MESSAGE)
-@Deprecated
-public class Created extends HttpResponse {
-
-	/** HTTP status code */
-	public static final int CODE = 201;
-
-	/** Default message */
-	public static final String MESSAGE = "Created";
-
-	/** Reusable instance. */
-	public static final Created INSTANCE = new Created();
-
-	/**
-	 * Constructor using HTTP-standard message.
-	 */
-	public Created() {
-		this(MESSAGE);
-	}
-
-	/**
-	 * Constructor using custom message.
-	 * @param message Message to send as the response.
-	 */
-	public Created(String message) {
-		super(message);
-	}
-}
\ No newline at end of file
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/EarlyHints.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/EarlyHints.java
deleted file mode 100644
index 14983ba..0000000
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/EarlyHints.java
+++ /dev/null
@@ -1,56 +0,0 @@
-// ***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *
-// * with the License.  You may obtain a copy of the License at                                                              *
-// *                                                                                                                         *
-// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-// *                                                                                                                         *
-// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-// * specific language governing permissions and limitations under the License.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.rest.response;
-
-import static org.apache.juneau.rest.response.EarlyHints.*;
-
-import org.apache.juneau.http.annotation.*;
-
-/**
- * Represents an <c>HTTP 103 Early Hints</c> response.
- *
- * <div class='warn'>
- * 	<b>Deprecated</b> - Use {@link org.apache.juneau.http.response.EarlyHints}
- * </div>
- *
- * <p>
- * Used to return some response headers before final HTTP message.
- */
-@Response(code=CODE, description=MESSAGE)
-@Deprecated
-public class EarlyHints extends HttpResponse {
-
-	/** HTTP status code */
-	public static final int CODE = 103;
-
-	/** Default message */
-	public static final String MESSAGE = "Early Hints";
-
-	/** Reusable instance. */
-	public static final EarlyHints INSTANCE = new EarlyHints();
-
-	/**
-	 * Constructor using HTTP-standard message.
-	 */
-	public EarlyHints() {
-		this(MESSAGE);
-	}
-
-	/**
-	 * Constructor using custom message.
-	 * @param message Message to send as the response.
-	 */
-	public EarlyHints(String message) {
-		super(message);
-	}
-}
\ No newline at end of file
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/Found.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/Found.java
deleted file mode 100644
index c8836c3..0000000
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/Found.java
+++ /dev/null
@@ -1,96 +0,0 @@
-// ***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *
-// * with the License.  You may obtain a copy of the License at                                                              *
-// *                                                                                                                         *
-// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-// *                                                                                                                         *
-// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-// * specific language governing permissions and limitations under the License.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.rest.response;
-
-import java.net.*;
-
-import static org.apache.juneau.rest.response.Found.*;
-
-import org.apache.juneau.annotation.BeanIgnore;
-import org.apache.juneau.http.annotation.*;
-
-/**
- * Represents an <c>HTTP 302 Found</c> response.
- *
- * <div class='warn'>
- * 	<b>Deprecated</b> - Use {@link org.apache.juneau.http.response.Found}
- * </div>
- *
- * <p>
- * Tells the client to look at (browse to) another url. 302 has been superseded by 303 and 307.
- * This is an example of industry practice contradicting the standard.
- * The HTTP/1.0 specification (RFC 1945) required the client to perform a temporary redirect (the original describing phrase was "Moved Temporarily"), but popular browsers implemented 302 with the functionality of a 303 See Other.
- * Therefore, HTTP/1.1 added status codes 303 and 307 to distinguish between the two behaviours.
- * However, some Web applications and frameworks use the 302 status code as if it were the 303.
- */
-@Response(code=CODE, description=MESSAGE)
-@BeanIgnore
-@Deprecated
-public class Found extends HttpResponse {
-
-	/** HTTP status code */
-	public static final int CODE = 302;
-
-	/** Default message */
-	public static final String MESSAGE = "Found";
-
-	/** Reusable instance. */
-	public static final Found INSTANCE = new Found();
-
-	private final URI location;
-
-	/**
-	 * Constructor using HTTP-standard message.
-	 */
-	public Found() {
-		this(MESSAGE, null);
-	}
-
-	/**
-	 * Constructor with no redirect.
-	 * <p>
-	 * Used for end-to-end interfaces.
-	 *
-	 * @param message Message to send as the response.
-	 */
-	public Found(String message) {
-		super(message);
-		this.location = null;
-	}
-
-	/**
-	 * Constructor using custom message.
-	 * @param message Message to send as the response.
-	 * @param location <c>Location</c> header value.
-	 */
-	public Found(String message, URI location) {
-		super(message);
-		this.location = location;
-	}
-
-	/**
-	 * Constructor.
-	 * @param location <c>Location</c> header value.
-	 */
-	public Found(URI location) {
-		this(MESSAGE, location);
-	}
-
-	/**
-	 * @return <c>Location</c> header value.
-	 */
-	@ResponseHeader(name="Location", description="Location of resource.")
-	public URI getLocation() {
-		return location;
-	}
-}
\ No newline at end of file
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/HttpResponse.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/HttpResponse.java
deleted file mode 100644
index 1bbd800..0000000
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/HttpResponse.java
+++ /dev/null
@@ -1,47 +0,0 @@
-// ***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *
-// * with the License.  You may obtain a copy of the License at                                                              *
-// *                                                                                                                         *
-// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-// *                                                                                                                         *
-// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-// * specific language governing permissions and limitations under the License.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.rest.response;
-
-import org.apache.juneau.http.annotation.*;
-
-/**
- * Superclass of all predefined responses in this package.
- *
- * <div class='warn'>
- * 	<b>Deprecated</b> - Use {@link org.apache.juneau.http.response.HttpResponse}
- * </div>
- *
- * <p>
- * Consists simply of a simple string message.
- */
-@Response
-@Deprecated
-public abstract class HttpResponse {
-
-	private final String message;
-
-	/**
-	 * Constructor.
-	 *
-	 * @param message Message to send as the response.
-	 */
-	protected HttpResponse(String message) {
-		this.message = message;
-	}
-
-	@ResponseBody
-	@Override /* Object */
-	public String toString() {
-		return message;
-	}
-}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/IMUsed.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/IMUsed.java
deleted file mode 100644
index 65efad7..0000000
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/IMUsed.java
+++ /dev/null
@@ -1,56 +0,0 @@
-// ***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *
-// * with the License.  You may obtain a copy of the License at                                                              *
-// *                                                                                                                         *
-// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-// *                                                                                                                         *
-// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-// * specific language governing permissions and limitations under the License.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.rest.response;
-
-import static org.apache.juneau.rest.response.IMUsed.*;
-
-import org.apache.juneau.http.annotation.*;
-
-/**
- * Represents an <c>HTTP 226 IM Used</c> response.
- *
- * <div class='warn'>
- * 	<b>Deprecated</b> - Use {@link org.apache.juneau.http.response.IMUsed}
- * </div>
- *
- * <p>
- * The server has fulfilled a request for the resource, and the response is a representation of the result of one or more instance-manipulations applied to the current instance.
- */
-@Response(code=CODE, description=MESSAGE)
-@Deprecated
-public class IMUsed extends HttpResponse {
-
-	/** HTTP status code */
-	public static final int CODE = 226;
-
-	/** Default message */
-	public static final String MESSAGE = "IM Used";
-
-	/** Reusable instance. */
-	public static final IMUsed INSTANCE = new IMUsed();
-
-	/**
-	 * Constructor using HTTP-standard message.
-	 */
-	public IMUsed() {
-		this(MESSAGE);
-	}
-
-	/**
-	 * Constructor using custom message.
-	 * @param message Message to send as the response.
-	 */
-	public IMUsed(String message) {
-		super(message);
-	}
-}
\ No newline at end of file
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/MovedPermanently.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/MovedPermanently.java
deleted file mode 100644
index 7ddaf8c..0000000
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/MovedPermanently.java
+++ /dev/null
@@ -1,92 +0,0 @@
-// ***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *
-// * with the License.  You may obtain a copy of the License at                                                              *
-// *                                                                                                                         *
-// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-// *                                                                                                                         *
-// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-// * specific language governing permissions and limitations under the License.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.rest.response;
-
-import static org.apache.juneau.rest.response.MovedPermanently.*;
-
-import java.net.*;
-
-import org.apache.juneau.annotation.BeanIgnore;
-import org.apache.juneau.http.annotation.*;
-
-/**
- * Represents an <c>HTTP 301 Moved Permanently</c> response.
- *
- * <div class='warn'>
- * 	<b>Deprecated</b> - Use {@link org.apache.juneau.http.response.MovedPermanently}
- * </div>
- *
- * <p>
- * This and all future requests should be directed to the given URI.
- */
-@Response(code=CODE, description=MESSAGE)
-@BeanIgnore
-@Deprecated
-public class MovedPermanently extends HttpResponse {
-
-	/** HTTP status code */
-	public static final int CODE = 301;
-
-	/** Default message */
-	public static final String MESSAGE = "Moved Permanently";
-
-	/** Reusable instance. */
-	public static final MovedPermanently INSTANCE = new MovedPermanently();
-
-	private final URI location;
-
-	/**
-	 * Constructor using HTTP-standard message.
-	 */
-	public MovedPermanently() {
-		this(MESSAGE, null);
-	}
-
-	/**
-	 * Constructor with no redirect.
-	 * <p>
-	 * Used for end-to-end interfaces.
-	 *
-	 * @param message Message to send as the response.
-	 */
-	public MovedPermanently(String message) {
-		super(message);
-		this.location = null;
-	}
-
-	/**
-	 * Constructor using custom message.
-	 * @param message Message to send as the response.
-	 * @param location <c>Location</c> header value.
-	 */
-	public MovedPermanently(String message, URI location) {
-		super(message);
-		this.location = location;
-	}
-
-	/**
-	 * Constructor.
-	 * @param location <c>Location</c> header value.
-	 */
-	public MovedPermanently(URI location) {
-		this(MESSAGE, location);
-	}
-
-	/**
-	 * @return <c>Location</c> header value.
-	 */
-	@ResponseHeader(name="Location", description="New location of resource.")
-	public URI getLocation() {
-		return location;
-	}
-}
\ No newline at end of file
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/MultiStatus.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/MultiStatus.java
deleted file mode 100644
index 551ebef..0000000
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/MultiStatus.java
+++ /dev/null
@@ -1,56 +0,0 @@
-// ***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *
-// * with the License.  You may obtain a copy of the License at                                                              *
-// *                                                                                                                         *
-// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-// *                                                                                                                         *
-// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-// * specific language governing permissions and limitations under the License.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.rest.response;
-
-import static org.apache.juneau.rest.response.MultiStatus.*;
-
-import org.apache.juneau.http.annotation.*;
-
-/**
- * Represents an <c>HTTP 207 Multi-Status</c> response.
- *
- * <div class='warn'>
- * 	<b>Deprecated</b> - Use {@link org.apache.juneau.http.response.MultiStatus}
- * </div>
- *
- * <p>
- * The message body that follows is by default an XML message and can contain a number of separate response codes, depending on how many sub-requests were made.
- */
-@Response(code=CODE, description=MESSAGE)
-@Deprecated
-public class MultiStatus extends HttpResponse {
-
-	/** HTTP status code */
-	public static final int CODE = 207;
-
-	/** Default message */
-	public static final String MESSAGE = "Multi-Status";
-
-	/** Reusable instance. */
-	public static final MultiStatus INSTANCE = new MultiStatus();
-
-	/**
-	 * Constructor using HTTP-standard message.
-	 */
-	public MultiStatus() {
-		this(MESSAGE);
-	}
-
-	/**
-	 * Constructor using custom message.
-	 * @param message Message to send as the response.
-	 */
-	public MultiStatus(String message) {
-		super(message);
-	}
-}
\ No newline at end of file
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/MultipleChoices.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/MultipleChoices.java
deleted file mode 100644
index 792d0c4..0000000
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/MultipleChoices.java
+++ /dev/null
@@ -1,57 +0,0 @@
-// ***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *
-// * with the License.  You may obtain a copy of the License at                                                              *
-// *                                                                                                                         *
-// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-// *                                                                                                                         *
-// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-// * specific language governing permissions and limitations under the License.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.rest.response;
-
-import static org.apache.juneau.rest.response.MultipleChoices.*;
-
-import org.apache.juneau.http.annotation.*;
-
-/**
- * Represents an <c>HTTP 300 Multiple Choices</c> response.
- *
- * <div class='warn'>
- * 	<b>Deprecated</b> - Use {@link org.apache.juneau.http.response.MultipleChoices}
- * </div>
- *
- * <p>
- * Indicates multiple options for the resource from which the client may choose (via agent-driven content negotiation).
- * For example, this code could be used to present multiple video format options, to list files with different filename extensions, or to suggest word-sense disambiguation.
- */
-@Response(code=CODE, description=MESSAGE)
-@Deprecated
-public class MultipleChoices extends HttpResponse {
-
-	/** HTTP status code */
-	public static final int CODE = 300;
-
-	/** Default message */
-	public static final String MESSAGE = "Multiple Choices";
-
-	/** Reusable instance. */
-	public static final MultipleChoices INSTANCE = new MultipleChoices();
-
-	/**
-	 * Constructor using HTTP-standard message.
-	 */
-	public MultipleChoices() {
-		this(MESSAGE);
-	}
-
-	/**
-	 * Constructor using custom message.
-	 * @param message Message to send as the response.
-	 */
-	public MultipleChoices(String message) {
-		super(message);
-	}
-}
\ No newline at end of file
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/NoContent.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/NoContent.java
deleted file mode 100644
index 5c5f473..0000000
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/NoContent.java
+++ /dev/null
@@ -1,56 +0,0 @@
-// ***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *
-// * with the License.  You may obtain a copy of the License at                                                              *
-// *                                                                                                                         *
-// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-// *                                                                                                                         *
-// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-// * specific language governing permissions and limitations under the License.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.rest.response;
-
-import static org.apache.juneau.rest.response.NoContent.*;
-
-import org.apache.juneau.http.annotation.*;
-
-/**
- * Represents an <c>HTTP 204 No Content</c> response.
- *
- * <div class='warn'>
- * 	<b>Deprecated</b> - Use {@link org.apache.juneau.http.response.NoContent}
- * </div>
- *
- * <p>
- * The server successfully processed the request and is not returning any content.
- */
-@Response(code=CODE, description=MESSAGE)
-@Deprecated
-public class NoContent extends HttpResponse {
-
-	/** HTTP status code */
-	public static final int CODE = 204;
-
-	/** Default message */
-	public static final String MESSAGE = "No Content";
-
-	/** Reusable instance. */
-	public static final NoContent INSTANCE = new NoContent();
-
-	/**
-	 * Constructor using HTTP-standard message.
-	 */
-	public NoContent() {
-		this(MESSAGE);
-	}
-
-	/**
-	 * Constructor using custom message.
-	 * @param message Message to send as the response.
-	 */
-	public NoContent(String message) {
-		super(message);
-	}
-}
\ No newline at end of file
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/NonAuthoritiveInformation.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/NonAuthoritiveInformation.java
deleted file mode 100644
index 6624da0..0000000
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/NonAuthoritiveInformation.java
+++ /dev/null
@@ -1,56 +0,0 @@
-// ***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *
-// * with the License.  You may obtain a copy of the License at                                                              *
-// *                                                                                                                         *
-// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-// *                                                                                                                         *
-// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-// * specific language governing permissions and limitations under the License.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.rest.response;
-
-import static org.apache.juneau.rest.response.NonAuthoritiveInformation.*;
-
-import org.apache.juneau.http.annotation.*;
-
-/**
- * Represents an <c>HTTP 203 Non-Authoritative Information</c> response.
- *
- * <div class='warn'>
- * 	<b>Deprecated</b> - Use {@link org.apache.juneau.http.response.NonAuthoritiveInformation}
- * </div>
- *
- * <p>
- * The server is a transforming proxy (e.g. a Web accelerator) that received a 200 OK from its origin, but is returning a modified version of the origin's response.
- */
-@Response(code=CODE, description=MESSAGE)
-@Deprecated
-public class NonAuthoritiveInformation extends HttpResponse {
-
-	/** HTTP status code */
-	public static final int CODE = 203;
-
-	/** Default message */
-	public static final String MESSAGE = "Non-Authoritative Information";
-
-	/** Reusable instance. */
-	public static final NonAuthoritiveInformation INSTANCE = new NonAuthoritiveInformation();
-
-	/**
-	 * Constructor using HTTP-standard message.
-	 */
-	public NonAuthoritiveInformation() {
-		this(MESSAGE);
-	}
-
-	/**
-	 * Constructor using custom message.
-	 * @param message Message to send as the response.
-	 */
-	public NonAuthoritiveInformation(String message) {
-		super(message);
-	}
-}
\ No newline at end of file
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/NotModified.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/NotModified.java
deleted file mode 100644
index e77e44d..0000000
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/NotModified.java
+++ /dev/null
@@ -1,57 +0,0 @@
-// ***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *
-// * with the License.  You may obtain a copy of the License at                                                              *
-// *                                                                                                                         *
-// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-// *                                                                                                                         *
-// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-// * specific language governing permissions and limitations under the License.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.rest.response;
-
-import static org.apache.juneau.rest.response.NotModified.*;
-
-import org.apache.juneau.http.annotation.*;
-
-/**
- * Represents an <c>HTTP 304 Not Modified</c> response.
- *
- * <div class='warn'>
- * 	<b>Deprecated</b> - Use {@link org.apache.juneau.http.response.NotModified}
- * </div>
- *
- * <p>
- * Indicates that the resource has not been modified since the version specified by the request headers If-Modified-Since or If-None-Match.
- * In such case, there is no need to retransmit the resource since the client still has a previously-downloaded copy.
- */
-@Response(code=CODE, description=MESSAGE)
-@Deprecated
-public class NotModified extends HttpResponse {
-
-	/** HTTP status code */
-	public static final int CODE = 304;
-
-	/** Default message */
-	public static final String MESSAGE = "Not Modified";
-
-	/** Reusable instance. */
-	public static final NotModified INSTANCE = new NotModified();
-
-	/**
-	 * Constructor using HTTP-standard message.
-	 */
-	public NotModified() {
-		this(MESSAGE);
-	}
-
-	/**
-	 * Constructor using custom message.
-	 * @param message Message to send as the response.
-	 */
-	public NotModified(String message) {
-		super(message);
-	}
-}
\ No newline at end of file
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/Ok.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/Ok.java
deleted file mode 100644
index e64df3a..0000000
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/Ok.java
+++ /dev/null
@@ -1,60 +0,0 @@
-// ***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *
-// * with the License.  You may obtain a copy of the License at                                                              *
-// *                                                                                                                         *
-// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-// *                                                                                                                         *
-// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-// * specific language governing permissions and limitations under the License.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.rest.response;
-
-import static org.apache.juneau.rest.response.Ok.*;
-
-import org.apache.juneau.http.annotation.*;
-
-/**
- * Represents an <c>HTTP 200 OK</c> response.
- *
- * <div class='warn'>
- * 	<b>Deprecated</b> - Use {@link org.apache.juneau.http.response.Ok}
- * </div>
- *
- * <p>
- * Standard response for successful HTTP requests. The actual response will depend on the request method used.
- * In a GET request, the response will contain an entity corresponding to the requested resource.
- * In a POST request, the response will contain an entity describing or containing the result of the action.
- */
-@Response(code=CODE, description=MESSAGE)
-@Deprecated
-public class Ok extends HttpResponse {
-
-	/** HTTP status code */
-	public static final int CODE = 200;
-
-	/** Default message */
-	public static final String MESSAGE = "OK";
-
-	/** Reusable instance. */
-	public static final Ok INSTANCE = new Ok();
-	/** Reusable instance. */
-	public static final Ok OK = new Ok();
-
-	/**
-	 * Constructor using HTTP-standard message.
-	 */
-	public Ok() {
-		this(MESSAGE);
-	}
-
-	/**
-	 * Constructor using custom message.
-	 * @param message Message to send as the response.
-	 */
-	public Ok(String message) {
-		super(message);
-	}
-}
\ No newline at end of file
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/PartialContent.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/PartialContent.java
deleted file mode 100644
index 2d7e789..0000000
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/PartialContent.java
+++ /dev/null
@@ -1,57 +0,0 @@
-// ***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *
-// * with the License.  You may obtain a copy of the License at                                                              *
-// *                                                                                                                         *
-// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-// *                                                                                                                         *
-// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-// * specific language governing permissions and limitations under the License.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.rest.response;
-
-import static org.apache.juneau.rest.response.PartialContent.*;
-
-import org.apache.juneau.http.annotation.*;
-
-/**
- * Represents an <c>HTTP 206 Partial Content</c> response.
- *
- * <div class='warn'>
- * 	<b>Deprecated</b> - Use {@link org.apache.juneau.http.response.PartialContent}
- * </div>
- *
- * <p>
- * The server is delivering only part of the resource (byte serving) due to a range header sent by the client.
- * The range header is used by HTTP clients to enable resuming of interrupted downloads, or split a download into multiple simultaneous streams.
- */
-@Response(code=CODE, description=MESSAGE)
-@Deprecated
-public class PartialContent extends HttpResponse {
-
-	/** HTTP status code */
-	public static final int CODE = 206;
-
-	/** Default message */
-	public static final String MESSAGE = "Partial Content";
-
-	/** Reusable instance. */
-	public static final PartialContent INSTANCE = new PartialContent();
-
-	/**
-	 * Constructor using HTTP-standard message.
-	 */
-	public PartialContent() {
-		this(MESSAGE);
-	}
-
-	/**
-	 * Constructor using custom message.
-	 * @param message Message to send as the response.
-	 */
-	public PartialContent(String message) {
-		super(message);
-	}
-}
\ No newline at end of file
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/PermanentRedirect.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/PermanentRedirect.java
deleted file mode 100644
index cf94676..0000000
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/PermanentRedirect.java
+++ /dev/null
@@ -1,93 +0,0 @@
-// ***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *
-// * with the License.  You may obtain a copy of the License at                                                              *
-// *                                                                                                                         *
-// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-// *                                                                                                                         *
-// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-// * specific language governing permissions and limitations under the License.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.rest.response;
-
-import static org.apache.juneau.rest.response.PermanentRedirect.*;
-
-import java.net.*;
-
-import org.apache.juneau.annotation.BeanIgnore;
-import org.apache.juneau.http.annotation.*;
-
-/**
- * Represents an <c>HTTP 308 Permanent Redirect</c> response.
- *
- * <div class='warn'>
- * 	<b>Deprecated</b> - Use {@link org.apache.juneau.http.response.PermanentRedirect}
- * </div>
- *
- * <p>
- * The request and all future requests should be repeated using another URI. 307 and 308 parallel the behaviors of 302 and 301, but do not allow the HTTP method to change.
- * So, for example, submitting a form to a permanently redirected resource may continue smoothly.
- */
-@Response(code=CODE, description=MESSAGE)
-@BeanIgnore
-@Deprecated
-public class PermanentRedirect extends HttpResponse {
-
-	/** HTTP status code */
-	public static final int CODE = 308;
-
-	/** Default message */
-	public static final String MESSAGE = "Permanent Redirect";
-
-	/** Reusable instance. */
-	public static final PermanentRedirect INSTANCE = new PermanentRedirect();
-
-	private final URI location;
-
-	/**
-	 * Constructor using HTTP-standard message.
-	 */
-	public PermanentRedirect() {
-		this(MESSAGE, null);
-	}
-
-	/**
-	 * Constructor with no redirect.
-	 * <p>
-	 * Used for end-to-end interfaces.
-	 *
-	 * @param message Message to send as the response.
-	 */
-	public PermanentRedirect(String message) {
-		super(message);
-		this.location = null;
-	}
-
-	/**
-	 * Constructor using custom message.
-	 * @param message Message to send as the response.
-	 * @param location <c>Location</c> header value.
-	 */
-	public PermanentRedirect(String message, URI location) {
-		super(message);
-		this.location = location;
-	}
-
-	/**
-	 * Constructor.
-	 * @param location <c>Location</c> header value.
-	 */
-	public PermanentRedirect(URI location) {
-		this(MESSAGE, location);
-	}
-
-	/**
-	 * @return <c>Location</c> header value.
-	 */
-	@ResponseHeader(name="Location", description="New location of resource.")
-	public URI getLocation() {
-		return location;
-	}
-}
\ No newline at end of file
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/Processing.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/Processing.java
deleted file mode 100644
index e43d174..0000000
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/Processing.java
+++ /dev/null
@@ -1,58 +0,0 @@
-// ***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *
-// * with the License.  You may obtain a copy of the License at                                                              *
-// *                                                                                                                         *
-// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-// *                                                                                                                         *
-// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-// * specific language governing permissions and limitations under the License.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.rest.response;
-
-import static org.apache.juneau.rest.response.Processing.*;
-
-import org.apache.juneau.http.annotation.*;
-
-/**
- * Represents an <c>HTTP 102 Processing</c> response.
- *
- * <div class='warn'>
- * 	<b>Deprecated</b> - Use {@link org.apache.juneau.http.response.Processing}
- * </div>
- *
- * <p>
- * A WebDAV request may contain many sub-requests involving file operations, requiring a long time to complete the request.
- * This code indicates that the server has received and is processing the request, but no response is available yet.
- * This prevents the client from timing out and assuming the request was lost.
- */
-@Response(code=CODE, description=MESSAGE)
-@Deprecated
-public class Processing extends HttpResponse {
-
-	/** HTTP status code */
-	public static final int CODE = 102;
-
-	/** Default message */
-	public static final String MESSAGE = "Processing";
-
-	/** Reusable instance. */
-	public static final Processing INSTANCE = new Processing();
-
-	/**
-	 * Constructor using HTTP-standard message.
-	 */
-	public Processing() {
-		this(MESSAGE);
-	}
-
-	/**
-	 * Constructor using custom message.
-	 * @param message Message to send as the response.
-	 */
-	public Processing(String message) {
-		super(message);
-	}
-}
\ No newline at end of file
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/ResetContent.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/ResetContent.java
deleted file mode 100644
index fb36709..0000000
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/ResetContent.java
+++ /dev/null
@@ -1,57 +0,0 @@
-// ***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *
-// * with the License.  You may obtain a copy of the License at                                                              *
-// *                                                                                                                         *
-// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-// *                                                                                                                         *
-// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-// * specific language governing permissions and limitations under the License.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.rest.response;
-
-import static org.apache.juneau.rest.response.ResetContent.*;
-
-import org.apache.juneau.http.annotation.*;
-
-/**
- * Represents an <c>HTTP 205 Reset Content</c> response.
- *
- * <div class='warn'>
- * 	<b>Deprecated</b> - Use {@link org.apache.juneau.http.response.ResetContent}
- * </div>
- *
- * <p>
- * The server successfully processed the request, but is not returning any content.
- * Unlike a 204 response, this response requires that the requester reset the document view.
- */
-@Response(code=CODE, description=MESSAGE)
-@Deprecated
-public class ResetContent extends HttpResponse {
-
-	/** HTTP status code */
-	public static final int CODE = 205;
-
-	/** Default message */
-	public static final String MESSAGE = "Reset Content";
-
-	/** Reusable instance. */
-	public static final ResetContent INSTANCE = new ResetContent();
-
-	/**
-	 * Constructor using HTTP-standard message.
-	 */
-	public ResetContent() {
-		this(MESSAGE);
-	}
-
-	/**
-	 * Constructor using custom message.
-	 * @param message Message to send as the response.
-	 */
-	public ResetContent(String message) {
-		super(message);
-	}
-}
\ No newline at end of file
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/SeeOther.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/SeeOther.java
deleted file mode 100644
index 53d2f0d..0000000
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/SeeOther.java
+++ /dev/null
@@ -1,118 +0,0 @@
-// ***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *
-// * with the License.  You may obtain a copy of the License at                                                              *
-// *                                                                                                                         *
-// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-// *                                                                                                                         *
-// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-// * specific language governing permissions and limitations under the License.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.rest.response;
-
-import static org.apache.juneau.rest.response.SeeOther.*;
-import static org.apache.juneau.internal.StringUtils.*;
-
-import java.net.*;
-import java.text.*;
-
-import org.apache.juneau.annotation.BeanIgnore;
-import org.apache.juneau.http.annotation.*;
-
-/**
- * Represents an <c>HTTP 303 See Other</c> response.
- *
- * <div class='warn'>
- * 	<b>Deprecated</b> - Use {@link org.apache.juneau.http.response.SeeOther}
- * </div>
- *
- * <p>
- * The response to the request can be found under another URI using the GET method.
- * When received in response to a POST (or PUT/DELETE), the client should presume that the server has received the data and should issue a new GET request to the given URI.
- */
-@Response(code=CODE, description=MESSAGE)
-@BeanIgnore
-@Deprecated
-public class SeeOther extends HttpResponse {
-
-	/** HTTP status code */
-	public static final int CODE = 303;
-
-	/** Default message */
-	public static final String MESSAGE = "See Other";
-
-	/** Reusable instance. */
-	public static final SeeOther INSTANCE = new SeeOther();
-
-	private final URI location;
-
-	/**
-	 * Constructor using HTTP-standard message.
-	 */
-	public SeeOther() {
-		this(MESSAGE, null);
-	}
-
-	/**
-	 * Constructor with no redirect.
-	 * <p>
-	 * Used for end-to-end interfaces.
-	 *
-	 * @param message Message to send as the response.
-	 */
-	public SeeOther(String message) {
-		super(message);
-		this.location = null;
-	}
-
-	/**
-	 * Constructor using custom message.
-	 *
-	 * @param message Message to send as the response.
-	 * @param location <c>Location</c> header value.
-	 */
-	public SeeOther(String message, URI location) {
-		super(message);
-		this.location = location;
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param message Message to send as the response.
-	 * @param uri URI containing {@link MessageFormat}-style arguments.
-	 * @param uriArgs {@link MessageFormat}-style arguments.
-	 */
-	public SeeOther(String message, String uri, Object uriArgs) {
-		this(message, toURI(format(uri.toString(), uriArgs)));
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param location <c>Location</c> header value.
-	 */
-	public SeeOther(URI location) {
-		this(MESSAGE, location);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param uri URI containing {@link MessageFormat}-style arguments.
-	 * @param uriArgs {@link MessageFormat}-style arguments.
-	 */
-	public SeeOther(String uri, Object uriArgs) {
-		this(toURI(format(uri.toString(), uriArgs)));
-	}
-
-	/**
-	 * @return <c>Location</c> header value.
-	 */
-	@ResponseHeader(name="Location", description="Other location.")
-	public URI getLocation() {
-		return location;
-	}
-}
\ No newline at end of file
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/SwitchingProtocols.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/SwitchingProtocols.java
deleted file mode 100644
index 166c063..0000000
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/SwitchingProtocols.java
+++ /dev/null
@@ -1,56 +0,0 @@
-// ***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *
-// * with the License.  You may obtain a copy of the License at                                                              *
-// *                                                                                                                         *
-// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-// *                                                                                                                         *
-// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-// * specific language governing permissions and limitations under the License.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.rest.response;
-
-import static org.apache.juneau.rest.response.SwitchingProtocols.*;
-
-import org.apache.juneau.http.annotation.*;
-
-/**
- * Represents an <c>HTTP 101 Switching Protocols</c> response.
- *
- * <div class='warn'>
- * 	<b>Deprecated</b> - Use {@link org.apache.juneau.http.response.SwitchingProtocols}
- * </div>
- *
- * <p>
- * The requester has asked the server to switch protocols and the server has agreed to do so.
- */
-@Response(code=CODE, description=MESSAGE)
-@Deprecated
-public class SwitchingProtocols extends HttpResponse {
-
-	/** HTTP status code */
-	public static final int CODE = 101;
-
-	/** Default message */
-	public static final String MESSAGE = "Switching Protocols";
-
-	/** Reusable instance. */
-	public static final SwitchingProtocols INSTANCE = new SwitchingProtocols();
-
-	/**
-	 * Constructor using HTTP-standard message.
-	 */
-	public SwitchingProtocols() {
-		this(MESSAGE);
-	}
-
-	/**
-	 * Constructor using custom message.
-	 * @param message Message to send as the response.
-	 */
-	public SwitchingProtocols(String message) {
-		super(message);
-	}
-}
\ No newline at end of file
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/TemporaryRedirect.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/TemporaryRedirect.java
deleted file mode 100644
index b648817..0000000
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/TemporaryRedirect.java
+++ /dev/null
@@ -1,94 +0,0 @@
-// ***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *
-// * with the License.  You may obtain a copy of the License at                                                              *
-// *                                                                                                                         *
-// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-// *                                                                                                                         *
-// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-// * specific language governing permissions and limitations under the License.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.rest.response;
-
-import static org.apache.juneau.rest.response.TemporaryRedirect.*;
-
-import java.net.*;
-
-import org.apache.juneau.annotation.BeanIgnore;
-import org.apache.juneau.http.annotation.*;
-
-/**
- * Represents an <c>HTTP 307 Temporary Redirect</c> response.
- *
- * <div class='warn'>
- * 	<b>Deprecated</b> - Use {@link org.apache.juneau.http.response.TemporaryRedirect}
- * </div>
- *
- * <p>
- * In this case, the request should be repeated with another URI; however, future requests should still use the original URI.
- * In contrast to how 302 was historically implemented, the request method is not allowed to be changed when reissuing the original request.
- * For example, a POST request should be repeated using another POST request.
- */
-@Response(code=CODE, description=MESSAGE)
-@BeanIgnore
-@Deprecated
-public class TemporaryRedirect extends HttpResponse {
-
-	/** HTTP status code */
-	public static final int CODE = 307;
-
-	/** Default message */
-	public static final String MESSAGE = "Temporary Redirect";
-
-	/** Reusable instance. */
-	public static final TemporaryRedirect INSTANCE = new TemporaryRedirect();
-
-	private final URI location;
-
-	/**
-	 * Constructor using HTTP-standard message.
-	 */
-	public TemporaryRedirect() {
-		this(MESSAGE, null);
-	}
-
-	/**
-	 * Constructor with no redirect.
-	 * <p>
-	 * Used for end-to-end interfaces.
-	 *
-	 * @param message Message to send as the response.
-	 */
-	public TemporaryRedirect(String message) {
-		super(message);
-		this.location = null;
-	}
-
-	/**
-	 * Constructor using custom message.
-	 * @param message Message to send as the response.
-	 * @param location <c>Location</c> header value.
-	 */
-	public TemporaryRedirect(String message, URI location) {
-		super(message);
-		this.location = location;
-	}
-
-	/**
-	 * Constructor.
-	 * @param location <c>Location</c> header value.
-	 */
-	public TemporaryRedirect(URI location) {
-		this(MESSAGE, location);
-	}
-
-	/**
-	 * @return <c>Location</c> header value.
-	 */
-	@ResponseHeader(name="Location", description="Temporary location of resource.")
-	public URI getLocation() {
-		return location;
-	}
-}
\ No newline at end of file
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/UseProxy.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/UseProxy.java
deleted file mode 100644
index 1f5fe93..0000000
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/UseProxy.java
+++ /dev/null
@@ -1,57 +0,0 @@
-// ***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *
-// * with the License.  You may obtain a copy of the License at                                                              *
-// *                                                                                                                         *
-// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-// *                                                                                                                         *
-// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-// * specific language governing permissions and limitations under the License.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.rest.response;
-
-import static org.apache.juneau.rest.response.UseProxy.*;
-
-import org.apache.juneau.http.annotation.*;
-
-/**
- * Represents an <c>HTTP 305 Use Proxy</c> response.
- *
- * <div class='warn'>
- * 	<b>Deprecated</b> - Use {@link org.apache.juneau.http.response.UseProxy}
- * </div>
- *
- * <p>
- * The requested resource is available only through a proxy, the address for which is provided in the response.
- * Many HTTP clients (such as Mozilla and Internet Explorer) do not correctly handle responses with this status code, primarily for security reasons.
- */
-@Response(code=CODE, description=MESSAGE)
-@Deprecated
-public class UseProxy extends HttpResponse {
-
-	/** HTTP status code */
-	public static final int CODE = 305;
-
-	/** Default message */
-	public static final String MESSAGE = "Use Proxy";
-
-	/** Reusable instance. */
-	public static final UseProxy INSTANCE = new UseProxy();
-
-	/**
-	 * Constructor using HTTP-standard message.
-	 */
-	public UseProxy() {
-		this(MESSAGE);
-	}
-
-	/**
-	 * Constructor using custom message.
-	 * @param message Message to send as the response.
-	 */
-	public UseProxy(String message) {
-		super(message);
-	}
-}
\ No newline at end of file
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/package-info.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/package-info.java
deleted file mode 100644
index f6e1fbd..0000000
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/package-info.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/***************************************************************************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations under the License.
- *
- ***************************************************************************************************************************/
-
-/**
- * REST Server Utilities
- */
-package org.apache.juneau.rest.response;
\ No newline at end of file


Mime
View raw message