svn commit: r676526 - in /archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src: main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java test/java/org/apache/maven/archiva/webdav/RepositoryServletRepositoryGroupTest.java

[oching]

Author: oching
Date: Mon Jul 14 02:23:33 2008
New Revision: 676526

URL: http://svn.apache.org/viewvc?rev=676526&view=rev
Log:
[MRM-872]
-write the merged metadata into maven-metadata-${repoGroupId}.xml instead of 
merged-maven-metadata.xml

Modified:
    
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java
    
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletRepositoryGroupTest.java

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java?rev=676526&r1=676525&r2=676526&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java
 Mon Jul 14 02:23:33 2008
@@ -175,8 +175,6 @@
      */
     private Digester digestMd5;
         
-    private static final String mergedMetadataFilename = 
"/merged-maven-metadata.xml";
-        
     public DavResource createResource( final DavResourceLocator locator, final 
DavServletRequest request,
                                        final DavServletResponse response )
         throws DavException
@@ -303,9 +301,9 @@
                 artifactId = StringUtils.substringAfterLast( artifactId, "/" );
                 
                 ArchivaDavResource res = ( ArchivaDavResource ) 
availableResources.get( 0 );
-                String filePath = StringUtils.substringBeforeLast( 
res.getLocalResource().getAbsolutePath().replace( '\\', '/' ), "/" );
-                filePath = filePath + mergedMetadataFilename;
-                   
+                String filePath = StringUtils.substringBeforeLast( 
res.getLocalResource().getAbsolutePath().replace( '\\', '/' ), "/" );           
                     
+                filePath = filePath + "/maven-metadata-" + 
repoGroupConfig.getId() + ".xml";
+                
                 // for MRM-872 handle checksums of the merged metadata files 
                 if( repositoryRequest.isSupportFile( requestedResource ) )
                 {

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletRepositoryGroupTest.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletRepositoryGroupTest.java?rev=676526&r1=676525&r2=676526&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletRepositoryGroupTest.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletRepositoryGroupTest.java
 Mon Jul 14 02:23:33 2008
@@ -276,7 +276,7 @@
         response = sc.getResource( request );
         
         assertResponseOK( response );
-        assertEquals( "d2321a573e0488bca571b624f891104009408dd8  
merged-maven-metadata.xml", response.getText() );
+        assertEquals( "d2321a573e0488bca571b624f891104009408dd8  
maven-metadata-group-with-valid-repos.xml", response.getText() );
         
         // request the md5 checksum of the metadata
         request =
@@ -285,7 +285,7 @@
         response = sc.getResource( request );
                 
         assertResponseOK( response );
-        assertEquals( "79d271fbe8bd1d17b23273937750d407  
merged-maven-metadata.xml", response.getText().trim() );
+        assertEquals( "79d271fbe8bd1d17b23273937750d407  
maven-metadata-group-with-valid-repos.xml", response.getText().trim() );
     }
         
     protected void assertResponseMethodNotAllowed( WebResponse response )