Return-Path: Delivered-To: apmail-archiva-commits-archive@www.apache.org Received: (qmail 32108 invoked from network); 24 Jun 2008 15:24:18 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 24 Jun 2008 15:24:18 -0000 Received: (qmail 20628 invoked by uid 500); 24 Jun 2008 15:24:19 -0000 Delivered-To: apmail-archiva-commits-archive@archiva.apache.org Received: (qmail 20572 invoked by uid 500); 24 Jun 2008 15:24:19 -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 20563 invoked by uid 99); 24 Jun 2008 15:24:19 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 24 Jun 2008 08:24:19 -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; Tue, 24 Jun 2008 15:23:37 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0FDA02388A02; Tue, 24 Jun 2008 08:23:27 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r671209 - in /archiva/sandbox/new-repository-api: ./ src/main/java/org/apache/archiva/repository/ src/main/java/org/apache/archiva/repository/filesystem/ Date: Tue, 24 Jun 2008 15:23:26 -0000 To: commits@archiva.apache.org From: jdumay@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080624152327.0FDA02388A02@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jdumay Date: Tue Jun 24 08:23:26 2008 New Revision: 671209 URL: http://svn.apache.org/viewvc?rev=671209&view=rev Log: Adding some unit tests for the basic file system repository backend. Fixed up imports. Modified: archiva/sandbox/new-repository-api/ (props changed) archiva/sandbox/new-repository-api/src/main/java/org/apache/archiva/repository/Repository.java archiva/sandbox/new-repository-api/src/main/java/org/apache/archiva/repository/RepositoryProxyManager.java archiva/sandbox/new-repository-api/src/main/java/org/apache/archiva/repository/RepositoryWriteException.java archiva/sandbox/new-repository-api/src/main/java/org/apache/archiva/repository/ResourceContext.java archiva/sandbox/new-repository-api/src/main/java/org/apache/archiva/repository/ResourceRepository.java archiva/sandbox/new-repository-api/src/main/java/org/apache/archiva/repository/filesystem/FileSystemRepositoryBackend.java Propchange: archiva/sandbox/new-repository-api/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Tue Jun 24 08:23:26 2008 @@ -0,0 +1 @@ +target Modified: archiva/sandbox/new-repository-api/src/main/java/org/apache/archiva/repository/Repository.java URL: http://svn.apache.org/viewvc/archiva/sandbox/new-repository-api/src/main/java/org/apache/archiva/repository/Repository.java?rev=671209&r1=671208&r2=671209&view=diff ============================================================================== --- archiva/sandbox/new-repository-api/src/main/java/org/apache/archiva/repository/Repository.java (original) +++ archiva/sandbox/new-repository-api/src/main/java/org/apache/archiva/repository/Repository.java Tue Jun 24 08:23:26 2008 @@ -1,3 +1,5 @@ +package org.apache.archiva.repository; + /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -16,13 +18,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.archiva.repository; import java.io.InputStream; /** - * - * @author jdumay + * @author James William Dumay */ public interface Repository { Modified: archiva/sandbox/new-repository-api/src/main/java/org/apache/archiva/repository/RepositoryProxyManager.java URL: http://svn.apache.org/viewvc/archiva/sandbox/new-repository-api/src/main/java/org/apache/archiva/repository/RepositoryProxyManager.java?rev=671209&r1=671208&r2=671209&view=diff ============================================================================== --- archiva/sandbox/new-repository-api/src/main/java/org/apache/archiva/repository/RepositoryProxyManager.java (original) +++ archiva/sandbox/new-repository-api/src/main/java/org/apache/archiva/repository/RepositoryProxyManager.java Tue Jun 24 08:23:26 2008 @@ -1,3 +1,5 @@ +package org.apache.archiva.repository; + /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -16,7 +18,6 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.archiva.repository; import java.io.InputStream; Modified: archiva/sandbox/new-repository-api/src/main/java/org/apache/archiva/repository/RepositoryWriteException.java URL: http://svn.apache.org/viewvc/archiva/sandbox/new-repository-api/src/main/java/org/apache/archiva/repository/RepositoryWriteException.java?rev=671209&r1=671208&r2=671209&view=diff ============================================================================== --- archiva/sandbox/new-repository-api/src/main/java/org/apache/archiva/repository/RepositoryWriteException.java (original) +++ archiva/sandbox/new-repository-api/src/main/java/org/apache/archiva/repository/RepositoryWriteException.java Tue Jun 24 08:23:26 2008 @@ -1,3 +1,5 @@ +package org.apache.archiva.repository; + /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -16,7 +18,6 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.archiva.repository; /** * Modified: archiva/sandbox/new-repository-api/src/main/java/org/apache/archiva/repository/ResourceContext.java URL: http://svn.apache.org/viewvc/archiva/sandbox/new-repository-api/src/main/java/org/apache/archiva/repository/ResourceContext.java?rev=671209&r1=671208&r2=671209&view=diff ============================================================================== --- archiva/sandbox/new-repository-api/src/main/java/org/apache/archiva/repository/ResourceContext.java (original) +++ archiva/sandbox/new-repository-api/src/main/java/org/apache/archiva/repository/ResourceContext.java Tue Jun 24 08:23:26 2008 @@ -1,3 +1,5 @@ +package org.apache.archiva.repository; + /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -16,7 +18,6 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.archiva.repository; /** * @author James William Dumay Modified: archiva/sandbox/new-repository-api/src/main/java/org/apache/archiva/repository/ResourceRepository.java URL: http://svn.apache.org/viewvc/archiva/sandbox/new-repository-api/src/main/java/org/apache/archiva/repository/ResourceRepository.java?rev=671209&r1=671208&r2=671209&view=diff ============================================================================== --- archiva/sandbox/new-repository-api/src/main/java/org/apache/archiva/repository/ResourceRepository.java (original) +++ archiva/sandbox/new-repository-api/src/main/java/org/apache/archiva/repository/ResourceRepository.java Tue Jun 24 08:23:26 2008 @@ -1,3 +1,5 @@ +package org.apache.archiva.repository; + /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -16,7 +18,6 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.archiva.repository; import java.io.InputStream; Modified: archiva/sandbox/new-repository-api/src/main/java/org/apache/archiva/repository/filesystem/FileSystemRepositoryBackend.java URL: http://svn.apache.org/viewvc/archiva/sandbox/new-repository-api/src/main/java/org/apache/archiva/repository/filesystem/FileSystemRepositoryBackend.java?rev=671209&r1=671208&r2=671209&view=diff ============================================================================== --- archiva/sandbox/new-repository-api/src/main/java/org/apache/archiva/repository/filesystem/FileSystemRepositoryBackend.java (original) +++ archiva/sandbox/new-repository-api/src/main/java/org/apache/archiva/repository/filesystem/FileSystemRepositoryBackend.java Tue Jun 24 08:23:26 2008 @@ -46,10 +46,10 @@ public InputStream getStream(ResourceContext context) throws RepositoryReadException { - File file = new File(rootPath, context.getRepositoryId()); + File file = getFileForContext(context); if (!file.exists()) { - throw new RepositoryReadException(""); + throw new RepositoryReadException(file.getAbsolutePath() + " does not exist"); } try @@ -65,7 +65,7 @@ public void writeStream(ResourceContext context, InputStream is) throws RepositoryWriteException { - File file = new File(rootPath, context.getLogicalPath()); + File file = getFileForContext(context); if (!file.exists()) { if (!file.getParentFile().mkdirs()) @@ -89,4 +89,9 @@ IOUtils.closeQuietly(os); } } + + private File getFileForContext(ResourceContext context) + { + return new File(new File(rootPath, context.getRepositoryId()), context.getLogicalPath()); + } }