Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix issues downloading merged index path (thanks to unit tests) and add an other with non default mergedindex path 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1470481 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2013-04-22 12:46:13 +00:00
parent cd7372298d
commit 97f22cd13c
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/DownloadMergedIndexTest.java
View File

@ -123,8 +123,15 @@ public class DownloadMergedIndexTest
RepositoryGroupService repositoryGroupService = getRepositoryGroupService();
String repoGroupId = "test-group";
if ( repositoryGroupService.getRepositoryGroup( repoGroupId ) != null )
{
repositoryGroupService.deleteRepositoryGroup( repoGroupId );
}
RepositoryGroup repositoryGroup = new RepositoryGroup();
repositoryGroup.setId( "test-group" );
repositoryGroup.setId( repoGroupId );
repositoryGroup.setRepositories( Arrays.asList( id ) );
repositoryGroupService.addRepositoryGroup( repositoryGroup );
@ -134,7 +141,7 @@ public class DownloadMergedIndexTest
managedRepository = new ManagedRepository();
managedRepository.setId( id );
managedRepository.setName( "name of " + id );
managedRepository.setLocation(System.getProperty( "basedir" ) + "/src/test/repositories/test-repo" );
managedRepository.setLocation( System.getProperty( "basedir" ) + "/src/test/repositories/test-repo" );
managedRepository.setIndexDirectory( System.getProperty( "java.io.tmpdir" ) + "/tmpIndex/" + id );
if ( managedRepositoriesService.getManagedRepository( id ) != null )
@ -157,7 +164,7 @@ public class DownloadMergedIndexTest
ProxyConnectorService proxyConnectorService = getProxyConnectorService();
ProxyConnector proxyConnector = new ProxyConnector();
proxyConnector.setProxyId( "foo-bar" );
proxyConnector.setProxyId( "foo-bar1" );
proxyConnector.setSourceRepoId( id );
proxyConnector.setTargetRepoId( "all-merged" );
proxyConnectorService.addProxyConnector( proxyConnector );

2
archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java
View File

@ -446,7 +446,7 @@ public class ArchivaDavResourceFactory
String rootPath = StringUtils.substringBeforeLast( pathInfo, "/" );
if ( StringUtils.endsWith( rootPath, "/" + repoGroupConfig.getMergedIndexPath() ) )
if ( StringUtils.endsWith( rootPath, repoGroupConfig.getMergedIndexPath() ) )
{
// we are in the case of index file request
String requestedFileName = StringUtils.substringAfterLast( pathInfo, "/" );