You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2013/04/22 14:46:13 UTC
svn commit: r1470481 - in /archiva/trunk/archiva-modules/archiva-web:
archiva-web-common/src/test/java/org/apache/archiva/DownloadMergedIndexTest.java
archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java
Author: olamy
Date: Mon Apr 22 12:46:13 2013
New Revision: 1470481
URL: http://svn.apache.org/r1470481
Log:
fix issues downloading merged index path (thanks to unit tests) and add an other with non default mergedindex path
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/DownloadMergedIndexTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/DownloadMergedIndexTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/DownloadMergedIndexTest.java?rev=1470481&r1=1470480&r2=1470481&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/DownloadMergedIndexTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/DownloadMergedIndexTest.java Mon Apr 22 12:46:13 2013
@@ -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 );
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java?rev=1470481&r1=1470480&r2=1470481&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java Mon Apr 22 12:46:13 2013
@@ -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, "/" );