Released Restlet Framework 2.3.9

restlet · Dec 20, 2016 · 1571731 · 1571731
1 parent 48754d3
commit 1571731
Show file tree

Hide file tree

Showing 12 changed files with 108 additions and 156 deletions.
diff --git a/build/build.properties b/build/build.properties
@@ -6,9 +6,9 @@
 major-number: 2
 minor-number: 3
 # the last figure of the real release number: e.g. 1 in "2.2m1", "2.3rc1", "2.4.1"
-release-number:8
+release-number:9
 # choose among: final, snapshot, rc, milestone
-meta.release-type: snapshot
+meta.release-type: final
 version-minor: ${major-number}.${minor-number}
 
 # Version of JDK required

diff --git a/build/tmpl/text/changes.txt b/build/tmpl/text/changes.txt
@@ -3,12 +3,13 @@
 Changes log
 ===========
 
-- @version-full@ (@release-date@)
+- 2.3.9 (12/19/2016)
     - Bugs fixed
        - In IE 10 and seq., request without body are sent with an "undefined" body. Issue #1252.
          Reported by Etienne Griette.
        - Fixed potential NPE when a queue returns null in PipeStream. Issue #1246.
          Reported and contributed by Grégoire Juge. 
+
 - 2.3.8 (12/10/2016)
     - Bugs fixed
        - Fixed NullPointerException when requesting a Directory with a query string. Issue #1206.

diff --git a/libraries/com.thoughtworks.xstream_1.4/library.xml b/libraries/com.thoughtworks.xstream_1.4/library.xml
@@ -16,6 +16,6 @@
 		<distribution id="classic" />
 	</distributions>
 	<javadocs>
-		<link href="http://xstream.codehaus.org/javadoc/" />
+		<link href="http://x-stream.github.io/javadoc/" />
 	</javadocs>
 </library>
diff --git a/libraries/org.apache.commons.collections_3.2/library.xml b/libraries/org.apache.commons.collections_3.2/library.xml
@@ -17,6 +17,6 @@
 		<distribution id="classic" />
 	</distributions>
 	<javadocs>
-		<link href="http://commons.apache.org/proper/commons-collections/javadocs/api-3.2.1/" />
+		<link href="http://commons.apache.org/proper/commons-collections/javadocs/api-3.2.2/" />
 	</javadocs>
 </library>
diff --git a/modules/org.restlet.ext.jaxrs/src/org/restlet/ext/jaxrs/AbstractUriBuilder.java b/modules/org.restlet.ext.jaxrs/src/org/restlet/ext/jaxrs/AbstractUriBuilder.java
@@ -249,7 +249,7 @@ public URI buildFromMap(Map<String, ? extends Object> values)
      * @throws UriBuilderException
      *             if a URI cannot be constructed based on the current state of
      *             the builder.
-     * @see javax.ws.rs.core.UriBuilder#build(java.util.Map)
+     * @see javax.ws.rs.core.UriBuilder#buildFromMap(Map)
      */
     private URI buildFromMap(final Map<String, ? extends Object> values,
             final boolean encode) throws IllegalArgumentException,

diff --git a/modules/org.restlet.ext.jaxrs/src/org/restlet/ext/jaxrs/JaxRsRestlet.java b/modules/org.restlet.ext.jaxrs/src/org/restlet/ext/jaxrs/JaxRsRestlet.java
@@ -275,7 +275,7 @@ public boolean addClass(Class<?> jaxRsClass)
      * @return true, if the provider is ok and added, otherwise false.
      * @throws IllegalArgumentException
      *             if null was given
-     * @see {@link javax.ws.rs.ext.Provider}
+     * @see class       {@link javax.ws.rs.ext.Provider}
      */
     private boolean addDefaultProvider(Object jaxRsProvider) {
         try {
@@ -311,7 +311,7 @@ public boolean addSingleton(Object jaxRsProviderOrRootresourceObject)
      * @return true, if the provider is ok and added, otherwise false.
      * @throws IllegalArgumentException
      *             if null was given
-     * @see {@link javax.ws.rs.ext.Provider}
+     * @see class {@link javax.ws.rs.ext.Provider}
      */
     private boolean addSingleton(Object jaxRsProvider, boolean defaultProvider)
             throws IllegalArgumentException {
@@ -483,7 +483,7 @@ private Representation convertToRepresentation(Object entity,
      * @param o
      * @param subResourceLocator
      * @param callContext
-     * @return
+     * @return ResourceObject
      * @throws WebApplicationException
      * @throws RequestHandledException
      */

diff --git a/modules/org.restlet.ext.oauth/src/org/restlet/ext/oauth/AccessTokenServerResource.java b/modules/org.restlet.ext.oauth/src/org/restlet/ext/oauth/AccessTokenServerResource.java
@@ -347,8 +347,8 @@ protected String getPassword(Form parameters) throws OAuthException {
      * @throws OAuthException
      *             In case the parameter is not set.
      */
-    protected String getRedirectURI(Form params) throws OAuthException {
-        return getParameter(params, REDIR_URI);
+    protected String getRedirectURI(Form parameters) throws OAuthException {
+        return getParameter(parameters, REDIR_URI);
     }
 
     /**
@@ -359,8 +359,8 @@ protected String getRedirectURI(Form params) throws OAuthException {
      * @throws OAuthException
      *             In case the parameter is not set.
      */
-    protected String getRefreshToken(Form params) throws OAuthException {
-        return getParameter(params, REFRESH_TOKEN);
+    protected String getRefreshToken(Form parameters) throws OAuthException {
+        return getParameter(parameters, REFRESH_TOKEN);
     }
 
     /**
@@ -371,8 +371,8 @@ protected String getRefreshToken(Form params) throws OAuthException {
      * @throws OAuthException
      *             In case the parameter is not set.
      */
-    protected String getUsername(Form params) throws OAuthException {
-        return getParameter(params, USERNAME);
+    protected String getUsername(Form parameters) throws OAuthException {
+        return getParameter(parameters, USERNAME);
     }
 
     /**

diff --git a/modules/org.restlet.ext.oauth/src/org/restlet/ext/oauth/AuthorizationServerResource.java b/modules/org.restlet.ext.oauth/src/org/restlet/ext/oauth/AuthorizationServerResource.java
@@ -166,8 +166,8 @@ protected RedirectionURI getRedirectionURI(Form parameters, Client client) throw
      * @return
      * @throws OAuthException
      */
-    protected ResponseType[] getResponseType(Form params) throws OAuthException {
-        String responseType = params.getFirstValue(RESPONSE_TYPE);
+    protected ResponseType[] getResponseType(Form parameters) throws OAuthException {
+        String responseType = parameters.getFirstValue(RESPONSE_TYPE);
         if (StringUtils.isNullOrEmpty(responseType)) {
             throw new OAuthException(OAuthError.invalid_request, "No \"response_type\" parameter found.", null);
         }

diff --git a/modules/org.restlet.ext.oauth/src/org/restlet/ext/oauth/OAuthParameters.java b/modules/org.restlet.ext.oauth/src/org/restlet/ext/oauth/OAuthParameters.java
@@ -181,7 +181,7 @@ public Reference toReference(String uri) {
     /**
      * Completes the URI with the OAuth parameters as query parameters.
      * 
-     * @param uri
+     * @param ref
      *            The URI to complete.
      * @return The URI with the set as Oauth parameters as query.
      */

diff --git a/modules/org.restlet/src/org/restlet/engine/header/HeaderUtils.java b/modules/org.restlet/src/org/restlet/engine/header/HeaderUtils.java
@@ -693,12 +693,10 @@ public static void addResponseHeaders(Response response,
     }
 
     /**
-     * Copies extension headers into a request.
+     * Remove the headers that are mapped to the framework's API from the given message's list of headers.
      * 
-     * @param headers
-     *            The headers to copy.
-     * @param request
-     *            The request to update.
+     * @param message
+     *            The message to update.
      */
     public static void keepExtensionHeadersOnly(Message message) {
         Series<Header> headers = message.getHeaders();
@@ -719,8 +717,8 @@ public static void keepExtensionHeadersOnly(Message message) {
      * 
      * @param headers
      *            The headers to copy.
-     * @param request
-     *            The request to update.
+     * @param message
+     *            The message to update.
      */
     public static void copyExtensionHeaders(Series<Header> headers, Message message) {
         if (headers != null) {