Author: rombert Date: Tue Aug 4 12:10:20 2015 New Revision: 1694036 URL: http://svn.apache.org/r1694036 Log: SLING-4923 - Unable to connect to Sling instance running with a custom context
Introduce RepositoryInfo.appendUrl for safer path manipulations Modified: sling/trunk/tooling/ide/api/src/org/apache/sling/ide/transport/RepositoryInfo.java sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/jcr/RepositoryUtils.java Modified: sling/trunk/tooling/ide/api/src/org/apache/sling/ide/transport/RepositoryInfo.java URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/api/src/org/apache/sling/ide/transport/RepositoryInfo.java?rev=1694036&r1=1694035&r2=1694036&view=diff ============================================================================== --- sling/trunk/tooling/ide/api/src/org/apache/sling/ide/transport/RepositoryInfo.java (original) +++ sling/trunk/tooling/ide/api/src/org/apache/sling/ide/transport/RepositoryInfo.java Tue Aug 4 12:10:20 2015 @@ -18,6 +18,8 @@ package org.apache.sling.ide.transport; import java.net.URI; +import org.apache.sling.ide.util.PathUtil; + public class RepositoryInfo { private String username; @@ -39,6 +41,13 @@ public class RepositoryInfo { return password; } + /** + * Returns the URL for this repository + * + * <p>If you need to manipulate the URL by appending a path it's recommended to use {@link #appendPath(String)}</p> + * + * @return the URL for this repository + */ public String getUrl() { return url; } @@ -52,6 +61,11 @@ public class RepositoryInfo { return URI.create(url).getPort(); } + + public String appendPath(String url) { + + return PathUtil.join(this.url, url); + } @Override public String toString() { Modified: sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/jcr/RepositoryUtils.java URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/jcr/RepositoryUtils.java?rev=1694036&r1=1694035&r2=1694036&view=diff ============================================================================== --- sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/jcr/RepositoryUtils.java (original) +++ sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/jcr/RepositoryUtils.java Tue Aug 4 12:10:20 2015 @@ -53,7 +53,7 @@ public abstract class RepositoryUtils { for (String webDavUrlLocation : WEBDAV_URL_LOCATIONS) { Session session = null; - String url = repositoryInfo.getUrl() + webDavUrlLocation; + String url = repositoryInfo.appendPath(webDavUrlLocation); try { RepositoryAddress address = new RepositoryAddress(url); Repository repository;