From 525a0f943828410b213543d5da19aebc886bc3b1 Mon Sep 17 00:00:00 2001
From: Michael Hartmeier <mlhartme.users.noreply@github.com>
Date: Mon, 4 Dec 2023 22:46:00 +0100
Subject: [PATCH] repository -> storage

---
 CHANGELOG.md                                  |  24 +-
 README.md                                     |  26 +-
 .../java/net/oneandone/pommes/cli/Base.java   |   2 +-
 .../net/oneandone/pommes/cli/Environment.java |   4 +-
 .../java/net/oneandone/pommes/cli/Index.java  |  81 +++----
 .../java/net/oneandone/pommes/cli/Lib.java    |   9 +-
 .../java/net/oneandone/pommes/cli/Main.java   |  12 +-
 .../net/oneandone/pommes/cli/Properties.java  |  36 +--
 .../java/net/oneandone/pommes/cli/Scope.java  |  10 +-
 .../java/net/oneandone/pommes/cli/Setup.java  |  10 +-
 .../java/net/oneandone/pommes/cli/Status.java |   6 +-
 .../oneandone/pommes/database/Database.java   |   4 +-
 .../net/oneandone/pommes/database/Field.java  |   2 +-
 .../pommes/database/PommesQuery.java          |  22 +-
 .../oneandone/pommes/database/Project.java    |  16 +-
 .../pommes/descriptor/ComposerDescriptor.java |  12 +-
 .../pommes/descriptor/Descriptor.java         |  20 +-
 .../pommes/descriptor/ErrorDescriptor.java    |   7 +-
 .../pommes/descriptor/JsonDescriptor.java     |  16 +-
 .../pommes/descriptor/MavenDescriptor.java    |  30 +--
 .../pommes/descriptor/RawDescriptor.java      |  15 +-
 .../repository/BitbucketRepository.java       | 202 ----------------
 .../pommes/repository/Constructor.java        |  12 -
 .../pommes/repository/GiteaProject.java       |  40 ---
 .../pommes/repository/NodeRepository.java     | 227 ------------------
 .../pommes/repository/Repository.java         | 113 ---------
 .../java/net/oneandone/pommes/scm/Scm.java    |   2 +-
 .../java/net/oneandone/pommes/scm/ScmUrl.java |   2 +-
 .../oneandone/pommes/storage/Artifact.java    |  21 ++
 .../ArtifactoryStorage.java}                  |  74 ++++--
 .../oneandone/pommes/storage/Bitbucket.java   | 121 ++++++++++
 .../pommes/storage/BitbucketStorage.java      | 100 ++++++++
 .../oneandone/pommes/storage/Constructor.java |  11 +
 .../oneandone/pommes/storage/FileStorage.java | 144 +++++++++++
 .../pommes/storage/GiteaProject.java          |  45 ++++
 .../GiteaStorage.java}                        |  63 ++++-
 .../GithubStorage.java}                       |  82 ++++---
 .../GitlabStorage.java}                       |  88 ++++---
 .../JsonStorage.java}                         |  31 +--
 .../net/oneandone/pommes/storage/Storage.java |  91 +++++++
 .../oneandone/pommes/storage/TreeStorage.java |  86 +++++++
 .../pommes/database/ProjectTest.java          |   2 +-
 .../GithubStorageIT.java}                     |  20 +-
 .../GitlabStorageIT.java}                     |  20 +-
 44 files changed, 1032 insertions(+), 929 deletions(-)
 delete mode 100644 src/main/java/net/oneandone/pommes/repository/BitbucketRepository.java
 delete mode 100644 src/main/java/net/oneandone/pommes/repository/Constructor.java
 delete mode 100644 src/main/java/net/oneandone/pommes/repository/GiteaProject.java
 delete mode 100644 src/main/java/net/oneandone/pommes/repository/NodeRepository.java
 delete mode 100644 src/main/java/net/oneandone/pommes/repository/Repository.java
 create mode 100644 src/main/java/net/oneandone/pommes/storage/Artifact.java
 rename src/main/java/net/oneandone/pommes/{repository/ArtifactoryRepository.java => storage/ArtifactoryStorage.java} (77%)
 create mode 100644 src/main/java/net/oneandone/pommes/storage/Bitbucket.java
 create mode 100644 src/main/java/net/oneandone/pommes/storage/BitbucketStorage.java
 create mode 100644 src/main/java/net/oneandone/pommes/storage/Constructor.java
 create mode 100644 src/main/java/net/oneandone/pommes/storage/FileStorage.java
 create mode 100644 src/main/java/net/oneandone/pommes/storage/GiteaProject.java
 rename src/main/java/net/oneandone/pommes/{repository/GiteaRepository.java => storage/GiteaStorage.java} (73%)
 rename src/main/java/net/oneandone/pommes/{repository/GithubRepository.java => storage/GithubStorage.java} (76%)
 rename src/main/java/net/oneandone/pommes/{repository/GitlabRepository.java => storage/GitlabStorage.java} (76%)
 rename src/main/java/net/oneandone/pommes/{repository/JsonRepository.java => storage/JsonStorage.java} (73%)
 create mode 100644 src/main/java/net/oneandone/pommes/storage/Storage.java
 create mode 100644 src/main/java/net/oneandone/pommes/storage/TreeStorage.java
 rename src/test/java/net/oneandone/pommes/{repository/GithubRepositoryIT.java => storage/GithubStorageIT.java} (80%)
 rename src/test/java/net/oneandone/pommes/{repository/GitlabRepositoryIT.java => storage/GitlabStorageIT.java} (79%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fec40efc..59cc859d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,16 +2,18 @@
 
 ### 3.5.0 (pending)
 
+* node storage now only handles checkouts -- local maven repository or svn no longer supported
 * token handling
   * load token from environment POMMES_REPOSITORY_TOKEN_<name> variable, not file
   * github + gitlab
     * load github token from "git credentials"
-    * explicitly declare "§§" if repository needs a token
-* default repositories
-  * the first repository defined in config is the default repository
-  * setup automatically defines default repository local = $POMMES_ROOT
-  * changed queries to only search the default repository by default;
-    prefix a query with "/" <repo> to search a different repository; prefix with "/" to search all repositories
+    * explicitly declare "§§" if storage needs a token
+* major repository cleanup, they are now called storage. The config file changed accordingly
+* default storage
+  * the first storage defined in config is the default storage
+  * setup automatically defines default storage local = $POMMES_ROOT
+  * changed queries to only search the default storage by default;
+    prefix a query with "/" <repo> to search a different storage; prefix with "/" to search all storages
 * simplified setup: 
   * root directory is an optional argument to `setup` now
   * default root directory changed from `Pommes` to `Projects`
@@ -22,8 +24,8 @@
   * more robust: handle io exception to that user interaction can be continued
 * tweaks and fixes
   * normalize git urls to avoid conflicting checkout problems
-  * fixed repository scm for file repositories
-  * fixed RawDescriptor to properly set repositoryScm
+  * fixed file storage scm
+  * fixed RawDescriptor to properly set storageScm
   * pom loading: use developer connection instead of connection, because it's usually better maintained
   * do not abort on pom loading errors, just report them
 * build
@@ -52,9 +54,9 @@
     the former POMMES_HOME (i.e `.pommes`); default is 'Pommes'
   * renamed pommes.properties to config
   * property `checkouts` is gone, it's now configured via `POMMES_ROOT`
-  * renamed import to repository
+  * renamed import to storage
 * tailing `.git` in git scm url is now optional
-* renamed zone to repository
+* renamed zone to storage
 * fixed NodeRepository to detect raw descriptors in none-root directories
 * fixed NodeRepository to check for trunk/branches/tags only for svn nodes (because ~/Projects/branches confused it)
 * updates
@@ -169,7 +171,7 @@
   (and pushed for git projects) now, and it prints an 'X' status if the project is unknwon but in scm.
 * Improved action selection: return quits without actions now, a applies all actions.
 * Dumped -svnuser and -svnpassword options. Specify credentials in the url instead.
-  (I've removed them because I don't want special handling for Subversion repository authentication.)
+  (I've removed them because I don't want special handling for Subversion storage authentication.)
 * Improved find argument: use can use query and format macros; the format is appended now; you can merge duplicate lines '-fold'.
   Merged database-export into find. Find now has an optional output argument (which also accepts files now) and -json and -dump
   formats to print pretty-printed or raw json.
diff --git a/README.md b/README.md
index 5689f67c..cb773970 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ This command searches the database for `lavender` projects and lets you choose b
 simply cd into the already existing checkout, choosing `2` also creates the checkout. 
 
 Technically, Pommes is a command line tool that maintains a database with project metadata. Pommes can:
-* index repositories (e.g. github or github) to populate the database
+* index storages (e.g. github or github) to populate the database
 * search the database by coordinates, dependencies, scm location, etc. 
 * perform (bulk-) checkouts for all projects that match a query.
 
@@ -58,25 +58,25 @@ Install the application
 ## Managing the Database
 
 Pommes maintains a [Lucene](http://lucene.apache.org) database to store project metadata. The database is filled
-by indexing so-called repositories. The database is stored in `$POMMES_ROOT/.pommes/database`, it's safe to delete this
+by indexing so-called storages. The database is stored in `$POMMES_ROOT/.pommes/database`, it's safe to delete this
 directory to wipe the database.
 
-`.pommes/config` defines databases in the form *repository.<name> = <url> {<option>}*
+`.pommes/config` defines databases in the form *storage.<name> = <url> {<option>}*
 * name is an arbitrary name
-* url is the primary definition of the repository, the protocol distinishes the repository type
+* url is the primary definition of the storage, the protocol distinishes the storage type
   * github:<url-of-github-api>
   * gitlab:<url-of-gitlab-server>
   * json:<url-pointing-to-json-file>
   * file:///path-to-local-directory-with checkouts
-* options depend on the repository type
+* options depend on the storage type
 
 Example urls
 
-       repository.mlhartme=github:https://api.github.com %~mlhartme
-       repository.company=gitlab:https://gitlab.company.com 
+       storage.mlhartme=github:https://api.github.com %~mlhartme
+       storage.company=gitlab:https://gitlab.company.com 
 
 You can configure access token for github and gitlab by storing them in a file $POMMES_ROOT/.pommes/<reponame>-<protocol>.token.
-For example, a token in file $POMMES_ROOT/.pommes/github-mlhartme.token will be used to index the above mlhartme repository.
+For example, a token in file $POMMES_ROOT/.pommes/github-mlhartme.token will be used to index the above mlhartme storage.
 
 ## Find Command
 
@@ -151,7 +151,7 @@ Descriptor: references a project, various implementation to load Maven, Json, et
 
 Project: holds project metadata: gav, parent, dependencies, scm, url
 
-Repository: can be scanned for descriptors
+Storage: can be scanned for descriptors
 
 Database: stores projects (in Lucene)
 
@@ -181,14 +181,14 @@ commands
                         '?' - checkout is not in database
                         '!' - checkout in wrong directory
                         '#' - error checking this checkout
-  'index' {repo}        re-index the specified (default: all) repositories.
+  'index' {storage}     re-index the specified (default: all) storages.
   'setup' ['-batch'] {name'='value}
-                        creates '.pommes' directory with initial configuration containing name/values as repositories; 
-                        indexes all repositories to create intial database;
+                        creates '.pommes' directory with initial configuration containing name/values as storages; 
+                        indexes all storages to create initial database;
                         '.pommes' is created in the directory specified by $POMMES_ROOT, default is ~/Pommes.
 
 fields in the database: (field id is the first letter of the field name.)
-  origin      Where this project was loaded from. Used as unique identifier. <repositoryName>:<path>
+  origin      Where this project was loaded from. Used as unique identifier. <storageName>:<path>
   revision    Last modified timestamp or content hash of this pom. Used to detect changes.
   parent      Coordinates of the parent project.
   artifact    Coordinates of this project.
diff --git a/src/main/java/net/oneandone/pommes/cli/Base.java b/src/main/java/net/oneandone/pommes/cli/Base.java
index 53097fc3..e749eeb3 100644
--- a/src/main/java/net/oneandone/pommes/cli/Base.java
+++ b/src/main/java/net/oneandone/pommes/cli/Base.java
@@ -40,7 +40,7 @@ public Base(Environment environment) {
 
     public void run() throws Exception {
         try (Database database = environment.lib.loadDatabase()) {
-            run(new Scope(environment.lib.properties().defaultRepository,
+            run(new Scope(environment.lib.properties().defaultStorage,
                     database, environment, new CentralSearch(environment.world(), environment.maven())));
         }
     }
diff --git a/src/main/java/net/oneandone/pommes/cli/Environment.java b/src/main/java/net/oneandone/pommes/cli/Environment.java
index ff13a9ec..9cf06daf 100644
--- a/src/main/java/net/oneandone/pommes/cli/Environment.java
+++ b/src/main/java/net/oneandone/pommes/cli/Environment.java
@@ -47,7 +47,7 @@ public Environment(Console console, World world) throws IOException {
         this.console = console;
         this.world = world;
         this.lib = Lib.load(world);
-        console.verbose.println("default repository: " + lib.properties().defaultRepository);
+        console.verbose.println("default storage: " + lib.properties().defaultStorage);
         this.lazyMaven = null;
         this.lazyCurrentPom = null;
         this.lazyExcludes = null;
@@ -124,7 +124,7 @@ private Project scanPom(FileNode directory) throws IOException {
                 Descriptor.Creator m = Descriptor.match(child.getName());
                 if (m != null) {
                     descriptor = m.create(this, child, "unused", child.getPath(), child.sha(), scm.getUrl(directory));
-                    return descriptor.load(this);
+                    return descriptor.load();
                 }
             }
         }
diff --git a/src/main/java/net/oneandone/pommes/cli/Index.java b/src/main/java/net/oneandone/pommes/cli/Index.java
index 98bf31f9..5fa85e81 100644
--- a/src/main/java/net/oneandone/pommes/cli/Index.java
+++ b/src/main/java/net/oneandone/pommes/cli/Index.java
@@ -22,14 +22,13 @@
 import net.oneandone.pommes.database.Project;
 import net.oneandone.pommes.descriptor.Descriptor;
 import net.oneandone.pommes.descriptor.ErrorDescriptor;
-import net.oneandone.pommes.repository.Repository;
+import net.oneandone.pommes.storage.Storage;
 import net.oneandone.pommes.scm.Git;
 import net.oneandone.pommes.scm.Scm;
 import net.oneandone.sushi.util.Separator;
 import org.apache.lucene.document.Document;
 
 import java.io.IOException;
-import java.io.PrintWriter;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -40,76 +39,70 @@
 import java.util.concurrent.BlockingQueue;
 
 public class Index extends Base {
-    private final List<String> repositories;
+    private final List<String> storages;
 
-    public Index(Environment environment, List<String> repositories) {
+    public Index(Environment environment, List<String> storages) {
         super(environment);
 
-        Set<String> available = environment.lib.properties().repositories.keySet();
-        this.repositories = repositories;
-        for (String repository : repositories) {
-            if (!available.contains(repository)) {
-                throw new ArgumentException("repository not found: " + repository);
+        Set<String> available = environment.lib.properties().storages.keySet();
+        this.storages = storages;
+        for (String storage : storages) {
+            if (!available.contains(storage)) {
+                throw new ArgumentException("storage not found: " + storage);
             }
         }
     }
 
     @Override
     public void run(Scope scope) throws Exception {
-        Repository repository;
+        Storage storage;
         Indexer indexer;
-        PrintWriter log;
 
-        log = new PrintWriter(environment.lib.logs().join("pommes.log").newWriter(), true);
-        for (Map.Entry<String, String> entry : environment.lib.properties().repositories.entrySet()) {
-            if (!repositories.isEmpty() && !repositories.contains(entry.getKey())) {
+        for (Map.Entry<String, String> entry : environment.lib.properties().storages.entrySet()) {
+            if (!storages.isEmpty() && !storages.contains(entry.getKey())) {
                 // not selected
                 continue;
             }
-            repository = null;
+            storage = null;
             for (String str : Separator.SPACE.split(entry.getValue())) {
                 if (str.equals("§§")) {
-                    String host = repo(repository, str).getTokenHost();
+                    String host = storage(storage, str).getTokenHost();
                     if (host != null) {
                         Git.UP up = Scm.GIT.getCredentials(environment.console(), environment.world().getWorking(), host);
-                        repo(repository, str).setToken(up.password());
+                        storage(storage, str).setToken(up.password());
                     }
                 } else if (str.startsWith("-")) {
-                    repo(repository, str).addExclude(str.substring(1));
+                    storage(storage, str).addExclude(str.substring(1));
                 } else if (str.startsWith("%")) {
-                    repo(repository, str).addOption(str.substring(1));
+                    storage(storage, str).addOption(str.substring(1));
                 } else {
-                    if (repository != null) {
-                        throw new ArgumentException("duplicate repository");
+                    if (storage != null) {
+                        throw new ArgumentException("duplicate storage: " + storage);
                     }
-                    repository = Repository.create(environment, entry.getKey(), str, log);
+                    storage = Storage.createStorage(environment, entry.getKey(), str);
                 }
             }
 
+            console.info.println("indexing " + entry.getKey() + ": " + entry.getValue());
+            indexer = new Indexer(environment, scope.getDatabase(), entry.getKey());
+            indexer.start();
             try {
-                console.info.println("indexing " + entry.getKey() + ": " + entry.getValue());
-                indexer = new Indexer(environment, scope.getDatabase(), entry.getKey());
-                indexer.start();
-                try {
-                    repository.scan(indexer.src, environment.console());
-                } finally {
-                    indexer.src.put(ErrorDescriptor.END_OF_QUEUE);
-                    indexer.join();
-                }
-                if (indexer.exception != null) {
-                    throw indexer.exception;
-                }
+                storage.scan(indexer.src, environment.console());
             } finally {
-                log.close();
+                indexer.src.put(ErrorDescriptor.END_OF_QUEUE);
+                indexer.join();
+            }
+            if (indexer.exception != null) {
+                throw indexer.exception;
             }
         }
     }
 
-    private Repository repo(Repository repository, String str) {
-        if (repository == null) {
+    private Storage storage(Storage storage, String str) {
+        if (storage == null) {
             throw new ArgumentException("missing url before '" + str + "'");
         }
-        return repository;
+        return storage;
     }
 
     /** Iterates modified or new documents, skips unmodified ones */
@@ -118,7 +111,7 @@ public static class Indexer extends Thread implements Iterator<Document> {
 
         public final BlockingQueue<Descriptor> src;
         private final Database database;
-        private final String repository;
+        private final String storage;
 
         private Exception exception;
 
@@ -128,7 +121,7 @@ public static class Indexer extends Thread implements Iterator<Document> {
 
         private final Map<String, String> existing;
 
-        public Indexer(Environment environment, Database database, String repository) {
+        public Indexer(Environment environment, Database database, String storage) {
             super("Indexer");
 
             this.environment = environment;
@@ -136,7 +129,7 @@ public Indexer(Environment environment, Database database, String repository) {
             this.src = new ArrayBlockingQueue<>(25);
 
             this.database = database;
-            this.repository = repository;
+            this.storage = storage;
             this.exception = null;
 
             // CAUTION: current is not defined until this thread is started (because it would block this constructor)!
@@ -151,7 +144,7 @@ public void run() {
 
             try {
                 started = System.currentTimeMillis();
-                database.list(repository, existing);
+                database.list(storage, existing);
                 environment.console().verbose.println("scanned " + existing.size() + " existing projects: "
                         + (System.currentTimeMillis() - started) + " ms");
                 current = iter();
@@ -209,13 +202,13 @@ private Document iter() {
                     return null;
                 }
                 count++;
-                existingRevision = existing.remove(descriptor.getRepository() + Field.ORIGIN_DELIMITER + descriptor.getPath());
+                existingRevision = existing.remove(descriptor.getStorage() + Field.ORIGIN_DELIMITER + descriptor.getPath());
                 if (descriptor.getRevision().equals(existingRevision)) {
                     console.info.println("  " + descriptor.getPath());
                     continue;
                 }
                 try {
-                    project = descriptor.load(environment);
+                    project = descriptor.load();
                 } catch (IOException e) {
                     console.error.println(e.getMessage());
                     e.printStackTrace(console.verbose);
diff --git a/src/main/java/net/oneandone/pommes/cli/Lib.java b/src/main/java/net/oneandone/pommes/cli/Lib.java
index 032cded1..271936cf 100644
--- a/src/main/java/net/oneandone/pommes/cli/Lib.java
+++ b/src/main/java/net/oneandone/pommes/cli/Lib.java
@@ -39,7 +39,7 @@ public static Lib load(World world) throws IOException {
         return new Lib(lib);
     }
 
-    public static void create(World world, FileNode root, Console console, Map<String, String> repositories) throws IOException {
+    public static void create(World world, FileNode root, Console console, Map<String, String> storages) throws IOException {
         FileNode lib;
 
         lib = root.join(DIR);
@@ -50,7 +50,7 @@ public static void create(World world, FileNode root, Console console, Map<Strin
         lib.mkdirs();
         lib.join("logs").mkdir();
         world.resource("profiles").copyDirectory(lib.join("profiles").mkdir());
-        configFile(lib).writeLines(Properties.defaultConfig(repositories));
+        configFile(lib).writeLines(Properties.defaultConfig(storages));
     }
 
     /** @return .pommes directory to use or null if not defined */
@@ -72,11 +72,6 @@ public Lib(FileNode home) throws IOException {
         this.properties = Properties.load(configFile(home));
     }
 
-    public String tokenOpt(String repositoryName) {
-        // TODO merge with git credential access
-        return System.getenv("POMMES_REPOSITORY_TOKEN_" + repositoryName.toUpperCase());
-    }
-
     public FileNode projectDirectory(Project project) throws IOException {
         if (project.scm == null) {
             throw new IOException(project + ": missing scm");
diff --git a/src/main/java/net/oneandone/pommes/cli/Main.java b/src/main/java/net/oneandone/pommes/cli/Main.java
index c6fa7405..ae4cb08a 100644
--- a/src/main/java/net/oneandone/pommes/cli/Main.java
+++ b/src/main/java/net/oneandone/pommes/cli/Main.java
@@ -58,19 +58,19 @@ public static void main(String[] args) {
                 + "  'remove' root?        remove checkouts under the specified root directory;\n"
                 + "                        offers selection before changing anything on disk;\n"
                 + "                        checkouts with modifications are marked in the list\n" */
-                + "  'index' {repo}        re-index the specified (default: all) repositories.\n"
+                + "  'index' {storage}     re-index the specified storages (default: all).\n"
                 + "  'setup' ['-batch'] root? {name'='value}\n"
                 + "                        sets up pommes in the specified directory (default: ~/" + Lib.DEFAULT_ROOT + ")\n"
-                + "                        creates '" + Lib.DIR + "' directory inside with initial configuration containing name/values as repositories; \n"
-                + "                        indexes all repositories to create intial database;\n"
+                + "                        creates '" + Lib.DIR + "' directory inside with initial configuration containing name/values as storages; \n"
+                + "                        indexes all storages to create initial database;\n"
                 + "\n"
                 + "fields in the database: (field id is the first letter of the field name.)\n"
                 + fieldList()
                 + "\n"
                 + "query syntax\n"
                 + "  query     = '@' MACRO | or\n"
-                + "  or        = repo? (and (' ' and)*)? index?\n"
-                + "  repo      = '/' STR?                  ; default is first repository defined in config\n"
+                + "  or        = storage? (and (' ' and)*)? index?\n"
+                + "  storage   = '/' STR?                  ; default is first storage defined in config\n"
                 + "  index     = NUMBER\n"
                 + "  and       = term ('+' term)*\n"
                 + "  term      = field | lucene\n"
@@ -96,7 +96,7 @@ public static void main(String[] args) {
             cli.add(Remove.class, "remove root?=.");
             cli.add(Status.class, "st root?=.");
             cli.add(Goto.class, "goto -x=false query*");
-            cli.add(Index.class, "index repo*");
+            cli.add(Index.class, "index storage*");
             cli.add(Find.class, "find -output=null -fold queryOrFormat* { arg*(queryOrFormat)}");
 
         System.exit(cli.run(args));
diff --git a/src/main/java/net/oneandone/pommes/cli/Properties.java b/src/main/java/net/oneandone/pommes/cli/Properties.java
index a157085a..31fa1469 100644
--- a/src/main/java/net/oneandone/pommes/cli/Properties.java
+++ b/src/main/java/net/oneandone/pommes/cli/Properties.java
@@ -27,15 +27,15 @@
 import java.util.Map;
 
 public class Properties {
-    public static List<String> defaultConfig(Map<String, String> repositories) {
+    public static List<String> defaultConfig(Map<String, String> storages) {
         List<String> lines;
 
         lines = new ArrayList<>();
         lines.add("# Pommes configuration file, see https://github.com/mlhartme/pommes");
         lines.add("");
-        lines.add("# repositories");
-        for (var entry : repositories.entrySet()) {
-            lines.add("repository." + entry.getKey() + "=" + entry.getValue());
+        lines.add("# storages");
+        for (var entry : storages.entrySet()) {
+            lines.add("storage." + entry.getKey() + "=" + entry.getValue());
         }
         lines.add("");
         lines.add("# query macros");
@@ -49,18 +49,18 @@ public static List<String> defaultConfig(Map<String, String> repositories) {
     public static Properties load(FileNode file) throws IOException {
         String queryPrefix = "query.";
         String formatPrefix = "format.";
-        String repoPrefix = "repository.";
+        String storagePrefix = "storage.";
         String giteaKey;
         Map<String, String> props;
         Map<String, List<String>> queries;
         Map<String, String> formats;
-        Map<String, String> repositories;
+        Map<String, String> storages;
         FileNode checkouts;
 
         giteaKey = null;
         queries = new HashMap<>();
         formats = new HashMap<>();
-        repositories = new LinkedHashMap<>();
+        storages = new LinkedHashMap<>();
         props = readSequencedProperties(file);
         checkouts = file.getParent().getParent();
         for (String key : props.keySet()) {
@@ -70,16 +70,16 @@ public static Properties load(FileNode file) throws IOException {
                 queries.put(key.substring(queryPrefix.length()), Separator.SPACE.split(props.get(key)));
             } else if (key.startsWith(formatPrefix)) {
                 formats.put(key.substring(formatPrefix.length()), props.get(key));
-            } else if (key.startsWith(repoPrefix)) {
-                repositories.put(key.substring(repoPrefix.length()), props.get(key));
+            } else if (key.startsWith(storagePrefix)) {
+                storages.put(key.substring(storagePrefix.length()), props.get(key));
             } else {
                 throw new IOException("unknown property: " + key);
             }
         }
-        if (repositories.isEmpty()) {
-            throw new IOException("missing repositories: " + file);
+        if (storages.isEmpty()) {
+            throw new IOException("missing storages: " + file);
         }
-        return new Properties(checkouts, giteaKey, queries, formats, repositories, repositories.keySet().iterator().next());
+        return new Properties(checkouts, giteaKey, queries, formats, storages, storages.keySet().iterator().next());
     }
 
     public static Map<String, String> readSequencedProperties(FileNode file) throws IOException {
@@ -104,18 +104,18 @@ public synchronized Object put(Object key, Object value) {
     private Map<String, List<String>> queries;
     private Map<String, String> formats;
 
-    /** maps names to repository urls */
-    public final Map<String, String> repositories;
-    public final String defaultRepository;
+    /** maps names to storage urls */
+    public final Map<String, String> storages;
+    public final String defaultStorage;
 
     public Properties(FileNode checkouts, String giteaKey, Map<String, List<String>> queries,
-                      Map<String, String> formats, Map<String, String> repositories, String defaultRepository) {
+                      Map<String, String> formats, Map<String, String> storages, String defaultStorage) {
         this.checkouts = checkouts;
         this.giteaKey = giteaKey;
         this.queries = queries;
         this.formats = formats;
-        this.repositories = repositories;
-        this.defaultRepository = defaultRepository;
+        this.storages = storages;
+        this.defaultStorage = defaultStorage;
     }
 
     public List<String> lookupQuery(String name) {
diff --git a/src/main/java/net/oneandone/pommes/cli/Scope.java b/src/main/java/net/oneandone/pommes/cli/Scope.java
index f521caaa..3056a589 100644
--- a/src/main/java/net/oneandone/pommes/cli/Scope.java
+++ b/src/main/java/net/oneandone/pommes/cli/Scope.java
@@ -26,13 +26,13 @@
 import java.util.List;
 
 public class Scope {
-    private final String defaultRepository;
+    private final String defaultStorage;
     private final Database database;
     private final CentralSearch centralSearch;
     private final Variables variables;
 
-    public Scope(String defaultRepository, Database database, Variables variables, CentralSearch centralSearch) {
-        this.defaultRepository = defaultRepository;
+    public Scope(String defaultStorage, Database database, Variables variables, CentralSearch centralSearch) {
+        this.defaultStorage = defaultStorage;
         this.database = database;
         this.variables = variables;
         this.centralSearch = centralSearch;
@@ -45,14 +45,14 @@ public Database getDatabase() {
     public List<Project> queryDatabase(List<String> queryStrings) throws IOException {
         PommesQuery query;
 
-        query = PommesQuery.parse(queryStrings, defaultRepository, variables);
+        query = PommesQuery.parse(queryStrings, defaultStorage, variables);
         return Field.projects(database.query(query));
     }
 
     public List<Project> queryCentral(List<String> queryStrings) throws IOException {
         PommesQuery query;
 
-        query = PommesQuery.parse(queryStrings, defaultRepository, variables);
+        query = PommesQuery.parse(queryStrings, defaultStorage, variables);
         return centralSearch.query(query);
     }
 }
diff --git a/src/main/java/net/oneandone/pommes/cli/Setup.java b/src/main/java/net/oneandone/pommes/cli/Setup.java
index 41048a1b..a927878d 100644
--- a/src/main/java/net/oneandone/pommes/cli/Setup.java
+++ b/src/main/java/net/oneandone/pommes/cli/Setup.java
@@ -33,15 +33,15 @@ public class Setup {
     private final boolean batch;
     private final FileNode root;
 
-    private final Map<String, String> repositories;
+    private final Map<String, String> storages;
 
     public Setup(World world, Console console, boolean batch, List<String> dirKeyValues) {
         this.world = world;
         this.console = console;
         this.batch = batch;
         this.root = eatRoot(dirKeyValues);
-        this.repositories = new LinkedHashMap<>();
-        this.repositories.put("local", root.getAbsolute());
+        this.storages = new LinkedHashMap<>();
+        this.storages.put("local", root.getAbsolute());
         for (String kv : dirKeyValues) {
             add(kv);
         }
@@ -66,7 +66,7 @@ private void add(String kv) {
             throw new ArgumentException("delimiter '=' not found: " + kv);
         }
         String key = kv.substring(0, idx).trim();
-        if (repositories.put(key, kv.substring(idx +1).trim()) != null) {
+        if (storages.put(key, kv.substring(idx +1).trim()) != null) {
             throw new ArgumentException("duplicate key: " + key);
         }
     }
@@ -85,7 +85,7 @@ public void run() throws Exception {
             console.info.println("Directory " + directory.getAbsolute() + " will be created to store configuration and other files.");
             console.readline("Press return to continue, ctl-c to abort: ");
         }
-        Lib.create(world, root, console, repositories);
+        Lib.create(world, root, console, storages);
         environment = new Environment(console, world);
         console.info.println("initial indexing ...");
         new Index(environment, new ArrayList<>()).run();
diff --git a/src/main/java/net/oneandone/pommes/cli/Status.java b/src/main/java/net/oneandone/pommes/cli/Status.java
index ef36ecfa..ccbb3e3c 100644
--- a/src/main/java/net/oneandone/pommes/cli/Status.java
+++ b/src/main/java/net/oneandone/pommes/cli/Status.java
@@ -20,7 +20,7 @@
 import net.oneandone.pommes.database.Database;
 import net.oneandone.pommes.database.Project;
 import net.oneandone.pommes.descriptor.Descriptor;
-import net.oneandone.pommes.repository.NodeRepository;
+import net.oneandone.pommes.storage.FileStorage;
 import net.oneandone.pommes.scm.Scm;
 import net.oneandone.pommes.scm.ScmUrl;
 import net.oneandone.sushi.fs.DirectoryNotFoundException;
@@ -173,11 +173,11 @@ public static Step create(Environment environment, Database database, FileNode f
             scmUrl = scm.getUrl(found);
             foundProjects = database.projectsByScm(scmUrl);
             if (foundProjects.isEmpty()) {
-                probed = NodeRepository.probe(environment, "unused", found);
+                probed = FileStorage.probe(environment, "unused", found);
                 if (probed == null) {
                     throw new IllegalStateException();
                 }
-                newPom = probed.load(environment);
+                newPom = probed.load();
                 try {
                     expected = environment.lib.projectDirectory(newPom);
                 } catch (IOException e) {
diff --git a/src/main/java/net/oneandone/pommes/database/Database.java b/src/main/java/net/oneandone/pommes/database/Database.java
index eb10f16b..4f19d09d 100644
--- a/src/main/java/net/oneandone/pommes/database/Database.java
+++ b/src/main/java/net/oneandone/pommes/database/Database.java
@@ -124,14 +124,14 @@ public void removeOrigins(Collection<String> origins) throws IOException {
         writer.close();
     }
 
-    public void list(String repository, Map<String, String> result) throws IOException {
+    public void list(String storage, Map<String, String> result) throws IOException {
         TopDocs search;
         Document document;
 
         if (searcher == null) {
             searcher = new IndexSearcher(DirectoryReader.open(getIndexLuceneDirectory()));
         }
-        search = searcher.search(Field.ORIGIN.query(Match.PREFIX, repository + Field.ORIGIN_DELIMITER), Integer.MAX_VALUE);
+        search = searcher.search(Field.ORIGIN.query(Match.PREFIX, storage + Field.ORIGIN_DELIMITER), Integer.MAX_VALUE);
         for (ScoreDoc scoreDoc : search.scoreDocs) {
             document = searcher.getIndexReader().storedFields().document(scoreDoc.doc);
             result.put(Field.ORIGIN.get(document), Field.REVISION.get(document));
diff --git a/src/main/java/net/oneandone/pommes/database/Field.java b/src/main/java/net/oneandone/pommes/database/Field.java
index 95de73f6..b973855f 100644
--- a/src/main/java/net/oneandone/pommes/database/Field.java
+++ b/src/main/java/net/oneandone/pommes/database/Field.java
@@ -30,7 +30,7 @@ public enum Field {
      * Mandatory. The full uri used to load the project for indexing. Full means the uri pointing to the pom file, not to trunk or a branch directory.
      * Used as a unique identifier for the document.
      */
-    ORIGIN("Where this project was loaded from. Used as unique identifier. <repositoryName>:<path>"),
+    ORIGIN("Where this project was loaded from. Used as unique identifier. <storageName>:<path>"),
 
     REVISION("Last modified timestamp or content hash of this pom. Used to detect changes."),
     PARENT(true, false, "Coordinates of the parent project."),
diff --git a/src/main/java/net/oneandone/pommes/database/PommesQuery.java b/src/main/java/net/oneandone/pommes/database/PommesQuery.java
index 0fd5309b..441855b4 100644
--- a/src/main/java/net/oneandone/pommes/database/PommesQuery.java
+++ b/src/main/java/net/oneandone/pommes/database/PommesQuery.java
@@ -40,17 +40,17 @@ public static PommesQuery parse(String str) throws IOException {
         return parse(Collections.singletonList(str), null);
     }
 
-    public static PommesQuery parse(List<String> initialOr, String defaultRepository) throws IOException {
-        return parse(initialOr, defaultRepository, EMPTY);
+    public static PommesQuery parse(List<String> initialOr, String defaultStorage) throws IOException {
+        return parse(initialOr, defaultStorage, EMPTY);
     }
 
-    public static PommesQuery parse(List<String> initialOr, String defaultRepository, Variables variables) throws IOException {
+    public static PommesQuery parse(List<String> initialOr, String defaultStorage, Variables variables) throws IOException {
         int queryIndex;
         List<String> or;
         Or orBuilder;
         And andBuilder;
         List<String> terms;
-        String repo;
+        String storage;
 
         queryIndex = -1;
         or = new ArrayList<>(initialOr);
@@ -64,20 +64,20 @@ public static PommesQuery parse(List<String> initialOr, String defaultRepository
             }
         }
         if (or.size() > 0 && or.get(0).startsWith("/")) {
-            repo = or.remove(0);
-            if (repo.length() == 1) {
-                repo = null;
+            storage = or.remove(0);
+            if (storage.length() == 1) {
+                storage = null;
             } else {
-                repo = repo.substring(1);
+                storage = storage.substring(1);
             }
         } else {
-            repo = defaultRepository;
+            storage = defaultStorage;
         }
         orBuilder = new Or();
         for (String and : or.isEmpty() ? Collections.singletonList("") : or) {
             andBuilder = new And();
-            if (repo != null) {
-                andBuilder.add(new Atom(false, Arrays.asList(Field.ORIGIN), Match.PREFIX, repo + ":"));
+            if (storage != null) {
+                andBuilder.add(new Atom(false, Arrays.asList(Field.ORIGIN), Match.PREFIX, storage + ":"));
             }
             terms = PLUS.split(variables.substitute(and));
             for (String termWithNot : terms) {
diff --git a/src/main/java/net/oneandone/pommes/database/Project.java b/src/main/java/net/oneandone/pommes/database/Project.java
index f9f5ac6e..52fd3b31 100644
--- a/src/main/java/net/oneandone/pommes/database/Project.java
+++ b/src/main/java/net/oneandone/pommes/database/Project.java
@@ -32,7 +32,7 @@ public static Project fromJson(JsonObject object) {
         Project result;
 
         result = new Project(
-                string(object, "repository"),
+                string(object, "storage"),
                 string(object, "path"),
                 string(object, "revision"),
                 Gav.forGavOpt(stringOpt(object, "parent")),
@@ -74,7 +74,7 @@ public static String stringOpt(JsonObject obj, String name) {
 
     //--
 
-    public final String repository;
+    public final String storage;
     public final String path;
     public final String revision;
 
@@ -88,9 +88,9 @@ public static String stringOpt(JsonObject obj, String name) {
 
     public final List<Gav> dependencies;
 
-    public Project(String repository, String path, String revision, Gav parent, Gav artifact, ScmUrl scm, String url) {
-        if (repository == null || repository.contains(":")) {
-            throw new IllegalArgumentException("repository: " + repository);
+    public Project(String storage, String path, String revision, Gav parent, Gav artifact, ScmUrl scm, String url) {
+        if (storage == null || storage.contains(":")) {
+            throw new IllegalArgumentException("storage: " + storage);
         }
         if (path == null) {
             throw new IllegalArgumentException("path: " + path);
@@ -98,7 +98,7 @@ public Project(String repository, String path, String revision, Gav parent, Gav
         if (scm == null) {
             throw new IllegalArgumentException("scm: " + scm);
         }
-        this.repository = repository;
+        this.storage = storage;
         this.path = path;
         this.revision = revision;
         this.parent = parent;
@@ -109,7 +109,7 @@ public Project(String repository, String path, String revision, Gav parent, Gav
     }
 
     public String origin() {
-        return repository + Field.ORIGIN_DELIMITER + path;
+        return storage + Field.ORIGIN_DELIMITER + path;
     }
 
     public String toLine() {
@@ -130,7 +130,7 @@ public JsonObject toJson() {
         JsonArray array;
 
         obj = new JsonObject();
-        obj.add("repository", new JsonPrimitive(repository));
+        obj.add("storage", new JsonPrimitive(storage));
         obj.add("path", new JsonPrimitive(path));
         obj.add("revision", new JsonPrimitive(revision));
         if (parent != null) {
diff --git a/src/main/java/net/oneandone/pommes/descriptor/ComposerDescriptor.java b/src/main/java/net/oneandone/pommes/descriptor/ComposerDescriptor.java
index 3986ee33..5ff36d99 100644
--- a/src/main/java/net/oneandone/pommes/descriptor/ComposerDescriptor.java
+++ b/src/main/java/net/oneandone/pommes/descriptor/ComposerDescriptor.java
@@ -23,8 +23,8 @@
 import net.oneandone.sushi.util.Strings;
 
 public class ComposerDescriptor extends Descriptor {
-    public ComposerDescriptor(String repository, String path, String revision, ScmUrl repositoryScm) {
-        super(repository, path, revision, repositoryScm);
+    public ComposerDescriptor(String storage, String path, String revision, ScmUrl storageScm) {
+        super(storage, path, revision, storageScm);
     }
 
     public static boolean matches(String name) {
@@ -32,13 +32,13 @@ public static boolean matches(String name) {
     }
 
     public static ComposerDescriptor create(Environment environmentNotUsed, Node descriptorCurrentlyNotUsed,
-                                            String repository, String path, String revision, ScmUrl repositoryScm) {
-        return new ComposerDescriptor(repository, path, revision, repositoryScm);
+                                            String storage, String path, String revision, ScmUrl storageScm) {
+        return new ComposerDescriptor(storage, path, revision, storageScm);
     }
 
     @Override
-    public Project load(Environment notUsed) {
-        return new Project(repository, path, revision, null, artifact(path), repositoryScm, null);
+    public Project load() {
+        return new Project(storage, path, revision, null, artifact(path), storageScm, null);
     }
 
     private static Gav artifact(String origin) {
diff --git a/src/main/java/net/oneandone/pommes/descriptor/Descriptor.java b/src/main/java/net/oneandone/pommes/descriptor/Descriptor.java
index 14f8fa55..528c52fe 100644
--- a/src/main/java/net/oneandone/pommes/descriptor/Descriptor.java
+++ b/src/main/java/net/oneandone/pommes/descriptor/Descriptor.java
@@ -28,7 +28,7 @@
 public abstract class Descriptor {
     @FunctionalInterface
     public interface Creator {
-        Descriptor create(Environment env, Node<?> node, String repository, String path, String revision, ScmUrl scmUrl);
+        Descriptor create(Environment environment, Node<?> node, String storage, String path, String revision, ScmUrl scmUrl);
     }
 
     /** @return create method for matching descriptor or null if no descriptor matches */
@@ -47,13 +47,13 @@ public static Creator match(String name) {
 
     //--
 
-    protected final String repository;
+    protected final String storage;
     protected final String path;
     protected final String revision;
-    protected final ScmUrl repositoryScm;
+    protected final ScmUrl storageScm;
 
-    public Descriptor(String repository, String path, String revision, ScmUrl repositoryScm) {
-        if (repository == null) {
+    public Descriptor(String storage, String path, String revision, ScmUrl storageScm) {
+        if (storage == null) {
             throw new IllegalArgumentException();
         }
         if (path == null) {
@@ -62,14 +62,14 @@ public Descriptor(String repository, String path, String revision, ScmUrl reposi
         if (revision == null) {
             throw new IllegalArgumentException();
         }
-        this.repository = repository;
+        this.storage = storage;
         this.path = path;
         this.revision = revision;
-        this.repositoryScm = repositoryScm == null ? null : repositoryScm.normalize();
+        this.storageScm = storageScm == null ? null : storageScm.normalize();
     }
 
-    public String getRepository() {
-        return repository;
+    public String getStorage() {
+        return storage;
     }
 
     public String getPath() {
@@ -80,7 +80,7 @@ public String getRevision() {
         return revision;
     }
 
-    public abstract Project load(Environment environment) throws IOException;
+    public abstract Project load() throws IOException;
 
     public String toString() {
         return path;
diff --git a/src/main/java/net/oneandone/pommes/descriptor/ErrorDescriptor.java b/src/main/java/net/oneandone/pommes/descriptor/ErrorDescriptor.java
index cf13689f..08ebd283 100644
--- a/src/main/java/net/oneandone/pommes/descriptor/ErrorDescriptor.java
+++ b/src/main/java/net/oneandone/pommes/descriptor/ErrorDescriptor.java
@@ -15,7 +15,6 @@
  */
 package net.oneandone.pommes.descriptor;
 
-import net.oneandone.pommes.cli.Environment;
 import net.oneandone.pommes.database.Project;
 import net.oneandone.pommes.scm.ScmUrl;
 
@@ -27,13 +26,13 @@ public class ErrorDescriptor extends Descriptor {
 
     private final Exception exception;
 
-    public ErrorDescriptor(Exception exception, String repository, String path, String revision, ScmUrl repositoryScm) {
-        super(repository, path, revision, repositoryScm);
+    public ErrorDescriptor(Exception exception, String storage, String path, String revision, ScmUrl storageScm) {
+        super(storage, path, revision, storageScm);
         this.exception = exception;
     }
 
     @Override
-    public Project load(Environment environment) throws IOException {
+    public Project load() throws IOException {
         if (exception instanceof RuntimeException) {
             throw (RuntimeException) exception;
         } else {
diff --git a/src/main/java/net/oneandone/pommes/descriptor/JsonDescriptor.java b/src/main/java/net/oneandone/pommes/descriptor/JsonDescriptor.java
index 1b0c1d82..861b4c20 100644
--- a/src/main/java/net/oneandone/pommes/descriptor/JsonDescriptor.java
+++ b/src/main/java/net/oneandone/pommes/descriptor/JsonDescriptor.java
@@ -25,16 +25,18 @@
 import java.io.IOException;
 
 public class JsonDescriptor extends Descriptor {
+    public static final String NAME = "pommes.json";
+
     public static boolean matches(String name) {
-        return name.equals(".pommes.json") || name.equals("pommes.json");
+        return name.equals("." + NAME) || name.equals(NAME);
     }
 
-    public static JsonDescriptor create(Environment notUsed, Node node, String repository, String path, String revision, ScmUrl repositoryScm) {
+    public static JsonDescriptor create(Environment notUsed, Node<?> node, String storage, String path, String revision, ScmUrl storageScm) {
         JsonObject json;
 
         try {
             json = JsonParser.parseString(node.readString()).getAsJsonObject();
-            return new JsonDescriptor(Project.fromJson(json), repository, path, revision, repositoryScm);
+            return new JsonDescriptor(Project.fromJson(json), storage, path, revision, storageScm);
         } catch (IOException e) {
             throw new RuntimeException(node.getUri().toString() + ": cannot create json descriptor", e);
         }
@@ -44,16 +46,16 @@ public static JsonDescriptor create(Environment notUsed, Node node, String repos
 
     private final Project orig;
 
-    public JsonDescriptor(Project orig, String repository, String path, String revision, ScmUrl repositoryScm) {
-        super(repository, path, revision, repositoryScm);
+    public JsonDescriptor(Project orig, String storage, String path, String revision, ScmUrl storageScm) {
+        super(storage, path, revision, storageScm);
         this.orig = orig;
     }
 
     @Override
-    public Project load(Environment environment) {
+    public Project load() {
         Project project;
 
-        project = new Project(repository, path, revision, orig.parent, orig.artifact, repositoryScm != null ? repositoryScm : orig.scm, orig.url);
+        project = new Project(storage, path, revision, orig.parent, orig.artifact, storageScm != null ? storageScm : orig.scm, orig.url);
         project.dependencies.addAll(orig.dependencies);
         return project;
     }
diff --git a/src/main/java/net/oneandone/pommes/descriptor/MavenDescriptor.java b/src/main/java/net/oneandone/pommes/descriptor/MavenDescriptor.java
index fe4e6ffb..a5da78d2 100644
--- a/src/main/java/net/oneandone/pommes/descriptor/MavenDescriptor.java
+++ b/src/main/java/net/oneandone/pommes/descriptor/MavenDescriptor.java
@@ -33,26 +33,28 @@
 import java.io.IOException;
 
 public class MavenDescriptor extends Descriptor {
+    private final Environment environment;
     /** pom file */
-    protected final Node pom;
+    private final Node<?> pom;
 
     public static boolean matches(String name) {
         return name.equals("pom.xml") || name.endsWith(".pom");
     }
 
-    public static MavenDescriptor create(Environment notUsed, Node<?> node, String repository, String path, String revision, ScmUrl repositoryScm) {
-        return new MavenDescriptor(node, repository, path, revision, repositoryScm);
+    public static MavenDescriptor create(Environment environment, Node<?> node, String storage, String path, String revision, ScmUrl storageScm) {
+        return new MavenDescriptor(environment, node, storage, path, revision, storageScm);
     }
 
-    public MavenDescriptor(Node<?> pom, String repository, String path, String revision, ScmUrl repositoryScm) {
-        super(repository, path, revision, repositoryScm);
+    public MavenDescriptor(Environment environment, Node<?> pom, String storage, String path, String revision, ScmUrl storageScm) {
+        super(storage, path, revision, storageScm);
+        this.environment = environment;
         this.pom = pom;
     }
 
     //--
 
     @Override
-    public Project load(Environment environment) throws IOException {
+    public Project load() throws IOException {
         FileNode local;
         MavenProject project;
 
@@ -70,7 +72,7 @@ public Project load(Environment environment) throws IOException {
                 throw new IOException(pom + ": cannot load maven project: " + e.getMessage(), e);
             }
 
-            return mavenToPommesProject(project, repository, path, revision, scm(environment.console(), repositoryScm, project));
+            return mavenToPommesProject(project, storage, path, revision, scm(environment.console(), storageScm, project));
         } finally {
             if (local != null && local != pom) {
                 local.deleteFile();
@@ -78,14 +80,14 @@ public Project load(Environment environment) throws IOException {
         }
     }
 
-    public static Project mavenToPommesProject(MavenProject project, String repository, String path, String revision, ScmUrl scm) {
+    public static Project mavenToPommesProject(MavenProject project, String storage, String path, String revision, ScmUrl scm) {
         Artifact pa;
         Gav paGav;
         Project pommesProject;
 
         pa = project.getParentArtifact();
         paGav = pa != null ? Gav.forArtifact(pa) : null;
-        pommesProject = new Project(repository, path, revision, paGav, Gav.forArtifact(project.getArtifact()),
+        pommesProject = new Project(storage, path, revision, paGav, Gav.forArtifact(project.getArtifact()),
                 scm == null ? null : scm.normalize(), project.getUrl());
         for (Dependency dependency : project.getDependencies()) {
             pommesProject.dependencies.add(Gav.forDependency(dependency));
@@ -93,15 +95,15 @@ public static Project mavenToPommesProject(MavenProject project, String reposito
         return pommesProject;
 
     }
-    private ScmUrl scm(Console console, ScmUrl repositoryScm, MavenProject project) throws IOException {
+    private ScmUrl scm(Console console, ScmUrl storageScm, MavenProject project) throws IOException {
         ScmUrl pomScm;
 
         pomScm = scmOpt(project);
-        if (repositoryScm != null) {
-            if (pomScm != null && !pomScm.same(repositoryScm)) {
-                console.error.println("overriding pom scm " + pomScm + " with " + repositoryScm);
+        if (storageScm != null) {
+            if (pomScm != null && !pomScm.same(storageScm)) {
+                console.error.println("overriding pom scm " + pomScm + " with " + storageScm);
             }
-            return repositoryScm;
+            return storageScm;
         }
         if (pomScm == null) {
             throw new IOException("missing scm in pom.xml: " + project.getFile());
diff --git a/src/main/java/net/oneandone/pommes/descriptor/RawDescriptor.java b/src/main/java/net/oneandone/pommes/descriptor/RawDescriptor.java
index db612fc8..f8b05c42 100644
--- a/src/main/java/net/oneandone/pommes/descriptor/RawDescriptor.java
+++ b/src/main/java/net/oneandone/pommes/descriptor/RawDescriptor.java
@@ -15,7 +15,6 @@
  */
 package net.oneandone.pommes.descriptor;
 
-import net.oneandone.pommes.cli.Environment;
 import net.oneandone.pommes.database.Project;
 import net.oneandone.pommes.scm.Scm;
 import net.oneandone.pommes.scm.ScmUrl;
@@ -25,8 +24,8 @@
 
 /** descriptor without meta information like from poms, only the scm url is known */
 public class RawDescriptor extends Descriptor {
-    public static RawDescriptor createOpt(String repository, FileNode node) throws IOException {
-        Scm scm;
+    public static RawDescriptor createOpt(String storage, FileNode node) throws IOException {
+        Scm<?> scm;
 
         if (!node.isDirectory()) {
             return null;
@@ -35,20 +34,20 @@ public static RawDescriptor createOpt(String repository, FileNode node) throws I
         if (scm == null) {
             return null;
         }
-        return new RawDescriptor(repository, node.getPath(), Long.toString(node.getLastModified()), scm.getUrl(node), null);
+        return new RawDescriptor(storage, node.getPath(), Long.toString(node.getLastModified()), scm.getUrl(node), null);
     }
 
     private final String url;
 
-    public RawDescriptor(String repository, String path, String revision, ScmUrl repositoryScm, String url) {
-        super(repository, path, revision, repositoryScm);
+    public RawDescriptor(String storage, String path, String revision, ScmUrl storageScm, String url) {
+        super(storage, path, revision, storageScm);
         this.url = url;
     }
 
     //--
 
     @Override
-    public Project load(Environment environment) throws IOException {
-        return new Project(repository, path, revision, null, repositoryScm.defaultGav(), repositoryScm, url);
+    public Project load() throws IOException {
+        return new Project(storage, path, revision, null, storageScm.defaultGav(), storageScm, url);
     }
 }
diff --git a/src/main/java/net/oneandone/pommes/repository/BitbucketRepository.java b/src/main/java/net/oneandone/pommes/repository/BitbucketRepository.java
deleted file mode 100644
index eb9751d4..00000000
--- a/src/main/java/net/oneandone/pommes/repository/BitbucketRepository.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
- * Copyright 1&1 Internet AG, https://github.com/1and1/
- *
- * 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.
- */
-package net.oneandone.pommes.repository;
-
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-import net.oneandone.pommes.cli.Environment;
-import net.oneandone.pommes.descriptor.Descriptor;
-import net.oneandone.pommes.scm.GitUrl;
-import net.oneandone.sushi.fs.NewInputStreamException;
-import net.oneandone.sushi.fs.Node;
-import net.oneandone.sushi.fs.NodeInstantiationException;
-import net.oneandone.sushi.fs.World;
-import net.oneandone.sushi.fs.http.HttpNode;
-import net.oneandone.sushi.fs.http.HttpRoot;
-import net.oneandone.sushi.fs.http.MovedTemporarilyException;
-import net.oneandone.sushi.fs.http.StatusException;
-
-import java.io.IOException;
-import java.io.Reader;
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.List;
-
-/** https://developer.atlassian.com/static/rest/bitbucket-server/4.6.2/bitbucket-rest.html */
-public class BitbucketRepository extends Repository<Descriptor> {
-    public static void main(String[] args) throws IOException {
-        World world;
-        Bitbucket bb;
-
-        world = World.create();
-        bb = new Bitbucket(((HttpNode) world.validNode("https://bitbucket.1and1.org")).getRoot());
-        System.out.println("rev: " + new String(bb.readBytes("CISOOPS", "puc", "pom.xml")));
-    }
-
-    public static BitbucketRepository create(Environment environment, String name, String url) throws URISyntaxException, NodeInstantiationException {
-        return new BitbucketRepository(environment, name, (HttpNode) environment.world().node(url));
-    }
-
-    private final Environment environment;
-    private final HttpNode bitbucket;
-
-    public BitbucketRepository(Environment environment, String name, HttpNode bitbucket) {
-        super(name);
-        this.environment = environment;
-        this.bitbucket = bitbucket;
-    }
-
-    @Override
-    public List<Descriptor> list() throws IOException {
-        List<Descriptor> result = new ArrayList<>();
-        Bitbucket bb;
-        String bbProject;
-        Descriptor.Creator m;
-        byte[] bytes;
-        List<String> lst;
-        Node tmp;
-        String hostname;
-
-        bb = new Bitbucket(bitbucket.getRoot());
-        bbProject = bitbucket.getName();
-        for (String repo : bb.listRepos(bbProject)) {
-            lst = bb.listRoot(bbProject, repo);
-            for (String path : lst) {
-                m = Descriptor.match(path);
-                if (m != null) {
-                    bytes = bb.readBytes(bbProject, repo, path);
-                    tmp = environment.world().memoryNode(bytes);
-                    hostname = bitbucket.getRoot().getHostname();
-                    result.add(m.create(environment, tmp, this.name, bbProject.toLowerCase() + "/" + repo + "/" + path, tmp.sha(),
-                            GitUrl.create("ssh://git@" + hostname + "/" + bbProject.toLowerCase() + "/" + repo + ".git")));
-                }
-            }
-        }
-        return result;
-    }
-
-    @Override
-    public Descriptor load(Descriptor descriptor) throws IOException {
-        // TODO
-        return descriptor;
-    }
-
-    private static class Bitbucket {
-        private final HttpRoot root;
-
-        Bitbucket(HttpRoot root) {
-            this.root = root;
-        }
-
-        // TODO: always fails with 404 error ...
-        public String getRevision(String project, String repo, String path) throws IOException {
-            JsonObject result;
-
-            result = getJsonObject("rest/api/1.0/projects/" + project + "/repos/" + repo + "/last-modified/" + path, "");
-            return result.get("id").getAsString();
-        }
-
-        public byte[] readBytes(String project, String repo, String path) throws IOException {
-            String location;
-            HttpNode node;
-
-            node = root.node("projects/" + project + "/repos/" + repo + "/browse/" + path, "raw");
-            while (true) {
-                try {
-                    // try to load. To see if we ne a redirected location
-                    return node.readBytes();
-                } catch (NewInputStreamException e) {
-                    if (e.getCause() instanceof MovedTemporarilyException) {
-                        location = ((MovedTemporarilyException) e.getCause()).location;
-                        try {
-                            node = (HttpNode) node.getWorld().node(location);
-                        } catch (URISyntaxException e1) {
-                            throw new IOException("cannot redirect to location " + location, e);
-                        }
-                        continue;
-                    } else {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        public List<String> listRepos(String project) throws IOException {
-            List<String> result;
-
-            result = new ArrayList<>();
-            for (JsonElement repo : getPaged("rest/api/1.0/projects/" + project + "/repos")) {
-                result.add(repo.getAsJsonObject().get("slug").getAsString());
-            }
-            return result;
-        }
-
-        public List<String> listRoot(String project, String repo) throws IOException {
-            String path;
-            List<JsonElement> all;
-            List<String> result;
-
-
-            result = new ArrayList<>();
-            try {
-                all = getPaged("rest/api/1.0/projects/" + project + "/repos/" + repo + "/files/");
-            } catch (NewInputStreamException e) {
-                if (e.getCause() instanceof StatusException) {
-                    if (((StatusException) e.getCause()).getStatusLine().code == 401) {
-                        // happens if the repository is still empty
-                        return result;
-                    }
-                }
-                throw e;
-            }
-
-            for (JsonElement file : all) {
-                path = file.getAsString();
-                if (!path.contains("/")) {
-                    result.add(path);
-                }
-            }
-            return result;
-        }
-
-        //--
-
-        private List<JsonElement> getPaged(String path) throws IOException {
-            int perPage = 25;
-            JsonObject paged;
-            List<JsonElement> result;
-
-            result = new ArrayList<>();
-            for (int i = 0; true; i += perPage) {
-                paged = getJsonObject(path, "limit=" + perPage + "&start=" + i);
-                for (JsonElement value : paged.get("values").getAsJsonArray()) {
-                    result.add(value);
-                }
-                if (paged.get("isLastPage").getAsBoolean()) {
-                    break;
-                }
-            }
-            return result;
-        }
-
-        private JsonObject getJsonObject(String path, String params) throws IOException {
-            try (Reader src = root.node(path, params).newReader()) {
-                return JsonParser.parseReader(src).getAsJsonObject();
-            }
-        }
-    }
-}
diff --git a/src/main/java/net/oneandone/pommes/repository/Constructor.java b/src/main/java/net/oneandone/pommes/repository/Constructor.java
deleted file mode 100644
index 9923ccef..00000000
--- a/src/main/java/net/oneandone/pommes/repository/Constructor.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package net.oneandone.pommes.repository;
-
-import net.oneandone.pommes.cli.Environment;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.net.URISyntaxException;
-
-@FunctionalInterface
-public interface Constructor {
-    Repository create(Environment environment, String name, String url, PrintWriter log) throws URISyntaxException, IOException;
-}
diff --git a/src/main/java/net/oneandone/pommes/repository/GiteaProject.java b/src/main/java/net/oneandone/pommes/repository/GiteaProject.java
deleted file mode 100644
index 11eae175..00000000
--- a/src/main/java/net/oneandone/pommes/repository/GiteaProject.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package net.oneandone.pommes.repository;
-
-import io.gitea.ApiException;
-import io.gitea.api.RepositoryApi;
-import io.gitea.model.ContentsResponse;
-import net.oneandone.pommes.cli.Environment;
-import net.oneandone.pommes.descriptor.Descriptor;
-import net.oneandone.pommes.scm.GitUrl;
-import net.oneandone.sushi.fs.memory.MemoryNode;
-
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.util.Base64;
-import java.util.List;
-
-public record GiteaProject(String org, String repo, String ref) {
-    public Descriptor scanOpt(Environment environment, String hostname, RepositoryApi repositoryApi) throws IOException, ApiException {
-        List<ContentsResponse> lst;
-
-        lst = repositoryApi.repoGetContentsList(org, repo, ref);
-        for (ContentsResponse contents : lst) {
-            if ("file".equals(contents.getType())) {
-                Descriptor.Creator m = Descriptor.match(contents.getName());
-                if (m != null) {
-                    contents = repositoryApi.repoGetContents(org, repo, contents.getPath(), ref);
-                    String str = contents.getContent();
-                    if ("base64".equals(contents.getEncoding())) {
-                        str = new String(Base64.getDecoder().decode(str.getBytes(StandardCharsets.UTF_8)), StandardCharsets.UTF_8);
-                    } else if (contents.getEncoding() != null) {
-                        throw new IllegalStateException(contents.getEncoding());
-                    }
-                    MemoryNode tmp = environment.world().memoryNode(str);
-                    return m.create(environment, tmp, repo, org + "/" + repo + "/" + contents.getPath(), tmp.sha(),
-                            GitUrl.create("ssh://gitea@" + hostname + "/" + org + "/" + repo + ".git"));
-                }
-            }
-        }
-        return null;
-    }
-}
diff --git a/src/main/java/net/oneandone/pommes/repository/NodeRepository.java b/src/main/java/net/oneandone/pommes/repository/NodeRepository.java
deleted file mode 100644
index 27f55fc7..00000000
--- a/src/main/java/net/oneandone/pommes/repository/NodeRepository.java
+++ /dev/null
@@ -1,227 +0,0 @@
-/*
- * Copyright 1&1 Internet AG, https://github.com/1and1/
- *
- * 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.
- */
-package net.oneandone.pommes.repository;
-
-import net.oneandone.inline.ArgumentException;
-import net.oneandone.pommes.cli.Environment;
-import net.oneandone.pommes.cli.Find;
-import net.oneandone.pommes.descriptor.Descriptor;
-import net.oneandone.pommes.descriptor.RawDescriptor;
-import net.oneandone.pommes.scm.GitUrl;
-import net.oneandone.pommes.scm.Scm;
-import net.oneandone.pommes.scm.ScmUrl;
-import net.oneandone.pommes.scm.SubversionUrl;
-import net.oneandone.sushi.fs.Node;
-import net.oneandone.sushi.fs.NodeInstantiationException;
-import net.oneandone.sushi.fs.file.FileNode;
-import net.oneandone.sushi.fs.filter.Filter;
-import net.oneandone.sushi.fs.svn.SvnNode;
-import org.tmatesoft.svn.core.SVNURL;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.List;
-
-/** To search files system and subversion */
-public class NodeRepository extends Repository<NodeRepository.NodeProject> {
-    public interface NodeProject {
-        Descriptor descriptor() throws IOException;
-    }
-
-    public static Descriptor probe(Environment environment, String repository, FileNode checkout) throws IOException {
-        NodeRepository repo;
-        List<NodeProject> dest;
-
-        repo = new NodeRepository(environment, repository, checkout, environment.console().verbose);
-        dest = new ArrayList<>(2);
-        repo.scan(checkout, false, dest);
-        return switch (dest.size()) {
-            case 0 -> null;
-            case 1 -> dest.get(0).descriptor();
-            default -> throw new IOException("amibugous: " + dest.toString());
-        };
-    }
-
-    public static NodeRepository create(Environment environment, String name, String url, PrintWriter log) throws URISyntaxException, NodeInstantiationException {
-        return new NodeRepository(environment, name, Find.fileOrNode(environment.world(), url), log);
-    }
-
-    //--
-
-    private final Environment environment;
-    private final PrintWriter log;
-    private final Node root;
-    private boolean branches;
-    private boolean tags;
-    private final Filter exclude;
-
-    public NodeRepository(Environment environment, String name, Node root, PrintWriter log) {
-        this(environment, name, root, false, false, log);
-    }
-
-    public NodeRepository(Environment environment, String name, Node root, boolean branches, boolean tags, PrintWriter log) {
-        super(name);
-        this.environment = environment;
-        this.root = root;
-        this.exclude = new Filter();
-        this.branches = branches;
-        this.tags = tags;
-        this.log = log;
-    }
-
-    @Override
-    public void addOption(String option) {
-        if (option.equals("branches")) {
-            branches = true;
-        } else if (option.equals("tags")) {
-            tags = true;
-        } else {
-            throw new ArgumentException("unknown option: " + option);
-        }
-    }
-
-    @Override
-    public void addExclude(String str) {
-        if (str.startsWith("/") || str.endsWith("/")) {
-            throw new ArgumentException("do not use '/' before or after excludes: " + str);
-        }
-        exclude.include("**/" + str);
-    }
-
-    @Override
-    public List<NodeProject> list() throws IOException {
-        List<NodeProject> result = new ArrayList<>();
-        scan(root, true, result);
-        return result;
-    }
-
-    @Override
-    public Descriptor load(NodeProject project) throws IOException {
-        return project.descriptor();
-    }
-
-    public void scan(Node<?> directory, boolean recurse, List<NodeProject> dest) throws IOException {
-        List<? extends Node> children;
-        Node<?> trunkNode;
-        Node<?> branchesNode;
-        Node<?> tagsNode;
-        List<? extends Node> grandChildren;
-
-        if (exclude.matches(directory.getPath())) {
-            return;
-        }
-        children = directory.list();
-        if (children == null) {
-            return;
-        }
-        log.println("scan " + directory.getPath());
-        for (Node<?> child : children) {
-            Descriptor.Creator m = Descriptor.match(child.getName());
-            if (m != null) {
-                dest.add(() -> m.create(environment, child, this.name, child.getPath(), Long.toString(child.getLastModified()), nodeScm(child)));
-                return;
-            }
-        }
-        if (directory instanceof FileNode fileNode) {
-            Descriptor descriptor = RawDescriptor.createOpt(name, fileNode);
-            if (descriptor != null) {
-                dest.add(() -> descriptor);
-                return;
-            }
-        }
-        if (directory instanceof SvnNode) {
-            trunkNode = child(children, "trunk");
-            if (trunkNode != null) {
-                scan(trunkNode, false, dest);
-            }
-            branchesNode = child(children, "branches");
-            if (branchesNode != null && branches) {
-                grandChildren = branchesNode.list();
-                if (grandChildren != null) {
-                    for (Node grandChild : grandChildren) {
-                        scan(grandChild, false, dest);
-                    }
-                }
-            }
-            tagsNode = child(children, "tags");
-            if (tagsNode != null && tags) {
-                grandChildren = tagsNode.list();
-                if (grandChildren != null) {
-                    for (Node grandChild : grandChildren) {
-                        scan(grandChild, false, dest);
-                    }
-                }
-            }
-            if (trunkNode != null || branchesNode != null || tagsNode != null) {
-                // found project with standard svn layout; no need for further recursion
-                return;
-            }
-        }
-
-        if (child(children, "src") != null) {
-            // probably an old ant build
-            return;
-        }
-
-        if (recurse) {
-            // recurse
-            for (Node child : children) {
-                scan(child, true, dest);
-            }
-        }
-    }
-
-    private static Node child(List<? extends Node> childen, String name) {
-        for (Node node : childen) {
-            if (node.getName().equals(name)) {
-                return node;
-            }
-        }
-        return null;
-    }
-
-    public static ScmUrl nodeScm(Node descriptor) throws IOException {
-        String path;
-        SVNURL root;
-
-        if (descriptor instanceof SvnNode svn) {
-            // TODO: I currently use svn to crawl github ...
-            // sushi path is only trunk/pom.xml - i need svnkit path instead
-            root = svn.getRoot().getRepository().getLocation();
-            if (root.getHost().equals("github.com")) {
-                path = root.getPath();
-                if (!path.startsWith("/")) {
-                    throw new IllegalStateException(path);
-                }
-                return GitUrl.create("ssh://git@github.com" + path + ".git");
-            } else {
-                return new SubversionUrl(svn.getParent().getUri().toString());
-            }
-        } else if (descriptor instanceof FileNode fileNode) {
-            FileNode directory = fileNode.getParent();
-            Scm scm = Scm.probeCheckout(directory);
-            if (scm == null) {
-                return null;
-            } else {
-                return scm.getUrl(directory);
-            }
-        } else {
-            return null;
-        }
-    }
-}
diff --git a/src/main/java/net/oneandone/pommes/repository/Repository.java b/src/main/java/net/oneandone/pommes/repository/Repository.java
deleted file mode 100644
index bc8588b9..00000000
--- a/src/main/java/net/oneandone/pommes/repository/Repository.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright 1&1 Internet AG, https://github.com/1and1/
- *
- * 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.
- */
-package net.oneandone.pommes.repository;
-
-import net.oneandone.inline.ArgumentException;
-import net.oneandone.inline.Console;
-import net.oneandone.pommes.cli.Environment;
-import net.oneandone.pommes.descriptor.Descriptor;
-import net.oneandone.sushi.fs.file.FileNode;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.BlockingQueue;
-
-/** A place to search for descriptors. */
-public abstract class Repository<E> {
-    private static Map<String, Constructor> types;
-    static {
-        types = new HashMap<>();
-        types.put("artifactory", ArtifactoryRepository::create);
-        types.put("file", NodeRepository::create);
-        types.put("svn", NodeRepository::create);
-        types.put("gitlab", GitlabRepository::create);
-        types.put("github", GithubRepository::create);
-        types.put("gitea", GiteaRepository::create);
-        types.put("bitbucket", BitbucketRepository::create);
-        types.put("json", JsonRepository::createJson);
-        types.put("inline", JsonRepository::createInline);
-    }
-
-    public static Repository create(Environment environment, String name, String url, PrintWriter log) throws URISyntaxException, IOException {
-        int idx;
-        FileNode file;
-        Constructor constructor;
-
-        idx = url.indexOf(':');
-        if (idx >= 0) {
-            constructor = types.get(url.substring(0, idx));
-            if (constructor != null) {
-                return constructor.create(environment, name, url.substring(idx + 1), log);
-            }
-        }
-        file = environment.world().file(url);
-        if (file.exists()) {
-            return new NodeRepository(environment, name, file, log);
-        }
-        throw new ArgumentException("unknown repository type: " + url);
-    }
-
-    protected final String name;
-
-    public Repository(String name) {
-        this.name = name;
-    }
-
-
-    // override to return a host name if repository can handle token
-    public String getTokenHost() {
-        return null;
-    }
-    // override if getTokenHost is overridden
-    public void setToken(String token) {
-        throw new IllegalStateException("token not supported");
-    }
-
-    public void addOption(String option) {
-        throw new ArgumentException(name + ": unknown option: " + option);
-    }
-
-    public void addExclude(String exclude) {
-        throw new ArgumentException(name + ": excludes not supported: " + exclude);
-    }
-    public final void scan(BlockingQueue<Descriptor> dest, Console console) throws IOException, InterruptedException {
-        console.info.print("collecting entries ...");
-        console.info.flush();
-        List<E> entries = list();
-        console.info.println(" done: " + entries.size());
-        for (E entry : entries) {
-            try {
-                var descriptor = load(entry);
-                if (descriptor != null) {
-                    dest.put(descriptor);
-                }
-            } catch (IOException e) {
-                console.error.println("cannot load " + entry + ": " + e.getMessage());
-                e.printStackTrace(console.verbose);
-            }
-        }
-    }
-
-    /** List entries in the repository */
-    public abstract List<E> list() throws IOException;
-
-    /** Load an entry, i.e. return the respective descriptor */
-    public abstract Descriptor load(E entry) throws IOException;
-}
diff --git a/src/main/java/net/oneandone/pommes/scm/Scm.java b/src/main/java/net/oneandone/pommes/scm/Scm.java
index d945c7c9..c163742a 100644
--- a/src/main/java/net/oneandone/pommes/scm/Scm.java
+++ b/src/main/java/net/oneandone/pommes/scm/Scm.java
@@ -32,7 +32,7 @@ public abstract class Scm<U extends ScmUrl> {
     public static final Git GIT = new Git();
     public static final Subversion SUBVERSION = new Subversion();
 
-    private static final Scm[] SCMS = { GIT, SUBVERSION };
+    private static final Scm<?>[] SCMS = { GIT, SUBVERSION };
 
     //--
 
diff --git a/src/main/java/net/oneandone/pommes/scm/ScmUrl.java b/src/main/java/net/oneandone/pommes/scm/ScmUrl.java
index b720a48e..7395d308 100644
--- a/src/main/java/net/oneandone/pommes/scm/ScmUrl.java
+++ b/src/main/java/net/oneandone/pommes/scm/ScmUrl.java
@@ -5,7 +5,7 @@
 import net.oneandone.sushi.launcher.Failure;
 
 public abstract class ScmUrl {
-    private final Scm scm;
+    private final Scm<ScmUrl> scm;
 
     public ScmUrl(Scm scm) {
         this.scm = scm;
diff --git a/src/main/java/net/oneandone/pommes/storage/Artifact.java b/src/main/java/net/oneandone/pommes/storage/Artifact.java
new file mode 100644
index 00000000..fe757fce
--- /dev/null
+++ b/src/main/java/net/oneandone/pommes/storage/Artifact.java
@@ -0,0 +1,21 @@
+package net.oneandone.pommes.storage;
+
+import net.oneandone.pommes.cli.Environment;
+import net.oneandone.pommes.descriptor.Descriptor;
+import net.oneandone.sushi.fs.Node;
+import net.oneandone.sushi.util.Strings;
+
+public record Artifact(String uri, String sha1) {
+    public String name() {
+        int idx = uri.lastIndexOf('/');
+        if (idx < 0) {
+            throw new IllegalStateException(uri);
+        }
+        return uri.substring(idx + 1);
+    }
+
+    public Descriptor create(Node<?> root, String storage, Environment environment, Descriptor.Creator creator) {
+        Node<?> node = root.join(Strings.removeLeft(uri, "/"));
+        return creator.create(environment, node, storage, "artifactory:" + node.getPath(), sha1, null);
+    }
+}
diff --git a/src/main/java/net/oneandone/pommes/repository/ArtifactoryRepository.java b/src/main/java/net/oneandone/pommes/storage/ArtifactoryStorage.java
similarity index 77%
rename from src/main/java/net/oneandone/pommes/repository/ArtifactoryRepository.java
rename to src/main/java/net/oneandone/pommes/storage/ArtifactoryStorage.java
index fadc2c6f..0f7a139a 100644
--- a/src/main/java/net/oneandone/pommes/repository/ArtifactoryRepository.java
+++ b/src/main/java/net/oneandone/pommes/storage/ArtifactoryStorage.java
@@ -13,11 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.oneandone.pommes.repository;
+package net.oneandone.pommes.storage;
 
 import net.oneandone.inline.ArgumentException;
 import net.oneandone.pommes.cli.Environment;
 import net.oneandone.pommes.descriptor.Descriptor;
+import net.oneandone.pommes.scm.ScmUrl;
 import net.oneandone.sushi.fs.Node;
 import net.oneandone.sushi.fs.NodeInstantiationException;
 import net.oneandone.sushi.fs.World;
@@ -27,18 +28,18 @@
 import javax.json.stream.JsonParser;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.PrintWriter;
 import java.net.URISyntaxException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
-public class ArtifactoryRepository extends Repository<Descriptor> {
-    public static ArtifactoryRepository create(Environment environment, String name, String url, PrintWriter log)
+public class ArtifactoryStorage extends TreeStorage<Artifact, Artifact> {
+    public static ArtifactoryStorage create(Environment environment, String name, String url)
             throws NodeInstantiationException, URISyntaxException {
-        return new ArtifactoryRepository(environment, name, url);
+        return new ArtifactoryStorage(environment, name, url);
     }
 
     private final String url;
@@ -47,8 +48,8 @@ public static ArtifactoryRepository create(Environment environment, String name,
     private final World world;
     private String contextPath;
 
-    public ArtifactoryRepository(Environment environment, String name, String url) throws NodeInstantiationException, URISyntaxException {
-        super(name);
+    public ArtifactoryStorage(Environment environment, String name, String url) throws NodeInstantiationException, URISyntaxException {
+        super(environment, name);
         this.environment = environment;
         this.world = environment.world();
         this.url = url;
@@ -72,11 +73,11 @@ public void addOption(String option) {
     }
 
     @Override
-    public List<Descriptor> list() throws IOException {
-        List<Descriptor> result = new ArrayList<>();
+    public List<Artifact> list() throws IOException {
+        List<Artifact> result = new ArrayList<>();
         Node<?> listing = world.validNode(artifactory() + "api/storage/" + repositoryAndPath() + "?list&deep=1&mdTimestamps=0");
         try {
-            Parser.run(environment, name, listing, root, result);
+            Parser.run(environment, listing, result);
         } catch (IOException | RuntimeException e) {
             throw e;
         } catch (Exception e) {
@@ -85,12 +86,6 @@ public List<Descriptor> list() throws IOException {
         return result;
     }
 
-    @Override
-    public Descriptor load(Descriptor descriptor) {
-        // TODO: currently all processing done by parser
-        return descriptor;
-    }
-
     /** @return with tailing slash */
     private String artifactory() {
         int idx;
@@ -106,20 +101,52 @@ private String repositoryAndPath() {
         return Strings.removeLeft(url, artifactory());
     }
 
+    @Override
+    public List<Artifact> listRoot(Artifact entry) throws IOException {
+        return Collections.singletonList(entry);
+    }
+
+    @Override
+    public String fileName(Artifact file) {
+        return file.name();
+    }
+
+    @Override
+    public ScmUrl storageUrl(Artifact repository) throws IOException {
+        return null; // TODO
+    }
+
+    @Override
+    public String repositoryPath(Artifact repository, Artifact file) throws IOException {
+        return "artifactory:" + root.join(Strings.removeLeft(repository.uri(), "/")).getPath();
+    }
+
+    @Override
+    public Node<?> localFile(Artifact repository, Artifact file) throws IOException {
+        return root.join(Strings.removeLeft(file.uri(), "/"));
+    }
+
+    @Override
+    public String fileRevision(Artifact repository, Artifact artifact, Node<?> local) throws IOException {
+        return local.sha();
+    }
+
+    @Override
+    public Descriptor createDefault(Artifact entry) {
+        return null;
+    }
+
     //--
 
     public static class Parser implements AutoCloseable {
         private static final SimpleDateFormat FMT = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSX");
 
-        public static void run(Environment environment, String repository, Node listing, Node root, List<Descriptor> dest) throws Exception {
+        public static void run(Environment environment, Node listing, List<Artifact> dest) throws Exception {
             String uri;
             long size;
             Date lastModified;
             String sha1;
-            int count;
-            Node node;
 
-            count = 0;
             try (InputStream is = listing.newInputStream(); Parser parser = new Parser(Json.createParser(is))) {
                 parser.next(JsonParser.Event.START_OBJECT);
                 parser.eatKeyValueString("uri");
@@ -136,15 +163,10 @@ public static void run(Environment environment, String repository, Node listing,
                     }
                     parser.eatKeyValueFalse("folder");
                     sha1 = parser.eatKeyValueString("sha1");
-                    node = root.join(Strings.removeLeft(uri, "/"));
-                    Descriptor.Creator m = Descriptor.match(((Node<?>) node).getName());
-                    if (m != null) {
-                        dest.add(m.create(environment, node, repository, "artifactory:" + node.getPath(), sha1, null));
-                    }
+                    dest.add(new Artifact(uri, sha1));
                     if (parser.eatTimestampsOpt() != JsonParser.Event.END_OBJECT) {
                         throw new IllegalStateException();
                     }
-                    count++;
                 }
             }
         }
diff --git a/src/main/java/net/oneandone/pommes/storage/Bitbucket.java b/src/main/java/net/oneandone/pommes/storage/Bitbucket.java
new file mode 100644
index 00000000..44600299
--- /dev/null
+++ b/src/main/java/net/oneandone/pommes/storage/Bitbucket.java
@@ -0,0 +1,121 @@
+package net.oneandone.pommes.storage;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import net.oneandone.sushi.fs.NewInputStreamException;
+import net.oneandone.sushi.fs.http.HttpNode;
+import net.oneandone.sushi.fs.http.HttpRoot;
+import net.oneandone.sushi.fs.http.MovedTemporarilyException;
+import net.oneandone.sushi.fs.http.StatusException;
+
+import java.io.IOException;
+import java.io.Reader;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.List;
+
+public class Bitbucket {
+    private final HttpRoot root;
+
+    public Bitbucket(HttpRoot root) {
+        this.root = root;
+    }
+
+    // TODO: always fails with 404 error ...
+    public String getRevision(String project, String repo, String path) throws IOException {
+        JsonObject result;
+
+        result = getJsonObject("rest/api/1.0/projects/" + project + "/repos/" + repo + "/last-modified/" + path, "");
+        return result.get("id").getAsString();
+    }
+
+    public byte[] readBytes(String project, String repo, String path) throws IOException {
+        String location;
+        HttpNode node;
+
+        node = root.node("projects/" + project + "/repos/" + repo + "/browse/" + path, "raw");
+        while (true) {
+            try {
+                // try to load. To see if we ne a redirected location
+                return node.readBytes();
+            } catch (NewInputStreamException e) {
+                if (e.getCause() instanceof MovedTemporarilyException) {
+                    location = ((MovedTemporarilyException) e.getCause()).location;
+                    try {
+                        node = (HttpNode) node.getWorld().node(location);
+                    } catch (URISyntaxException e1) {
+                        throw new IOException("cannot redirect to location " + location, e);
+                    }
+                    continue;
+                } else {
+                    throw e;
+                }
+            }
+        }
+    }
+
+    public List<String> listRepos(String project) throws IOException {
+        List<String> result;
+
+        result = new ArrayList<>();
+        for (JsonElement repo : getPaged("rest/api/1.0/projects/" + project + "/repos")) {
+            result.add(repo.getAsJsonObject().get("slug").getAsString());
+        }
+        return result;
+    }
+
+    public List<String> listRoot(String project, String repo) throws IOException {
+        String path;
+        List<JsonElement> all;
+        List<String> result;
+
+
+        result = new ArrayList<>();
+        try {
+            all = getPaged("rest/api/1.0/projects/" + project + "/repos/" + repo + "/files/");
+        } catch (NewInputStreamException e) {
+            if (e.getCause() instanceof StatusException cause) {
+                if (cause.getStatusLine().code == 401) {
+                    // happens if the repository is still empty
+                    return result;
+                }
+            }
+            throw e;
+        }
+
+        for (JsonElement file : all) {
+            path = file.getAsString();
+            if (!path.contains("/")) {
+                result.add(path);
+            }
+        }
+        return result;
+    }
+
+    //--
+
+    private List<JsonElement> getPaged(String path) throws IOException {
+        int perPage = 25;
+        JsonObject paged;
+        List<JsonElement> result;
+
+        result = new ArrayList<>();
+        for (int i = 0; true; i += perPage) {
+            paged = getJsonObject(path, "limit=" + perPage + "&start=" + i);
+            for (JsonElement value : paged.get("values").getAsJsonArray()) {
+                result.add(value);
+            }
+            if (paged.get("isLastPage").getAsBoolean()) {
+                break;
+            }
+        }
+        return result;
+    }
+
+    private JsonObject getJsonObject(String path, String params) throws IOException {
+        try (Reader src = root.node(path, params).newReader()) {
+            return JsonParser.parseReader(src).getAsJsonObject();
+        }
+    }
+}
diff --git a/src/main/java/net/oneandone/pommes/storage/BitbucketStorage.java b/src/main/java/net/oneandone/pommes/storage/BitbucketStorage.java
new file mode 100644
index 00000000..03f63126
--- /dev/null
+++ b/src/main/java/net/oneandone/pommes/storage/BitbucketStorage.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright 1&1 Internet AG, https://github.com/1and1/
+ *
+ * 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.
+ */
+package net.oneandone.pommes.storage;
+
+import net.oneandone.pommes.cli.Environment;
+import net.oneandone.pommes.descriptor.Descriptor;
+import net.oneandone.pommes.scm.GitUrl;
+import net.oneandone.pommes.scm.ScmUrl;
+import net.oneandone.sushi.fs.Node;
+import net.oneandone.sushi.fs.NodeInstantiationException;
+import net.oneandone.sushi.fs.World;
+import net.oneandone.sushi.fs.http.HttpNode;
+
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.util.List;
+
+/** https://developer.atlassian.com/static/rest/bitbucket-server/4.6.2/bitbucket-rest.html */
+public class BitbucketStorage extends TreeStorage<String, String> {
+    public static void main(String[] args) throws IOException {
+        World world;
+        Bitbucket bb;
+
+        world = World.create();
+        bb = new Bitbucket(((HttpNode) world.validNode("https://bitbucket.1and1.org")).getRoot());
+        System.out.println("rev: " + new String(bb.readBytes("CISOOPS", "puc", "pom.xml")));
+    }
+
+    public static BitbucketStorage create(Environment environment, String name, String url) throws URISyntaxException, NodeInstantiationException {
+        return new BitbucketStorage(environment, name, (HttpNode) environment.world().node(url));
+    }
+
+    private final Environment environment;
+    private final HttpNode bitbucket;
+    private final Bitbucket bb;
+    private final String bbProject;
+
+    public BitbucketStorage(Environment environment, String name, HttpNode bitbucket) {
+        super(environment, name);
+        this.environment = environment;
+        this.bitbucket = bitbucket;
+        this.bb = new Bitbucket(bitbucket.getRoot());
+        this.bbProject = bitbucket.getName();
+    }
+
+    @Override
+    public List<String> list() throws IOException {
+        return bb.listRepos(bbProject);
+    }
+
+    @Override
+    public List<String> listRoot(String repo) throws IOException {
+        return bb.listRoot(bbProject, repo);
+    }
+
+    @Override
+    public String fileName(String file) {
+        return file;
+    }
+
+    @Override
+    public ScmUrl storageUrl(String repository) throws IOException {
+        String hostname = bitbucket.getRoot().getHostname();
+        return GitUrl.create("ssh://git@" + hostname + "/" + bbProject.toLowerCase() + "/" + repository + ".git");
+    }
+
+    @Override
+    public String repositoryPath(String repository, String file) throws IOException {
+        return bbProject.toLowerCase() + "/" + repository + "/" + file;
+    }
+
+    @Override
+    public Node<?> localFile(String repository, String file) throws IOException {
+        byte[] bytes = bb.readBytes(bbProject, repository, file);
+        return environment.world().memoryNode(bytes);
+    }
+
+    @Override
+    public String fileRevision(String repository, String s, Node<?> local) throws IOException {
+        return local.sha();
+    }
+
+    @Override
+    public Descriptor createDefault(String repo) {
+        return null; // TODO
+    }
+}
diff --git a/src/main/java/net/oneandone/pommes/storage/Constructor.java b/src/main/java/net/oneandone/pommes/storage/Constructor.java
new file mode 100644
index 00000000..299484b6
--- /dev/null
+++ b/src/main/java/net/oneandone/pommes/storage/Constructor.java
@@ -0,0 +1,11 @@
+package net.oneandone.pommes.storage;
+
+import net.oneandone.pommes.cli.Environment;
+
+import java.io.IOException;
+import java.net.URISyntaxException;
+
+@FunctionalInterface
+public interface Constructor {
+    Storage create(Environment environment, String name, String url) throws URISyntaxException, IOException;
+}
diff --git a/src/main/java/net/oneandone/pommes/storage/FileStorage.java b/src/main/java/net/oneandone/pommes/storage/FileStorage.java
new file mode 100644
index 00000000..ad7cdc63
--- /dev/null
+++ b/src/main/java/net/oneandone/pommes/storage/FileStorage.java
@@ -0,0 +1,144 @@
+/*
+ * Copyright 1&1 Internet AG, https://github.com/1and1/
+ *
+ * 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.
+ */
+package net.oneandone.pommes.storage;
+
+import net.oneandone.inline.ArgumentException;
+import net.oneandone.pommes.cli.Environment;
+import net.oneandone.pommes.cli.Find;
+import net.oneandone.pommes.descriptor.Descriptor;
+import net.oneandone.pommes.descriptor.RawDescriptor;
+import net.oneandone.pommes.scm.Scm;
+import net.oneandone.pommes.scm.ScmUrl;
+import net.oneandone.sushi.fs.Node;
+import net.oneandone.sushi.fs.NodeInstantiationException;
+import net.oneandone.sushi.fs.file.FileNode;
+import net.oneandone.sushi.fs.filter.Filter;
+
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.List;
+
+/** To search files system and subversion */
+public class FileStorage extends TreeStorage<FileStorage.Repo, FileNode> {
+    public record Repo(FileNode directory, Scm scm) {
+    }
+
+    public static Descriptor probe(Environment environment, String storageName, FileNode checkout) throws IOException {
+        FileStorage storage;
+        List<Repo> dest;
+
+        storage = new FileStorage(environment, storageName, checkout);
+        dest = new ArrayList<>(2);
+        storage.scan(checkout, false, dest);
+        return switch (dest.size()) {
+            case 0 -> null;
+            case 1 -> storage.load(dest.get(0));
+            default -> throw new IOException("ambiguous: " + dest);
+        };
+    }
+
+    public static FileStorage create(Environment environment, String name, String url) throws URISyntaxException, NodeInstantiationException {
+        Node<?> node = Find.fileOrNode(environment.world(), url);
+        if (node instanceof FileNode file) {
+            return new FileStorage(environment, name, file);
+        } else {
+            throw new URISyntaxException(url, "file expected");
+        }
+    }
+
+    //--
+
+    private final FileNode root;
+    private final Filter exclude;
+
+    public FileStorage(Environment environment, String name, FileNode root) {
+        super(environment, name);
+        this.root = root;
+        this.exclude = new Filter();
+    }
+
+    @Override
+    public void addExclude(String str) {
+        if (str.startsWith("/") || str.endsWith("/")) {
+            throw new ArgumentException("do not use '/' before or after excludes: " + str);
+        }
+        exclude.include("**/" + str);
+    }
+
+    @Override
+    public List<Repo> list() throws IOException {
+        List<Repo> result = new ArrayList<>();
+        scan(root, true, result);
+        return result;
+    }
+
+    public void scan(FileNode directory, boolean recurse, List<Repo> dest) throws IOException {
+        if (!directory.isDirectory()) {
+            return;
+        }
+        if (exclude.matches(directory.getPath())) {
+            return;
+        }
+        Scm scm = Scm.probeCheckout(directory);
+        if (scm != null) {
+            dest.add(new Repo(directory, scm));
+            return;
+        }
+        if (recurse) {
+            // recurse
+            for (FileNode child : directory.list()) {
+                scan(child, true, dest);
+            }
+        }
+    }
+
+
+    @Override
+    public List<FileNode> listRoot(Repo entry) throws IOException {
+        return entry.directory().list();
+    }
+
+    @Override
+    public String fileName(FileNode file) {
+        return file.getName();
+    }
+
+    @Override
+    public ScmUrl storageUrl(Repo repository) throws IOException {
+        return repository.scm().getUrl(repository.directory());
+    }
+
+    @Override
+    public String repositoryPath(Repo repository, FileNode file) throws IOException {
+        return file.getPath();
+    }
+
+    @Override
+    public Node<?> localFile(Repo repository, FileNode file) throws IOException {
+        return file;
+    }
+
+    @Override
+    public String fileRevision(Repo repository, FileNode fileNode, Node<?> local) throws IOException {
+        return Long.toString(fileNode.getLastModified());
+    }
+
+    @Override
+    public Descriptor createDefault(Repo entry) throws IOException {
+        return RawDescriptor.createOpt(name, entry.directory());
+    }
+}
diff --git a/src/main/java/net/oneandone/pommes/storage/GiteaProject.java b/src/main/java/net/oneandone/pommes/storage/GiteaProject.java
new file mode 100644
index 00000000..bcd8746b
--- /dev/null
+++ b/src/main/java/net/oneandone/pommes/storage/GiteaProject.java
@@ -0,0 +1,45 @@
+package net.oneandone.pommes.storage;
+
+import io.gitea.ApiException;
+import io.gitea.api.RepositoryApi;
+import io.gitea.model.ContentsResponse;
+import net.oneandone.pommes.cli.Environment;
+import net.oneandone.pommes.descriptor.Descriptor;
+import net.oneandone.pommes.scm.GitUrl;
+import net.oneandone.sushi.fs.memory.MemoryNode;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
+import java.util.List;
+
+public record GiteaProject(String org, String repo, String ref) {
+    public List<ContentsResponse> list(RepositoryApi repositoryApi) throws IOException, ApiException {
+        return repositoryApi.repoGetContentsList(org, repo, ref).stream().filter(c -> "file".equals(c.getType())).toList();
+    }
+
+    public Descriptor create(ContentsResponse contents, Descriptor.Creator creator, Environment environment, String hostname, RepositoryApi repositoryApi)
+            throws IOException, ApiException {
+        contents = repositoryApi.repoGetContents(org, repo, contents.getPath(), ref);
+        String str = contents.getContent();
+        if ("base64".equals(contents.getEncoding())) {
+            str = new String(Base64.getDecoder().decode(str.getBytes(StandardCharsets.UTF_8)), StandardCharsets.UTF_8);
+        } else if (contents.getEncoding() != null) {
+            throw new IllegalStateException(contents.getEncoding());
+        }
+        MemoryNode tmp = environment.world().memoryNode(str);
+        return creator.create(environment, tmp, repo, org + "/" + repo + "/" + contents.getPath(), tmp.sha(),
+                GitUrl.create("ssh://gitea@" + hostname + "/" + org + "/" + repo + ".git"));
+    }
+
+    public MemoryNode localFile(ContentsResponse contents, Environment environment, RepositoryApi repositoryApi) throws ApiException {
+        contents = repositoryApi.repoGetContents(org, repo, contents.getPath(), ref);
+        String str = contents.getContent();
+        if ("base64".equals(contents.getEncoding())) {
+            str = new String(Base64.getDecoder().decode(str.getBytes(StandardCharsets.UTF_8)), StandardCharsets.UTF_8);
+        } else if (contents.getEncoding() != null) {
+            throw new IllegalStateException(contents.getEncoding());
+        }
+        return environment.world().memoryNode(str);
+    }
+}
diff --git a/src/main/java/net/oneandone/pommes/repository/GiteaRepository.java b/src/main/java/net/oneandone/pommes/storage/GiteaStorage.java
similarity index 73%
rename from src/main/java/net/oneandone/pommes/repository/GiteaRepository.java
rename to src/main/java/net/oneandone/pommes/storage/GiteaStorage.java
index 9edc000c..36b65dbc 100644
--- a/src/main/java/net/oneandone/pommes/repository/GiteaRepository.java
+++ b/src/main/java/net/oneandone/pommes/storage/GiteaStorage.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.oneandone.pommes.repository;
+package net.oneandone.pommes.storage;
 
 import io.gitea.ApiClient;
 import io.gitea.ApiException;
@@ -21,15 +21,19 @@
 import io.gitea.api.OrganizationApi;
 import io.gitea.api.RepositoryApi;
 import io.gitea.auth.ApiKeyAuth;
+import io.gitea.model.ContentsResponse;
 import io.gitea.model.Organization;
 import net.oneandone.inline.Console;
 import net.oneandone.pommes.cli.Environment;
 import net.oneandone.pommes.descriptor.Descriptor;
+import net.oneandone.pommes.scm.GitUrl;
+import net.oneandone.pommes.scm.ScmUrl;
+import net.oneandone.sushi.fs.Node;
 import net.oneandone.sushi.fs.World;
+import net.oneandone.sushi.fs.memory.MemoryNode;
 import net.oneandone.sushi.util.Strings;
 
 import java.io.IOException;
-import java.io.PrintWriter;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
@@ -42,22 +46,21 @@
 import java.util.concurrent.BlockingQueue;
 
 /** https://developer.atlassian.com/static/rest/bitbucket-server/4.6.2/bitbucket-rest.html */
-public class GiteaRepository extends Repository<GiteaProject> {
+public class GiteaStorage extends TreeStorage<GiteaProject, ContentsResponse> {
     public static void main(String[] args) throws IOException, URISyntaxException, InterruptedException {
         Environment env;
-        GiteaRepository gitea;
+        GiteaStorage gitea;
 
         env = new Environment(Console.create(), World.create());
-        gitea = GiteaRepository.create(env, "reponame", "https://git.ionos.org/CPOPS", null);
+        gitea = GiteaStorage.create(env, "storagename", "https://git.ionos.org/CPOPS");
         BlockingQueue<Descriptor> result = new ArrayBlockingQueue<>(1000);
         gitea.scan(result, env.console());
         for (var d : result) {
-            System.out.println(" " + d.load(env));
+            System.out.println(" " + d.load());
         }
     }
 
-    public static GiteaRepository create(Environment environment, String repository, String uriStr, PrintWriter log)
-            throws URISyntaxException {
+    public static GiteaStorage create(Environment environment, String storage, String uriStr) throws URISyntaxException {
         ApiClient gitea;
         URI uri;
         String path;
@@ -81,7 +84,7 @@ public static GiteaRepository create(Environment environment, String repository,
         ApiKeyAuth accessToken = (ApiKeyAuth) gitea.getAuthentication("AccessToken");
         accessToken.setApiKey(environment.lib.properties().giteaKey);
 
-        return new GiteaRepository(environment, repository, uri.getHost(), gitea, selectedOrganization);
+        return new GiteaStorage(environment, storage, uri.getHost(), gitea, selectedOrganization);
     }
 
     private final Environment environment;
@@ -91,8 +94,8 @@ public static GiteaRepository create(Environment environment, String repository,
     private final OrganizationApi organizationApi;
     private final RepositoryApi repositoryApi;
 
-    public GiteaRepository(Environment environment, String repository, String hostname, ApiClient gitea, String selectedOrganization) {
-        super(repository);
+    public GiteaStorage(Environment environment, String storage, String hostname, ApiClient gitea, String selectedOrganization) {
+        super(environment, storage);
         this.environment = environment;
         this.hostname = hostname;
         this.gitea = gitea;
@@ -124,14 +127,48 @@ public List<GiteaProject> list() throws IOException {
     }
 
     @Override
-    public Descriptor load(GiteaProject project) throws IOException {
+    public List<ContentsResponse> listRoot(GiteaProject entry) throws IOException {
         try {
-            return project.scanOpt(environment, hostname, repositoryApi);
+            return entry.list(repositoryApi);
         } catch (ApiException e) {
             throw new IOException(e);
         }
     }
 
+    @Override
+    public String fileName(ContentsResponse file) {
+        return file.getName();
+    }
+
+    @Override
+    public ScmUrl storageUrl(GiteaProject repository) throws IOException {
+        return GitUrl.create("ssh://gitea@" + hostname + "/" + repository.org() + "/" + repository + ".git");
+    }
+
+    @Override
+    public String repositoryPath(GiteaProject repository, ContentsResponse file) throws IOException {
+        return repository.org() + "/" + repository.repo() + "/" + file.getPath();
+    }
+
+    @Override
+    public MemoryNode localFile(GiteaProject repository, ContentsResponse file) throws IOException {
+        try {
+            return repository.localFile(file, environment, repositoryApi);
+        } catch (ApiException e) {
+            throw new IOException(e.getMessage(), e);
+        }
+    }
+
+    @Override
+    public String fileRevision(GiteaProject repository, ContentsResponse contentsResponse, Node<?> local) throws IOException {
+        return local.sha();
+    }
+
+    @Override
+    public Descriptor createDefault(GiteaProject entry) throws IOException {
+        return null; // TODO
+    }
+
     public List<io.gitea.model.Repository> listRepos(String org) throws IOException {
         List<io.gitea.model.Repository> repos;
         Map<String, io.gitea.model.Repository> map;
diff --git a/src/main/java/net/oneandone/pommes/repository/GithubRepository.java b/src/main/java/net/oneandone/pommes/storage/GithubStorage.java
similarity index 76%
rename from src/main/java/net/oneandone/pommes/repository/GithubRepository.java
rename to src/main/java/net/oneandone/pommes/storage/GithubStorage.java
index 4a39dee0..19de00f7 100644
--- a/src/main/java/net/oneandone/pommes/repository/GithubRepository.java
+++ b/src/main/java/net/oneandone/pommes/storage/GithubStorage.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.oneandone.pommes.repository;
+package net.oneandone.pommes.storage;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.DeserializationFeature;
@@ -22,26 +22,26 @@
 import net.oneandone.pommes.descriptor.Descriptor;
 import net.oneandone.pommes.descriptor.RawDescriptor;
 import net.oneandone.pommes.scm.GitUrl;
+import net.oneandone.pommes.scm.ScmUrl;
 import net.oneandone.pommes.scm.ScmUrlException;
 import net.oneandone.sushi.fs.Node;
 import net.oneandone.sushi.fs.NodeInstantiationException;
+import net.oneandone.sushi.fs.file.FileNode;
 import net.oneandone.sushi.fs.http.HttpNode;
 import net.oneandone.sushi.fs.http.model.HeaderList;
 
 import java.io.IOException;
-import java.io.PrintWriter;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.List;
 
 /** https://docs.github.com/de/rest/guides/getting-started-with-the-rest-api */
-public class GithubRepository extends Repository<GithubRepository.GithubRepo> {
+public class GithubStorage extends TreeStorage<GithubStorage.GithubRepo, GithubStorage.GithubFile> {
     private static final int PAGE_SIZE = 30;
 
-    public static GithubRepository create(Environment environment, String name, String url, PrintWriter log)
-            throws IOException, URISyntaxException {
-        return new GithubRepository(environment, name, url);
+    public static GithubStorage create(Environment environment, String name, String url) throws IOException, URISyntaxException {
+        return new GithubStorage(environment, name, url);
     }
 
 
@@ -52,8 +52,8 @@ public static GithubRepository create(Environment environment, String name, Stri
 
     private final List<String> groupsOrUsers;
 
-    public GithubRepository(Environment environment, String name, String urlstr) throws NodeInstantiationException, URISyntaxException {
-        super(name);
+    public GithubStorage(Environment environment, String name, String urlstr) throws NodeInstantiationException, URISyntaxException {
+        super(environment, name);
         // currently hard-coded, other server might need something else ...
         String prefix = "api.";
         URI url = new URI(urlstr);
@@ -123,21 +123,6 @@ public List<GithubRepo> listOrganizationOrUserRepos(String orgOrUser) throws IOE
     private HttpNode page(HttpNode url, int page) {
         return url.withParameter("page", page).withParameter("per_page", PAGE_SIZE);
     }
-    public List<String> files(GithubRepo repo) throws IOException {
-        HttpNode url;
-        String str;
-        List<GithubFile> files;
-        List<String> result;
-
-        result = new ArrayList<>();
-        url = root.join("repos", repo.full_name, "contents"); // caution: not paginated!
-        str = url.readString();
-        files = mapper.readValue(str, new TypeReference<>() {});
-        for (GithubFile file : files) {
-            result.add(file.path);
-        }
-        return result;
-    }
 
     @Override
     public List<GithubRepo> list() throws IOException {
@@ -160,20 +145,45 @@ public HttpNode fileNode(GithubRepo repo, String path) {
     }
 
     @Override
-    public Descriptor load(GithubRepo repo) throws IOException {
-        Descriptor.Creator m;
-        Node<?> node;
-
-        for (String name : files(repo)) {
-            m = Descriptor.match(name);
-            if (m != null) {
-                // TODO: when to delete node?
-                node = environment.world().getTemp().createTempFile();
-                fileNode(repo, name).copyFile(node);
-                return m.create(environment, node, this.name, repo.full_name(), branchRevision(repo, repo.default_branch()), repoUrl(repo));
-            }
-        }
+    public List<GithubFile> listRoot(GithubRepo repo) throws IOException {
+        HttpNode url;
+        String str;
+
+        url = root.join("repos", repo.full_name, "contents"); // caution: not paginated!
+        str = url.readString();
+        return mapper.readValue(str, new TypeReference<>() {});
+    }
 
+    @Override
+    public String fileName(GithubFile file) {
+        return file.path();
+    }
+
+    @Override
+    public ScmUrl storageUrl(GithubRepo repository) throws IOException {
+        return repoUrl(repository);
+    }
+
+    @Override
+    public String repositoryPath(GithubRepo repository, GithubFile file) throws IOException {
+        return repository.full_name();
+    }
+
+    @Override
+    public FileNode localFile(GithubRepo repository, GithubFile file) throws IOException {
+        FileNode local = environment.world().getTemp().createTempFile();
+        fileNode(repository, file.path()).copyFile(local);
+        return local;
+    }
+
+    @Override
+    public String fileRevision(GithubRepo repository, GithubFile githubFile, Node<?> local) throws IOException {
+        // TODO: revision of this very file!?
+        return branchRevision(repository, repository.default_branch());
+    }
+
+    @Override
+    public Descriptor createDefault(GithubRepo repo) throws IOException {
         return new RawDescriptor(name, repo.full_name(), "TODO", repoUrl(repo), repo.url);
     }
 
diff --git a/src/main/java/net/oneandone/pommes/repository/GitlabRepository.java b/src/main/java/net/oneandone/pommes/storage/GitlabStorage.java
similarity index 76%
rename from src/main/java/net/oneandone/pommes/repository/GitlabRepository.java
rename to src/main/java/net/oneandone/pommes/storage/GitlabStorage.java
index c1b1ce9a..4777e2bb 100644
--- a/src/main/java/net/oneandone/pommes/repository/GitlabRepository.java
+++ b/src/main/java/net/oneandone/pommes/storage/GitlabStorage.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.oneandone.pommes.repository;
+package net.oneandone.pommes.storage;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.DeserializationFeature;
@@ -23,21 +23,21 @@
 import net.oneandone.pommes.descriptor.Descriptor;
 import net.oneandone.pommes.descriptor.RawDescriptor;
 import net.oneandone.pommes.scm.GitUrl;
+import net.oneandone.pommes.scm.ScmUrl;
 import net.oneandone.pommes.scm.ScmUrlException;
 import net.oneandone.sushi.fs.Node;
 import net.oneandone.sushi.fs.NodeInstantiationException;
+import net.oneandone.sushi.fs.file.FileNode;
 import net.oneandone.sushi.fs.http.HttpNode;
 
 import java.io.IOException;
-import java.io.PrintWriter;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 
-public class GitlabRepository extends Repository<GitlabRepository.GitlabProject> {
-    public static GitlabRepository create(Environment environment, String repository, String url, PrintWriter log) throws URISyntaxException, IOException {
-        return new GitlabRepository(environment, repository, url);
+public class GitlabStorage extends TreeStorage<GitlabStorage.GitlabProject, GitlabStorage.TreeItem> {
+    public static GitlabStorage create(Environment environment, String storage, String url) throws URISyntaxException, IOException {
+        return new GitlabStorage(environment, storage, url);
     }
 
 
@@ -47,8 +47,8 @@ public static GitlabRepository create(Environment environment, String repository
 
     private final List<String> groupsOrUsers;
 
-    public GitlabRepository(Environment environment, String name, String url) throws NodeInstantiationException {
-        super(name);
+    public GitlabStorage(Environment environment, String name, String url) throws NodeInstantiationException {
+        super(environment, name);
         this.environment = environment;
         this.mapper = new ObjectMapper();
         mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
@@ -124,17 +124,6 @@ public GitlabProject getProject(long id) throws IOException {
         return mapper.readValue(url.readString(), GitlabProject.class);
     }
 
-    public List<String> files(GitlabProject project) throws IOException {
-        HttpNode url;
-        List<TreeItem> items;
-
-        url = root.join("projects", Long.toString(project.id()), "repository/tree");
-        url.withParameter("per_page", 100);
-        url.withParameter("ref", or(project.default_branch(), "main"));
-        items = mapper.readValue(url.readString(), new TypeReference<>() {});
-        return items.stream().map((item) -> "blob".equals(item.type()) ? item.name() : null).filter(Objects::nonNull).toList();
-    }
-
     private static String or(String left, String right) {
         return left != null ? left : right;
     }
@@ -174,24 +163,51 @@ private GitUrl repoUrl(GitlabProject project) throws ScmUrlException {
     }
 
     @Override
-    public Descriptor load(GitlabProject project) throws IOException {
-        Descriptor.Creator m;
-        Node<?> node;
-
-        for (String name : files(project)) {
-            m = Descriptor.match(name);
-            if (m != null) {
-                // TODO: when to delete node?
-                node = environment.world().getTemp().createTempFile();
-                HttpNode url = root.join("projects", Long.toString(project.id()), "repository/files", name, "raw");
-                url = url.withParameter("ref", project.default_branch());
-                url.copyFile(node);
-                return m.create(environment, node, this.name, project.path_with_namespace() + "/" + name,
-                        branchRevision(project, project.default_branch()),  // TODO: could be more accurate with the revision of this very file ...
-                        repoUrl(project));
-            }
-        }
+    public List<GitlabStorage.TreeItem> listRoot(GitlabProject project) throws IOException {
+        HttpNode url;
+        List<TreeItem> items;
+
+        url = root.join("projects", Long.toString(project.id()), "repository/tree");
+        url.withParameter("per_page", 100);
+        url.withParameter("ref", or(project.default_branch(), "main"));
+        items = mapper.readValue(url.readString(), new TypeReference<>() {});
+        return items.stream().filter((item) -> "blob".equals(item.type())).toList();
+    }
+
+    @Override
+    public String fileName(GitlabStorage.TreeItem file) {
+        return file.name();
+    }
+
+    @Override
+    public ScmUrl storageUrl(GitlabProject repository) throws IOException {
+        return repoUrl(repository);
+    }
+
+    @Override
+    public String repositoryPath(GitlabProject repository, GitlabStorage.TreeItem file) throws IOException {
+        return repository.path_with_namespace() + "/" + file.name();
+    }
+
+    @Override
+    public FileNode localFile(GitlabProject repository, TreeItem file) throws IOException {
+        FileNode local;
+
+        local = environment.world().getTemp().createTempFile();
+        HttpNode url = root.join("projects", Long.toString(repository.id()), "repository/files", file.name(), "raw");
+        url = url.withParameter("ref", repository.default_branch());
+        url.copyFile(local);
+        return local;
+    }
 
+    @Override
+    public String fileRevision(GitlabProject repository, TreeItem treeItem, Node<?> local) throws IOException {
+        // TODO: could be more accurate with the revision of this very file ...
+        return branchRevision(repository, repository.default_branch());
+    }
+
+    @Override
+    public Descriptor createDefault(GitlabProject project) throws IOException {
         return new RawDescriptor(name, project.path_with_namespace(), "TODO", repoUrl(project), project.web_url);
     }
 
diff --git a/src/main/java/net/oneandone/pommes/repository/JsonRepository.java b/src/main/java/net/oneandone/pommes/storage/JsonStorage.java
similarity index 73%
rename from src/main/java/net/oneandone/pommes/repository/JsonRepository.java
rename to src/main/java/net/oneandone/pommes/storage/JsonStorage.java
index e5fa23d6..eb070156 100644
--- a/src/main/java/net/oneandone/pommes/repository/JsonRepository.java
+++ b/src/main/java/net/oneandone/pommes/storage/JsonStorage.java
@@ -13,11 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.oneandone.pommes.repository;
+package net.oneandone.pommes.storage;
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonParser;
+import net.oneandone.inline.Console;
 import net.oneandone.pommes.cli.Environment;
 import net.oneandone.pommes.cli.Find;
 import net.oneandone.pommes.database.Project;
@@ -30,29 +31,34 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.io.PrintWriter;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.BlockingQueue;
 import java.util.zip.GZIPInputStream;
 
-public class JsonRepository extends Repository<Descriptor> {
-    public static JsonRepository createJson(Environment environment, String name, String url, PrintWriter log) throws URISyntaxException, NodeInstantiationException {
-        return new JsonRepository(name, Find.fileOrNode(environment.world(), url));
+public class JsonStorage extends Storage {
+    public static JsonStorage createJson(Environment environment, String name, String url) throws URISyntaxException, NodeInstantiationException {
+        return new JsonStorage(name, Find.fileOrNode(environment.world(), url));
     }
 
-    public static JsonRepository createInline(Environment environment, String name, String url, PrintWriter log) {
-        return new JsonRepository(name, environment.world().memoryNode("[ " + url + " ]"));
+    public static JsonStorage createInline(Environment environment, String name, String url) {
+        return new JsonStorage(name, environment.world().memoryNode("[ " + url + " ]"));
     }
 
-    private final Node node;
+    private final Node<?> node;
 
-    public JsonRepository(String name, Node node) {
+    public JsonStorage(String name, Node<?> node) {
         super(name);
         this.node = node;
     }
 
-    @Override
+    public void scan(BlockingQueue<Descriptor> dest, Console console) throws IOException, InterruptedException {
+        for (Descriptor descriptor : list()) {
+            dest.put(descriptor);
+        }
+    }
+
     public List<Descriptor> list() throws IOException {
         List<Descriptor> result = new ArrayList<>();
         JsonArray array;
@@ -73,9 +79,4 @@ public List<Descriptor> list() throws IOException {
         }
         return result;
     }
-
-    @Override
-    public Descriptor load(Descriptor descriptor) throws IOException {
-        return descriptor; // TODO
-    }
 }
diff --git a/src/main/java/net/oneandone/pommes/storage/Storage.java b/src/main/java/net/oneandone/pommes/storage/Storage.java
new file mode 100644
index 00000000..143e06ea
--- /dev/null
+++ b/src/main/java/net/oneandone/pommes/storage/Storage.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright 1&1 Internet AG, https://github.com/1and1/
+ *
+ * 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.
+ */
+package net.oneandone.pommes.storage;
+
+import net.oneandone.inline.ArgumentException;
+import net.oneandone.inline.Console;
+import net.oneandone.pommes.cli.Environment;
+import net.oneandone.pommes.descriptor.Descriptor;
+import net.oneandone.sushi.fs.file.FileNode;
+
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.BlockingQueue;
+
+/** A place to get descriptors from. Can list repositories, which in turn can list files. */
+public abstract class Storage {
+    private static Map<String, Constructor> types;
+    static {
+        types = new HashMap<>();
+        types.put("artifactory", ArtifactoryStorage::create);
+        types.put("bitbucket", BitbucketStorage::create);
+        types.put("file", FileStorage::create);
+        types.put("gitea", GiteaStorage::create);
+        types.put("github", GithubStorage::create);
+        types.put("gitlab", GitlabStorage::create);
+        types.put("json", JsonStorage::createJson);
+        types.put("inline", JsonStorage::createInline);
+    }
+
+    public static Storage createStorage(Environment environment, String name, final String scmurl) throws URISyntaxException, IOException {
+        int idx;
+        FileNode file;
+        Constructor constructor;
+
+        idx = scmurl.indexOf(':');
+        if (idx >= 0) {
+            constructor = types.get(scmurl.substring(0, idx));
+            if (constructor != null) {
+                return constructor.create(environment, name, scmurl.substring(idx + 1));
+            }
+        }
+        file = environment.world().file(scmurl);
+        if (file.exists()) {
+            return new FileStorage(environment, name, file);
+        }
+        throw new ArgumentException("storage " + name + ": unknown storage type: " + scmurl);
+    }
+
+    protected final String name;
+
+    public Storage(String name) {
+        this.name = name;
+    }
+
+
+    // override to return a host name if storage can handle token
+    public String getTokenHost() {
+        return null;
+    }
+    // override if getTokenHost is overridden
+    public void setToken(String token) {
+        throw new IllegalStateException("token not supported");
+    }
+
+    public void addOption(String option) {
+        throw new ArgumentException(name + ": unknown option: " + option);
+    }
+
+    public void addExclude(String exclude) {
+        throw new ArgumentException(name + ": excludes not supported: " + exclude);
+    }
+
+    //--
+
+    public abstract void scan(BlockingQueue<Descriptor> dest, Console console) throws IOException, InterruptedException;
+}
diff --git a/src/main/java/net/oneandone/pommes/storage/TreeStorage.java b/src/main/java/net/oneandone/pommes/storage/TreeStorage.java
new file mode 100644
index 00000000..412a9056
--- /dev/null
+++ b/src/main/java/net/oneandone/pommes/storage/TreeStorage.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright 1&1 Internet AG, https://github.com/1and1/
+ *
+ * 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.
+ */
+package net.oneandone.pommes.storage;
+
+import net.oneandone.inline.Console;
+import net.oneandone.pommes.cli.Environment;
+import net.oneandone.pommes.descriptor.Descriptor;
+import net.oneandone.pommes.scm.ScmUrl;
+import net.oneandone.sushi.fs.Node;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.concurrent.BlockingQueue;
+
+/** Storage organized as hierarchy of repositories and files */
+public abstract class TreeStorage<R, F> extends Storage {
+    private final Environment environment;
+
+    public TreeStorage(Environment environment, String name) {
+        super(name);
+        this.environment = environment;
+    }
+
+    public void scan(BlockingQueue<Descriptor> dest, Console console) throws IOException, InterruptedException {
+        console.info.print("collecting repositories ...");
+        console.info.flush();
+        List<R> repositories = list();
+        console.info.println(" done: " + repositories.size());
+        for (R repository : repositories) {
+            try {
+                var descriptor = load(repository);
+                if (descriptor != null) {
+                    dest.put(descriptor);
+                }
+            } catch (IOException e) {
+                console.error.println("cannot load descriptor from repository " + repository + ": " + e.getMessage());
+                e.printStackTrace(console.verbose);
+            }
+        }
+    }
+
+    /** Load descriptor from repository. */
+    public Descriptor load(R repository) throws IOException {
+        for (F file : listRoot(repository)) {
+            var creator = Descriptor.match(fileName(file));
+            if (creator != null) {
+                // TODO: when to delete directory?
+                Node<?> local = localFile(repository, file);
+                return creator.create(environment, local, this.name,
+                        repositoryPath(repository, file), fileRevision(repository, file, local), storageUrl(repository));
+            }
+        }
+        return createDefault(repository);
+    }
+
+    //--
+
+    /** List repositories in the storage */
+    public abstract List<R> list() throws IOException;
+
+    /** list top-level files in the repository */
+    public abstract List<F> listRoot(R repository) throws IOException;
+    public abstract String fileName(F file);
+    public abstract Descriptor createDefault(R repository) throws IOException;
+
+    public abstract ScmUrl storageUrl(R repository) throws IOException;
+
+    // TODO: rename?
+    public abstract String repositoryPath(R repository, F file) throws IOException;
+
+    public abstract Node<?> localFile(R repository, F file) throws IOException;
+    public abstract String fileRevision(R repository, F f, Node<?> local) throws IOException;
+}
diff --git a/src/test/java/net/oneandone/pommes/database/ProjectTest.java b/src/test/java/net/oneandone/pommes/database/ProjectTest.java
index 059764bf..d19457ac 100644
--- a/src/test/java/net/oneandone/pommes/database/ProjectTest.java
+++ b/src/test/java/net/oneandone/pommes/database/ProjectTest.java
@@ -29,7 +29,7 @@ public void json() {
 
         obj = JsonParser.parseString(
                 "  {\n" +
-                "    \"repository\": \"r\",\n" +
+                "    \"storage\": \"r\",\n" +
                 "    \"path\": \"p\",\n" +
                 "    \"revision\": \"32\",\n" +
                 "    \"parent\": \"net.oneandone.maven.poms:lazy-foss-parent:1.0.1\",\n" +
diff --git a/src/test/java/net/oneandone/pommes/repository/GithubRepositoryIT.java b/src/test/java/net/oneandone/pommes/storage/GithubStorageIT.java
similarity index 80%
rename from src/test/java/net/oneandone/pommes/repository/GithubRepositoryIT.java
rename to src/test/java/net/oneandone/pommes/storage/GithubStorageIT.java
index 7f8fa975..dc895040 100644
--- a/src/test/java/net/oneandone/pommes/repository/GithubRepositoryIT.java
+++ b/src/test/java/net/oneandone/pommes/storage/GithubStorageIT.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.oneandone.pommes.repository;
+package net.oneandone.pommes.storage;
 
 import net.oneandone.inline.Console;
 import net.oneandone.pommes.cli.Environment;
@@ -26,14 +26,14 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-public class GithubRepositoryIT {
-    private GithubRepository repository() throws IOException {
+public class GithubStorageIT {
+    private GithubStorage storage() throws IOException {
         Environment environment;
-        GithubRepository hub;
+        GithubStorage hub;
 
         environment = new Environment(Console.create(), World.create());
         try {
-            hub = GithubRepository.create(environment, "name", "https://api.github.com", null);
+            hub = GithubStorage.create(environment, "name", "https://github.com");
         } catch (URISyntaxException e) {
             throw new IOException(e);
         }
@@ -42,28 +42,28 @@ private GithubRepository repository() throws IOException {
 
     @Test
     public void repo() throws IOException {
-        var hub = repository();
+        var hub = storage();
         var repo = hub.getRepo("mlhartme", "pommes");
         assertEquals("pommes", repo.name());
         assertTrue(repo.clone_url().startsWith("https://"));
         var pom = hub.fileNode(repo, "pom.xml").readString();
-        assertTrue(hub.files(repo).contains("pom.xml"));
+        assertTrue(hub.listRoot(repo).stream().map(GithubStorage.GithubFile::path).toList().contains("pom.xml"));
         assertTrue(pom.startsWith("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"), pom);
         var descriptor = hub.load(repo);
-        var project = descriptor.load(new Environment(Console.create(), World.create()));
+        var project = descriptor.load();
         System.out.println("" + project.revision);
         assertEquals("net.oneandone:pommes", project.artifact.toGaString());
     }
 
     @Test
     public void orgOrgRepos() throws IOException {
-        var hub = repository();
+        var hub = storage();
         var repo = hub.listOrganizationOrUserRepos("1and1");
         assertTrue(repo.size() > 100);
     }
     @Test
     public void orgUserRepos() throws IOException {
-        var hub = repository();
+        var hub = storage();
         var repo = hub.listOrganizationOrUserRepos("~mlhartme");
         assertEquals(26, repo.size());
     }
diff --git a/src/test/java/net/oneandone/pommes/repository/GitlabRepositoryIT.java b/src/test/java/net/oneandone/pommes/storage/GitlabStorageIT.java
similarity index 79%
rename from src/test/java/net/oneandone/pommes/repository/GitlabRepositoryIT.java
rename to src/test/java/net/oneandone/pommes/storage/GitlabStorageIT.java
index 5c0fac86..88000bb5 100644
--- a/src/test/java/net/oneandone/pommes/repository/GitlabRepositoryIT.java
+++ b/src/test/java/net/oneandone/pommes/storage/GitlabStorageIT.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.oneandone.pommes.repository;
+package net.oneandone.pommes.storage;
 
 import net.oneandone.inline.Console;
 import net.oneandone.pommes.cli.Environment;
@@ -25,19 +25,19 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class GitlabRepositoryIT {
-    private GitlabRepository repository() throws IOException {
+public class GitlabStorageIT {
+    private GitlabStorage storage() throws IOException {
         Environment environment;
-        GitlabRepository gitlab;
+        GitlabStorage gitlab;
 
         environment = new Environment(Console.create(), World.create());
-        gitlab = new GitlabRepository(environment, "name", "https://gitlab.com");
+        gitlab = new GitlabStorage(environment, "name", "https://gitlab.com");
         return gitlab;
     }
 
     @Test
     public void listGroups() throws IOException {
-        var gitlab = repository();
+        var gitlab = storage();
         var lst = gitlab.listGroupOrUserProjects("jeffster");
         System.out.println("common-tools: " + lst.size());
         for (var g : lst) {
@@ -48,17 +48,17 @@ public void listGroups() throws IOException {
     @Test
     public void scanOpt() throws IOException {
         Environment environment;
-        GitlabRepository gitlab;
+        GitlabStorage gitlab;
         Descriptor descriptor;
 
         environment = new Environment(Console.create(), World.create());
-        gitlab = new GitlabRepository(environment, "name", "https://gitlab.com");
+        gitlab = new GitlabStorage(environment, "name", "https://gitlab.com");
         var project = gitlab.getProject(41573530);
-        System.out.println("" + gitlab.files(project));
+        System.out.println("" + gitlab.listRoot(project));
         System.out.println("default branch: " + project.default_branch());
         System.out.println("branch revision: " + gitlab.branchRevision(project, project.default_branch()));
         descriptor = gitlab.load(project);
-        var pommes = descriptor.load(environment);
+        var pommes = descriptor.load();
         System.out.println("project: " + project);
         assertEquals("ru.t1.sochilenkov.tm", pommes.artifact.groupId);
         assertEquals("task-manager", pommes.artifact.artifactId);