You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by jd...@apache.org on 2008/08/13 03:47:08 UTC
svn commit: r685414 - in
/archiva/branches/metadata-rejig-1.2/archiva-modules:
archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/metadata/
archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/
Author: jdumay
Date: Tue Aug 12 18:47:08 2008
New Revision: 685414
URL: http://svn.apache.org/viewvc?rev=685414&view=rev
Log:
Fix failing test testGetMergedMetadata(org.apache.maven.archiva.webdav.RepositoryServletRepositoryGroupTest)
Modified:
archiva/branches/metadata-rejig-1.2/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/metadata/MetadataTools.java
archiva/branches/metadata-rejig-1.2/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/metadata/RepositoryMetadataMerge.java
archiva/branches/metadata-rejig-1.2/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletRepositoryGroupTest.java
Modified: archiva/branches/metadata-rejig-1.2/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/metadata/MetadataTools.java
URL: http://svn.apache.org/viewvc/archiva/branches/metadata-rejig-1.2/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/metadata/MetadataTools.java?rev=685414&r1=685413&r2=685414&view=diff
==============================================================================
--- archiva/branches/metadata-rejig-1.2/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/metadata/MetadataTools.java (original)
+++ archiva/branches/metadata-rejig-1.2/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/metadata/MetadataTools.java Tue Aug 12 18:47:08 2008
@@ -424,9 +424,8 @@
public void updateMetadata( ManagedRepositoryContent managedRepository, String logicalResource) throws RepositoryMetadataException
{
- ArchivaRepositoryMetadata metadata = null;
final File metadataFile = new File(managedRepository.getRepoRoot(), logicalResource);
-// final long lastUpdated = getExistingLastUpdated( metadataFile );
+ ArchivaRepositoryMetadata metadata = null;
//Gather and merge all metadata available
List<ArchivaRepositoryMetadata> metadatas = getMetadatasForManagedRepository(managedRepository, logicalResource);
@@ -448,12 +447,10 @@
updateMetadataVersions(availableVersions, metadata);
}
-// if ( lastUpdated > 0 )
-// {
-// metadata.setLastUpdatedTimestamp( toLastUpdatedDate( lastUpdated ) );
-// }
-
RepositoryMetadataWriter.write(metadata, metadataFile);
+
+ ChecksummedFile checksum = new ChecksummedFile( metadataFile );
+ checksum.fixChecksums( algorithms );
}
/**
Modified: archiva/branches/metadata-rejig-1.2/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/metadata/RepositoryMetadataMerge.java
URL: http://svn.apache.org/viewvc/archiva/branches/metadata-rejig-1.2/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/metadata/RepositoryMetadataMerge.java?rev=685414&r1=685413&r2=685414&view=diff
==============================================================================
--- archiva/branches/metadata-rejig-1.2/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/metadata/RepositoryMetadataMerge.java (original)
+++ archiva/branches/metadata-rejig-1.2/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/metadata/RepositoryMetadataMerge.java Tue Aug 12 18:47:08 2008
@@ -19,11 +19,7 @@
* under the License.
*/
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
import org.apache.maven.archiva.model.ArchivaModelCloner;
import org.apache.maven.archiva.model.ArchivaRepositoryMetadata;
import org.apache.maven.archiva.model.SnapshotVersion;
@@ -31,7 +27,6 @@
import java.util.Iterator;
import java.util.List;
import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.time.DateUtils;
import org.apache.maven.archiva.model.Plugin;
/**
Modified: archiva/branches/metadata-rejig-1.2/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletRepositoryGroupTest.java
URL: http://svn.apache.org/viewvc/archiva/branches/metadata-rejig-1.2/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletRepositoryGroupTest.java?rev=685414&r1=685413&r2=685414&view=diff
==============================================================================
--- archiva/branches/metadata-rejig-1.2/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletRepositoryGroupTest.java (original)
+++ archiva/branches/metadata-rejig-1.2/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletRepositoryGroupTest.java Tue Aug 12 18:47:08 2008
@@ -77,6 +77,7 @@
protected static final String REPO_GROUP_WITH_INVALID_REPOS = "group-with-invalid-repos";
+ @Override
protected void setUp()
throws Exception
{
@@ -119,6 +120,7 @@
saveConfiguration( archivaConfiguration );
}
+ @Override
protected void tearDown()
throws Exception
{
@@ -275,7 +277,7 @@
response = sc.getResource( request );
assertResponseOK( response );
- assertEquals( "d2321a573e0488bca571b624f891104009408dd8 maven-metadata-group-with-valid-repos.xml", response.getText() );
+ assertEquals( "add113b0d7f8c6adb92a5015a7a3701081edf998 maven-metadata-group-with-valid-repos.xml", response.getText() );
// request the md5 checksum of the metadata
request =
@@ -284,7 +286,7 @@
response = sc.getResource( request );
assertResponseOK( response );
- assertEquals( "79d271fbe8bd1d17b23273937750d407 maven-metadata-group-with-valid-repos.xml", response.getText().trim() );
+ assertEquals( "5b85ea4aa5f52bb76760041a52f98de8 maven-metadata-group-with-valid-repos.xml", response.getText().trim() );
}
protected void assertResponseMethodNotAllowed( WebResponse response )