Author: jdumay
Date: Wed Jun 25 01:14:26 2008
New Revision: 671458
URL: http://svn.apache.org/viewvc?rev=671458&view=rev
Log:
listResources now returns a map key=resourcename value=resourcetype
Added:
archiva/sandbox/new-repository-api/src/main/java/org/apache/archiva/repository/ResourceType.java
Modified:
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/ResourceRepository.java
archiva/sandbox/new-repository-api/src/main/java/org/apache/archiva/repository/filesystem/FileSystemRepositoryBackend.java
archiva/sandbox/new-repository-api/src/test/java/org/apache/archiva/repository/filesystem/FileSystemRepositoryBackendTest.java
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=671458&r1=671457&r2=671458&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
Wed Jun 25 01:14:26 2008
@@ -20,6 +20,7 @@
*/
import java.io.InputStream;
+import java.util.Map;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">James William Dumay</a>
@@ -32,6 +33,6 @@
public void writeStream(ResourceContext context, InputStream is)
throws RepositoryWriteException;
- public String[] listResources(ResourceContext context)
+ public Map<String, ResourceType> listResources(ResourceContext context)
throws RepositoryReadException;
}
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=671458&r1=671457&r2=671458&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
Wed Jun 25 01:14:26 2008
@@ -20,6 +20,7 @@
*/
import java.io.InputStream;
+import java.util.Map;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">James William Dumay</a>
@@ -53,7 +54,7 @@
sourceRepository.writeStream(context, is);
}
- public String[] listResources(ResourceContext context)
+ public Map<String, ResourceType> listResources(ResourceContext context)
throws RepositoryReadException
{
return sourceRepository.listResources(context);
Added:
archiva/sandbox/new-repository-api/src/main/java/org/apache/archiva/repository/ResourceType.java
URL:
http://svn.apache.org/viewvc/archiva/sandbox/new-repository-api/src/main/java/org/apache/archiva/repository/ResourceType.java?rev=671458&view=auto
==============================================================================
---
archiva/sandbox/new-repository-api/src/main/java/org/apache/archiva/repository/ResourceType.java
(added)
+++
archiva/sandbox/new-repository-api/src/main/java/org/apache/archiva/repository/ResourceType.java
Wed Jun 25 01:14:26 2008
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+package org.apache.archiva.repository;
+
+/**
+ * @author <a href="mailto:[EMAIL PROTECTED]">James William Dumay</a>
+ */
+public enum ResourceType
+{
+ Resource,
+ Collection
+}
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=671458&r1=671457&r2=671458&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
Wed Jun 25 01:14:26 2008
@@ -25,10 +25,13 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import java.util.HashMap;
+import java.util.Map;
import org.apache.archiva.repository.Repository;
import org.apache.archiva.repository.RepositoryReadException;
import org.apache.archiva.repository.RepositoryWriteException;
import org.apache.archiva.repository.ResourceContext;
+import org.apache.archiva.repository.ResourceType;
import org.apache.commons.io.IOUtils;
/**
@@ -68,7 +71,7 @@
File file = getFileForContext(context);
if (!file.exists())
{
- if (!file.getParentFile().mkdirs())
+ if (!file.getParentFile().exists() &&
!file.getParentFile().mkdirs())
{
throw new RepositoryWriteException("Could not create directory
" + file.getParent());
}
@@ -90,7 +93,7 @@
}
}
- public String[] listResources(ResourceContext context)
+ public Map<String, ResourceType> listResources(ResourceContext context)
throws RepositoryReadException
{
File directory = getFileForContext(context);
@@ -106,7 +109,15 @@
+ " failed as resource is a file, not a directory.");
}
- return directory.list();
+ HashMap<String, ResourceType> map = new HashMap<String,
ResourceType>();
+
+ for (File resource : directory.listFiles())
+ {
+ ResourceType resourceType = resource.isFile() ?
ResourceType.Resource : ResourceType.Collection;
+ map.put(resource.getName(), resourceType);
+ }
+
+ return map;
}
private File getFileForContext(ResourceContext context)
Modified:
archiva/sandbox/new-repository-api/src/test/java/org/apache/archiva/repository/filesystem/FileSystemRepositoryBackendTest.java
URL:
http://svn.apache.org/viewvc/archiva/sandbox/new-repository-api/src/test/java/org/apache/archiva/repository/filesystem/FileSystemRepositoryBackendTest.java?rev=671458&r1=671457&r2=671458&view=diff
==============================================================================
---
archiva/sandbox/new-repository-api/src/test/java/org/apache/archiva/repository/filesystem/FileSystemRepositoryBackendTest.java
(original)
+++
archiva/sandbox/new-repository-api/src/test/java/org/apache/archiva/repository/filesystem/FileSystemRepositoryBackendTest.java
Wed Jun 25 01:14:26 2008
@@ -3,6 +3,7 @@
import java.io.File;
import java.io.InputStream;
import java.util.List;
+import java.util.Map;
import junit.framework.TestCase;
/*
@@ -24,6 +25,7 @@
* under the License.
*/
import org.apache.archiva.repository.ResourceContext;
+import org.apache.archiva.repository.ResourceType;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
@@ -71,6 +73,23 @@
assertEquals("Help im trapped in a lisp factory", lines.get(0));
}
+ public void testList()
+ throws Exception
+ {
+ File listDir = new File(rootDir, "testing/fstestlist");
+ listDir.mkdir();
+
+ FileUtils.touch(new File(listDir, "myresource"));
+
+ new File(listDir, "mycollection").mkdir();
+
+ Map<String,ResourceType> map = backend.listResources(new
MockResourceContext(listDir.getName()));
+ assertEquals(2, map.size());
+
+ assertEquals(ResourceType.Collection, map.get("mycollection"));
+ assertEquals(ResourceType.Resource, map.get("myresource"));
+ }
+
public class MockResourceContext implements ResourceContext
{
private final String logicalPath;
