From 58be2109088a152bb2d12f1019f7dbab4073923e Mon Sep 17 00:00:00 2001
From: Kai Reinhard <K.Reinhard@micromata.de>
Date: Thu, 24 Jan 2019 07:24:38 +0000
Subject: [PATCH] New demo archives (with /opt dir for testing auto cd into single sub directory entries).
---
borgbutler-core/src/main/java/de/micromata/borgbutler/demo/DemoRepos.java | 14 --------------
borgbutler-core/src/main/resources/demodata/archive-info-borgbutlerdemo-2019-01-12_01-00.json.gz | 0
borgbutler-core/src/main/resources/demodata/archive-list-borgbutlerdemo-2019-01-12_01-00.json.gz | 0
borgbutler-core/README.adoc | 13 +++++++++----
borgbutler-core/src/main/resources/demodata/archive-list-borgbutlerdemo-2019-01-13_01-00.json.gz | 0
borgbutler-core/src/main/resources/demodata/repo-info.json.gz | 0
borgbutler-core/src/main/resources/demodata/archive-info-borgbutlerdemo-2019-01-13_01-00.json.gz | 0
borgbutler-core/src/main/resources/demodata/repo-list.json.gz | 0
8 files changed, 9 insertions(+), 18 deletions(-)
diff --git a/borgbutler-core/README.adoc b/borgbutler-core/README.adoc
index 8589582..1074d70 100644
--- a/borgbutler-core/README.adoc
+++ b/borgbutler-core/README.adoc
@@ -10,7 +10,12 @@
== Development
=== Creating test data
-1. Install virtual debian system
-2. `apt install net-tools curl`
-3. Execute script `./createFiles.sh` on debian host (borg is installed automatically)
-4. See the result files in `out.tar`.
\ No newline at end of file
+1. Install virtual debian system (including user `borgbutler).
+2. Enable ssh:
+ .. Port-forward: Virtual box network settings: [name=SSH], [protocol=TCP], [Host IP=127.0.0.1], [Host Port=2222], [Guest IP=10.0.0.15], [Guest Port=22]
+ .. Connect to virtual machine: `ssh -p 2222 borgbutler@127.0.0.1
+3. `apt install net-tools curl`
+4. Execute script `./createFiles.sh` as root on debian host (borg is installed automatically)
+5. See and get the result files in `out.tar`:
+ .. `cp out.tar /home/borgbutler`
+ .. From host system: `scp -P 2222 borgbutler@127.0.0.1:out.tar`
\ No newline at end of file
diff --git a/borgbutler-core/src/main/java/de/micromata/borgbutler/demo/DemoRepos.java b/borgbutler-core/src/main/java/de/micromata/borgbutler/demo/DemoRepos.java
index 7ba4fa5..5958c63 100644
--- a/borgbutler-core/src/main/java/de/micromata/borgbutler/demo/DemoRepos.java
+++ b/borgbutler-core/src/main/java/de/micromata/borgbutler/demo/DemoRepos.java
@@ -52,20 +52,6 @@
if (!repositoryList.contains(repo))
repositoryList.add(repo);
}
- // Remove duplicate entries (produced by former versions of BorgButler:
- Set<String> set = new HashSet<>();
- Iterator<BorgRepoConfig> it = repositoryList.iterator();
- while(it.hasNext()) {
- BorgRepoConfig repoConfig = it.next();
- if (!StringUtils.startsWith(repoConfig.getRepo(), DEMO_IDENTIFIER)) {
- continue;
- }
- if (set.contains(repoConfig.getRepo())) {
- it.remove();
- } else {
- set.add(repoConfig.getRepo());
- }
- }
}
public static boolean isDemo(String name) {
diff --git a/borgbutler-core/src/main/resources/demodata/archive-info-borgbutlerdemo-2019-01-12_01-00.json.gz b/borgbutler-core/src/main/resources/demodata/archive-info-borgbutlerdemo-2019-01-12_01-00.json.gz
index 769e79d..3108d59 100644
--- a/borgbutler-core/src/main/resources/demodata/archive-info-borgbutlerdemo-2019-01-12_01-00.json.gz
+++ b/borgbutler-core/src/main/resources/demodata/archive-info-borgbutlerdemo-2019-01-12_01-00.json.gz
Binary files differ
diff --git a/borgbutler-core/src/main/resources/demodata/archive-info-borgbutlerdemo-2019-01-13_01-00.json.gz b/borgbutler-core/src/main/resources/demodata/archive-info-borgbutlerdemo-2019-01-13_01-00.json.gz
index 69dd0f5..d282cf8 100644
--- a/borgbutler-core/src/main/resources/demodata/archive-info-borgbutlerdemo-2019-01-13_01-00.json.gz
+++ b/borgbutler-core/src/main/resources/demodata/archive-info-borgbutlerdemo-2019-01-13_01-00.json.gz
Binary files differ
diff --git a/borgbutler-core/src/main/resources/demodata/archive-list-borgbutlerdemo-2019-01-12_01-00.json.gz b/borgbutler-core/src/main/resources/demodata/archive-list-borgbutlerdemo-2019-01-12_01-00.json.gz
index 00cad35..55ede50 100644
--- a/borgbutler-core/src/main/resources/demodata/archive-list-borgbutlerdemo-2019-01-12_01-00.json.gz
+++ b/borgbutler-core/src/main/resources/demodata/archive-list-borgbutlerdemo-2019-01-12_01-00.json.gz
Binary files differ
diff --git a/borgbutler-core/src/main/resources/demodata/archive-list-borgbutlerdemo-2019-01-13_01-00.json.gz b/borgbutler-core/src/main/resources/demodata/archive-list-borgbutlerdemo-2019-01-13_01-00.json.gz
index c9321b9..3513752 100644
--- a/borgbutler-core/src/main/resources/demodata/archive-list-borgbutlerdemo-2019-01-13_01-00.json.gz
+++ b/borgbutler-core/src/main/resources/demodata/archive-list-borgbutlerdemo-2019-01-13_01-00.json.gz
Binary files differ
diff --git a/borgbutler-core/src/main/resources/demodata/repo-info.json.gz b/borgbutler-core/src/main/resources/demodata/repo-info.json.gz
index c8bba90..66b2e8f 100644
--- a/borgbutler-core/src/main/resources/demodata/repo-info.json.gz
+++ b/borgbutler-core/src/main/resources/demodata/repo-info.json.gz
Binary files differ
diff --git a/borgbutler-core/src/main/resources/demodata/repo-list.json.gz b/borgbutler-core/src/main/resources/demodata/repo-list.json.gz
index c60b152..ee4e861 100644
--- a/borgbutler-core/src/main/resources/demodata/repo-list.json.gz
+++ b/borgbutler-core/src/main/resources/demodata/repo-list.json.gz
Binary files differ
--
Gitblit v1.10.0