Author: tchemit Date: 2013-09-11 22:57:30 +0200 (Wed, 11 Sep 2013) New Revision: 419 Url: http://nuiton.org/projects/jredmine/repository/revisions/419 Log: refs #2836: jredmine client assumes redmine's context root is / Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/client/RedmineClient.java Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/client/RedmineClient.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/client/RedmineClient.java 2013-09-11 20:56:50 UTC (rev 418) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/client/RedmineClient.java 2013-09-11 20:57:30 UTC (rev 419) @@ -33,7 +33,6 @@ import org.apache.commons.logging.LogFactory; import org.apache.http.HttpEntity; import org.apache.http.HttpEntityEnclosingRequest; -import org.apache.http.HttpHost; import org.apache.http.HttpResponse; import org.apache.http.HttpStatus; import org.apache.http.NameValuePair; @@ -69,6 +68,7 @@ import java.io.InputStream; import java.net.URI; import java.net.URISyntaxException; +import java.net.URL; import java.util.List; import java.util.Map; @@ -90,7 +90,7 @@ protected final HttpClient client; - protected final HttpHost host; + protected final URL serverUrl; protected final HttpContext clientContext; @@ -113,17 +113,8 @@ // Bind custom cookie store to the local context clientContext.setAttribute(ClientContext.COOKIE_STORE, cookieStore); - int port = configuration.getUrl().getPort(); - if (port == -1) { + serverUrl = configuration.getUrl(); - // no port set - host = new HttpHost(configuration.getUrl().getHost()); - } else { - - // a specific port is asked - host = new HttpHost(configuration.getUrl().getHost(), port); - } - // set encoding (will then encode parameters fine) client.getParams().setParameter( CoreProtocolPNames.HTTP_CONTENT_CHARSET, @@ -320,8 +311,13 @@ protected <T> String getRequestUrl(RedmineRequest<T> request) { - String uri = host.toURI(); - String result = request.toPath(uri); + String result = null; + try { + String uri = serverUrl.toURI().toString(); + result = request.toPath(uri); + } catch (URISyntaxException e) { + throw new IllegalStateException(e); + } return result; }