GitLab Mirror pushed to branch 2.10 at cms-community / hippo-jackrabbit
Commits: f70bae2d by Julian Reschke at 2016-11-24T08:30:23+00:00 JCR-4059: avoid use of HttpClient3 URI class (ported to 2.10) git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/branches/2.10@1771080 13f79535-47bb-0310-9956-ffa450edef68 - - - - - 3 changed files: - jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java - jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/URIResolverImpl.java - jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/RepositoryServiceImpl.java Changes: ===================================== jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java ===================================== --- a/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java +++ b/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java @@ -22,6 +22,7 @@ import java.io.InputStreamReader; import java.io.Reader; import java.io.StringWriter; import java.io.UnsupportedEncodingException; +import java.net.URI; import java.net.URISyntaxException; import java.util.ArrayList; import java.util.Arrays; @@ -68,8 +69,6 @@ import org.apache.commons.httpclient.HttpConnectionManager; import org.apache.commons.httpclient.HttpMethod; import org.apache.commons.httpclient.HttpStatus; import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager; -import org.apache.commons.httpclient.URI; -import org.apache.commons.httpclient.URIException; import org.apache.commons.httpclient.auth.AuthScope; import org.apache.commons.httpclient.methods.GetMethod; import org.apache.commons.httpclient.methods.HeadMethod; @@ -331,14 +330,14 @@ public class RepositoryServiceImpl implements RepositoryService, DavConstants { try { URI repositoryUri = computeRepositoryUri(uri); hostConfig = new HostConfiguration(); - hostConfig.setHost(repositoryUri); + hostConfig.setHost(repositoryUri.toASCIIString()); nsCache = new NamespaceCache(); uriResolver = new URIResolverImpl(repositoryUri, this, DomUtil.createDocument()); NamePathResolver resolver = new NamePathResolverImpl(nsCache); valueFactory = new ValueFactoryQImpl(qValueFactory, resolver); - } catch (URIException e) { + } catch (URISyntaxException e) { throw new RepositoryException(e); } catch (ParserConfigurationException e) { throw new RepositoryException(e); @@ -2783,8 +2782,8 @@ public class RepositoryServiceImpl implements RepositoryService, DavConstants { * Compute the repository URI (while dealing with trailing / and port number * defaulting) */ - public static URI computeRepositoryUri(String uri) throws URIException { - URI repositoryUri = new URI((uri.endsWith("/")) ? uri : uri + "/", true); + public static URI computeRepositoryUri(String uri) throws URISyntaxException { + URI repositoryUri = URI.create((uri.endsWith("/")) ? uri : uri + "/"); // workaround for JCR-3228: normalize default port numbers because of // the weak URI matching code elsewhere (the remote server is unlikely // to include the port number in URIs when it's the default for the @@ -2792,7 +2791,7 @@ public class RepositoryServiceImpl implements RepositoryService, DavConstants { boolean useDefaultPort = ("http".equalsIgnoreCase(repositoryUri.getScheme()) && repositoryUri.getPort() == 80) || (("https".equalsIgnoreCase(repositoryUri.getScheme()) && repositoryUri.getPort() == 443)); if (useDefaultPort) { - repositoryUri = new URI(repositoryUri.getScheme(), repositoryUri.getUserinfo(), repositoryUri.getHost(), -1, + repositoryUri = new URI(repositoryUri.getScheme(), repositoryUri.getUserInfo(), repositoryUri.getHost(), -1, repositoryUri.getPath(), repositoryUri.getQuery(), repositoryUri.getFragment()); } ===================================== jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/URIResolverImpl.java ===================================== --- a/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/URIResolverImpl.java +++ b/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/URIResolverImpl.java @@ -16,7 +16,6 @@ */ package org.apache.jackrabbit.spi2dav; -import org.apache.commons.httpclient.URI; import org.apache.jackrabbit.commons.webdav.JcrRemotingConstants; import org.apache.jackrabbit.spi.commons.conversion.NameException; import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver; @@ -45,6 +44,7 @@ import org.w3c.dom.Document; import javax.jcr.ItemNotFoundException; import javax.jcr.RepositoryException; import java.io.IOException; +import java.net.URI; import java.net.URISyntaxException; import java.util.HashMap; import java.util.Map; @@ -79,7 +79,7 @@ class URIResolverImpl implements URIResolver { } String getRepositoryUri() { - return repositoryUri.getEscapedURI(); + return repositoryUri.toASCIIString(); } String getWorkspaceUri(String workspaceName) { ===================================== jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/RepositoryServiceImpl.java ===================================== --- a/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/RepositoryServiceImpl.java +++ b/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/RepositoryServiceImpl.java @@ -18,6 +18,8 @@ package org.apache.jackrabbit.spi2davex; import java.io.IOException; import java.io.StringWriter; +import java.net.URI; +import java.net.URISyntaxException; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; @@ -31,8 +33,6 @@ import javax.jcr.RepositoryException; import org.apache.commons.httpclient.HttpClient; import org.apache.commons.httpclient.HttpException; import org.apache.commons.httpclient.HttpMethod; -import org.apache.commons.httpclient.URI; -import org.apache.commons.httpclient.URIException; import org.apache.commons.httpclient.methods.RequestEntity; import org.apache.commons.httpclient.methods.multipart.MultipartRequestEntity; import org.apache.commons.httpclient.methods.multipart.Part; @@ -193,7 +193,7 @@ public class RepositoryServiceImpl extends org.apache.jackrabbit.spi2dav.Reposit try { URI repositoryUri = computeRepositoryUri(jcrServerURI); this.jcrServerURI = repositoryUri.toString(); - } catch (URIException e) { + } catch (URISyntaxException e) { throw new RepositoryException(e); } View it on GitLab: https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/f70bae2d40575de446fa166db91a2fa79779a8b0
_______________________________________________ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
