Author: jdumay
Date: Tue Jun 3 22:52:40 2008
New Revision: 662989
URL: http://svn.apache.org/viewvc?rev=662989&view=rev
Log:
MRM-781 - Removal of Archiva-Webdav implementation in favor of Jackrabbit-webdav
* DELETE should 404 if resource does not exist
* 93% litmus coverage
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResource.java
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/DavResourceTest.java
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResource.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResource.java?rev=662989&r1=662988&r2=662989&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResource.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResource.java
Tue Jun 3 22:52:40 2008
@@ -329,6 +329,10 @@
throw new DavException(
HttpServletResponse.SC_INTERNAL_SERVER_ERROR );
}
}
+ else
+ {
+ throw new DavException( HttpServletResponse.SC_NOT_FOUND );
+ }
}
public void move( DavResource destination )
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/DavResourceTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/DavResourceTest.java?rev=662989&r1=662988&r2=662989&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/DavResourceTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/DavResourceTest.java
Tue Jun 3 22:52:40 2008
@@ -90,6 +90,22 @@
return new ArchivaDavResource(file.getAbsolutePath(), logicalPath,
mimeTypes, session, resourceLocator, resourceFactory);
}
+ public void testDeleteNonExistantResourceShould404()
+ throws Exception
+ {
+ File dir = new File(baseDir, "testdir");
+ try
+ {
+ DavResource directoryResource = getDavResource("/testdir", dir);
+ directoryResource.getCollection().removeMember(directoryResource);
+ fail("Did not throw DavException");
+ }
+ catch (DavException e)
+ {
+ assertEquals(DavServletResponse.SC_NOT_FOUND, e.getErrorCode());
+ }
+ }
+
public void testDeleteCollection()
throws Exception
{
