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 2014/02/16 22:59:02 UTC
svn commit: r1568842 - in /archiva/branches/2.0.0-RC: ./
archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/
archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/
Author: olamy
Date: Sun Feb 16 21:59:02 2014
New Revision: 1568842
URL: http://svn.apache.org/r1568842
Log:
fix unit test due to bad previous commit
Modified:
archiva/branches/2.0.0-RC/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java
archiva/branches/2.0.0-RC/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletNoProxyTest.java
archiva/branches/2.0.0-RC/pom.xml
Modified: archiva/branches/2.0.0-RC/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java
URL: http://svn.apache.org/viewvc/archiva/branches/2.0.0-RC/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java?rev=1568842&r1=1568841&r2=1568842&view=diff
==============================================================================
--- archiva/branches/2.0.0-RC/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java (original)
+++ archiva/branches/2.0.0-RC/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java Sun Feb 16 21:59:02 2014
@@ -107,7 +107,6 @@ import javax.servlet.http.HttpSession;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
@@ -416,8 +415,8 @@ public class ArchivaDavResourceFactory
catch ( DigesterException de )
{
throw new DavException( HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
- "Error occurred while generating checksum files." + de.getMessage()
- );
+ "Error occurred while generating checksum files."
+ + de.getMessage() );
}
}
}
@@ -877,6 +876,11 @@ public class ArchivaDavResourceFactory
response.setHeader( "Cache-Control", "no-cache" );
response.setDateHeader( "Last-Modified", new Date().getTime() );
}
+ else
+ {
+ // We need to specify this so connecting wagons can work correctly
+ response.setDateHeader( "Last-Modified", resource.getModificationTime() );
+ }
// TODO: [MRM-524] determine http caching options for other types of files (artifacts, sha1, md5, snapshots)
}
@@ -988,12 +992,11 @@ public class ArchivaDavResourceFactory
|| repositoryGroupConfiguration.getRepositories().isEmpty() )
{
File file =
- new File( System.getProperty( "appserver.base"), "groups/" + repositoryGroupConfiguration.getId() );
+ new File( System.getProperty( "appserver.base" ), "groups/" + repositoryGroupConfiguration.getId() );
- return new ArchivaDavResource( file.getPath(), "groups/" + repositoryGroupConfiguration.getId(),
- null,request.getDavSession(), locator, this,
- mimeTypes, auditListeners,
- scheduler, fileLockManager );
+ return new ArchivaDavResource( file.getPath(), "groups/" + repositoryGroupConfiguration.getId(), null,
+ request.getDavSession(), locator, this, mimeTypes, auditListeners, scheduler,
+ fileLockManager );
}
List<File> mergedRepositoryContents = new ArrayList<File>();
// multiple repo types so we guess they are all the same type
Modified: archiva/branches/2.0.0-RC/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletNoProxyTest.java
URL: http://svn.apache.org/viewvc/archiva/branches/2.0.0-RC/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletNoProxyTest.java?rev=1568842&r1=1568841&r2=1568842&view=diff
==============================================================================
--- archiva/branches/2.0.0-RC/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletNoProxyTest.java (original)
+++ archiva/branches/2.0.0-RC/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletNoProxyTest.java Sun Feb 16 21:59:02 2014
@@ -62,7 +62,7 @@ public class RepositoryServletNoProxyTes
//WebRequest request = new GetMethodWebRequest( "http://machine.com/repository/internal/" + commonsLangSha1 );
WebResponse response = getWebResponse( "/repository/internal/" + commonsLangSha1 );
- assertNotNull( response.getResponseHeaderValue( "last-modified" ) );
+ assertNotNull( response.getResponseHeaderValue( "Last-Modified" ) );
}
@Test
Modified: archiva/branches/2.0.0-RC/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/2.0.0-RC/pom.xml?rev=1568842&r1=1568841&r2=1568842&view=diff
==============================================================================
--- archiva/branches/2.0.0-RC/pom.xml (original)
+++ archiva/branches/2.0.0-RC/pom.xml Sun Feb 16 21:59:02 2014
@@ -74,7 +74,7 @@
<redback.spring-utils.version>2.1</redback.spring-utils.version>
<redback.taskqueue.version>2.1</redback.taskqueue.version>
<slf4j.version>1.7.5</slf4j.version>
- <log4j.version>2.0-beta9</log4j.version>
+ <log4j.version>2.0-rc1</log4j.version>
<spring.version>4.0.1.RELEASE</spring.version>