From 39a91e8bf2af9a7a321d6bb554be008de34dbcdf Mon Sep 17 00:00:00 2001
From: Kai Reinhard <K.Reinhard@micromata.de>
Date: Fri, 14 Dec 2018 06:05:41 +0000
Subject: [PATCH] ...
---
/dev/null | 36 ------------------------------------
settings.gradle | 2 +-
.gitignore | 1 +
README.adoc | 9 +++++----
4 files changed, 7 insertions(+), 41 deletions(-)
diff --git a/.gitignore b/.gitignore
index 223b030..3154bf6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,3 +39,4 @@
borgbutler-core/out
borgbutler-server/out
borgbutler-webapp/node_modules
+borgbutler-webapp/build
diff --git a/README.adoc b/README.adoc
index c1bc059..abd14df 100644
--- a/README.adoc
+++ b/README.adoc
@@ -47,10 +47,11 @@
=== Work with borgbutler-server
==== npm
-1. `cd borgbutler-webapp`
-2. `npm install`
-3. `npm start`
-4. Start borgbutler-server's Main.
+1. `gradle npmBuild`
+2. `cd borgbutler-webapp`
+3. `npm install`
+4. `npm start`
+5. Start borgbutler-server's Main.
=== Ideas
==== 2 factor authentication
diff --git a/borgbutler-core/src/main/java/de/micromata/borgbutler/json/borg/RepositoryMatcher.java b/borgbutler-core/src/main/java/de/micromata/borgbutler/json/borg/RepositoryMatcher.java
deleted file mode 100644
index 4060753..0000000
--- a/borgbutler-core/src/main/java/de/micromata/borgbutler/json/borg/RepositoryMatcher.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package de.micromata.borgbutler.json.borg;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import de.micromata.borgbutler.json.JsonUtils;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.io.Serializable;
-
-public abstract class RepositoryMatcher implements Serializable {
- private static final long serialVersionUID = -3672403959096363628L;
-
- @Getter
- protected Repository repository;
- @Getter
- @Setter
- @JsonIgnore
- protected String originalJson;
-
- public String toString() {
- return JsonUtils.toJson(this, true);
- }
-
- public void updateFrom(RepositoryMatcher from) {
- this.repository = from.repository;
- this.originalJson = from.originalJson;
- }
-
- public boolean matches(String identifier) {
- if (repository == null || identifier == null) {
- return false;
- }
- return identifier.equals(repository.getId()) || identifier.equals(repository.getName())
- || identifier.equals(repository.getLocation());
- }
-}
diff --git a/settings.gradle b/settings.gradle
index 738b884..84c3517 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -17,4 +17,4 @@
project(':borgbutler-webapp').projectDir = "$rootDir/borgbutler-webapp" as File
//startParameter.excludedTaskNames << ':borgbutler-desktop:distTar'
-startParameter.excludedTaskNames << ':borgbutler-main:distTar'
+startParameter.excludedTaskNames << ':borgbutler-server:distTar'
--
Gitblit v1.10.0