Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-05-07 15:28:09 +02:00
Code Issues Packages Projects Releases Activity

fix svn checkout bug with empty classpath

Browse Source
This commit is contained in:
Sebastian Sdorra
2011-01-16 15:51:45 +01:00
parent 797f33a070
commit f4853db3c0
3 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
plugins/scm-svn-plugin/pom.xml
View File

@@ -19,10 +19,17 @@
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>${servlet.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.tmatesoft.svnkit</groupId>
<artifactId>svnkit</artifactId>
<version>${svnkit.version}</version>
<artifactId>svnkit-dav</artifactId>
<version>${svnkit-dav.version}</version>
<exclusions>
<exclusion>
<artifactId>trilead-ssh2</artifactId>
@@ -35,12 +42,6 @@
</exclusions>
</dependency>
<dependency>
<groupId>org.tmatesoft.svnkit</groupId>
<artifactId>svnkit-dav</artifactId>
<version>${svnkit.version}</version>
</dependency>
<!-- test scope -->
<dependency>
@@ -53,7 +54,7 @@
</dependencies>
<properties>
<svnkit.version>1.3.5</svnkit.version>
<svnkit-dav.version>1.3.5.1</svnkit-dav.version>
</properties>
</project>

9
third-party/svnkit-dav/pom.xml vendored
View File

@@ -12,7 +12,7 @@
<groupId>org.tmatesoft.svnkit</groupId>
<artifactId>svnkit-dav</artifactId>
<packaging>jar</packaging>
<version>1.3.5</version>
<version>1.3.5.1</version>
<name>svnkit-dav</name>
<dependencies>
@@ -21,14 +21,19 @@
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>${servlet.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.tmatesoft.svnkit</groupId>
<artifactId>svnkit</artifactId>
<version>${project.version}</version>
<version>${svnkit.version}</version>
</dependency>
</dependencies>
<properties>
<svnkit.version>1.3.5</svnkit.version>
</properties>
</project>

11
third-party/svnkit-dav/src/main/java/org/tmatesoft/svn/core/internal/server/dav/DAVRepositoryManager.java vendored
View File

@@ -182,6 +182,7 @@ public class DAVRepositoryManager {
String uri = DAVPathUtil.addLeadingSlash(url.getURIEncodedPath());
if (uri.startsWith(getResourceContext())) {
uri = uri.substring(getResourceContext().length());
uri = DAVPathUtil.addLeadingSlash(uri);
} else {
SVNErrorManager.error(SVNErrorMessage.create(SVNErrorCode.RA_DAV_REQUEST_FAILED, "Invalid URL ''{0}'' requested", url.toString()),
SVNLogType.NETWORK);
@@ -291,7 +292,7 @@ public class DAVRepositoryManager {
}
requestContext = SVNPathUtil.append(requestContext, servletPath);
}
return SVNEncodingUtil.uriEncode(requestContext);
return encodeRequestContext(requestContext);
}
String reposName = DAVPathUtil.head(pathInfo);
@@ -301,9 +302,13 @@ public class DAVRepositoryManager {
}
String pathToRepos = SVNPathUtil.append(requestContext, servletPath);
requestContext = SVNPathUtil.append(pathToRepos, reposName);
return SVNEncodingUtil.uriEncode(requestContext);
return encodeRequestContext(requestContext);
}
requestContext = DAVPathUtil.append(requestContext, reposName);
return SVNEncodingUtil.uriEncode(requestContext);
return encodeRequestContext(requestContext);
}
private String encodeRequestContext(String requestContext){
return SVNEncodingUtil.uriEncode( DAVPathUtil.addLeadingSlash(requestContext) );
}
}