Return-Path: Delivered-To: apmail-archiva-commits-archive@www.apache.org Received: (qmail 31904 invoked from network); 22 May 2008 10:18:29 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 22 May 2008 10:18:29 -0000 Received: (qmail 13020 invoked by uid 500); 22 May 2008 10:18:31 -0000 Delivered-To: apmail-archiva-commits-archive@archiva.apache.org Received: (qmail 12960 invoked by uid 500); 22 May 2008 10:18:30 -0000 Mailing-List: contact commits-help@archiva.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@archiva.apache.org Delivered-To: mailing list commits@archiva.apache.org Received: (qmail 12951 invoked by uid 99); 22 May 2008 10:18:30 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 22 May 2008 03:18:30 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 22 May 2008 10:17:44 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 085422388A09; Thu, 22 May 2008 03:18:06 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r659071 - in /archiva/trunk/archiva-modules/archiva-web: archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/ archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ Date: Thu, 22 May 2008 10:18:04 -0000 To: commits@archiva.apache.org From: oching@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080522101806.085422388A09@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: oching Date: Thu May 22 03:18:03 2008 New Revision: 659071 URL: http://svn.apache.org/viewvc?rev=659071&view=rev Log: [MRM-694] -return 405 instead of 400 for write request to repo groups Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletRepositoryGroupTest.java archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletRepositoryGroupTest.java URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletRepositoryGroupTest.java?rev=659071&r1=659070&r2=659071&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletRepositoryGroupTest.java (original) +++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletRepositoryGroupTest.java Thu May 22 03:18:03 2008 @@ -205,7 +205,7 @@ WebRequest request = new PutMethodWebRequest( putUrl, is, "text/plain" ); WebResponse response = sc.getResponse( request ); - assertResponseBadRequest( response ); + assertResponseMethodNotAllowed( response ); } public void testBrowseRepositoryGroup() @@ -218,10 +218,10 @@ assertEquals( "Should have been an 401 response code.", HttpServletResponse.SC_UNAUTHORIZED, response.getResponseCode() ); } - protected void assertResponseBadRequest( WebResponse response ) + protected void assertResponseMethodNotAllowed( WebResponse response ) { assertNotNull( "Should have recieved a response", response ); - assertEquals( "Should have been an 400/Bad Request response code.", HttpServletResponse.SC_BAD_REQUEST, response.getResponseCode() ); + assertEquals( "Should have been an 405/Method Not Allowed response code.", HttpServletResponse.SC_METHOD_NOT_ALLOWED, response.getResponseCode() ); } protected RepositoryGroupConfiguration createRepositoryGroup( String id, List repositories ) 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=659071&r1=659070&r2=659071&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 Thu May 22 03:18:03 2008 @@ -142,8 +142,8 @@ { if( WebdavMethodUtil.isWriteMethod( request.getMethod() ) ) { - throw new DavException( HttpServletResponse.SC_BAD_REQUEST, "Bad request to repository group <" + - repoGroupConfig.getId() + ">" ); + throw new DavException( HttpServletResponse.SC_METHOD_NOT_ALLOWED, + "Write method not allowed for repository groups." ); } repositories.addAll( repoGroupConfig.getRepositories() );