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/06/04 02:29:27 UTC
svn commit: r662933 - in
/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src:
main/java/org/apache/maven/archiva/webdav/
test/java/org/apache/maven/archiva/webdav/
test/java/org/apache/maven/archiva/webdav/httpunit/
Author: jdumay
Date: Tue Jun 3 17:29:27 2008
New Revision: 662933
URL: http://svn.apache.org/viewvc?rev=662933&view=rev
Log:
MRM-781 - Removal of Archiva-Webdav implementation in favor of Jackrabbit-webdav
* Changed so that non-existant parent directories are only created on PUT and not on MKCOL. This allows better litmus compliance.
* Added MkColMethodWebRequest which implements the MkCol method for HttpUnit
* Unit tests
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/httpunit/
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/httpunit/MkColMethodWebRequest.java
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/RepositoryServletDeployTest.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=662933&r1=662932&r2=662933&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 Tue Jun 3 17:29:27 2008
@@ -78,6 +78,8 @@
public class ArchivaDavResourceFactory
implements DavResourceFactory, Auditable
{
+ private static final String HTTP_PUT_METHOD = "PUT";
+
private Logger log = LoggerFactory.getLogger( ArchivaDavResourceFactory.class );
/**
@@ -321,7 +323,7 @@
File rootDirectory = new File( managedRepository.getRepoRoot() );
File destDir = new File( rootDirectory, logicalResource.getPath() ).getParentFile();
- if ( !destDir.exists() )
+ if ( request.getMethod().equals(HTTP_PUT_METHOD) && !destDir.exists() )
{
destDir.mkdirs();
String relPath = PathUtil.getRelative( rootDirectory.getAbsolutePath(), destDir );
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletDeployTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletDeployTest.java?rev=662933&r1=662932&r2=662933&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletDeployTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletDeployTest.java Tue Jun 3 17:29:27 2008
@@ -23,9 +23,11 @@
import com.meterware.httpunit.WebRequest;
import com.meterware.httpunit.WebResponse;
+import java.io.File;
import java.io.InputStream;
import javax.servlet.http.HttpServletResponse;
+import org.apache.maven.archiva.webdav.httpunit.MkColMethodWebRequest;
/**
@@ -53,6 +55,23 @@
assertFileContents( "artifact.jar\n", repoRootInternal, "path/to/artifact.jar" );
}
+ public void testMkColWithMissingParentCollectionFails()
+ throws Exception
+ {
+ setupCleanRepo( repoRootInternal );
+
+ String putUrl = "http://machine.com/repository/internal/path/to/";
+
+ WebRequest request = new MkColMethodWebRequest( putUrl );
+
+ WebResponse response = sc.getResponse( request );
+
+ assertEquals(HttpServletResponse.SC_CONFLICT, response.getResponseCode());
+
+ File mkColLocalPath = new File(repoRootInternal, "path/to/");
+ assertFalse(mkColLocalPath.exists());
+ }
+
protected void assertResponseCreated( WebResponse response )
{
assertNotNull( "Should have recieved a response", response );
Added: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/httpunit/MkColMethodWebRequest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/httpunit/MkColMethodWebRequest.java?rev=662933&view=auto
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/httpunit/MkColMethodWebRequest.java (added)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/httpunit/MkColMethodWebRequest.java Tue Jun 3 17:29:27 2008
@@ -0,0 +1,39 @@
+package org.apache.maven.archiva.webdav.httpunit;
+
+/*
+ * Copyright 2008 jdumay.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * under the License.
+ */
+
+import com.meterware.httpunit.HeaderOnlyWebRequest;
+import java.net.URL;
+
+/**
+ * MkColMethodWebRequest
+ * See RFC-2518 Section 8.3
+ * @author <a href="mailto:james@atlassian.com">James William Dumay</a>
+ */
+public class MkColMethodWebRequest extends HeaderOnlyWebRequest
+{
+ public MkColMethodWebRequest( String urlString )
+ {
+ super(urlString);
+ }
+
+ @Override
+ public String getMethod() {
+ return "MKCOL";
+ }
+}