From f33b54f60f0172c92c6103561356898502af51c4 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Tue, 31 Jul 2018 16:32:16 +0200
Subject: [PATCH 01/51] intial import of repositroy list ui

---
 scm-ui/package.json                           |   2 +
 scm-ui/public/locales/en/repos.json           |   6 +
 scm-ui/src/components/DateFromNow.js          |  32 ++
 .../navigation/PrimaryNavigation.js           |   4 +-
 scm-ui/src/containers/App.css                 |  14 +-
 scm-ui/src/containers/App.js                  |   1 +
 scm-ui/src/containers/App.scss                |  19 +-
 scm-ui/src/containers/Login.js                |   2 +-
 scm-ui/src/containers/Main.js                 |  19 +-
 scm-ui/src/createReduxStore.js                |   2 +
 scm-ui/src/i18n.js                            |   2 +
 .../src/repos/components/RepositoryEntry.js   | 121 ++++++++
 .../repos/components/RepositoryEntryLink.js   |  34 +++
 .../repos/components/RepositoryGroupEntry.js  |  64 ++++
 scm-ui/src/repos/components/RepositoryList.js |  28 ++
 .../src/repos/components/groupByNamespace.js  |  39 +++
 .../repos/components/groupByNamespace.test.js |  74 +++++
 scm-ui/src/repos/containers/Overview.js       |  62 ++++
 scm-ui/src/repos/modules/repos.js             | 104 +++++++
 scm-ui/src/repos/modules/repos.test.js        | 285 ++++++++++++++++++
 scm-ui/src/repos/types/Repositories.js        |  25 ++
 scm-ui/yarn.lock                              |   8 +
 22 files changed, 929 insertions(+), 18 deletions(-)
 create mode 100644 scm-ui/public/locales/en/repos.json
 create mode 100644 scm-ui/src/components/DateFromNow.js
 create mode 100644 scm-ui/src/repos/components/RepositoryEntry.js
 create mode 100644 scm-ui/src/repos/components/RepositoryEntryLink.js
 create mode 100644 scm-ui/src/repos/components/RepositoryGroupEntry.js
 create mode 100644 scm-ui/src/repos/components/RepositoryList.js
 create mode 100644 scm-ui/src/repos/components/groupByNamespace.js
 create mode 100644 scm-ui/src/repos/components/groupByNamespace.test.js
 create mode 100644 scm-ui/src/repos/containers/Overview.js
 create mode 100644 scm-ui/src/repos/modules/repos.js
 create mode 100644 scm-ui/src/repos/modules/repos.test.js
 create mode 100644 scm-ui/src/repos/types/Repositories.js

diff --git a/scm-ui/package.json b/scm-ui/package.json
index bd182cd972..6ce2e8880e 100644
--- a/scm-ui/package.json
+++ b/scm-ui/package.json
@@ -6,10 +6,12 @@
   "dependencies": {
     "bulma": "^0.7.1",
     "classnames": "^2.2.5",
+    "font-awesome": "^4.7.0",
     "history": "^4.7.2",
     "i18next": "^11.4.0",
     "i18next-browser-languagedetector": "^2.2.2",
     "i18next-fetch-backend": "^0.1.0",
+    "moment": "^2.22.2",
     "react": "^16.4.1",
     "react-dom": "^16.4.1",
     "react-i18next": "^7.9.0",
diff --git a/scm-ui/public/locales/en/repos.json b/scm-ui/public/locales/en/repos.json
new file mode 100644
index 0000000000..5117f64928
--- /dev/null
+++ b/scm-ui/public/locales/en/repos.json
@@ -0,0 +1,6 @@
+{
+  "overview": {
+    "title": "Repositories",
+    "subtitle": "Overview of available repositories"
+  }
+}
diff --git a/scm-ui/src/components/DateFromNow.js b/scm-ui/src/components/DateFromNow.js
new file mode 100644
index 0000000000..b47de49a3d
--- /dev/null
+++ b/scm-ui/src/components/DateFromNow.js
@@ -0,0 +1,32 @@
+//@flow
+import React from "react";
+import moment from "moment";
+import { translate } from "react-i18next";
+
+type Props = {
+  date?: string,
+
+  // context props
+  i18n: any
+};
+
+class DateFromNow extends React.Component<Props> {
+  static format(locale: string, date?: string) {
+    let fromNow = "";
+    if (date) {
+      fromNow = moment(date)
+        .locale(locale)
+        .fromNow();
+    }
+    return fromNow;
+  }
+
+  render() {
+    const { i18n, date } = this.props;
+
+    const fromNow = DateFromNow.format(i18n.language, date);
+    return <span>{fromNow}</span>;
+  }
+}
+
+export default translate()(DateFromNow);
diff --git a/scm-ui/src/components/navigation/PrimaryNavigation.js b/scm-ui/src/components/navigation/PrimaryNavigation.js
index 4fff895d90..606f5814ca 100644
--- a/scm-ui/src/components/navigation/PrimaryNavigation.js
+++ b/scm-ui/src/components/navigation/PrimaryNavigation.js
@@ -14,8 +14,8 @@ class PrimaryNavigation extends React.Component<Props> {
       <nav className="tabs is-boxed">
         <ul>
           <PrimaryNavigationLink
-            to="/"
-            activeOnlyWhenExact={true}
+            to="/repos"
+            match="/(repo|repos)"
             label={t("primary-navigation.repositories")}
           />
           <PrimaryNavigationLink
diff --git a/scm-ui/src/containers/App.css b/scm-ui/src/containers/App.css
index a2714191ff..2aa9a4a5ca 100644
--- a/scm-ui/src/containers/App.css
+++ b/scm-ui/src/containers/App.css
@@ -13,9 +13,11 @@
   margin: 0 !important;
   padding: 0 0 0 3.8em !important; }
 
-html, body {
-  background-color: whitesmoke;
-  height: 100%; }
+.main {
+  min-height: calc(100vh - 260px); }
+
+.footer {
+  height: 50px; }
 
 /*! bulma.io v0.7.1 | MIT License | github.com/jgthms/bulma */
 @keyframes spinAround {
@@ -6437,3 +6439,9 @@ label.panel-block {
 .footer {
   background-color: #fafafa;
   padding: 3rem 1.5rem 6rem; }
+
+.box-link-shadow:hover, .box-link-shadow:focus {
+  box-shadow: 0 2px 3px rgba(10, 10, 10, 0.1), 0 0 0 1px #33B2E8; }
+
+.box-link-shadow:active {
+  box-shadow: inset 0 1px 2px rgba(10, 10, 10, 0.2), 0 0 0 1px #33B2E8; }
diff --git a/scm-ui/src/containers/App.js b/scm-ui/src/containers/App.js
index 47b5d7e811..360aa875a9 100644
--- a/scm-ui/src/containers/App.js
+++ b/scm-ui/src/containers/App.js
@@ -12,6 +12,7 @@ import {
 } from "../modules/auth";
 
 import "./App.css";
+import "font-awesome/css/font-awesome.css";
 import "../components/modals/ConfirmAlert.css";
 import { PrimaryNavigation } from "../components/navigation";
 import Loading from "../components/Loading";
diff --git a/scm-ui/src/containers/App.scss b/scm-ui/src/containers/App.scss
index 0b26d6e0f0..ef12b50f75 100644
--- a/scm-ui/src/containers/App.scss
+++ b/scm-ui/src/containers/App.scss
@@ -26,10 +26,23 @@ $blue: #33B2E8;
   padding: 0 0 0 3.8em !important;
 }
 
-html, body {
-  background-color: whitesmoke;
-  height: 100%;
+.main {
+  min-height: calc(100vh - 260px);
+}
+.footer {
+  height: 50px;
 }
 
 // 6. Import the rest of Bulma
 @import "bulma/bulma";
+
+// import at the end, because we need a lot of stuff from bulma/bulma
+.box-link-shadow {
+  &:hover,
+  &:focus {
+    box-shadow: $box-link-hover-shadow;
+  } 
+  &:active {
+    box-shadow: $box-link-active-shadow;
+  }
+}
diff --git a/scm-ui/src/containers/Login.js b/scm-ui/src/containers/Login.js
index d58a892af6..2a895b04f2 100644
--- a/scm-ui/src/containers/Login.js
+++ b/scm-ui/src/containers/Login.js
@@ -98,7 +98,7 @@ class Login extends React.Component<Props, State> {
     }
 
     return (
-      <section className="hero has-background-light">
+      <section className="hero">
         <div className="hero-body">
           <div className="container has-text-centered">
             <div className="column is-4 is-offset-4">
diff --git a/scm-ui/src/containers/Main.js b/scm-ui/src/containers/Main.js
index 536227aec6..c1dcf54908 100644
--- a/scm-ui/src/containers/Main.js
+++ b/scm-ui/src/containers/Main.js
@@ -1,9 +1,9 @@
 //@flow
 import React from "react";
 
-import { Route, withRouter } from "react-router";
+import { Route, Redirect, withRouter } from "react-router";
 
-import Repositories from "../repositories/containers/Repositories";
+import Overview from "../repos/containers/Overview";
 import Users from "../users/containers/Users";
 import Login from "../containers/Login";
 import Logout from "../containers/Logout";
@@ -21,16 +21,17 @@ class Main extends React.Component<Props> {
   render() {
     const { authenticated } = this.props;
     return (
-      <div>
+      <div className="main">
         <Switch>
-          <ProtectedRoute
-            exact
-            path="/"
-            component={Repositories}
-            authenticated={authenticated}
-          />
+          <Redirect exact path="/" to="/repos" />
           <Route exact path="/login" component={Login} />
           <Route path="/logout" component={Logout} />
+          <ProtectedRoute
+            exact
+            path="/repos"
+            component={Overview}
+            authenticated={authenticated}
+          />
           <ProtectedRoute
             exact
             path="/users"
diff --git a/scm-ui/src/createReduxStore.js b/scm-ui/src/createReduxStore.js
index dd16f9cbfc..24e1046b29 100644
--- a/scm-ui/src/createReduxStore.js
+++ b/scm-ui/src/createReduxStore.js
@@ -5,6 +5,7 @@ import { createStore, compose, applyMiddleware, combineReducers } from "redux";
 import { routerReducer, routerMiddleware } from "react-router-redux";
 
 import users from "./users/modules/users";
+import repos from "./repos/modules/repos";
 import auth from "./modules/auth";
 import pending from "./modules/pending";
 import failure from "./modules/failure";
@@ -20,6 +21,7 @@ function createReduxStore(history: BrowserHistory) {
     pending,
     failure,
     users,
+    repos,
     auth
   });
 
diff --git a/scm-ui/src/i18n.js b/scm-ui/src/i18n.js
index 954d47c605..cb8705a746 100644
--- a/scm-ui/src/i18n.js
+++ b/scm-ui/src/i18n.js
@@ -5,6 +5,8 @@ import { reactI18nextModule } from "react-i18next";
 
 const loadPath = process.env.PUBLIC_URL + "/locales/{{lng}}/{{ns}}.json";
 
+// TODO load locales for moment
+
 i18n
   .use(Backend)
   .use(LanguageDetector)
diff --git a/scm-ui/src/repos/components/RepositoryEntry.js b/scm-ui/src/repos/components/RepositoryEntry.js
new file mode 100644
index 0000000000..eceed7c1ff
--- /dev/null
+++ b/scm-ui/src/repos/components/RepositoryEntry.js
@@ -0,0 +1,121 @@
+//@flow
+import React from "react";
+import { Link } from "react-router-dom";
+import injectSheet from "react-jss";
+import type { Repository } from "../types/Repositories";
+import DateFromNow from "../../components/DateFromNow";
+import RepositoryEntryLink from "./RepositoryEntryLink";
+import classNames from "classnames";
+
+import icon from "../../images/blib.jpg";
+
+// TODO we need a variable or something central for the hover
+
+const styles = {
+  outer: {
+    position: "relative"
+  },
+  overlay: {
+    position: "absolute",
+    left: 0,
+    top: 0,
+    bottom: 0,
+    right: 0
+  },
+  inner: {
+    position: "relative",
+    pointerEvents: "none",
+    zIndex: 1
+  },
+  innerLink: {
+    pointerEvents: "all"
+  }
+};
+
+type Props = {
+  repository: Repository,
+  // context props
+  classes: any
+};
+
+class RepositoryEntry extends React.Component<Props> {
+  createLink = (repository: Repository) => {
+    return `/repo/${repository.namespace}/${repository.name}`;
+  };
+
+  renderChangesetsLink = (repository: Repository, repositoryLink: string) => {
+    if (repository._links["changesets"]) {
+      return (
+        <RepositoryEntryLink
+          iconClass="fa-code-fork"
+          to={repositoryLink + "/changesets"}
+        />
+      );
+    }
+    return null;
+  };
+
+  renderSourcesLink = (repository: Repository, repositoryLink: string) => {
+    if (repository._links["sources"]) {
+      return (
+        <RepositoryEntryLink
+          iconClass="fa-code"
+          to={repositoryLink + "/sources"}
+        />
+      );
+    }
+    return null;
+  };
+
+  renderModifyLink = (repository: Repository, repositoryLink: string) => {
+    if (repository._links["update"]) {
+      return (
+        <RepositoryEntryLink
+          iconClass="fa-cog"
+          to={repositoryLink + "/modify"}
+        />
+      );
+    }
+    return null;
+  };
+
+  render() {
+    const { repository, classes } = this.props;
+    const repositoryLink = this.createLink(repository);
+    return (
+      <div className={classNames("box", "box-link-shadow", classes.outer)}>
+        <Link className={classes.overlay} to={repositoryLink} />
+        <article className={classNames("media", classes.inner)}>
+          <figure className="media-left">
+            <p className="image is-64x64">
+              <img src={icon} alt="Logo" />
+            </p>
+          </figure>
+          <div className="media-content">
+            <div className="content">
+              <p>
+                <strong>{repository.name}</strong>
+                <br />
+                {repository.description}
+              </p>
+            </div>
+            <nav className="level is-mobile">
+              <div className="level-left">
+                {this.renderChangesetsLink(repository, repositoryLink)}
+                {this.renderSourcesLink(repository, repositoryLink)}
+                {this.renderModifyLink(repository, repositoryLink)}
+              </div>
+              <div className="level-right is-hidden-mobile">
+                <small className="level-item">
+                  <DateFromNow date={repository.creationDate} />
+                </small>
+              </div>
+            </nav>
+          </div>
+        </article>
+      </div>
+    );
+  }
+}
+
+export default injectSheet(styles)(RepositoryEntry);
diff --git a/scm-ui/src/repos/components/RepositoryEntryLink.js b/scm-ui/src/repos/components/RepositoryEntryLink.js
new file mode 100644
index 0000000000..289ec7d326
--- /dev/null
+++ b/scm-ui/src/repos/components/RepositoryEntryLink.js
@@ -0,0 +1,34 @@
+//@flow
+import React from "react";
+import { Link } from "react-router-dom";
+import injectSheet from "react-jss";
+import classNames from "classnames";
+
+const styles = {
+  link: {
+    pointerEvents: "all"
+  }
+};
+
+type Props = {
+  to: string,
+  iconClass: string,
+
+  // context props
+  classes: any
+};
+
+class RepositoryEntryLink extends React.Component<Props> {
+  render() {
+    const { to, iconClass, classes } = this.props;
+    return (
+      <Link className={classNames("level-item", classes.link)} to={to}>
+        <span className="icon is-small">
+          <i className={classNames("fa", iconClass)} />
+        </span>
+      </Link>
+    );
+  }
+}
+
+export default injectSheet(styles)(RepositoryEntryLink);
diff --git a/scm-ui/src/repos/components/RepositoryGroupEntry.js b/scm-ui/src/repos/components/RepositoryGroupEntry.js
new file mode 100644
index 0000000000..b768577c4e
--- /dev/null
+++ b/scm-ui/src/repos/components/RepositoryGroupEntry.js
@@ -0,0 +1,64 @@
+//@flow
+import React from "react";
+import type { RepositoryGroup } from "../types/Repositories";
+import injectSheet from "react-jss";
+import classNames from "classnames";
+import RepositoryEntry from "./RepositoryEntry";
+
+const styles = {
+  pointer: {
+    cursor: "pointer"
+  }
+};
+
+type Props = {
+  group: RepositoryGroup,
+
+  // context props
+  classes: any
+};
+
+type State = {
+  collapsed: boolean
+};
+
+class RepositoryGroupEntry extends React.Component<Props, State> {
+  constructor(props: Props) {
+    super(props);
+    this.state = {
+      collapsed: false
+    };
+  }
+
+  toggleCollapse = () => {
+    this.setState(prevState => ({
+      collapsed: !prevState.collapsed
+    }));
+  };
+
+  render() {
+    const { group, classes } = this.props;
+    const { collapsed } = this.state;
+
+    const icon = collapsed ? "fa-angle-right" : "fa-angle-down";
+    let content = null;
+    if (!collapsed) {
+      content = group.repositories.map((repository, index) => {
+        return <RepositoryEntry repository={repository} key={index} />;
+      });
+    }
+    return (
+      <div>
+        <h2>
+          <span className={classes.pointer} onClick={this.toggleCollapse}>
+            <i className={classNames("fa", icon)} /> {group.name}
+          </span>
+        </h2>
+        <hr />
+        {content}
+      </div>
+    );
+  }
+}
+
+export default injectSheet(styles)(RepositoryGroupEntry);
diff --git a/scm-ui/src/repos/components/RepositoryList.js b/scm-ui/src/repos/components/RepositoryList.js
new file mode 100644
index 0000000000..c6a8d3b86c
--- /dev/null
+++ b/scm-ui/src/repos/components/RepositoryList.js
@@ -0,0 +1,28 @@
+//@flow
+import React from "react";
+
+import type { Repository } from "../types/Repositories";
+
+import groupByNamespace from "./groupByNamespace";
+import RepositoryGroupEntry from "./RepositoryGroupEntry";
+
+type Props = {
+  repositories: Repository[]
+};
+
+class RepositoryList extends React.Component<Props> {
+  render() {
+    const { repositories } = this.props;
+
+    const groups = groupByNamespace(repositories);
+    return (
+      <div className="content">
+        {groups.map(group => {
+          return <RepositoryGroupEntry group={group} key={group.name} />;
+        })}
+      </div>
+    );
+  }
+}
+
+export default RepositoryList;
diff --git a/scm-ui/src/repos/components/groupByNamespace.js b/scm-ui/src/repos/components/groupByNamespace.js
new file mode 100644
index 0000000000..55dec92391
--- /dev/null
+++ b/scm-ui/src/repos/components/groupByNamespace.js
@@ -0,0 +1,39 @@
+// @flow
+import type { Repository, RepositoryGroup } from "../types/Repositories";
+
+export default function groupByNamespace(
+  repositories: Repository[]
+): RepositoryGroup[] {
+  let groups = {};
+  for (let repository of repositories) {
+    const groupName = repository.namespace;
+
+    let group = groups[groupName];
+    if (!group) {
+      group = {
+        name: groupName,
+        repositories: []
+      };
+      groups[groupName] = group;
+    }
+    group.repositories.push(repository);
+  }
+
+  let groupArray = [];
+  for (let groupName in groups) {
+    const group = groups[groupName];
+    group.repositories.sort(sortByName);
+    groupArray.push(groups[groupName]);
+  }
+  groupArray.sort(sortByName);
+  return groupArray;
+}
+
+function sortByName(a, b) {
+  if (a.name < b.name) {
+    return -1;
+  } else if (a.name > b.name) {
+    return 1;
+  }
+  return 0;
+}
diff --git a/scm-ui/src/repos/components/groupByNamespace.test.js b/scm-ui/src/repos/components/groupByNamespace.test.js
new file mode 100644
index 0000000000..e7d2ffca93
--- /dev/null
+++ b/scm-ui/src/repos/components/groupByNamespace.test.js
@@ -0,0 +1,74 @@
+// @flow
+import groupByNamespace from "./groupByNamespace";
+
+const base = {
+  type: "git",
+  _links: {}
+};
+
+const slartiBlueprintsFjords = {
+  ...base,
+  namespace: "slarti",
+  name: "fjords-blueprints"
+};
+
+const slartiFjords = {
+  ...base,
+  namespace: "slarti",
+  name: "fjords"
+};
+
+const hitchhikerRestand = {
+  ...base,
+  namespace: "hitchhiker",
+  name: "restand"
+};
+const hitchhikerPuzzle42 = {
+  ...base,
+  namespace: "hitchhiker",
+  name: "puzzle42"
+};
+
+const hitchhikerHeartOfGold = {
+  ...base,
+  namespace: "hitchhiker",
+  name: "heartOfGold"
+};
+
+const zaphodMarvinFirmware = {
+  ...base,
+  namespace: "zaphod",
+  name: "marvin-firmware"
+};
+
+it("should group the repositories by their namespace", () => {
+  const repositories = [
+    zaphodMarvinFirmware,
+    slartiBlueprintsFjords,
+    hitchhikerRestand,
+    slartiFjords,
+    hitchhikerHeartOfGold,
+    hitchhikerPuzzle42
+  ];
+
+  const expected = [
+    {
+      name: "hitchhiker",
+      repositories: [
+        hitchhikerHeartOfGold,
+        hitchhikerPuzzle42,
+        hitchhikerRestand
+      ]
+    },
+    {
+      name: "slarti",
+      repositories: [slartiFjords, slartiBlueprintsFjords]
+    },
+    {
+      name: "zaphod",
+      repositories: [zaphodMarvinFirmware]
+    }
+  ];
+
+  expect(groupByNamespace(repositories)).toEqual(expected);
+});
diff --git a/scm-ui/src/repos/containers/Overview.js b/scm-ui/src/repos/containers/Overview.js
new file mode 100644
index 0000000000..f3498d5339
--- /dev/null
+++ b/scm-ui/src/repos/containers/Overview.js
@@ -0,0 +1,62 @@
+// @flow
+import React from "react";
+
+import type { RepositoryCollection } from "../types/Repositories";
+
+import { connect } from "react-redux";
+import { fetchRepos, getRepositoryCollection } from "../modules/repos";
+import { translate } from "react-i18next";
+import { Page } from "../../components/layout";
+import RepositoryList from "../components/RepositoryList";
+
+type Props = {
+  collection: RepositoryCollection,
+
+  // dispatched functions
+  fetchRepos: () => void,
+  // context props
+  t: string => string
+};
+
+class Overview extends React.Component<Props> {
+  componentDidMount() {
+    this.props.fetchRepos();
+  }
+  render() {
+    const { t } = this.props;
+    return (
+      <Page title={t("overview.title")} subtitle={t("overview.subtitle")}>
+        {this.renderList()}
+      </Page>
+    );
+  }
+
+  renderList() {
+    const { collection } = this.props;
+    if (collection) {
+      return (
+        <RepositoryList repositories={collection._embedded.repositories} />
+      );
+    }
+    return null;
+  }
+}
+
+const mapStateToProps = (state, ownProps) => {
+  const collection = getRepositoryCollection(state);
+  return {
+    collection
+  };
+};
+
+const mapDispatchToProps = dispatch => {
+  return {
+    fetchRepos: () => {
+      dispatch(fetchRepos());
+    }
+  };
+};
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(translate("repos")(Overview));
diff --git a/scm-ui/src/repos/modules/repos.js b/scm-ui/src/repos/modules/repos.js
new file mode 100644
index 0000000000..cad3ea5d93
--- /dev/null
+++ b/scm-ui/src/repos/modules/repos.js
@@ -0,0 +1,104 @@
+// @flow
+import { apiClient } from "../../apiclient";
+import * as types from "../../modules/types";
+import type { Action } from "../../types/Action";
+import type { RepositoryCollection } from "../types/Repositories";
+
+export const FETCH_REPOS = "scm/repos/FETCH_REPOS";
+export const FETCH_REPOS_PENDING = `${FETCH_REPOS}_${types.PENDING_SUFFIX}`;
+export const FETCH_REPOS_SUCCESS = `${FETCH_REPOS}_${types.SUCCESS_SUFFIX}`;
+export const FETCH_REPOS_FAILURE = `${FETCH_REPOS}_${types.FAILURE_SUFFIX}`;
+
+const REPOS_URL = "repositories";
+
+export function fetchRepos() {
+  return function(dispatch: any) {
+    dispatch(fetchReposPending());
+    return apiClient
+      .get(REPOS_URL)
+      .then(response => response.json())
+      .then(repositories => {
+        dispatch(fetchReposSuccess(repositories));
+      })
+      .catch(err => {
+        dispatch(fetchReposFailure(err));
+      });
+  };
+}
+
+export function fetchReposPending(): Action {
+  return {
+    type: FETCH_REPOS_PENDING
+  };
+}
+
+export function fetchReposSuccess(repositories: RepositoryCollection): Action {
+  return {
+    type: FETCH_REPOS_SUCCESS,
+    payload: repositories
+  };
+}
+
+export function fetchReposFailure(err: Error): Action {
+  return {
+    type: FETCH_REPOS_FAILURE,
+    payload: err
+  };
+}
+
+// reducer
+
+function normalizeByNamespaceAndName(
+  repositoryCollection: RepositoryCollection
+) {
+  const names = [];
+  const byNames = {};
+  for (const repository of repositoryCollection._embedded.repositories) {
+    const identifier = repository.namespace + "/" + repository.name;
+    names.push(identifier);
+    byNames[identifier] = repository;
+  }
+  return {
+    list: {
+      ...repositoryCollection,
+      _embedded: {
+        repositories: names
+      }
+    },
+    byNames: byNames
+  };
+}
+
+export default function reducer(
+  state: Object = {},
+  action: Action = { type: "UNKNOWN" }
+): Object {
+  switch (action.type) {
+    case FETCH_REPOS_SUCCESS:
+      if (action.payload) {
+        return normalizeByNamespaceAndName(action.payload);
+      } else {
+        // TODO ???
+        return state;
+      }
+    default:
+      return state;
+  }
+}
+
+// selectors
+
+export function getRepositoryCollection(state: Object) {
+  if (state.repos && state.repos.list && state.repos.byNames) {
+    const repositories = [];
+    for (let repositoryName of state.repos.list._embedded.repositories) {
+      repositories.push(state.repos.byNames[repositoryName]);
+    }
+    return {
+      ...state.repos.list,
+      _embedded: {
+        repositories
+      }
+    };
+  }
+}
diff --git a/scm-ui/src/repos/modules/repos.test.js b/scm-ui/src/repos/modules/repos.test.js
new file mode 100644
index 0000000000..272cf9dad6
--- /dev/null
+++ b/scm-ui/src/repos/modules/repos.test.js
@@ -0,0 +1,285 @@
+// @flow
+import configureMockStore from "redux-mock-store";
+import thunk from "redux-thunk";
+import fetchMock from "fetch-mock";
+import reducer, {
+  FETCH_REPOS_PENDING,
+  FETCH_REPOS_SUCCESS,
+  fetchRepos,
+  FETCH_REPOS_FAILURE,
+  fetchReposSuccess,
+  getRepositoryCollection
+} from "./repos";
+import type { Repository, RepositoryCollection } from "../types/Repositories";
+
+const hitchhikerPuzzle42: Repository = {
+  contact: "fourtytwo@hitchhiker.com",
+  creationDate: "2018-07-31T08:58:45.961Z",
+  description: "the answer to life the universe and everything",
+  namespace: "hitchhiker",
+  name: "puzzle42",
+  type: "svn",
+  _links: {
+    self: {
+      href:
+        "http://localhost:8081/scm/api/rest/v2/repositories/hitchhiker/puzzle42"
+    },
+    delete: {
+      href:
+        "http://localhost:8081/scm/api/rest/v2/repositories/hitchhiker/puzzle42"
+    },
+    update: {
+      href:
+        "http://localhost:8081/scm/api/rest/v2/repositories/hitchhiker/puzzle42"
+    },
+    permissions: {
+      href:
+        "http://localhost:8081/scm/api/rest/v2/repositories/hitchhiker/puzzle42/permissions/"
+    },
+    tags: {
+      href:
+        "http://localhost:8081/scm/api/rest/v2/repositories/hitchhiker/puzzle42/tags/"
+    },
+    branches: {
+      href:
+        "http://localhost:8081/scm/api/rest/v2/repositories/hitchhiker/puzzle42/branches/"
+    },
+    changesets: {
+      href:
+        "http://localhost:8081/scm/api/rest/v2/repositories/hitchhiker/puzzle42/changesets/"
+    },
+    sources: {
+      href:
+        "http://localhost:8081/scm/api/rest/v2/repositories/hitchhiker/puzzle42/sources/"
+    }
+  }
+};
+
+const hitchhikerRestatend: Repository = {
+  contact: "restatend@hitchhiker.com",
+  creationDate: "2018-07-31T08:58:32.803Z",
+  description: "restaurant at the end of the universe",
+  namespace: "hitchhiker",
+  name: "restatend",
+  archived: false,
+  type: "git",
+  _links: {
+    self: {
+      href:
+        "http://localhost:8081/scm/api/rest/v2/repositories/hitchhiker/restatend"
+    },
+    delete: {
+      href:
+        "http://localhost:8081/scm/api/rest/v2/repositories/hitchhiker/restatend"
+    },
+    update: {
+      href:
+        "http://localhost:8081/scm/api/rest/v2/repositories/hitchhiker/restatend"
+    },
+    permissions: {
+      href:
+        "http://localhost:8081/scm/api/rest/v2/repositories/hitchhiker/restatend/permissions/"
+    },
+    tags: {
+      href:
+        "http://localhost:8081/scm/api/rest/v2/repositories/hitchhiker/restatend/tags/"
+    },
+    branches: {
+      href:
+        "http://localhost:8081/scm/api/rest/v2/repositories/hitchhiker/restatend/branches/"
+    },
+    changesets: {
+      href:
+        "http://localhost:8081/scm/api/rest/v2/repositories/hitchhiker/restatend/changesets/"
+    },
+    sources: {
+      href:
+        "http://localhost:8081/scm/api/rest/v2/repositories/hitchhiker/restatend/sources/"
+    }
+  }
+};
+
+const slartiFjords: Repository = {
+  contact: "slartibartfast@hitchhiker.com",
+  description: "My award-winning fjords from the Norwegian coast",
+  namespace: "slarti",
+  name: "fjords",
+  type: "hg",
+  creationDate: "2018-07-31T08:59:05.653Z",
+  _links: {
+    self: {
+      href: "http://localhost:8081/scm/api/rest/v2/repositories/slarti/fjords"
+    },
+    delete: {
+      href: "http://localhost:8081/scm/api/rest/v2/repositories/slarti/fjords"
+    },
+    update: {
+      href: "http://localhost:8081/scm/api/rest/v2/repositories/slarti/fjords"
+    },
+    permissions: {
+      href:
+        "http://localhost:8081/scm/api/rest/v2/repositories/slarti/fjords/permissions/"
+    },
+    tags: {
+      href:
+        "http://localhost:8081/scm/api/rest/v2/repositories/slarti/fjords/tags/"
+    },
+    branches: {
+      href:
+        "http://localhost:8081/scm/api/rest/v2/repositories/slarti/fjords/branches/"
+    },
+    changesets: {
+      href:
+        "http://localhost:8081/scm/api/rest/v2/repositories/slarti/fjords/changesets/"
+    },
+    sources: {
+      href:
+        "http://localhost:8081/scm/api/rest/v2/repositories/slarti/fjords/sources/"
+    }
+  }
+};
+
+const repositoryCollection: RepositoryCollection = {
+  page: 0,
+  pageTotal: 1,
+  _links: {
+    self: {
+      href:
+        "http://localhost:8081/scm/api/rest/v2/repositories/?page=0&pageSize=10"
+    },
+    first: {
+      href:
+        "http://localhost:8081/scm/api/rest/v2/repositories/?page=0&pageSize=10"
+    },
+    last: {
+      href:
+        "http://localhost:8081/scm/api/rest/v2/repositories/?page=0&pageSize=10"
+    },
+    create: {
+      href: "http://localhost:8081/scm/api/rest/v2/repositories/"
+    }
+  },
+  _embedded: {
+    repositories: [hitchhikerPuzzle42, hitchhikerRestatend, slartiFjords]
+  }
+};
+
+const repositoryCollectionWithNames: RepositoryCollection = {
+  page: 0,
+  pageTotal: 1,
+  _links: {
+    self: {
+      href:
+        "http://localhost:8081/scm/api/rest/v2/repositories/?page=0&pageSize=10"
+    },
+    first: {
+      href:
+        "http://localhost:8081/scm/api/rest/v2/repositories/?page=0&pageSize=10"
+    },
+    last: {
+      href:
+        "http://localhost:8081/scm/api/rest/v2/repositories/?page=0&pageSize=10"
+    },
+    create: {
+      href: "http://localhost:8081/scm/api/rest/v2/repositories/"
+    }
+  },
+  _embedded: {
+    repositories: [
+      "hitchhiker/puzzle42",
+      "hitchhiker/restatend",
+      "slarti/fjords"
+    ]
+  }
+};
+
+describe("repos fetch", () => {
+  const REPOS_URL = "/scm/api/rest/v2/repositories";
+  const mockStore = configureMockStore([thunk]);
+
+  afterEach(() => {
+    fetchMock.reset();
+    fetchMock.restore();
+  });
+
+  it("should successfully fetch repos", () => {
+    fetchMock.getOnce(REPOS_URL, repositoryCollection);
+
+    const expectedActions = [
+      { type: FETCH_REPOS_PENDING },
+      {
+        type: FETCH_REPOS_SUCCESS,
+        payload: repositoryCollection
+      }
+    ];
+
+    const store = mockStore({});
+
+    return store.dispatch(fetchRepos()).then(() => {
+      expect(store.getActions()).toEqual(expectedActions);
+    });
+  });
+
+  it("should dispatch FETCH_REPOS_FAILURE, it the request fails", () => {
+    fetchMock.getOnce(REPOS_URL, {
+      status: 500
+    });
+
+    const store = mockStore({});
+    return store.dispatch(fetchRepos()).then(() => {
+      const actions = store.getActions();
+      expect(actions[0].type).toEqual(FETCH_REPOS_PENDING);
+      expect(actions[1].type).toEqual(FETCH_REPOS_FAILURE);
+      expect(actions[1].payload).toBeDefined();
+    });
+  });
+});
+
+describe("repos reducer", () => {
+  it("should return empty object, if state and action is undefined", () => {
+    expect(reducer()).toEqual({});
+  });
+
+  it("should return the same state, if the action is undefined", () => {
+    const state = { x: true };
+    expect(reducer(state)).toBe(state);
+  });
+
+  it("should return the same state, if the action is unknown to the reducer", () => {
+    const state = { x: true };
+    expect(reducer(state, { type: "EL_SPECIALE" })).toBe(state);
+  });
+
+  it("should store the repositories by it's namespace and name on FETCH_REPOS_SUCCESS", () => {
+    const newState = reducer({}, fetchReposSuccess(repositoryCollection));
+    expect(newState.list.page).toBe(0);
+    expect(newState.list.pageTotal).toBe(1);
+    expect(newState.list._embedded.repositories).toEqual([
+      "hitchhiker/puzzle42",
+      "hitchhiker/restatend",
+      "slarti/fjords"
+    ]);
+
+    expect(newState.byNames["hitchhiker/puzzle42"]).toBe(hitchhikerPuzzle42);
+    expect(newState.byNames["hitchhiker/restatend"]).toBe(hitchhikerRestatend);
+    expect(newState.byNames["slarti/fjords"]).toBe(slartiFjords);
+  });
+});
+
+describe("repos selectors", () => {
+  it("should return the repositories collection", () => {
+    const state = {
+      repos: {
+        list: repositoryCollectionWithNames,
+        byNames: {
+          "hitchhiker/puzzle42": hitchhikerPuzzle42,
+          "hitchhiker/restatend": hitchhikerRestatend,
+          "slarti/fjords": slartiFjords
+        }
+      }
+    };
+
+    const collection = getRepositoryCollection(state);
+    expect(collection).toEqual(repositoryCollection);
+  });
+});
diff --git a/scm-ui/src/repos/types/Repositories.js b/scm-ui/src/repos/types/Repositories.js
new file mode 100644
index 0000000000..24eefd2cd7
--- /dev/null
+++ b/scm-ui/src/repos/types/Repositories.js
@@ -0,0 +1,25 @@
+//@flow
+import type { Links } from "../../types/hal";
+import type { PagedCollection } from "../../types/Collection";
+
+export type Repository = {
+  namespace: string,
+  name: string,
+  type: string,
+  contact?: string,
+  description?: string,
+  creationDate?: string,
+  lastModified?: string,
+  _links: Links
+};
+
+export type RepositoryCollection = PagedCollection & {
+  _embedded: {
+    repositories: Repository[] | string[]
+  }
+};
+
+export type RepositoryGroup = {
+  name: string,
+  repositories: Repository[]
+};
diff --git a/scm-ui/yarn.lock b/scm-ui/yarn.lock
index 5d252931e5..08df201c59 100644
--- a/scm-ui/yarn.lock
+++ b/scm-ui/yarn.lock
@@ -3104,6 +3104,10 @@ follow-redirects@^1.0.0:
   dependencies:
     debug "^3.1.0"
 
+font-awesome@^4.7.0:
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133"
+
 for-in@^1.0.1, for-in@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
@@ -5216,6 +5220,10 @@ mkdirp@0.5.1, mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdi
   dependencies:
     minimist "0.0.8"
 
+moment@^2.22.2:
+  version "2.22.2"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.2.tgz#3c257f9839fc0e93ff53149632239eb90783ff66"
+
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"

From 6ee0e05e0cb8278bac94275724e6c9c53e963e38 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Wed, 1 Aug 2018 09:40:33 +0200
Subject: [PATCH 02/51] NamespaceAndName should be comparable to allow sort by
 namespaceAndName

---
 .../java/sonia/scm/repository/NamespaceAndName.java   | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/scm-core/src/main/java/sonia/scm/repository/NamespaceAndName.java b/scm-core/src/main/java/sonia/scm/repository/NamespaceAndName.java
index 1aa6f474f0..7b71078f67 100644
--- a/scm-core/src/main/java/sonia/scm/repository/NamespaceAndName.java
+++ b/scm-core/src/main/java/sonia/scm/repository/NamespaceAndName.java
@@ -5,7 +5,7 @@ import com.google.common.base.Strings;
 
 import java.util.Objects;
 
-public class NamespaceAndName {
+public class NamespaceAndName implements Comparable<NamespaceAndName> {
 
   private final String namespace;
   private final String name;
@@ -47,4 +47,13 @@ public class NamespaceAndName {
   public int hashCode() {
     return Objects.hash(namespace, name);
   }
+
+  @Override
+  public int compareTo(NamespaceAndName o) {
+    int result = namespace.compareTo(o.namespace);
+    if (result == 0) {
+      return name.compareTo(o.name);
+    }
+    return result;
+  }
 }

From ea17e536f10fc6918153598cb117499b4b585c9a Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Wed, 1 Aug 2018 09:43:49 +0200
Subject: [PATCH 03/51] change NamespaceStrategy signature to
 createNamespace(Repository)

This change allows us to implement NamespaceStrategies, such as by type (git, hg, svn) or manual defined.
The DefaultNamespaceStrategy accepts now a predefined namespace and only if no namespace was set the username of the currently logged in user is used.
---
 .../sonia/scm/repository/NamespaceStrategy.java     | 13 ++++++++++++-
 .../scm/repository/DefaultNamespaceStrategy.java    | 13 ++++++++++---
 .../scm/repository/DefaultRepositoryManager.java    |  2 +-
 .../repository/DefaultNamespaceStrategyTest.java    | 12 ++++++++++--
 .../repository/DefaultRepositoryManagerTest.java    |  7 +++----
 5 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/scm-core/src/main/java/sonia/scm/repository/NamespaceStrategy.java b/scm-core/src/main/java/sonia/scm/repository/NamespaceStrategy.java
index f972956adf..d3529294ed 100644
--- a/scm-core/src/main/java/sonia/scm/repository/NamespaceStrategy.java
+++ b/scm-core/src/main/java/sonia/scm/repository/NamespaceStrategy.java
@@ -2,7 +2,18 @@ package sonia.scm.repository;
 
 import sonia.scm.plugin.ExtensionPoint;
 
+/**
+ * Strategy to create a namespace for the new repository. Namespaces are used to order and identify repositories.
+ */
 @ExtensionPoint
 public interface NamespaceStrategy {
-  String getNamespace();
+
+  /**
+   * Create new namespace for the given repository.
+   *
+   * @param repository repository
+   *
+   * @return namespace
+   */
+  String createNamespace(Repository repository);
 }
diff --git a/scm-webapp/src/main/java/sonia/scm/repository/DefaultNamespaceStrategy.java b/scm-webapp/src/main/java/sonia/scm/repository/DefaultNamespaceStrategy.java
index 9cf2c8ab20..35a5abea24 100644
--- a/scm-webapp/src/main/java/sonia/scm/repository/DefaultNamespaceStrategy.java
+++ b/scm-webapp/src/main/java/sonia/scm/repository/DefaultNamespaceStrategy.java
@@ -1,17 +1,24 @@
 package sonia.scm.repository;
 
+import com.google.common.base.Strings;
 import org.apache.shiro.SecurityUtils;
 import sonia.scm.plugin.Extension;
 
 /**
- * The DefaultNamespaceStrategy returns the username of the currently logged in user as namespace.
+ * The DefaultNamespaceStrategy returns the predefined namespace of the given repository, if the namespace was not set
+ * the username of the currently loggedin user is used.
+ *
  * @since 2.0.0
  */
 @Extension
 public class DefaultNamespaceStrategy implements NamespaceStrategy {
 
   @Override
-  public String getNamespace() {
-    return SecurityUtils.getSubject().getPrincipal().toString();
+  public String createNamespace(Repository repository) {
+    String namespace = repository.getNamespace();
+    if (Strings.isNullOrEmpty(namespace)) {
+      namespace = SecurityUtils.getSubject().getPrincipal().toString();
+    }
+    return namespace;
   }
 }
diff --git a/scm-webapp/src/main/java/sonia/scm/repository/DefaultRepositoryManager.java b/scm-webapp/src/main/java/sonia/scm/repository/DefaultRepositoryManager.java
index ad6de93b0a..162f825b6a 100644
--- a/scm-webapp/src/main/java/sonia/scm/repository/DefaultRepositoryManager.java
+++ b/scm-webapp/src/main/java/sonia/scm/repository/DefaultRepositoryManager.java
@@ -141,7 +141,7 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager {
 
   public Repository create(Repository repository, boolean initRepository) throws RepositoryException {
     repository.setId(keyGenerator.createKey());
-    repository.setNamespace(namespaceStrategy.getNamespace());
+    repository.setNamespace(namespaceStrategy.createNamespace(repository));
 
     logger.info("create repository {} of type {} in namespace {}", repository.getName(), repository.getType(), repository.getNamespace());
 
diff --git a/scm-webapp/src/test/java/sonia/scm/repository/DefaultNamespaceStrategyTest.java b/scm-webapp/src/test/java/sonia/scm/repository/DefaultNamespaceStrategyTest.java
index dc40d1c1cb..257ae5cff1 100644
--- a/scm-webapp/src/test/java/sonia/scm/repository/DefaultNamespaceStrategyTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/repository/DefaultNamespaceStrategyTest.java
@@ -17,8 +17,16 @@ public class DefaultNamespaceStrategyTest {
 
   @Test
   @SubjectAware(username = "trillian", password = "secret")
-  public void testNamespaceStrategy() {
-    assertEquals("trillian", namespaceStrategy.getNamespace());
+  public void testNamespaceStrategyWithoutPreset() {
+    assertEquals("trillian", namespaceStrategy.createNamespace(new Repository()));
+  }
+
+  @Test
+  @SubjectAware(username = "trillian", password = "secret")
+  public void testNamespaceStrategyWithPreset() {
+    Repository repository = new Repository();
+    repository.setNamespace("awesome");
+    assertEquals("awesome", namespaceStrategy.createNamespace(repository));
   }
 
 }
diff --git a/scm-webapp/src/test/java/sonia/scm/repository/DefaultRepositoryManagerTest.java b/scm-webapp/src/test/java/sonia/scm/repository/DefaultRepositoryManagerTest.java
index 02b25c0735..1f361d4766 100644
--- a/scm-webapp/src/test/java/sonia/scm/repository/DefaultRepositoryManagerTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/repository/DefaultRepositoryManagerTest.java
@@ -40,6 +40,7 @@ import org.apache.shiro.authz.UnauthorizedException;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
+import org.mockito.Mockito;
 import org.mockito.invocation.InvocationOnMock;
 import sonia.scm.HandlerEventType;
 import sonia.scm.Manager;
@@ -65,9 +66,7 @@ import java.util.HashSet;
 import java.util.Set;
 import java.util.Stack;
 
-import static org.hamcrest.Matchers.containsInAnyOrder;
-import static org.hamcrest.Matchers.hasProperty;
-import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -501,7 +500,7 @@ public class DefaultRepositoryManagerTest extends ManagerTestBase<Repository, Re
     configuration.setEnableRepositoryArchive(archiveEnabled);
 
     NamespaceStrategy namespaceStrategy = mock(NamespaceStrategy.class);
-    when(namespaceStrategy.getNamespace()).thenAnswer(invocation -> mockedNamespace);
+    when(namespaceStrategy.createNamespace(Mockito.any(Repository.class))).thenAnswer(invocation -> mockedNamespace);
 
     return new DefaultRepositoryManager(configuration, contextProvider,
       keyGenerator, repositoryDAO, handlerSet, createRepositoryMatcher(), namespaceStrategy);

From 81ec5ae9865b679a2c2c5b7977f761fb0b1cbcb0 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Wed, 1 Aug 2018 09:44:34 +0200
Subject: [PATCH 04/51] order repositories by namespace and name

---
 scm-ui/src/repos/modules/repos.js      | 3 ++-
 scm-ui/src/repos/modules/repos.test.js | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/scm-ui/src/repos/modules/repos.js b/scm-ui/src/repos/modules/repos.js
index cad3ea5d93..ccf6bf4f4e 100644
--- a/scm-ui/src/repos/modules/repos.js
+++ b/scm-ui/src/repos/modules/repos.js
@@ -10,12 +10,13 @@ export const FETCH_REPOS_SUCCESS = `${FETCH_REPOS}_${types.SUCCESS_SUFFIX}`;
 export const FETCH_REPOS_FAILURE = `${FETCH_REPOS}_${types.FAILURE_SUFFIX}`;
 
 const REPOS_URL = "repositories";
+const SORT_BY = "sortBy=namespaceAndName";
 
 export function fetchRepos() {
   return function(dispatch: any) {
     dispatch(fetchReposPending());
     return apiClient
-      .get(REPOS_URL)
+      .get(`${REPOS_URL}?${SORT_BY}`)
       .then(response => response.json())
       .then(repositories => {
         dispatch(fetchReposSuccess(repositories));
diff --git a/scm-ui/src/repos/modules/repos.test.js b/scm-ui/src/repos/modules/repos.test.js
index 272cf9dad6..4ba12d13fa 100644
--- a/scm-ui/src/repos/modules/repos.test.js
+++ b/scm-ui/src/repos/modules/repos.test.js
@@ -194,7 +194,7 @@ const repositoryCollectionWithNames: RepositoryCollection = {
 };
 
 describe("repos fetch", () => {
-  const REPOS_URL = "/scm/api/rest/v2/repositories";
+  const REPOS_URL = "/scm/api/rest/v2/repositories?sortBy=namespaceAndName";
   const mockStore = configureMockStore([thunk]);
 
   afterEach(() => {

From 641b3efd317d5dd9339c186f8a37f83c6af52cc5 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Wed, 1 Aug 2018 09:44:53 +0200
Subject: [PATCH 05/51] added more spacing to repository groups

---
 scm-ui/src/repos/components/RepositoryGroupEntry.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/scm-ui/src/repos/components/RepositoryGroupEntry.js b/scm-ui/src/repos/components/RepositoryGroupEntry.js
index b768577c4e..b0d145c338 100644
--- a/scm-ui/src/repos/components/RepositoryGroupEntry.js
+++ b/scm-ui/src/repos/components/RepositoryGroupEntry.js
@@ -8,6 +8,9 @@ import RepositoryEntry from "./RepositoryEntry";
 const styles = {
   pointer: {
     cursor: "pointer"
+  },
+  repoGroup: {
+    marginBottom: "1em"
   }
 };
 
@@ -48,7 +51,7 @@ class RepositoryGroupEntry extends React.Component<Props, State> {
       });
     }
     return (
-      <div>
+      <div className={classes.repoGroup}>
         <h2>
           <span className={classes.pointer} onClick={this.toggleCollapse}>
             <i className={classNames("fa", icon)} /> {group.name}

From b1c65a3a3c0d8c3c30573619f6e33eb43c8c289e Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Wed, 1 Aug 2018 10:00:53 +0200
Subject: [PATCH 06/51] added loading indicator and handle failures of
 repository overview

---
 scm-ui/public/locales/en/repositories.json    |  7 -----
 scm-ui/src/repos/containers/Overview.js       | 14 ++++++---
 scm-ui/src/repos/modules/repos.js             | 10 ++++++
 scm-ui/src/repos/modules/repos.test.js        | 31 ++++++++++++++++++-
 .../repositories/containers/Repositories.js   | 24 --------------
 5 files changed, 50 insertions(+), 36 deletions(-)
 delete mode 100644 scm-ui/public/locales/en/repositories.json
 delete mode 100644 scm-ui/src/repositories/containers/Repositories.js

diff --git a/scm-ui/public/locales/en/repositories.json b/scm-ui/public/locales/en/repositories.json
deleted file mode 100644
index 4cfd96a25f..0000000000
--- a/scm-ui/public/locales/en/repositories.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "repositories": {
-    "title": "Repositories",
-    "subtitle": "Repositories will be shown here",
-    "body": "Coming soon ..."
-  }
-}
diff --git a/scm-ui/src/repos/containers/Overview.js b/scm-ui/src/repos/containers/Overview.js
index f3498d5339..44949cb5bb 100644
--- a/scm-ui/src/repos/containers/Overview.js
+++ b/scm-ui/src/repos/containers/Overview.js
@@ -4,13 +4,15 @@ import React from "react";
 import type { RepositoryCollection } from "../types/Repositories";
 
 import { connect } from "react-redux";
-import { fetchRepos, getRepositoryCollection } from "../modules/repos";
+import {fetchRepos, getFetchReposFailure, getRepositoryCollection, isFetchReposPending} from "../modules/repos";
 import { translate } from "react-i18next";
 import { Page } from "../../components/layout";
 import RepositoryList from "../components/RepositoryList";
 
 type Props = {
   collection: RepositoryCollection,
+  loading: boolean,
+  error: Error,
 
   // dispatched functions
   fetchRepos: () => void,
@@ -23,9 +25,9 @@ class Overview extends React.Component<Props> {
     this.props.fetchRepos();
   }
   render() {
-    const { t } = this.props;
+    const { error, loading, t } = this.props;
     return (
-      <Page title={t("overview.title")} subtitle={t("overview.subtitle")}>
+      <Page title={t("overview.title")} subtitle={t("overview.subtitle")} loading={loading} error={error}>
         {this.renderList()}
       </Page>
     );
@@ -44,8 +46,12 @@ class Overview extends React.Component<Props> {
 
 const mapStateToProps = (state, ownProps) => {
   const collection = getRepositoryCollection(state);
+  const loading = isFetchReposPending(state);
+  const error = getFetchReposFailure(state);
   return {
-    collection
+    collection,
+    loading,
+    error
   };
 };
 
diff --git a/scm-ui/src/repos/modules/repos.js b/scm-ui/src/repos/modules/repos.js
index ccf6bf4f4e..a70bdd7054 100644
--- a/scm-ui/src/repos/modules/repos.js
+++ b/scm-ui/src/repos/modules/repos.js
@@ -3,6 +3,8 @@ import { apiClient } from "../../apiclient";
 import * as types from "../../modules/types";
 import type { Action } from "../../types/Action";
 import type { RepositoryCollection } from "../types/Repositories";
+import {isPending} from "../../modules/pending";
+import {getFailure} from "../../modules/failure";
 
 export const FETCH_REPOS = "scm/repos/FETCH_REPOS";
 export const FETCH_REPOS_PENDING = `${FETCH_REPOS}_${types.PENDING_SUFFIX}`;
@@ -103,3 +105,11 @@ export function getRepositoryCollection(state: Object) {
     };
   }
 }
+
+export function isFetchReposPending(state: Object) {
+  return isPending(state, FETCH_REPOS);
+}
+
+export function getFetchReposFailure(state: Object) {
+  return getFailure(state, FETCH_REPOS);
+}
diff --git a/scm-ui/src/repos/modules/repos.test.js b/scm-ui/src/repos/modules/repos.test.js
index 4ba12d13fa..1031e9efe0 100644
--- a/scm-ui/src/repos/modules/repos.test.js
+++ b/scm-ui/src/repos/modules/repos.test.js
@@ -8,7 +8,7 @@ import reducer, {
   fetchRepos,
   FETCH_REPOS_FAILURE,
   fetchReposSuccess,
-  getRepositoryCollection
+  getRepositoryCollection, FETCH_REPOS, isFetchReposPending, getFetchReposFailure
 } from "./repos";
 import type { Repository, RepositoryCollection } from "../types/Repositories";
 
@@ -267,6 +267,9 @@ describe("repos reducer", () => {
 });
 
 describe("repos selectors", () => {
+
+  const error = new Error("something goes wrong");
+
   it("should return the repositories collection", () => {
     const state = {
       repos: {
@@ -282,4 +285,30 @@ describe("repos selectors", () => {
     const collection = getRepositoryCollection(state);
     expect(collection).toEqual(repositoryCollection);
   });
+
+  it("should return true, when fetch repos is pending", () => {
+    const state = {
+      pending: {
+        [FETCH_REPOS]: true
+      }
+    };
+    expect(isFetchReposPending(state)).toEqual(true);
+  });
+
+  it("should return false, when fetch repos is not pending", () => {
+    expect(isFetchReposPending({})).toEqual(false);
+  });
+
+  it("should return error when fetch repos did fail", () => {
+    const state = {
+      failure: {
+        [FETCH_REPOS]: error
+      }
+    };
+    expect(getFetchReposFailure(state)).toEqual(error);
+  });
+
+  it("should return undefined when fetch repos did not fail", () => {
+    expect(getFetchReposFailure({})).toBe(undefined);
+  });
 });
diff --git a/scm-ui/src/repositories/containers/Repositories.js b/scm-ui/src/repositories/containers/Repositories.js
deleted file mode 100644
index 162c6cfc4d..0000000000
--- a/scm-ui/src/repositories/containers/Repositories.js
+++ /dev/null
@@ -1,24 +0,0 @@
-// @flow
-import React from "react";
-import { Page } from "../../components/layout";
-import { translate } from "react-i18next";
-
-type Props = {
-  t: string => string
-};
-
-class Repositories extends React.Component<Props> {
-  render() {
-    const { t } = this.props;
-    return (
-      <Page
-        title={t("repositories.title")}
-        subtitle={t("repositories.subtitle")}
-      >
-        {t("repositories.body")}
-      </Page>
-    );
-  }
-}
-
-export default translate("repositories")(Repositories);

From 41170a1c8344bb3dd43e897e391faa5cf9ff0756 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Wed, 1 Aug 2018 11:40:09 +0200
Subject: [PATCH 07/51] Fix error for multiple creation of repositories

---
 .../java/sonia/scm/ManagerDaoAdapter.java     |  7 +++++-
 .../repository/DefaultRepositoryManager.java  | 25 ++++++++++++++++---
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/scm-webapp/src/main/java/sonia/scm/ManagerDaoAdapter.java b/scm-webapp/src/main/java/sonia/scm/ManagerDaoAdapter.java
index b94ce934f6..abc9ab2fd9 100644
--- a/scm-webapp/src/main/java/sonia/scm/ManagerDaoAdapter.java
+++ b/scm-webapp/src/main/java/sonia/scm/ManagerDaoAdapter.java
@@ -4,6 +4,7 @@ import com.github.sdorra.ssp.PermissionCheck;
 import sonia.scm.util.AssertUtil;
 
 import java.util.function.Function;
+import java.util.function.Predicate;
 import java.util.function.Supplier;
 
 public class ManagerDaoAdapter<T extends ModelObject, E extends Exception> {
@@ -38,9 +39,13 @@ public class ManagerDaoAdapter<T extends ModelObject, E extends Exception> {
   }
 
   public T create(T newObject, Supplier<PermissionCheck> permissionCheck, AroundHandler<T, E> beforeCreate, AroundHandler<T, E> afterCreate) throws E {
+    return create(newObject, permissionCheck, beforeCreate, afterCreate, dao::contains);
+  }
+
+  public T create(T newObject, Supplier<PermissionCheck> permissionCheck, AroundHandler<T, E> beforeCreate, AroundHandler<T, E> afterCreate, Predicate<T> existsCheck) throws E {
     permissionCheck.get().check();
     AssertUtil.assertIsValid(newObject);
-    if (dao.contains(newObject)) {
+    if (existsCheck.test(newObject)) {
       throw alreadyExistsException.apply(newObject);
     }
     newObject.setCreationDate(System.currentTimeMillis());
diff --git a/scm-webapp/src/main/java/sonia/scm/repository/DefaultRepositoryManager.java b/scm-webapp/src/main/java/sonia/scm/repository/DefaultRepositoryManager.java
index 6998893652..69e969f9cb 100644
--- a/scm-webapp/src/main/java/sonia/scm/repository/DefaultRepositoryManager.java
+++ b/scm-webapp/src/main/java/sonia/scm/repository/DefaultRepositoryManager.java
@@ -42,14 +42,30 @@ import com.google.inject.Singleton;
 import org.apache.shiro.concurrent.SubjectAwareExecutorService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import sonia.scm.*;
+import sonia.scm.ArgumentIsInvalidException;
+import sonia.scm.ConfigurationException;
+import sonia.scm.HandlerEventType;
+import sonia.scm.ManagerDaoAdapter;
+import sonia.scm.SCMContextProvider;
+import sonia.scm.Type;
 import sonia.scm.config.ScmConfiguration;
 import sonia.scm.security.KeyGenerator;
-import sonia.scm.util.*;
+import sonia.scm.util.AssertUtil;
+import sonia.scm.util.CollectionAppender;
+import sonia.scm.util.HttpUtil;
+import sonia.scm.util.IOUtil;
+import sonia.scm.util.Util;
 
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
-import java.util.*;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadFactory;
@@ -138,7 +154,8 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager {
         }
         fireEvent(HandlerEventType.BEFORE_CREATE, newRepository);
       },
-      newRepository -> fireEvent(HandlerEventType.CREATE, newRepository)
+      newRepository -> fireEvent(HandlerEventType.CREATE, newRepository),
+      newRepository -> repositoryDAO.contains(newRepository.getNamespaceAndName())
     );
   }
 

From 952067acb9233f647fcae4b73f90bcc05b63f7ba Mon Sep 17 00:00:00 2001
From: Philipp Czora <philipp.czora@cloudogu.com>
Date: Wed, 1 Aug 2018 13:54:15 +0200
Subject: [PATCH 08/51] Fixed bug preventing frontend tests to be skipped when
 -DskipTests is set

---
 scm-ui/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scm-ui/pom.xml b/scm-ui/pom.xml
index 58c935ad21..e05c9b0ade 100644
--- a/scm-ui/pom.xml
+++ b/scm-ui/pom.xml
@@ -68,6 +68,7 @@
             </goals>
             <configuration>
               <script>test-ci</script>
+              <skip>${skipTests}</skip>
             </configuration>
           </execution>
         </executions>

From 11e2112e80ba9aee9e38d0c53523403341f973b4 Mon Sep 17 00:00:00 2001
From: Johannes Schnatterer <johannes.schnatterer@cloudogu.com>
Date: Wed, 1 Aug 2018 14:16:08 +0200
Subject: [PATCH 09/51] Adds docs for config and me resources

---
 .../main/java/sonia/scm/api/v2/resources/ConfigResource.java   | 3 +++
 .../src/main/java/sonia/scm/api/v2/resources/MeResource.java   | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ConfigResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ConfigResource.java
index bf3da19416..5dc479b17e 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ConfigResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ConfigResource.java
@@ -18,6 +18,9 @@ import javax.ws.rs.core.Context;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.UriInfo;
 
+/**
+ * RESTful Web Service Resource to manage the configuration.
+ */
 @Path(ConfigResource.CONFIG_PATH_V2)
 public class ConfigResource {
 
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/MeResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/MeResource.java
index 50025d3cdb..f9a32c7ddd 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/MeResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/MeResource.java
@@ -19,6 +19,9 @@ import javax.ws.rs.core.Response;
 import javax.ws.rs.core.UriInfo;
 
 
+/**
+ * RESTful Web Service Resource to get currently logged in users.
+ */
 @Path(MeResource.ME_PATH_V2)
 public class MeResource {
   static final String ME_PATH_V2 = "v2/me/";

From 2953c805f983a1401e74e17102f6e7e0353720f7 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Wed, 1 Aug 2018 14:56:24 +0200
Subject: [PATCH 10/51] implemented paging for repository overview

---
 scm-ui/src/containers/Main.js           |  6 ++
 scm-ui/src/repos/containers/Overview.js | 55 +++++++++++++++++--
 scm-ui/src/repos/modules/repos.js       | 41 ++++++++++----
 scm-ui/src/repos/modules/repos.test.js  | 73 +++++++++++++++++++++++--
 4 files changed, 155 insertions(+), 20 deletions(-)

diff --git a/scm-ui/src/containers/Main.js b/scm-ui/src/containers/Main.js
index c1dcf54908..17504ef1f2 100644
--- a/scm-ui/src/containers/Main.js
+++ b/scm-ui/src/containers/Main.js
@@ -32,6 +32,12 @@ class Main extends React.Component<Props> {
             component={Overview}
             authenticated={authenticated}
           />
+          <ProtectedRoute
+            exact
+            path="/repos/:page"
+            component={Overview}
+            authenticated={authenticated}
+          />
           <ProtectedRoute
             exact
             path="/users"
diff --git a/scm-ui/src/repos/containers/Overview.js b/scm-ui/src/repos/containers/Overview.js
index 44949cb5bb..ab85b04424 100644
--- a/scm-ui/src/repos/containers/Overview.js
+++ b/scm-ui/src/repos/containers/Overview.js
@@ -4,26 +4,48 @@ import React from "react";
 import type { RepositoryCollection } from "../types/Repositories";
 
 import { connect } from "react-redux";
-import {fetchRepos, getFetchReposFailure, getRepositoryCollection, isFetchReposPending} from "../modules/repos";
+import {fetchRepos, fetchReposByLink, fetchReposByPage, getFetchReposFailure, getRepositoryCollection, isFetchReposPending} from "../modules/repos";
 import { translate } from "react-i18next";
 import { Page } from "../../components/layout";
 import RepositoryList from "../components/RepositoryList";
+import Paginator from '../../components/Paginator';
+import {withRouter} from 'react-router-dom';
+import type { History } from "history";
 
 type Props = {
+  page: number,
   collection: RepositoryCollection,
   loading: boolean,
   error: Error,
 
   // dispatched functions
   fetchRepos: () => void,
+  fetchReposByPage: number => void,
+  fetchReposByLink: string => void,
   // context props
-  t: string => string
+  t: string => string,
+  history: History
 };
 
 class Overview extends React.Component<Props> {
   componentDidMount() {
-    this.props.fetchRepos();
+    this.props.fetchReposByPage(this.props.page);
   }
+
+  /**
+   * reflect page transitions in the uri
+   */
+  componentDidUpdate() {
+    const { page, collection } = this.props;
+    if (collection) {
+      // backend starts paging by 0
+      const statePage: number = collection.page + 1;
+      if (page !== statePage) {
+        this.props.history.push(`/repos/${statePage}`);
+      }
+    }
+  };
+
   render() {
     const { error, loading, t } = this.props;
     return (
@@ -34,21 +56,36 @@ class Overview extends React.Component<Props> {
   }
 
   renderList() {
-    const { collection } = this.props;
+    const { collection, fetchReposByLink } = this.props;
     if (collection) {
       return (
-        <RepositoryList repositories={collection._embedded.repositories} />
+        <div>
+          <RepositoryList repositories={collection._embedded.repositories} />
+          <Paginator collection={collection} onPageChange={fetchReposByLink} />
+        </div>
       );
     }
     return null;
   }
 }
 
+const getPageFromProps = props => {
+  let page = props.match.params.page;
+  if (page) {
+    page = parseInt(page, 10);
+  } else {
+    page = 1;
+  }
+  return page;
+};
+
 const mapStateToProps = (state, ownProps) => {
+  const page = getPageFromProps(ownProps);
   const collection = getRepositoryCollection(state);
   const loading = isFetchReposPending(state);
   const error = getFetchReposFailure(state);
   return {
+    page,
     collection,
     loading,
     error
@@ -59,10 +96,16 @@ const mapDispatchToProps = dispatch => {
   return {
     fetchRepos: () => {
       dispatch(fetchRepos());
+    },
+    fetchReposByPage: (page: number) => {
+      dispatch(fetchReposByPage(page))
+    },
+    fetchReposByLink: (link: string) => {
+      dispatch(fetchReposByLink(link))
     }
   };
 };
 export default connect(
   mapStateToProps,
   mapDispatchToProps
-)(translate("repos")(Overview));
+)(translate("repos")(withRouter(Overview)));
diff --git a/scm-ui/src/repos/modules/repos.js b/scm-ui/src/repos/modules/repos.js
index a70bdd7054..92ef8e3922 100644
--- a/scm-ui/src/repos/modules/repos.js
+++ b/scm-ui/src/repos/modules/repos.js
@@ -15,10 +15,32 @@ const REPOS_URL = "repositories";
 const SORT_BY = "sortBy=namespaceAndName";
 
 export function fetchRepos() {
+  return fetchReposByLink(REPOS_URL);
+}
+
+export function fetchReposByPage(page: number) {
+  return fetchReposByLink(`${REPOS_URL}?page=${page - 1}`);
+}
+
+function appendSortByLink(url: string) {
+  if (url.includes(SORT_BY)) {
+    return url;
+  }
+  let urlWithSortBy = url;
+  if (url.includes("?")) {
+    urlWithSortBy += "&";
+  } else {
+    urlWithSortBy += "?";
+  }
+  return urlWithSortBy + SORT_BY;
+}
+
+export function fetchReposByLink(link: string) {
+  const url = appendSortByLink(link);
   return function(dispatch: any) {
     dispatch(fetchReposPending());
     return apiClient
-      .get(`${REPOS_URL}?${SORT_BY}`)
+      .get(url)
       .then(response => response.json())
       .then(repositories => {
         dispatch(fetchReposSuccess(repositories));
@@ -76,16 +98,15 @@ export default function reducer(
   state: Object = {},
   action: Action = { type: "UNKNOWN" }
 ): Object {
-  switch (action.type) {
-    case FETCH_REPOS_SUCCESS:
-      if (action.payload) {
-        return normalizeByNamespaceAndName(action.payload);
-      } else {
-        // TODO ???
-        return state;
-      }
-    default:
+  if (action.type === FETCH_REPOS_SUCCESS) {
+    if (action.payload) {
+      return normalizeByNamespaceAndName(action.payload);
+    } else {
+      // TODO ???
       return state;
+    }
+  } else {
+    return state;
   }
 }
 
diff --git a/scm-ui/src/repos/modules/repos.test.js b/scm-ui/src/repos/modules/repos.test.js
index 1031e9efe0..6535da187a 100644
--- a/scm-ui/src/repos/modules/repos.test.js
+++ b/scm-ui/src/repos/modules/repos.test.js
@@ -8,7 +8,12 @@ import reducer, {
   fetchRepos,
   FETCH_REPOS_FAILURE,
   fetchReposSuccess,
-  getRepositoryCollection, FETCH_REPOS, isFetchReposPending, getFetchReposFailure
+  getRepositoryCollection,
+  FETCH_REPOS,
+  isFetchReposPending,
+  getFetchReposFailure,
+  fetchReposByLink,
+  fetchReposByPage
 } from "./repos";
 import type { Repository, RepositoryCollection } from "../types/Repositories";
 
@@ -203,7 +208,26 @@ describe("repos fetch", () => {
   });
 
   it("should successfully fetch repos", () => {
-    fetchMock.getOnce(REPOS_URL, repositoryCollection);
+    const url = REPOS_URL + "&page=42";
+    fetchMock.getOnce(url, repositoryCollection);
+
+    const expectedActions = [
+      { type: FETCH_REPOS_PENDING },
+      {
+        type: FETCH_REPOS_SUCCESS,
+        payload: repositoryCollection
+      }
+    ];
+
+    const store = mockStore({});
+    return store.dispatch(fetchRepos()).then(() => {
+      expect(store.getActions()).toEqual(expectedActions);
+    });
+  });
+
+  it("should successfully fetch page 42", () => {
+    const url = REPOS_URL + "&page=42";
+    fetchMock.getOnce(url, repositoryCollection);
 
     const expectedActions = [
       { type: FETCH_REPOS_PENDING },
@@ -215,7 +239,49 @@ describe("repos fetch", () => {
 
     const store = mockStore({});
 
-    return store.dispatch(fetchRepos()).then(() => {
+    return store.dispatch(fetchReposByPage(43)).then(() => {
+      expect(store.getActions()).toEqual(expectedActions);
+    });
+  });
+
+  it("should successfully fetch repos from link", () => {
+    fetchMock.getOnce(REPOS_URL, repositoryCollection);
+
+    const expectedActions = [
+      { type: FETCH_REPOS_PENDING },
+      {
+        type: FETCH_REPOS_SUCCESS,
+        payload: repositoryCollection
+      }
+    ];
+
+    const store = mockStore({});
+    return store
+      .dispatch(
+        fetchReposByLink("/repositories?sortBy=namespaceAndName&page=42")
+      )
+      .then(() => {
+        expect(store.getActions()).toEqual(expectedActions);
+      });
+  });
+
+  it("should append sortby parameter and successfully fetch repos from link", () => {
+    fetchMock.getOnce(
+      "/scm/api/rest/v2/repositories?one=1&sortBy=namespaceAndName",
+      repositoryCollection
+    );
+
+    const expectedActions = [
+      { type: FETCH_REPOS_PENDING },
+      {
+        type: FETCH_REPOS_SUCCESS,
+        payload: repositoryCollection
+      }
+    ];
+
+    const store = mockStore({});
+
+    return store.dispatch(fetchReposByLink("/repositories?one=1")).then(() => {
       expect(store.getActions()).toEqual(expectedActions);
     });
   });
@@ -267,7 +333,6 @@ describe("repos reducer", () => {
 });
 
 describe("repos selectors", () => {
-
   const error = new Error("something goes wrong");
 
   it("should return the repositories collection", () => {

From 6dd7397d14e223ee9081d0ccd7f679388f475134 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Wed, 1 Aug 2018 14:58:52 +0200
Subject: [PATCH 11/51] fixed bug in users paging

---
 scm-ui/src/users/containers/Users.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scm-ui/src/users/containers/Users.js b/scm-ui/src/users/containers/Users.js
index c9120ba8ec..d57f2be60f 100644
--- a/scm-ui/src/users/containers/Users.js
+++ b/scm-ui/src/users/containers/Users.js
@@ -50,9 +50,9 @@ class Users extends React.Component<Props> {
   /**
    * reflect page transitions in the uri
    */
-  componentDidUpdate = (prevProps: Props) => {
+  componentDidUpdate() {
     const { page, list } = this.props;
-    if (list.page) {
+    if (list && list.page || list.page === 0) {
       // backend starts paging by 0
       const statePage: number = list.page + 1;
       if (page !== statePage) {

From ac8da1886760d5a9d10700836a31c16b059b5257 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Wed, 1 Aug 2018 18:23:16 +0200
Subject: [PATCH 12/51] start implementation repository details

---
 scm-ui/public/locales/en/repos.json           |   4 +
 scm-ui/src/containers/Main.js                 |   7 ++
 .../src/repos/components/RepositoryDetails.js |  16 +++
 scm-ui/src/repos/containers/RepositoryRoot.js | 108 +++++++++++++++++
 scm-ui/src/repos/modules/repos.js             | 106 +++++++++++++++--
 scm-ui/src/repos/modules/repos.test.js        | 109 ++++++++++++++++--
 scm-ui/src/users/containers/Users.js          |   2 +-
 7 files changed, 335 insertions(+), 17 deletions(-)
 create mode 100644 scm-ui/src/repos/components/RepositoryDetails.js
 create mode 100644 scm-ui/src/repos/containers/RepositoryRoot.js

diff --git a/scm-ui/public/locales/en/repos.json b/scm-ui/public/locales/en/repos.json
index 5117f64928..428f723f37 100644
--- a/scm-ui/public/locales/en/repos.json
+++ b/scm-ui/public/locales/en/repos.json
@@ -2,5 +2,9 @@
   "overview": {
     "title": "Repositories",
     "subtitle": "Overview of available repositories"
+  },
+  "repository-root": {
+    "error-title": "Error",
+    "error-subtitle": "Unknown repository error"
   }
 }
diff --git a/scm-ui/src/containers/Main.js b/scm-ui/src/containers/Main.js
index 17504ef1f2..1c5cface29 100644
--- a/scm-ui/src/containers/Main.js
+++ b/scm-ui/src/containers/Main.js
@@ -12,6 +12,7 @@ import { Switch } from "react-router-dom";
 import ProtectedRoute from "../components/ProtectedRoute";
 import AddUser from "../users/containers/AddUser";
 import SingleUser from "../users/containers/SingleUser";
+import RepositoryRoot from '../repos/containers/RepositoryRoot';
 
 type Props = {
   authenticated?: boolean
@@ -38,6 +39,12 @@ class Main extends React.Component<Props> {
             component={Overview}
             authenticated={authenticated}
           />
+          <ProtectedRoute
+            exact
+            path="/repo/:namespace/:name"
+            component={RepositoryRoot}
+            authenticated={authenticated}
+          />
           <ProtectedRoute
             exact
             path="/users"
diff --git a/scm-ui/src/repos/components/RepositoryDetails.js b/scm-ui/src/repos/components/RepositoryDetails.js
new file mode 100644
index 0000000000..df7fd5083d
--- /dev/null
+++ b/scm-ui/src/repos/components/RepositoryDetails.js
@@ -0,0 +1,16 @@
+//@flow
+import React from "react";
+import type {Repository} from '../types/Repositories';
+
+type Props = {
+  repository: Repository
+};
+
+class RepositoryDetails extends React.Component<Props> {
+  render() {
+    const { repository } = this.props;
+    return <div>{repository.description}</div>;
+  }
+}
+
+export default RepositoryDetails;
diff --git a/scm-ui/src/repos/containers/RepositoryRoot.js b/scm-ui/src/repos/containers/RepositoryRoot.js
new file mode 100644
index 0000000000..65de6b2fa5
--- /dev/null
+++ b/scm-ui/src/repos/containers/RepositoryRoot.js
@@ -0,0 +1,108 @@
+//@flow
+import React from "react";
+import {fetchRepo, getFetchRepoFailure, getRepository, isFetchRepoPending} from '../modules/repos';
+import { connect } from "react-redux";
+import {Route} from "react-router-dom"
+import type {Repository} from '../types/Repositories';
+import {Page} from '../../components/layout';
+import Loading from '../../components/Loading';
+import ErrorPage from '../../components/ErrorPage';
+import { translate } from "react-i18next";
+import {Navigation} from '../../components/navigation';
+import RepositoryDetails from '../components/RepositoryDetails';
+
+type Props = {
+  namespace: string,
+  name: string,
+  repository: Repository,
+  loading: boolean,
+  error: Error,
+
+  // dispatch functions
+  fetchRepo: (namespace: string, name: string) => void,
+
+  // context props
+  t: string => string,
+  match: any
+};
+
+class RepositoryRoot extends React.Component<Props> {
+  componentDidMount() {
+    const { fetchRepo, namespace, name } = this.props;
+
+    fetchRepo(namespace, name);
+  }
+
+  stripEndingSlash = (url: string) => {
+    if (url.endsWith("/")) {
+      return url.substring(0, url.length - 2);
+    }
+    return url;
+  };
+
+  matchedUrl = () => {
+    return this.stripEndingSlash(this.props.match.url);
+  };
+
+
+  render() {
+    const { loading, error, repository, t } = this.props;
+
+    if (error) {
+      return (
+        <ErrorPage
+          title={t("repository-root.error-title")}
+          subtitle={t("repository-root.error-subtitle")}
+          error={error}
+        />
+      );
+    }
+
+    if (!repository || loading) {
+      return <Loading />
+    }
+
+    const url = this.matchedUrl();
+
+    return <Page title={repository.namespace + "/" + repository.name}>
+      <div className="columns">
+        <div className="column is-three-quarters">
+          <Route path={url} exact component={() => <RepositoryDetails repository={repository} />} />
+        </div>
+        <div className="column">
+          <Navigation>
+
+          </Navigation>
+        </div>
+      </div>
+    </Page>
+  }
+}
+
+
+const mapStateToProps = (state, ownProps) => {
+  const { namespace, name } = ownProps.match.params;
+  const repository = getRepository(state, namespace, name);
+  const loading = isFetchRepoPending(state, namespace, name);
+  const error = getFetchRepoFailure(state, namespace, name);
+  return {
+    namespace,
+    name,
+    repository,
+    loading,
+    error
+  };
+};
+
+const mapDispatchToProps = dispatch => {
+  return {
+    fetchRepo : (namespace: string, name: string) => {
+      dispatch(fetchRepo(namespace, name))
+    }
+  };
+};
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(translate("repos")(RepositoryRoot));
diff --git a/scm-ui/src/repos/modules/repos.js b/scm-ui/src/repos/modules/repos.js
index 92ef8e3922..b23cb07a15 100644
--- a/scm-ui/src/repos/modules/repos.js
+++ b/scm-ui/src/repos/modules/repos.js
@@ -2,7 +2,7 @@
 import { apiClient } from "../../apiclient";
 import * as types from "../../modules/types";
 import type { Action } from "../../types/Action";
-import type { RepositoryCollection } from "../types/Repositories";
+import type {Repository, RepositoryCollection} from "../types/Repositories";
 import {isPending} from "../../modules/pending";
 import {getFailure} from "../../modules/failure";
 
@@ -11,7 +11,15 @@ export const FETCH_REPOS_PENDING = `${FETCH_REPOS}_${types.PENDING_SUFFIX}`;
 export const FETCH_REPOS_SUCCESS = `${FETCH_REPOS}_${types.SUCCESS_SUFFIX}`;
 export const FETCH_REPOS_FAILURE = `${FETCH_REPOS}_${types.FAILURE_SUFFIX}`;
 
+export const FETCH_REPO = "scm/repos/FETCH_REPO";
+export const FETCH_REPO_PENDING = `${FETCH_REPO}_${types.PENDING_SUFFIX}`;
+export const FETCH_REPO_SUCCESS = `${FETCH_REPO}_${types.SUCCESS_SUFFIX}`;
+export const FETCH_REPO_FAILURE = `${FETCH_REPO}_${types.FAILURE_SUFFIX}`;
+
 const REPOS_URL = "repositories";
+
+// fetch repos
+
 const SORT_BY = "sortBy=namespaceAndName";
 
 export function fetchRepos() {
@@ -71,15 +79,66 @@ export function fetchReposFailure(err: Error): Action {
   };
 }
 
+// fetch repo
+
+export function fetchRepo(namespace: string, name: string) {
+  return function(dispatch: any) {
+    dispatch(fetchRepoPending(namespace, name));
+    return apiClient.get(`${REPOS_URL}/${namespace}/${name}`)
+      .then(response => response.json())
+      .then( repository => {
+        dispatch(fetchRepoSuccess(repository))
+      } )
+      .catch(err => {
+        dispatch(fetchRepoFailure(namespace, name, err))
+      });
+  }
+}
+
+export function fetchRepoPending(namespace: string, name: string): Action {
+  return {
+    type: FETCH_REPO_PENDING,
+    payload: {
+      namespace,
+      name
+    },
+    itemId: namespace + "/" + name
+  };
+}
+
+export function fetchRepoSuccess(repository: Repository): Action {
+  return {
+    type: FETCH_REPO_SUCCESS,
+    payload: repository,
+    itemId: createIdentifier(repository)
+  };
+}
+
+export function fetchRepoFailure(namespace: string, name: string, error: Error): Action {
+  return {
+    type: FETCH_REPO_FAILURE,
+    payload: {
+      namespace,
+      name,
+      error
+    },
+    itemId: namespace + "/" + name
+  };
+}
+
 // reducer
 
+function createIdentifier(repository: Repository) {
+  return repository.namespace + "/" + repository.name;
+}
+
 function normalizeByNamespaceAndName(
   repositoryCollection: RepositoryCollection
 ) {
   const names = [];
   const byNames = {};
   for (const repository of repositoryCollection._embedded.repositories) {
-    const identifier = repository.namespace + "/" + repository.name;
+    const identifier = createIdentifier(repository);
     names.push(identifier);
     byNames[identifier] = repository;
   }
@@ -94,18 +153,33 @@ function normalizeByNamespaceAndName(
   };
 }
 
+const reducerByNames = (state: Object, repository: Repository) => {
+  const identifier = createIdentifier(repository);
+  const newState = {
+    ...state,
+    byNames: {
+      ...state.byNames,
+      [identifier]: repository
+    }
+  };
+
+  return newState;
+};
+
 export default function reducer(
   state: Object = {},
   action: Action = { type: "UNKNOWN" }
 ): Object {
-  if (action.type === FETCH_REPOS_SUCCESS) {
-    if (action.payload) {
+  if (!action.payload) {
+    return state;
+  }
+
+  switch (action.type) {
+    case FETCH_REPOS_SUCCESS:
       return normalizeByNamespaceAndName(action.payload);
-    } else {
-      // TODO ???
-      return state;
-    }
-  } else {
+    case FETCH_REPO_SUCCESS:
+      return reducerByNames(state, action.payload);
+    default:
     return state;
   }
 }
@@ -134,3 +208,17 @@ export function isFetchReposPending(state: Object) {
 export function getFetchReposFailure(state: Object) {
   return getFailure(state, FETCH_REPOS);
 }
+
+export function getRepository(state: Object, namespace: string, name: string) {
+  if (state.repos && state.repos.byNames) {
+    return state.repos.byNames[ namespace + "/" + name];
+  }
+}
+
+export function isFetchRepoPending(state: Object, namespace: string, name: string) {
+  return isPending(state, FETCH_REPO, namespace + "/" + name);
+}
+
+export function getFetchRepoFailure(state: Object, namespace: string, name: string) {
+  return getFailure(state, FETCH_REPO, namespace + "/" + name);
+}
diff --git a/scm-ui/src/repos/modules/repos.test.js b/scm-ui/src/repos/modules/repos.test.js
index 6535da187a..e214e89520 100644
--- a/scm-ui/src/repos/modules/repos.test.js
+++ b/scm-ui/src/repos/modules/repos.test.js
@@ -13,7 +13,16 @@ import reducer, {
   isFetchReposPending,
   getFetchReposFailure,
   fetchReposByLink,
-  fetchReposByPage
+  fetchReposByPage,
+  FETCH_REPO,
+  fetchRepo,
+  FETCH_REPO_PENDING,
+  FETCH_REPO_SUCCESS,
+  FETCH_REPO_FAILURE,
+  fetchRepoSuccess,
+  getRepository,
+  isFetchRepoPending,
+  getFetchRepoFailure
 } from "./repos";
 import type { Repository, RepositoryCollection } from "../types/Repositories";
 
@@ -199,7 +208,9 @@ const repositoryCollectionWithNames: RepositoryCollection = {
 };
 
 describe("repos fetch", () => {
-  const REPOS_URL = "/scm/api/rest/v2/repositories?sortBy=namespaceAndName";
+  const REPOS_URL = "/scm/api/rest/v2/repositories";
+  const SORT = "sortBy=namespaceAndName";
+  const REPOS_URL_WITH_SORT = REPOS_URL + "?" + SORT;
   const mockStore = configureMockStore([thunk]);
 
   afterEach(() => {
@@ -208,8 +219,7 @@ describe("repos fetch", () => {
   });
 
   it("should successfully fetch repos", () => {
-    const url = REPOS_URL + "&page=42";
-    fetchMock.getOnce(url, repositoryCollection);
+    fetchMock.getOnce(REPOS_URL_WITH_SORT, repositoryCollection);
 
     const expectedActions = [
       { type: FETCH_REPOS_PENDING },
@@ -226,7 +236,7 @@ describe("repos fetch", () => {
   });
 
   it("should successfully fetch page 42", () => {
-    const url = REPOS_URL + "&page=42";
+    const url = REPOS_URL + "?page=42&" + SORT;
     fetchMock.getOnce(url, repositoryCollection);
 
     const expectedActions = [
@@ -245,7 +255,10 @@ describe("repos fetch", () => {
   });
 
   it("should successfully fetch repos from link", () => {
-    fetchMock.getOnce(REPOS_URL, repositoryCollection);
+    fetchMock.getOnce(
+      REPOS_URL + "?" + SORT + "&page=42",
+      repositoryCollection
+    );
 
     const expectedActions = [
       { type: FETCH_REPOS_PENDING },
@@ -287,7 +300,7 @@ describe("repos fetch", () => {
   });
 
   it("should dispatch FETCH_REPOS_FAILURE, it the request fails", () => {
-    fetchMock.getOnce(REPOS_URL, {
+    fetchMock.getOnce(REPOS_URL_WITH_SORT, {
       status: 500
     });
 
@@ -299,6 +312,48 @@ describe("repos fetch", () => {
       expect(actions[1].payload).toBeDefined();
     });
   });
+
+  it("should successfully fetch repo slarti/fjords", () => {
+    fetchMock.getOnce(REPOS_URL + "/slarti/fjords", slartiFjords);
+
+    const expectedActions = [
+      {
+        type: FETCH_REPO_PENDING,
+        payload: {
+          namespace: "slarti",
+          name: "fjords"
+        },
+        itemId: "slarti/fjords"
+      },
+      {
+        type: FETCH_REPO_SUCCESS,
+        payload: slartiFjords,
+        itemId: "slarti/fjords"
+      }
+    ];
+
+    const store = mockStore({});
+    return store.dispatch(fetchRepo("slarti", "fjords")).then(() => {
+      expect(store.getActions()).toEqual(expectedActions);
+    });
+  });
+
+  it("should dispatch FETCH_REPO_FAILURE, it the request for slarti/fjords fails", () => {
+    fetchMock.getOnce(REPOS_URL + "/slarti/fjords", {
+      status: 500
+    });
+
+    const store = mockStore({});
+    return store.dispatch(fetchRepo("slarti", "fjords")).then(() => {
+      const actions = store.getActions();
+      expect(actions[0].type).toEqual(FETCH_REPO_PENDING);
+      expect(actions[1].type).toEqual(FETCH_REPO_FAILURE);
+      expect(actions[1].payload.namespace).toBe("slarti");
+      expect(actions[1].payload.name).toBe("fjords");
+      expect(actions[1].payload.error).toBeDefined();
+      expect(actions[1].itemId).toBe("slarti/fjords");
+    });
+  });
 });
 
 describe("repos reducer", () => {
@@ -330,6 +385,11 @@ describe("repos reducer", () => {
     expect(newState.byNames["hitchhiker/restatend"]).toBe(hitchhikerRestatend);
     expect(newState.byNames["slarti/fjords"]).toBe(slartiFjords);
   });
+
+  it("should store the repo at byNames", () => {
+    const newState = reducer({}, fetchRepoSuccess(slartiFjords));
+    expect(newState.byNames["slarti/fjords"]).toBe(slartiFjords);
+  });
 });
 
 describe("repos selectors", () => {
@@ -376,4 +436,39 @@ describe("repos selectors", () => {
   it("should return undefined when fetch repos did not fail", () => {
     expect(getFetchReposFailure({})).toBe(undefined);
   });
+
+  it("should return the repository collection", () => {
+    const state = {
+      repos: {
+        byNames: {
+          "slarti/fjords": slartiFjords
+        }
+      }
+    };
+
+    const repository = getRepository(state, "slarti", "fjords");
+    expect(repository).toEqual(slartiFjords);
+  });
+
+  it("should return true, when fetch repo is pending", () => {
+    const state = {
+      pending: {
+        [FETCH_REPO + "/slarti/fjords"]: true
+      }
+    };
+    expect(isFetchRepoPending(state, "slarti", "fjords")).toEqual(true);
+  });
+
+  it("should return false, when fetch repo is not pending", () => {
+    expect(isFetchRepoPending({}, "slarti", "fjords")).toEqual(false);
+  });
+
+  it("should return error when fetch repo did fail", () => {
+    const state = {
+      failure: {
+        [FETCH_REPO + "/slarti/fjords"]: error
+      }
+    };
+    expect(getFetchRepoFailure(state, "slarti", "fjords")).toEqual(error);
+  });
 });
diff --git a/scm-ui/src/users/containers/Users.js b/scm-ui/src/users/containers/Users.js
index d57f2be60f..60f104a42d 100644
--- a/scm-ui/src/users/containers/Users.js
+++ b/scm-ui/src/users/containers/Users.js
@@ -52,7 +52,7 @@ class Users extends React.Component<Props> {
    */
   componentDidUpdate() {
     const { page, list } = this.props;
-    if (list && list.page || list.page === 0) {
+    if (list && (list.page || list.page === 0)) {
       // backend starts paging by 0
       const statePage: number = list.page + 1;
       if (page !== statePage) {

From d49c07b9920b142544030868a0c03d48516e7f7a Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Thu, 2 Aug 2018 13:20:37 +0200
Subject: [PATCH 13/51] change collection type hint from array of dto to
 CollectionDto

---
 .../sonia/scm/api/v2/resources/GroupCollectionResource.java     | 2 +-
 .../scm/api/v2/resources/RepositoryCollectionResource.java      | 2 +-
 .../java/sonia/scm/api/v2/resources/UserCollectionResource.java | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupCollectionResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupCollectionResource.java
index 0f68894a64..4a9c797b9f 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupCollectionResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupCollectionResource.java
@@ -42,7 +42,7 @@ public class GroupCollectionResource {
   @GET
   @Path("")
   @Produces(VndMediaType.GROUP_COLLECTION)
-  @TypeHint(GroupDto[].class)
+  @TypeHint(CollectionDto.class)
   @StatusCodes({
     @ResponseCode(code = 200, condition = "success"),
     @ResponseCode(code = 400, condition = "\"sortBy\" field unknown"),
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryCollectionResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryCollectionResource.java
index 7a70957b91..c6d54e7f4e 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryCollectionResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryCollectionResource.java
@@ -40,7 +40,7 @@ public class RepositoryCollectionResource {
   @GET
   @Path("")
   @Produces(VndMediaType.REPOSITORY_COLLECTION)
-  @TypeHint(RepositoryDto[].class)
+  @TypeHint(CollectionDto.class)
   @StatusCodes({
     @ResponseCode(code = 200, condition = "success"),
     @ResponseCode(code = 401, condition = "not authenticated / invalid credentials"),
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserCollectionResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserCollectionResource.java
index ef826980b3..36a1e69a83 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserCollectionResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserCollectionResource.java
@@ -42,7 +42,7 @@ public class UserCollectionResource {
   @GET
   @Path("")
   @Produces(VndMediaType.USER_COLLECTION)
-  @TypeHint(UserDto[].class)
+  @TypeHint(CollectionDto.class)
   @StatusCodes({
     @ResponseCode(code = 200, condition = "success"),
     @ResponseCode(code = 400, condition = "\"sortBy\" field unknown"),

From f191f2833d14795d15ce62fb52f9b4790ae4ca5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Thu, 2 Aug 2018 08:56:03 +0200
Subject: [PATCH 14/51] Fix handling of RepositoryIsNotArchivedException

---
 .../resources/AbstractManagerResource.java    | 14 ----------
 .../api/v2/resources/RepositoryResource.java  | 19 ++++++++++++--
 .../SingleResourceManagerAdapter.java         | 12 +++++++++
 .../resources/RepositoryRootResourceTest.java | 26 +++++++++++++++++--
 4 files changed, 53 insertions(+), 18 deletions(-)

diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/AbstractManagerResource.java b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/AbstractManagerResource.java
index 27ceb03a36..2ad7a64255 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/AbstractManagerResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/AbstractManagerResource.java
@@ -374,20 +374,6 @@ public abstract class AbstractManagerResource<T extends ModelObject,
       throwable.getMessage(), throwable);
   }
 
-  /**
-   * Method description
-   *
-   *
-   * @param status
-   * @param throwable
-   *
-   * @return
-   */
-  protected Response createErrorResponse(Status status, Throwable throwable)
-  {
-    return createErrorResponse(status, throwable.getMessage(), throwable);
-  }
-
   /**
    * Method description
    *
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryResource.java
index 34896149c3..255f08f295 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryResource.java
@@ -5,12 +5,19 @@ import com.webcohesion.enunciate.metadata.rs.StatusCodes;
 import com.webcohesion.enunciate.metadata.rs.TypeHint;
 import sonia.scm.repository.Repository;
 import sonia.scm.repository.RepositoryException;
+import sonia.scm.repository.RepositoryIsNotArchivedException;
 import sonia.scm.repository.RepositoryManager;
 import sonia.scm.web.VndMediaType;
 
 import javax.inject.Inject;
 import javax.inject.Provider;
-import javax.ws.rs.*;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
 import javax.ws.rs.core.Response;
 import java.util.Optional;
 import java.util.function.Predicate;
@@ -40,7 +47,7 @@ public class RepositoryResource {
     this.dtoToRepositoryMapper = dtoToRepositoryMapper;
     this.manager = manager;
     this.repositoryToDtoMapper = repositoryToDtoMapper;
-    this.adapter = new SingleResourceManagerAdapter<>(manager, Repository.class);
+    this.adapter = new SingleResourceManagerAdapter<>(manager, Repository.class, this::handleNotArchived);
     this.tagRootResource = tagRootResource;
     this.branchRootResource = branchRootResource;
     this.changesetRootResource = changesetRootResource;
@@ -148,6 +155,14 @@ public class RepositoryResource {
     return permissionRootResource.get();
   }
 
+  private Optional<Response> handleNotArchived(Throwable throwable) {
+    if (throwable instanceof RepositoryIsNotArchivedException) {
+      return Optional.of(Response.status(Response.Status.PRECONDITION_FAILED).build());
+    } else {
+      return Optional.empty();
+    }
+  }
+
   private Supplier<Optional<Repository>> loadBy(String namespace, String name) {
     return () -> manager.getByNamespace(namespace, name);
   }
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/SingleResourceManagerAdapter.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/SingleResourceManagerAdapter.java
index 7f8b115dee..06195284df 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/SingleResourceManagerAdapter.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/SingleResourceManagerAdapter.java
@@ -31,8 +31,15 @@ class SingleResourceManagerAdapter<MODEL_OBJECT extends ModelObject,
                              DTO extends HalRepresentation,
                              EXCEPTION extends Exception> extends AbstractManagerResource<MODEL_OBJECT, EXCEPTION> {
 
+  private final Function<Throwable, Optional<Response>> errorHandler;
+
   SingleResourceManagerAdapter(Manager<MODEL_OBJECT, EXCEPTION> manager, Class<MODEL_OBJECT> type) {
+    this(manager, type, e -> Optional.empty());
+  }
+
+  SingleResourceManagerAdapter(Manager<MODEL_OBJECT, EXCEPTION> manager, Class<MODEL_OBJECT> type, Function<Throwable, Optional<Response>> errorHandler) {
     super(manager, type);
+    this.errorHandler = errorHandler;
   }
 
   /**
@@ -70,6 +77,11 @@ class SingleResourceManagerAdapter<MODEL_OBJECT extends ModelObject,
       .orElse(null);
   }
 
+  @Override
+  protected Response createErrorResponse(Throwable throwable) {
+    return errorHandler.apply(throwable).orElse(super.createErrorResponse(throwable));
+  }
+
   @Override
   protected GenericEntity<Collection<MODEL_OBJECT>> createGenericEntity(Collection<MODEL_OBJECT> modelObjects) {
     throw new UnsupportedOperationException();
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryRootResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryRootResourceTest.java
index a8616fe2ce..f0e875e650 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryRootResourceTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryRootResourceTest.java
@@ -15,6 +15,7 @@ import org.mockito.Mock;
 import sonia.scm.PageResult;
 import sonia.scm.repository.Repository;
 import sonia.scm.repository.RepositoryException;
+import sonia.scm.repository.RepositoryIsNotArchivedException;
 import sonia.scm.repository.RepositoryManager;
 import sonia.scm.web.VndMediaType;
 
@@ -27,14 +28,21 @@ import java.net.URL;
 import static java.util.Collections.singletonList;
 import static java.util.Optional.empty;
 import static java.util.Optional.of;
-import static javax.servlet.http.HttpServletResponse.*;
+import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
+import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND;
+import static javax.servlet.http.HttpServletResponse.SC_NO_CONTENT;
+import static javax.servlet.http.HttpServletResponse.SC_OK;
+import static javax.servlet.http.HttpServletResponse.SC_PRECONDITION_FAILED;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyObject;
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 import static org.mockito.MockitoAnnotations.initMocks;
 
 @SubjectAware(
@@ -191,6 +199,20 @@ public class RepositoryRootResourceTest {
     verify(repositoryManager).delete(anyObject());
   }
 
+  @Test
+  public void shouldHandleDeleteIsNotArchivedException() throws Exception {
+    mockRepository("space", "repo");
+
+    doThrow(RepositoryIsNotArchivedException.class).when(repositoryManager).delete(anyObject());
+
+    MockHttpRequest request = MockHttpRequest.delete("/" + RepositoryRootResource.REPOSITORIES_PATH_V2 + "space/repo");
+    MockHttpResponse response = new MockHttpResponse();
+
+    dispatcher.invoke(request, response);
+
+    assertEquals(SC_PRECONDITION_FAILED, response.getStatus());
+  }
+
   @Test
   public void shouldCreateNewRepositoryInCorrectNamespace() throws URISyntaxException, IOException, RepositoryException {
     when(repositoryManager.create(any())).thenAnswer(invocation -> {

From 99ecc8cba205ff420d2558bc12ed9369bfce28ad Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Thu, 2 Aug 2018 11:56:35 +0200
Subject: [PATCH 15/51] implemented rest endpoint for repository types

---
 .../src/main/java/sonia/scm/ScmState.java     |  11 +-
 .../scm/repository/RepositoryHandler.java     |   3 +
 .../scm/repository/RepositoryManager.java     |   3 +-
 .../RepositoryManagerDecorator.java           |   2 +-
 .../main/java/sonia/scm/web/VndMediaType.java |   3 +
 .../scm/repository/GitRepositoryHandler.java  |   5 +-
 .../scm/repository/HgRepositoryHandler.java   |   5 +-
 .../scm/repository/SvnRepositoryHandler.java  |   5 +-
 .../repository/DummyRepositoryHandler.java    |   6 +-
 .../scm/api/v2/resources/BaseMapper.java      |   5 +-
 .../v2/resources/CollectionToDtoMapper.java   |  32 ++++
 .../scm/api/v2/resources/MapperModule.java    |   3 +
 .../RepositoryTypeCollectionResource.java     |  36 +++++
 .../RepositoryTypeCollectionToDtoMapper.java  |  21 +++
 .../api/v2/resources/RepositoryTypeDto.java   |  22 +++
 .../v2/resources/RepositoryTypeResource.java  |  53 +++++++
 .../resources/RepositoryTypeRootResource.java |  35 +++++
 ...positoryTypeToRepositoryTypeDtoMapper.java |  25 +++
 .../scm/api/v2/resources/ResourceLinks.java   |  33 ++++
 .../repository/DefaultRepositoryManager.java  |   4 +-
 ...positoryTypeCollectionToDtoMapperTest.java |  60 ++++++++
 .../RepositoryTypeRootResourceTest.java       | 142 ++++++++++++++++++
 ...toryTypeToRepositoryTypeDtoMapperTest.java |  42 ++++++
 .../api/v2/resources/ResourceLinksMock.java   |   3 +
 .../sonia/scm/it/IntegrationTestUtil.java     |   3 +-
 .../test/java/sonia/scm/it/UserITCase.java    |   3 +-
 .../DefaultRepositoryManagerPerfTest.java     |   3 +-
 .../DefaultRepositoryManagerTest.java         |   9 +-
 28 files changed, 545 insertions(+), 32 deletions(-)
 create mode 100644 scm-webapp/src/main/java/sonia/scm/api/v2/resources/CollectionToDtoMapper.java
 create mode 100644 scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryTypeCollectionResource.java
 create mode 100644 scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryTypeCollectionToDtoMapper.java
 create mode 100644 scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryTypeDto.java
 create mode 100644 scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryTypeResource.java
 create mode 100644 scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryTypeRootResource.java
 create mode 100644 scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryTypeToRepositoryTypeDtoMapper.java
 create mode 100644 scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryTypeCollectionToDtoMapperTest.java
 create mode 100644 scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryTypeRootResourceTest.java
 create mode 100644 scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryTypeToRepositoryTypeDtoMapperTest.java

diff --git a/scm-core/src/main/java/sonia/scm/ScmState.java b/scm-core/src/main/java/sonia/scm/ScmState.java
index 5610a40c08..cd36aa707c 100644
--- a/scm-core/src/main/java/sonia/scm/ScmState.java
+++ b/scm-core/src/main/java/sonia/scm/ScmState.java
@@ -35,6 +35,7 @@ package sonia.scm;
 
 //~--- non-JDK imports --------------------------------------------------------
 
+import sonia.scm.repository.RepositoryType;
 import sonia.scm.security.PermissionDescriptor;
 import sonia.scm.user.User;
 
@@ -82,9 +83,9 @@ public final class ScmState
    * @since 2.0.0
    */
   public ScmState(String version, User user, Collection<String> groups,
-    String token, Collection<Type> repositoryTypes, String defaultUserType,
-    ScmClientConfig clientConfig, List<String> assignedPermission,
-    List<PermissionDescriptor> availablePermissions)
+                  String token, Collection<RepositoryType> repositoryTypes, String defaultUserType,
+                  ScmClientConfig clientConfig, List<String> assignedPermission,
+                  List<PermissionDescriptor> availablePermissions)
   {
     this.version = version;
     this.user = user;
@@ -165,7 +166,7 @@ public final class ScmState
    *
    * @return all available repository types
    */
-  public Collection<Type> getRepositoryTypes()
+  public Collection<RepositoryType> getRepositoryTypes()
   {
     return repositoryTypes;
   }
@@ -244,7 +245,7 @@ public final class ScmState
 
   /** Field description */
   @XmlElement(name = "repositoryTypes")
-  private Collection<Type> repositoryTypes;
+  private Collection<RepositoryType> repositoryTypes;
 
   /** Field description */
   private User user;
diff --git a/scm-core/src/main/java/sonia/scm/repository/RepositoryHandler.java b/scm-core/src/main/java/sonia/scm/repository/RepositoryHandler.java
index 8dc5f8418b..739d0d0177 100644
--- a/scm-core/src/main/java/sonia/scm/repository/RepositoryHandler.java
+++ b/scm-core/src/main/java/sonia/scm/repository/RepositoryHandler.java
@@ -82,4 +82,7 @@ public interface RepositoryHandler
    * @since 1.15
    */
   public String getVersionInformation();
+
+  @Override
+  RepositoryType getType();
 }
diff --git a/scm-core/src/main/java/sonia/scm/repository/RepositoryManager.java b/scm-core/src/main/java/sonia/scm/repository/RepositoryManager.java
index 493d8f6dbb..629e0d4513 100644
--- a/scm-core/src/main/java/sonia/scm/repository/RepositoryManager.java
+++ b/scm-core/src/main/java/sonia/scm/repository/RepositoryManager.java
@@ -35,7 +35,6 @@ package sonia.scm.repository;
 
 //~--- non-JDK imports --------------------------------------------------------
 
-import sonia.scm.Type;
 import sonia.scm.TypeManager;
 
 import javax.servlet.http.HttpServletRequest;
@@ -100,7 +99,7 @@ public interface RepositoryManager
    *
    * @return all configured repository types
    */
-  public Collection<Type> getConfiguredTypes();
+  public Collection<RepositoryType> getConfiguredTypes();
 
   /**
    * Returns the {@link Repository} associated to the request uri.
diff --git a/scm-core/src/main/java/sonia/scm/repository/RepositoryManagerDecorator.java b/scm-core/src/main/java/sonia/scm/repository/RepositoryManagerDecorator.java
index 6990baf7c5..b504359bc0 100644
--- a/scm-core/src/main/java/sonia/scm/repository/RepositoryManagerDecorator.java
+++ b/scm-core/src/main/java/sonia/scm/repository/RepositoryManagerDecorator.java
@@ -103,7 +103,7 @@ public class RepositoryManagerDecorator
    * @return
    */
   @Override
-  public Collection<Type> getConfiguredTypes()
+  public Collection<RepositoryType> getConfiguredTypes()
   {
     return decorated.getConfiguredTypes();
   }
diff --git a/scm-core/src/main/java/sonia/scm/web/VndMediaType.java b/scm-core/src/main/java/sonia/scm/web/VndMediaType.java
index 6d20d14043..36bde974d0 100644
--- a/scm-core/src/main/java/sonia/scm/web/VndMediaType.java
+++ b/scm-core/src/main/java/sonia/scm/web/VndMediaType.java
@@ -6,6 +6,7 @@ import javax.ws.rs.core.MediaType;
  * Vendor media types used by SCMM.
  */
 public class VndMediaType {
+
   private static final String VERSION = "2";
   private static final String TYPE = "application";
   private static final String SUBTYPE_PREFIX = "vnd.scmm-";
@@ -18,6 +19,8 @@ public class VndMediaType {
   public static final String USER_COLLECTION = PREFIX + "userCollection" + SUFFIX;
   public static final String GROUP_COLLECTION = PREFIX + "groupCollection" + SUFFIX;
   public static final String REPOSITORY_COLLECTION = PREFIX + "repositoryCollection" + SUFFIX;
+  public static final String REPOSITORY_TYPE_COLLECTION = PREFIX + "repositoryTypeCollection" + SUFFIX;
+  public static final String REPOSITORY_TYPE = PREFIX + "repositoryType" + SUFFIX;
   public static final String ME = PREFIX + "me" + SUFFIX;
 
   private VndMediaType() {
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitRepositoryHandler.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitRepositoryHandler.java
index 2338cc3b46..87f96f850f 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitRepositoryHandler.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitRepositoryHandler.java
@@ -41,7 +41,6 @@ import com.google.inject.Singleton;
 
 import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
 
-import sonia.scm.Type;
 import sonia.scm.io.FileSystem;
 import sonia.scm.plugin.Extension;
 import sonia.scm.repository.spi.GitRepositoryServiceProvider;
@@ -88,7 +87,7 @@ public class GitRepositoryHandler
   private static final Logger logger = LoggerFactory.getLogger(GitRepositoryHandler.class);
 
   /** Field description */
-  public static final Type TYPE = new RepositoryType(TYPE_NAME,
+  public static final RepositoryType TYPE = new RepositoryType(TYPE_NAME,
                                     TYPE_DISPLAYNAME,
                                     GitRepositoryServiceProvider.COMMANDS);
 
@@ -167,7 +166,7 @@ public class GitRepositoryHandler
    * @return
    */
   @Override
-  public Type getType()
+  public RepositoryType getType()
   {
     return TYPE;
   }
diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgRepositoryHandler.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgRepositoryHandler.java
index 40987fa4da..aad546f651 100644
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgRepositoryHandler.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgRepositoryHandler.java
@@ -44,7 +44,6 @@ import org.slf4j.LoggerFactory;
 
 import sonia.scm.ConfigurationException;
 import sonia.scm.SCMContextProvider;
-import sonia.scm.Type;
 import sonia.scm.installer.HgInstaller;
 import sonia.scm.installer.HgInstallerFactory;
 import sonia.scm.io.DirectoryFileFilter;
@@ -98,7 +97,7 @@ public class HgRepositoryHandler
   public static final String TYPE_NAME = "hg";
 
   /** Field description */
-  public static final Type TYPE = new RepositoryType(TYPE_NAME,
+  public static final RepositoryType TYPE = new RepositoryType(TYPE_NAME,
                                     TYPE_DISPLAYNAME,
                                     HgRepositoryServiceProvider.COMMANDS,
                                     HgRepositoryServiceProvider.FEATURES);
@@ -259,7 +258,7 @@ public class HgRepositoryHandler
    * @return
    */
   @Override
-  public Type getType()
+  public RepositoryType getType()
   {
     return TYPE;
   }
diff --git a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnRepositoryHandler.java b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnRepositoryHandler.java
index dcadd5c1c6..58ada0738b 100644
--- a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnRepositoryHandler.java
+++ b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnRepositoryHandler.java
@@ -49,7 +49,6 @@ import org.tmatesoft.svn.core.io.SVNRepository;
 import org.tmatesoft.svn.core.io.SVNRepositoryFactory;
 import org.tmatesoft.svn.util.SVNDebugLog;
 
-import sonia.scm.Type;
 import sonia.scm.io.FileSystem;
 import sonia.scm.logging.SVNKitLogger;
 import sonia.scm.plugin.Extension;
@@ -87,7 +86,7 @@ public class SvnRepositoryHandler
   public static final String TYPE_NAME = "svn";
 
   /** Field description */
-  public static final Type TYPE = new RepositoryType(TYPE_NAME,
+  public static final RepositoryType TYPE = new RepositoryType(TYPE_NAME,
                                     TYPE_DISPLAYNAME,
                                     SvnRepositoryServiceProvider.COMMANDS);
 
@@ -150,7 +149,7 @@ public class SvnRepositoryHandler
    * @return
    */
   @Override
-  public Type getType()
+  public RepositoryType getType()
   {
     return TYPE;
   }
diff --git a/scm-test/src/main/java/sonia/scm/repository/DummyRepositoryHandler.java b/scm-test/src/main/java/sonia/scm/repository/DummyRepositoryHandler.java
index 870127b14e..1a1d4c413a 100644
--- a/scm-test/src/main/java/sonia/scm/repository/DummyRepositoryHandler.java
+++ b/scm-test/src/main/java/sonia/scm/repository/DummyRepositoryHandler.java
@@ -33,7 +33,7 @@ package sonia.scm.repository;
 
 //~--- non-JDK imports --------------------------------------------------------
 
-import sonia.scm.Type;
+import com.google.common.collect.Sets;
 import sonia.scm.io.DefaultFileSystem;
 import sonia.scm.store.ConfigurationStoreFactory;
 
@@ -54,7 +54,7 @@ public class DummyRepositoryHandler
 
   public static final String TYPE_NAME = "dummy";
 
-  public static final Type TYPE = new Type(TYPE_NAME, TYPE_DISPLAYNAME);
+  public static final RepositoryType TYPE = new RepositoryType(TYPE_NAME, TYPE_DISPLAYNAME, Sets.newHashSet());
 
   private final Set<String> existingRepoNames = new HashSet<>();
 
@@ -63,7 +63,7 @@ public class DummyRepositoryHandler
   }
 
   @Override
-  public Type getType() {
+  public RepositoryType getType() {
     return TYPE;
   }
 
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BaseMapper.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BaseMapper.java
index 94d884c437..db24463be8 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BaseMapper.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BaseMapper.java
@@ -2,14 +2,13 @@ package sonia.scm.api.v2.resources;
 
 import de.otto.edison.hal.HalRepresentation;
 import org.mapstruct.Mapping;
-import sonia.scm.ModelObject;
 
 import java.time.Instant;
 
-abstract class BaseMapper<T extends ModelObject, D extends HalRepresentation> {
+abstract class BaseMapper<T, D extends HalRepresentation> {
 
   @Mapping(target = "attributes", ignore = true) // We do not map HAL attributes
-  public abstract D map(T modelObject);
+  public abstract D map(T object);
 
   Instant mapTime(Long epochMilli) {
     return epochMilli == null? null: Instant.ofEpochMilli(epochMilli);
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/CollectionToDtoMapper.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/CollectionToDtoMapper.java
new file mode 100644
index 0000000000..4f8c6a6f3f
--- /dev/null
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/CollectionToDtoMapper.java
@@ -0,0 +1,32 @@
+package sonia.scm.api.v2.resources;
+
+import de.otto.edison.hal.HalRepresentation;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import static de.otto.edison.hal.Embedded.embeddedBuilder;
+import static de.otto.edison.hal.Links.linkingTo;
+
+abstract class CollectionToDtoMapper<E, D extends HalRepresentation> {
+
+  private final String collectionName;
+  private final BaseMapper<E, D> mapper;
+
+  protected CollectionToDtoMapper(String collectionName, BaseMapper<E, D> mapper) {
+    this.collectionName = collectionName;
+    this.mapper = mapper;
+  }
+
+  public HalRepresentation map(Collection<E> collection) {
+    List<D> dtos = collection.stream().map(mapper::map).collect(Collectors.toList());
+    return new HalRepresentation(
+      linkingTo().self(createSelfLink()).build(),
+      embeddedBuilder().with(collectionName, dtos).build()
+    );
+  }
+
+  protected abstract String createSelfLink();
+
+}
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/MapperModule.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/MapperModule.java
index 8e22755fe0..eea80a077b 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/MapperModule.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/MapperModule.java
@@ -18,6 +18,9 @@ public class MapperModule extends AbstractModule {
     bind(RepositoryToRepositoryDtoMapper.class).to(Mappers.getMapper(RepositoryToRepositoryDtoMapper.class).getClass());
     bind(RepositoryDtoToRepositoryMapper.class).to(Mappers.getMapper(RepositoryDtoToRepositoryMapper.class).getClass());
 
+    bind(RepositoryTypeToRepositoryTypeDtoMapper.class).to(Mappers.getMapper(RepositoryTypeToRepositoryTypeDtoMapper.class).getClass());
+    bind(RepositoryTypeCollectionToDtoMapper.class);
+
     bind(UriInfoStore.class).in(ServletScopes.REQUEST);
   }
 }
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryTypeCollectionResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryTypeCollectionResource.java
new file mode 100644
index 0000000000..4f9e76a939
--- /dev/null
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryTypeCollectionResource.java
@@ -0,0 +1,36 @@
+package sonia.scm.api.v2.resources;
+
+import com.webcohesion.enunciate.metadata.rs.ResponseCode;
+import com.webcohesion.enunciate.metadata.rs.StatusCodes;
+import de.otto.edison.hal.HalRepresentation;
+import sonia.scm.repository.RepositoryManager;
+import sonia.scm.web.VndMediaType;
+
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+
+public class RepositoryTypeCollectionResource {
+
+  private RepositoryManager repositoryManager;
+  private RepositoryTypeCollectionToDtoMapper mapper;
+
+  @Inject
+  public RepositoryTypeCollectionResource(RepositoryManager repositoryManager, RepositoryTypeCollectionToDtoMapper mapper) {
+    this.repositoryManager = repositoryManager;
+    this.mapper = mapper;
+  }
+
+  @GET
+  @Path("")
+  @StatusCodes({
+    @ResponseCode(code = 200, condition = "success"),
+    @ResponseCode(code = 500, condition = "internal server error")
+  })
+  @Produces(VndMediaType.REPOSITORY_TYPE_COLLECTION)
+  public HalRepresentation getAll() {
+    return mapper.map(repositoryManager.getConfiguredTypes());
+  }
+
+}
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryTypeCollectionToDtoMapper.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryTypeCollectionToDtoMapper.java
new file mode 100644
index 0000000000..b9d7ff46c9
--- /dev/null
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryTypeCollectionToDtoMapper.java
@@ -0,0 +1,21 @@
+package sonia.scm.api.v2.resources;
+
+import sonia.scm.repository.RepositoryType;
+
+import javax.inject.Inject;
+
+public class RepositoryTypeCollectionToDtoMapper extends CollectionToDtoMapper<RepositoryType, RepositoryTypeDto>  {
+
+  private final ResourceLinks resourceLinks;
+
+  @Inject
+  public RepositoryTypeCollectionToDtoMapper(RepositoryTypeToRepositoryTypeDtoMapper mapper, ResourceLinks resourceLinks) {
+    super("repository-types", mapper);
+    this.resourceLinks = resourceLinks;
+  }
+
+  @Override
+  protected String createSelfLink() {
+    return resourceLinks.repositoryTypeCollection().self();
+  }
+}
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryTypeDto.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryTypeDto.java
new file mode 100644
index 0000000000..73a1b60b9e
--- /dev/null
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryTypeDto.java
@@ -0,0 +1,22 @@
+package sonia.scm.api.v2.resources;
+
+import de.otto.edison.hal.HalRepresentation;
+import de.otto.edison.hal.Links;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@NoArgsConstructor
+@Getter
+@Setter
+public class RepositoryTypeDto extends HalRepresentation {
+
+  private String name;
+  private String displayName;
+
+  @Override
+  @SuppressWarnings("squid:S1185") // We want to have this method available in this package
+  protected HalRepresentation add(Links links) {
+    return super.add(links);
+  }
+}
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryTypeResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryTypeResource.java
new file mode 100644
index 0000000000..3a47fdf6c6
--- /dev/null
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryTypeResource.java
@@ -0,0 +1,53 @@
+package sonia.scm.api.v2.resources;
+
+import com.webcohesion.enunciate.metadata.rs.ResponseCode;
+import com.webcohesion.enunciate.metadata.rs.StatusCodes;
+import com.webcohesion.enunciate.metadata.rs.TypeHint;
+import sonia.scm.repository.RepositoryManager;
+import sonia.scm.repository.RepositoryType;
+import sonia.scm.web.VndMediaType;
+
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Response;
+
+public class RepositoryTypeResource {
+
+  private RepositoryManager repositoryManager;
+  private RepositoryTypeToRepositoryTypeDtoMapper mapper;
+
+  @Inject
+  public RepositoryTypeResource(RepositoryManager repositoryManager, RepositoryTypeToRepositoryTypeDtoMapper mapper) {
+    this.repositoryManager = repositoryManager;
+    this.mapper = mapper;
+  }
+
+  /**
+   * Returns the specified repository type.
+   *
+   * <strong>Note:</strong> This method requires "group" privilege.
+   *
+   * @param name of the requested repository type
+   */
+  @GET
+  @Path("")
+  @Produces(VndMediaType.REPOSITORY_TYPE)
+  @TypeHint(RepositoryTypeDto.class)
+  @StatusCodes({
+    @ResponseCode(code = 200, condition = "success"),
+    @ResponseCode(code = 404, condition = "not found, no repository type with the specified name available"),
+    @ResponseCode(code = 500, condition = "internal server error")
+  })
+  public Response get(@PathParam("name") String name) {
+    for (RepositoryType type : repositoryManager.getConfiguredTypes()) {
+      if (name.equalsIgnoreCase(type.getName())) {
+        return Response.ok(mapper.map(type)).build();
+      }
+    }
+    return Response.status(Response.Status.NOT_FOUND).build();
+  }
+
+}
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryTypeRootResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryTypeRootResource.java
new file mode 100644
index 0000000000..0adc198e96
--- /dev/null
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryTypeRootResource.java
@@ -0,0 +1,35 @@
+package sonia.scm.api.v2.resources;
+
+import javax.inject.Inject;
+import javax.inject.Provider;
+import javax.ws.rs.Path;
+
+/**
+ * RESTful Web Service Resource to get available repository types.
+ */
+@Path(RepositoryTypeRootResource.PATH)
+public class RepositoryTypeRootResource {
+
+  static final String PATH = "v2/repository-types/";
+
+  private Provider<RepositoryTypeCollectionResource> collectionResourceProvider;
+  private Provider<RepositoryTypeResource> resourceProvider;
+
+  @Inject
+  public RepositoryTypeRootResource(Provider<RepositoryTypeCollectionResource> collectionResourceProvider, Provider<RepositoryTypeResource> resourceProvider) {
+    this.collectionResourceProvider = collectionResourceProvider;
+    this.resourceProvider = resourceProvider;
+  }
+
+  @Path("")
+  public RepositoryTypeCollectionResource getRepositoryTypeCollectionResource() {
+    return collectionResourceProvider.get();
+  }
+
+  @Path("{name}")
+  public RepositoryTypeResource getRepositoryTypeResource() {
+    return resourceProvider.get();
+  }
+
+
+}
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryTypeToRepositoryTypeDtoMapper.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryTypeToRepositoryTypeDtoMapper.java
new file mode 100644
index 0000000000..438273a514
--- /dev/null
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryTypeToRepositoryTypeDtoMapper.java
@@ -0,0 +1,25 @@
+package sonia.scm.api.v2.resources;
+
+import de.otto.edison.hal.Links;
+import org.mapstruct.AfterMapping;
+import org.mapstruct.Mapper;
+import org.mapstruct.MappingTarget;
+import sonia.scm.repository.RepositoryType;
+
+import javax.inject.Inject;
+
+import static de.otto.edison.hal.Links.linkingTo;
+
+@Mapper
+public abstract class RepositoryTypeToRepositoryTypeDtoMapper extends BaseMapper<RepositoryType, RepositoryTypeDto> {
+
+  @Inject
+  private ResourceLinks resourceLinks;
+
+  @AfterMapping
+  void appendLinks(RepositoryType repositoryType, @MappingTarget RepositoryTypeDto target) {
+    Links.Builder linksBuilder = linkingTo().self(resourceLinks.repositoryType().self(repositoryType.getName()));
+    target.add(linksBuilder.build());
+  }
+
+}
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ResourceLinks.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ResourceLinks.java
index 8f6f1eaae3..f48f160d83 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ResourceLinks.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ResourceLinks.java
@@ -145,6 +145,39 @@ class ResourceLinks {
     }
   }
 
+  public RepositoryTypeLinks repositoryType() {
+    return new RepositoryTypeLinks(uriInfoStore.get());
+  }
+
+  static class RepositoryTypeLinks {
+    private final LinkBuilder repositoryTypeLinkBuilder;
+
+    RepositoryTypeLinks(UriInfo uriInfo) {
+      repositoryTypeLinkBuilder = new LinkBuilder(uriInfo, RepositoryTypeRootResource.class, RepositoryTypeResource.class);
+    }
+
+    String self(String name) {
+      return repositoryTypeLinkBuilder.method("getRepositoryTypeResource").parameters(name).method("get").parameters().href();
+    }
+  }
+
+  public RepositoryTypeCollectionLinks repositoryTypeCollection() {
+    return new RepositoryTypeCollectionLinks(uriInfoStore.get());
+  }
+
+  static class RepositoryTypeCollectionLinks {
+    private final LinkBuilder collectionLinkBuilder;
+
+    RepositoryTypeCollectionLinks(UriInfo uriInfo) {
+      collectionLinkBuilder = new LinkBuilder(uriInfo, RepositoryTypeRootResource.class, RepositoryTypeCollectionResource.class);
+    }
+
+    String self() {
+      return collectionLinkBuilder.method("getRepositoryTypeCollectionResource").parameters().method("getAll").parameters().href();
+    }
+  }
+
+
   public TagCollectionLinks tagCollection() {
     return new TagCollectionLinks(uriInfoStore.get());
   }
diff --git a/scm-webapp/src/main/java/sonia/scm/repository/DefaultRepositoryManager.java b/scm-webapp/src/main/java/sonia/scm/repository/DefaultRepositoryManager.java
index 162f825b6a..645c3a6b72 100644
--- a/scm-webapp/src/main/java/sonia/scm/repository/DefaultRepositoryManager.java
+++ b/scm-webapp/src/main/java/sonia/scm/repository/DefaultRepositoryManager.java
@@ -300,8 +300,8 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager {
   }
 
   @Override
-  public Collection<Type> getConfiguredTypes() {
-    List<Type> validTypes = Lists.newArrayList();
+  public Collection<RepositoryType> getConfiguredTypes() {
+    List<RepositoryType> validTypes = Lists.newArrayList();
 
     for (RepositoryHandler handler : handlerMap.values()) {
       if (handler.isConfigured()) {
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryTypeCollectionToDtoMapperTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryTypeCollectionToDtoMapperTest.java
new file mode 100644
index 0000000000..ecde79ae1f
--- /dev/null
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryTypeCollectionToDtoMapperTest.java
@@ -0,0 +1,60 @@
+package sonia.scm.api.v2.resources;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
+import de.otto.edison.hal.Embedded;
+import de.otto.edison.hal.HalRepresentation;
+import de.otto.edison.hal.Link;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.runners.MockitoJUnitRunner;
+import sonia.scm.repository.RepositoryType;
+
+import java.net.URI;
+import java.util.List;
+import java.util.Optional;
+
+import static org.junit.Assert.*;
+
+@RunWith(MockitoJUnitRunner.class)
+public class RepositoryTypeCollectionToDtoMapperTest {
+
+  private final URI baseUri = URI.create("https://scm-manager.org/scm/");
+
+  @SuppressWarnings("unused") // Is injected
+  private final ResourceLinks resourceLinks = ResourceLinksMock.createMock(baseUri);
+
+  @InjectMocks
+  private RepositoryTypeToRepositoryTypeDtoMapperImpl mapper;
+
+  private List<RepositoryType> types = Lists.newArrayList(
+    new RepositoryType("hk", "Hitchhiker", Sets.newHashSet()),
+    new RepositoryType("hog", "Heart of Gold", Sets.newHashSet())
+  );
+
+  private RepositoryTypeCollectionToDtoMapper collectionMapper;
+
+  @Before
+  public void setUpEnvironment() {
+    collectionMapper = new RepositoryTypeCollectionToDtoMapper(mapper, resourceLinks);
+  }
+
+  @Test
+  public void shouldHaveEmbeddedDtos() {
+    HalRepresentation mappedTypes = collectionMapper.map(types);
+    Embedded embedded = mappedTypes.getEmbedded();
+    List<RepositoryTypeDto> embeddedTypes = embedded.getItemsBy("repository-types", RepositoryTypeDto.class);
+    assertEquals("hk", embeddedTypes.get(0).getName());
+    assertEquals("hog", embeddedTypes.get(1).getName());
+  }
+
+  @Test
+  public void shouldHaveSelfLink() {
+    HalRepresentation mappedTypes = collectionMapper.map(types);
+    Optional<Link> self = mappedTypes.getLinks().getLinkBy("self");
+    assertEquals("https://scm-manager.org/scm/v2/repository-types/", self.get().getHref());
+  }
+
+}
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryTypeRootResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryTypeRootResourceTest.java
new file mode 100644
index 0000000000..0dfb6bf92c
--- /dev/null
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryTypeRootResourceTest.java
@@ -0,0 +1,142 @@
+package sonia.scm.api.v2.resources;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
+import org.jboss.resteasy.core.Dispatcher;
+import org.jboss.resteasy.mock.MockDispatcherFactory;
+import org.jboss.resteasy.mock.MockHttpRequest;
+import org.jboss.resteasy.mock.MockHttpResponse;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+import sonia.scm.repository.RepositoryManager;
+import sonia.scm.repository.RepositoryType;
+import sonia.scm.web.VndMediaType;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.List;
+
+import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND;
+import static javax.servlet.http.HttpServletResponse.SC_OK;
+import static org.junit.Assert.*;
+import static org.hamcrest.Matchers.*;
+import static org.mockito.Mockito.when;
+
+@RunWith(MockitoJUnitRunner.class)
+public class RepositoryTypeRootResourceTest {
+
+  private final Dispatcher dispatcher = MockDispatcherFactory.createDispatcher();
+
+  @Mock
+  private RepositoryManager repositoryManager;
+
+  private final URI baseUri = URI.create("/");
+  private final ResourceLinks resourceLinks = ResourceLinksMock.createMock(baseUri);
+
+  @InjectMocks
+  private RepositoryTypeToRepositoryTypeDtoMapperImpl mapper;
+
+  private List<RepositoryType> types = Lists.newArrayList(
+    new RepositoryType("hk", "Hitchhiker", Sets.newHashSet()),
+    new RepositoryType("hog", "Heart of Gold", Sets.newHashSet())
+  );
+
+  @Before
+  public void prepareEnvironment() {
+    when(repositoryManager.getConfiguredTypes()).thenReturn(types);
+
+    RepositoryTypeCollectionToDtoMapper collectionMapper = new RepositoryTypeCollectionToDtoMapper(mapper, resourceLinks);
+    RepositoryTypeCollectionResource collectionResource = new RepositoryTypeCollectionResource(repositoryManager, collectionMapper);
+    RepositoryTypeResource resource = new RepositoryTypeResource(repositoryManager, mapper);
+    RepositoryTypeRootResource rootResource = new RepositoryTypeRootResource(MockProvider.of(collectionResource), MockProvider.of(resource));
+    dispatcher.getRegistry().addSingletonResource(rootResource);
+  }
+
+  @Test
+  public void shouldHaveCollectionVndMediaType() throws URISyntaxException {
+    MockHttpRequest request = MockHttpRequest.get("/" + RepositoryTypeRootResource.PATH);
+    MockHttpResponse response = new MockHttpResponse();
+
+    dispatcher.invoke(request, response);
+
+    assertEquals(SC_OK, response.getStatus());
+    String contentType = response.getOutputHeaders().getFirst("Content-Type").toString();
+    assertThat(VndMediaType.REPOSITORY_TYPE_COLLECTION, equalToIgnoringCase(contentType));
+  }
+
+  @Test
+  public void shouldHaveCollectionSelfLink() throws URISyntaxException {
+    String uri = "/" + RepositoryTypeRootResource.PATH;
+    MockHttpRequest request = MockHttpRequest.get(uri);
+    MockHttpResponse response = new MockHttpResponse();
+
+    dispatcher.invoke(request, response);
+
+    assertEquals(SC_OK, response.getStatus());
+    assertTrue(response.getContentAsString().contains("\"self\":{\"href\":\"" + uri + "\"}"));
+  }
+
+  @Test
+  public void shouldHaveEmbeddedRepositoryTypes() throws URISyntaxException {
+    MockHttpRequest request = MockHttpRequest.get("/" + RepositoryTypeRootResource.PATH);
+    MockHttpResponse response = new MockHttpResponse();
+
+    dispatcher.invoke(request, response);
+
+    assertEquals(SC_OK, response.getStatus());
+    assertTrue(response.getContentAsString().contains("Hitchhiker"));
+    assertTrue(response.getContentAsString().contains("Heart of Gold"));
+  }
+
+  @Test
+  public void shouldHaveVndMediaType() throws URISyntaxException {
+    MockHttpRequest request = MockHttpRequest.get("/" + RepositoryTypeRootResource.PATH + "hk");
+    MockHttpResponse response = new MockHttpResponse();
+
+    dispatcher.invoke(request, response);
+
+    assertEquals(SC_OK, response.getStatus());
+    String contentType = response.getOutputHeaders().getFirst("Content-Type").toString();
+    assertThat(VndMediaType.REPOSITORY_TYPE, equalToIgnoringCase(contentType));
+  }
+
+  @Test
+  public void shouldContainAttributes() throws URISyntaxException {
+    String uri = "/" + RepositoryTypeRootResource.PATH + "hk";
+    MockHttpRequest request = MockHttpRequest.get(uri);
+    MockHttpResponse response = new MockHttpResponse();
+
+    dispatcher.invoke(request, response);
+
+    assertEquals(SC_OK, response.getStatus());
+    assertTrue(response.getContentAsString().contains("hk"));
+    assertTrue(response.getContentAsString().contains("Hitchhiker"));
+  }
+
+  @Test
+  public void shouldHaveSelfLink() throws URISyntaxException {
+    String uri = "/" + RepositoryTypeRootResource.PATH + "hk";
+    MockHttpRequest request = MockHttpRequest.get(uri);
+    MockHttpResponse response = new MockHttpResponse();
+
+    dispatcher.invoke(request, response);
+
+    assertEquals(SC_OK, response.getStatus());
+    assertTrue(response.getContentAsString().contains("\"self\":{\"href\":\"" + uri + "\"}"));
+  }
+
+  @Test
+  public void shouldReturn404OnUnknownTypes() throws URISyntaxException {
+    MockHttpRequest request = MockHttpRequest.get("/" + RepositoryTypeRootResource.PATH + "git");
+    MockHttpResponse response = new MockHttpResponse();
+
+    dispatcher.invoke(request, response);
+
+    assertEquals(SC_NOT_FOUND, response.getStatus());
+  }
+
+}
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryTypeToRepositoryTypeDtoMapperTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryTypeToRepositoryTypeDtoMapperTest.java
new file mode 100644
index 0000000000..9a40c253c4
--- /dev/null
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryTypeToRepositoryTypeDtoMapperTest.java
@@ -0,0 +1,42 @@
+package sonia.scm.api.v2.resources;
+
+import com.google.common.collect.Sets;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.runners.MockitoJUnitRunner;
+import sonia.scm.repository.RepositoryType;
+
+import java.net.URI;
+
+import static org.junit.Assert.assertEquals;
+
+@RunWith(MockitoJUnitRunner.class)
+public class RepositoryTypeToRepositoryTypeDtoMapperTest {
+
+  private final URI baseUri = URI.create("https://scm-manager.org/scm/");
+
+  @SuppressWarnings("unused") // Is injected
+  private final ResourceLinks resourceLinks = ResourceLinksMock.createMock(baseUri);
+
+  @InjectMocks
+  private RepositoryTypeToRepositoryTypeDtoMapperImpl mapper;
+
+  private RepositoryType type = new RepositoryType("hk", "Hitchhiker", Sets.newHashSet());
+
+  @Test
+  public void shouldMapSimpleProperties() {
+    RepositoryTypeDto dto = mapper.map(type);
+    assertEquals("hk", dto.getName());
+    assertEquals("Hitchhiker", dto.getDisplayName());
+  }
+
+  @Test
+  public void shouldAppendSelfLink() {
+    RepositoryTypeDto dto = mapper.map(type);
+    assertEquals(
+      "https://scm-manager.org/scm/v2/repository-types/hk",
+      dto.getLinks().getLinkBy("self").get().getHref()
+    );
+  }
+}
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ResourceLinksMock.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ResourceLinksMock.java
index b35bc3820c..5c3205e8c3 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ResourceLinksMock.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ResourceLinksMock.java
@@ -24,6 +24,9 @@ public class ResourceLinksMock {
     when(resourceLinks.changesetCollection()).thenReturn(new ResourceLinks.ChangesetCollectionLinks(uriInfo));
     when(resourceLinks.sourceCollection()).thenReturn(new ResourceLinks.SourceCollectionLinks(uriInfo));
     when(resourceLinks.permissionCollection()).thenReturn(new ResourceLinks.PermissionCollectionLinks(uriInfo));
+    when(resourceLinks.repositoryType()).thenReturn(new ResourceLinks.RepositoryTypeLinks(uriInfo));
+    when(resourceLinks.repositoryTypeCollection()).thenReturn(new ResourceLinks.RepositoryTypeCollectionLinks(uriInfo));
+
     return resourceLinks;
   }
 }
diff --git a/scm-webapp/src/test/java/sonia/scm/it/IntegrationTestUtil.java b/scm-webapp/src/test/java/sonia/scm/it/IntegrationTestUtil.java
index e12057e47a..c2f2e062f7 100644
--- a/scm-webapp/src/test/java/sonia/scm/it/IntegrationTestUtil.java
+++ b/scm-webapp/src/test/java/sonia/scm/it/IntegrationTestUtil.java
@@ -47,6 +47,7 @@ import sonia.scm.Type;
 import sonia.scm.api.rest.JSONContextResolver;
 import sonia.scm.api.rest.ObjectMapperProvider;
 import sonia.scm.repository.Person;
+import sonia.scm.repository.RepositoryType;
 import sonia.scm.repository.client.api.ClientCommand;
 import sonia.scm.repository.client.api.RepositoryClient;
 import sonia.scm.user.User;
@@ -140,7 +141,7 @@ public final class IntegrationTestUtil
     assertEquals("scmadmin", user.getName());
     assertTrue(user.isAdmin());
 
-    Collection<Type> types = state.getRepositoryTypes();
+    Collection<RepositoryType> types = state.getRepositoryTypes();
 
     assertNotNull(types);
     assertFalse(types.isEmpty());
diff --git a/scm-webapp/src/test/java/sonia/scm/it/UserITCase.java b/scm-webapp/src/test/java/sonia/scm/it/UserITCase.java
index 9a749c6456..bd5ec13ab9 100644
--- a/scm-webapp/src/test/java/sonia/scm/it/UserITCase.java
+++ b/scm-webapp/src/test/java/sonia/scm/it/UserITCase.java
@@ -40,6 +40,7 @@ import org.junit.Test;
 
 import sonia.scm.ScmState;
 import sonia.scm.Type;
+import sonia.scm.repository.RepositoryType;
 import sonia.scm.user.User;
 import sonia.scm.user.UserTestData;
 
@@ -204,7 +205,7 @@ public class UserITCase extends AbstractAdminITCaseBase
     assertEquals("scmadmin", user.getName());
     assertTrue(user.isAdmin());
 
-    Collection<Type> types = state.getRepositoryTypes();
+    Collection<RepositoryType> types = state.getRepositoryTypes();
 
     assertNotNull(types);
     assertFalse(types.isEmpty());
diff --git a/scm-webapp/src/test/java/sonia/scm/repository/DefaultRepositoryManagerPerfTest.java b/scm-webapp/src/test/java/sonia/scm/repository/DefaultRepositoryManagerPerfTest.java
index 665c54c9e1..15c54ccb71 100644
--- a/scm-webapp/src/test/java/sonia/scm/repository/DefaultRepositoryManagerPerfTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/repository/DefaultRepositoryManagerPerfTest.java
@@ -32,6 +32,7 @@ package sonia.scm.repository;
 
 import com.google.common.base.Stopwatch;
 import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Sets;
 import com.google.inject.Provider;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authc.AuthenticationException;
@@ -109,7 +110,7 @@ public class DefaultRepositoryManagerPerfTest {
    */
   @Before
   public void setUpObjectUnderTest(){
-    when(repositoryHandler.getType()).thenReturn(new Type(REPOSITORY_TYPE, REPOSITORY_TYPE));
+    when(repositoryHandler.getType()).thenReturn(new RepositoryType(REPOSITORY_TYPE, REPOSITORY_TYPE, Sets.newHashSet()));
     Set<RepositoryHandler> handlerSet = ImmutableSet.of(repositoryHandler);
     RepositoryMatcher repositoryMatcher = new RepositoryMatcher(Collections.<RepositoryPathMatcher>emptySet());
     NamespaceStrategy namespaceStrategy = mock(NamespaceStrategy.class);
diff --git a/scm-webapp/src/test/java/sonia/scm/repository/DefaultRepositoryManagerTest.java b/scm-webapp/src/test/java/sonia/scm/repository/DefaultRepositoryManagerTest.java
index 1f361d4766..b044dfd1d7 100644
--- a/scm-webapp/src/test/java/sonia/scm/repository/DefaultRepositoryManagerTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/repository/DefaultRepositoryManagerTest.java
@@ -36,6 +36,7 @@ import com.github.legman.Subscribe;
 import com.github.sdorra.shiro.ShiroRule;
 import com.github.sdorra.shiro.SubjectAware;
 import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Sets;
 import org.apache.shiro.authz.UnauthorizedException;
 import org.junit.Rule;
 import org.junit.Test;
@@ -482,14 +483,14 @@ public class DefaultRepositoryManagerTest extends ManagerTestBase<Repository, Re
     handlerSet.add(new DummyRepositoryHandler(factory));
     handlerSet.add(new DummyRepositoryHandler(factory) {
       @Override
-      public Type getType() {
-        return new Type("hg", "Mercurial");
+      public RepositoryType getType() {
+        return new RepositoryType("hg", "Mercurial", Sets.newHashSet());
       }
     });
     handlerSet.add(new DummyRepositoryHandler(factory) {
       @Override
-      public Type getType() {
-        return new Type("git", "Git");
+      public RepositoryType getType() {
+        return new RepositoryType("git", "Git", Sets.newHashSet());
       }
     });
 

From 3838406ee83c3b64662fdb6c638fd612cde05ed4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Thu, 2 Aug 2018 15:14:40 +0200
Subject: [PATCH 16/51] Adapt git repository paths for LFS handling to
 namespaces

---
 .../java/sonia/scm/web/ScmGitServlet.java     | 30 ++++++++-----------
 .../web/lfs/servlet/LfsServletFactory.java    |  4 +--
 .../lfs/servlet/LfsServletFactoryTest.java    |  8 ++---
 3 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/ScmGitServlet.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/ScmGitServlet.java
index e8e62b52cc..ebf4173ad5 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/ScmGitServlet.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/ScmGitServlet.java
@@ -38,32 +38,27 @@ package sonia.scm.web;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
-
 import org.eclipse.jgit.http.server.GitServlet;
-
-import org.slf4j.Logger;
-import static org.slf4j.LoggerFactory.getLogger;
-
-
 import org.eclipse.jgit.lfs.lib.Constants;
-import static org.eclipse.jgit.lfs.lib.Constants.CONTENT_TYPE_GIT_LFS_JSON;
-
+import org.slf4j.Logger;
 import sonia.scm.repository.Repository;
+import sonia.scm.repository.RepositoryException;
 import sonia.scm.repository.RepositoryProvider;
 import sonia.scm.repository.RepositoryRequestListenerUtil;
 import sonia.scm.util.HttpUtil;
 import sonia.scm.web.lfs.servlet.LfsServletFactory;
 
-//~--- JDK imports ------------------------------------------------------------
-
-import java.io.IOException;
-import java.util.regex.Pattern;
-
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import sonia.scm.repository.RepositoryException;
+import java.io.IOException;
+import java.util.regex.Pattern;
+
+import static org.eclipse.jgit.lfs.lib.Constants.CONTENT_TYPE_GIT_LFS_JSON;
+import static org.slf4j.LoggerFactory.getLogger;
+
+//~--- JDK imports ------------------------------------------------------------
 
 /**
  *
@@ -166,12 +161,13 @@ public class ScmGitServlet extends GitServlet
    * </ul>
    */
   private void handleRequest(HttpServletRequest request, HttpServletResponse response, Repository repository) throws ServletException, IOException {
-    logger.trace("handle git repository at {}", repository.getName());
-    if (isLfsBatchApiRequest(request, repository.getName())) {
+    String repoPath = repository.getNamespace() + "/" + repository.getName();
+    logger.trace("handle git repository at {}", repoPath);
+    if (isLfsBatchApiRequest(request, repoPath)) {
       HttpServlet servlet = lfsServletFactory.createProtocolServletFor(repository, request);
       logger.trace("handle lfs batch api request");
       handleGitLfsRequest(servlet, request, response, repository);
-    } else if (isLfsFileTransferRequest(request, repository.getName())) {
+    } else if (isLfsFileTransferRequest(request, repoPath)) {
       HttpServlet servlet = lfsServletFactory.createFileLfsServletFor(repository, request);
       logger.trace("handle lfs file transfer request");
       handleGitLfsRequest(servlet, request, response, repository);
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/lfs/servlet/LfsServletFactory.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/lfs/servlet/LfsServletFactory.java
index 2ca10559a2..58bdb2fcf1 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/lfs/servlet/LfsServletFactory.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/lfs/servlet/LfsServletFactory.java
@@ -9,13 +9,13 @@ import org.slf4j.LoggerFactory;
 import sonia.scm.repository.Repository;
 import sonia.scm.store.BlobStore;
 import sonia.scm.util.HttpUtil;
+import sonia.scm.web.lfs.LfsBlobStoreFactory;
 import sonia.scm.web.lfs.ScmBlobLfsRepository;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
-import sonia.scm.web.lfs.LfsBlobStoreFactory;
 
 /**
  * This factory class is a helper class to provide the {@link LfsProtocolServlet} and the {@link FileLfsServlet}
@@ -70,7 +70,7 @@ public class LfsServletFactory {
    */
   @VisibleForTesting
   static String buildBaseUri(Repository repository, HttpServletRequest request) {
-    return String.format("%s/git/%s.git/info/lfs/objects/", HttpUtil.getCompleteUrl(request), repository.getName());
+    return String.format("%s/git/%s/%s.git/info/lfs/objects/", HttpUtil.getCompleteUrl(request), repository.getNamespace(), repository.getName());
   }
 
 }
diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/web/lfs/servlet/LfsServletFactoryTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/web/lfs/servlet/LfsServletFactoryTest.java
index 74674cc9db..f6f5803bb7 100644
--- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/web/lfs/servlet/LfsServletFactoryTest.java
+++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/web/lfs/servlet/LfsServletFactoryTest.java
@@ -17,18 +17,18 @@ import static org.mockito.Mockito.when;
 public class LfsServletFactoryTest {
 
   @Test
-  public void buildBaseUri() throws Exception {
+  public void buildBaseUri() {
 
     String repositoryNamespace = "space";
     String repositoryName = "git-lfs-demo";
 
     String result = LfsServletFactory.buildBaseUri(new Repository("", "GIT", repositoryNamespace, repositoryName), RequestWithUri(repositoryName, true));
-    assertThat(result, is(equalTo("http://localhost:8081/scm/git/git-lfs-demo.git/info/lfs/objects/")));
+    assertThat(result, is(equalTo("http://localhost:8081/scm/git/space/git-lfs-demo.git/info/lfs/objects/")));
 
 
-    //result will be with dot-gix suffix, ide
+    //result will be with dot-git suffix, ide
     result = LfsServletFactory.buildBaseUri(new Repository("", "GIT", repositoryNamespace, repositoryName), RequestWithUri(repositoryName, false));
-    assertThat(result, is(equalTo("http://localhost:8081/scm/git/git-lfs-demo.git/info/lfs/objects/")));
+    assertThat(result, is(equalTo("http://localhost:8081/scm/git/space/git-lfs-demo.git/info/lfs/objects/")));
   }
 
   private HttpServletRequest RequestWithUri(String repositoryName, boolean withDotGitSuffix) {

From 9b62d19df54cea4dd0d151d5455a8b17c9a3ac54 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Thu, 2 Aug 2018 16:09:58 +0200
Subject: [PATCH 17/51] implemented repository create form

---
 scm-ui/public/locales/en/repos.json           |  20 +-
 scm-ui/src/components/buttons/AddButton.js    |  11 -
 scm-ui/src/components/buttons/Button.js       |   3 +-
 scm-ui/src/components/buttons/CreateButton.js |  24 +++
 scm-ui/src/components/buttons/index.js        |   2 +-
 scm-ui/src/components/forms/Select.js         |  59 ++++++
 scm-ui/src/components/forms/index.js          |   1 +
 scm-ui/src/components/validation.js           |  12 ++
 scm-ui/src/components/validation.test.js      |  75 +++++++
 scm-ui/src/containers/Main.js                 |   9 +-
 scm-ui/src/createReduxStore.js                |   2 +
 scm-ui/src/repos/components/RepositoryForm.js | 167 +++++++++++++++
 .../repos/components/repositoryValidation.js  |  10 +
 .../components/repositoryValidation.test.js   |  31 +++
 scm-ui/src/repos/containers/Create.js         |  71 +++++++
 scm-ui/src/repos/containers/Overview.js       |  33 ++-
 scm-ui/src/repos/modules/repository-types.js  | 107 ++++++++++
 .../repos/modules/repository-types.test.js    | 198 ++++++++++++++++++
 scm-ui/src/repos/types/RepositoryTypes.js     |  14 ++
 scm-ui/src/users/components/UserForm.js       |   9 +-
 .../components/buttons/CreateUserButton.js    |  22 +-
 scm-ui/src/users/components/userValidation.js |  13 --
 .../users/components/userValidation.test.js   |  74 -------
 23 files changed, 838 insertions(+), 129 deletions(-)
 delete mode 100644 scm-ui/src/components/buttons/AddButton.js
 create mode 100644 scm-ui/src/components/buttons/CreateButton.js
 create mode 100644 scm-ui/src/components/forms/Select.js
 create mode 100644 scm-ui/src/components/validation.js
 create mode 100644 scm-ui/src/components/validation.test.js
 create mode 100644 scm-ui/src/repos/components/RepositoryForm.js
 create mode 100644 scm-ui/src/repos/components/repositoryValidation.js
 create mode 100644 scm-ui/src/repos/components/repositoryValidation.test.js
 create mode 100644 scm-ui/src/repos/containers/Create.js
 create mode 100644 scm-ui/src/repos/modules/repository-types.js
 create mode 100644 scm-ui/src/repos/modules/repository-types.test.js
 create mode 100644 scm-ui/src/repos/types/RepositoryTypes.js

diff --git a/scm-ui/public/locales/en/repos.json b/scm-ui/public/locales/en/repos.json
index 428f723f37..e28d9bb23d 100644
--- a/scm-ui/public/locales/en/repos.json
+++ b/scm-ui/public/locales/en/repos.json
@@ -1,10 +1,28 @@
 {
+  "repository": {
+    "name": "Name",
+    "type": "Type",
+    "contact": "Contact",
+    "description": "Description"
+  },
+  "validation": {
+    "name-invalid": "The repository name is invalid",
+    "contact-invalid": "Contact must be a valid mail address"
+  },
   "overview": {
     "title": "Repositories",
-    "subtitle": "Overview of available repositories"
+    "subtitle": "Overview of available repositories",
+    "create-button": "Create"
   },
   "repository-root": {
     "error-title": "Error",
     "error-subtitle": "Unknown repository error"
+  },
+  "create": {
+    "title": "Create Repository",
+    "subtitle": "Create a new repository"
+  },
+  "repository-form": {
+    "submit": "Speichern"
   }
 }
diff --git a/scm-ui/src/components/buttons/AddButton.js b/scm-ui/src/components/buttons/AddButton.js
deleted file mode 100644
index 6668aa32d1..0000000000
--- a/scm-ui/src/components/buttons/AddButton.js
+++ /dev/null
@@ -1,11 +0,0 @@
-//@flow
-import React from "react";
-import Button, { type ButtonProps } from "./Button";
-
-class AddButton extends React.Component<ButtonProps> {
-  render() {
-    return <Button type="default" {...this.props} />;
-  }
-}
-
-export default AddButton;
diff --git a/scm-ui/src/components/buttons/Button.js b/scm-ui/src/components/buttons/Button.js
index 242950ef11..5eedc6c046 100644
--- a/scm-ui/src/components/buttons/Button.js
+++ b/scm-ui/src/components/buttons/Button.js
@@ -10,7 +10,8 @@ export type ButtonProps = {
   action?: () => void,
   link?: string,
   fullWidth?: boolean,
-  className?: string
+  className?: string,
+  classes: any
 };
 
 type Props = ButtonProps & {
diff --git a/scm-ui/src/components/buttons/CreateButton.js b/scm-ui/src/components/buttons/CreateButton.js
new file mode 100644
index 0000000000..6da2c20548
--- /dev/null
+++ b/scm-ui/src/components/buttons/CreateButton.js
@@ -0,0 +1,24 @@
+//@flow
+import React from "react";
+import injectSheet from "react-jss";
+import Button, { type ButtonProps } from "./Button";
+import classNames from "classnames";
+
+const styles = {
+  spacing: {
+    margin: "1em 0 0 1em"
+  }
+};
+
+class CreateButton extends React.Component<ButtonProps> {
+  render() {
+    const { classes } = this.props;
+    return (
+      <div className={classNames("is-pulled-right", classes.spacing)}>
+        <Button type="default" {...this.props} />
+      </div>
+    );
+  }
+}
+
+export default injectSheet(styles)(CreateButton);
diff --git a/scm-ui/src/components/buttons/index.js b/scm-ui/src/components/buttons/index.js
index 47f0d34ad2..1af7a7330d 100644
--- a/scm-ui/src/components/buttons/index.js
+++ b/scm-ui/src/components/buttons/index.js
@@ -1,4 +1,4 @@
-export { default as AddButton } from "./AddButton";
+export { default as CreateButton } from "./CreateButton";
 export { default as Button } from "./Button";
 export { default as DeleteButton } from "./DeleteButton";
 export { default as EditButton } from "./EditButton";
diff --git a/scm-ui/src/components/forms/Select.js b/scm-ui/src/components/forms/Select.js
new file mode 100644
index 0000000000..7918d747ec
--- /dev/null
+++ b/scm-ui/src/components/forms/Select.js
@@ -0,0 +1,59 @@
+//@flow
+import React from "react";
+
+export type SelectItem = {
+  value: string,
+  label: string
+};
+
+type Props = {
+  label?: string,
+  options: SelectItem[],
+  value?: SelectItem,
+  onChange: string => void
+};
+
+class Select extends React.Component<Props> {
+  field: ?HTMLSelectElement;
+
+  handleInput = (event: SyntheticInputEvent<HTMLSelectElement>) => {
+    this.props.onChange(event.target.value);
+  };
+
+  renderLabel = () => {
+    const label = this.props.label;
+    if (label) {
+      return <label className="label">{label}</label>;
+    }
+    return "";
+  };
+
+  render() {
+    const { options, value } = this.props;
+
+    return (
+      <div className="field">
+        {this.renderLabel()}
+        <div className="control select">
+          <select
+            ref={input => {
+              this.field = input;
+            }}
+            value={value}
+            onChange={this.handleInput}
+          >
+            {options.map(opt => {
+              return (
+                <option value={opt.value} key={opt.value}>
+                  {opt.label}
+                </option>
+              );
+            })}
+          </select>
+        </div>
+      </div>
+    );
+  }
+}
+
+export default Select;
diff --git a/scm-ui/src/components/forms/index.js b/scm-ui/src/components/forms/index.js
index fd2744cf23..1564347fac 100644
--- a/scm-ui/src/components/forms/index.js
+++ b/scm-ui/src/components/forms/index.js
@@ -1,2 +1,3 @@
 export { default as Checkbox } from "./Checkbox";
 export { default as InputField } from "./InputField";
+export { default as Select } from "./Select";
diff --git a/scm-ui/src/components/validation.js b/scm-ui/src/components/validation.js
new file mode 100644
index 0000000000..fd61da57a5
--- /dev/null
+++ b/scm-ui/src/components/validation.js
@@ -0,0 +1,12 @@
+// @flow
+const nameRegex = /^([A-z0-9.\-_@]|[^ ]([A-z0-9.\-_@ ]*[A-z0-9.\-_@]|[^\s])?)$/;
+
+export const isNameValid = (name: string) => {
+  return nameRegex.test(name);
+};
+
+const mailRegex = /^[A-z0-9][\w.-]*@[A-z0-9][\w\-.]*\.[A-z0-9][A-z0-9-]+$/;
+
+export const isMailValid = (mail: string) => {
+  return mailRegex.test(mail);
+};
diff --git a/scm-ui/src/components/validation.test.js b/scm-ui/src/components/validation.test.js
new file mode 100644
index 0000000000..3ec6e7a575
--- /dev/null
+++ b/scm-ui/src/components/validation.test.js
@@ -0,0 +1,75 @@
+import * as validator from "./validation";
+
+describe("test name validation", () => {
+  it("should return false", () => {
+    // invalid names taken from ValidationUtilTest.java
+    const invalidNames = [
+      " test 123",
+      " test 123 ",
+      "test 123 ",
+      "test/123",
+      "test%123",
+      "test:123",
+      "t ",
+      " t",
+      " t ",
+      ""
+    ];
+    for (let name of invalidNames) {
+      expect(validator.isNameValid(name)).toBe(false);
+    }
+  });
+
+  it("should return true", () => {
+    // valid names taken from ValidationUtilTest.java
+    const validNames = [
+      "test",
+      "test.git",
+      "Test123.git",
+      "Test123-git",
+      "Test_user-123.git",
+      "test@scm-manager.de",
+      "test 123",
+      "tt",
+      "t"
+    ];
+    for (let name of validNames) {
+      expect(validator.isNameValid(name)).toBe(true);
+    }
+  });
+});
+
+describe("test mail validation", () => {
+  it("should return false", () => {
+    // invalid taken from ValidationUtilTest.java
+    const invalid = [
+      "ostfalia.de",
+      "@ostfalia.de",
+      "s.sdorra@",
+      "s.sdorra@ostfalia",
+      "s.sdorra@@ostfalia.de",
+      "s.sdorra@ ostfalia.de",
+      "s.sdorra @ostfalia.de"
+    ];
+    for (let mail of invalid) {
+      expect(validator.isMailValid(mail)).toBe(false);
+    }
+  });
+
+  it("should return true", () => {
+    // valid taken from ValidationUtilTest.java
+    const valid = [
+      "s.sdorra@ostfalia.de",
+      "sdorra@ostfalia.de",
+      "s.sdorra@hbk-bs.de",
+      "s.sdorra@gmail.com",
+      "s.sdorra@t.co",
+      "s.sdorra@ucla.college",
+      "s.sdorra@example.xn--p1ai",
+      "s.sdorra@scm.solutions"
+    ];
+    for (let mail of valid) {
+      expect(validator.isMailValid(mail)).toBe(true);
+    }
+  });
+});
diff --git a/scm-ui/src/containers/Main.js b/scm-ui/src/containers/Main.js
index 1c5cface29..2c93cb06d0 100644
--- a/scm-ui/src/containers/Main.js
+++ b/scm-ui/src/containers/Main.js
@@ -12,7 +12,8 @@ import { Switch } from "react-router-dom";
 import ProtectedRoute from "../components/ProtectedRoute";
 import AddUser from "../users/containers/AddUser";
 import SingleUser from "../users/containers/SingleUser";
-import RepositoryRoot from '../repos/containers/RepositoryRoot';
+import RepositoryRoot from "../repos/containers/RepositoryRoot";
+import Create from "../repos/containers/Create";
 
 type Props = {
   authenticated?: boolean
@@ -33,6 +34,12 @@ class Main extends React.Component<Props> {
             component={Overview}
             authenticated={authenticated}
           />
+          <ProtectedRoute
+            exact
+            path="/repos/create"
+            component={Create}
+            authenticated={authenticated}
+          />
           <ProtectedRoute
             exact
             path="/repos/:page"
diff --git a/scm-ui/src/createReduxStore.js b/scm-ui/src/createReduxStore.js
index 24e1046b29..a360381810 100644
--- a/scm-ui/src/createReduxStore.js
+++ b/scm-ui/src/createReduxStore.js
@@ -6,6 +6,7 @@ import { routerReducer, routerMiddleware } from "react-router-redux";
 
 import users from "./users/modules/users";
 import repos from "./repos/modules/repos";
+import repositoryTypes from "./repos/modules/repository-types";
 import auth from "./modules/auth";
 import pending from "./modules/pending";
 import failure from "./modules/failure";
@@ -22,6 +23,7 @@ function createReduxStore(history: BrowserHistory) {
     failure,
     users,
     repos,
+    repositoryTypes,
     auth
   });
 
diff --git a/scm-ui/src/repos/components/RepositoryForm.js b/scm-ui/src/repos/components/RepositoryForm.js
new file mode 100644
index 0000000000..3c83f88115
--- /dev/null
+++ b/scm-ui/src/repos/components/RepositoryForm.js
@@ -0,0 +1,167 @@
+// @flow
+import React from "react";
+import { translate } from "react-i18next";
+import { InputField, Select } from "../../components/forms";
+import { SubmitButton } from "../../components/buttons";
+import type { Repository } from "../types/Repositories";
+import * as validator from "./repositoryValidation";
+import type { RepositoryType } from "../types/RepositoryTypes";
+
+type Props = {
+  submitForm: Repository => void,
+  repository?: Repository,
+  repositoryTypes: RepositoryType[],
+  loading?: boolean,
+  t: string => string
+};
+
+type State = {
+  repository: Repository,
+  nameValidationError: boolean,
+  contactValidationError: boolean
+};
+
+class RepositoryForm extends React.Component<Props, State> {
+  constructor(props: Props) {
+    super(props);
+
+    this.state = {
+      repository: {
+        name: "",
+        namespace: "",
+        type: "",
+        contact: "",
+        description: "",
+        _links: {}
+      },
+      nameValidationError: false,
+      contactValidationError: false,
+      descriptionValidationError: false
+    };
+  }
+
+  componentDidMount() {
+    const { repository } = this.props;
+    if (repository) {
+      this.setState({ repository: { ...repository } });
+    }
+  }
+
+  isFalsy(value) {
+    if (!value) {
+      return true;
+    }
+    return false;
+  }
+
+  isValid = () => {
+    const repository = this.state.repository;
+    return !(
+      this.state.nameValidationError ||
+      this.state.contactValidationError ||
+      this.isFalsy(repository.name)
+    );
+  };
+
+  submit = (event: Event) => {
+    event.preventDefault();
+    if (this.isValid()) {
+      this.props.submitForm(this.state.repository);
+    }
+  };
+
+  isCreateMode = () => {
+    return !this.props.repository;
+  };
+
+  render() {
+    const { loading, t } = this.props;
+    const repository = this.state.repository;
+
+    return (
+      <form onSubmit={this.submit}>
+        {this.renderCreateOnlyFields()}
+        <InputField
+          label={t("repository.contact")}
+          onChange={this.handleContactChange}
+          value={repository ? repository.contact : ""}
+          validationError={this.state.contactValidationError}
+          errorMessage={t("validation.contact-invalid")}
+        />
+
+        <InputField
+          label={t("repository.description")}
+          onChange={this.handleDescriptionChange}
+          value={repository ? repository.description : ""}
+        />
+        <SubmitButton
+          disabled={!this.isValid()}
+          loading={loading}
+          label={t("repository-form.submit")}
+        />
+      </form>
+    );
+  }
+
+  createSelectOptions(repositoryTypes: RepositoryType[]) {
+    return repositoryTypes.map(repositoryType => {
+      return {
+        label: repositoryType.displayName,
+        value: repositoryType.name
+      };
+    });
+  }
+
+  renderCreateOnlyFields() {
+    if (!this.isCreateMode()) {
+      return null;
+    }
+    const { repositoryTypes, t } = this.props;
+    const repository = this.state.repository;
+    return (
+      <div>
+        <InputField
+          label={t("repository.name")}
+          onChange={this.handleNameChange}
+          value={repository ? repository.name : ""}
+          validationError={this.state.nameValidationError}
+          errorMessage={t("validation.name-invalid")}
+        />
+        <Select
+          label={t("repository.type")}
+          onChange={this.handleTypeChange}
+          value={repository ? repository.type : ""}
+          options={this.createSelectOptions(repositoryTypes)}
+        />
+      </div>
+    );
+  }
+
+  handleNameChange = (name: string) => {
+    this.setState({
+      nameValidationError: !validator.isNameValid(name),
+      repository: { ...this.state.repository, name }
+    });
+  };
+
+  handleTypeChange = (type: string) => {
+    this.setState({
+      repository: { ...this.state.repository, type }
+    });
+  };
+
+  handleContactChange = (contact: string) => {
+    this.setState({
+      contactValidationError: !validator.isContactValid(contact),
+      repository: { ...this.state.repository, contact }
+    });
+  };
+
+  handleDescriptionChange = (description: string) => {
+    this.setState({
+      repository: { ...this.state.repository, description }
+    });
+  };
+}
+
+export default translate("repos")(RepositoryForm);
diff --git a/scm-ui/src/repos/components/repositoryValidation.js b/scm-ui/src/repos/components/repositoryValidation.js
new file mode 100644
index 0000000000..d85b961c99
--- /dev/null
+++ b/scm-ui/src/repos/components/repositoryValidation.js
@@ -0,0 +1,10 @@
+// @flow
+import * as generalValidator from "../../components/validation";
+
+export const isNameValid = (name: string) => {
+  return generalValidator.isNameValid(name);
+};
+
+export function isContactValid(mail: string) {
+  return "" === mail || generalValidator.isMailValid(mail);
+}
diff --git a/scm-ui/src/repos/components/repositoryValidation.test.js b/scm-ui/src/repos/components/repositoryValidation.test.js
new file mode 100644
index 0000000000..bcb29f3ef7
--- /dev/null
+++ b/scm-ui/src/repos/components/repositoryValidation.test.js
@@ -0,0 +1,31 @@
+import * as validator from "./repositoryValidation";
+
+describe("repository name validation", () => {
+  // we don't need rich tests, because they are in validation.test.js
+  it("should validate the name", () => {
+    expect(validator.isNameValid("scm-manager")).toBe(true);
+  });
+
+  it("should fail for old nested repository names", () => {
+    // in v2 this is not allowed
+    expect(validator.isNameValid("scm/manager")).toBe(false);
+    expect(validator.isNameValid("scm/ma/nager")).toBe(false);
+  });
+});
+
+describe("repository contact validation", () => {
+  it("should allow empty contact", () => {
+    expect(validator.isContactValid("")).toBe(true);
+  });
+
+  // we don't need rich tests, because they are in validation.test.js
+  it("should allow real mail addresses", () => {
+    expect(validator.isContactValid("trici.mcmillian@hitchhiker.com")).toBe(
+      true
+    );
+  });
+
+  it("should fail on invalid mail addresses", () => {
+    expect(validator.isContactValid("tricia")).toBe(false);
+  });
+});
diff --git a/scm-ui/src/repos/containers/Create.js b/scm-ui/src/repos/containers/Create.js
new file mode 100644
index 0000000000..37197bd5a7
--- /dev/null
+++ b/scm-ui/src/repos/containers/Create.js
@@ -0,0 +1,71 @@
+// @flow
+import React from "react";
+import { connect } from "react-redux";
+import { translate } from "react-i18next";
+import { Page } from "../../components/layout";
+import RepositoryForm from "../components/RepositoryForm";
+import type { RepositoryType } from "../types/RepositoryTypes";
+import {
+  fetchRepositoryTypesIfNeeded,
+  getFetchRepositoryTypesFailure,
+  getRepositoryTypes,
+  isFetchRepositoryTypesPending
+} from "../modules/repository-types";
+
+type Props = {
+  repositoryTypes: RepositoryType[],
+  typesLoading: boolean,
+  error: Error,
+
+  // dispatch functions
+  fetchRepositoryTypesIfNeeded: () => void,
+
+  // context props
+  t: string => string
+};
+
+class Create extends React.Component<Props> {
+  componentDidMount() {
+    this.props.fetchRepositoryTypesIfNeeded();
+  }
+
+  render() {
+    const { typesLoading, repositoryTypes, error } = this.props;
+
+    const { t } = this.props;
+    return (
+      <Page
+        title={t("create.title")}
+        subtitle={t("create.subtitle")}
+        loading={typesLoading}
+        error={error}
+      >
+        <RepositoryForm repositoryTypes={repositoryTypes} />
+      </Page>
+    );
+  }
+}
+
+const mapStateToProps = state => {
+  const repositoryTypes = getRepositoryTypes(state);
+  const typesLoading = isFetchRepositoryTypesPending(state);
+  const error = getFetchRepositoryTypesFailure(state);
+  return {
+    repositoryTypes,
+    typesLoading,
+    error
+  };
+};
+
+const mapDispatchToProps = dispatch => {
+  return {
+    fetchRepositoryTypesIfNeeded: () => {
+      dispatch(fetchRepositoryTypesIfNeeded());
+    }
+  };
+};
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(translate("repos")(Create));
diff --git a/scm-ui/src/repos/containers/Overview.js b/scm-ui/src/repos/containers/Overview.js
index ab85b04424..d466ff50d4 100644
--- a/scm-ui/src/repos/containers/Overview.js
+++ b/scm-ui/src/repos/containers/Overview.js
@@ -4,13 +4,21 @@ import React from "react";
 import type { RepositoryCollection } from "../types/Repositories";
 
 import { connect } from "react-redux";
-import {fetchRepos, fetchReposByLink, fetchReposByPage, getFetchReposFailure, getRepositoryCollection, isFetchReposPending} from "../modules/repos";
+import {
+  fetchRepos,
+  fetchReposByLink,
+  fetchReposByPage,
+  getFetchReposFailure,
+  getRepositoryCollection,
+  isFetchReposPending
+} from "../modules/repos";
 import { translate } from "react-i18next";
 import { Page } from "../../components/layout";
 import RepositoryList from "../components/RepositoryList";
-import Paginator from '../../components/Paginator';
-import {withRouter} from 'react-router-dom';
+import Paginator from "../../components/Paginator";
+import { withRouter } from "react-router-dom";
 import type { History } from "history";
+import CreateButton from "../../components/buttons/CreateButton";
 
 type Props = {
   page: number,
@@ -44,24 +52,33 @@ class Overview extends React.Component<Props> {
         this.props.history.push(`/repos/${statePage}`);
       }
     }
-  };
+  }
 
   render() {
     const { error, loading, t } = this.props;
     return (
-      <Page title={t("overview.title")} subtitle={t("overview.subtitle")} loading={loading} error={error}>
+      <Page
+        title={t("overview.title")}
+        subtitle={t("overview.subtitle")}
+        loading={loading}
+        error={error}
+      >
         {this.renderList()}
       </Page>
     );
   }
 
   renderList() {
-    const { collection, fetchReposByLink } = this.props;
+    const { collection, fetchReposByLink, t } = this.props;
     if (collection) {
       return (
         <div>
           <RepositoryList repositories={collection._embedded.repositories} />
           <Paginator collection={collection} onPageChange={fetchReposByLink} />
+          <CreateButton
+            label={t("overview.create-button")}
+            link="/repos/create"
+          />
         </div>
       );
     }
@@ -98,10 +115,10 @@ const mapDispatchToProps = dispatch => {
       dispatch(fetchRepos());
     },
     fetchReposByPage: (page: number) => {
-      dispatch(fetchReposByPage(page))
+      dispatch(fetchReposByPage(page));
     },
     fetchReposByLink: (link: string) => {
-      dispatch(fetchReposByLink(link))
+      dispatch(fetchReposByLink(link));
     }
   };
 };
diff --git a/scm-ui/src/repos/modules/repository-types.js b/scm-ui/src/repos/modules/repository-types.js
new file mode 100644
index 0000000000..1231486cfc
--- /dev/null
+++ b/scm-ui/src/repos/modules/repository-types.js
@@ -0,0 +1,107 @@
+// @flow
+
+import * as types from "../../modules/types";
+import type { Action } from "../../types/Action";
+import type {
+  RepositoryType,
+  RepositoryTypeCollection
+} from "../types/RepositoryTypes";
+import { apiClient } from "../../apiclient";
+import { isPending } from "../../modules/pending";
+import { getFailure } from "../../modules/failure";
+
+export const FETCH_REPOSITORY_TYPES = "scm/repos/FETCH_REPOSITORY_TYPES";
+export const FETCH_REPOSITORY_TYPES_PENDING = `${FETCH_REPOSITORY_TYPES}_${
+  types.PENDING_SUFFIX
+}`;
+export const FETCH_REPOSITORY_TYPES_SUCCESS = `${FETCH_REPOSITORY_TYPES}_${
+  types.SUCCESS_SUFFIX
+}`;
+export const FETCH_REPOSITORY_TYPES_FAILURE = `${FETCH_REPOSITORY_TYPES}_${
+  types.FAILURE_SUFFIX
+}`;
+
+export function fetchRepositoryTypesIfNeeded() {
+  return function(dispatch: any, getState: () => Object) {
+    if (shouldFetchRepositoryTypes(getState())) {
+      return fetchRepositoryTypes(dispatch);
+    }
+  };
+}
+
+function fetchRepositoryTypes(dispatch: any) {
+  dispatch(fetchRepositoryTypesPending());
+  return apiClient
+    .get("repository-types")
+    .then(response => response.json())
+    .then(repositoryTypes => {
+      dispatch(fetchRepositoryTypesSuccess(repositoryTypes));
+    })
+    .catch(err => {
+      dispatch(fetchRepositoryTypesFailure(err));
+    });
+}
+
+export function shouldFetchRepositoryTypes(state: Object) {
+  if (
+    isFetchRepositoryTypesPending(state) ||
+    getFetchRepositoryTypesFailure(state)
+  ) {
+    return false;
+  }
+  if (state.repositoryTypes && state.repositoryTypes.length > 0) {
+    return false;
+  }
+  return true;
+}
+
+export function fetchRepositoryTypesPending(): Action {
+  return {
+    type: FETCH_REPOSITORY_TYPES_PENDING
+  };
+}
+
+export function fetchRepositoryTypesSuccess(
+  repositoryTypes: RepositoryTypeCollection
+): Action {
+  return {
+    type: FETCH_REPOSITORY_TYPES_SUCCESS,
+    payload: repositoryTypes
+  };
+}
+
+export function fetchRepositoryTypesFailure(error: Error): Action {
+  return {
+    type: FETCH_REPOSITORY_TYPES_FAILURE,
+    payload: error
+  };
+}
+
+// reducers
+
+export default function reducer(
+  state: RepositoryType[] = [],
+  action: Action = { type: "UNKNOWN" }
+): RepositoryType[] {
+  if (action.type === FETCH_REPOSITORY_TYPES_SUCCESS && action.payload) {
+    return action.payload._embedded["repository-types"];
+  }
+  return state;
+}
+
+// selectors
+
+export function getRepositoryTypes(state: Object) {
+  if (state.repositoryTypes) {
+    return state.repositoryTypes;
+  }
+  return [];
+}
+
+export function isFetchRepositoryTypesPending(state: Object) {
+  return isPending(state, FETCH_REPOSITORY_TYPES);
+}
+
+export function getFetchRepositoryTypesFailure(state: Object) {
+  return getFailure(state, FETCH_REPOSITORY_TYPES);
+}
diff --git a/scm-ui/src/repos/modules/repository-types.test.js b/scm-ui/src/repos/modules/repository-types.test.js
new file mode 100644
index 0000000000..578a814ff0
--- /dev/null
+++ b/scm-ui/src/repos/modules/repository-types.test.js
@@ -0,0 +1,198 @@
+// @flow
+
+import fetchMock from "fetch-mock";
+import configureMockStore from "redux-mock-store";
+import thunk from "redux-thunk";
+import {
+  FETCH_REPOSITORY_TYPES,
+  FETCH_REPOSITORY_TYPES_FAILURE,
+  FETCH_REPOSITORY_TYPES_PENDING,
+  FETCH_REPOSITORY_TYPES_SUCCESS,
+  fetchRepositoryTypesIfNeeded,
+  fetchRepositoryTypesSuccess,
+  getFetchRepositoryTypesFailure,
+  getRepositoryTypes,
+  isFetchRepositoryTypesPending,
+  shouldFetchRepositoryTypes
+} from "./repository-types";
+import reducer from "./repository-types";
+
+const git = {
+  name: "git",
+  displayName: "Git",
+  _links: {
+    self: {
+      href: "http://localhost:8081/scm/api/rest/v2/repository-types/git"
+    }
+  }
+};
+
+const hg = {
+  name: "hg",
+  displayName: "Mercurial",
+  _links: {
+    self: {
+      href: "http://localhost:8081/scm/api/rest/v2/repository-types/hg"
+    }
+  }
+};
+
+const svn = {
+  name: "svn",
+  displayName: "Subversion",
+  _links: {
+    self: {
+      href: "http://localhost:8081/scm/api/rest/v2/repository-types/svn"
+    }
+  }
+};
+
+const collection = {
+  _embedded: {
+    "repository-types": [git, hg, svn]
+  },
+  _links: {
+    self: {
+      href: "http://localhost:8081/scm/api/rest/v2/repository-types"
+    }
+  }
+};
+
+describe("repository types caching", () => {
+  it("should fetch repository types, on empty state", () => {
+    expect(shouldFetchRepositoryTypes({})).toBe(true);
+  });
+
+  it("should fetch repository types, if the state contains an empty array", () => {
+    const state = {
+      repositoryTypes: []
+    };
+    expect(shouldFetchRepositoryTypes(state)).toBe(true);
+  });
+
+  it("should not fetch repository types, on pending state", () => {
+    const state = {
+      pending: {
+        [FETCH_REPOSITORY_TYPES]: true
+      }
+    };
+    expect(shouldFetchRepositoryTypes(state)).toBe(false);
+  });
+
+  it("should not fetch repository types, on failure state", () => {
+    const state = {
+      failure: {
+        [FETCH_REPOSITORY_TYPES]: new Error("no...")
+      }
+    };
+    expect(shouldFetchRepositoryTypes(state)).toBe(false);
+  });
+
+  it("should not fetch repository types, if they are already fetched", () => {
+    const state = {
+      repositoryTypes: [git, hg, svn]
+    };
+    expect(shouldFetchRepositoryTypes(state)).toBe(false);
+  });
+});
+
+describe("repository types fetch", () => {
+  const URL = "/scm/api/rest/v2/repository-types";
+  const mockStore = configureMockStore([thunk]);
+
+  afterEach(() => {
+    fetchMock.reset();
+    fetchMock.restore();
+  });
+
+  it("should successfully fetch repository types", () => {
+    fetchMock.getOnce(URL, collection);
+
+    const expectedActions = [
+      { type: FETCH_REPOSITORY_TYPES_PENDING },
+      {
+        type: FETCH_REPOSITORY_TYPES_SUCCESS,
+        payload: collection
+      }
+    ];
+
+    const store = mockStore({});
+    return store.dispatch(fetchRepositoryTypesIfNeeded()).then(() => {
+      expect(store.getActions()).toEqual(expectedActions);
+    });
+  });
+
+  it("should dispatch FETCH_REPOSITORY_TYPES_FAILURE on server error", () => {
+    fetchMock.getOnce(URL, {
+      status: 500
+    });
+
+    const store = mockStore({});
+    return store.dispatch(fetchRepositoryTypesIfNeeded()).then(() => {
+      const actions = store.getActions();
+      expect(actions[0].type).toBe(FETCH_REPOSITORY_TYPES_PENDING);
+      expect(actions[1].type).toBe(FETCH_REPOSITORY_TYPES_FAILURE);
+      expect(actions[1].payload).toBeDefined();
+    });
+  });
+
+  it("should dispatch not dispatch any action, if the repository types are already fetched", () => {
+    const store = mockStore({
+      repositoryTypes: [git, hg, svn]
+    });
+    store.dispatch(fetchRepositoryTypesIfNeeded());
+    expect(store.getActions().length).toBe(0);
+  });
+});
+
+describe("repository types reducer", () => {
+  it("should return unmodified state on unknown action", () => {
+    const state = [];
+    expect(reducer(state)).toBe(state);
+  });
+  it("should store the repository types on FETCH_REPOSITORY_TYPES_SUCCESS", () => {
+    const newState = reducer([], fetchRepositoryTypesSuccess(collection));
+    expect(newState).toEqual([git, hg, svn]);
+  });
+});
+
+describe("repository types selectors", () => {
+  const error = new Error("The end of the universe");
+
+  it("should return an emtpy array", () => {
+    expect(getRepositoryTypes({})).toEqual([]);
+  });
+
+  it("should return the repository types", () => {
+    const state = {
+      repositoryTypes: [git, hg, svn]
+    };
+    expect(getRepositoryTypes(state)).toEqual([git, hg, svn]);
+  });
+
+  it("should return true, when fetch repository types is pending", () => {
+    const state = {
+      pending: {
+        [FETCH_REPOSITORY_TYPES]: true
+      }
+    };
+    expect(isFetchRepositoryTypesPending(state)).toEqual(true);
+  });
+
+  it("should return false, when fetch repos is not pending", () => {
+    expect(isFetchRepositoryTypesPending({})).toEqual(false);
+  });
+
+  it("should return error when fetch repository types did fail", () => {
+    const state = {
+      failure: {
+        [FETCH_REPOSITORY_TYPES]: error
+      }
+    };
+    expect(getFetchRepositoryTypesFailure(state)).toEqual(error);
+  });
+
+  it("should return undefined when fetch repos did not fail", () => {
+    expect(getFetchRepositoryTypesFailure({})).toBe(undefined);
+  });
+});
diff --git a/scm-ui/src/repos/types/RepositoryTypes.js b/scm-ui/src/repos/types/RepositoryTypes.js
new file mode 100644
index 0000000000..069b901b56
--- /dev/null
+++ b/scm-ui/src/repos/types/RepositoryTypes.js
@@ -0,0 +1,14 @@
+// @flow
+
+import type { Collection } from "../../types/Collection";
+
+export type RepositoryType = {
+  name: string,
+  displayName: string
+};
+
+export type RepositoryTypeCollection = Collection & {
+  _embedded: {
+    "repository-types": RepositoryType[]
+  }
+};
diff --git a/scm-ui/src/users/components/UserForm.js b/scm-ui/src/users/components/UserForm.js
index 39189ca127..7a44eda272 100644
--- a/scm-ui/src/users/components/UserForm.js
+++ b/scm-ui/src/users/components/UserForm.js
@@ -4,7 +4,8 @@ import { translate } from "react-i18next";
 import type { User } from "../types/User";
 import { Checkbox, InputField } from "../../components/forms";
 import { SubmitButton } from "../../components/buttons";
-import * as validator from "./userValidation";
+import * as validator from "../../components/validation";
+import * as userValidator from "./userValidation";
 
 type Props = {
   submitForm: User => void,
@@ -157,7 +158,9 @@ class UserForm extends React.Component<Props, State> {
 
   handleDisplayNameChange = (displayName: string) => {
     this.setState({
-      displayNameValidationError: !validator.isDisplayNameValid(displayName),
+      displayNameValidationError: !userValidator.isDisplayNameValid(
+        displayName
+      ),
       user: { ...this.state.user, displayName }
     });
   };
@@ -175,7 +178,7 @@ class UserForm extends React.Component<Props, State> {
       this.state.validatePassword
     );
     this.setState({
-      validatePasswordError: !validator.isPasswordValid(password),
+      validatePasswordError: !userValidator.isPasswordValid(password),
       passwordValidationError: validatePasswordError,
       user: { ...this.state.user, password }
     });
diff --git a/scm-ui/src/users/components/buttons/CreateUserButton.js b/scm-ui/src/users/components/buttons/CreateUserButton.js
index 91d4292509..000f7ca315 100644
--- a/scm-ui/src/users/components/buttons/CreateUserButton.js
+++ b/scm-ui/src/users/components/buttons/CreateUserButton.js
@@ -1,30 +1,20 @@
 //@flow
 import React from "react";
-import injectSheet from "react-jss";
 import { translate } from "react-i18next";
-import { AddButton } from "../../../components/buttons";
-import classNames from "classnames";
-
-const styles = {
-  spacing: {
-    margin: "1em 0 0 1em"
-  }
-};
+import { CreateButton } from "../../../components/buttons";
 
+// TODO remove
 type Props = {
-  t: string => string,
-  classes: any
+  t: string => string
 };
 
 class CreateUserButton extends React.Component<Props> {
   render() {
-    const { classes, t } = this.props;
+    const { t } = this.props;
     return (
-      <div className={classNames("is-pulled-right", classes.spacing)}>
-        <AddButton label={t("create-user-button.label")} link="/users/add" />
-      </div>
+      <CreateButton label={t("create-user-button.label")} link="/users/add" />
     );
   }
 }
 
-export default translate("users")(injectSheet(styles)(CreateUserButton));
+export default translate("users")(CreateUserButton);
diff --git a/scm-ui/src/users/components/userValidation.js b/scm-ui/src/users/components/userValidation.js
index a5d592e4fb..77b6c08c16 100644
--- a/scm-ui/src/users/components/userValidation.js
+++ b/scm-ui/src/users/components/userValidation.js
@@ -1,24 +1,11 @@
 // @flow
 
-const nameRegex = /^([A-z0-9.\-_@]|[^ ]([A-z0-9.\-_@ ]*[A-z0-9.\-_@]|[^\s])?)$/;
-
-export const isNameValid = (name: string) => {
-  return nameRegex.test(name);
-};
-
 export const isDisplayNameValid = (displayName: string) => {
   if (displayName) {
     return true;
   }
   return false;
 };
-
-const mailRegex = /^[A-z0-9][\w.-]*@[A-z0-9][\w\-.]*\.[A-z0-9][A-z0-9-]+$/;
-
-export const isMailValid = (mail: string) => {
-  return mailRegex.test(mail);
-};
-
 export const isPasswordValid = (password: string) => {
   return password.length > 6 && password.length < 32;
 };
diff --git a/scm-ui/src/users/components/userValidation.test.js b/scm-ui/src/users/components/userValidation.test.js
index 370247fe90..9e09cd725c 100644
--- a/scm-ui/src/users/components/userValidation.test.js
+++ b/scm-ui/src/users/components/userValidation.test.js
@@ -1,45 +1,6 @@
 // @flow
 import * as validator from "./userValidation";
 
-describe("test name validation", () => {
-  it("should return false", () => {
-    // invalid names taken from ValidationUtilTest.java
-    const invalidNames = [
-      " test 123",
-      " test 123 ",
-      "test 123 ",
-      "test/123",
-      "test%123",
-      "test:123",
-      "t ",
-      " t",
-      " t ",
-      ""
-    ];
-    for (let name of invalidNames) {
-      expect(validator.isNameValid(name)).toBe(false);
-    }
-  });
-
-  it("should return true", () => {
-    // valid names taken from ValidationUtilTest.java
-    const validNames = [
-      "test",
-      "test.git",
-      "Test123.git",
-      "Test123-git",
-      "Test_user-123.git",
-      "test@scm-manager.de",
-      "test 123",
-      "tt",
-      "t"
-    ];
-    for (let name of validNames) {
-      expect(validator.isNameValid(name)).toBe(true);
-    }
-  });
-});
-
 describe("test displayName validation", () => {
   it("should return false", () => {
     expect(validator.isDisplayNameValid("")).toBe(false);
@@ -60,41 +21,6 @@ describe("test displayName validation", () => {
   });
 });
 
-describe("test mail validation", () => {
-  it("should return false", () => {
-    // invalid taken from ValidationUtilTest.java
-    const invalid = [
-      "ostfalia.de",
-      "@ostfalia.de",
-      "s.sdorra@",
-      "s.sdorra@ostfalia",
-      "s.sdorra@@ostfalia.de",
-      "s.sdorra@ ostfalia.de",
-      "s.sdorra @ostfalia.de"
-    ];
-    for (let mail of invalid) {
-      expect(validator.isMailValid(mail)).toBe(false);
-    }
-  });
-
-  it("should return true", () => {
-    // valid taken from ValidationUtilTest.java
-    const valid = [
-      "s.sdorra@ostfalia.de",
-      "sdorra@ostfalia.de",
-      "s.sdorra@hbk-bs.de",
-      "s.sdorra@gmail.com",
-      "s.sdorra@t.co",
-      "s.sdorra@ucla.college",
-      "s.sdorra@example.xn--p1ai",
-      "s.sdorra@scm.solutions"
-    ];
-    for (let mail of valid) {
-      expect(validator.isMailValid(mail)).toBe(true);
-    }
-  });
-});
-
 describe("test password validation", () => {
   it("should return false", () => {
     // invalid taken from ValidationUtilTest.java

From f2f806cf1d294cb32273f58b30b6b22acbb614d0 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Thu, 2 Aug 2018 16:18:34 +0200
Subject: [PATCH 18/51] use textarea instead of input for repository
 description

---
 scm-ui/src/components/forms/Textarea.js       | 54 +++++++++++++++++++
 scm-ui/src/repos/components/RepositoryForm.js |  3 +-
 2 files changed, 56 insertions(+), 1 deletion(-)
 create mode 100644 scm-ui/src/components/forms/Textarea.js

diff --git a/scm-ui/src/components/forms/Textarea.js b/scm-ui/src/components/forms/Textarea.js
new file mode 100644
index 0000000000..3144c00d0c
--- /dev/null
+++ b/scm-ui/src/components/forms/Textarea.js
@@ -0,0 +1,54 @@
+//@flow
+import React from "react";
+
+export type SelectItem = {
+  value: string,
+  label: string
+};
+
+type Props = {
+  label?: string,
+  placeholder?: SelectItem[],
+  value?: string,
+  onChange: string => void
+};
+
+class Textarea extends React.Component<Props> {
+  field: ?HTMLTextAreaElement;
+
+  handleInput = (event: SyntheticInputEvent<HTMLTextAreaElement>) => {
+    this.props.onChange(event.target.value);
+  };
+
+  renderLabel = () => {
+    const label = this.props.label;
+    if (label) {
+      return <label className="label">{label}</label>;
+    }
+    return "";
+  };
+
+  render() {
+    const { placeholder, value } = this.props;
+
+    return (
+      <div className="field">
+        {this.renderLabel()}
+        <div className="control">
+          <textarea
+            className="textarea"
+            ref={input => {
+              this.field = input;
+            }}
+            placeholder={placeholder}
+            onChange={this.handleInput}
+          >
+            {value}
+          </textarea>
+        </div>
+      </div>
+    );
+  }
+}
+
+export default Textarea;
diff --git a/scm-ui/src/repos/components/RepositoryForm.js b/scm-ui/src/repos/components/RepositoryForm.js
index 3c83f88115..92741f1d83 100644
--- a/scm-ui/src/repos/components/RepositoryForm.js
+++ b/scm-ui/src/repos/components/RepositoryForm.js
@@ -6,6 +6,7 @@ import { SubmitButton } from "../../components/buttons";
 import type { Repository } from "../types/Repositories";
 import * as validator from "./repositoryValidation";
 import type { RepositoryType } from "../types/RepositoryTypes";
+import Textarea from "../../components/forms/Textarea";
 
 type Props = {
   submitForm: Repository => void,
@@ -89,7 +90,7 @@ class RepositoryForm extends React.Component<Props, State> {
           errorMessage={t("validation.contact-invalid")}
         />
 
-        <InputField
+        <Textarea
           label={t("repository.description")}
           onChange={this.handleDescriptionChange}
           value={repository ? repository.description : ""}

From f0f57de4b5b73c1785a05a30d9acede969a3f227 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Fri, 3 Aug 2018 08:35:55 +0200
Subject: [PATCH 19/51] Remove error prone getByNamespace method

This method does not report missing permissions correctly.
---
 .../java/sonia/scm/repository/RepositoryManager.java   |  8 --------
 .../sonia/scm/api/v2/resources/RepositoryResource.java |  3 ++-
 .../api/v2/resources/RepositoryRootResourceTest.java   | 10 ++++------
 3 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/scm-core/src/main/java/sonia/scm/repository/RepositoryManager.java b/scm-core/src/main/java/sonia/scm/repository/RepositoryManager.java
index 493d8f6dbb..172108aa1b 100644
--- a/scm-core/src/main/java/sonia/scm/repository/RepositoryManager.java
+++ b/scm-core/src/main/java/sonia/scm/repository/RepositoryManager.java
@@ -41,7 +41,6 @@ import sonia.scm.TypeManager;
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.util.Collection;
-import java.util.Optional;
 
 //~--- JDK imports ------------------------------------------------------------
 
@@ -135,11 +134,4 @@ public interface RepositoryManager
    */
   @Override
   public RepositoryHandler getHandler(String type);
-
-  default Optional<Repository> getByNamespace(String namespace, String name) {
-    return getAll()
-      .stream()
-      .filter(r -> r.getName().equals(name) && r.getNamespace().equals(namespace))
-      .findFirst();
-  }
 }
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryResource.java
index 255f08f295..2c227f78f2 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryResource.java
@@ -3,6 +3,7 @@ package sonia.scm.api.v2.resources;
 import com.webcohesion.enunciate.metadata.rs.ResponseCode;
 import com.webcohesion.enunciate.metadata.rs.StatusCodes;
 import com.webcohesion.enunciate.metadata.rs.TypeHint;
+import sonia.scm.repository.NamespaceAndName;
 import sonia.scm.repository.Repository;
 import sonia.scm.repository.RepositoryException;
 import sonia.scm.repository.RepositoryIsNotArchivedException;
@@ -164,7 +165,7 @@ public class RepositoryResource {
   }
 
   private Supplier<Optional<Repository>> loadBy(String namespace, String name) {
-    return () -> manager.getByNamespace(namespace, name);
+    return () -> Optional.ofNullable(manager.get(new NamespaceAndName(namespace, name)));
   }
 
   private Predicate<Repository> nameAndNamespaceStaysTheSame(String namespace, String name) {
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryRootResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryRootResourceTest.java
index f0e875e650..888d4d6f25 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryRootResourceTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryRootResourceTest.java
@@ -13,6 +13,7 @@ import org.junit.Test;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import sonia.scm.PageResult;
+import sonia.scm.repository.NamespaceAndName;
 import sonia.scm.repository.Repository;
 import sonia.scm.repository.RepositoryException;
 import sonia.scm.repository.RepositoryIsNotArchivedException;
@@ -26,8 +27,6 @@ import java.net.URISyntaxException;
 import java.net.URL;
 
 import static java.util.Collections.singletonList;
-import static java.util.Optional.empty;
-import static java.util.Optional.of;
 import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
 import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND;
 import static javax.servlet.http.HttpServletResponse.SC_NO_CONTENT;
@@ -37,7 +36,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyObject;
-import static org.mockito.Matchers.anyString;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.never;
@@ -80,7 +78,7 @@ public class RepositoryRootResourceTest {
 
   @Test
   public void shouldFailForNotExistingRepository() throws URISyntaxException {
-    when(repositoryManager.getByNamespace(anyString(), anyString())).thenReturn(empty());
+    when(repositoryManager.get(any(NamespaceAndName.class))).thenReturn(null);
     mockRepository("space", "repo");
 
     MockHttpRequest request = MockHttpRequest.get("/" + RepositoryRootResource.REPOSITORIES_PATH_V2 + "space/other");
@@ -135,7 +133,7 @@ public class RepositoryRootResourceTest {
   public void shouldHandleUpdateForNotExistingRepository() throws URISyntaxException, IOException {
     URL url = Resources.getResource("sonia/scm/api/v2/repository-test-update.json");
     byte[] repository = Resources.toByteArray(url);
-    when(repositoryManager.getByNamespace(anyString(), anyString())).thenReturn(empty());
+    when(repositoryManager.get(any(NamespaceAndName.class))).thenReturn(null);
 
     MockHttpRequest request = MockHttpRequest
       .put("/" + RepositoryRootResource.REPOSITORIES_PATH_V2 + "space/repo")
@@ -247,7 +245,7 @@ public class RepositoryRootResourceTest {
     repository.setName(name);
     String id = namespace + "-" + name;
     repository.setId(id);
-    when(repositoryManager.getByNamespace(namespace, name)).thenReturn(of(repository));
+    when(repositoryManager.get(new NamespaceAndName(namespace, name))).thenReturn(repository);
     when(repositoryManager.get(id)).thenReturn(repository);
     return repository;
   }

From 9f4f57cdc1258b47c217af2bd3651791fa99b41a Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Fri, 3 Aug 2018 08:36:16 +0200
Subject: [PATCH 20/51] simplify the post and put api of the apiClient

---
 scm-ui/src/apiclient.js           | 55 +++++--------------------------
 scm-ui/src/users/modules/users.js |  4 +--
 2 files changed, 11 insertions(+), 48 deletions(-)

diff --git a/scm-ui/src/apiclient.js b/scm-ui/src/apiclient.js
index bcddf040aa..f8cfc4db70 100644
--- a/scm-ui/src/apiclient.js
+++ b/scm-ui/src/apiclient.js
@@ -27,7 +27,7 @@ function handleStatusCode(response: Response) {
 }
 
 export function createUrl(url: string) {
-  if (url.indexOf("://") > 0) {
+  if (url.includes("://")) {
     return url;
   }
   let urlWithStartingSlash = url;
@@ -42,26 +42,12 @@ class ApiClient {
     return fetch(createUrl(url), fetchOptions).then(handleStatusCode);
   }
 
-  post(url: string, payload: any) {
-    return this.httpRequestWithJSONBody(url, payload, "POST");
+  post(url: string, payload: any, contentType: string = "application/json") {
+    return this.httpRequestWithJSONBody("POST", url, contentType, payload);
   }
 
-  postWithContentType(url: string, payload: any, contentType: string) {
-    return this.httpRequestWithContentType(
-      url,
-      "POST",
-      JSON.stringify(payload),
-      contentType
-    );
-  }
-
-  putWithContentType(url: string, payload: any, contentType: string) {
-    return this.httpRequestWithContentType(
-      url,
-      "PUT",
-      JSON.stringify(payload),
-      contentType
-    );
+  put(url: string, payload: any, contentType: string = "application/json") {
+    return this.httpRequestWithJSONBody("PUT", url, contentType, payload);
   }
 
   delete(url: string): Promise<Response> {
@@ -73,37 +59,14 @@ class ApiClient {
   }
 
   httpRequestWithJSONBody(
-    url: string,
-    payload: any,
-    method: string
-  ): Promise<Response> {
-    // let options: RequestOptions = {
-    //   method: method,
-    //   body: JSON.stringify(payload)
-    // };
-    // options = Object.assign(options, fetchOptions);
-    // // $FlowFixMe
-    // options.headers["Content-Type"] = "application/json";
-
-    // return fetch(createUrl(url), options).then(handleStatusCode);
-
-    return this.httpRequestWithContentType(
-      url,
-      method,
-      JSON.stringify(payload),
-      "application/json"
-    ).then(handleStatusCode);
-  }
-
-  httpRequestWithContentType(
-    url: string,
     method: string,
-    payload: any,
-    contentType: string
+    url: string,
+    contentType: string,
+    payload: any
   ): Promise<Response> {
     let options: RequestOptions = {
       method: method,
-      body: payload
+      body: JSON.stringify(payload)
     };
     options = Object.assign(options, fetchOptions);
     // $FlowFixMe
diff --git a/scm-ui/src/users/modules/users.js b/scm-ui/src/users/modules/users.js
index afd77021af..767c27119b 100644
--- a/scm-ui/src/users/modules/users.js
+++ b/scm-ui/src/users/modules/users.js
@@ -143,7 +143,7 @@ export function createUser(user: User, callback?: () => void) {
   return function(dispatch: Dispatch) {
     dispatch(createUserPending(user));
     return apiClient
-      .postWithContentType(USERS_URL, user, CONTENT_TYPE_USER)
+      .post(USERS_URL, user, CONTENT_TYPE_USER)
       .then(() => {
         dispatch(createUserSuccess());
         if (callback) {
@@ -192,7 +192,7 @@ export function modifyUser(user: User, callback?: () => void) {
   return function(dispatch: Dispatch) {
     dispatch(modifyUserPending(user));
     return apiClient
-      .putWithContentType(user._links.update.href, user, CONTENT_TYPE_USER)
+      .put(user._links.update.href, user, CONTENT_TYPE_USER)
       .then(() => {
         dispatch(modifyUserSuccess(user));
         if (callback) {

From 5ddc595bf12f96a2a939f1b66fb78424acf07288 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Fri, 3 Aug 2018 08:37:09 +0200
Subject: [PATCH 21/51] don't unmount create form on error

---
 scm-ui/src/components/layout/Page.js   | 5 +++--
 scm-ui/src/users/containers/AddUser.js | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/scm-ui/src/components/layout/Page.js b/scm-ui/src/components/layout/Page.js
index d9502c6506..77d206d348 100644
--- a/scm-ui/src/components/layout/Page.js
+++ b/scm-ui/src/components/layout/Page.js
@@ -8,6 +8,7 @@ type Props = {
   subtitle?: string,
   loading?: boolean,
   error?: Error,
+  showContentOnError?: boolean,
   children: React.Node
 };
 
@@ -35,8 +36,8 @@ class Page extends React.Component<Props> {
   }
 
   renderContent() {
-    const { loading, children, error } = this.props;
-    if (error) {
+    const { loading, children, showContentOnError, error } = this.props;
+    if (error && !showContentOnError) {
       return null;
     }
     if (loading) {
diff --git a/scm-ui/src/users/containers/AddUser.js b/scm-ui/src/users/containers/AddUser.js
index a690c147e3..fe114d0cae 100644
--- a/scm-ui/src/users/containers/AddUser.js
+++ b/scm-ui/src/users/containers/AddUser.js
@@ -48,6 +48,7 @@ class AddUser extends React.Component<Props> {
         title={t("add-user.title")}
         subtitle={t("add-user.subtitle")}
         error={error}
+        showContentOnError={true}
       >
         <UserForm
           submitForm={user => this.createUser(user)}

From a70420bb0696fd2a6a179125e247769251c916ea Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Fri, 3 Aug 2018 08:38:18 +0200
Subject: [PATCH 22/51] trigger change of Select after render, if value was not
 set to fix empty without change

---
 scm-ui/src/components/forms/Select.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/scm-ui/src/components/forms/Select.js b/scm-ui/src/components/forms/Select.js
index 7918d747ec..184359cc11 100644
--- a/scm-ui/src/components/forms/Select.js
+++ b/scm-ui/src/components/forms/Select.js
@@ -16,6 +16,14 @@ type Props = {
 class Select extends React.Component<Props> {
   field: ?HTMLSelectElement;
 
+  componentDidMount() {
+    // trigger change after render, if value is null to set it to the first value
+    // of the given options.
+    if (!this.props.value && this.field && this.field.value) {
+      this.props.onChange(this.field.value);
+    }
+  }
+
   handleInput = (event: SyntheticInputEvent<HTMLSelectElement>) => {
     this.props.onChange(event.target.value);
   };

From ebe3ef8c3ec8f0b292c761b5c9ad854bd062393b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Fri, 3 Aug 2018 08:40:01 +0200
Subject: [PATCH 23/51] Remove unused exception constructors

---
 .../RepositoryIsNotArchivedException.java     | 46 ++-----------------
 .../repository/DefaultRepositoryManager.java  |  2 +-
 2 files changed, 4 insertions(+), 44 deletions(-)

diff --git a/scm-core/src/main/java/sonia/scm/repository/RepositoryIsNotArchivedException.java b/scm-core/src/main/java/sonia/scm/repository/RepositoryIsNotArchivedException.java
index 775e4714d8..3742512622 100644
--- a/scm-core/src/main/java/sonia/scm/repository/RepositoryIsNotArchivedException.java
+++ b/scm-core/src/main/java/sonia/scm/repository/RepositoryIsNotArchivedException.java
@@ -38,51 +38,11 @@ package sonia.scm.repository;
  *
  * @since 1.14
  */
-public class RepositoryIsNotArchivedException extends RepositoryException
-{
+public class RepositoryIsNotArchivedException extends RepositoryException {
 
-  /** Field description */
   private static final long serialVersionUID = 7728748133123987511L;
 
-  //~--- constructors ---------------------------------------------------------
-
-  /**
-   * Constructs ...
-   *
-   */
-  public RepositoryIsNotArchivedException() {}
-
-  /**
-   * Constructs ...
-   *
-   *
-   * @param message
-   */
-  public RepositoryIsNotArchivedException(String message)
-  {
-    super(message);
-  }
-
-  /**
-   * Constructs ...
-   *
-   *
-   * @param cause
-   */
-  public RepositoryIsNotArchivedException(Throwable cause)
-  {
-    super(cause);
-  }
-
-  /**
-   * Constructs ...
-   *
-   *
-   * @param message
-   * @param cause
-   */
-  public RepositoryIsNotArchivedException(String message, Throwable cause)
-  {
-    super(message, cause);
+  public RepositoryIsNotArchivedException() {
+    super("Repository could not be deleted, because it is not archived.");
   }
 }
diff --git a/scm-webapp/src/main/java/sonia/scm/repository/DefaultRepositoryManager.java b/scm-webapp/src/main/java/sonia/scm/repository/DefaultRepositoryManager.java
index 69e969f9cb..e380979d3c 100644
--- a/scm-webapp/src/main/java/sonia/scm/repository/DefaultRepositoryManager.java
+++ b/scm-webapp/src/main/java/sonia/scm/repository/DefaultRepositoryManager.java
@@ -172,7 +172,7 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager {
 
   private void preDelete(Repository toDelete) throws RepositoryException {
     if (configuration.isEnableRepositoryArchive() && !toDelete.isArchived()) {
-      throw new RepositoryIsNotArchivedException("Repository could not deleted, because it is not archived.");
+      throw new RepositoryIsNotArchivedException();
     }
     fireEvent(HandlerEventType.BEFORE_DELETE, toDelete);
     getHandler(toDelete).delete(toDelete);

From 211551a5bec5093323c06abe64f9376e0bb3a41b Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Fri, 3 Aug 2018 08:52:02 +0200
Subject: [PATCH 24/51] implemented create repository

---
 scm-ui/src/repos/containers/Create.js   |  48 +++++++++-
 scm-ui/src/repos/containers/Overview.js |  27 ++++--
 scm-ui/src/repos/modules/repos.js       | 113 ++++++++++++++++++++---
 scm-ui/src/repos/modules/repos.test.js  | 114 +++++++++++++++++++++++-
 4 files changed, 277 insertions(+), 25 deletions(-)

diff --git a/scm-ui/src/repos/containers/Create.js b/scm-ui/src/repos/containers/Create.js
index 37197bd5a7..664f7e2d1b 100644
--- a/scm-ui/src/repos/containers/Create.js
+++ b/scm-ui/src/repos/containers/Create.js
@@ -11,26 +11,50 @@ import {
   getRepositoryTypes,
   isFetchRepositoryTypesPending
 } from "../modules/repository-types";
+import {
+  createRepo,
+  createRepoReset,
+  getCreateRepoFailure,
+  isCreateRepoPending
+} from "../modules/repos";
+import type { Repository } from "../types/Repositories";
+import type { History } from "history";
 
 type Props = {
   repositoryTypes: RepositoryType[],
   typesLoading: boolean,
+  createLoading: boolean,
   error: Error,
 
   // dispatch functions
   fetchRepositoryTypesIfNeeded: () => void,
+  createRepo: (Repository, callback: () => void) => void,
+  resetForm: () => void,
 
   // context props
-  t: string => string
+  t: string => string,
+  history: History
 };
 
 class Create extends React.Component<Props> {
   componentDidMount() {
+    this.props.resetForm();
     this.props.fetchRepositoryTypesIfNeeded();
   }
 
+  repoCreated = () => {
+    const { history } = this.props;
+    history.push("/repos");
+  };
+
   render() {
-    const { typesLoading, repositoryTypes, error } = this.props;
+    const {
+      typesLoading,
+      createLoading,
+      repositoryTypes,
+      createRepo,
+      error
+    } = this.props;
 
     const { t } = this.props;
     return (
@@ -39,8 +63,15 @@ class Create extends React.Component<Props> {
         subtitle={t("create.subtitle")}
         loading={typesLoading}
         error={error}
+        showContentOnError={true}
       >
-        <RepositoryForm repositoryTypes={repositoryTypes} />
+        <RepositoryForm
+          repositoryTypes={repositoryTypes}
+          loading={createLoading}
+          submitForm={repo => {
+            createRepo(repo, this.repoCreated);
+          }}
+        />
       </Page>
     );
   }
@@ -49,10 +80,13 @@ class Create extends React.Component<Props> {
 const mapStateToProps = state => {
   const repositoryTypes = getRepositoryTypes(state);
   const typesLoading = isFetchRepositoryTypesPending(state);
-  const error = getFetchRepositoryTypesFailure(state);
+  const createLoading = isCreateRepoPending(state);
+  const error =
+    getFetchRepositoryTypesFailure(state) || getCreateRepoFailure(state);
   return {
     repositoryTypes,
     typesLoading,
+    createLoading,
     error
   };
 };
@@ -61,6 +95,12 @@ const mapDispatchToProps = dispatch => {
   return {
     fetchRepositoryTypesIfNeeded: () => {
       dispatch(fetchRepositoryTypesIfNeeded());
+    },
+    createRepo: (repository: Repository, callback: () => void) => {
+      dispatch(createRepo(repository, callback));
+    },
+    resetForm: () => {
+      dispatch(createRepoReset());
     }
   };
 };
diff --git a/scm-ui/src/repos/containers/Overview.js b/scm-ui/src/repos/containers/Overview.js
index d466ff50d4..54d90a354a 100644
--- a/scm-ui/src/repos/containers/Overview.js
+++ b/scm-ui/src/repos/containers/Overview.js
@@ -10,6 +10,7 @@ import {
   fetchReposByPage,
   getFetchReposFailure,
   getRepositoryCollection,
+  isAbleToCreateRepos,
   isFetchReposPending
 } from "../modules/repos";
 import { translate } from "react-i18next";
@@ -25,11 +26,13 @@ type Props = {
   collection: RepositoryCollection,
   loading: boolean,
   error: Error,
+  showCreateButton: boolean,
 
   // dispatched functions
   fetchRepos: () => void,
   fetchReposByPage: number => void,
   fetchReposByLink: string => void,
+
   // context props
   t: string => string,
   history: History
@@ -69,21 +72,31 @@ class Overview extends React.Component<Props> {
   }
 
   renderList() {
-    const { collection, fetchReposByLink, t } = this.props;
+    const { collection, fetchReposByLink } = this.props;
     if (collection) {
       return (
         <div>
           <RepositoryList repositories={collection._embedded.repositories} />
           <Paginator collection={collection} onPageChange={fetchReposByLink} />
-          <CreateButton
-            label={t("overview.create-button")}
-            link="/repos/create"
-          />
+          {this.renderCreateButton()}
         </div>
       );
     }
     return null;
   }
+
+  renderCreateButton() {
+    const { showCreateButton, t } = this.props;
+    if (showCreateButton) {
+      return (
+        <CreateButton
+          label={t("overview.create-button")}
+          link="/repos/create"
+        />
+      );
+    }
+    return null;
+  }
 }
 
 const getPageFromProps = props => {
@@ -101,11 +114,13 @@ const mapStateToProps = (state, ownProps) => {
   const collection = getRepositoryCollection(state);
   const loading = isFetchReposPending(state);
   const error = getFetchReposFailure(state);
+  const showCreateButton = isAbleToCreateRepos(state);
   return {
     page,
     collection,
     loading,
-    error
+    error,
+    showCreateButton
   };
 };
 
diff --git a/scm-ui/src/repos/modules/repos.js b/scm-ui/src/repos/modules/repos.js
index b23cb07a15..c96719efcb 100644
--- a/scm-ui/src/repos/modules/repos.js
+++ b/scm-ui/src/repos/modules/repos.js
@@ -2,9 +2,9 @@
 import { apiClient } from "../../apiclient";
 import * as types from "../../modules/types";
 import type { Action } from "../../types/Action";
-import type {Repository, RepositoryCollection} from "../types/Repositories";
-import {isPending} from "../../modules/pending";
-import {getFailure} from "../../modules/failure";
+import type { Repository, RepositoryCollection } from "../types/Repositories";
+import { isPending } from "../../modules/pending";
+import { getFailure } from "../../modules/failure";
 
 export const FETCH_REPOS = "scm/repos/FETCH_REPOS";
 export const FETCH_REPOS_PENDING = `${FETCH_REPOS}_${types.PENDING_SUFFIX}`;
@@ -16,8 +16,16 @@ export const FETCH_REPO_PENDING = `${FETCH_REPO}_${types.PENDING_SUFFIX}`;
 export const FETCH_REPO_SUCCESS = `${FETCH_REPO}_${types.SUCCESS_SUFFIX}`;
 export const FETCH_REPO_FAILURE = `${FETCH_REPO}_${types.FAILURE_SUFFIX}`;
 
+export const CREATE_REPO = "scm/repos/FETCH_REPO";
+export const CREATE_REPO_PENDING = `${CREATE_REPO}_${types.PENDING_SUFFIX}`;
+export const CREATE_REPO_SUCCESS = `${CREATE_REPO}_${types.SUCCESS_SUFFIX}`;
+export const CREATE_REPO_FAILURE = `${CREATE_REPO}_${types.FAILURE_SUFFIX}`;
+export const CREATE_REPO_RESET = `${CREATE_REPO}_${types.RESET_SUFFIX}`;
+
 const REPOS_URL = "repositories";
 
+const CONTENT_TYPE = "application/vnd.scmm-repository+json;v=2";
+
 // fetch repos
 
 const SORT_BY = "sortBy=namespaceAndName";
@@ -84,15 +92,16 @@ export function fetchReposFailure(err: Error): Action {
 export function fetchRepo(namespace: string, name: string) {
   return function(dispatch: any) {
     dispatch(fetchRepoPending(namespace, name));
-    return apiClient.get(`${REPOS_URL}/${namespace}/${name}`)
+    return apiClient
+      .get(`${REPOS_URL}/${namespace}/${name}`)
       .then(response => response.json())
-      .then( repository => {
-        dispatch(fetchRepoSuccess(repository))
-      } )
+      .then(repository => {
+        dispatch(fetchRepoSuccess(repository));
+      })
       .catch(err => {
-        dispatch(fetchRepoFailure(namespace, name, err))
+        dispatch(fetchRepoFailure(namespace, name, err));
       });
-  }
+  };
 }
 
 export function fetchRepoPending(namespace: string, name: string): Action {
@@ -114,7 +123,11 @@ export function fetchRepoSuccess(repository: Repository): Action {
   };
 }
 
-export function fetchRepoFailure(namespace: string, name: string, error: Error): Action {
+export function fetchRepoFailure(
+  namespace: string,
+  name: string,
+  error: Error
+): Action {
   return {
     type: FETCH_REPO_FAILURE,
     payload: {
@@ -126,6 +139,50 @@ export function fetchRepoFailure(namespace: string, name: string, error: Error):
   };
 }
 
+// create repo
+
+export function createRepo(repository: Repository, callback?: () => void) {
+  return function(dispatch: any) {
+    dispatch(createRepoPending());
+    return apiClient
+      .post(REPOS_URL, repository, CONTENT_TYPE)
+      .then(() => {
+        dispatch(createRepoSuccess());
+        if (callback) {
+          callback();
+        }
+      })
+      .catch(err => {
+        dispatch(createRepoFailure(err));
+      });
+  };
+}
+
+export function createRepoPending(): Action {
+  return {
+    type: CREATE_REPO_PENDING
+  };
+}
+
+export function createRepoSuccess(): Action {
+  return {
+    type: CREATE_REPO_SUCCESS
+  };
+}
+
+export function createRepoFailure(err: Error): Action {
+  return {
+    type: CREATE_REPO_FAILURE,
+    payload: err
+  };
+}
+
+export function createRepoReset(): Action {
+  return {
+    type: CREATE_REPO_RESET
+  };
+}
+
 // reducer
 
 function createIdentifier(repository: Repository) {
@@ -180,7 +237,7 @@ export default function reducer(
     case FETCH_REPO_SUCCESS:
       return reducerByNames(state, action.payload);
     default:
-    return state;
+      return state;
   }
 }
 
@@ -211,14 +268,42 @@ export function getFetchReposFailure(state: Object) {
 
 export function getRepository(state: Object, namespace: string, name: string) {
   if (state.repos && state.repos.byNames) {
-    return state.repos.byNames[ namespace + "/" + name];
+    return state.repos.byNames[namespace + "/" + name];
   }
 }
 
-export function isFetchRepoPending(state: Object, namespace: string, name: string) {
+export function isFetchRepoPending(
+  state: Object,
+  namespace: string,
+  name: string
+) {
   return isPending(state, FETCH_REPO, namespace + "/" + name);
 }
 
-export function getFetchRepoFailure(state: Object, namespace: string, name: string) {
+export function getFetchRepoFailure(
+  state: Object,
+  namespace: string,
+  name: string
+) {
   return getFailure(state, FETCH_REPO, namespace + "/" + name);
 }
+
+export function isAbleToCreateRepos(state: Object) {
+  if (
+    state.repos &&
+    state.repos.list &&
+    state.repos.list._links &&
+    state.repos.list._links.create
+  ) {
+    return true;
+  }
+  return false;
+}
+
+export function isCreateRepoPending(state: Object) {
+  return isPending(state, CREATE_REPO);
+}
+
+export function getCreateRepoFailure(state: Object) {
+  return getFailure(state, CREATE_REPO);
+}
diff --git a/scm-ui/src/repos/modules/repos.test.js b/scm-ui/src/repos/modules/repos.test.js
index e214e89520..c35d95c9a4 100644
--- a/scm-ui/src/repos/modules/repos.test.js
+++ b/scm-ui/src/repos/modules/repos.test.js
@@ -22,7 +22,15 @@ import reducer, {
   fetchRepoSuccess,
   getRepository,
   isFetchRepoPending,
-  getFetchRepoFailure
+  getFetchRepoFailure,
+  CREATE_REPO_PENDING,
+  CREATE_REPO_SUCCESS,
+  createRepo,
+  CREATE_REPO_FAILURE,
+  isCreateRepoPending,
+  CREATE_REPO,
+  getCreateRepoFailure,
+  isAbleToCreateRepos
 } from "./repos";
 import type { Repository, RepositoryCollection } from "../types/Repositories";
 
@@ -354,6 +362,56 @@ describe("repos fetch", () => {
       expect(actions[1].itemId).toBe("slarti/fjords");
     });
   });
+
+  it("should successfully create repo slarti/fjords", () => {
+    fetchMock.postOnce(REPOS_URL, slartiFjords);
+
+    const expectedActions = [
+      {
+        type: CREATE_REPO_PENDING
+      },
+      {
+        type: CREATE_REPO_SUCCESS
+      }
+    ];
+
+    const store = mockStore({});
+    return store.dispatch(createRepo(slartiFjords)).then(() => {
+      expect(store.getActions()).toEqual(expectedActions);
+    });
+  });
+
+  it("should successfully create repo slarti/fjords and call the callback", () => {
+    // unmatched
+    fetchMock.postOnce(REPOS_URL, {
+      status: 201
+    });
+
+    let callMe = "not yet";
+
+    const callback = () => {
+      callMe = "yeah";
+    };
+
+    const store = mockStore({});
+    return store.dispatch(createRepo(slartiFjords, callback)).then(() => {
+      expect(callMe).toBe("yeah");
+    });
+  });
+
+  it("should disapatch failure if server returns status code 500", () => {
+    fetchMock.postOnce(REPOS_URL, {
+      status: 500
+    });
+
+    const store = mockStore({});
+    return store.dispatch(createRepo(slartiFjords)).then(() => {
+      const actions = store.getActions();
+      expect(actions[0].type).toEqual(CREATE_REPO_PENDING);
+      expect(actions[1].type).toEqual(CREATE_REPO_FAILURE);
+      expect(actions[1].payload).toBeDefined();
+    });
+  });
 });
 
 describe("repos reducer", () => {
@@ -471,4 +529,58 @@ describe("repos selectors", () => {
     };
     expect(getFetchRepoFailure(state, "slarti", "fjords")).toEqual(error);
   });
+
+  it("should return undefined when fetch repo did not fail", () => {
+    expect(getFetchRepoFailure({}, "slarti", "fjords")).toBe(undefined);
+  });
+
+  // create
+
+  it("should return true, when create repo is pending", () => {
+    const state = {
+      pending: {
+        [CREATE_REPO]: true
+      }
+    };
+    expect(isCreateRepoPending(state)).toEqual(true);
+  });
+
+  it("should return false, when create repo is not pending", () => {
+    expect(isCreateRepoPending({})).toEqual(false);
+  });
+
+  it("should return error when create repo did fail", () => {
+    const state = {
+      failure: {
+        [CREATE_REPO]: error
+      }
+    };
+    expect(getCreateRepoFailure(state)).toEqual(error);
+  });
+
+  it("should return undefined when create repo did not fail", () => {
+    expect(getCreateRepoFailure({})).toBe(undefined);
+  });
+
+  it("should return true if the list contains the create link", () => {
+    const state = {
+      repos: {
+        list: repositoryCollection
+      }
+    };
+
+    expect(isAbleToCreateRepos(state)).toBe(true);
+  });
+
+  it("should return false, if create link is unavailable", () => {
+    const state = {
+      repos: {
+        list: {
+          _links: {}
+        }
+      }
+    };
+
+    expect(isAbleToCreateRepos(state)).toBe(false);
+  });
 });

From fd873877c44cd3ed1a88a3e401b468133338383d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Fri, 3 Aug 2018 09:28:54 +0200
Subject: [PATCH 25/51] Fix old integration tests for migration period

---
 .../sonia/scm/it/AbstractAdminITCaseBase.java |  31 +-
 .../scm/it/AbstractPermissionITCaseBase.java  | 122 ++-----
 .../sonia/scm/it/AdminPermissionITCase.java   | 308 ------------------
 .../sonia/scm/it/AnonymousAccessITCase.java   | 285 ----------------
 .../sonia/scm/it/AuthenticationITCase.java    |  96 ------
 .../scm/it/AuthorizationScopeITCase.java      | 131 --------
 .../sonia/scm/it/ChangesetViewerITCase.java   | 296 -----------------
 .../scm/it/CreateRepositoriesITCase.java      | 191 -----------
 .../sonia/scm/it/DeactivatedUserITCase.java   | 137 --------
 .../test/java/sonia/scm/it/GitLfsITCase.java  | 210 ++++++------
 .../it/GitRepositoryPathMatcherITCase.java    |  75 +++--
 .../test/java/sonia/scm/it/GroupITCase.java   | 265 ---------------
 .../sonia/scm/it/GroupPermissionITCase.java   | 185 -----------
 .../sonia/scm/it/HttpCacheITCaseBase.java     |  31 +-
 .../sonia/scm/it/IntegrationTestUtil.java     | 150 +++------
 .../sonia/scm/it/RepositoryArchiveITCase.java |  68 ++--
 .../scm/it/RepositoryExtendedITCase.java      |  25 +-
 .../sonia/scm/it/RepositoryHookITCase.java    |  61 ++--
 .../scm/it/RepositoryHttpCacheITCase.java     |  26 +-
 .../java/sonia/scm/it/RepositoryITCase.java   | 259 ---------------
 .../sonia/scm/it/RepositoryITCaseBase.java    | 192 ++++-------
 .../java/sonia/scm/it/RepositoryITUtil.java   | 133 +++-----
 .../it/RepositorySimplePermissionITCase.java  |  97 +++---
 .../scm/it/RepositoryTypeITCaseBase.java      |  36 +-
 .../src/test/java/sonia/scm/it/ScmClient.java |  37 +++
 .../test/java/sonia/scm/it/UserITCase.java    | 297 -----------------
 .../test/java/sonia/scm/it/UserITUtil.java    |  13 +
 .../sonia/scm/it/UserPermissionITCase.java    |  40 ++-
 .../src/test/resources/repository-git.json    |   7 +
 .../src/test/resources/repository-hg.json     |   7 +
 .../src/test/resources/repository-svn.json    |   7 +
 31 files changed, 600 insertions(+), 3218 deletions(-)
 delete mode 100644 scm-webapp/src/test/java/sonia/scm/it/AdminPermissionITCase.java
 delete mode 100644 scm-webapp/src/test/java/sonia/scm/it/AnonymousAccessITCase.java
 delete mode 100644 scm-webapp/src/test/java/sonia/scm/it/AuthenticationITCase.java
 delete mode 100644 scm-webapp/src/test/java/sonia/scm/it/AuthorizationScopeITCase.java
 delete mode 100644 scm-webapp/src/test/java/sonia/scm/it/ChangesetViewerITCase.java
 delete mode 100644 scm-webapp/src/test/java/sonia/scm/it/CreateRepositoriesITCase.java
 delete mode 100644 scm-webapp/src/test/java/sonia/scm/it/DeactivatedUserITCase.java
 delete mode 100644 scm-webapp/src/test/java/sonia/scm/it/GroupITCase.java
 delete mode 100644 scm-webapp/src/test/java/sonia/scm/it/GroupPermissionITCase.java
 delete mode 100644 scm-webapp/src/test/java/sonia/scm/it/RepositoryITCase.java
 create mode 100644 scm-webapp/src/test/java/sonia/scm/it/ScmClient.java
 delete mode 100644 scm-webapp/src/test/java/sonia/scm/it/UserITCase.java
 create mode 100644 scm-webapp/src/test/java/sonia/scm/it/UserITUtil.java
 create mode 100644 scm-webapp/src/test/resources/repository-git.json
 create mode 100644 scm-webapp/src/test/resources/repository-hg.json
 create mode 100644 scm-webapp/src/test/resources/repository-svn.json

diff --git a/scm-webapp/src/test/java/sonia/scm/it/AbstractAdminITCaseBase.java b/scm-webapp/src/test/java/sonia/scm/it/AbstractAdminITCaseBase.java
index f8ec4d2d10..45a24585e3 100644
--- a/scm-webapp/src/test/java/sonia/scm/it/AbstractAdminITCaseBase.java
+++ b/scm-webapp/src/test/java/sonia/scm/it/AbstractAdminITCaseBase.java
@@ -35,45 +35,22 @@ package sonia.scm.it;
 
 //~--- non-JDK imports --------------------------------------------------------
 
-import org.junit.After;
-import org.junit.Before;
-
-import static sonia.scm.it.IntegrationTestUtil.*;
+import static sonia.scm.it.IntegrationTestUtil.createAdminClient;
 
 //~--- JDK imports ------------------------------------------------------------
 
-import com.sun.jersey.api.client.Client;
-
 /**
  *
  * @author Sebastian Sdorra
  */
 public class AbstractAdminITCaseBase
 {
-
-  /**
-   * Method description
-   *
-   */
-  @Before
-  public void login()
-  {
-    client = createClient();
-    authenticateAdmin(client);
-  }
-
-  /**
-   * Method description
-   *
-   */
-  @After
-  public void logout()
-  {
-    logoutClient(client);
+  public AbstractAdminITCaseBase() {
+    client = createAdminClient();
   }
 
   //~--- fields ---------------------------------------------------------------
 
   /** Field description */
-  protected Client client;
+  protected final ScmClient client;
 }
diff --git a/scm-webapp/src/test/java/sonia/scm/it/AbstractPermissionITCaseBase.java b/scm-webapp/src/test/java/sonia/scm/it/AbstractPermissionITCaseBase.java
index cd655c78b5..d72f952876 100644
--- a/scm-webapp/src/test/java/sonia/scm/it/AbstractPermissionITCaseBase.java
+++ b/scm-webapp/src/test/java/sonia/scm/it/AbstractPermissionITCaseBase.java
@@ -35,29 +35,26 @@ package sonia.scm.it;
 
 //~--- non-JDK imports --------------------------------------------------------
 
-import org.junit.After;
+import com.sun.jersey.api.client.ClientResponse;
+import com.sun.jersey.api.client.WebResource;
 import org.junit.AfterClass;
-import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runners.Parameterized.Parameters;
-
 import sonia.scm.user.User;
 import sonia.scm.user.UserTestData;
 
-import static org.junit.Assert.*;
+import java.util.Collection;
 
-import static sonia.scm.it.IntegrationTestUtil.*;
+import static java.util.Arrays.asList;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static sonia.scm.it.IntegrationTestUtil.createAdminClient;
+import static sonia.scm.it.IntegrationTestUtil.createResource;
+import static sonia.scm.it.IntegrationTestUtil.post;
 
 //~--- JDK imports ------------------------------------------------------------
 
-import com.sun.jersey.api.client.Client;
-import com.sun.jersey.api.client.ClientResponse;
-import com.sun.jersey.api.client.WebResource;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
 /**
  *
  * @author Sebastian Sdorra
@@ -77,26 +74,24 @@ public abstract class AbstractPermissionITCaseBase<T>
   public AbstractPermissionITCaseBase(Credentials credentials)
   {
     this.credentials = credentials;
+    this.client = credentials.isAnonymous()? ScmClient.anonymous(): new ScmClient(credentials.getUsername(), credentials.getPassword());
   }
 
-  //~--- methods --------------------------------------------------------------
 
+  //~--- methods --------------------------------------------------------------
   /**
    * Method description
    *
    *
    * @return
    */
-  @Parameters
-  public static Collection<Credentials[]> createParameters()
+  @Parameters(name = "{1}")
+  public static Collection<Object[]> createParameters()
   {
-    Collection<Credentials[]> params = new ArrayList<>();
-
-    params.add(new Credentials[] { new Credentials() });
-    params.add(new Credentials[] {
-      new Credentials("trillian", "a.trillian124") });
-
-    return params;
+    return asList(
+      new Object[] {new Credentials(), "anonymous"},
+      new Object[] {new Credentials("trillian", "a.trillian124"), "trillian" }
+    );
   }
 
   /**
@@ -111,18 +106,13 @@ public abstract class AbstractPermissionITCaseBase<T>
 
     trillian.setPassword("a.trillian124");
 
-    Client client = createClient();
+    ScmClient client = createAdminClient();
 
-    authenticateAdmin(client);
-
-    WebResource wr = createResource(client, "users");
-    ClientResponse response = wr.post(ClientResponse.class, trillian);
+    ClientResponse response = UserITUtil.postUser(client, trillian);
 
     assertNotNull(response);
     assertEquals(201, response.getStatus());
     response.close();
-    logoutClient(client);
-    client.destroy();
   }
 
   /**
@@ -132,15 +122,12 @@ public abstract class AbstractPermissionITCaseBase<T>
   @AfterClass
   public static void removeTestUser()
   {
-    Client client = createClient();
-
-    authenticateAdmin(client);
+    ScmClient client = createAdminClient();
     createResource(client, "users/trillian").delete();
-    client.destroy();
   }
 
-  //~--- get methods ----------------------------------------------------------
 
+  //~--- get methods ----------------------------------------------------------
   /**
    * Method description
    *
@@ -189,30 +176,10 @@ public abstract class AbstractPermissionITCaseBase<T>
    */
   protected abstract String getModifyPath();
 
+  protected abstract String getMediaType();
+
   //~--- methods --------------------------------------------------------------
 
-  /**
-   * Method description
-   *
-   */
-  @After
-  public void after()
-  {
-    client = createClient();
-    logout();
-  }
-
-  /**
-   * Method description
-   *
-   */
-  @Before
-  public void before()
-  {
-    client = createClient();
-    login();
-  }
-
   /**
    * Method description
    *
@@ -220,9 +187,7 @@ public abstract class AbstractPermissionITCaseBase<T>
   @Test
   public void create()
   {
-    WebResource wr = createResource(client, getBasePath());
-
-    checkResponse(wr.post(ClientResponse.class, getCreateItem()));
+    checkResponse(post(client, getBasePath(), getMediaType(), getCreateItem()));
   }
 
   /**
@@ -232,7 +197,7 @@ public abstract class AbstractPermissionITCaseBase<T>
   @Test
   public void delete()
   {
-    WebResource wr = createResource(client, getDeletePath());
+    WebResource.Builder wr = createResource(client, getDeletePath());
 
     checkResponse(wr.delete(ClientResponse.class));
   }
@@ -244,9 +209,9 @@ public abstract class AbstractPermissionITCaseBase<T>
   @Test
   public void modify()
   {
-    WebResource wr = createResource(client, getModifyPath());
+    WebResource.Builder wr = createResource(client, getModifyPath());
 
-    checkResponse(wr.put(ClientResponse.class, getModifyItem()));
+    checkResponse(wr.type(getMediaType()).put(ClientResponse.class, getModifyItem()));
   }
 
   //~--- get methods ----------------------------------------------------------
@@ -258,7 +223,7 @@ public abstract class AbstractPermissionITCaseBase<T>
   @Test
   public void get()
   {
-    WebResource wr = createResource(client, getGetPath());
+    WebResource.Builder wr = createResource(client, getGetPath());
 
     checkGetResponse(wr.get(ClientResponse.class));
   }
@@ -270,7 +235,7 @@ public abstract class AbstractPermissionITCaseBase<T>
   @Test
   public void getAll()
   {
-    WebResource wr = createResource(client, getBasePath());
+    WebResource.Builder wr = createResource(client, getBasePath());
 
     checkGetAllResponse(wr.get(ClientResponse.class));
   }
@@ -321,36 +286,9 @@ public abstract class AbstractPermissionITCaseBase<T>
     response.close();
   }
 
-  /**
-   * Method description
-   *
-   */
-  private void login()
-  {
-    if (!credentials.isAnonymous())
-    {
-      authenticate(client, credentials.getUsername(),
-                   credentials.getPassword());
-    }
-  }
-
-  /**
-   * Method description
-   *
-   */
-  private void logout()
-  {
-    if (!credentials.isAnonymous())
-    {
-      logoutClient(client);
-    }
-  }
-
   //~--- fields ---------------------------------------------------------------
 
-  /** Field description */
-  protected Client client;
+  protected ScmClient client;
 
-  /** Field description */
   protected Credentials credentials;
 }
diff --git a/scm-webapp/src/test/java/sonia/scm/it/AdminPermissionITCase.java b/scm-webapp/src/test/java/sonia/scm/it/AdminPermissionITCase.java
deleted file mode 100644
index ae6c9aabd1..0000000000
--- a/scm-webapp/src/test/java/sonia/scm/it/AdminPermissionITCase.java
+++ /dev/null
@@ -1,308 +0,0 @@
-/**
- * Copyright (c) 2010, Sebastian Sdorra
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 3. Neither the name of SCM-Manager; nor the names of its
- *    contributors may be used to endorse or promote products derived from this
- *    software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * http://bitbucket.org/sdorra/scm-manager
- *
- */
-
-
-
-package sonia.scm.it;
-
-//~--- non-JDK imports --------------------------------------------------------
-
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import sonia.scm.group.Group;
-import sonia.scm.user.User;
-import sonia.scm.user.UserTestData;
-import sonia.scm.util.IOUtil;
-
-import static org.junit.Assert.*;
-
-import static sonia.scm.it.IntegrationTestUtil.*;
-
-//~--- JDK imports ------------------------------------------------------------
-
-import com.sun.jersey.api.client.Client;
-import com.sun.jersey.api.client.ClientResponse;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-/**
- *
- * @author Sebastian Sdorra
- */
-@RunWith(Parameterized.class)
-public class AdminPermissionITCase
-{
-
-  /**
-   * Constructs ...
-   *
-   *
-   * @param credentials
-   */
-  public AdminPermissionITCase(Credentials credentials)
-  {
-    this.credentials = credentials;
-  }
-
-  //~--- methods --------------------------------------------------------------
-
-  /**
-   * Method description
-   *
-   */
-  @AfterClass
-  public static void cleanup()
-  {
-    Client client = createAdminClient();
-
-    createResource(client, "users/marvin").delete();
-    createResource(client, "groups/test-group").delete();
-    client.destroy();
-  }
-
-  /**
-   * Method description
-   *
-   *
-   * @return
-   */
-  @Parameters
-  public static Collection<Object[]> createParameters()
-  {
-    Collection<Object[]> params = new ArrayList<>();
-
-    // params.add(new Object[] { new Credentials() });
-
-    User u = UserTestData.createMarvin();
-
-    u.setPassword("secret");
-
-    Client client = createAdminClient();
-
-    createResource(client, "users").post(u);
-    client.destroy();
-    params.add(new Object[] { new Credentials(u.getName(), u.getPassword()) });
-
-    return params;
-  }
-
-  /**
-   * Method description
-   *
-   */
-  @BeforeClass
-  public static void setup()
-  {
-    Group group = new Group("xml", "test-group");
-    Client client = createAdminClient();
-
-    createResource(client, "groups").post(group);
-    client.destroy();
-  }
-
-  /**
-   * Method description
-   *
-   */
-  @Before
-  public void login()
-  {
-    client = createClient();
-
-    if (!credentials.isAnonymous())
-    {
-      authenticate(client, credentials.getUsername(),
-                   credentials.getPassword());
-    }
-  }
-
-  /**
-   * Method description
-   *
-   */
-  @After
-  public void logout()
-  {
-    if (!credentials.isAnonymous())
-    {
-      logoutClient(client);
-    }
-  }
-
-  /**
-   * Method description
-   *
-   */
-  @Test
-  public void testConfig()
-  {
-    checkResponse(createResource(client, "config").get(ClientResponse.class));
-    checkResponse(createResource(client, "config").post(ClientResponse.class));
-  }
-
-  /**
-   * Method description
-   *
-   */
-  @Test
-  public void testGitConfig()
-  {
-    checkResponse(
-        createResource(client, "config/repositories/git").get(
-          ClientResponse.class));
-    checkResponse(
-        createResource(client, "config/repositories/git").post(
-          ClientResponse.class));
-  }
-
-  /**
-   * Method description
-   *
-   */
-  @Test
-  public void testGroups()
-  {
-    checkResponse(createResource(client, "groups").get(ClientResponse.class));
-    checkResponse(createResource(client, "groups").post(ClientResponse.class));
-    checkResponse(
-        createResource(client, "groups/test-group").get(ClientResponse.class));
-    checkResponse(
-        createResource(client, "groups/test-group").put(ClientResponse.class));
-    checkResponse(
-        createResource(client, "groups/test-group").delete(
-          ClientResponse.class));
-  }
-
-  /**
-   * Method description
-   *
-   */
-  @Test
-  public void testHgConfig()
-  {
-    checkResponse(
-        createResource(client, "config/repositories/hg").get(
-          ClientResponse.class));
-    checkResponse(
-        createResource(client, "config/repositories/hg").post(
-          ClientResponse.class));
-  }
-
-  /**
-   * Method description
-   *
-   */
-  @Test
-  public void testPlugins()
-  {
-    checkResponse(createResource(client, "plugins").get(ClientResponse.class));
-    checkResponse(createResource(client,
-                                 "plugins/overview").get(ClientResponse.class));
-    checkResponse(
-        createResource(client, "plugins/installed").get(ClientResponse.class));
-    checkResponse(createResource(client,
-                                 "plugins/updates").get(ClientResponse.class));
-    checkResponse(
-        createResource(client, "plugins/available").get(ClientResponse.class));
-  }
-
-  /**
-   * Method description
-   *
-   */
-  @Test
-  public void testSvnConfig()
-  {
-    checkResponse(
-        createResource(client, "config/repositories/svn").get(
-          ClientResponse.class));
-    checkResponse(
-        createResource(client, "config/repositories/svn").post(
-          ClientResponse.class));
-  }
-
-  /**
-   * Method description
-   *
-   */
-  @Test
-  public void testUsers()
-  {
-    checkResponse(createResource(client, "users").get(ClientResponse.class));
-    checkResponse(createResource(client, "users").post(ClientResponse.class));
-    checkResponse(createResource(client,
-                                 "users/scmadmin").get(ClientResponse.class));
-    checkResponse(createResource(client,
-                                 "users/scmadmin").put(ClientResponse.class));
-    checkResponse(
-        createResource(client, "users/scmadmin").delete(ClientResponse.class));
-  }
-
-  /**
-   * Method description
-   *
-   *
-   * @param response
-   */
-  private void checkResponse(ClientResponse response)
-  {
-    assertNotNull(response);
-
-    if (credentials.isAnonymous())
-    {
-      assertEquals(401, response.getStatus());
-    }
-    else
-    {
-      assertEquals(403, response.getStatus());
-    }
-
-    // fix jersey-client bug
-    IOUtil.close(response.getEntityInputStream());
-    response.close();
-  }
-
-  //~--- fields ---------------------------------------------------------------
-
-  /** Field description */
-  private Client client;
-
-  /** Field description */
-  private Credentials credentials;
-}
diff --git a/scm-webapp/src/test/java/sonia/scm/it/AnonymousAccessITCase.java b/scm-webapp/src/test/java/sonia/scm/it/AnonymousAccessITCase.java
deleted file mode 100644
index c60b46460b..0000000000
--- a/scm-webapp/src/test/java/sonia/scm/it/AnonymousAccessITCase.java
+++ /dev/null
@@ -1,285 +0,0 @@
-/**
- * Copyright (c) 2010, Sebastian Sdorra
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 3. Neither the name of SCM-Manager; nor the names of its
- *    contributors may be used to endorse or promote products derived from this
- *    software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * http://bitbucket.org/sdorra/scm-manager
- *
- */
-
-
-
-package sonia.scm.it;
-
-//~--- non-JDK imports --------------------------------------------------------
-
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import sonia.scm.config.ScmConfiguration;
-import sonia.scm.repository.Permission;
-import sonia.scm.repository.PermissionType;
-import sonia.scm.repository.Repository;
-import sonia.scm.repository.RepositoryTestData;
-
-import static org.junit.Assert.*;
-
-import static sonia.scm.it.IntegrationTestUtil.*;
-import static sonia.scm.it.RepositoryITUtil.*;
-
-//~--- JDK imports ------------------------------------------------------------
-
-import com.sun.jersey.api.client.Client;
-import com.sun.jersey.api.client.ClientResponse;
-import com.sun.jersey.api.client.WebResource;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Arrays;
-
-import java.util.Collection;
-import org.junit.Ignore;
-
-import sonia.scm.repository.client.api.RepositoryClient;
-import sonia.scm.repository.client.api.RepositoryClientFactory;
-
-/**
- *
- * @author Sebastian Sdorra
- */
-@RunWith(Parameterized.class)
-public class AnonymousAccessITCase
-{
-
-  /** Field description */
-  private static final Permission PERMISSION_ANONYMOUS_WRITE =
-    new Permission("anonymous", PermissionType.WRITE);
-
-  //~--- constructors ---------------------------------------------------------
-
-  /**
-   * Constructs ...
-   *
-   *
-   * @param repositoryType
-   */
-  public AnonymousAccessITCase(String repositoryType)
-  {
-    this.repositoryType = repositoryType;
-  }
-
-  //~--- methods --------------------------------------------------------------
-
-  /**
-   * Method description
-   *
-   *
-   * @return
-   */
-  @Parameters
-  public static Collection<String[]> createParameters()
-  {
-    return createRepositoryTypeParameters();
-  }
-
-  /**
-   * Method description
-   *
-   */
-  @AfterClass
-  public static void unsetAnonymousAccess()
-  {
-    toggleAnonymousAccess(false);
-  }
-
-  //~--- set methods ----------------------------------------------------------
-
-  /**
-   * Method description
-   *
-   */
-  @BeforeClass
-  public static void setAnonymousAccess()
-  {
-    toggleAnonymousAccess(true);
-  }
-
-  //~--- methods --------------------------------------------------------------
-
-  /**
-   * Method description
-   *
-   *
-   * @param anonymousAccess
-   */
-  private static void toggleAnonymousAccess(boolean anonymousAccess)
-  {
-    Client client = createAdminClient();
-    WebResource resource = createResource(client, "config");
-    ScmConfiguration config = resource.get(ScmConfiguration.class);
-
-    assertNotNull(config);
-    config.setAnonymousAccessEnabled(anonymousAccess);
-
-    ClientResponse response = resource.post(ClientResponse.class, config);
-
-    assertNotNull(response);
-    assertEquals(201, response.getStatus());
-    logoutClient(client);
-  }
-
-  /**
-   * Method description
-   *
-   */
-  @Before
-  public void createTestRepository()
-  {
-    Client client = createAdminClient();
-
-    repository = RepositoryTestData.createHeartOfGold(repositoryType);
-    repository.setPublicReadable(true);
-    repository = createRepository(client, repository);
-    logoutClient(client);
-  }
-
-  /**
-   * Method description
-   *
-   */
-  @After
-  public void removeTestRepository()
-  {
-    Client client = createAdminClient();
-
-    deleteRepository(client, repository.getId());
-    logoutClient(client);
-  }
-
-  /**
-   * Method description
-   *
-   * @throws IOException
-   */
-  @Test
-  @Ignore
-  public void testAllowedAnonymousPush() throws IOException
-  {
-    Client client = createAdminClient();
-    WebResource resource = createResource(client,
-                             "repository/".concat(repository.getId()));
-
-    repository.setPermissions(Arrays.asList(PERMISSION_ANONYMOUS_WRITE));
-    resource.post(ClientResponse.class, repository);
-
-    RepositoryClient repositoryClient = createAnonymousRepositoryClient();
-
-    createRandomFile(repositoryClient);
-    commit(repositoryClient, "added test files");
-  }
-
-  /**
-   * Method description
-   * 
-    * TODO fix test case
-   *
-   * @throws IOException
-   */
-  @Test @Ignore
-  public void testAnonymousClone() throws IOException
-  {
-    testSimpleAdminPush();
-
-    RepositoryClient client = createAnonymousRepositoryClient();
-
-    // client.checkout();
-  }
-
-  /**
-   * Method description
-   *
-   * @throws IOException
-   */
-  @Ignore
-  @Test(expected = IOException.class)
-  public void testDeniedAnonymousPush() throws IOException
-  {
-    RepositoryClient repositoryClient = createAnonymousRepositoryClient();
-
-    createRandomFile(repositoryClient);
-    commit(repositoryClient, "added anonymous test file");
-  }
-
-  /**
-   * Method description
-   *
-   *
-   * @throws IOException
-   */
-  @Test
-  public void testSimpleAdminPush() throws IOException
-  {
-    RepositoryClient repositoryClient = createAdminRepositoryClient();
-
-    createRandomFile(repositoryClient);
-    commit(repositoryClient, "added random file");
-  }
-
-  private RepositoryClient createAdminRepositoryClient() throws IOException {
-    return createRepositoryClient(ADMIN_USERNAME, ADMIN_PASSWORD);
-  }
-
-  private RepositoryClient createAnonymousRepositoryClient() throws IOException {
-    return createRepositoryClient(null, null);
-  }
-
-  private RepositoryClient createRepositoryClient(String username, String password) throws IOException {
-    File directory = temporaryFolder.newFolder();
-    String remoteUrl = repository.createUrl(BASE_URL);
-
-    RepositoryClientFactory factory = new RepositoryClientFactory();
-    return factory.create(repositoryType, remoteUrl, username, password, directory);
-  }
-
-  //~--- fields ---------------------------------------------------------------
-
-  /** Field description */
-  @Rule
-  public TemporaryFolder temporaryFolder = new TemporaryFolder();
-
-  /** Field description */
-  private Repository repository;
-
-  /** Field description */
-  private final String repositoryType;
-}
diff --git a/scm-webapp/src/test/java/sonia/scm/it/AuthenticationITCase.java b/scm-webapp/src/test/java/sonia/scm/it/AuthenticationITCase.java
deleted file mode 100644
index eb5d999592..0000000000
--- a/scm-webapp/src/test/java/sonia/scm/it/AuthenticationITCase.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/**
- * Copyright (c) 2010, Sebastian Sdorra
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 3. Neither the name of SCM-Manager; nor the names of its
- *    contributors may be used to endorse or promote products derived from this
- *    software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * http://bitbucket.org/sdorra/scm-manager
- *
- */
-
-
-
-package sonia.scm.it;
-
-//~--- non-JDK imports --------------------------------------------------------
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-import static sonia.scm.it.IntegrationTestUtil.*;
-
-//~--- JDK imports ------------------------------------------------------------
-
-import com.sun.jersey.api.client.Client;
-import com.sun.jersey.api.client.ClientResponse;
-
-/**
- *
- * @author Sebastian Sdorra
- */
-public class AuthenticationITCase
-{
-
-  /**
-   * Method description
-   *
-   *
-   */
-  @Test
-  public void testLogin()
-  {
-    Client client = createClient();
-
-    authenticateAdmin(client);
-  }
-
-  /**
-   * Method description
-   *
-   */
-  @Test
-  public void testLoginFailed()
-  {
-    Client client = createClient();
-    ClientResponse response = authenticate(client, "dent", "trillian");
-
-    assertNotNull(response);
-    assertEquals(401, response.getStatus());
-    response.close();
-  }
-
-  /**
-   * Method description
-   *
-   */
-  @Test
-  public void testLogout()
-  {
-    Client client = createClient();
-
-    authenticateAdmin(client);
-    logoutClient(client);
-  }
-}
diff --git a/scm-webapp/src/test/java/sonia/scm/it/AuthorizationScopeITCase.java b/scm-webapp/src/test/java/sonia/scm/it/AuthorizationScopeITCase.java
deleted file mode 100644
index d7b06d93b3..0000000000
--- a/scm-webapp/src/test/java/sonia/scm/it/AuthorizationScopeITCase.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/**
- * Copyright (c) 2014, Sebastian Sdorra
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 3. Neither the name of SCM-Manager; nor the names of its
- *    contributors may be used to endorse or promote products derived from this
- *    software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * http://bitbucket.org/sdorra/scm-manager
- *
- */
-package sonia.scm.it;
-
-import com.google.common.base.Strings;
-import com.sun.jersey.api.client.Client;
-import com.sun.jersey.api.client.ClientResponse;
-import com.sun.jersey.api.client.GenericType;
-import com.sun.jersey.api.client.WebResource;
-import com.sun.jersey.core.util.MultivaluedMapImpl;
-import java.util.List;
-import javax.ws.rs.core.MultivaluedMap;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import sonia.scm.ScmState;
-import static sonia.scm.it.IntegrationTestUtil.*;
-import static sonia.scm.it.RepositoryITUtil.*;
-import static sonia.scm.it.RepositoryITUtil.createRepository;
-import sonia.scm.repository.Repository;
-import sonia.scm.repository.RepositoryTestData;
-
-/**
- * Integration test for authorization with scope.
- * 
- * @author Sebastian Sdorra
- */
-public class AuthorizationScopeITCase {
-  
-  private Repository heartOfGold;
-  private Repository puzzle42;
-  
-  /**
-   * Create test repositories.
-   */
-  @Before
-  public void createTestRepositories(){
-    Client adminClient = createAdminClient();
-    this.heartOfGold = createRepository(adminClient, RepositoryTestData.createHeartOfGold("git"));
-    this.puzzle42 = createRepository(adminClient, RepositoryTestData.create42Puzzle("git"));
-  }
-  
-  /**
-   * Delete test repositories.
-   */
-  @After
-  public void deleteTestRepositories(){
-    Client adminClient = createAdminClient();
-    deleteRepository(adminClient, heartOfGold.getId());
-    deleteRepository(adminClient, puzzle42.getId());
-  }
-  
-  /**
-   * Read all available repositories without scope.
-   */
-  @Test
-  public void testAuthenticateWithoutScope() {
-    Assert.assertEquals(2, getRepositories(createAuthenticationToken()).size());
-  }
-  
-  /**
-   * Read all available repositories with a scope for only one of them.
-   */
-  @Test
-  public void testAuthenticateWithScope() {
-    String scope = "repository:read:".concat(heartOfGold.getId());
-    Assert.assertEquals(1, getRepositories(createAuthenticationToken(scope)).size());
-  }
-  
-  private List<Repository> getRepositories(String token) {
-    Client client = createClient();
-    WebResource wr =  client.resource(createResourceUrl("repositories"));
-    return wr.header("Authorization", "Bearer ".concat(token)).get(new GenericType<List<Repository>>(){});
-  }
-  
-  private String createAuthenticationToken() {
-    return createAuthenticationToken("");
-  }
-  
-  private String createAuthenticationToken(String scope) {
-    Client client = createClient();
-    String url = createResourceUrl("auth/access_token");
-    
-    WebResource wr =  client.resource(url);
-    MultivaluedMap<String, String> formData = new MultivaluedMapImpl();
-
-    formData.add("username", ADMIN_USERNAME);
-    formData.add("password", ADMIN_PASSWORD);
-    formData.add("grant_type", "password");
-    if (!Strings.isNullOrEmpty(scope)) {
-      formData.add("scope", scope);
-    }
-
-    ClientResponse response = wr.type("application/x-www-form-urlencoded").post(ClientResponse.class, formData);
-    if (response.getStatus() >= 300 ){
-      Assert.fail("authentication failed with status code " + response.getStatus());
-    }
-    
-    return response.getEntity(ScmState.class).getToken();
-  }
-  
-}
diff --git a/scm-webapp/src/test/java/sonia/scm/it/ChangesetViewerITCase.java b/scm-webapp/src/test/java/sonia/scm/it/ChangesetViewerITCase.java
deleted file mode 100644
index 816f86fe52..0000000000
--- a/scm-webapp/src/test/java/sonia/scm/it/ChangesetViewerITCase.java
+++ /dev/null
@@ -1,296 +0,0 @@
-/**
- * Copyright (c) 2010, Sebastian Sdorra
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 3. Neither the name of SCM-Manager; nor the names of its
- *    contributors may be used to endorse or promote products derived from this
- *    software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * http://bitbucket.org/sdorra/scm-manager
- *
- */
-
-
-
-package sonia.scm.it;
-
-//~--- non-JDK imports --------------------------------------------------------
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import sonia.scm.repository.Changeset;
-import sonia.scm.repository.ChangesetPagingResult;
-import sonia.scm.repository.Modifications;
-import sonia.scm.repository.Repository;
-import sonia.scm.repository.RepositoryTestData;
-
-import sonia.scm.util.IOUtil;
-
-import static org.hamcrest.Matchers.*;
-
-import static org.junit.Assert.*;
-
-import static sonia.scm.it.IntegrationTestUtil.*;
-import static sonia.scm.it.RepositoryITUtil.*;
-
-//~--- JDK imports ------------------------------------------------------------
-
-import com.sun.jersey.api.client.ClientResponse;
-import com.sun.jersey.api.client.WebResource;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Random;
-
-import sonia.scm.repository.client.api.RepositoryClient;
-import sonia.scm.repository.client.api.RepositoryClientFactory;
-
-/**
- *
- * @author Sebastian Sdorra
- */
-@RunWith(Parameterized.class)
-public class ChangesetViewerITCase extends AbstractAdminITCaseBase
-{
-
-  /**
-   * Constructs ...
-   *
-   *
-   * @param repositoryType
-   */
-  public ChangesetViewerITCase(String repositoryType)
-  {
-    this.repositoryType = repositoryType;
-  }
-
-  //~--- methods --------------------------------------------------------------
-
-  /**
-   * Method description
-   *
-   *
-   * @return
-   */
-  @Parameters
-  public static Collection<String[]> createParameters()
-  {
-    return createRepositoryTypeParameters();
-  }
-
-  /**
-   * Method description
-   *
-   *
-   * @throws IOException
-   * @throws InterruptedException
-   */
-  @Test
-  public void cachingTest() throws IOException, InterruptedException
-  {
-    RepositoryClient rc = createRepositoryClient();
-
-    // rc.checkout();
-    addTestFile(rc, "a", 1, false);
-    addTestFile(rc, "b", 2, true);
-  }
-
-  /**
-   * Method description
-   *
-   *
-   * @throws IOException
-   */
-  @After
-  public void cleanup() throws IOException
-  {
-    IOUtil.delete(localDirectory, true);
-    deleteRepository(client, repository.getId());
-  }
-
-  /**
-   * Method description
-   *
-   *
-   * @throws IOException
-   */
-  @Before
-  public void setup() throws IOException
-  {
-    repository = RepositoryTestData.createHeartOfGold(repositoryType);
-    repository = createRepository(client, repository);
-    localDirectory = File.createTempFile("scm-", ".unittest");
-    IOUtil.delete(localDirectory);
-    IOUtil.mkdirs(localDirectory);
-  }
-
-  /**
-   * Method description
-   *
-   *
-   * @throws IOException
-   * @throws InterruptedException
-   */
-  @Test
-  public void simpleTest() throws IOException, InterruptedException
-  {
-    RepositoryClient rc = createRepositoryClient();
-
-    // rc.init();
-    addTestFile(rc, "a", 1, false);
-  }
-
-  /**
-   * Method description
-   *
-   *
-   * @param rc
-   * @param name
-   * @param count
-   * @param sleep
-   *
-   * @throws IOException
-   * @throws InterruptedException
-   * @throws RepositoryClientException
-   */
-  private void addTestFile(RepositoryClient rc, String name, int count,
-                           boolean sleep)
-          throws IOException, InterruptedException
-  {
-    File file = new File(localDirectory, name.concat(".txt"));
-
-    writeRandomContent(file);
-    rc.getAddCommand().add(name.concat(".txt"));
-    IntegrationTestUtil.commit(rc, "added-".concat(name).concat(".txt"));
-
-    if (sleep) {
-      // cache clear is async
-      Thread.sleep(500l);
-    }
-
-    ChangesetPagingResult cpr = getChangesets(repository);
-
-    if ("svn".equals(repositoryType)) {
-      assertEquals((count + 1), cpr.getTotal());
-    } else {
-      assertEquals(count, cpr.getTotal());
-    }
-
-    List<Changeset> changesets = cpr.getChangesets();
-
-    assertNotNull(changesets);
-
-    if ("svn".equals(repositoryType)) {
-      assertEquals((count + 1), changesets.size());
-    } else {
-      assertEquals(count, changesets.size());
-    }
-
-    Changeset c = changesets.get(0);
-
-    assertNotNull(c);
-    assertEquals("added-".concat(name).concat(".txt"), c.getDescription());
-    assertTrue(c.isValid());
-
-    Modifications m = c.getModifications();
-
-    assertNotNull(m);
-
-    List<String> added = m.getAdded();
-
-    assertNotNull(added);
-    assertFalse(added.isEmpty());
-    assertEquals(1, added.size());
-    //J-
-    assertThat(
-      added.get(0),
-      anyOf(
-        equalTo(name.concat(".txt")),
-        equalTo("/".concat(name).concat(".txt"))
-      )
-    );
-    //J+
-  }
-
-  private RepositoryClient createRepositoryClient() throws IOException {
-    RepositoryClientFactory factory = new RepositoryClientFactory();
-    return factory.create(
-      repositoryType, repository.createUrl(BASE_URL), 
-      IntegrationTestUtil.ADMIN_USERNAME, IntegrationTestUtil.ADMIN_PASSWORD, 
-      localDirectory
-    );
-  }
-
-  private void writeRandomContent(File file) throws IOException {
-    Random random = new Random();
-    byte[] data = new byte[random.nextInt(1024)];
-    
-    try (FileOutputStream output = new FileOutputStream(file)) {
-      random.nextBytes(data);
-      output.write(data);
-    }
-  }
-
-  //~--- get methods ----------------------------------------------------------
-
-  private String getChangesetViewerUri(Repository repository) {
-    return "repositories/".concat(repository.getId()).concat("/changesets");
-  }
-
-  private ChangesetPagingResult getChangesets(Repository repository) {
-    WebResource resource = createResource(client,
-                             getChangesetViewerUri(repository));
-
-    assertNotNull(resource);
-
-    ClientResponse response = resource.get(ClientResponse.class);
-
-    assertNotNull(response);
-    assertEquals(200, response.getStatus());
-
-    ChangesetPagingResult cpr = response.getEntity(ChangesetPagingResult.class);
-
-    assertNotNull(cpr);
-
-    return cpr;
-  }
-
-  //~--- fields ---------------------------------------------------------------
-
-  /** Field description */
-  private File localDirectory;
-
-  /** Field description */
-  private Repository repository;
-
-  /** Field description */
-  private final String repositoryType;
-}
diff --git a/scm-webapp/src/test/java/sonia/scm/it/CreateRepositoriesITCase.java b/scm-webapp/src/test/java/sonia/scm/it/CreateRepositoriesITCase.java
deleted file mode 100644
index 3d240c96f5..0000000000
--- a/scm-webapp/src/test/java/sonia/scm/it/CreateRepositoriesITCase.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/**
- * Copyright (c) 2010, Sebastian Sdorra
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 3. Neither the name of SCM-Manager; nor the names of its
- *    contributors may be used to endorse or promote products derived from this
- *    software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * http://bitbucket.org/sdorra/scm-manager
- *
- */
-
-
-
-package sonia.scm.it;
-
-//~--- non-JDK imports --------------------------------------------------------
-
-import org.junit.After;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import sonia.scm.repository.Repository;
-import sonia.scm.repository.RepositoryTestData;
-import sonia.scm.util.IOUtil;
-
-import static org.junit.Assert.*;
-
-import static sonia.scm.it.IntegrationTestUtil.*;
-import static sonia.scm.it.RepositoryITUtil.*;
-
-//~--- JDK imports ------------------------------------------------------------
-
-import com.sun.jersey.api.client.ClientResponse;
-import com.sun.jersey.api.client.WebResource;
-
-import java.io.IOException;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-/**
- *
- * @author Sebastian Sdorra
- */
-@RunWith(Parameterized.class)
-public class CreateRepositoriesITCase extends AbstractAdminITCaseBase
-{
-
-  /**
-   * Constructs ...
-   *
-   *
-   * @param repositoryType
-   */
-  public CreateRepositoriesITCase(String repositoryType)
-  {
-    this.repositoryType = repositoryType;
-  }
-
-  //~--- methods --------------------------------------------------------------
-
-  /**
-   * Method description
-   *
-   *
-   * @return
-   */
-  @Parameters
-  public static Collection<String[]> createParameters()
-  {
-    Collection<String[]> params = new ArrayList<>();
-
-    params.add(new String[] { "git" });
-    params.add(new String[] { "svn" });
-
-    if (IOUtil.search("hg") != null)
-    {
-      params.add(new String[] { "hg" });
-    }
-
-    return params;
-  }
-
-  /**
-   * Method description
-   *
-   *
-   * @throws IOException
-   */
-  @After
-  public void cleanup() throws IOException
-  {
-    deleteRepository(client, repository.getId());
-  }
-
-  /**
-   * Method description
-   *
-   */
-  @Test
-  public void testCreate()
-  {
-    repository = RepositoryTestData.createHeartOfGold(repositoryType);
-    repository = createRepository(client, repository);
-  }
-
-  /**
-   * Method description
-   *
-   */
-  @Test
-  public void testCreateAllreadyExists()
-  {
-    repository = RepositoryTestData.create42Puzzle(repositoryType);
-    repository = createRepository(client, repository);
-
-    WebResource wr = createResource(client, "repositories");
-    ClientResponse response =
-      wr.post(ClientResponse.class,
-              RepositoryTestData.create42Puzzle(repositoryType));
-
-    assertNotNull(response);
-    assertEquals(500, response.getStatus());
-    response.close();
-  }
-
-  /**
-   * Method description
-   *
-   */
-  @Test
-  public void testCreateAllreadyExistsWithStructure()
-  {
-    repository = RepositoryTestData.create42Puzzle(repositoryType);
-    repository = createRepository(client, repository);
-
-    Repository r = RepositoryTestData.create42Puzzle(repositoryType);
-
-    r.setName(r.getName() + "/" + r.getName());
-
-    WebResource wr = createResource(client, "repositories");
-    ClientResponse response = wr.post(ClientResponse.class, r);
-
-    assertNotNull(response);
-    System.out.println( response.getStatus() );
-    assertEquals(500, response.getStatus());
-    response.close();
-  }
-
-  /**
-   * Method description
-   *
-   */
-  @Test
-  public void testCreateWithStructure()
-  {
-    repository = RepositoryTestData.createHeartOfGold(repositoryType);
-    repository.setName("test/".concat(repository.getName()));
-    repository = createRepository(client, repository);
-  }
-
-  //~--- fields ---------------------------------------------------------------
-
-  /** Field description */
-  private Repository repository;
-
-  /** Field description */
-  private String repositoryType;
-}
diff --git a/scm-webapp/src/test/java/sonia/scm/it/DeactivatedUserITCase.java b/scm-webapp/src/test/java/sonia/scm/it/DeactivatedUserITCase.java
deleted file mode 100644
index 5d30115fbb..0000000000
--- a/scm-webapp/src/test/java/sonia/scm/it/DeactivatedUserITCase.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/**
- * Copyright (c) 2010, Sebastian Sdorra
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 3. Neither the name of SCM-Manager; nor the names of its
- *    contributors may be used to endorse or promote products derived from this
- *    software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * http://bitbucket.org/sdorra/scm-manager
- *
- */
-
-
-package sonia.scm.it;
-
-//~--- non-JDK imports --------------------------------------------------------
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import sonia.scm.user.User;
-import sonia.scm.user.UserTestData;
-
-import static org.junit.Assert.*;
-
-import static sonia.scm.it.IntegrationTestUtil.*;
-
-//~--- JDK imports ------------------------------------------------------------
-
-import com.sun.jersey.api.client.Client;
-import com.sun.jersey.api.client.ClientResponse;
-import com.sun.jersey.api.client.WebResource;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.MediaType;
-
-/**
- *
- * @author Sebastian Sdorra
- */
-public class DeactivatedUserITCase
-{
-
-  /**
-   * Method description
-   *
-   */
-  @Before
-  public void createDeactivatedUser()
-  {
-    Client client = createAdminClient();
-
-    try
-    {
-      WebResource wr = createResource(client, "users");
-
-      slarti = UserTestData.createSlarti();
-      slarti.setPassword("slart123");
-      slarti.setActive(false);
-
-      ClientResponse response =
-        wr.type(MediaType.APPLICATION_XML).post(ClientResponse.class, slarti);
-
-      assertNotNull(response);
-      assertEquals(201, response.getStatus());
-      response.close();
-    }
-    finally
-    {
-      client.destroy();
-    }
-  }
-
-  /**
-   * Method description
-   *
-   */
-  @After
-  public void destroyDeactivatedUser()
-  {
-    Client client = createAdminClient();
-
-    try
-    {
-      WebResource wr = createResource(client,
-                                      "users/".concat(slarti.getName()));
-      ClientResponse response =
-        wr.type(MediaType.APPLICATION_XML).delete(ClientResponse.class);
-
-      assertNotNull(response);
-      assertEquals(204, response.getStatus());
-      response.close();
-    }
-    finally
-    {
-      client.destroy();
-    }
-  }
-
-  /**
-   * Method description
-   *
-   */
-  @Test
-  public void testFailedAuthentication()
-  {
-    Client client = createClient();
-    ClientResponse response = authenticate(client, slarti.getName(), "slart123");
-    assertNotNull(response);
-    assertEquals(HttpServletResponse.SC_UNAUTHORIZED, response.getStatus());
-  }
-
-  //~--- fields ---------------------------------------------------------------
-
-  /** Field description */
-  private User slarti;
-}
diff --git a/scm-webapp/src/test/java/sonia/scm/it/GitLfsITCase.java b/scm-webapp/src/test/java/sonia/scm/it/GitLfsITCase.java
index 33e020f85d..2452afb909 100644
--- a/scm-webapp/src/test/java/sonia/scm/it/GitLfsITCase.java
+++ b/scm-webapp/src/test/java/sonia/scm/it/GitLfsITCase.java
@@ -36,251 +36,259 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.type.TypeFactory;
 import com.fasterxml.jackson.module.jaxb.JaxbAnnotationIntrospector;
 import com.google.common.base.Charsets;
-import com.sun.jersey.api.client.Client;
 import com.sun.jersey.api.client.UniformInterfaceException;
-import java.io.IOException;
-import java.util.UUID;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
 import org.apache.shiro.crypto.hash.Sha256Hash;
 import org.hamcrest.Matchers;
 import org.junit.After;
-import org.junit.Test;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Rule;
-import org.junit.rules.TemporaryFolder;
-import static org.junit.Assert.*;
+import org.junit.Test;
 import org.junit.rules.ExpectedException;
-
-import static sonia.scm.it.IntegrationTestUtil.*;
-import static sonia.scm.it.RepositoryITUtil.*;
-import sonia.scm.repository.Permission;
+import org.junit.rules.TemporaryFolder;
+import sonia.scm.api.rest.ObjectMapperProvider;
+import sonia.scm.api.v2.resources.RepositoryDto;
 import sonia.scm.repository.PermissionType;
 import sonia.scm.repository.Repository;
-import sonia.scm.repository.RepositoryTestData;
 import sonia.scm.user.User;
 import sonia.scm.user.UserTestData;
 
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.io.IOException;
+import java.util.UUID;
+
+import static org.junit.Assert.assertArrayEquals;
+import static sonia.scm.it.IntegrationTestUtil.BASE_URL;
+import static sonia.scm.it.IntegrationTestUtil.REST_BASE_URL;
+import static sonia.scm.it.IntegrationTestUtil.createAdminClient;
+import static sonia.scm.it.IntegrationTestUtil.readJson;
+import static sonia.scm.it.RepositoryITUtil.createRepository;
+import static sonia.scm.it.RepositoryITUtil.deleteRepository;
+
 /**
  * Integration tests for git lfs.
- * 
+ *
  * @author Sebastian Sdorra
  */
 public class GitLfsITCase {
-  
+
   @Rule
   public ExpectedException expectedException = ExpectedException.none();
-  
+
   @Rule
   public TemporaryFolder temporaryFolder = new TemporaryFolder();
-  
+
   private final ObjectMapper mapper = new ObjectMapper();
 
-  private Client adminClient;
-  
-  private Repository repository;
-  
+  private ScmClient adminClient;
+
+  private RepositoryDto repository;
+
   public GitLfsITCase() {
     mapper.setAnnotationIntrospector(new JaxbAnnotationIntrospector(TypeFactory.defaultInstance()));
   }
-  
+
   // lifecycle methods
-  
+
   @Before
   public void setUpTestDependencies() {
     adminClient = createAdminClient();
-    repository = createRepository(adminClient, RepositoryTestData.createHeartOfGold("git"));
+    repository = createRepository(adminClient, readJson("repository-git.json"));
   }
-  
+
   @After
   public void tearDownTestDependencies() {
-    deleteRepository(adminClient, repository.getId());
-    adminClient.destroy();
+    deleteRepository(adminClient, repository);
   }
-  
+
   // tests
-  
+
   @Test
   public void testLfsAPIWithAdminPermissions() throws IOException {
     uploadAndDownload(adminClient);
   }
-  
+
   @Test
+  @Ignore("permissions not yet implemented")
   public void testLfsAPIWithOwnerPermissions() throws IOException {
     uploadAndDownloadAsUser(PermissionType.OWNER);
   }
-  
+
   private void uploadAndDownloadAsUser(PermissionType permissionType) throws IOException {
     User trillian = UserTestData.createTrillian();
     trillian.setPassword("secret123");
     createUser(trillian);
-    
-    try {    
-      repository.getPermissions().add(new Permission(trillian.getId(), permissionType));
-      modifyRepository(repository);
 
-      Client client = createClient();
-      authenticate(client, trillian.getId(), "secret123");
+    try {
+      // TODO enable when permissions are implemented in v2
+//      repository.getPermissions().add(new Permission(trillian.getId(), permissionType));
+//      modifyRepository(repository);
+
+      ScmClient client = new ScmClient(trillian.getId(), "secret123");
 
       uploadAndDownload(client);
     } finally {
       removeUser(trillian);
     }
   }
-  
+
   @Test
+  @Ignore("permissions not yet implemented")
   public void testLfsAPIWithWritePermissions() throws IOException {
     uploadAndDownloadAsUser(PermissionType.WRITE);
   }
-  
+
   private void createUser(User user) {
     adminClient.resource(REST_BASE_URL + "users.json").post(user);
   }
-  
+
   private void modifyRepository(Repository repository) {
     adminClient.resource(REST_BASE_URL + "repositories/" + repository.getId() + ".json").put(repository);
   }
-  
+
   private void removeUser(User user) {
     adminClient.resource(REST_BASE_URL + "users/" + user.getId() + ".json").delete();
   }
-  
+
   @Test
+  @Ignore("permissions not yet implemented")
   public void testLfsAPIWithoutWritePermissions() throws IOException {
     User trillian = UserTestData.createTrillian();
     trillian.setPassword("secret123");
     createUser(trillian);
-    
+
     expectedException.expect(UniformInterfaceException.class);
     expectedException.expectMessage(Matchers.containsString("403"));
-    
-    
-    try {    
-      repository.getPermissions().add(new Permission(trillian.getId(), PermissionType.READ));
-      modifyRepository(repository);
 
-      Client client = createClient();
-      authenticate(client, trillian.getId(), "secret123");
 
+    try {
+      // TODO enable when permissions are implemented in v2
+//      repository.getPermissions().add(new Permission(trillian.getId(), PermissionType.READ));
+//      modifyRepository(repository);
+
+      ScmClient client = new ScmClient(trillian.getId(), "secret123");
       uploadAndDownload(client);
     } finally {
       removeUser(trillian);
     }
   }
-  
+
   @Test
+  @Ignore("permissions not yet implemented")
   public void testLfsDownloadWithReadPermissions() throws IOException {
     User trillian = UserTestData.createTrillian();
     trillian.setPassword("secret123");
     createUser(trillian);
-    
-    
-    try {    
-      repository.getPermissions().add(new Permission(trillian.getId(), PermissionType.READ));
-      modifyRepository(repository);
+
+
+    try {
+      // TODO enable when permissions are implemented in v2
+//      repository.getPermissions().add(new Permission(trillian.getId(), PermissionType.READ));
+//      modifyRepository(repository);
 
       // upload data as admin
       String data = UUID.randomUUID().toString();
       byte[] dataAsBytes = data.getBytes(Charsets.UTF_8);
       LfsObject lfsObject = upload(adminClient, dataAsBytes);
-      
-      Client client = createClient();
-      authenticate(client, trillian.getId(), "secret123");
+
+      ScmClient client = new ScmClient(trillian.getId(), "secret123");
 
       // download as user
       byte[] downloadedData = download(client, lfsObject);
-      
+
       // assert both are equal
       assertArrayEquals(dataAsBytes, downloadedData);
     } finally {
       removeUser(trillian);
     }
   }
-  
+
   // lfs api
-  
-  private void uploadAndDownload(Client client) throws IOException {
+
+  private void uploadAndDownload(ScmClient client) throws IOException {
     String data = UUID.randomUUID().toString();
     byte[] dataAsBytes = data.getBytes(Charsets.UTF_8);
     LfsObject lfsObject = upload(client, dataAsBytes);
     byte[] downloadedData = download(client, lfsObject);
     assertArrayEquals(dataAsBytes, downloadedData);
   }
-  
-  private LfsObject upload(Client client, byte[] data) throws IOException {
+
+  private LfsObject upload(ScmClient client, byte[] data) throws IOException {
     LfsObject lfsObject = createLfsObject(data);
     LfsRequestBody request = LfsRequestBody.createUploadRequest(lfsObject);
     LfsResponseBody response = request(client, request);
-    
+
     String uploadURL = response.objects[0].actions.upload.href;
     client.resource(uploadURL).put(data);
-    
+
     return lfsObject;
-  }  
-  
-  private LfsResponseBody request(Client client, LfsRequestBody request) throws IOException {
+  }
+
+  private LfsResponseBody request(ScmClient client, LfsRequestBody request) throws IOException {
     String batchUrl = createBatchUrl();
     String requestAsString = mapper.writeValueAsString(request);
-    
-    return client
-            .resource(batchUrl)
-            .accept("application/vnd.git-lfs+json")
-            .header("Content-Type", "application/vnd.git-lfs+json")
-            .post(LfsResponseBody.class, requestAsString);    
+
+    String json = client
+      .resource(batchUrl)
+      .accept("application/vnd.git-lfs+json")
+      .header("Content-Type", "application/vnd.git-lfs+json")
+      .post(String.class, requestAsString);
+    return new ObjectMapperProvider().get().readValue(json, LfsResponseBody.class);
   }
-  
+
   private String createBatchUrl() {
-    String url = repository.createUrl(BASE_URL);
+    String url = BASE_URL + "git/" + repository.getNamespace() + "/" + repository.getName();
     return url + "/info/lfs/objects/batch";
   }
-  
-  private byte[] download(Client client, LfsObject lfsObject) throws IOException {
+
+  private byte[] download(ScmClient client, LfsObject lfsObject) throws IOException {
     LfsRequestBody request = LfsRequestBody.createDownloadRequest(lfsObject);
     LfsResponseBody response = request(client, request);
-    
+
     String downloadUrl = response.objects[0].actions.download.href;
     return client.resource(downloadUrl).get(byte[].class);
   }
-  
+
   private LfsObject createLfsObject(byte[] data) {
     Sha256Hash hash = new Sha256Hash(data);
     String oid = hash.toHex();
     return new LfsObject(oid, data.length);
   }
-  
+
   // LFS DTO objects
-  
+
   @XmlRootElement
   @XmlAccessorType(XmlAccessType.FIELD)
   private static class LfsRequestBody {
-    
+
     private String operation;
     private String[] transfers = new String[]{ "basic" };
     private LfsObject[] objects;
 
     public LfsRequestBody() {
     }
-    
+
     private LfsRequestBody(String operation, LfsObject[] objects) {
       this.operation = operation;
       this.objects = objects;
     }
-    
+
     public static LfsRequestBody createUploadRequest(LfsObject object) {
       return new LfsRequestBody("upload", new LfsObject[]{object});
     }
-    
+
     public static LfsRequestBody createDownloadRequest(LfsObject object) {
       return new LfsRequestBody("download", new LfsObject[]{object});
     }
-    
+
   }
-  
+
   @XmlRootElement
   @XmlAccessorType(XmlAccessType.FIELD)
   private static class LfsResponseBody {
-    
+
     private LfsObject[] objects;
 
     public LfsResponseBody() {
@@ -290,11 +298,11 @@ public class GitLfsITCase {
       this.objects = objects;
     }
   }
-  
+
   @XmlRootElement
   @XmlAccessorType(XmlAccessType.FIELD)
   private static class LfsObject {
-    
+
     private String oid;
     private long size;
     private LfsActions actions;
@@ -312,24 +320,24 @@ public class GitLfsITCase {
       this.size = size;
       this.actions = actions;
     }
-    
+
   }
-  
+
   @XmlRootElement
   @XmlAccessorType(XmlAccessType.FIELD)
   private static class LfsActions {
-    
+
     private LfsAction upload;
     private LfsAction download;
 
     public LfsActions() {
     }
   }
-  
+
   @XmlRootElement
   @XmlAccessorType(XmlAccessType.FIELD)
   private static class LfsAction {
-    
+
     private String href;
 
     public LfsAction() {
@@ -338,7 +346,7 @@ public class GitLfsITCase {
     public LfsAction(String href) {
       this.href = href;
     }
-    
+
   }
-  
+
 }
diff --git a/scm-webapp/src/test/java/sonia/scm/it/GitRepositoryPathMatcherITCase.java b/scm-webapp/src/test/java/sonia/scm/it/GitRepositoryPathMatcherITCase.java
index 079e2c520e..13cae15907 100644
--- a/scm-webapp/src/test/java/sonia/scm/it/GitRepositoryPathMatcherITCase.java
+++ b/scm-webapp/src/test/java/sonia/scm/it/GitRepositoryPathMatcherITCase.java
@@ -32,103 +32,108 @@ package sonia.scm.it;
 
 import com.google.common.base.Charsets;
 import com.google.common.io.Files;
-import com.sun.jersey.api.client.Client;
-import java.io.File;
-import java.io.IOException;
 import org.junit.After;
-import static org.junit.Assert.*;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
-import static sonia.scm.it.IntegrationTestUtil.*;
-import static sonia.scm.it.RepositoryITUtil.*;
+import sonia.scm.api.v2.resources.RepositoryDto;
 import sonia.scm.repository.Person;
-import sonia.scm.repository.Repository;
-import sonia.scm.repository.RepositoryTestData;
 import sonia.scm.repository.client.api.ClientCommand;
 import sonia.scm.repository.client.api.RepositoryClient;
 import sonia.scm.repository.client.api.RepositoryClientFactory;
 
+import java.io.File;
+import java.io.IOException;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static sonia.scm.it.IntegrationTestUtil.ADMIN_PASSWORD;
+import static sonia.scm.it.IntegrationTestUtil.ADMIN_USERNAME;
+import static sonia.scm.it.IntegrationTestUtil.BASE_URL;
+import static sonia.scm.it.IntegrationTestUtil.createAdminClient;
+import static sonia.scm.it.IntegrationTestUtil.readJson;
+import static sonia.scm.it.RepositoryITUtil.createRepository;
+import static sonia.scm.it.RepositoryITUtil.deleteRepository;
+
 /**
  * Integration test for RepositoryPathMatching with ".git" and without ".git".
- * 
+ *
  * @author Sebastian Sdorra
  * @since 1.54
  */
 public class GitRepositoryPathMatcherITCase {
-  
+
   private static final RepositoryClientFactory REPOSITORY_CLIENT_FACTORY = new RepositoryClientFactory();
-  
+
   @Rule
   public TemporaryFolder tempFolder = new TemporaryFolder();
-  
-  private Client apiClient;
-  private Repository repository;
-  
+
+  private ScmClient apiClient;
+  private RepositoryDto repository;
+
   @Before
   public void setUp() {
     apiClient = createAdminClient();
-    Repository testRepository = RepositoryTestData.createHeartOfGold("git");
-    this.repository = createRepository(apiClient, testRepository);
+    this.repository = createRepository(apiClient, readJson("repository-git.json"));
   }
-  
+
   @After
   public void tearDown() {
-    deleteRepository(apiClient, repository.getId());
+    deleteRepository(apiClient, repository);
   }
-  
+
   // tests begin
-  
+
   @Test
   public void testWithoutDotGit() throws IOException {
     String urlWithoutDotGit = createUrl();
     cloneAndPush(urlWithoutDotGit);
   }
-  
+
   @Test
   public void testWithDotGit() throws IOException {
     String urlWithDotGit = createUrl() + ".git";
     cloneAndPush(urlWithDotGit);
   }
-  
+
   // tests end
-  
+
   private String createUrl() {
-    return BASE_URL + "git/" + repository.getName();
+    return BASE_URL + "git/" + repository.getNamespace() + "/" + repository.getName();
   }
-  
+
   private void cloneAndPush( String url ) throws IOException {
     cloneRepositoryAndPushFiles(url);
     cloneRepositoryAndCheckFiles(url);
   }
-  
+
   private void cloneRepositoryAndPushFiles(String url) throws IOException {
     RepositoryClient repositoryClient = createRepositoryClient(url);
-    
+
     Files.write("a", new File(repositoryClient.getWorkingCopy(), "a.txt"), Charsets.UTF_8);
     repositoryClient.getAddCommand().add("a.txt");
     commit(repositoryClient, "added a");
-    
+
     Files.write("b", new File(repositoryClient.getWorkingCopy(), "b.txt"), Charsets.UTF_8);
     repositoryClient.getAddCommand().add("b.txt");
     commit(repositoryClient, "added b");
   }
-  
+
   private void cloneRepositoryAndCheckFiles(String url) throws IOException {
     RepositoryClient repositoryClient = createRepositoryClient(url);
     File workingCopy = repositoryClient.getWorkingCopy();
-    
+
     File a = new File(workingCopy, "a.txt");
     assertTrue(a.exists());
     assertEquals("a", Files.toString(a, Charsets.UTF_8));
-    
+
     File b = new File(workingCopy, "b.txt");
     assertTrue(b.exists());
     assertEquals("b", Files.toString(b, Charsets.UTF_8));
   }
-  
-   private void commit(RepositoryClient repositoryClient, String message) throws IOException {
+
+  private void commit(RepositoryClient repositoryClient, String message) throws IOException {
     repositoryClient.getCommitCommand().commit(
       new Person("scmadmin", "scmadmin@scm-manager.org"), message
     );
@@ -136,7 +141,7 @@ public class GitRepositoryPathMatcherITCase {
       repositoryClient.getPushCommand().push();
     }
   }
-  
+
   private RepositoryClient createRepositoryClient(String url) throws IOException {
     return REPOSITORY_CLIENT_FACTORY.create("git", url, ADMIN_USERNAME, ADMIN_PASSWORD, tempFolder.newFolder());
   }
diff --git a/scm-webapp/src/test/java/sonia/scm/it/GroupITCase.java b/scm-webapp/src/test/java/sonia/scm/it/GroupITCase.java
deleted file mode 100644
index e95f613f2a..0000000000
--- a/scm-webapp/src/test/java/sonia/scm/it/GroupITCase.java
+++ /dev/null
@@ -1,265 +0,0 @@
-/**
- * Copyright (c) 2010, Sebastian Sdorra
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 3. Neither the name of SCM-Manager; nor the names of its
- *    contributors may be used to endorse or promote products derived from this
- *    software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * http://bitbucket.org/sdorra/scm-manager
- *
- */
-
-
-
-package sonia.scm.it;
-
-//~--- non-JDK imports --------------------------------------------------------
-
-import org.junit.AfterClass;
-import org.junit.Test;
-
-import sonia.scm.group.Group;
-
-import static org.junit.Assert.*;
-
-import static sonia.scm.it.IntegrationTestUtil.*;
-
-//~--- JDK imports ------------------------------------------------------------
-
-import com.sun.jersey.api.client.Client;
-import com.sun.jersey.api.client.ClientResponse;
-import com.sun.jersey.api.client.GenericType;
-import com.sun.jersey.api.client.WebResource;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-/**
- *
- * @author Sebastian Sdorra
- */
-public class GroupITCase extends AbstractAdminITCaseBase
-{
-
-  /**
-   * Method description
-   *
-   */
-  @AfterClass
-  public static void cleanup()
-  {
-    Client client = createClient();
-
-    authenticateAdmin(client);
-    createResource(client, "groups/group-a").delete();
-    createResource(client, "groups/group-c").delete();
-    client.destroy();
-  }
-
-  /**
-   * Method description
-   *
-   */
-  @Test
-  public void create()
-  {
-    Group group = new Group();
-
-    group.setName("group-a");
-    group.setDescription("group a");
-
-    List<String> members = new ArrayList<String>();
-
-    members.add("slarti");
-    members.add("marvin");
-    members.add("dent");
-    group.setMembers(members);
-    createGroup(group);
-  }
-
-  /**
-   * Method description
-   *
-   */
-  @Test
-  public void delete()
-  {
-    Group group = new Group();
-
-    group.setName("group-b");
-    group.setDescription("group b");
-
-    List<String> members = new ArrayList<String>();
-
-    members.add("slarti");
-    members.add("dent");
-    group.setMembers(members);
-    createGroup(group);
-    deleteGroup(group.getName());
-  }
-
-  /**
-   * Method description
-   *
-   */
-  @Test
-  public void modify()
-  {
-    Group group = new Group();
-
-    group.setName("group-d");
-    group.setDescription("group d");
-    createGroup(group);
-    group = getGroup(group.getName());
-    group.setDescription("GROUP D");
-
-    WebResource wr = createResource(client, "groups/group-d");
-    ClientResponse response = wr.put(ClientResponse.class, group);
-
-    assertNotNull(response);
-    assertEquals(204, response.getStatus());
-    response.close();
-
-    Group other = getGroup("group-d");
-
-    assertEquals(group.getName(), other.getName());
-    assertEquals(group.getDescription(), other.getDescription());
-    assertNotNull(other.getLastModified());
-    deleteGroup(other.getName());
-  }
-
-  //~--- get methods ----------------------------------------------------------
-
-  /**
-   * Method description
-   *
-   */
-  @Test
-  public void getAll()
-  {
-    Group group = new Group();
-
-    group.setName("group-c");
-    createGroup(group);
-
-    WebResource wr = createResource(client, "groups");
-    ClientResponse response = wr.get(ClientResponse.class);
-    Collection<Group> groups =
-      response.getEntity(new GenericType<Collection<Group>>() {}
-    );
-
-    response.close();
-    assertNotNull(groups);
-    assertFalse(groups.isEmpty());
-
-    Group groupC = null;
-
-    for (Group g : groups)
-    {
-      if (g.getName().equals("group-c"))
-      {
-        groupC = g;
-      }
-    }
-
-    assertNotNull(groupC);
-    assertNotNull(groupC.getCreationDate());
-    assertNotNull(groupC.getType());
-  }
-
-  //~--- methods --------------------------------------------------------------
-
-  /**
-   * Method description
-   *
-   *
-   * @param group
-   */
-  private void createGroup(Group group)
-  {
-    WebResource wr = createResource(client, "groups");
-    ClientResponse response = wr.post(ClientResponse.class, group);
-
-    assertNotNull(response);
-    assertEquals(201, response.getStatus());
-    response.close();
-
-    Group other = getGroup(group.getName());
-
-    assertNotNull(other);
-    assertNotNull(other.getType());
-    assertEquals(group.getName(), other.getName());
-    assertEquals(group.getDescription(), other.getDescription());
-    assertArrayEquals(other.getMembers().toArray(new String[0]),
-                      group.getMembers().toArray(new String[0]));
-    assertNotNull(other.getCreationDate());
-  }
-
-  /**
-   * Method description
-   *
-   *
-   * @param name
-   */
-  private void deleteGroup(String name)
-  {
-    WebResource wr = createResource(client, "groups/".concat(name));
-    ClientResponse response = wr.delete(ClientResponse.class);
-
-    assertNotNull(response);
-    assertEquals(204, response.getStatus());
-    response.close();
-    wr = createResource(client, "groups/".concat(name));
-    response = wr.get(ClientResponse.class);
-    assertNotNull(response);
-    assertEquals(404, response.getStatus());
-    response.close();
-  }
-
-  //~--- get methods ----------------------------------------------------------
-
-  /**
-   * Method description
-   *
-   *
-   * @param groupname
-   *
-   * @return
-   */
-  private Group getGroup(String groupname)
-  {
-    WebResource wr = createResource(client, "groups/".concat(groupname));
-    ClientResponse response = wr.get(ClientResponse.class);
-
-    assertNotNull(response);
-
-    Group group = response.getEntity(Group.class);
-
-    response.close();
-    assertNotNull(group);
-    assertEquals(groupname, group.getName());
-
-    return group;
-  }
-}
diff --git a/scm-webapp/src/test/java/sonia/scm/it/GroupPermissionITCase.java b/scm-webapp/src/test/java/sonia/scm/it/GroupPermissionITCase.java
deleted file mode 100644
index 5d115f58ff..0000000000
--- a/scm-webapp/src/test/java/sonia/scm/it/GroupPermissionITCase.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/**
- * Copyright (c) 2010, Sebastian Sdorra
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 3. Neither the name of SCM-Manager; nor the names of its
- *    contributors may be used to endorse or promote products derived from this
- *    software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * http://bitbucket.org/sdorra/scm-manager
- *
- */
-
-
-
-package sonia.scm.it;
-
-//~--- non-JDK imports --------------------------------------------------------
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import sonia.scm.group.Group;
-
-import static org.junit.Assert.*;
-
-import static sonia.scm.it.IntegrationTestUtil.*;
-
-//~--- JDK imports ------------------------------------------------------------
-
-import com.sun.jersey.api.client.Client;
-import com.sun.jersey.api.client.ClientResponse;
-import com.sun.jersey.api.client.WebResource;
-
-/**
- *
- * @author Sebastian Sdorra
- */
-@RunWith(Parameterized.class)
-public class GroupPermissionITCase extends AbstractPermissionITCaseBase<Group>
-{
-
-  /**
-   * Constructs ...
-   *
-   *
-   * @param credentials
-   */
-  public GroupPermissionITCase(Credentials credentials)
-  {
-    super(credentials);
-  }
-
-  //~--- methods --------------------------------------------------------------
-
-  /**
-   * Method description
-   *
-   */
-  @AfterClass
-  public static void cleanup()
-  {
-    Client client = createClient();
-
-    authenticateAdmin(client);
-    createResource(client, "groups/test-group").delete();
-    client.destroy();
-  }
-
-  /**
-   * Method description
-   *
-   */
-  @BeforeClass
-  public static void createTestGroup()
-  {
-    Group testGroup = new Group("xml", "test-group");
-    Client client = createClient();
-
-    authenticateAdmin(client);
-
-    WebResource wr = createResource(client, "groups");
-    ClientResponse response = wr.post(ClientResponse.class, testGroup);
-
-    assertNotNull(response);
-    assertEquals(201, response.getStatus());
-    response.close();
-    logoutClient(client);
-    client.destroy();
-  }
-
-  //~--- get methods ----------------------------------------------------------
-
-  /**
-   * Method description
-   *
-   *
-   * @return
-   */
-  @Override
-  protected String getBasePath()
-  {
-    return "groups";
-  }
-
-  /**
-   * Method description
-   *
-   *
-   * @return
-   */
-  @Override
-  protected Group getCreateItem()
-  {
-    return new Group("xml", "create-test-group");
-  }
-
-  /**
-   * Method description
-   *
-   *
-   * @return
-   */
-  @Override
-  protected String getDeletePath()
-  {
-    return "groups/test-group";
-  }
-
-  /**
-   * Method description
-   *
-   *
-   * @return
-   */
-  @Override
-  protected String getGetPath()
-  {
-    return "groups/test-group";
-  }
-
-  /**
-   * Method description
-   *
-   *
-   * @return
-   */
-  @Override
-  protected Group getModifyItem()
-  {
-    return new Group("xml", "test-group", "dent", "zaphod", "trillian");
-  }
-
-  /**
-   * Method description
-   *
-   *
-   * @return
-   */
-  @Override
-  protected String getModifyPath()
-  {
-    return "groups/test-group";
-  }
-}
diff --git a/scm-webapp/src/test/java/sonia/scm/it/HttpCacheITCaseBase.java b/scm-webapp/src/test/java/sonia/scm/it/HttpCacheITCaseBase.java
index e3727a468d..c2b43465c3 100644
--- a/scm-webapp/src/test/java/sonia/scm/it/HttpCacheITCaseBase.java
+++ b/scm-webapp/src/test/java/sonia/scm/it/HttpCacheITCaseBase.java
@@ -35,24 +35,25 @@ package sonia.scm.it;
 
 //~--- non-JDK imports --------------------------------------------------------
 
+import com.sun.jersey.api.client.ClientResponse;
+import com.sun.jersey.api.client.WebResource;
 import org.junit.After;
 import org.junit.Test;
 
-import static org.hamcrest.Matchers.*;
-
-import static org.junit.Assert.*;
-
-import static sonia.scm.it.IntegrationTestUtil.*;
-
-//~--- JDK imports ------------------------------------------------------------
-
-import com.sun.jersey.api.client.Client;
-import com.sun.jersey.api.client.ClientResponse;
-import com.sun.jersey.api.client.WebResource;
-
+import javax.ws.rs.core.EntityTag;
 import java.util.Date;
 
-import javax.ws.rs.core.EntityTag;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.not;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+import static sonia.scm.it.IntegrationTestUtil.createAdminClient;
+import static sonia.scm.it.IntegrationTestUtil.createResource;
+
+//~--- JDK imports ------------------------------------------------------------
 
 /**
  *
@@ -188,8 +189,8 @@ public abstract class HttpCacheITCaseBase<T>
    */
   private ClientResponse getCollectionResponse()
   {
-    Client client = createAdminClient();
-    WebResource resource = createResource(client, getCollectionUrlPart());
+    ScmClient client = createAdminClient();
+    WebResource.Builder resource = createResource(client, getCollectionUrlPart());
     ClientResponse response = resource.get(ClientResponse.class);
 
     assertEquals(200, response.getStatus());
diff --git a/scm-webapp/src/test/java/sonia/scm/it/IntegrationTestUtil.java b/scm-webapp/src/test/java/sonia/scm/it/IntegrationTestUtil.java
index e12057e47a..4db5896598 100644
--- a/scm-webapp/src/test/java/sonia/scm/it/IntegrationTestUtil.java
+++ b/scm-webapp/src/test/java/sonia/scm/it/IntegrationTestUtil.java
@@ -35,33 +35,33 @@ package sonia.scm.it;
 
 //~--- non-JDK imports --------------------------------------------------------
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.io.Resources;
 import com.sun.jersey.api.client.Client;
 import com.sun.jersey.api.client.ClientResponse;
 import com.sun.jersey.api.client.WebResource;
 import com.sun.jersey.client.apache.ApacheHttpClient;
 import com.sun.jersey.client.apache.config.ApacheHttpClientConfig;
 import com.sun.jersey.client.apache.config.DefaultApacheHttpClientConfig;
-import com.sun.jersey.core.util.MultivaluedMapImpl;
-import sonia.scm.ScmState;
-import sonia.scm.Type;
+import de.otto.edison.hal.HalRepresentation;
 import sonia.scm.api.rest.JSONContextResolver;
 import sonia.scm.api.rest.ObjectMapperProvider;
 import sonia.scm.repository.Person;
 import sonia.scm.repository.client.api.ClientCommand;
 import sonia.scm.repository.client.api.RepositoryClient;
-import sonia.scm.user.User;
 import sonia.scm.util.IOUtil;
 
-import javax.ws.rs.core.MultivaluedMap;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.net.URI;
+import java.net.URL;
+import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.UUID;
 
-import static org.junit.Assert.*;
-
 //~--- JDK imports ------------------------------------------------------------
 
 /**
@@ -83,7 +83,7 @@ public final class IntegrationTestUtil
   public static final String BASE_URL = "http://localhost:8081/scm/";
   
   /** scm-manager base url for the rest api */
-  public static final String REST_BASE_URL = BASE_URL.concat("api/rest/");
+  public static final String REST_BASE_URL = BASE_URL.concat("api/rest/v2/");
 
   //~--- constructors ---------------------------------------------------------
 
@@ -95,72 +95,10 @@ public final class IntegrationTestUtil
 
   //~--- methods --------------------------------------------------------------
 
-  /**
-   * Method description
-   *
-   *
-   * @param client
-   * @param username
-   * @param password
-   *
-   * @return
-   */
-  public static ClientResponse authenticate(Client client, String username, String password) {
-    WebResource wr =  client.resource(createResourceUrl("auth/access_token"));
-    MultivaluedMap<String, String> formData = new MultivaluedMapImpl();
 
-    formData.add("username", username);
-    formData.add("password", password);
-    formData.add("cookie", "true");
-    formData.add("grant_type", "password");
-
-    return wr.type("application/x-www-form-urlencoded").post(ClientResponse.class, formData);
-  }
-
-  /**
-   * Method description
-   *
-   *
-   * @param client
-   *
-   * @return
-   */
-  public static ScmState authenticateAdmin(Client client)
+  public static ScmClient createAdminClient()
   {
-    ClientResponse cr = authenticate(client, ADMIN_USERNAME, ADMIN_PASSWORD);
-    ScmState state = cr.getEntity(ScmState.class);
-
-    cr.close();
-    assertNotNull(state);
-    assertTrue(state.isSuccess());
-
-    User user = state.getUser();
-
-    assertNotNull(user);
-    assertEquals("scmadmin", user.getName());
-    assertTrue(user.isAdmin());
-
-    Collection<Type> types = state.getRepositoryTypes();
-
-    assertNotNull(types);
-    assertFalse(types.isEmpty());
-
-    return state;
-  }
-
-  /**
-   * Method description
-   *
-   *
-   * @return
-   */
-  public static Client createAdminClient()
-  {
-    Client client = createClient();
-
-    authenticateAdmin(client);
-
-    return client;
+    return new ScmClient("scmadmin", "scmadmin");
   }
 
   /**
@@ -178,6 +116,15 @@ public final class IntegrationTestUtil
     return ApacheHttpClient.create(config);
   }
 
+  public static String serialize(Object o) {
+    ObjectMapper mapper = new ObjectMapperProvider().get();
+    try {
+      return mapper.writeValueAsString(o);
+    } catch (JsonProcessingException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
   /**
    * Commit and push changes.
    * 
@@ -236,18 +183,21 @@ public final class IntegrationTestUtil
     return params;
   }
 
-  /**
-   * Method description
-   *
-   *
-   * @param client
-   * @param url
-   *
-   * @return
-   */
-  public static WebResource createResource(Client client, String url)
-  {
-    return client.resource(createResourceUrl(url));
+  public static URI getLink(HalRepresentation object, String linkName) {
+    return URI.create(object.getLinks().getLinkBy("delete").get().getHref());
+  }
+
+  public static WebResource.Builder createResource(ScmClient client, String url) {
+    return createResource(client, createResourceUrl(url));
+  }
+  public static WebResource.Builder createResource(ScmClient client, URI url) {
+    return client.resource(url.toString());
+  }
+
+  public static ClientResponse post(ScmClient client, String path, String mediaType, Object o) {
+    return createResource(client, path)
+      .type(mediaType)
+      .post(ClientResponse.class, serialize(o));
   }
 
   /**
@@ -258,9 +208,9 @@ public final class IntegrationTestUtil
    *
    * @return
    */
-  public static String createResourceUrl(String url)
+  public static URI createResourceUrl(String url)
   {
-    return REST_BASE_URL.concat(url);
+    return URI.create(REST_BASE_URL).resolve(url);
   }
   
   /**
@@ -269,30 +219,20 @@ public final class IntegrationTestUtil
    *
    * @return
    */
-  public static File createTempDirectory()
-  {
-    File directory = new File(System.getProperty("java.io.tmpdir"),
-                       UUID.randomUUID().toString());
+  public static File createTempDirectory() {
+    File directory = new File(System.getProperty("java.io.tmpdir"), UUID.randomUUID().toString());
 
     IOUtil.mkdirs(directory);
 
     return directory;
   }
 
-  /**
-   * Method description
-   *
-   *
-   * @param client
-   */
-  public static void logoutClient(Client client)
-  {
-    WebResource wr = createResource(client, "auth/logout");
-    ClientResponse response = wr.get(ClientResponse.class);
-
-    assertNotNull(response);
-    assertEquals(200, response.getStatus());
-    response.close();
-    client.destroy();
+  public static String readJson(String jsonFileName) {
+    URL url = Resources.getResource(jsonFileName);
+    try {
+      return Resources.toString(url, Charset.forName("UTF-8"));
+    } catch (IOException e) {
+      throw new RuntimeException("could not read json file " + jsonFileName, e);
+    }
   }
 }
diff --git a/scm-webapp/src/test/java/sonia/scm/it/RepositoryArchiveITCase.java b/scm-webapp/src/test/java/sonia/scm/it/RepositoryArchiveITCase.java
index abb92b674b..9539be674f 100644
--- a/scm-webapp/src/test/java/sonia/scm/it/RepositoryArchiveITCase.java
+++ b/scm-webapp/src/test/java/sonia/scm/it/RepositoryArchiveITCase.java
@@ -35,27 +35,32 @@ package sonia.scm.it;
 
 //~--- non-JDK imports --------------------------------------------------------
 
+import com.sun.jersey.api.client.ClientResponse;
+import com.sun.jersey.api.client.WebResource;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
+import sonia.scm.api.v2.resources.ConfigDto;
+import sonia.scm.api.v2.resources.RepositoryDto;
+import sonia.scm.web.VndMediaType;
 
-import sonia.scm.config.ScmConfiguration;
-import sonia.scm.repository.Repository;
-import sonia.scm.repository.RepositoryTestData;
+import javax.ws.rs.core.MediaType;
+import java.net.URI;
 
-import static org.junit.Assert.*;
-
-import static sonia.scm.it.IntegrationTestUtil.*;
-import static sonia.scm.it.RepositoryITUtil.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static sonia.scm.it.IntegrationTestUtil.createAdminClient;
+import static sonia.scm.it.IntegrationTestUtil.createResource;
+import static sonia.scm.it.IntegrationTestUtil.getLink;
+import static sonia.scm.it.IntegrationTestUtil.readJson;
+import static sonia.scm.it.IntegrationTestUtil.serialize;
+import static sonia.scm.it.RepositoryITUtil.createRepository;
+import static sonia.scm.it.RepositoryITUtil.deleteRepository;
 
 //~--- JDK imports ------------------------------------------------------------
 
-import com.sun.jersey.api.client.Client;
-import com.sun.jersey.api.client.ClientResponse;
-import com.sun.jersey.api.client.WebResource;
-
 
 /**
  *
@@ -83,11 +88,9 @@ public class RepositoryArchiveITCase extends RepositoryTypeITCaseBase
    *
    */
   @Before
-  public void createTestRepository()
-  {
-    repository = RepositoryTestData.createHeartOfGold(type);
+  public void createTestRepository() {
     client = createAdminClient();
-    repository = createRepository(client, repository);
+    repository = createRepository(client, readJson("repository-" + type + ".json"));
   }
 
   /**
@@ -101,10 +104,8 @@ public class RepositoryArchiveITCase extends RepositoryTypeITCaseBase
 
     if (repository != null)
     {
-      deleteRepository(client, repository.getId());
+      deleteRepository(client, repository);
     }
-
-    logoutClient(client);
   }
 
   /**
@@ -112,20 +113,19 @@ public class RepositoryArchiveITCase extends RepositoryTypeITCaseBase
    *
    */
   @Test
-  public void testDeleteAllowed()
-  {
+  public void testDeleteAllowed() {
     setArchiveMode(true);
 
-    WebResource resource = createResource(client,
-                             "repositories/".concat(repository.getId()));
-
     repository.setArchived(true);
 
-    ClientResponse response = resource.put(ClientResponse.class, repository);
+    ClientResponse response = createResource(client,
+      "repositories/" + repository.getNamespace() + "/" + repository.getName())
+      .type(VndMediaType.REPOSITORY).put(ClientResponse.class, serialize(repository));
 
     assertNotNull(response);
     assertEquals(204, response.getStatus());
-    response = resource.delete(ClientResponse.class);
+    response = createResource(client,
+      "repositories/" + repository.getNamespace() + "/" + repository.getName()).delete(ClientResponse.class);
     assertNotNull(response);
     assertEquals(204, response.getStatus());
     repository = null;
@@ -140,12 +140,12 @@ public class RepositoryArchiveITCase extends RepositoryTypeITCaseBase
   {
     setArchiveMode(true);
 
-    WebResource resource = createResource(client,
-                             "repositories/".concat(repository.getId()));
-    ClientResponse response = resource.delete(ClientResponse.class);
+    URI deleteUrl = getLink(repository, "delete");
+    ClientResponse response = createResource(client, deleteUrl).delete(ClientResponse.class);
 
     assertNotNull(response);
     assertEquals(412, response.getStatus());
+    response.close();
   }
 
   //~--- set methods ----------------------------------------------------------
@@ -158,25 +158,25 @@ public class RepositoryArchiveITCase extends RepositoryTypeITCaseBase
    */
   private void setArchiveMode(boolean archive)
   {
-    WebResource resource = createResource(client, "config");
-    ScmConfiguration config = resource.get(ScmConfiguration.class);
+    WebResource.Builder resource = createResource(client, "config").type(MediaType.APPLICATION_JSON);
+    ConfigDto config = resource.get(ConfigDto.class);
 
     assertNotNull(config);
     config.setEnableRepositoryArchive(archive);
 
-    ClientResponse resp = resource.post(ClientResponse.class, config);
+    ClientResponse resp = createResource(client, "config").type(VndMediaType.CONFIG).put(ClientResponse.class, config);
 
     assertNotNull(resp);
-    assertEquals(201, resp.getStatus());
+    assertEquals(204, resp.getStatus());
   }
 
   //~--- fields ---------------------------------------------------------------
 
   /** Field description */
-  private Client client;
+  private ScmClient client;
 
   /** Field description */
-  private Repository repository;
+  private RepositoryDto repository;
 
   /** Field description */
   private String type;
diff --git a/scm-webapp/src/test/java/sonia/scm/it/RepositoryExtendedITCase.java b/scm-webapp/src/test/java/sonia/scm/it/RepositoryExtendedITCase.java
index de508627c8..7ddaf8d7b1 100644
--- a/scm-webapp/src/test/java/sonia/scm/it/RepositoryExtendedITCase.java
+++ b/scm-webapp/src/test/java/sonia/scm/it/RepositoryExtendedITCase.java
@@ -37,31 +37,30 @@ package sonia.scm.it;
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
-
-import sonia.scm.repository.Repository;
+import sonia.scm.api.v2.resources.RepositoryDto;
+import sonia.scm.repository.client.api.RepositoryClient;
+import sonia.scm.repository.client.api.RepositoryClientException;
 import sonia.scm.user.User;
 import sonia.scm.util.IOUtil;
 
-import static org.junit.Assert.*;
-
-import static sonia.scm.it.IntegrationTestUtil.*;
-
-//~--- JDK imports ------------------------------------------------------------
-
 import java.io.File;
 import java.io.IOException;
 
-import sonia.scm.repository.client.api.RepositoryClient;
-import sonia.scm.repository.client.api.RepositoryClientException;
+import static org.junit.Assert.fail;
+import static sonia.scm.it.IntegrationTestUtil.createTempDirectory;
+
+//~--- JDK imports ------------------------------------------------------------
 
 /**
  *
  * @author Sebastian Sdorra
  */
 @RunWith(Parameterized.class)
+@Ignore("permissions not yet implemented -- see RepositoryITCaseBase#createTestRepository")
 public class RepositoryExtendedITCase extends RepositoryITCaseBase
 {
 
@@ -76,9 +75,9 @@ public class RepositoryExtendedITCase extends RepositoryITCaseBase
    * @param noperm
    * @param password
    */
-  public RepositoryExtendedITCase(Repository repository, User owner,
-                                  User write, User read, User noperm,
-                                  String password)
+  public RepositoryExtendedITCase(RepositoryDto repository, User owner,
+    User write, User read, User noperm,
+    String password, String ignore_testCaseName)
   {
     super(repository, owner, write, read, noperm, password);
   }
diff --git a/scm-webapp/src/test/java/sonia/scm/it/RepositoryHookITCase.java b/scm-webapp/src/test/java/sonia/scm/it/RepositoryHookITCase.java
index cee6a4d92f..6ba4d572b2 100644
--- a/scm-webapp/src/test/java/sonia/scm/it/RepositoryHookITCase.java
+++ b/scm-webapp/src/test/java/sonia/scm/it/RepositoryHookITCase.java
@@ -31,9 +31,7 @@
 package sonia.scm.it;
 
 import com.google.common.base.Charsets;
-import com.google.common.collect.Lists;
 import com.google.common.io.Files;
-import com.sun.jersey.api.client.WebResource;
 import org.junit.After;
 import org.junit.Assume;
 import org.junit.Before;
@@ -43,26 +41,18 @@ import org.junit.rules.TemporaryFolder;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
-import sonia.scm.debug.DebugHookData;
+import sonia.scm.api.v2.resources.RepositoryDto;
 import sonia.scm.repository.Changeset;
 import sonia.scm.repository.Person;
-import sonia.scm.repository.Repository;
-import sonia.scm.repository.RepositoryTestData;
 import sonia.scm.repository.client.api.ClientCommand;
 import sonia.scm.repository.client.api.RepositoryClient;
 import sonia.scm.repository.client.api.RepositoryClientFactory;
-import sonia.scm.util.IOUtil;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.Collection;
 
-import static org.hamcrest.Matchers.allOf;
-import static org.hamcrest.Matchers.contains;
-import static org.hamcrest.Matchers.not;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
-import static sonia.scm.it.IntegrationTestUtil.createResource;
+import static sonia.scm.it.IntegrationTestUtil.readJson;
 import static sonia.scm.it.RepositoryITUtil.createRepository;
 import static sonia.scm.it.RepositoryITUtil.deleteRepository;
 
@@ -83,7 +73,7 @@ public class RepositoryHookITCase extends AbstractAdminITCaseBase
   public TemporaryFolder tempFolder = new TemporaryFolder();
   
   private final String repositoryType;
-  private Repository repository;
+  private RepositoryDto repository;
   private File workingCopy;
   private RepositoryClient repositoryClient;
   
@@ -105,8 +95,7 @@ public class RepositoryHookITCase extends AbstractAdminITCaseBase
   @Before
   public void setUpTestRepository() throws IOException 
   {
-    repository = RepositoryTestData.createHeartOfGold(repositoryType);
-    repository = createRepository(client, repository);
+    repository = createRepository(client, readJson("repository-" + repositoryType + ".json"));
     workingCopy = tempFolder.newFolder();
     repositoryClient = createRepositoryClient();
   }
@@ -117,7 +106,9 @@ public class RepositoryHookITCase extends AbstractAdminITCaseBase
   @After
   public void removeTestRepository()
   {
-    deleteRepository(client, repository.getId());
+    if (repository != null) {
+      deleteRepository(client, repository);
+    }
   }
   
   /**
@@ -138,10 +129,10 @@ public class RepositoryHookITCase extends AbstractAdminITCaseBase
     Thread.sleep(WAIT_TIME);
     
     // check debug servlet for pushed commit
-    WebResource wr = createResource(client, "debug/" + repository.getId() + "/post-receive/last");
-    DebugHookData data = wr.get(DebugHookData.class);
-    assertNotNull(data);
-    assertThat(data.getChangesets(), contains(changeset.getId()));
+//    WebResource wr = createResource(client, "debug/" + repository.getId() + "/post-receive/last");
+//    DebugHookData data = wr.get(DebugHookData.class);
+//    assertNotNull(data);
+//    assertThat(data.getChangesets(), contains(changeset.getId()));
   }
   
   /**
@@ -173,15 +164,15 @@ public class RepositoryHookITCase extends AbstractAdminITCaseBase
     Thread.sleep(WAIT_TIME);
     
     // check debug servlet that only one commit is present
-    WebResource wr = createResource(client, "debug/" + repository.getId() + "/post-receive/last");
-    DebugHookData data = wr.get(DebugHookData.class);
-    assertNotNull(data);
-    assertThat(data.getChangesets(), allOf(
-      contains(b.getId()),
-      not(
-        contains(a.getId())
-      )
-    ));
+//    WebResource wr = createResource(client, "debug/" + repository.getId() + "/post-receive/last");
+//    DebugHookData data = wr.get(DebugHookData.class);
+//    assertNotNull(data);
+//    assertThat(data.getChangesets(), allOf(
+//      contains(b.getId()),
+//      not(
+//        contains(a.getId())
+//      )
+//    ));
   }
   
   private Changeset commit(String message) throws IOException {
@@ -197,7 +188,7 @@ public class RepositoryHookITCase extends AbstractAdminITCaseBase
   private RepositoryClient createRepositoryClient() throws IOException 
   {
     return REPOSITORY_CLIENT_FACTORY.create(repositoryType, 
-      IntegrationTestUtil.BASE_URL + repositoryType + "/" + repository.getName(), 
+      IntegrationTestUtil.BASE_URL + repositoryType + "/" + repository.getNamespace() + "/" + repository.getName(),
       IntegrationTestUtil.ADMIN_USERNAME, IntegrationTestUtil.ADMIN_PASSWORD, workingCopy
     );
   }
@@ -208,16 +199,10 @@ public class RepositoryHookITCase extends AbstractAdminITCaseBase
    *
    * @return repository types test parameter
    */
-  @Parameters
+  @Parameters(name = "{0}")
   public static Collection<String[]> createParameters()
   {
-    Collection<String[]> params = Lists.newArrayList();
-    params.add(new String[] { "git" });
-    params.add(new String[] { "svn" });
-    if (IOUtil.search("hg") != null) {
-       params.add(new String[] { "hg" });
-    }
-    return params;
+    return IntegrationTestUtil.createRepositoryTypeParameters();
   }
   
 }
diff --git a/scm-webapp/src/test/java/sonia/scm/it/RepositoryHttpCacheITCase.java b/scm-webapp/src/test/java/sonia/scm/it/RepositoryHttpCacheITCase.java
index ceb02b65a3..7f22366ecb 100644
--- a/scm-webapp/src/test/java/sonia/scm/it/RepositoryHttpCacheITCase.java
+++ b/scm-webapp/src/test/java/sonia/scm/it/RepositoryHttpCacheITCase.java
@@ -34,23 +34,24 @@ package sonia.scm.it;
 
 //~--- non-JDK imports --------------------------------------------------------
 
+import com.sun.jersey.api.client.ClientResponse;
+import com.sun.jersey.api.client.WebResource;
+import org.junit.Ignore;
 import sonia.scm.repository.Repository;
 import sonia.scm.repository.RepositoryTestData;
 
-import static org.junit.Assert.*;
-
-import static sonia.scm.it.IntegrationTestUtil.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static sonia.scm.it.IntegrationTestUtil.createAdminClient;
+import static sonia.scm.it.IntegrationTestUtil.createResource;
 
 //~--- JDK imports ------------------------------------------------------------
 
-import com.sun.jersey.api.client.Client;
-import com.sun.jersey.api.client.ClientResponse;
-import com.sun.jersey.api.client.WebResource;
-
 /**
  *
  * @author Sebastian Sdorra
  */
+@Ignore()
 public class RepositoryHttpCacheITCase extends HttpCacheITCaseBase<Repository>
 {
 
@@ -64,8 +65,8 @@ public class RepositoryHttpCacheITCase extends HttpCacheITCaseBase<Repository>
   protected Repository createSampleItem()
   {
     Repository repository = RepositoryTestData.createHeartOfGold("git");
-    Client client = createAdminClient();
-    WebResource resource = createResource(client, "repositories");
+    ScmClient client = createAdminClient();
+    WebResource.Builder resource = createResource(client, "repositories");
     ClientResponse response = resource.post(ClientResponse.class, repository);
 
     assertNotNull(response);
@@ -74,8 +75,7 @@ public class RepositoryHttpCacheITCase extends HttpCacheITCaseBase<Repository>
     String location = response.getHeaders().get("Location").get(0);
 
     assertNotNull(location);
-    resource = client.resource(location);
-    response = resource.get(ClientResponse.class);
+    response = client.resource(location).get(ClientResponse.class);
     assertNotNull(response);
     assertEquals(200, response.getStatus());
     repository = response.getEntity(Repository.class);
@@ -94,8 +94,8 @@ public class RepositoryHttpCacheITCase extends HttpCacheITCaseBase<Repository>
   @Override
   protected void destroy(Repository item)
   {
-    Client client = createAdminClient();
-    WebResource resource = createResource(client,
+    ScmClient client = createAdminClient();
+    WebResource.Builder resource = createResource(client,
                              "repositories/".concat(item.getId()));
     ClientResponse response = resource.delete(ClientResponse.class);
 
diff --git a/scm-webapp/src/test/java/sonia/scm/it/RepositoryITCase.java b/scm-webapp/src/test/java/sonia/scm/it/RepositoryITCase.java
deleted file mode 100644
index 9ee0cadf58..0000000000
--- a/scm-webapp/src/test/java/sonia/scm/it/RepositoryITCase.java
+++ /dev/null
@@ -1,259 +0,0 @@
-/**
- * Copyright (c) 2010, Sebastian Sdorra
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 3. Neither the name of SCM-Manager; nor the names of its
- *    contributors may be used to endorse or promote products derived from this
- *    software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * http://bitbucket.org/sdorra/scm-manager
- *
- */
-
-
-
-package sonia.scm.it;
-
-//~--- non-JDK imports --------------------------------------------------------
-
-import com.google.common.collect.Lists;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import sonia.scm.repository.Permission;
-import sonia.scm.repository.PermissionType;
-import sonia.scm.repository.Repository;
-import sonia.scm.repository.RepositoryTestData;
-
-import static org.junit.Assert.*;
-import static org.hamcrest.Matchers.*;
-
-import static sonia.scm.it.IntegrationTestUtil.*;
-import static sonia.scm.it.RepositoryITUtil.*;
-
-//~--- JDK imports ------------------------------------------------------------
-
-import com.sun.jersey.api.client.ClientResponse;
-import com.sun.jersey.api.client.GenericType;
-import com.sun.jersey.api.client.WebResource;
-
-import java.util.Arrays;
-import java.util.Collection;
-import org.junit.After;
-import sonia.scm.util.IOUtil;
-
-/**
- *
- * @author Sebastian Sdorra
- */
-@RunWith(Parameterized.class)
-public class RepositoryITCase extends AbstractAdminITCaseBase
-{
-
-  /**
-   * Constructs ...
-   *
-   *
-   * @param repositoryType
-   */
-  public RepositoryITCase(String repositoryType)
-  {
-    this.repositoryType = repositoryType;
-  }
-
-  //~--- methods --------------------------------------------------------------
-
-  /**
-   * Method description
-   *
-   *
-   * @return
-   */
-  @After
-  public void cleanup()
-  {
-    Collection<Repository> repositories =
-      createResource(client,
-        "repositories").get(new GenericType<Collection<Repository>>() {}
-    );
-
-    if (repositories != null)
-    {
-      for (Repository r : repositories)
-      {
-        createResource(client, "repositories/" + r.getId()).delete();
-      }
-    }
-
-    client.destroy();
-  }
-
-  /**
-   * Method description
-   *
-   *
-   * @return
-   */
-  @Parameters
-  public static Collection<String[]> createParameters()
-  {
-    Collection<String[]> params = Lists.newArrayList();
-
-    params.add(new String[] { "git" });
-    params.add(new String[] { "svn" });
-    
-    if (IOUtil.search("hg") != null)
-    {
-      params.add(new String[] { "hg" });
-    }
-
-    return params;
-  }
-
-  /**
-   * Method description
-   *
->>>>>>> merge rev
-   */
-  @Test
-  public void create()
-  {
-    Repository repository =
-      RepositoryTestData.createHeartOfGold(repositoryType);
-
-    createRepository(client, repository);
-  }
-
-  /**
-   * Method description
-   *
-   */
-  @Test
-  public void delete()
-  {
-    Repository repository =
-      RepositoryTestData.createHappyVerticalPeopleTransporter(repositoryType);
-
-    repository = createRepository(client, repository);
-    deleteRepository(client, repository.getId());
-  }
-
-  /**
-   * Method description
-   *
-   */
-  @Test
-  public void doubleCreate()
-  {
-    Repository repository = RepositoryTestData.create42Puzzle(repositoryType);
-
-    repository = createRepository(client, repository);
-    
-    WebResource wr = createResource(client, "repositories");
-    ClientResponse response = wr.post(ClientResponse.class, repository);
-    
-    assertNotNull(response);
-    assertThat(response.getStatus(), not(lessThanOrEqualTo(400)));
-  }
-
-  /**
-   * Method description
-   *
-   */
-  @Test
-  public void modify()
-  {
-    Repository repository =
-      RepositoryTestData.createHappyVerticalPeopleTransporter(repositoryType);
-
-    repository = createRepository(client, repository);
-    repository.setPermissions(Arrays.asList(new Permission("dent",
-      PermissionType.READ), new Permission("slarti", PermissionType.WRITE)));
-
-    WebResource wr = createResource(client,
-                       "repositories/".concat(repository.getId()));
-    ClientResponse response = wr.put(ClientResponse.class, repository);
-
-    assertNotNull(response);
-    assertEquals(204, response.getStatus());
-    response.close();
-
-    Repository other = getRepositoryById(client, repository.getId());
-
-    assertRepositoriesEquals(repository, other);
-  }
-
-  //~--- get methods ----------------------------------------------------------
-
-  /**
-   * Method description
-   *
-   */
-  @Test
-  public void getAll()
-  {
-    Repository repository =
-      RepositoryTestData.createHappyVerticalPeopleTransporter(repositoryType);
-
-    repository = createRepository(client, repository);
-
-    WebResource wr = createResource(client, "repositories");
-    ClientResponse response = wr.get(ClientResponse.class);
-
-    assertNotNull(response);
-    assertEquals(200, response.getStatus());
-
-    Collection<Repository> repositories =
-      response.getEntity(new GenericType<Collection<Repository>>() {}
-    );
-
-    response.close();
-    assertNotNull(repositories);
-    assertFalse(repositories.isEmpty());
-
-    Repository hvpt = null;
-
-    for (Repository other : repositories)
-    {
-
-      // fix equals check
-      other.getPermissions();
-
-      if (repository.equals(other))
-      {
-        hvpt = other;
-
-        break;
-      }
-    }
-
-    assertNotNull(hvpt);
-  }
-
-  //~--- fields ---------------------------------------------------------------
-
-  /** Field description */
-  private final String repositoryType;
-}
diff --git a/scm-webapp/src/test/java/sonia/scm/it/RepositoryITCaseBase.java b/scm-webapp/src/test/java/sonia/scm/it/RepositoryITCaseBase.java
index ab8b598bdf..c227fb5e4b 100644
--- a/scm-webapp/src/test/java/sonia/scm/it/RepositoryITCaseBase.java
+++ b/scm-webapp/src/test/java/sonia/scm/it/RepositoryITCaseBase.java
@@ -37,37 +37,30 @@ package sonia.scm.it;
 
 import org.junit.AfterClass;
 import org.junit.runners.Parameterized.Parameters;
-
-import sonia.scm.ScmState;
-import sonia.scm.Type;
-import sonia.scm.repository.Permission;
-import sonia.scm.repository.PermissionType;
-import sonia.scm.repository.Repository;
-import sonia.scm.repository.RepositoryTestData;
+import sonia.scm.api.v2.resources.RepositoryDto;
+import sonia.scm.repository.client.api.RepositoryClient;
+import sonia.scm.repository.client.api.RepositoryClientFactory;
 import sonia.scm.user.User;
 import sonia.scm.user.UserTestData;
 import sonia.scm.util.IOUtil;
-import sonia.scm.util.Util;
-
-import static org.junit.Assert.*;
-
-import static sonia.scm.it.IntegrationTestUtil.*;
-import static sonia.scm.it.RepositoryITUtil.*;
-
-//~--- JDK imports ------------------------------------------------------------
-
-import com.sun.jersey.api.client.Client;
-import com.sun.jersey.api.client.GenericType;
 
 import java.io.File;
 import java.io.IOException;
-
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 
-import sonia.scm.repository.client.api.RepositoryClient;
-import sonia.scm.repository.client.api.RepositoryClientFactory;
+import static sonia.scm.it.IntegrationTestUtil.ADMIN_PASSWORD;
+import static sonia.scm.it.IntegrationTestUtil.ADMIN_USERNAME;
+import static sonia.scm.it.IntegrationTestUtil.commit;
+import static sonia.scm.it.IntegrationTestUtil.createAdminClient;
+import static sonia.scm.it.IntegrationTestUtil.createRandomFile;
+import static sonia.scm.it.IntegrationTestUtil.createResource;
+import static sonia.scm.it.IntegrationTestUtil.createTempDirectory;
+import static sonia.scm.it.IntegrationTestUtil.readJson;
+import static sonia.scm.it.RepositoryITUtil.createUrl;
+import static sonia.scm.it.UserITUtil.postUser;
+
+//~--- JDK imports ------------------------------------------------------------
 
 /**
  *
@@ -76,6 +69,15 @@ import sonia.scm.repository.client.api.RepositoryClientFactory;
 public class RepositoryITCaseBase
 {
 
+  private static final Collection<RepositoryDto> CREATED_REPOSITORIES = new ArrayList<>();
+
+  protected User nopermUser;
+  protected User ownerUser;
+  protected String password;
+  protected User readUser;
+  protected RepositoryDto repository;
+  protected User writeUser;
+
   /**
    * Constructs ...
    *
@@ -87,8 +89,8 @@ public class RepositoryITCaseBase
    * @param noperm
    * @param password
    */
-  public RepositoryITCaseBase(Repository repository, User owner, User write,
-                              User read, User noperm, String password)
+  public RepositoryITCaseBase(RepositoryDto repository, User owner, User write,
+    User read, User noperm, String password)
   {
     this.repository = repository;
     this.ownerUser = owner;
@@ -127,24 +129,27 @@ public class RepositoryITCaseBase
    *
    * @throws IOException
    */
-  public static void addTestFiles(Repository repository, String username,
-                                  String password)
-          throws IOException
+  public static void addTestFiles(RepositoryDto repository, String username,
+    String password)
   {
     File directory = createTempDirectory();
 
-    try
-    {
+    try {
       RepositoryClientFactory clientFactory = new RepositoryClientFactory();
       RepositoryClient client = clientFactory.create(
-        repository.getType(), repository.createUrl(BASE_URL), username, password, directory
+        repository.getType(), createUrl(repository),
+        username, password, directory
       );
-      
+
       addTestFiles(client);
-    }
-    finally
-    {
-      IOUtil.delete(directory);
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    } finally {
+      try {
+        IOUtil.delete(directory);
+      } catch (IOException e) {
+        e.printStackTrace();
+      }
     }
   }
 
@@ -155,27 +160,17 @@ public class RepositoryITCaseBase
   @AfterClass
   public static void cleanup()
   {
-    Client client = createAdminClient();
+    ScmClient client = createAdminClient();
 
     deleteUser(client, UserTestData.createTrillian());
     deleteUser(client, UserTestData.createZaphod());
     deleteUser(client, UserTestData.createMarvin());
     deleteUser(client, UserTestData.createPerfect());
 
-    Collection<Repository> repositories =
-      createResource(client, "repositories").get(
-          new GenericType<Collection<Repository>>() {}
-    );
-
-    if (repositories != null)
+    for (RepositoryDto r : CREATED_REPOSITORIES)
     {
-      for (Repository r : repositories)
-      {
-        createResource(client, "repositories/" + r.getId()).delete();
-      }
+      createResource(client, "repositories/" + r.getNamespace() + "/"  + r.getName()).delete();
     }
-
-    client.destroy();
   }
 
   /**
@@ -186,15 +181,9 @@ public class RepositoryITCaseBase
    *
    * @throws IOException
    */
-  @Parameters
+  @Parameters(name = "{6}")
   public static Collection<Object[]> createParameters() throws IOException
   {
-    Client client = createClient();
-    ScmState state = authenticateAdmin(client);
-
-    assertNotNull(state);
-    assertTrue(state.isSuccess());
-
     Collection<Object[]> params = new ArrayList<>();
     User owner = UserTestData.createTrillian();
 
@@ -211,11 +200,8 @@ public class RepositoryITCaseBase
     User noperm = UserTestData.createPerfect();
 
     createUser(noperm);
-
-    for (Type t : state.getRepositoryTypes())
-    {
-      appendTestParemeter(params, t.getName(), owner, write, read, noperm);
-    }
+    IntegrationTestUtil.createRepositoryTypeParameters().stream().map(array -> array[0])
+      .forEach(t -> appendTestParameter(params, t, owner, write, read, noperm));
 
     return params;
   }
@@ -232,22 +218,15 @@ public class RepositoryITCaseBase
    * @param noperm
    *
    * @throws IOException
-   * @throws RepositoryClientException
    */
-  private static void appendTestParemeter(Collection<Object[]> params,
-          String type, User owner, User write, User read, User noperm) throws IOException
+  private static void appendTestParameter(Collection<Object[]> params,
+    String type, User owner, User write, User read, User noperm)
   {
-    Repository repository = createTestRepository(null, type, owner, write, read);
+    RepositoryDto repository = createTestRepository(type, owner, write, read);
     params.add(new Object[]
-    {
-      repository, owner, write, read, noperm, "secret"
-    });
-    
-    repository = createTestRepository("test", type, owner, write, read);
-    params.add(new Object[]
-    {
-      repository, owner, write, read, noperm, "secret"
-    });
+      {
+        repository, owner, write, read, noperm, "secret", repository.getType() + "-" + owner.getId()
+      });
   }
 
   /**
@@ -255,7 +234,6 @@ public class RepositoryITCaseBase
    *
    *
    *
-   * @param prefix
    * @param type
    * @param owner
    * @param write
@@ -264,29 +242,23 @@ public class RepositoryITCaseBase
    * @return
    *
    * @throws IOException
-   * @throws RepositoryClientException
    */
-  private static Repository createTestRepository(String prefix, String type,
-          User owner, User write, User read) throws IOException
+  private static RepositoryDto createTestRepository(String type,
+    User owner, User write, User read)
   {
-    Client client = createAdminClient();
-    Repository repository = RepositoryTestData.createHeartOfGold(type);
+    ScmClient client = createAdminClient();
 
-    if (Util.isNotEmpty(prefix))
-    {
-      repository.setName(prefix.concat("/").concat(repository.getName()));
-    }
+    // TODO Activate for tests when implemented
+//    repository.setPermissions(Arrays.asList(
+//      new Permission(owner.getName(), PermissionType.OWNER),
+//      new Permission(write.getName(), PermissionType.WRITE),
+//      new Permission(read.getName(), PermissionType.READ))
+//    );
+    String repositoryJson = readJson("repository-" + type + ".json");
+    RepositoryDto repository = RepositoryITUtil.createRepository(client, repositoryJson);
+
+    CREATED_REPOSITORIES.add(repository);
 
-    //J-
-    repository.setPermissions(Arrays.asList(
-          new Permission(owner.getName(), PermissionType.OWNER), 
-          new Permission(write.getName(), PermissionType.WRITE),
-          new Permission(read.getName(), PermissionType.READ))
-    );
-    //J+
-    repository = createRepository(client, repository);
-    client.destroy();
-    
     addTestFiles(repository, ADMIN_USERNAME, ADMIN_PASSWORD);
 
     return repository;
@@ -300,11 +272,11 @@ public class RepositoryITCaseBase
    */
   private static void createUser(User user)
   {
-    Client client = createAdminClient();
+    ScmClient client = createAdminClient();
 
     user.setPassword("secret");
-    createResource(client, "users").post(user);
-    client.destroy();
+
+    postUser(client, user);
   }
 
   /**
@@ -314,7 +286,7 @@ public class RepositoryITCaseBase
    * @param client
    * @param user
    */
-  private static void deleteUser(Client client, User user)
+  private static void deleteUser(ScmClient client, User user)
   {
     createResource(client, "users/".concat(user.getName())).delete();
   }
@@ -327,33 +299,13 @@ public class RepositoryITCaseBase
    * @param directory
    *
    * @return
-   * 
+   *
    * @throws IOException
    */
   protected RepositoryClient createRepositoryClient(User user, File directory) throws IOException
   {
     RepositoryClientFactory clientFactory = new RepositoryClientFactory();
-    return clientFactory.create(repository.getType(), repository.createUrl(BASE_URL),
-            user.getName(), password, directory);
+    return clientFactory.create(repository.getType(), createUrl(repository),
+      user.getName(), password, directory);
   }
-
-  //~--- fields ---------------------------------------------------------------
-
-  /** Field description */
-  protected User nopermUser;
-
-  /** Field description */
-  protected User ownerUser;
-
-  /** Field description */
-  protected String password;
-
-  /** Field description */
-  protected User readUser;
-
-  /** Field description */
-  protected Repository repository;
-
-  /** Field description */
-  protected User writeUser;
 }
diff --git a/scm-webapp/src/test/java/sonia/scm/it/RepositoryITUtil.java b/scm-webapp/src/test/java/sonia/scm/it/RepositoryITUtil.java
index e3111502cc..05915f3b67 100644
--- a/scm-webapp/src/test/java/sonia/scm/it/RepositoryITUtil.java
+++ b/scm-webapp/src/test/java/sonia/scm/it/RepositoryITUtil.java
@@ -35,119 +35,83 @@ package sonia.scm.it;
 
 //~--- non-JDK imports --------------------------------------------------------
 
-import sonia.scm.repository.Repository;
+import com.sun.jersey.api.client.ClientResponse;
+import com.sun.jersey.api.client.WebResource;
+import sonia.scm.api.rest.ObjectMapperProvider;
+import sonia.scm.api.v2.resources.RepositoryDto;
+import sonia.scm.web.VndMediaType;
 
-import static org.junit.Assert.*;
+import java.io.IOException;
+import java.net.URI;
 
-import static sonia.scm.it.IntegrationTestUtil.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+import static sonia.scm.it.IntegrationTestUtil.BASE_URL;
+import static sonia.scm.it.IntegrationTestUtil.createResource;
+import static sonia.scm.it.IntegrationTestUtil.getLink;
 
 //~--- JDK imports ------------------------------------------------------------
 
-import com.sun.jersey.api.client.Client;
-import com.sun.jersey.api.client.ClientResponse;
-import com.sun.jersey.api.client.WebResource;
-
-/**
- *
- * @author Sebastian Sdorra
- */
 public final class RepositoryITUtil
 {
 
-  /**
-   * Constructs ...
-   *
-   */
   private RepositoryITUtil() {}
 
-  //~--- methods --------------------------------------------------------------
-
-  /**
-   * Method description
-   *
-   * @param repository
-   * @param other
-   */
-  public static void assertRepositoriesEquals(Repository repository, Repository other)
-  {
-    assertEquals(repository.getName(), other.getName());
-    assertEquals(repository.getDescription(), other.getDescription());
-    assertEquals(repository.getContact(), other.getContact());
-    assertEquals(repository.getPermissions(), other.getPermissions());
-    assertEquals(repository.getType(), other.getType());
-  }
-
-  /**
-   * Method description
-   *
-   * @param client
-   * @param repository
-   *
-   * @return
-   */
-  public static Repository createRepository(Client client,
-    Repository repository)
-  {
-    WebResource wr = createResource(client, "repositories");
-    ClientResponse response = wr.post(ClientResponse.class, repository);
+  public static RepositoryDto createRepository(ScmClient client, String repositoryJson) {
+    ClientResponse response =
+      createResource(client, "repositories")
+        .accept("*/*")
+        .type(VndMediaType.REPOSITORY)
+        .post(ClientResponse.class, repositoryJson);
 
     assertNotNull(response);
     assertEquals(201, response.getStatus());
 
-    String url = response.getHeaders().get("Location").get(0);
+    URI url = URI.create(response.getHeaders().get("Location").get(0));
 
     response.close();
 
-    Repository other = getRepository(client, url);
+    RepositoryDto other = getRepository(client, url);
 
     assertNotNull(other);
     assertNotNull(other.getType());
-    assertRepositoriesEquals(repository, other);
-    assertNotNull(other.getId());
     assertNotNull(other.getCreationDate());
 
     return other;
   }
 
-  /**
-   * Method description
-   *
-   * @param client
-   * @param id
-   */
-  public static void deleteRepository(Client client, String id)
+  public static void deleteRepository(ScmClient client, RepositoryDto repository)
   {
-    WebResource wr = createResource(client, "repositories/".concat(id));
-    ClientResponse response = wr.delete(ClientResponse.class);
+    URI deleteUrl = getLink(repository, "delete");
+    ClientResponse response = createResource(client, deleteUrl).delete(ClientResponse.class);
 
     assertNotNull(response);
     assertEquals(204, response.getStatus());
     response.close();
-    wr = createResource(client, "repositories/".concat(id));
-    response = wr.get(ClientResponse.class);
+
+    URI selfUrl = getLink(repository, "self");
+    response = createResource(client, selfUrl).get(ClientResponse.class);
     assertNotNull(response);
     assertEquals(404, response.getStatus());
     response.close();
   }
 
-  //~--- get methods ----------------------------------------------------------
-
-  /**
-   * Method description
-   *
-   * @param client
-   * @param url
-   *
-   * @return
-   */
-  public static Repository getRepository(Client client, String url)
+  public static RepositoryDto getRepository(ScmClient client, URI url)
   {
-    WebResource wr = client.resource(url);
+    WebResource.Builder wr = createResource(client, url);
     ClientResponse response = wr.get(ClientResponse.class);
 
     assertNotNull(response);
+    assertEquals(200, response.getStatus());
 
-    Repository repository = response.getEntity(Repository.class);
+    String json = response.getEntity(String.class);
+    RepositoryDto repository = null;
+    try {
+      repository = new ObjectMapperProvider().get().readerFor(RepositoryDto.class).readValue(json);
+    } catch (IOException e) {
+      fail("could not read json:\n" + json);
+    }
 
     response.close();
     assertNotNull(repository);
@@ -155,26 +119,7 @@ public final class RepositoryITUtil
     return repository;
   }
 
-  /**
-   * Method description
-   *
-   * @param client
-   * @param id
-   *
-   * @return
-   */
-  public static Repository getRepositoryById(Client client, String id)
-  {
-    WebResource wr = createResource(client, "repositories/".concat(id));
-    ClientResponse response = wr.get(ClientResponse.class);
-
-    assertNotNull(response);
-
-    Repository repository = response.getEntity(Repository.class);
-
-    response.close();
-    assertNotNull(repository);
-
-    return repository;
+  public static String createUrl(RepositoryDto repository) {
+    return BASE_URL + repository.getType() + "/" + repository.getNamespace() + "/" + repository.getName();
   }
 }
diff --git a/scm-webapp/src/test/java/sonia/scm/it/RepositorySimplePermissionITCase.java b/scm-webapp/src/test/java/sonia/scm/it/RepositorySimplePermissionITCase.java
index 4cc470da56..7900f11096 100644
--- a/scm-webapp/src/test/java/sonia/scm/it/RepositorySimplePermissionITCase.java
+++ b/scm-webapp/src/test/java/sonia/scm/it/RepositorySimplePermissionITCase.java
@@ -35,37 +35,39 @@ package sonia.scm.it;
 
 //~--- non-JDK imports --------------------------------------------------------
 
+import com.sun.jersey.api.client.ClientResponse;
+import com.sun.jersey.api.client.WebResource;
+import de.otto.edison.hal.HalRepresentation;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
+import sonia.scm.api.rest.ObjectMapperProvider;
+import sonia.scm.api.v2.resources.RepositoryDto;
+import sonia.scm.web.VndMediaType;
 
-import sonia.scm.repository.Repository;
+import java.io.IOException;
 
-import static org.junit.Assert.*;
-
-import static sonia.scm.it.IntegrationTestUtil.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static sonia.scm.it.IntegrationTestUtil.createAdminClient;
+import static sonia.scm.it.IntegrationTestUtil.createResource;
+import static sonia.scm.it.IntegrationTestUtil.serialize;
 
 //~--- JDK imports ------------------------------------------------------------
 
-import com.sun.jersey.api.client.Client;
-import com.sun.jersey.api.client.ClientResponse;
-import com.sun.jersey.api.client.GenericType;
-import com.sun.jersey.api.client.WebResource;
-
-import java.util.Collection;
-
 /**
  *
  * @author Sebastian Sdorra
  */
 @RunWith(Parameterized.class)
 public class RepositorySimplePermissionITCase
-        extends AbstractPermissionITCaseBase<Repository>
+        extends AbstractPermissionITCaseBase<RepositoryDto>
 {
 
   /** Field description */
-  private static String REPOSITORY_UUID;
+  private static String REPOSITORY_PATH;
 
   //~--- constructors ---------------------------------------------------------
 
@@ -75,7 +77,7 @@ public class RepositorySimplePermissionITCase
    *
    * @param credentials
    */
-  public RepositorySimplePermissionITCase(Credentials credentials)
+  public RepositorySimplePermissionITCase(Credentials credentials, String ignore_testCaseName)
   {
     super(credentials);
   }
@@ -87,20 +89,17 @@ public class RepositorySimplePermissionITCase
    *
    */
   @BeforeClass
-  public static void createTestRepository()
-  {
-    Repository repository = new Repository();
+  public static void createTestRepository() throws IOException {
+    RepositoryDto repository = new RepositoryDto();
 
     repository.setName("test-repo");
     repository.setType("git");
-    repository.setPublicReadable(false);
+//    repository.setPublicReadable(false);
 
-    Client client = createClient();
+    ScmClient client = createAdminClient();
 
-    authenticateAdmin(client);
-
-    WebResource wr = createResource(client, "repositories");
-    ClientResponse response = wr.post(ClientResponse.class, repository);
+    WebResource.Builder wr = createResource(client, "repositories");
+    ClientResponse response = wr.type(VndMediaType.REPOSITORY).post(ClientResponse.class, serialize(repository));
 
     assertNotNull(response);
     assertEquals(201, response.getStatus());
@@ -109,17 +108,13 @@ public class RepositorySimplePermissionITCase
 
     assertNotNull(repositoryUrl);
     response.close();
-    wr = client.resource(repositoryUrl);
-    response = wr.get(ClientResponse.class);
+    response = client.resource(repositoryUrl).get(ClientResponse.class);
     assertNotNull(response);
     assertEquals(200, response.getStatus());
-    repository = response.getEntity(Repository.class);
-    assertNotNull(repository);
-    REPOSITORY_UUID = repository.getId();
-    assertNotNull(REPOSITORY_UUID);
+    repository = new ObjectMapperProvider().get().readValue(response.getEntity(String.class), RepositoryDto.class);
+    REPOSITORY_PATH = repository.getNamespace() + "/" + repository.getName();
+    assertNotNull(REPOSITORY_PATH);
     response.close();
-    logoutClient(client);
-    client.destroy();
   }
 
   /**
@@ -127,13 +122,9 @@ public class RepositorySimplePermissionITCase
    *
    */
   @AfterClass
-  public static void removeTestRepoistory()
+  public static void removeTestRepository()
   {
-    Client client = createClient();
-
-    authenticateAdmin(client);
-    createResource(client, "repositories/" + REPOSITORY_UUID).delete();
-    client.destroy();
+    createResource(createAdminClient(), "repositories/" + REPOSITORY_PATH).delete();
   }
 
   /**
@@ -150,12 +141,16 @@ public class RepositorySimplePermissionITCase
       assertNotNull(response);
       assertEquals(200, response.getStatus());
 
-      Collection<Repository> repositories =
-        response.getEntity(new GenericType<Collection<Repository>>() {}
-      );
+      HalRepresentation repositories =
+        null;
+      try {
+        repositories = new ObjectMapperProvider().get().readValue(response.getEntity(String.class), HalRepresentation.class);
+      } catch (IOException e) {
+        throw new RuntimeException(e);
+      }
 
       assertNotNull(repositories);
-      assertTrue(repositories.isEmpty());
+      assertTrue(repositories.getEmbedded().getItemsBy("repositories").isEmpty());
       response.close();
     }
   }
@@ -198,9 +193,9 @@ public class RepositorySimplePermissionITCase
    * @return
    */
   @Override
-  protected Repository getCreateItem()
+  protected RepositoryDto getCreateItem()
   {
-    Repository repository = new Repository();
+    RepositoryDto repository = new RepositoryDto();
 
     repository.setName("create-test-repo");
     repository.setType("svn");
@@ -217,7 +212,7 @@ public class RepositorySimplePermissionITCase
   @Override
   protected String getDeletePath()
   {
-    return "repositories/".concat(REPOSITORY_UUID);
+    return "repositories/".concat(REPOSITORY_PATH);
   }
 
   /**
@@ -229,7 +224,7 @@ public class RepositorySimplePermissionITCase
   @Override
   protected String getGetPath()
   {
-    return "repositories/".concat(REPOSITORY_UUID);
+    return "repositories/".concat(REPOSITORY_PATH);
   }
 
   /**
@@ -239,11 +234,12 @@ public class RepositorySimplePermissionITCase
    * @return
    */
   @Override
-  protected Repository getModifyItem()
+  protected RepositoryDto getModifyItem()
   {
-    Repository repository = new Repository();
+    RepositoryDto repository = new RepositoryDto();
 
     repository.setName("test-repo");
+    repository.setNamespace("scmadmin");
     repository.setType("git");
     repository.setDescription("Test Repository");
 
@@ -259,6 +255,11 @@ public class RepositorySimplePermissionITCase
   @Override
   protected String getModifyPath()
   {
-    return "repositories/".concat(REPOSITORY_UUID);
+    return "repositories/".concat(REPOSITORY_PATH);
+  }
+
+  @Override
+  protected String getMediaType() {
+    return VndMediaType.REPOSITORY;
   }
 }
diff --git a/scm-webapp/src/test/java/sonia/scm/it/RepositoryTypeITCaseBase.java b/scm-webapp/src/test/java/sonia/scm/it/RepositoryTypeITCaseBase.java
index 8e356152be..80ee615fc5 100644
--- a/scm-webapp/src/test/java/sonia/scm/it/RepositoryTypeITCaseBase.java
+++ b/scm-webapp/src/test/java/sonia/scm/it/RepositoryTypeITCaseBase.java
@@ -36,39 +36,13 @@ package sonia.scm.it;
 
 import org.junit.runners.Parameterized.Parameters;
 
-import sonia.scm.util.IOUtil;
+import java.util.Collection;
 
 //~--- JDK imports ------------------------------------------------------------
 
-import java.util.ArrayList;
-import java.util.Collection;
-
-/**
- *
- * @author Sebastian Sdorra
- */
-public class RepositoryTypeITCaseBase
-{
-
-  /**
-   * Method description
-   *
-   *
-   * @return
-   */
-  @Parameters
-  public static Collection<String[]> createParameters()
-  {
-    Collection<String[]> params = new ArrayList<String[]>();
-
-    params.add(new String[] { "git" });
-    params.add(new String[] { "svn" });
-
-    if (IOUtil.search("hg") != null)
-    {
-      params.add(new String[] { "hg" });
-    }
-
-    return params;
+public class RepositoryTypeITCaseBase {
+  @Parameters(name = "{0}")
+  public static Collection<String[]> createParameters() {
+    return IntegrationTestUtil.createRepositoryTypeParameters();
   }
 }
diff --git a/scm-webapp/src/test/java/sonia/scm/it/ScmClient.java b/scm-webapp/src/test/java/sonia/scm/it/ScmClient.java
new file mode 100644
index 0000000000..a881ae2009
--- /dev/null
+++ b/scm-webapp/src/test/java/sonia/scm/it/ScmClient.java
@@ -0,0 +1,37 @@
+package sonia.scm.it;
+
+import com.sun.jersey.api.client.Client;
+import com.sun.jersey.api.client.WebResource;
+
+import java.util.Base64;
+
+import static sonia.scm.it.IntegrationTestUtil.createClient;
+
+public class ScmClient {
+  private final String user;
+  private final String password;
+
+  private final Client client;
+
+  public static ScmClient anonymous() {
+    return new ScmClient(null, null);
+  }
+
+  public ScmClient(String user, String password) {
+    this.user = user;
+    this.password = password;
+    this.client = createClient();
+  }
+
+  public WebResource.Builder resource(String url) {
+    if (user == null) {
+      return client.resource(url).getRequestBuilder();
+    } else {
+      return client.resource(url).header("Authorization", createAuthHeaderValue());
+    }
+  }
+
+  public String createAuthHeaderValue() {
+    return "Basic " + Base64.getEncoder().encodeToString((user +":"+ password).getBytes());
+  }
+}
diff --git a/scm-webapp/src/test/java/sonia/scm/it/UserITCase.java b/scm-webapp/src/test/java/sonia/scm/it/UserITCase.java
deleted file mode 100644
index 9a749c6456..0000000000
--- a/scm-webapp/src/test/java/sonia/scm/it/UserITCase.java
+++ /dev/null
@@ -1,297 +0,0 @@
-/**
- * Copyright (c) 2010, Sebastian Sdorra
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 3. Neither the name of SCM-Manager; nor the names of its
- *    contributors may be used to endorse or promote products derived from this
- *    software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * http://bitbucket.org/sdorra/scm-manager
- *
- */
-
-
-
-package sonia.scm.it;
-
-//~--- non-JDK imports --------------------------------------------------------
-
-import org.junit.AfterClass;
-import org.junit.Test;
-
-import sonia.scm.ScmState;
-import sonia.scm.Type;
-import sonia.scm.user.User;
-import sonia.scm.user.UserTestData;
-
-import static org.junit.Assert.*;
-
-import static sonia.scm.it.IntegrationTestUtil.*;
-
-//~--- JDK imports ------------------------------------------------------------
-
-import com.sun.jersey.api.client.Client;
-import com.sun.jersey.api.client.ClientResponse;
-import com.sun.jersey.api.client.GenericType;
-import com.sun.jersey.api.client.WebResource;
-
-import java.util.Collection;
-
-import javax.ws.rs.core.MediaType;
-
-/**
- *
- * @author Sebastian Sdorra
- */
-public class UserITCase extends AbstractAdminITCaseBase
-{
-
-  /**
-   * Method description
-   *
-   */
-  @AfterClass
-  public static void cleanup()
-  {
-    Client client = createClient();
-
-    authenticateAdmin(client);
-    createResource(client, "users/slarti").delete();
-    client.destroy();
-  }
-
-  /**
-   * Method description
-   *
-   */
-  @Test
-  public void create()
-  {
-    User slarti = UserTestData.createSlarti();
-
-    slarti.setPassword("slarti123");
-    createUser(slarti);
-  }
-
-  /**
-   * Method description
-   *
-   */
-  @Test
-  public void delete()
-  {
-    User dent = UserTestData.createDent();
-
-    createUser(dent);
-    deleteUser(dent);
-  }
-
-  /**
-   * Method description
-   *
-   */
-  @Test
-  public void modify()
-  {
-    User marvin = UserTestData.createMarvin();
-
-    createUser(marvin);
-    marvin = getUser(marvin.getName());
-    marvin.setDisplayName("Paranoid Android");
-
-    WebResource wr = createResource(client, "users/".concat(marvin.getName()));
-    ClientResponse response =
-      wr.type(MediaType.APPLICATION_XML).put(ClientResponse.class, marvin);
-
-    assertNotNull(response);
-    assertEquals(204, response.getStatus());
-    response.close();
-
-    User other = getUser(marvin.getName());
-
-    assertEquals(marvin.getDisplayName(), other.getDisplayName());
-    assertNotNull(other.getLastModified());
-    deleteUser(marvin);
-  }
-
-  //~--- get methods ----------------------------------------------------------
-
-  /**
-   * Method description
-   *
-   */
-  @Test
-  public void get()
-  {
-    User scmadmin = getUser("scmadmin");
-
-    testAdmin(scmadmin);
-  }
-
-  /**
-   * Method description
-   *
-   */
-  @Test
-  public void getAll()
-  {
-    WebResource wr = createResource(client, "users");
-    ClientResponse response = wr.get(ClientResponse.class);
-
-    assertNotNull(response);
-    assertEquals(200, response.getStatus());
-
-    Collection<User> users =
-      response.getEntity(new GenericType<Collection<User>>() {}
-    );
-
-    response.close();
-    assertNotNull(users);
-    assertFalse(users.isEmpty());
-
-    User admin = null;
-
-    for (User user : users)
-    {
-      if (user.getName().equals("scmadmin"))
-      {
-        admin = user;
-      }
-    }
-
-    testAdmin(admin);
-  }
-
-  //~--- methods --------------------------------------------------------------
-
-  /**
-   * Method description
-   *
-   *
-   * @param client
-   */
-  protected void adminLogin(Client client)
-  {
-    ClientResponse cr = authenticate(client, "scmadmin", "scmadmin");
-    ScmState state = cr.getEntity(ScmState.class);
-
-    cr.close();
-    assertNotNull(state);
-    assertTrue(state.isSuccess());
-
-    User user = state.getUser();
-
-    assertNotNull(user);
-    assertEquals("scmadmin", user.getName());
-    assertTrue(user.isAdmin());
-
-    Collection<Type> types = state.getRepositoryTypes();
-
-    assertNotNull(types);
-    assertFalse(types.isEmpty());
-  }
-
-  /**
-   * Method description
-   *
-   *
-   * @param user
-   */
-  private void createUser(User user)
-  {
-    WebResource wr = createResource(client, "users");
-    ClientResponse response =
-      wr.type(MediaType.APPLICATION_XML).post(ClientResponse.class, user);
-
-    assertNotNull(response);
-    assertEquals(201, response.getStatus());
-    response.close();
-
-    User other = getUser(user.getName());
-
-    assertEquals(user.getName(), other.getName());
-    assertEquals(user.getDisplayName(), other.getDisplayName());
-    assertEquals(user.getMail(), other.getMail());
-    assertNotNull(other.getType());
-    assertNotNull(other.getCreationDate());
-  }
-
-  /**
-   * Method description
-   *
-   *
-   * @param user
-   */
-  private void deleteUser(User user)
-  {
-    WebResource wr = createResource(client, "users/".concat(user.getName()));
-    ClientResponse response = wr.delete(ClientResponse.class);
-
-    assertNotNull(response);
-    assertEquals(204, response.getStatus());
-    response.close();
-    wr = createResource(client, "users/".concat(user.getName()));
-    response = wr.get(ClientResponse.class);
-    assertNotNull(response);
-    assertEquals(404, response.getStatus());
-    response.close();
-  }
-
-  /**
-   * Method description
-   *
-   *
-   * @param user
-   */
-  private void testAdmin(User user)
-  {
-    assertNotNull(user);
-    assertEquals(user.getName(), "scmadmin");
-    assertTrue(user.isAdmin());
-  }
-
-  //~--- get methods ----------------------------------------------------------
-
-  /**
-   * Method description
-   *
-   *
-   * @param username
-   *
-   * @return
-   */
-  private User getUser(String username)
-  {
-    WebResource wr = createResource(client, "users/".concat(username));
-    ClientResponse response = wr.get(ClientResponse.class);
-
-    assertNotNull(response);
-    assertEquals(200, response.getStatus());
-
-    User user = response.getEntity(User.class);
-
-    response.close();
-    assertNotNull(user);
-
-    return user;
-  }
-}
diff --git a/scm-webapp/src/test/java/sonia/scm/it/UserITUtil.java b/scm-webapp/src/test/java/sonia/scm/it/UserITUtil.java
new file mode 100644
index 0000000000..78667c516c
--- /dev/null
+++ b/scm-webapp/src/test/java/sonia/scm/it/UserITUtil.java
@@ -0,0 +1,13 @@
+package sonia.scm.it;
+
+import com.sun.jersey.api.client.ClientResponse;
+import sonia.scm.user.User;
+import sonia.scm.web.VndMediaType;
+
+import static sonia.scm.it.IntegrationTestUtil.post;
+
+public class UserITUtil {
+  public static ClientResponse postUser(ScmClient client, User user) {
+    return post(client, "users", VndMediaType.USER, user);
+  }
+}
diff --git a/scm-webapp/src/test/java/sonia/scm/it/UserPermissionITCase.java b/scm-webapp/src/test/java/sonia/scm/it/UserPermissionITCase.java
index 45bd0ebd9d..dc960c1b42 100644
--- a/scm-webapp/src/test/java/sonia/scm/it/UserPermissionITCase.java
+++ b/scm-webapp/src/test/java/sonia/scm/it/UserPermissionITCase.java
@@ -35,11 +35,20 @@ package sonia.scm.it;
 
 //~--- non-JDK imports --------------------------------------------------------
 
+import com.sun.jersey.api.client.ClientResponse;
+import de.otto.edison.hal.HalRepresentation;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
-
+import sonia.scm.api.rest.ObjectMapperProvider;
 import sonia.scm.user.User;
 import sonia.scm.user.UserTestData;
+import sonia.scm.web.VndMediaType;
+
+import java.io.IOException;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 /**
  *
@@ -55,7 +64,7 @@ public class UserPermissionITCase extends AbstractPermissionITCaseBase<User>
    *
    * @param credentials
    */
-  public UserPermissionITCase(Credentials credentials)
+  public UserPermissionITCase(Credentials credentials, String ignore_testCaseName)
   {
     super(credentials);
   }
@@ -140,4 +149,31 @@ public class UserPermissionITCase extends AbstractPermissionITCaseBase<User>
   {
     return "users/scmadmin";
   }
+
+  @Override
+  protected String getMediaType() {
+    return VndMediaType.USER;
+  }
+
+  @Override
+  protected void checkGetAllResponse(ClientResponse response)
+  {
+    if (!credentials.isAnonymous())
+    {
+      assertNotNull(response);
+      assertEquals(200, response.getStatus());
+
+      HalRepresentation repositories =
+        null;
+      try {
+        repositories = new ObjectMapperProvider().get().readValue(response.getEntity(String.class), HalRepresentation.class);
+      } catch (IOException e) {
+        throw new RuntimeException(e);
+      }
+
+      assertNotNull(repositories);
+      assertTrue(repositories.getEmbedded().getItemsBy("users").isEmpty());
+      response.close();
+    }
+  }
 }
diff --git a/scm-webapp/src/test/resources/repository-git.json b/scm-webapp/src/test/resources/repository-git.json
new file mode 100644
index 0000000000..3fc491ac01
--- /dev/null
+++ b/scm-webapp/src/test/resources/repository-git.json
@@ -0,0 +1,7 @@
+{
+  "contact": "zaphod.beeblebrox@hitchhiker.com",
+  "description": "Heart of Gold is the first prototype ship to successfully utilise the revolutionary Infinite Improbability Drive",
+  "name": "HeartOfGold-git",
+  "archived": false,
+  "type": "git"
+}
diff --git a/scm-webapp/src/test/resources/repository-hg.json b/scm-webapp/src/test/resources/repository-hg.json
new file mode 100644
index 0000000000..cf1be4cc2e
--- /dev/null
+++ b/scm-webapp/src/test/resources/repository-hg.json
@@ -0,0 +1,7 @@
+{
+  "contact": "zaphod.beeblebrox@hitchhiker.com",
+  "description": "Heart of Gold is the first prototype ship to successfully utilise the revolutionary Infinite Improbability Drive",
+  "name": "HeartOfGold-hg",
+  "archived": false,
+  "type": "hg"
+}
diff --git a/scm-webapp/src/test/resources/repository-svn.json b/scm-webapp/src/test/resources/repository-svn.json
new file mode 100644
index 0000000000..97e2aa6074
--- /dev/null
+++ b/scm-webapp/src/test/resources/repository-svn.json
@@ -0,0 +1,7 @@
+{
+  "contact": "zaphod.beeblebrox@hitchhiker.com",
+  "description": "Heart of Gold is the first prototype ship to successfully utilise the revolutionary Infinite Improbability Drive",
+  "name": "HeartOfGold-svn",
+  "archived": false,
+  "type": "svn"
+}

From b32c8501f1dcfa9f10ca4b0b30a38f2b39d8df61 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Fri, 3 Aug 2018 09:34:39 +0200
Subject: [PATCH 26/51] improve user and repository detail pages

---
 scm-ui/public/locales/en/repos.json           |  8 ++-
 scm-ui/public/locales/en/users.json           |  5 +-
 scm-ui/src/components/MailLink.js             | 18 ++++++
 .../src/repos/components/RepositoryDetails.js | 50 ++++++++++++++--
 scm-ui/src/repos/containers/RepositoryRoot.js | 59 +++++++++++--------
 scm-ui/src/users/components/table/Details.js  | 22 ++++++-
 scm-ui/src/users/types/User.js                |  3 +
 7 files changed, 132 insertions(+), 33 deletions(-)
 create mode 100644 scm-ui/src/components/MailLink.js

diff --git a/scm-ui/public/locales/en/repos.json b/scm-ui/public/locales/en/repos.json
index e28d9bb23d..76deba1c8a 100644
--- a/scm-ui/public/locales/en/repos.json
+++ b/scm-ui/public/locales/en/repos.json
@@ -3,7 +3,9 @@
     "name": "Name",
     "type": "Type",
     "contact": "Contact",
-    "description": "Description"
+    "description": "Description",
+    "creationDate": "Creation Date",
+    "lastModified": "Last Modified"
   },
   "validation": {
     "name-invalid": "The repository name is invalid",
@@ -16,7 +18,9 @@
   },
   "repository-root": {
     "error-title": "Error",
-    "error-subtitle": "Unknown repository error"
+    "error-subtitle": "Unknown repository error",
+    "actions-label": "Actions",
+    "back-label": "Back"
   },
   "create": {
     "title": "Create Repository",
diff --git a/scm-ui/public/locales/en/users.json b/scm-ui/public/locales/en/users.json
index c0b55adf7e..f1d71d8efc 100644
--- a/scm-ui/public/locales/en/users.json
+++ b/scm-ui/public/locales/en/users.json
@@ -5,7 +5,10 @@
     "mail": "E-Mail",
     "password": "Password",
     "admin": "Admin",
-    "active": "Active"
+    "active": "Active",
+    "type": "Type",
+    "creationDate": "Creation Date",
+    "lastModified": "Last Modified"
   },
   "users": {
     "title": "Users",
diff --git a/scm-ui/src/components/MailLink.js b/scm-ui/src/components/MailLink.js
new file mode 100644
index 0000000000..7d009cde85
--- /dev/null
+++ b/scm-ui/src/components/MailLink.js
@@ -0,0 +1,18 @@
+// @flow
+import React from "react";
+
+type Props = {
+  address?: string
+};
+
+class MailLink extends React.Component<Props> {
+  render() {
+    const { address } = this.props;
+    if (!address) {
+      return null;
+    }
+    return <a href={"mailto: " + address}>{address}</a>;
+  }
+}
+
+export default MailLink;
diff --git a/scm-ui/src/repos/components/RepositoryDetails.js b/scm-ui/src/repos/components/RepositoryDetails.js
index df7fd5083d..83a4f164aa 100644
--- a/scm-ui/src/repos/components/RepositoryDetails.js
+++ b/scm-ui/src/repos/components/RepositoryDetails.js
@@ -1,16 +1,56 @@
 //@flow
 import React from "react";
-import type {Repository} from '../types/Repositories';
+import { translate } from "react-i18next";
+import type { Repository } from "../types/Repositories";
+import MailLink from "../../components/MailLink";
+import DateFromNow from "../../components/DateFromNow";
 
 type Props = {
-  repository: Repository
+  repository: Repository,
+  // context props
+  t: string => string
 };
 
 class RepositoryDetails extends React.Component<Props> {
   render() {
-    const { repository } = this.props;
-    return <div>{repository.description}</div>;
+    const { repository, t } = this.props;
+    return (
+      <table className="table">
+        <tbody>
+          <tr>
+            <td>{t("repository.name")}</td>
+            <td>{repository.name}</td>
+          </tr>
+          <tr>
+            <td>{t("repository.type")}</td>
+            <td>{repository.type}</td>
+          </tr>
+          <tr>
+            <td>{t("repository.contact")}</td>
+            <td>
+              <MailLink address={repository.contact} />
+            </td>
+          </tr>
+          <tr>
+            <td>{t("repository.description")}</td>
+            <td>{repository.description}</td>
+          </tr>
+          <tr>
+            <td>{t("repository.creationDate")}</td>
+            <td>
+              <DateFromNow date={repository.creationDate} />
+            </td>
+          </tr>
+          <tr>
+            <td>{t("repository.lastModified")}</td>
+            <td>
+              <DateFromNow date={repository.lastModified} />
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    );
   }
 }
 
-export default RepositoryDetails;
+export default translate("repos")(RepositoryDetails);
diff --git a/scm-ui/src/repos/containers/RepositoryRoot.js b/scm-ui/src/repos/containers/RepositoryRoot.js
index 65de6b2fa5..ccc75ad05c 100644
--- a/scm-ui/src/repos/containers/RepositoryRoot.js
+++ b/scm-ui/src/repos/containers/RepositoryRoot.js
@@ -1,15 +1,20 @@
 //@flow
 import React from "react";
-import {fetchRepo, getFetchRepoFailure, getRepository, isFetchRepoPending} from '../modules/repos';
+import {
+  fetchRepo,
+  getFetchRepoFailure,
+  getRepository,
+  isFetchRepoPending
+} from "../modules/repos";
 import { connect } from "react-redux";
-import {Route} from "react-router-dom"
-import type {Repository} from '../types/Repositories';
-import {Page} from '../../components/layout';
-import Loading from '../../components/Loading';
-import ErrorPage from '../../components/ErrorPage';
+import { Route } from "react-router-dom";
+import type { Repository } from "../types/Repositories";
+import { Page } from "../../components/layout";
+import Loading from "../../components/Loading";
+import ErrorPage from "../../components/ErrorPage";
 import { translate } from "react-i18next";
-import {Navigation} from '../../components/navigation';
-import RepositoryDetails from '../components/RepositoryDetails';
+import { Navigation, NavLink, Section } from "../../components/navigation";
+import RepositoryDetails from "../components/RepositoryDetails";
 
 type Props = {
   namespace: string,
@@ -44,7 +49,6 @@ class RepositoryRoot extends React.Component<Props> {
     return this.stripEndingSlash(this.props.match.url);
   };
 
-
   render() {
     const { loading, error, repository, t } = this.props;
 
@@ -59,27 +63,34 @@ class RepositoryRoot extends React.Component<Props> {
     }
 
     if (!repository || loading) {
-      return <Loading />
+      return <Loading />;
     }
 
     const url = this.matchedUrl();
 
-    return <Page title={repository.namespace + "/" + repository.name}>
-      <div className="columns">
-        <div className="column is-three-quarters">
-          <Route path={url} exact component={() => <RepositoryDetails repository={repository} />} />
+    return (
+      <Page title={repository.namespace + "/" + repository.name}>
+        <div className="columns">
+          <div className="column is-three-quarters">
+            <Route
+              path={url}
+              exact
+              component={() => <RepositoryDetails repository={repository} />}
+            />
+          </div>
+          <div className="column">
+            <Navigation>
+              <Section label={t("repository-root.actions-label")}>
+                <NavLink to="/repos" label={t("repository-root.back-label")} />
+              </Section>
+            </Navigation>
+          </div>
         </div>
-        <div className="column">
-          <Navigation>
-
-          </Navigation>
-        </div>
-      </div>
-    </Page>
+      </Page>
+    );
   }
 }
 
-
 const mapStateToProps = (state, ownProps) => {
   const { namespace, name } = ownProps.match.params;
   const repository = getRepository(state, namespace, name);
@@ -96,8 +107,8 @@ const mapStateToProps = (state, ownProps) => {
 
 const mapDispatchToProps = dispatch => {
   return {
-    fetchRepo : (namespace: string, name: string) => {
-      dispatch(fetchRepo(namespace, name))
+    fetchRepo: (namespace: string, name: string) => {
+      dispatch(fetchRepo(namespace, name));
     }
   };
 };
diff --git a/scm-ui/src/users/components/table/Details.js b/scm-ui/src/users/components/table/Details.js
index 269df9db10..c2b90b0f2e 100644
--- a/scm-ui/src/users/components/table/Details.js
+++ b/scm-ui/src/users/components/table/Details.js
@@ -3,6 +3,8 @@ import React from "react";
 import type { User } from "../../types/User";
 import { translate } from "react-i18next";
 import { Checkbox } from "../../../components/forms";
+import MailLink from "../../../components/MailLink";
+import DateFromNow from "../../../components/DateFromNow";
 
 type Props = {
   user: User,
@@ -25,7 +27,9 @@ class Details extends React.Component<Props> {
           </tr>
           <tr>
             <td>{t("user.mail")}</td>
-            <td>{user.mail}</td>
+            <td>
+              <MailLink address={user.mail} />
+            </td>
           </tr>
           <tr>
             <td>{t("user.admin")}</td>
@@ -39,6 +43,22 @@ class Details extends React.Component<Props> {
               <Checkbox checked={user.active} />
             </td>
           </tr>
+          <tr>
+            <td>{t("user.type")}</td>
+            <td>{user.type}</td>
+          </tr>
+          <tr>
+            <td>{t("user.creationDate")}</td>
+            <td>
+              <DateFromNow date={user.creationDate} />
+            </td>
+          </tr>
+          <tr>
+            <td>{t("user.lastModified")}</td>
+            <td>
+              <DateFromNow date={user.lastModified} />
+            </td>
+          </tr>
         </tbody>
       </table>
     );
diff --git a/scm-ui/src/users/types/User.js b/scm-ui/src/users/types/User.js
index b113f7f795..58be91e0ba 100644
--- a/scm-ui/src/users/types/User.js
+++ b/scm-ui/src/users/types/User.js
@@ -8,5 +8,8 @@ export type User = {
   password: string,
   admin: boolean,
   active: boolean,
+  type?: string,
+  creationDate?: string,
+  lastModified?: string,
   _links: Links
 };

From 62f8509e855dca933b73cd8d6e864c89dd973263 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Fri, 3 Aug 2018 09:38:13 +0200
Subject: [PATCH 27/51] Introduce new integration test module

---
 pom.xml                                       |   1 +
 scm-it/pom.xml                                | 173 ++++++++++++++++
 scm-it/src/main/conf/jetty.xml                |  72 +++++++
 .../test/java/sonia/scm/it/RegExMatcher.java  |  29 +++
 .../java/sonia/scm/it/RepositoriesITCase.java | 153 ++++++++++++++
 .../src/test/java/sonia/scm/it/RestUtil.java  |  68 ++++++
 .../src/test/java/sonia/scm/it/TestData.java  |  74 +++++++
 scm-it/src/test/resources/repository-git.json |   7 +
 scm-it/src/test/resources/repository-hg.json  |   7 +
 scm-it/src/test/resources/repository-svn.json |   7 +
 .../sonia/scm/it/GetRepositoriesITCase.java   | 196 ------------------
 11 files changed, 591 insertions(+), 196 deletions(-)
 create mode 100644 scm-it/pom.xml
 create mode 100644 scm-it/src/main/conf/jetty.xml
 create mode 100644 scm-it/src/test/java/sonia/scm/it/RegExMatcher.java
 create mode 100644 scm-it/src/test/java/sonia/scm/it/RepositoriesITCase.java
 create mode 100644 scm-it/src/test/java/sonia/scm/it/RestUtil.java
 create mode 100644 scm-it/src/test/java/sonia/scm/it/TestData.java
 create mode 100644 scm-it/src/test/resources/repository-git.json
 create mode 100644 scm-it/src/test/resources/repository-hg.json
 create mode 100644 scm-it/src/test/resources/repository-svn.json
 delete mode 100644 scm-webapp/src/test/java/sonia/scm/it/GetRepositoriesITCase.java

diff --git a/pom.xml b/pom.xml
index af38d5175a..788abaca36 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,6 +73,7 @@
     <module>scm-ui</module>
     <module>scm-webapp</module>
     <module>scm-server</module>
+    <module>scm-it</module>
   </modules>
 
   <repositories>
diff --git a/scm-it/pom.xml b/scm-it/pom.xml
new file mode 100644
index 0000000000..ab68517a9d
--- /dev/null
+++ b/scm-it/pom.xml
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>sonia.scm</groupId>
+    <artifactId>scm</artifactId>
+    <version>2.0.0-SNAPSHOT</version>
+  </parent>
+
+  <groupId>sonia.scm</groupId>
+  <artifactId>scm-it</artifactId>
+  <packaging>jar</packaging>
+  <version>2.0.0-SNAPSHOT</version>
+  <name>scm-it</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>sonia.scm</groupId>
+      <artifactId>scm-core</artifactId>
+      <version>2.0.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>io.rest-assured</groupId>
+      <artifactId>rest-assured</artifactId>
+      <version>3.1.0</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+
+      <plugin>
+        <groupId>com.mycila.maven-license-plugin</groupId>
+        <artifactId>maven-license-plugin</artifactId>
+        <version>1.9.0</version>
+        <configuration>
+          <header>http://download.scm-manager.org/licenses/mvn-license.txt</header>
+          <includes>
+            <include>src/**</include>
+            <include>**/test/**</include>
+          </includes>
+          <excludes>
+            <exclude>target/**</exclude>
+            <exclude>.hg/**</exclude>
+            <exclude>src/main/webapp/resources/extjs/**</exclude>
+            <exclude>src/main/webapp/resources/syntaxhighlighter/**</exclude>
+            <exclude>src/main/webapp/resources/moment/**</exclude>
+            <exclude>**/*.mustache</exclude>
+          </excludes>
+          <strictCheck>true</strictCheck>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <groupId>org.eclipse.jetty</groupId>
+        <artifactId>jetty-maven-plugin</artifactId>
+        <version>${jetty.maven.version}</version>
+        <configuration>
+          <stopPort>8005</stopPort>
+          <stopKey>STOP</stopKey>
+          <systemProperties>
+            <systemProperty>
+              <name>scm.home</name>
+              <value>${scm.home}</value>
+            </systemProperty>
+            <systemProperty>
+              <name>scm.stage</name>
+              <value>${scm.stage}</value>
+            </systemProperty>
+            <systemProperty>
+              <name>java.awt.headless</name>
+              <value>true</value>
+            </systemProperty>
+          </systemProperties>
+          <webApp>
+            <contextPath>/scm</contextPath>
+          </webApp>
+          <jettyXml>${project.basedir}/src/main/conf/jetty.xml</jettyXml>
+          <scanIntervalSeconds>0</scanIntervalSeconds>
+        </configuration>
+      </plugin>
+    </plugins>
+
+    <finalName>scm-it</finalName>
+  </build>
+
+  <properties>
+  </properties>
+
+  <profiles>
+
+    <profile>
+      <id>it</id>
+
+      <build>
+        <plugins>
+
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-failsafe-plugin</artifactId>
+            <version>2.12</version>
+            <configuration>
+              <includes>
+                <include>sonia/scm/it/*ITCase.java</include>
+              </includes>
+            </configuration>
+            <executions>
+              <execution>
+                <id>integration-test</id>
+                <goals>
+                  <goal>integration-test</goal>
+                </goals>
+              </execution>
+              <execution>
+                <id>verify</id>
+                <goals>
+                  <goal>verify</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+
+          <plugin>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-maven-plugin</artifactId>
+            <version>${jetty.maven.version}</version>
+            <configuration>
+              <stopPort>8085</stopPort>
+              <stopKey>STOP</stopKey>
+              <systemProperties>
+                <systemProperty>
+                  <name>scm.home</name>
+                  <value>target/scm-it</value>
+                </systemProperty>
+                <systemProperty>
+                  <name>scm.stage</name>
+                  <value>${scm.stage}</value>
+                </systemProperty>
+              </systemProperties>
+              <jettyXml>${project.basedir}/src/main/conf/jetty.xml</jettyXml>
+              <war>${project.basedir}/../scm-webapp/target/scm-webapp.war</war>
+              <scanIntervalSeconds>0</scanIntervalSeconds>
+              <daemon>true</daemon>
+            </configuration>
+            <executions>
+              <execution>
+                <id>start-jetty</id>
+                <phase>pre-integration-test</phase>
+                <goals>
+                  <goal>deploy-war</goal>
+                </goals>
+              </execution>
+              <execution>
+                <id>stop-jetty</id>
+                <phase>post-integration-test</phase>
+                <goals>
+                  <goal>stop</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+
+        </plugins>
+      </build>
+
+    </profile>
+  </profiles>
+
+</project>
+
diff --git a/scm-it/src/main/conf/jetty.xml b/scm-it/src/main/conf/jetty.xml
new file mode 100644
index 0000000000..ec7ac555c8
--- /dev/null
+++ b/scm-it/src/main/conf/jetty.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
+<!--*
+Copyright (c) 2010, Sebastian Sdorra
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+3. Neither the name of SCM-Manager; nor the names of its
+   contributors may be used to endorse or promote products derived from this
+   software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+http://bitbucket.org/sdorra/scm-manager
+
+-->
+
+<Configure id="Server" class="org.eclipse.jetty.server.Server">
+
+  <New id="httpConfig" class="org.eclipse.jetty.server.HttpConfiguration">
+    <!-- increase header size for mercurial -->
+    <Set name="requestHeaderSize">16384</Set>
+    <Set name="responseHeaderSize">16384</Set>
+  </New>
+  
+  <Call id="httpConnector" name="addConnector">
+    <Arg>
+      <New class="org.eclipse.jetty.server.ServerConnector">
+        <Arg name="server">
+          <Ref refid="Server" />
+        </Arg>
+        <Arg name="factories">
+          <Array type="org.eclipse.jetty.server.ConnectionFactory">
+            <Item>
+              <New class="org.eclipse.jetty.server.HttpConnectionFactory">
+                <Arg name="config">
+                  <Ref refid="httpConfig" />
+                </Arg>
+              </New>
+            </Item>
+          </Array>
+        </Arg>
+        <Set name="host">
+          <Property name="jetty.host" />
+        </Set>
+        <Set name="port">
+          <Property name="jetty.port" default="8081" />
+        </Set>
+        <Set name="idleTimeout">
+          <Property name="http.timeout" default="30000"/>
+        </Set>
+      </New>
+    </Arg>
+  </Call>
+  
+</Configure>
\ No newline at end of file
diff --git a/scm-it/src/test/java/sonia/scm/it/RegExMatcher.java b/scm-it/src/test/java/sonia/scm/it/RegExMatcher.java
new file mode 100644
index 0000000000..e5dc7931d3
--- /dev/null
+++ b/scm-it/src/test/java/sonia/scm/it/RegExMatcher.java
@@ -0,0 +1,29 @@
+package sonia.scm.it;
+
+import org.hamcrest.BaseMatcher;
+import org.hamcrest.Description;
+import org.hamcrest.Matcher;
+
+import java.util.regex.Pattern;
+
+class RegExMatcher extends BaseMatcher<String> {
+  public static Matcher<String> matchesPattern(String pattern) {
+    return new RegExMatcher(pattern);
+  }
+
+  private final String pattern;
+
+  private RegExMatcher(String pattern) {
+    this.pattern = pattern;
+  }
+
+  @Override
+  public void describeTo(Description description) {
+    description.appendText("matching to regex pattern \"" + pattern + "\"");
+  }
+
+  @Override
+  public boolean matches(Object o) {
+    return Pattern.compile(pattern).matcher(o.toString()).matches();
+  }
+}
diff --git a/scm-it/src/test/java/sonia/scm/it/RepositoriesITCase.java b/scm-it/src/test/java/sonia/scm/it/RepositoriesITCase.java
new file mode 100644
index 0000000000..6e309e1ba6
--- /dev/null
+++ b/scm-it/src/test/java/sonia/scm/it/RepositoriesITCase.java
@@ -0,0 +1,153 @@
+/**
+ * Copyright (c) 2010, Sebastian Sdorra
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * 3. Neither the name of SCM-Manager; nor the names of its
+ * contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * http://bitbucket.org/sdorra/scm-manager
+ */
+
+
+package sonia.scm.it;
+
+//~--- non-JDK imports --------------------------------------------------------
+
+import org.apache.http.HttpStatus;
+import org.junit.After;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+import sonia.scm.util.IOUtil;
+import sonia.scm.web.VndMediaType;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
+import static sonia.scm.it.RegExMatcher.matchesPattern;
+import static sonia.scm.it.RestUtil.createResourceUrl;
+import static sonia.scm.it.RestUtil.given;
+import static sonia.scm.it.RestUtil.readJson;
+
+@RunWith(Parameterized.class)
+public class RepositoriesITCase {
+
+  private final String repositoryType;
+
+  public RepositoriesITCase(String repositoryType) {
+    this.repositoryType = repositoryType;
+  }
+
+  @Parameters(name = "{0}")
+  public static Collection<String[]> createParameters() {
+    Collection<String[]> params = new ArrayList<>();
+
+    params.add(new String[]{"git"});
+    params.add(new String[]{"svn"});
+
+    if (IOUtil.search("hg") != null) {
+      params.add(new String[]{"hg"});
+    }
+
+    return params;
+  }
+
+  @After
+  public void cleanup() {
+    TestData.cleanup();
+  }
+
+  @Test
+  public void shouldCreateSuccessfully() throws IOException {
+    String repositoryUrl = createRepository();
+
+    given(VndMediaType.REPOSITORY)
+
+      .when()
+      .get(repositoryUrl)
+
+      .then()
+      .statusCode(HttpStatus.SC_OK)
+      .body(
+        "name", equalTo("HeartOfGold-" + repositoryType),
+        "type", equalTo(repositoryType),
+        "creationDate", matchesPattern("\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\.\\d+Z"),
+        "lastModified", is(nullValue()),
+        "_links.self.href", equalTo(repositoryUrl)
+      );
+  }
+
+  @Test
+  public void shouldDeleteSuccessfully() throws IOException {
+    String repositoryUrl = createRepository();
+
+    given(VndMediaType.REPOSITORY)
+
+      .when()
+      .delete(repositoryUrl)
+
+      .then()
+      .statusCode(HttpStatus.SC_NO_CONTENT);
+
+    given(VndMediaType.REPOSITORY)
+
+      .when()
+      .get(repositoryUrl)
+
+      .then()
+      .statusCode(HttpStatus.SC_NOT_FOUND);
+  }
+
+  @Test
+  public void shouldRejectMultipleCreations() throws IOException {
+    String repositoryJson = readJson("repository-" + repositoryType + ".json");
+    createRepository();
+
+    given(VndMediaType.REPOSITORY)
+      .body(repositoryJson)
+
+      .when()
+      .post(createResourceUrl("repositories"))
+
+      .then()
+      .statusCode(HttpStatus.SC_CONFLICT);
+  }
+
+  private String createRepository() throws IOException {
+    return given(VndMediaType.REPOSITORY)
+      .body(readJson("repository-" + repositoryType + ".json"))
+
+      .when()
+      .post(createResourceUrl("repositories"))
+
+      .then()
+      .statusCode(HttpStatus.SC_CREATED)
+      .extract()
+      .header("location");
+  }
+}
diff --git a/scm-it/src/test/java/sonia/scm/it/RestUtil.java b/scm-it/src/test/java/sonia/scm/it/RestUtil.java
new file mode 100644
index 0000000000..a902c8985c
--- /dev/null
+++ b/scm-it/src/test/java/sonia/scm/it/RestUtil.java
@@ -0,0 +1,68 @@
+package sonia.scm.it;
+
+import com.google.common.io.Resources;
+import io.restassured.RestAssured;
+import io.restassured.response.Response;
+import io.restassured.specification.RequestSpecification;
+
+import java.io.IOException;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.net.URI;
+import java.net.URL;
+import java.nio.charset.Charset;
+
+import static java.util.Arrays.asList;
+
+public class RestUtil {
+
+  public static final String BASE_URL = "http://localhost:8081/scm/";
+  public static final String REST_BASE_URL = BASE_URL.concat("api/rest/v2/");
+
+  public static Response lastResponse;
+
+  public static URI createResourceUrl(String url)
+  {
+    return URI.create(REST_BASE_URL).resolve(url);
+  }
+
+  public static String readJson(String jsonFileName) throws IOException {
+    URL url = Resources.getResource(jsonFileName);
+    return Resources.toString(url, Charset.forName("UTF-8"));
+  }
+
+  public static RequestSpecification given(String mediaType) {
+    RequestSpecification requestSpecification = RestAssured.given()
+      .contentType(mediaType)
+      .accept(mediaType)
+      .auth().preemptive().basic("scmadmin", "scmadmin");
+    return wrapRequestSpecification(requestSpecification);
+  }
+
+  private static RequestSpecification wrapRequestSpecification(RequestSpecification requestSpecification) {
+    return (RequestSpecification) Proxy.newProxyInstance(RestUtil.class.getClassLoader(), new Class[]{RequestSpecification.class}, new RequestSpecificationWrapper(requestSpecification));
+  }
+
+  private static class RequestSpecificationWrapper implements InvocationHandler {
+
+    private final RequestSpecification delegate;
+
+    private RequestSpecificationWrapper(RequestSpecification delegate) {
+      this.delegate = delegate;
+    }
+
+    @Override
+    public Object invoke(Object proxy, Method method, Object[] args) throws InvocationTargetException, IllegalAccessException {
+      if (asList("get", "put", "post", "delete").contains(method.getName())) {
+        lastResponse = (Response) method.invoke(delegate, args);
+        return lastResponse;
+      } else if (method.getReturnType().equals(RequestSpecification.class)) {
+        return wrapRequestSpecification((RequestSpecification) method.invoke(delegate, args));
+      } else {
+        return method.invoke(delegate, args);
+      }
+    }
+  }
+}
diff --git a/scm-it/src/test/java/sonia/scm/it/TestData.java b/scm-it/src/test/java/sonia/scm/it/TestData.java
new file mode 100644
index 0000000000..4127b74b9d
--- /dev/null
+++ b/scm-it/src/test/java/sonia/scm/it/TestData.java
@@ -0,0 +1,74 @@
+package sonia.scm.it;
+
+import org.apache.http.HttpStatus;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import sonia.scm.web.VndMediaType;
+
+import java.util.List;
+
+import static java.util.Arrays.asList;
+import static sonia.scm.it.RestUtil.createResourceUrl;
+import static sonia.scm.it.RestUtil.given;
+
+public class TestData {
+
+  private static final Logger LOG = LoggerFactory.getLogger(TestData.class);
+
+  private static final List<String> PROTECTED_USERS = asList("scmadmin", "anonymous");
+
+  public static void cleanup() {
+    cleanupRepositories();
+    cleanupGroups();
+    cleanupUsers();
+  }
+
+  public static void cleanupRepositories() {
+    List<String> repositories = given(VndMediaType.REPOSITORY_COLLECTION)
+      .when()
+      .get(createResourceUrl("repositories"))
+      .then()
+      .statusCode(HttpStatus.SC_OK)
+      .extract()
+      .body().jsonPath().getList("_embedded.repositories._links.self.href");
+    LOG.info("about to delete {} repositories", repositories.size());
+    repositories.forEach(TestData::delete);
+  }
+
+  public static void cleanupGroups() {
+    List<String> groups = given(VndMediaType.GROUP_COLLECTION)
+      .when()
+      .get(createResourceUrl("groups"))
+      .then()
+      .statusCode(HttpStatus.SC_OK)
+      .extract()
+      .body().jsonPath().getList("_embedded.groups._links.self.href");
+    LOG.info("about to delete {} groups", groups.size());
+    groups.forEach(TestData::delete);
+  }
+
+  public static void cleanupUsers() {
+    List<String> users = given(VndMediaType.USER_COLLECTION)
+      .when()
+      .get(createResourceUrl("users"))
+      .then()
+      .statusCode(HttpStatus.SC_OK)
+      .extract()
+      .body().jsonPath().getList("_embedded.users._links.self.href");
+    LOG.info("about to delete {} users", users.size());
+    users.stream().filter(url -> PROTECTED_USERS.stream().noneMatch(url::contains)).forEach(TestData::delete);
+  }
+
+  public static void delete(String url) {
+    given(VndMediaType.REPOSITORY)
+      .when()
+      .delete(url)
+      .then()
+      .statusCode(HttpStatus.SC_NO_CONTENT);
+    LOG.info("deleted {}", url);
+  }
+
+  public static void main(String[] args) {
+    cleanup();
+  }
+}
diff --git a/scm-it/src/test/resources/repository-git.json b/scm-it/src/test/resources/repository-git.json
new file mode 100644
index 0000000000..3fc491ac01
--- /dev/null
+++ b/scm-it/src/test/resources/repository-git.json
@@ -0,0 +1,7 @@
+{
+  "contact": "zaphod.beeblebrox@hitchhiker.com",
+  "description": "Heart of Gold is the first prototype ship to successfully utilise the revolutionary Infinite Improbability Drive",
+  "name": "HeartOfGold-git",
+  "archived": false,
+  "type": "git"
+}
diff --git a/scm-it/src/test/resources/repository-hg.json b/scm-it/src/test/resources/repository-hg.json
new file mode 100644
index 0000000000..cf1be4cc2e
--- /dev/null
+++ b/scm-it/src/test/resources/repository-hg.json
@@ -0,0 +1,7 @@
+{
+  "contact": "zaphod.beeblebrox@hitchhiker.com",
+  "description": "Heart of Gold is the first prototype ship to successfully utilise the revolutionary Infinite Improbability Drive",
+  "name": "HeartOfGold-hg",
+  "archived": false,
+  "type": "hg"
+}
diff --git a/scm-it/src/test/resources/repository-svn.json b/scm-it/src/test/resources/repository-svn.json
new file mode 100644
index 0000000000..97e2aa6074
--- /dev/null
+++ b/scm-it/src/test/resources/repository-svn.json
@@ -0,0 +1,7 @@
+{
+  "contact": "zaphod.beeblebrox@hitchhiker.com",
+  "description": "Heart of Gold is the first prototype ship to successfully utilise the revolutionary Infinite Improbability Drive",
+  "name": "HeartOfGold-svn",
+  "archived": false,
+  "type": "svn"
+}
diff --git a/scm-webapp/src/test/java/sonia/scm/it/GetRepositoriesITCase.java b/scm-webapp/src/test/java/sonia/scm/it/GetRepositoriesITCase.java
deleted file mode 100644
index 6978c897f8..0000000000
--- a/scm-webapp/src/test/java/sonia/scm/it/GetRepositoriesITCase.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/**
- * Copyright (c) 2010, Sebastian Sdorra
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 3. Neither the name of SCM-Manager; nor the names of its
- *    contributors may be used to endorse or promote products derived from this
- *    software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * http://bitbucket.org/sdorra/scm-manager
- *
- */
-
-
-
-package sonia.scm.it;
-
-//~--- non-JDK imports --------------------------------------------------------
-
-import org.junit.After;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import sonia.scm.repository.Repository;
-import sonia.scm.repository.RepositoryTestData;
-import sonia.scm.util.IOUtil;
-
-import static org.junit.Assert.*;
-
-import static sonia.scm.it.IntegrationTestUtil.*;
-import static sonia.scm.it.RepositoryITUtil.*;
-
-//~--- JDK imports ------------------------------------------------------------
-
-import com.sun.jersey.api.client.ClientResponse;
-import com.sun.jersey.api.client.WebResource;
-
-import java.io.IOException;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-/**
- *
- * @author Sebastian Sdorra
- */
-@RunWith(Parameterized.class)
-public class GetRepositoriesITCase extends AbstractAdminITCaseBase
-{
-
-  /**
-   * Constructs ...
-   *
-   *
-   * @param repositoryType
-   */
-  public GetRepositoriesITCase(String repositoryType)
-  {
-    this.repositoryType = repositoryType;
-  }
-
-  //~--- methods --------------------------------------------------------------
-
-  /**
-   * Method description
-   *
-   *
-   * @return
-   */
-  @Parameters
-  public static Collection<String[]> createParameters()
-  {
-    Collection<String[]> params = new ArrayList<String[]>();
-
-    params.add(new String[] { "git" });
-    params.add(new String[] { "svn" });
-
-    if (IOUtil.search("hg") != null)
-    {
-      params.add(new String[] { "hg" });
-    }
-
-    return params;
-  }
-
-  /**
-   * Method description
-   *
-   *
-   * @throws IOException
-   */
-  @After
-  public void cleanup() throws IOException
-  {
-    deleteRepository(client, repository.getId());
-  }
-
-  /**
-   * Method description
-   *
-   */
-  @Test
-  public void testGetById()
-  {
-    repository = RepositoryTestData.createHeartOfGold(repositoryType);
-    repository = createRepository(client, repository);
-
-    String id = repository.getId();
-
-    assertNotNull(id);
-
-    Repository r = getRepositoryById(client, id);
-
-    assertEquals(id, r.getId());
-  }
-
-  /**
-   * Method description
-   *
-   */
-  @Test
-  public void testGetByTypeAndName()
-  {
-    repository = RepositoryTestData.create42Puzzle(repositoryType);
-    testGetByTypeAndName(repository);
-  }
-
-  /**
-   * Method description
-   *
-   */
-  @Test
-  public void testGetByTypeAndNameWithDirectoryStructure()
-  {
-    repository =
-      RepositoryTestData.createRestaurantAtTheEndOfTheUniverse(repositoryType);
-    repository.setName("test/".concat(repository.getName()));
-    testGetByTypeAndName(repository);
-  }
-
-  /**
-   * Method description
-   *
-   *
-   * @param repository
-   */
-  private void testGetByTypeAndName(Repository repo)
-  {
-    repository = createRepository(client, repo);
-
-    String name = repository.getName();
-    WebResource wr = createResource(
-                         client,
-                         "repositories/".concat(repositoryType).concat(
-                           "/").concat(name));
-    ClientResponse response = wr.get(ClientResponse.class);
-
-    assertNotNull(response);
-
-    Repository r = response.getEntity(Repository.class);
-
-    response.close();
-    assertNotNull(r);
-    assertEquals(repository.getId(), r.getId());
-    assertEquals(repository.getName(), r.getName());
-    assertEquals(repository.getType(), r.getType());
-  }
-
-  //~--- fields ---------------------------------------------------------------
-
-  /** Field description */
-  private Repository repository;
-
-  /** Field description */
-  private String repositoryType;
-}

From f0794c9d151afe1843e3e7d5f4250ae37d619cbb Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Fri, 3 Aug 2018 09:54:04 +0200
Subject: [PATCH 28/51] implemented action and selectors for delete repository

---
 scm-ui/src/repos/modules/repos.js      |  79 ++++++++++++++++--
 scm-ui/src/repos/modules/repos.test.js | 107 ++++++++++++++++++++++++-
 2 files changed, 177 insertions(+), 9 deletions(-)

diff --git a/scm-ui/src/repos/modules/repos.js b/scm-ui/src/repos/modules/repos.js
index c96719efcb..8f401e00ce 100644
--- a/scm-ui/src/repos/modules/repos.js
+++ b/scm-ui/src/repos/modules/repos.js
@@ -16,12 +16,17 @@ export const FETCH_REPO_PENDING = `${FETCH_REPO}_${types.PENDING_SUFFIX}`;
 export const FETCH_REPO_SUCCESS = `${FETCH_REPO}_${types.SUCCESS_SUFFIX}`;
 export const FETCH_REPO_FAILURE = `${FETCH_REPO}_${types.FAILURE_SUFFIX}`;
 
-export const CREATE_REPO = "scm/repos/FETCH_REPO";
+export const CREATE_REPO = "scm/repos/CREATE_REPO";
 export const CREATE_REPO_PENDING = `${CREATE_REPO}_${types.PENDING_SUFFIX}`;
 export const CREATE_REPO_SUCCESS = `${CREATE_REPO}_${types.SUCCESS_SUFFIX}`;
 export const CREATE_REPO_FAILURE = `${CREATE_REPO}_${types.FAILURE_SUFFIX}`;
 export const CREATE_REPO_RESET = `${CREATE_REPO}_${types.RESET_SUFFIX}`;
 
+export const DELETE_REPO = "scm/repos/DELETE_REPO";
+export const DELETE_REPO_PENDING = `${DELETE_REPO}_${types.PENDING_SUFFIX}`;
+export const DELETE_REPO_SUCCESS = `${DELETE_REPO}_${types.SUCCESS_SUFFIX}`;
+export const DELETE_REPO_FAILURE = `${DELETE_REPO}_${types.FAILURE_SUFFIX}`;
+
 const REPOS_URL = "repositories";
 
 const CONTENT_TYPE = "application/vnd.scmm-repository+json;v=2";
@@ -183,6 +188,55 @@ export function createRepoReset(): Action {
   };
 }
 
+// delete
+
+export function deleteRepo(repository: Repository, callback?: () => void) {
+  return function(dispatch: any) {
+    dispatch(deleteRepoPending(repository));
+    return apiClient
+      .delete(repository._links.delete.href)
+      .then(() => {
+        dispatch(deleteRepoSuccess(repository));
+        if (callback) {
+          callback();
+        }
+      })
+      .catch(err => {
+        dispatch(deleteRepoFailure(repository, err));
+      });
+  };
+}
+
+export function deleteRepoPending(repository: Repository): Action {
+  return {
+    type: DELETE_REPO_PENDING,
+    payload: repository,
+    itemId: createIdentifier(repository)
+  };
+}
+
+export function deleteRepoSuccess(repository: Repository): Action {
+  return {
+    type: DELETE_REPO_SUCCESS,
+    payload: repository,
+    itemId: createIdentifier(repository)
+  };
+}
+
+export function deleteRepoFailure(
+  repository: Repository,
+  error: Error
+): Action {
+  return {
+    type: DELETE_REPO_FAILURE,
+    payload: {
+      error,
+      repository
+    },
+    itemId: createIdentifier(repository)
+  };
+}
+
 // reducer
 
 function createIdentifier(repository: Repository) {
@@ -289,15 +343,12 @@ export function getFetchRepoFailure(
 }
 
 export function isAbleToCreateRepos(state: Object) {
-  if (
+  return !!(
     state.repos &&
     state.repos.list &&
     state.repos.list._links &&
     state.repos.list._links.create
-  ) {
-    return true;
-  }
-  return false;
+  );
 }
 
 export function isCreateRepoPending(state: Object) {
@@ -307,3 +358,19 @@ export function isCreateRepoPending(state: Object) {
 export function getCreateRepoFailure(state: Object) {
   return getFailure(state, CREATE_REPO);
 }
+
+export function isDeleteRepoPending(
+  state: Object,
+  namespace: string,
+  name: string
+) {
+  return isPending(state, DELETE_REPO, namespace + "/" + name);
+}
+
+export function getDeleteRepoFailure(
+  state: Object,
+  namespace: string,
+  name: string
+) {
+  return getFailure(state, DELETE_REPO, namespace + "/" + name);
+}
diff --git a/scm-ui/src/repos/modules/repos.test.js b/scm-ui/src/repos/modules/repos.test.js
index c35d95c9a4..0544f56d16 100644
--- a/scm-ui/src/repos/modules/repos.test.js
+++ b/scm-ui/src/repos/modules/repos.test.js
@@ -30,7 +30,14 @@ import reducer, {
   isCreateRepoPending,
   CREATE_REPO,
   getCreateRepoFailure,
-  isAbleToCreateRepos
+  isAbleToCreateRepos,
+  DELETE_REPO,
+  DELETE_REPO_SUCCESS,
+  deleteRepo,
+  DELETE_REPO_PENDING,
+  DELETE_REPO_FAILURE,
+  isDeleteRepoPending,
+  getDeleteRepoFailure
 } from "./repos";
 import type { Repository, RepositoryCollection } from "../types/Repositories";
 
@@ -364,7 +371,9 @@ describe("repos fetch", () => {
   });
 
   it("should successfully create repo slarti/fjords", () => {
-    fetchMock.postOnce(REPOS_URL, slartiFjords);
+    fetchMock.postOnce(REPOS_URL, {
+      status: 201
+    });
 
     const expectedActions = [
       {
@@ -382,7 +391,6 @@ describe("repos fetch", () => {
   });
 
   it("should successfully create repo slarti/fjords and call the callback", () => {
-    // unmatched
     fetchMock.postOnce(REPOS_URL, {
       status: 201
     });
@@ -412,6 +420,71 @@ describe("repos fetch", () => {
       expect(actions[1].payload).toBeDefined();
     });
   });
+
+  it("should successfully delete repo slarti/fjords", () => {
+    fetchMock.delete(
+      "http://localhost:8081/scm/api/rest/v2/repositories/slarti/fjords",
+      {
+        status: 204
+      }
+    );
+
+    const expectedActions = [
+      {
+        type: DELETE_REPO_PENDING,
+        payload: slartiFjords,
+        itemId: "slarti/fjords"
+      },
+      {
+        type: DELETE_REPO_SUCCESS,
+        payload: slartiFjords,
+        itemId: "slarti/fjords"
+      }
+    ];
+
+    const store = mockStore({});
+    return store.dispatch(deleteRepo(slartiFjords)).then(() => {
+      expect(store.getActions()).toEqual(expectedActions);
+    });
+  });
+
+  it("should successfully delete repo slarti/fjords and call the callback", () => {
+    fetchMock.delete(
+      "http://localhost:8081/scm/api/rest/v2/repositories/slarti/fjords",
+      {
+        status: 204
+      }
+    );
+
+    let callMe = "not yet";
+
+    const callback = () => {
+      callMe = "yeah";
+    };
+
+    const store = mockStore({});
+    return store.dispatch(deleteRepo(slartiFjords, callback)).then(() => {
+      expect(callMe).toBe("yeah");
+    });
+  });
+
+  it("should disapatch failure on delete, if server returns status code 500", () => {
+    fetchMock.delete(
+      "http://localhost:8081/scm/api/rest/v2/repositories/slarti/fjords",
+      {
+        status: 500
+      }
+    );
+
+    const store = mockStore({});
+    return store.dispatch(deleteRepo(slartiFjords)).then(() => {
+      const actions = store.getActions();
+      expect(actions[0].type).toEqual(DELETE_REPO_PENDING);
+      expect(actions[1].type).toEqual(DELETE_REPO_FAILURE);
+      expect(actions[1].payload.repository).toBe(slartiFjords);
+      expect(actions[1].payload.error).toBeDefined();
+    });
+  });
 });
 
 describe("repos reducer", () => {
@@ -562,6 +635,34 @@ describe("repos selectors", () => {
     expect(getCreateRepoFailure({})).toBe(undefined);
   });
 
+  // delete
+
+  it("should return true, when delete repo is pending", () => {
+    const state = {
+      pending: {
+        [DELETE_REPO + "/slarti/fjords"]: true
+      }
+    };
+    expect(isDeleteRepoPending(state, "slarti", "fjords")).toEqual(true);
+  });
+
+  it("should return false, when delete repo is not pending", () => {
+    expect(isDeleteRepoPending({}, "slarti", "fjords")).toEqual(false);
+  });
+
+  it("should return error when delete repo did fail", () => {
+    const state = {
+      failure: {
+        [DELETE_REPO + "/slarti/fjords"]: error
+      }
+    };
+    expect(getDeleteRepoFailure(state, "slarti", "fjords")).toEqual(error);
+  });
+
+  it("should return undefined when delete repo did not fail", () => {
+    expect(getDeleteRepoFailure({}, "slarti", "fjords")).toBe(undefined);
+  });
+
   it("should return true if the list contains the create link", () => {
     const state = {
       repos: {

From e60bea5f08212287b69e41e9f2da9f72b77e904a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Fri, 3 Aug 2018 10:42:47 +0200
Subject: [PATCH 29/51] Simplify scm test parameters

---
 .../java/sonia/scm/it/RepositoriesITCase.java | 15 ++-----------
 .../ScmParameterizedIntegrationTestUtil.java  | 21 +++++++++++++++++++
 .../sonia/scm/it/IntegrationTestUtil.java     | 17 +++++----------
 .../sonia/scm/it/RepositoryHookITCase.java    |  2 +-
 .../sonia/scm/it/RepositoryITCaseBase.java    |  4 ++--
 .../scm/it/RepositoryTypeITCaseBase.java      |  2 +-
 6 files changed, 32 insertions(+), 29 deletions(-)
 create mode 100644 scm-it/src/test/java/sonia/scm/it/ScmParameterizedIntegrationTestUtil.java

diff --git a/scm-it/src/test/java/sonia/scm/it/RepositoriesITCase.java b/scm-it/src/test/java/sonia/scm/it/RepositoriesITCase.java
index 6e309e1ba6..f4d0b7586b 100644
--- a/scm-it/src/test/java/sonia/scm/it/RepositoriesITCase.java
+++ b/scm-it/src/test/java/sonia/scm/it/RepositoriesITCase.java
@@ -39,11 +39,9 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
-import sonia.scm.util.IOUtil;
 import sonia.scm.web.VndMediaType;
 
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.Collection;
 
 import static org.hamcrest.Matchers.equalTo;
@@ -64,17 +62,8 @@ public class RepositoriesITCase {
   }
 
   @Parameters(name = "{0}")
-  public static Collection<String[]> createParameters() {
-    Collection<String[]> params = new ArrayList<>();
-
-    params.add(new String[]{"git"});
-    params.add(new String[]{"svn"});
-
-    if (IOUtil.search("hg") != null) {
-      params.add(new String[]{"hg"});
-    }
-
-    return params;
+  public static Collection<String> createParameters() {
+    return ScmParameterizedIntegrationTestUtil.createParameters();
   }
 
   @After
diff --git a/scm-it/src/test/java/sonia/scm/it/ScmParameterizedIntegrationTestUtil.java b/scm-it/src/test/java/sonia/scm/it/ScmParameterizedIntegrationTestUtil.java
new file mode 100644
index 0000000000..d8b43aef30
--- /dev/null
+++ b/scm-it/src/test/java/sonia/scm/it/ScmParameterizedIntegrationTestUtil.java
@@ -0,0 +1,21 @@
+package sonia.scm.it;
+
+import sonia.scm.util.IOUtil;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+class ScmParameterizedIntegrationTestUtil {
+  static Collection<String> createParameters() {
+    Collection<String> params = new ArrayList<>();
+
+    params.add("git");
+    params.add("svn");
+
+    if (IOUtil.search("hg") != null) {
+      params.add("hg");
+    }
+
+    return params;
+  }
+}
diff --git a/scm-webapp/src/test/java/sonia/scm/it/IntegrationTestUtil.java b/scm-webapp/src/test/java/sonia/scm/it/IntegrationTestUtil.java
index 4db5896598..1f75f93d48 100644
--- a/scm-webapp/src/test/java/sonia/scm/it/IntegrationTestUtil.java
+++ b/scm-webapp/src/test/java/sonia/scm/it/IntegrationTestUtil.java
@@ -162,22 +162,15 @@ public final class IntegrationTestUtil
     client.getAddCommand().add(name);
   }
 
-  /**
-   * Method description
-   *
-   *
-   * @return
-   */
-  public static Collection<String[]> createRepositoryTypeParameters()
-  {
-    Collection<String[]> params = new ArrayList<>();
+  public static Collection<String> createRepositoryTypeParameters() {
+    Collection<String> params = new ArrayList<>();
 
-    params.add(new String[] { "git" });
-    params.add(new String[] { "svn" });
+    params.add("git");
+    params.add("svn" );
 
     if (IOUtil.search("hg") != null)
     {
-      params.add(new String[] { "hg" });
+      params.add("hg");
     }
 
     return params;
diff --git a/scm-webapp/src/test/java/sonia/scm/it/RepositoryHookITCase.java b/scm-webapp/src/test/java/sonia/scm/it/RepositoryHookITCase.java
index 6ba4d572b2..d6e8a0d2fe 100644
--- a/scm-webapp/src/test/java/sonia/scm/it/RepositoryHookITCase.java
+++ b/scm-webapp/src/test/java/sonia/scm/it/RepositoryHookITCase.java
@@ -200,7 +200,7 @@ public class RepositoryHookITCase extends AbstractAdminITCaseBase
    * @return repository types test parameter
    */
   @Parameters(name = "{0}")
-  public static Collection<String[]> createParameters()
+  public static Collection<String> createParameters()
   {
     return IntegrationTestUtil.createRepositoryTypeParameters();
   }
diff --git a/scm-webapp/src/test/java/sonia/scm/it/RepositoryITCaseBase.java b/scm-webapp/src/test/java/sonia/scm/it/RepositoryITCaseBase.java
index c227fb5e4b..06d1f1be8e 100644
--- a/scm-webapp/src/test/java/sonia/scm/it/RepositoryITCaseBase.java
+++ b/scm-webapp/src/test/java/sonia/scm/it/RepositoryITCaseBase.java
@@ -54,6 +54,7 @@ import static sonia.scm.it.IntegrationTestUtil.ADMIN_USERNAME;
 import static sonia.scm.it.IntegrationTestUtil.commit;
 import static sonia.scm.it.IntegrationTestUtil.createAdminClient;
 import static sonia.scm.it.IntegrationTestUtil.createRandomFile;
+import static sonia.scm.it.IntegrationTestUtil.createRepositoryTypeParameters;
 import static sonia.scm.it.IntegrationTestUtil.createResource;
 import static sonia.scm.it.IntegrationTestUtil.createTempDirectory;
 import static sonia.scm.it.IntegrationTestUtil.readJson;
@@ -200,8 +201,7 @@ public class RepositoryITCaseBase
     User noperm = UserTestData.createPerfect();
 
     createUser(noperm);
-    IntegrationTestUtil.createRepositoryTypeParameters().stream().map(array -> array[0])
-      .forEach(t -> appendTestParameter(params, t, owner, write, read, noperm));
+    createRepositoryTypeParameters().forEach(t -> appendTestParameter(params, t, owner, write, read, noperm));
 
     return params;
   }
diff --git a/scm-webapp/src/test/java/sonia/scm/it/RepositoryTypeITCaseBase.java b/scm-webapp/src/test/java/sonia/scm/it/RepositoryTypeITCaseBase.java
index 80ee615fc5..ab86edafd0 100644
--- a/scm-webapp/src/test/java/sonia/scm/it/RepositoryTypeITCaseBase.java
+++ b/scm-webapp/src/test/java/sonia/scm/it/RepositoryTypeITCaseBase.java
@@ -42,7 +42,7 @@ import java.util.Collection;
 
 public class RepositoryTypeITCaseBase {
   @Parameters(name = "{0}")
-  public static Collection<String[]> createParameters() {
+  public static Collection<String> createParameters() {
     return IntegrationTestUtil.createRepositoryTypeParameters();
   }
 }

From 8f4c48b3819196ddb90e788c24948783eaeda61e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Fri, 3 Aug 2018 13:52:54 +0200
Subject: [PATCH 30/51] Remove unused ME media type

---
 scm-core/src/main/java/sonia/scm/web/VndMediaType.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scm-core/src/main/java/sonia/scm/web/VndMediaType.java b/scm-core/src/main/java/sonia/scm/web/VndMediaType.java
index fa8f2dd5d5..7c764685f1 100644
--- a/scm-core/src/main/java/sonia/scm/web/VndMediaType.java
+++ b/scm-core/src/main/java/sonia/scm/web/VndMediaType.java
@@ -18,7 +18,6 @@ public class VndMediaType {
   public static final String USER_COLLECTION = PREFIX + "userCollection" + SUFFIX;
   public static final String GROUP_COLLECTION = PREFIX + "groupCollection" + SUFFIX;
   public static final String REPOSITORY_COLLECTION = PREFIX + "repositoryCollection" + SUFFIX;
-  public static final String ME = PREFIX + "me" + SUFFIX;
 
   public static final String CONFIG = PREFIX + "config" + SUFFIX;
 

From ffbfdff52e8888f7d14ce3b0353b7736f4620d0b Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Mon, 6 Aug 2018 10:08:28 +0200
Subject: [PATCH 31/51] finish delete implementation and restructure components

---
 scm-ui/public/locales/en/repos.json           |  9 +++
 .../src/repos/components/DeleteNavAction.js   | 59 ++++++++++++++
 .../repos/components/DeleteNavAction.test.js  | 79 +++++++++++++++++++
 .../components/{ => form}/RepositoryForm.js   | 10 +--
 scm-ui/src/repos/components/form/index.js     |  2 +
 .../{ => form}/repositoryValidation.js        |  2 +-
 .../{ => form}/repositoryValidation.test.js   |  0
 .../components/{ => list}/RepositoryEntry.js  |  6 +-
 .../{ => list}/RepositoryEntryLink.js         |  0
 .../{ => list}/RepositoryGroupEntry.js        |  2 +-
 .../components/{ => list}/RepositoryList.js   |  2 +-
 .../components/{ => list}/groupByNamespace.js |  2 +-
 .../{ => list}/groupByNamespace.test.js       |  0
 scm-ui/src/repos/components/list/index.js     |  2 +
 scm-ui/src/repos/containers/Create.js         |  2 +-
 scm-ui/src/repos/containers/Overview.js       |  2 +-
 scm-ui/src/repos/containers/RepositoryRoot.js | 18 +++++
 17 files changed, 183 insertions(+), 14 deletions(-)
 create mode 100644 scm-ui/src/repos/components/DeleteNavAction.js
 create mode 100644 scm-ui/src/repos/components/DeleteNavAction.test.js
 rename scm-ui/src/repos/components/{ => form}/RepositoryForm.js (92%)
 create mode 100644 scm-ui/src/repos/components/form/index.js
 rename scm-ui/src/repos/components/{ => form}/repositoryValidation.js (75%)
 rename scm-ui/src/repos/components/{ => form}/repositoryValidation.test.js (100%)
 rename scm-ui/src/repos/components/{ => list}/RepositoryEntry.js (94%)
 rename scm-ui/src/repos/components/{ => list}/RepositoryEntryLink.js (100%)
 rename scm-ui/src/repos/components/{ => list}/RepositoryGroupEntry.js (95%)
 rename scm-ui/src/repos/components/{ => list}/RepositoryList.js (90%)
 rename scm-ui/src/repos/components/{ => list}/groupByNamespace.js (91%)
 rename scm-ui/src/repos/components/{ => list}/groupByNamespace.test.js (100%)
 create mode 100644 scm-ui/src/repos/components/list/index.js

diff --git a/scm-ui/public/locales/en/repos.json b/scm-ui/public/locales/en/repos.json
index 76deba1c8a..e28ea3754c 100644
--- a/scm-ui/public/locales/en/repos.json
+++ b/scm-ui/public/locales/en/repos.json
@@ -28,5 +28,14 @@
   },
   "repository-form": {
     "submit": "Speichern"
+  },
+  "delete-nav-action": {
+    "label": "Delete",
+    "confirm-alert": {
+      "title": "Delete repository",
+      "message": "Do you really want to delete the repository?",
+      "submit": "Yes",
+      "cancel": "No"
+    }
   }
 }
diff --git a/scm-ui/src/repos/components/DeleteNavAction.js b/scm-ui/src/repos/components/DeleteNavAction.js
new file mode 100644
index 0000000000..0fd554f045
--- /dev/null
+++ b/scm-ui/src/repos/components/DeleteNavAction.js
@@ -0,0 +1,59 @@
+//@flow
+import React from "react";
+import { translate } from "react-i18next";
+import { confirmAlert } from "../../components/modals/ConfirmAlert";
+import { NavAction } from "../../components/navigation";
+import type { Repository } from "../types/Repositories";
+
+type Props = {
+  repository: Repository,
+  confirmDialog?: boolean,
+  delete: Repository => void,
+
+  // context props
+  t: string => string
+};
+
+class DeleteNavAction extends React.Component<Props> {
+  static defaultProps = {
+    confirmDialog: true
+  };
+
+  delete = () => {
+    this.props.delete(this.props.repository);
+  };
+
+  confirmDelete = () => {
+    const { t } = this.props;
+    confirmAlert({
+      title: t("delete-nav-action.confirm-alert.title"),
+      message: t("delete-nav-action.confirm-alert.message"),
+      buttons: [
+        {
+          label: t("delete-nav-action.confirm-alert.submit"),
+          onClick: () => this.delete()
+        },
+        {
+          label: t("delete-nav-action.confirm-alert.cancel"),
+          onClick: () => null
+        }
+      ]
+    });
+  };
+
+  isDeletable = () => {
+    return this.props.repository._links.delete;
+  };
+
+  render() {
+    const { confirmDialog, t } = this.props;
+    const action = confirmDialog ? this.confirmDelete : this.delete();
+
+    if (!this.isDeletable()) {
+      return null;
+    }
+    return <NavAction label={t("delete-nav-action.label")} action={action} />;
+  }
+}
+
+export default translate("repos")(DeleteNavAction);
diff --git a/scm-ui/src/repos/components/DeleteNavAction.test.js b/scm-ui/src/repos/components/DeleteNavAction.test.js
new file mode 100644
index 0000000000..635f84c7a9
--- /dev/null
+++ b/scm-ui/src/repos/components/DeleteNavAction.test.js
@@ -0,0 +1,79 @@
+import React from "react";
+import { mount, shallow } from "enzyme";
+import "../../tests/enzyme";
+import "../../tests/i18n";
+import DeleteNavAction from "./DeleteNavAction";
+
+import { confirmAlert } from "../../components/modals/ConfirmAlert";
+jest.mock("../../components/modals/ConfirmAlert");
+
+describe("DeleteNavAction", () => {
+  it("should render nothing, if the delete link is missing", () => {
+    const repository = {
+      _links: {}
+    };
+
+    const navLink = shallow(
+      <DeleteNavAction repository={repository} delete={() => {}} />
+    );
+    expect(navLink.text()).toBe("");
+  });
+
+  it("should render the navLink", () => {
+    const repository = {
+      _links: {
+        delete: {
+          href: "/repositories"
+        }
+      }
+    };
+
+    const navLink = mount(
+      <DeleteNavAction repository={repository} delete={() => {}} />
+    );
+    expect(navLink.text()).not.toBe("");
+  });
+
+  it("should open the confirm dialog on navLink click", () => {
+    const repository = {
+      _links: {
+        delete: {
+          href: "/repositorys"
+        }
+      }
+    };
+
+    const navLink = mount(
+      <DeleteNavAction repository={repository} delete={() => {}} />
+    );
+    navLink.find("a").simulate("click");
+
+    expect(confirmAlert.mock.calls.length).toBe(1);
+  });
+
+  it("should call the delete repository function with delete url", () => {
+    const repository = {
+      _links: {
+        delete: {
+          href: "/repos"
+        }
+      }
+    };
+
+    let calledUrl = null;
+    function capture(repository) {
+      calledUrl = repository._links.delete.href;
+    }
+
+    const navLink = mount(
+      <DeleteNavAction
+        repository={repository}
+        confirmDialog={false}
+        delete={capture}
+      />
+    );
+    navLink.find("a").simulate("click");
+
+    expect(calledUrl).toBe("/repos");
+  });
+});
diff --git a/scm-ui/src/repos/components/RepositoryForm.js b/scm-ui/src/repos/components/form/RepositoryForm.js
similarity index 92%
rename from scm-ui/src/repos/components/RepositoryForm.js
rename to scm-ui/src/repos/components/form/RepositoryForm.js
index 92741f1d83..bde5d20d3b 100644
--- a/scm-ui/src/repos/components/RepositoryForm.js
+++ b/scm-ui/src/repos/components/form/RepositoryForm.js
@@ -1,12 +1,12 @@
 // @flow
 import React from "react";
 import { translate } from "react-i18next";
-import { InputField, Select } from "../../components/forms";
-import { SubmitButton } from "../../components/buttons";
-import type { Repository } from "../types/Repositories";
+import { InputField, Select } from "../../../components/forms/index";
+import { SubmitButton } from "../../../components/buttons/index";
+import type { Repository } from "../../types/Repositories";
 import * as validator from "./repositoryValidation";
-import type { RepositoryType } from "../types/RepositoryTypes";
-import Textarea from "../../components/forms/Textarea";
+import type { RepositoryType } from "../../types/RepositoryTypes";
+import Textarea from "../../../components/forms/Textarea";
 
 type Props = {
   submitForm: Repository => void,
diff --git a/scm-ui/src/repos/components/form/index.js b/scm-ui/src/repos/components/form/index.js
new file mode 100644
index 0000000000..4af39bf51e
--- /dev/null
+++ b/scm-ui/src/repos/components/form/index.js
@@ -0,0 +1,2 @@
+import RepositoryForm from "./RepositoryForm";
+export default RepositoryForm;
diff --git a/scm-ui/src/repos/components/repositoryValidation.js b/scm-ui/src/repos/components/form/repositoryValidation.js
similarity index 75%
rename from scm-ui/src/repos/components/repositoryValidation.js
rename to scm-ui/src/repos/components/form/repositoryValidation.js
index d85b961c99..dbd099144f 100644
--- a/scm-ui/src/repos/components/repositoryValidation.js
+++ b/scm-ui/src/repos/components/form/repositoryValidation.js
@@ -1,5 +1,5 @@
 // @flow
-import * as generalValidator from "../../components/validation";
+import * as generalValidator from "../../../components/validation";
 
 export const isNameValid = (name: string) => {
   return generalValidator.isNameValid(name);
diff --git a/scm-ui/src/repos/components/repositoryValidation.test.js b/scm-ui/src/repos/components/form/repositoryValidation.test.js
similarity index 100%
rename from scm-ui/src/repos/components/repositoryValidation.test.js
rename to scm-ui/src/repos/components/form/repositoryValidation.test.js
diff --git a/scm-ui/src/repos/components/RepositoryEntry.js b/scm-ui/src/repos/components/list/RepositoryEntry.js
similarity index 94%
rename from scm-ui/src/repos/components/RepositoryEntry.js
rename to scm-ui/src/repos/components/list/RepositoryEntry.js
index eceed7c1ff..72ebd70d77 100644
--- a/scm-ui/src/repos/components/RepositoryEntry.js
+++ b/scm-ui/src/repos/components/list/RepositoryEntry.js
@@ -2,12 +2,12 @@
 import React from "react";
 import { Link } from "react-router-dom";
 import injectSheet from "react-jss";
-import type { Repository } from "../types/Repositories";
-import DateFromNow from "../../components/DateFromNow";
+import type { Repository } from "../../types/Repositories";
+import DateFromNow from "../../../components/DateFromNow";
 import RepositoryEntryLink from "./RepositoryEntryLink";
 import classNames from "classnames";
 
-import icon from "../../images/blib.jpg";
+import icon from "../../../images/blib.jpg";
 
 // TODO we need a variable or something central for the hover
 
diff --git a/scm-ui/src/repos/components/RepositoryEntryLink.js b/scm-ui/src/repos/components/list/RepositoryEntryLink.js
similarity index 100%
rename from scm-ui/src/repos/components/RepositoryEntryLink.js
rename to scm-ui/src/repos/components/list/RepositoryEntryLink.js
diff --git a/scm-ui/src/repos/components/RepositoryGroupEntry.js b/scm-ui/src/repos/components/list/RepositoryGroupEntry.js
similarity index 95%
rename from scm-ui/src/repos/components/RepositoryGroupEntry.js
rename to scm-ui/src/repos/components/list/RepositoryGroupEntry.js
index b0d145c338..09b3932b28 100644
--- a/scm-ui/src/repos/components/RepositoryGroupEntry.js
+++ b/scm-ui/src/repos/components/list/RepositoryGroupEntry.js
@@ -1,6 +1,6 @@
 //@flow
 import React from "react";
-import type { RepositoryGroup } from "../types/Repositories";
+import type { RepositoryGroup } from "../../types/Repositories";
 import injectSheet from "react-jss";
 import classNames from "classnames";
 import RepositoryEntry from "./RepositoryEntry";
diff --git a/scm-ui/src/repos/components/RepositoryList.js b/scm-ui/src/repos/components/list/RepositoryList.js
similarity index 90%
rename from scm-ui/src/repos/components/RepositoryList.js
rename to scm-ui/src/repos/components/list/RepositoryList.js
index c6a8d3b86c..367c054990 100644
--- a/scm-ui/src/repos/components/RepositoryList.js
+++ b/scm-ui/src/repos/components/list/RepositoryList.js
@@ -1,7 +1,7 @@
 //@flow
 import React from "react";
 
-import type { Repository } from "../types/Repositories";
+import type { Repository } from "../../types/Repositories";
 
 import groupByNamespace from "./groupByNamespace";
 import RepositoryGroupEntry from "./RepositoryGroupEntry";
diff --git a/scm-ui/src/repos/components/groupByNamespace.js b/scm-ui/src/repos/components/list/groupByNamespace.js
similarity index 91%
rename from scm-ui/src/repos/components/groupByNamespace.js
rename to scm-ui/src/repos/components/list/groupByNamespace.js
index 55dec92391..825fa5e67b 100644
--- a/scm-ui/src/repos/components/groupByNamespace.js
+++ b/scm-ui/src/repos/components/list/groupByNamespace.js
@@ -1,5 +1,5 @@
 // @flow
-import type { Repository, RepositoryGroup } from "../types/Repositories";
+import type { Repository, RepositoryGroup } from "../../types/Repositories";
 
 export default function groupByNamespace(
   repositories: Repository[]
diff --git a/scm-ui/src/repos/components/groupByNamespace.test.js b/scm-ui/src/repos/components/list/groupByNamespace.test.js
similarity index 100%
rename from scm-ui/src/repos/components/groupByNamespace.test.js
rename to scm-ui/src/repos/components/list/groupByNamespace.test.js
diff --git a/scm-ui/src/repos/components/list/index.js b/scm-ui/src/repos/components/list/index.js
new file mode 100644
index 0000000000..62c264cb7b
--- /dev/null
+++ b/scm-ui/src/repos/components/list/index.js
@@ -0,0 +1,2 @@
+import RepositoryList from "./RepositoryList";
+export default RepositoryList;
diff --git a/scm-ui/src/repos/containers/Create.js b/scm-ui/src/repos/containers/Create.js
index 664f7e2d1b..b705788d1d 100644
--- a/scm-ui/src/repos/containers/Create.js
+++ b/scm-ui/src/repos/containers/Create.js
@@ -3,7 +3,7 @@ import React from "react";
 import { connect } from "react-redux";
 import { translate } from "react-i18next";
 import { Page } from "../../components/layout";
-import RepositoryForm from "../components/RepositoryForm";
+import RepositoryForm from "../components/form";
 import type { RepositoryType } from "../types/RepositoryTypes";
 import {
   fetchRepositoryTypesIfNeeded,
diff --git a/scm-ui/src/repos/containers/Overview.js b/scm-ui/src/repos/containers/Overview.js
index 54d90a354a..f4b49ed8d2 100644
--- a/scm-ui/src/repos/containers/Overview.js
+++ b/scm-ui/src/repos/containers/Overview.js
@@ -15,7 +15,7 @@ import {
 } from "../modules/repos";
 import { translate } from "react-i18next";
 import { Page } from "../../components/layout";
-import RepositoryList from "../components/RepositoryList";
+import RepositoryList from "../components/list";
 import Paginator from "../../components/Paginator";
 import { withRouter } from "react-router-dom";
 import type { History } from "history";
diff --git a/scm-ui/src/repos/containers/RepositoryRoot.js b/scm-ui/src/repos/containers/RepositoryRoot.js
index ccc75ad05c..97390aaa52 100644
--- a/scm-ui/src/repos/containers/RepositoryRoot.js
+++ b/scm-ui/src/repos/containers/RepositoryRoot.js
@@ -1,6 +1,7 @@
 //@flow
 import React from "react";
 import {
+  deleteRepo,
   fetchRepo,
   getFetchRepoFailure,
   getRepository,
@@ -15,6 +16,9 @@ import ErrorPage from "../../components/ErrorPage";
 import { translate } from "react-i18next";
 import { Navigation, NavLink, Section } from "../../components/navigation";
 import RepositoryDetails from "../components/RepositoryDetails";
+import DeleteNavAction from "../components/DeleteNavAction";
+
+import type { History } from "history";
 
 type Props = {
   namespace: string,
@@ -25,9 +29,11 @@ type Props = {
 
   // dispatch functions
   fetchRepo: (namespace: string, name: string) => void,
+  deleteRepo: (repository: Repository, () => void) => void,
 
   // context props
   t: string => string,
+  history: History,
   match: any
 };
 
@@ -49,6 +55,14 @@ class RepositoryRoot extends React.Component<Props> {
     return this.stripEndingSlash(this.props.match.url);
   };
 
+  deleted = () => {
+    this.props.history.push("/repos");
+  };
+
+  delete = (repository: Repository) => {
+    this.props.deleteRepo(repository, this.deleted);
+  };
+
   render() {
     const { loading, error, repository, t } = this.props;
 
@@ -81,6 +95,7 @@ class RepositoryRoot extends React.Component<Props> {
           <div className="column">
             <Navigation>
               <Section label={t("repository-root.actions-label")}>
+                <DeleteNavAction repository={repository} delete={this.delete} />
                 <NavLink to="/repos" label={t("repository-root.back-label")} />
               </Section>
             </Navigation>
@@ -109,6 +124,9 @@ const mapDispatchToProps = dispatch => {
   return {
     fetchRepo: (namespace: string, name: string) => {
       dispatch(fetchRepo(namespace, name));
+    },
+    deleteRepo: (repository: Repository, callback: () => void) => {
+      dispatch(deleteRepo(repository, callback));
     }
   };
 };

From 83005bebf4ff0a6b7e2483c9e45062ebbfc12614 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Mon, 6 Aug 2018 11:11:44 +0200
Subject: [PATCH 32/51] Use namespace and name instead of id in repository
 hooks

---
 .../main/java/sonia/scm/debug/DebugHook.java  |   5 +-
 .../java/sonia/scm/debug/DebugResource.java   |  24 ++--
 .../java/sonia/scm/debug/DebugService.java    |  30 ++---
 .../sonia/scm/it/RepositoryHookITCase.java    |  34 +++--
 .../scm/it/RepositoryHttpCacheITCase.java     | 119 ------------------
 .../java/sonia/scm/it/RepositoryITUtil.java   |   1 +
 6 files changed, 49 insertions(+), 164 deletions(-)
 delete mode 100644 scm-webapp/src/test/java/sonia/scm/it/RepositoryHttpCacheITCase.java

diff --git a/scm-webapp/src/main/java/sonia/scm/debug/DebugHook.java b/scm-webapp/src/main/java/sonia/scm/debug/DebugHook.java
index d75b455a95..7fe813159a 100644
--- a/scm-webapp/src/main/java/sonia/scm/debug/DebugHook.java
+++ b/scm-webapp/src/main/java/sonia/scm/debug/DebugHook.java
@@ -34,13 +34,14 @@ import com.github.legman.ReferenceType;
 import com.github.legman.Subscribe;
 import com.google.common.base.Function;
 import com.google.common.collect.Collections2;
-import javax.inject.Inject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import sonia.scm.EagerSingleton;
 import sonia.scm.repository.Changeset;
 import sonia.scm.repository.PostReceiveRepositoryHookEvent;
 
+import javax.inject.Inject;
+
 /**
  * {@link PostReceiveRepositoryHookEvent} which stores receives data and passes it to the {@link DebugService}.
  * 
@@ -78,7 +79,7 @@ public final class DebugHook
     LOG.trace("store changeset ids from repository", event.getRepository().getId());
     
     debugService.put(
-      event.getRepository().getId(), 
+      event.getRepository().getNamespaceAndName(),
       new DebugHookData(Collections2.transform(
         event.getContext().getChangesetProvider().getChangesetList(), IDEXTRACTOR)
       ));
diff --git a/scm-webapp/src/main/java/sonia/scm/debug/DebugResource.java b/scm-webapp/src/main/java/sonia/scm/debug/DebugResource.java
index 0933242b49..6ee035bf01 100644
--- a/scm-webapp/src/main/java/sonia/scm/debug/DebugResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/debug/DebugResource.java
@@ -30,20 +30,22 @@
  */
 package sonia.scm.debug;
 
-import java.util.Collection;
+import sonia.scm.repository.NamespaceAndName;
+
 import javax.inject.Inject;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
+import java.util.Collection;
 
 /**
  * Rest api resource for the {@link DebugService}.
  * 
  * @author Sebastian Sdorra
  */
-@Path("debug/{repository}/post-receive")
+@Path("debug/{namespace}/{name}/post-receive")
 public final class DebugResource
 {
   private final DebugService debugService;
@@ -62,28 +64,30 @@ public final class DebugResource
   /**
    * Returns all received hook data for the given repository.
    * 
-   * @param repository repository id
-   * 
+   * @param namespace repository namespace
+   * @param name repository name
+   *
    * @return all received hook data for the given repository
    */
   @GET
   @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-  public Collection<DebugHookData> getAll(@PathParam("repository") String repository){
-    return debugService.getAll(repository);
+  public Collection<DebugHookData> getAll(@PathParam("namespace") String namespace, @PathParam("name") String name){
+    return debugService.getAll(new NamespaceAndName(namespace, name));
   }
   
   /**
    * Returns the last received hook data for the given repository.
-   * 
-   * @param repository repository id
+   *
+   * @param namespace repository namespace
+   * @param name repository name
    * 
    * @return the last received hook data for the given repository
    */
   @GET
   @Path("last")
   @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-  public DebugHookData getLast(@PathParam("repository") String repository){
-    return debugService.getLast(repository);
+  public DebugHookData getLast(@PathParam("namespace") String namespace, @PathParam("name") String name){
+    return debugService.getLast(new NamespaceAndName(namespace, name));
   }
   
 }
diff --git a/scm-webapp/src/main/java/sonia/scm/debug/DebugService.java b/scm-webapp/src/main/java/sonia/scm/debug/DebugService.java
index 31282b6b08..8e2475d802 100644
--- a/scm-webapp/src/main/java/sonia/scm/debug/DebugService.java
+++ b/scm-webapp/src/main/java/sonia/scm/debug/DebugService.java
@@ -34,10 +34,12 @@ import com.google.common.collect.Iterables;
 import com.google.common.collect.LinkedListMultimap;
 import com.google.common.collect.Multimap;
 import com.google.inject.Singleton;
-import java.util.Collection;
 import org.apache.shiro.SecurityUtils;
+import sonia.scm.repository.NamespaceAndName;
 import sonia.scm.security.Role;
 
+import java.util.Collection;
+
 /**
  * The DebugService stores and returns received data from repository hook events.
  *
@@ -47,30 +49,23 @@ import sonia.scm.security.Role;
 public final class DebugService
 {
 
-  private final Multimap<String,DebugHookData> receivedHooks = LinkedListMultimap.create();
+  private final Multimap<NamespaceAndName,DebugHookData> receivedHooks = LinkedListMultimap.create();
 
   /**
    * Stores {@link DebugHookData} for the given repository.
-   * 
-   * @param repository repository id
-   * @param hookData received hook data
    */
-  void put(String repository, DebugHookData hookData)
+  void put(NamespaceAndName namespaceAndName, DebugHookData hookData)
   {
-    receivedHooks.put(repository, hookData);
+    receivedHooks.put(namespaceAndName, hookData);
   }
   
   /**
    * Returns the last received hook data for the given repository.
-   * 
-   * @param repository repository id
-   * 
-   * @return the last received hook data for the given repository
    */
-  public DebugHookData getLast(String repository){
+  public DebugHookData getLast(NamespaceAndName namespaceAndName){
     SecurityUtils.getSubject().checkRole(Role.ADMIN);
     DebugHookData hookData = null;
-    Collection<DebugHookData> receivedHookData = receivedHooks.get(repository);
+    Collection<DebugHookData> receivedHookData = receivedHooks.get(namespaceAndName);
     if (receivedHookData != null && ! receivedHookData.isEmpty()){
       hookData = Iterables.getLast(receivedHookData);
     }
@@ -79,14 +74,9 @@ public final class DebugService
   
   /**
    * Returns all received hook data for the given repository.
-   * 
-   * @param repository repository id
-   * 
-   * @return all received hook data for the given repository
    */
-  public Collection<DebugHookData> getAll(String repository){
+  public Collection<DebugHookData> getAll(NamespaceAndName namespaceAndName){
     SecurityUtils.getSubject().checkRole(Role.ADMIN);
-    return receivedHooks.get(repository);
+    return receivedHooks.get(namespaceAndName);
   }
-  
 }
diff --git a/scm-webapp/src/test/java/sonia/scm/it/RepositoryHookITCase.java b/scm-webapp/src/test/java/sonia/scm/it/RepositoryHookITCase.java
index d6e8a0d2fe..2be3bfd81b 100644
--- a/scm-webapp/src/test/java/sonia/scm/it/RepositoryHookITCase.java
+++ b/scm-webapp/src/test/java/sonia/scm/it/RepositoryHookITCase.java
@@ -32,6 +32,7 @@ package sonia.scm.it;
 
 import com.google.common.base.Charsets;
 import com.google.common.io.Files;
+import com.sun.jersey.api.client.WebResource;
 import org.junit.After;
 import org.junit.Assume;
 import org.junit.Before;
@@ -42,6 +43,7 @@ import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 import sonia.scm.api.v2.resources.RepositoryDto;
+import sonia.scm.debug.DebugHookData;
 import sonia.scm.repository.Changeset;
 import sonia.scm.repository.Person;
 import sonia.scm.repository.client.api.ClientCommand;
@@ -52,6 +54,12 @@ import java.io.File;
 import java.io.IOException;
 import java.util.Collection;
 
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.core.AllOf.allOf;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThat;
+import static sonia.scm.it.IntegrationTestUtil.createResource;
 import static sonia.scm.it.IntegrationTestUtil.readJson;
 import static sonia.scm.it.RepositoryITUtil.createRepository;
 import static sonia.scm.it.RepositoryITUtil.deleteRepository;
@@ -129,10 +137,10 @@ public class RepositoryHookITCase extends AbstractAdminITCaseBase
     Thread.sleep(WAIT_TIME);
     
     // check debug servlet for pushed commit
-//    WebResource wr = createResource(client, "debug/" + repository.getId() + "/post-receive/last");
-//    DebugHookData data = wr.get(DebugHookData.class);
-//    assertNotNull(data);
-//    assertThat(data.getChangesets(), contains(changeset.getId()));
+    WebResource.Builder wr = createResource(client, "../debug/" + repository.getNamespace() + "/" + repository.getName() + "/post-receive/last");
+    DebugHookData data = wr.get(DebugHookData.class);
+    assertNotNull(data);
+    assertThat(data.getChangesets(), contains(changeset.getId()));
   }
   
   /**
@@ -164,15 +172,15 @@ public class RepositoryHookITCase extends AbstractAdminITCaseBase
     Thread.sleep(WAIT_TIME);
     
     // check debug servlet that only one commit is present
-//    WebResource wr = createResource(client, "debug/" + repository.getId() + "/post-receive/last");
-//    DebugHookData data = wr.get(DebugHookData.class);
-//    assertNotNull(data);
-//    assertThat(data.getChangesets(), allOf(
-//      contains(b.getId()),
-//      not(
-//        contains(a.getId())
-//      )
-//    ));
+    WebResource.Builder wr = createResource(client, "../debug/" + repository.getNamespace() + "/" + repository.getName() + "/post-receive/last");
+    DebugHookData data = wr.get(DebugHookData.class);
+    assertNotNull(data);
+    assertThat(data.getChangesets(), allOf(
+      contains(b.getId()),
+      not(
+        contains(a.getId())
+      )
+    ));
   }
   
   private Changeset commit(String message) throws IOException {
diff --git a/scm-webapp/src/test/java/sonia/scm/it/RepositoryHttpCacheITCase.java b/scm-webapp/src/test/java/sonia/scm/it/RepositoryHttpCacheITCase.java
deleted file mode 100644
index 7f22366ecb..0000000000
--- a/scm-webapp/src/test/java/sonia/scm/it/RepositoryHttpCacheITCase.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/**
- * Copyright (c) 2010, Sebastian Sdorra
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 3. Neither the name of SCM-Manager; nor the names of its
- *    contributors may be used to endorse or promote products derived from this
- *    software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * http://bitbucket.org/sdorra/scm-manager
- *
- */
-
-
-package sonia.scm.it;
-
-//~--- non-JDK imports --------------------------------------------------------
-
-import com.sun.jersey.api.client.ClientResponse;
-import com.sun.jersey.api.client.WebResource;
-import org.junit.Ignore;
-import sonia.scm.repository.Repository;
-import sonia.scm.repository.RepositoryTestData;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static sonia.scm.it.IntegrationTestUtil.createAdminClient;
-import static sonia.scm.it.IntegrationTestUtil.createResource;
-
-//~--- JDK imports ------------------------------------------------------------
-
-/**
- *
- * @author Sebastian Sdorra
- */
-@Ignore()
-public class RepositoryHttpCacheITCase extends HttpCacheITCaseBase<Repository>
-{
-
-  /**
-   * Method description
-   *
-   *
-   * @return
-   */
-  @Override
-  protected Repository createSampleItem()
-  {
-    Repository repository = RepositoryTestData.createHeartOfGold("git");
-    ScmClient client = createAdminClient();
-    WebResource.Builder resource = createResource(client, "repositories");
-    ClientResponse response = resource.post(ClientResponse.class, repository);
-
-    assertNotNull(response);
-    assertEquals(201, response.getStatus());
-
-    String location = response.getHeaders().get("Location").get(0);
-
-    assertNotNull(location);
-    response = client.resource(location).get(ClientResponse.class);
-    assertNotNull(response);
-    assertEquals(200, response.getStatus());
-    repository = response.getEntity(Repository.class);
-    assertNotNull(repository);
-    assertNotNull(repository.getId());
-
-    return repository;
-  }
-
-  /**
-   * Method description
-   *
-   *
-   * @param item
-   */
-  @Override
-  protected void destroy(Repository item)
-  {
-    ScmClient client = createAdminClient();
-    WebResource.Builder resource = createResource(client,
-                             "repositories/".concat(item.getId()));
-    ClientResponse response = resource.delete(ClientResponse.class);
-
-    assertNotNull(response);
-    assertEquals(204, response.getStatus());
-  }
-
-  //~--- get methods ----------------------------------------------------------
-
-  /**
-   * Method description
-   *
-   *
-   * @return
-   */
-  @Override
-  protected String getCollectionUrlPart()
-  {
-    return "repositories";
-  }
-}
diff --git a/scm-webapp/src/test/java/sonia/scm/it/RepositoryITUtil.java b/scm-webapp/src/test/java/sonia/scm/it/RepositoryITUtil.java
index 05915f3b67..9284beebd0 100644
--- a/scm-webapp/src/test/java/sonia/scm/it/RepositoryITUtil.java
+++ b/scm-webapp/src/test/java/sonia/scm/it/RepositoryITUtil.java
@@ -76,6 +76,7 @@ public final class RepositoryITUtil
 
     assertNotNull(other);
     assertNotNull(other.getType());
+    assertNotNull(other.getNamespace());
     assertNotNull(other.getCreationDate());
 
     return other;

From 1f1ecb6f9b167788fd08e5376205d29fde84c7b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Mon, 6 Aug 2018 11:27:56 +0200
Subject: [PATCH 33/51] Delete cache integration tests

---
 .../sonia/scm/it/HttpCacheITCaseBase.java     | 244 ------------------
 .../scm/it/RepositoryExtendedITCase.java      | 183 -------------
 2 files changed, 427 deletions(-)
 delete mode 100644 scm-webapp/src/test/java/sonia/scm/it/HttpCacheITCaseBase.java
 delete mode 100644 scm-webapp/src/test/java/sonia/scm/it/RepositoryExtendedITCase.java

diff --git a/scm-webapp/src/test/java/sonia/scm/it/HttpCacheITCaseBase.java b/scm-webapp/src/test/java/sonia/scm/it/HttpCacheITCaseBase.java
deleted file mode 100644
index c2b43465c3..0000000000
--- a/scm-webapp/src/test/java/sonia/scm/it/HttpCacheITCaseBase.java
+++ /dev/null
@@ -1,244 +0,0 @@
-/**
- * Copyright (c) 2010, Sebastian Sdorra
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 3. Neither the name of SCM-Manager; nor the names of its
- *    contributors may be used to endorse or promote products derived from this
- *    software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * http://bitbucket.org/sdorra/scm-manager
- *
- */
-
-
-
-package sonia.scm.it;
-
-//~--- non-JDK imports --------------------------------------------------------
-
-import com.sun.jersey.api.client.ClientResponse;
-import com.sun.jersey.api.client.WebResource;
-import org.junit.After;
-import org.junit.Test;
-
-import javax.ws.rs.core.EntityTag;
-import java.util.Date;
-
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.not;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-import static sonia.scm.it.IntegrationTestUtil.createAdminClient;
-import static sonia.scm.it.IntegrationTestUtil.createResource;
-
-//~--- JDK imports ------------------------------------------------------------
-
-/**
- *
- * @author Sebastian Sdorra
- *
- * @param <T>
- */
-public abstract class HttpCacheITCaseBase<T>
-{
-
-  /**
-   * Method description
-   *
-   *
-   * @return
-   */
-  protected abstract T createSampleItem();
-
-  /**
-   * Method description
-   *
-   *
-   * @param item
-   */
-  protected abstract void destroy(T item);
-
-  //~--- get methods ----------------------------------------------------------
-
-  /**
-   * Method description
-   *
-   *
-   * @return
-   */
-  protected abstract String getCollectionUrlPart();
-
-  //~--- methods --------------------------------------------------------------
-
-  /**
-   * Method description
-   *
-   */
-  @Test
-  public void changingCollectionETagTest()
-  {
-    ClientResponse response = getCollectionResponse();
-    String etag = getETag(response);
-
-    item = createSampleItem();
-    response = getCollectionResponse();
-
-    String otherEtag = getETag(response);
-
-    assertThat(etag, not(equalTo(otherEtag)));
-  }
-
-  /**
-   * Method description
-   *
-   *
-   * @throws InterruptedException
-   */
-  @Test
-  public void changingCollectionLastModifiedTest() throws InterruptedException
-  {
-    ClientResponse response = getCollectionResponse();
-    long lastModified = getLastModified(response);
-
-    // wait 1 second because http date is not millisecond precision
-    Thread.sleep(1000l);
-    item = createSampleItem();
-    response = getCollectionResponse();
-
-    long otherLastModified = getLastModified(response);
-
-    assertNotEquals(lastModified, otherLastModified);
-  }
-
-  /**
-   * Method description
-   *
-   */
-  @After
-  public void cleanup()
-  {
-    if (item != null)
-    {
-      destroy(item);
-    }
-  }
-
-  /**
-   * Method description
-   *
-   */
-  @Test
-  public void simpleCollectionETagTest()
-  {
-    ClientResponse response = getCollectionResponse();
-    String etag = getETag(response);
-
-    response = getCollectionResponse();
-
-    String otherEtag = getETag(response);
-
-    assertEquals(etag, otherEtag);
-  }
-
-  /**
-   * Method description
-   *
-   */
-  @Test
-  public void simpleCollectionLastModifiedTest()
-  {
-    ClientResponse response = getCollectionResponse();
-    long lastModified = getLastModified(response);
-
-    response = getCollectionResponse();
-
-    long otherLastModified = getLastModified(response);
-
-    assertEquals(lastModified, otherLastModified);
-  }
-
-  //~--- get methods ----------------------------------------------------------
-
-  /**
-   * Method description
-   *
-   *
-   * @return
-   */
-  private ClientResponse getCollectionResponse()
-  {
-    ScmClient client = createAdminClient();
-    WebResource.Builder resource = createResource(client, getCollectionUrlPart());
-    ClientResponse response = resource.get(ClientResponse.class);
-
-    assertEquals(200, response.getStatus());
-
-    return response;
-  }
-
-  /**
-   * Method description
-   *
-   *
-   * @param response
-   *
-   * @return
-   */
-  private String getETag(ClientResponse response)
-  {
-    EntityTag e = response.getEntityTag();
-
-    assertNotNull(e);
-
-    String value = e.getValue();
-
-    assertNotNull(value);
-    assertTrue(value.length() > 0);
-
-    return value;
-  }
-
-  /**
-   * Method description
-   *
-   *
-   * @param response
-   *
-   * @return
-   */
-  private long getLastModified(ClientResponse response)
-  {
-    Date lastModified = response.getLastModified();
-
-    assertNotNull(lastModified);
-
-    return lastModified.getTime();
-  }
-
-  //~--- fields ---------------------------------------------------------------
-
-  /** Field description */
-  private T item;
-}
diff --git a/scm-webapp/src/test/java/sonia/scm/it/RepositoryExtendedITCase.java b/scm-webapp/src/test/java/sonia/scm/it/RepositoryExtendedITCase.java
deleted file mode 100644
index 7ddaf8d7b1..0000000000
--- a/scm-webapp/src/test/java/sonia/scm/it/RepositoryExtendedITCase.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/**
- * Copyright (c) 2010, Sebastian Sdorra
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 3. Neither the name of SCM-Manager; nor the names of its
- *    contributors may be used to endorse or promote products derived from this
- *    software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * http://bitbucket.org/sdorra/scm-manager
- *
- */
-
-
-
-package sonia.scm.it;
-
-//~--- non-JDK imports --------------------------------------------------------
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import sonia.scm.api.v2.resources.RepositoryDto;
-import sonia.scm.repository.client.api.RepositoryClient;
-import sonia.scm.repository.client.api.RepositoryClientException;
-import sonia.scm.user.User;
-import sonia.scm.util.IOUtil;
-
-import java.io.File;
-import java.io.IOException;
-
-import static org.junit.Assert.fail;
-import static sonia.scm.it.IntegrationTestUtil.createTempDirectory;
-
-//~--- JDK imports ------------------------------------------------------------
-
-/**
- *
- * @author Sebastian Sdorra
- */
-@RunWith(Parameterized.class)
-@Ignore("permissions not yet implemented -- see RepositoryITCaseBase#createTestRepository")
-public class RepositoryExtendedITCase extends RepositoryITCaseBase
-{
-
-  /**
-   * Constructs ...
-   *
-   *
-   * @param repository
-   * @param owner
-   * @param write
-   * @param read
-   * @param noperm
-   * @param password
-   */
-  public RepositoryExtendedITCase(RepositoryDto repository, User owner,
-    User write, User read, User noperm,
-    String password, String ignore_testCaseName)
-  {
-    super(repository, owner, write, read, noperm, password);
-  }
-
-  //~--- methods --------------------------------------------------------------
-
-  /**
-   * Method description
-   *
-   *
-   * @throws IOException
-   */
-  @After
-  public void cleanupTest() throws IOException
-  {
-    IOUtil.delete(directory);
-  }
-
-  /**
-   * Method description
-   *
-   *
-   * @throws IOException
-   */
-  @Test(expected = RepositoryClientException.class)
-  public void readFailed() throws IOException
-  {
-    RepositoryClient rc = createRepositoryClient(nopermUser, directory);
-
-    // rc.checkout();
-
-    // ugly workaround
-    if (repository.getType().equals("git"))
-    {
-      for (File f : directory.listFiles())
-      {
-        if (!".git".equals(f.getName()))
-        {
-          fail("checkout works");
-        }
-      }
-
-      throw new IOException("checkout failed");
-    }
-  }
-
-  /**
-   * Method description
-   *
-   */
-  @Before
-  public void setupTest()
-  {
-    directory = createTempDirectory();
-  }
-
-  /**
-   * Method description
-   *
-   *
-   * @throws IOException
-   */
-  @Test
-  public void simpleRead() throws IOException
-  {
-    RepositoryClient rc = createRepositoryClient(readUser, directory);
-
-    // rc.checkout();
-  }
-
-  /**
-   * Method description
-   *
-   * @throws IOException
-   */
-  @Test
-  public void simpleWrite() throws IOException
-  {
-    RepositoryClient rc = createRepositoryClient(writeUser, directory);
-
-    // rc.checkout();
-    addTestFiles(rc);
-  }
-
-  /**
-   * Method description
-   *
-   * @throws IOException
-   */
-  @Test(expected = IOException.class)
-  public void writeFailed() throws IOException
-  {
-    RepositoryClient rc = createRepositoryClient(readUser, directory);
-
-    // rc.checkout();
-    addTestFiles(rc);
-  }
-
-  //~--- fields ---------------------------------------------------------------
-
-  /** Field description */
-  private File directory;
-}

From 2316e5ea7e5fe229c315ed96d69518eb21f07ec0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Mon, 6 Aug 2018 11:28:12 +0200
Subject: [PATCH 34/51] Cleanup repository archive integration test

---
 .../sonia/scm/it/RepositoryArchiveITCase.java | 16 +++----
 .../scm/it/RepositoryTypeITCaseBase.java      | 48 -------------------
 2 files changed, 7 insertions(+), 57 deletions(-)
 delete mode 100644 scm-webapp/src/test/java/sonia/scm/it/RepositoryTypeITCaseBase.java

diff --git a/scm-webapp/src/test/java/sonia/scm/it/RepositoryArchiveITCase.java b/scm-webapp/src/test/java/sonia/scm/it/RepositoryArchiveITCase.java
index 9539be674f..4cf7cd6571 100644
--- a/scm-webapp/src/test/java/sonia/scm/it/RepositoryArchiveITCase.java
+++ b/scm-webapp/src/test/java/sonia/scm/it/RepositoryArchiveITCase.java
@@ -33,7 +33,6 @@
 
 package sonia.scm.it;
 
-//~--- non-JDK imports --------------------------------------------------------
 
 import com.sun.jersey.api.client.ClientResponse;
 import com.sun.jersey.api.client.WebResource;
@@ -48,6 +47,7 @@ import sonia.scm.web.VndMediaType;
 
 import javax.ws.rs.core.MediaType;
 import java.net.URI;
+import java.util.Collection;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -59,15 +59,12 @@ import static sonia.scm.it.IntegrationTestUtil.serialize;
 import static sonia.scm.it.RepositoryITUtil.createRepository;
 import static sonia.scm.it.RepositoryITUtil.deleteRepository;
 
-//~--- JDK imports ------------------------------------------------------------
-
-
 /**
  *
  * @author Sebastian Sdorra
  */
 @RunWith(Parameterized.class)
-public class RepositoryArchiveITCase extends RepositoryTypeITCaseBase
+public class RepositoryArchiveITCase
 {
 
   /**
@@ -83,6 +80,11 @@ public class RepositoryArchiveITCase extends RepositoryTypeITCaseBase
 
   //~--- methods --------------------------------------------------------------
 
+  @Parameterized.Parameters(name = "{0}")
+  public static Collection<String> createParameters() {
+    return IntegrationTestUtil.createRepositoryTypeParameters();
+  }
+
   /**
    * Method description
    *
@@ -148,8 +150,6 @@ public class RepositoryArchiveITCase extends RepositoryTypeITCaseBase
     response.close();
   }
 
-  //~--- set methods ----------------------------------------------------------
-
   /**
    * Method description
    *
@@ -170,8 +170,6 @@ public class RepositoryArchiveITCase extends RepositoryTypeITCaseBase
     assertEquals(204, resp.getStatus());
   }
 
-  //~--- fields ---------------------------------------------------------------
-
   /** Field description */
   private ScmClient client;
 
diff --git a/scm-webapp/src/test/java/sonia/scm/it/RepositoryTypeITCaseBase.java b/scm-webapp/src/test/java/sonia/scm/it/RepositoryTypeITCaseBase.java
deleted file mode 100644
index ab86edafd0..0000000000
--- a/scm-webapp/src/test/java/sonia/scm/it/RepositoryTypeITCaseBase.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * Copyright (c) 2010, Sebastian Sdorra
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 3. Neither the name of SCM-Manager; nor the names of its
- *    contributors may be used to endorse or promote products derived from this
- *    software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * http://bitbucket.org/sdorra/scm-manager
- *
- */
-
-
-package sonia.scm.it;
-
-//~--- non-JDK imports --------------------------------------------------------
-
-import org.junit.runners.Parameterized.Parameters;
-
-import java.util.Collection;
-
-//~--- JDK imports ------------------------------------------------------------
-
-public class RepositoryTypeITCaseBase {
-  @Parameters(name = "{0}")
-  public static Collection<String> createParameters() {
-    return IntegrationTestUtil.createRepositoryTypeParameters();
-  }
-}

From c87179e68665902a865964462f7f0ff0305eef86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Mon, 6 Aug 2018 11:53:45 +0200
Subject: [PATCH 35/51] Build json in integration test via java ee builder

---
 scm-it/pom.xml                                | 11 ++++
 .../java/sonia/scm/it/RepositoriesITCase.java | 50 ++++++++++-------
 .../src/test/java/sonia/scm/it/RestUtil.java  | 55 ++-----------------
 scm-it/src/test/resources/repository-git.json |  7 ---
 scm-it/src/test/resources/repository-hg.json  |  7 ---
 scm-it/src/test/resources/repository-svn.json |  7 ---
 6 files changed, 46 insertions(+), 91 deletions(-)
 delete mode 100644 scm-it/src/test/resources/repository-git.json
 delete mode 100644 scm-it/src/test/resources/repository-hg.json
 delete mode 100644 scm-it/src/test/resources/repository-svn.json

diff --git a/scm-it/pom.xml b/scm-it/pom.xml
index ab68517a9d..fa4c0b1295 100644
--- a/scm-it/pom.xml
+++ b/scm-it/pom.xml
@@ -27,6 +27,17 @@
       <version>3.1.0</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>javax</groupId>
+      <artifactId>javaee-api</artifactId>
+      <version>7.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.glassfish</groupId>
+      <artifactId>javax.json</artifactId>
+      <version>1.0.4</version>
+      <scope>runtime</scope>
+    </dependency>
   </dependencies>
 
   <build>
diff --git a/scm-it/src/test/java/sonia/scm/it/RepositoriesITCase.java b/scm-it/src/test/java/sonia/scm/it/RepositoriesITCase.java
index f4d0b7586b..4b8d3924a3 100644
--- a/scm-it/src/test/java/sonia/scm/it/RepositoriesITCase.java
+++ b/scm-it/src/test/java/sonia/scm/it/RepositoriesITCase.java
@@ -35,12 +35,14 @@ package sonia.scm.it;
 
 import org.apache.http.HttpStatus;
 import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 import sonia.scm.web.VndMediaType;
 
+import javax.json.Json;
 import java.io.IOException;
 import java.util.Collection;
 
@@ -50,13 +52,14 @@ import static org.hamcrest.Matchers.nullValue;
 import static sonia.scm.it.RegExMatcher.matchesPattern;
 import static sonia.scm.it.RestUtil.createResourceUrl;
 import static sonia.scm.it.RestUtil.given;
-import static sonia.scm.it.RestUtil.readJson;
 
 @RunWith(Parameterized.class)
 public class RepositoriesITCase {
 
   private final String repositoryType;
 
+  private String repositoryUrl;
+
   public RepositoriesITCase(String repositoryType) {
     this.repositoryType = repositoryType;
   }
@@ -66,6 +69,20 @@ public class RepositoriesITCase {
     return ScmParameterizedIntegrationTestUtil.createParameters();
   }
 
+  @Before
+  public void createRepository() {
+    this.repositoryUrl = given(VndMediaType.REPOSITORY)
+      .body(repositoryJson())
+
+      .when()
+      .post(createResourceUrl("repositories"))
+
+      .then()
+      .statusCode(HttpStatus.SC_CREATED)
+      .extract()
+      .header("location");
+  }
+
   @After
   public void cleanup() {
     TestData.cleanup();
@@ -73,8 +90,6 @@ public class RepositoriesITCase {
 
   @Test
   public void shouldCreateSuccessfully() throws IOException {
-    String repositoryUrl = createRepository();
-
     given(VndMediaType.REPOSITORY)
 
       .when()
@@ -92,9 +107,7 @@ public class RepositoriesITCase {
   }
 
   @Test
-  public void shouldDeleteSuccessfully() throws IOException {
-    String repositoryUrl = createRepository();
-
+  public void shouldDeleteSuccessfully() {
     given(VndMediaType.REPOSITORY)
 
       .when()
@@ -113,10 +126,8 @@ public class RepositoriesITCase {
   }
 
   @Test
-  public void shouldRejectMultipleCreations() throws IOException {
-    String repositoryJson = readJson("repository-" + repositoryType + ".json");
-    createRepository();
-
+  public void shouldRejectMultipleCreations() {
+    String repositoryJson = repositoryJson();
     given(VndMediaType.REPOSITORY)
       .body(repositoryJson)
 
@@ -127,16 +138,13 @@ public class RepositoriesITCase {
       .statusCode(HttpStatus.SC_CONFLICT);
   }
 
-  private String createRepository() throws IOException {
-    return given(VndMediaType.REPOSITORY)
-      .body(readJson("repository-" + repositoryType + ".json"))
-
-      .when()
-      .post(createResourceUrl("repositories"))
-
-      .then()
-      .statusCode(HttpStatus.SC_CREATED)
-      .extract()
-      .header("location");
+  private String repositoryJson() {
+    return Json.createObjectBuilder()
+      .add("contact", "zaphod.beeblebrox@hitchhiker.com")
+      .add("description", "Heart of Gold")
+      .add("name", "HeartOfGold-" + repositoryType)
+      .add("archived", false)
+      .add("type", repositoryType)
+      .build().toString();
   }
 }
diff --git a/scm-it/src/test/java/sonia/scm/it/RestUtil.java b/scm-it/src/test/java/sonia/scm/it/RestUtil.java
index a902c8985c..1458ab6d0b 100644
--- a/scm-it/src/test/java/sonia/scm/it/RestUtil.java
+++ b/scm-it/src/test/java/sonia/scm/it/RestUtil.java
@@ -1,68 +1,25 @@
 package sonia.scm.it;
 
-import com.google.common.io.Resources;
 import io.restassured.RestAssured;
-import io.restassured.response.Response;
 import io.restassured.specification.RequestSpecification;
 
-import java.io.IOException;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
 import java.net.URI;
-import java.net.URL;
-import java.nio.charset.Charset;
 
-import static java.util.Arrays.asList;
+import static java.net.URI.create;
 
 public class RestUtil {
 
-  public static final String BASE_URL = "http://localhost:8081/scm/";
-  public static final String REST_BASE_URL = BASE_URL.concat("api/rest/v2/");
+  public static final URI BASE_URL = create("http://localhost:8081/scm/");
+  public static final URI REST_BASE_URL = BASE_URL.resolve("api/rest/v2/");
 
-  public static Response lastResponse;
-
-  public static URI createResourceUrl(String url)
-  {
-    return URI.create(REST_BASE_URL).resolve(url);
-  }
-
-  public static String readJson(String jsonFileName) throws IOException {
-    URL url = Resources.getResource(jsonFileName);
-    return Resources.toString(url, Charset.forName("UTF-8"));
+  public static URI createResourceUrl(String path) {
+    return REST_BASE_URL.resolve(path);
   }
 
   public static RequestSpecification given(String mediaType) {
-    RequestSpecification requestSpecification = RestAssured.given()
+    return RestAssured.given()
       .contentType(mediaType)
       .accept(mediaType)
       .auth().preemptive().basic("scmadmin", "scmadmin");
-    return wrapRequestSpecification(requestSpecification);
-  }
-
-  private static RequestSpecification wrapRequestSpecification(RequestSpecification requestSpecification) {
-    return (RequestSpecification) Proxy.newProxyInstance(RestUtil.class.getClassLoader(), new Class[]{RequestSpecification.class}, new RequestSpecificationWrapper(requestSpecification));
-  }
-
-  private static class RequestSpecificationWrapper implements InvocationHandler {
-
-    private final RequestSpecification delegate;
-
-    private RequestSpecificationWrapper(RequestSpecification delegate) {
-      this.delegate = delegate;
-    }
-
-    @Override
-    public Object invoke(Object proxy, Method method, Object[] args) throws InvocationTargetException, IllegalAccessException {
-      if (asList("get", "put", "post", "delete").contains(method.getName())) {
-        lastResponse = (Response) method.invoke(delegate, args);
-        return lastResponse;
-      } else if (method.getReturnType().equals(RequestSpecification.class)) {
-        return wrapRequestSpecification((RequestSpecification) method.invoke(delegate, args));
-      } else {
-        return method.invoke(delegate, args);
-      }
-    }
   }
 }
diff --git a/scm-it/src/test/resources/repository-git.json b/scm-it/src/test/resources/repository-git.json
deleted file mode 100644
index 3fc491ac01..0000000000
--- a/scm-it/src/test/resources/repository-git.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "contact": "zaphod.beeblebrox@hitchhiker.com",
-  "description": "Heart of Gold is the first prototype ship to successfully utilise the revolutionary Infinite Improbability Drive",
-  "name": "HeartOfGold-git",
-  "archived": false,
-  "type": "git"
-}
diff --git a/scm-it/src/test/resources/repository-hg.json b/scm-it/src/test/resources/repository-hg.json
deleted file mode 100644
index cf1be4cc2e..0000000000
--- a/scm-it/src/test/resources/repository-hg.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "contact": "zaphod.beeblebrox@hitchhiker.com",
-  "description": "Heart of Gold is the first prototype ship to successfully utilise the revolutionary Infinite Improbability Drive",
-  "name": "HeartOfGold-hg",
-  "archived": false,
-  "type": "hg"
-}
diff --git a/scm-it/src/test/resources/repository-svn.json b/scm-it/src/test/resources/repository-svn.json
deleted file mode 100644
index 97e2aa6074..0000000000
--- a/scm-it/src/test/resources/repository-svn.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "contact": "zaphod.beeblebrox@hitchhiker.com",
-  "description": "Heart of Gold is the first prototype ship to successfully utilise the revolutionary Infinite Improbability Drive",
-  "name": "HeartOfGold-svn",
-  "archived": false,
-  "type": "svn"
-}

From e3d2997e7147ce614c8d161819f5a8c2cac841f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Mon, 6 Aug 2018 13:48:06 +0200
Subject: [PATCH 36/51] Migrate IT for read and commit from/to repository to
 new module

---
 scm-it/pom.xml                                |  46 +++
 .../java/sonia/scm/it/RepositoriesITCase.java |  56 ++++
 .../sonia/scm/it/IntegrationTestUtil.java     |  56 ----
 .../sonia/scm/it/RepositoryITCaseBase.java    | 311 ------------------
 4 files changed, 102 insertions(+), 367 deletions(-)
 delete mode 100644 scm-webapp/src/test/java/sonia/scm/it/RepositoryITCaseBase.java

diff --git a/scm-it/pom.xml b/scm-it/pom.xml
index fa4c0b1295..7fe464ccf5 100644
--- a/scm-it/pom.xml
+++ b/scm-it/pom.xml
@@ -21,6 +21,52 @@
       <artifactId>scm-core</artifactId>
       <version>2.0.0-SNAPSHOT</version>
     </dependency>
+    <dependency>
+      <groupId>sonia.scm</groupId>
+      <artifactId>scm-test</artifactId>
+      <version>2.0.0-SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
+      <groupId>sonia.scm.plugins</groupId>
+      <artifactId>scm-git-plugin</artifactId>
+      <version>2.0.0-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>sonia.scm.plugins</groupId>
+      <artifactId>scm-git-plugin</artifactId>
+      <version>2.0.0-SNAPSHOT</version>
+      <classifier>tests</classifier>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>sonia.scm.plugins</groupId>
+      <artifactId>scm-hg-plugin</artifactId>
+      <version>2.0.0-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>sonia.scm.plugins</groupId>
+      <artifactId>scm-hg-plugin</artifactId>
+      <version>2.0.0-SNAPSHOT</version>
+      <classifier>tests</classifier>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>sonia.scm.plugins</groupId>
+      <artifactId>scm-svn-plugin</artifactId>
+      <version>2.0.0-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>sonia.scm.plugins</groupId>
+      <artifactId>scm-svn-plugin</artifactId>
+      <version>2.0.0-SNAPSHOT</version>
+      <classifier>tests</classifier>
+      <scope>test</scope>
+    </dependency>
+
     <dependency>
       <groupId>io.rest-assured</groupId>
       <artifactId>rest-assured</artifactId>
diff --git a/scm-it/src/test/java/sonia/scm/it/RepositoriesITCase.java b/scm-it/src/test/java/sonia/scm/it/RepositoriesITCase.java
index 4b8d3924a3..a6efc64c3f 100644
--- a/scm-it/src/test/java/sonia/scm/it/RepositoriesITCase.java
+++ b/scm-it/src/test/java/sonia/scm/it/RepositoriesITCase.java
@@ -36,19 +36,29 @@ package sonia.scm.it;
 import org.apache.http.HttpStatus;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
+import sonia.scm.repository.Person;
+import sonia.scm.repository.client.api.ClientCommand;
+import sonia.scm.repository.client.api.RepositoryClient;
+import sonia.scm.repository.client.api.RepositoryClientFactory;
 import sonia.scm.web.VndMediaType;
 
 import javax.json.Json;
+import java.io.File;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.Collection;
+import java.util.UUID;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.nullValue;
+import static org.junit.Assert.assertEquals;
 import static sonia.scm.it.RegExMatcher.matchesPattern;
 import static sonia.scm.it.RestUtil.createResourceUrl;
 import static sonia.scm.it.RestUtil.given;
@@ -56,6 +66,11 @@ import static sonia.scm.it.RestUtil.given;
 @RunWith(Parameterized.class)
 public class RepositoriesITCase {
 
+  public static final Person AUTHOR = new Person("SCM Administrator", "scmadmin@scm-manager.org");
+
+  @Rule
+  public TemporaryFolder temporaryFolder = new TemporaryFolder();
+
   private final String repositoryType;
 
   private String repositoryUrl;
@@ -138,6 +153,47 @@ public class RepositoriesITCase {
       .statusCode(HttpStatus.SC_CONFLICT);
   }
 
+  @Test
+  public void shouldCloneRepository() throws IOException {
+    RepositoryClient rc = createRepositoryClient();
+    assertEquals(1, rc.getWorkingCopy().list().length);
+  }
+
+  @Test
+  public void shouldCommitFiles() throws IOException {
+    RepositoryClient rc = createRepositoryClient();
+
+    for (int i = 0; i < 5; i++) {
+      createRandomFile(rc);
+    }
+
+    commit(rc, "added some test files");
+  }
+
+  public static void createRandomFile(RepositoryClient client) throws IOException {
+    String uuid = UUID.randomUUID().toString();
+    String name = "file-" + uuid + ".uuid";
+
+    File file = new File(client.getWorkingCopy(), name);
+    try (FileOutputStream out = new FileOutputStream(file)) {
+      out.write(uuid.getBytes());
+    }
+
+    client.getAddCommand().add(name);
+  }
+
+  public static void commit(RepositoryClient repositoryClient, String message) throws IOException {
+    repositoryClient.getCommitCommand().commit(AUTHOR, message);
+    if ( repositoryClient.isCommandSupported(ClientCommand.PUSH) ) {
+      repositoryClient.getPushCommand().push();
+    }
+  }
+
+  private RepositoryClient createRepositoryClient() throws IOException {
+    RepositoryClientFactory clientFactory = new RepositoryClientFactory();
+    return clientFactory.create(repositoryType, "http://localhost:8081/scm/" + repositoryType + "/scmadmin/HeartOfGold-" + repositoryType, "scmadmin", "scmadmin", temporaryFolder.newFolder());
+  }
+
   private String repositoryJson() {
     return Json.createObjectBuilder()
       .add("contact", "zaphod.beeblebrox@hitchhiker.com")
diff --git a/scm-webapp/src/test/java/sonia/scm/it/IntegrationTestUtil.java b/scm-webapp/src/test/java/sonia/scm/it/IntegrationTestUtil.java
index 1f75f93d48..98e2e7db04 100644
--- a/scm-webapp/src/test/java/sonia/scm/it/IntegrationTestUtil.java
+++ b/scm-webapp/src/test/java/sonia/scm/it/IntegrationTestUtil.java
@@ -48,19 +48,14 @@ import de.otto.edison.hal.HalRepresentation;
 import sonia.scm.api.rest.JSONContextResolver;
 import sonia.scm.api.rest.ObjectMapperProvider;
 import sonia.scm.repository.Person;
-import sonia.scm.repository.client.api.ClientCommand;
-import sonia.scm.repository.client.api.RepositoryClient;
 import sonia.scm.util.IOUtil;
 
-import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.net.URI;
 import java.net.URL;
 import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.UUID;
 
 //~--- JDK imports ------------------------------------------------------------
 
@@ -125,43 +120,6 @@ public final class IntegrationTestUtil
     }
   }
 
-  /**
-   * Commit and push changes.
-   * 
-   * @param repositoryClient repository client
-   * @param message commit message
-   * 
-   * @throws IOException 
-   * 
-   * @since 1.51
-   */
-  public static void commit(RepositoryClient repositoryClient, String message) throws IOException {
-    repositoryClient.getCommitCommand().commit(IntegrationTestUtil.AUTHOR, message);
-    if ( repositoryClient.isCommandSupported(ClientCommand.PUSH) ) {
-      repositoryClient.getPushCommand().push();
-    }
-  }
-  
-  /**
-   * Method description
-   *
-   * @param client
-   *
-   * @throws IOException
-   */
-  public static void createRandomFile(RepositoryClient client) throws IOException
-  {
-    String uuid = UUID.randomUUID().toString();
-    String name = "file-" + uuid + ".uuid";
-
-    File file = new File(client.getWorkingCopy(), name);
-    try (FileOutputStream out = new FileOutputStream(file)) {
-      out.write(uuid.getBytes());
-    }
-
-    client.getAddCommand().add(name);
-  }
-
   public static Collection<String> createRepositoryTypeParameters() {
     Collection<String> params = new ArrayList<>();
 
@@ -206,20 +164,6 @@ public final class IntegrationTestUtil
     return URI.create(REST_BASE_URL).resolve(url);
   }
   
-  /**
-   * Method description
-   *
-   *
-   * @return
-   */
-  public static File createTempDirectory() {
-    File directory = new File(System.getProperty("java.io.tmpdir"), UUID.randomUUID().toString());
-
-    IOUtil.mkdirs(directory);
-
-    return directory;
-  }
-
   public static String readJson(String jsonFileName) {
     URL url = Resources.getResource(jsonFileName);
     try {
diff --git a/scm-webapp/src/test/java/sonia/scm/it/RepositoryITCaseBase.java b/scm-webapp/src/test/java/sonia/scm/it/RepositoryITCaseBase.java
deleted file mode 100644
index 06d1f1be8e..0000000000
--- a/scm-webapp/src/test/java/sonia/scm/it/RepositoryITCaseBase.java
+++ /dev/null
@@ -1,311 +0,0 @@
-/**
- * Copyright (c) 2010, Sebastian Sdorra
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 3. Neither the name of SCM-Manager; nor the names of its
- *    contributors may be used to endorse or promote products derived from this
- *    software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * http://bitbucket.org/sdorra/scm-manager
- *
- */
-
-
-
-package sonia.scm.it;
-
-//~--- non-JDK imports --------------------------------------------------------
-
-import org.junit.AfterClass;
-import org.junit.runners.Parameterized.Parameters;
-import sonia.scm.api.v2.resources.RepositoryDto;
-import sonia.scm.repository.client.api.RepositoryClient;
-import sonia.scm.repository.client.api.RepositoryClientFactory;
-import sonia.scm.user.User;
-import sonia.scm.user.UserTestData;
-import sonia.scm.util.IOUtil;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-
-import static sonia.scm.it.IntegrationTestUtil.ADMIN_PASSWORD;
-import static sonia.scm.it.IntegrationTestUtil.ADMIN_USERNAME;
-import static sonia.scm.it.IntegrationTestUtil.commit;
-import static sonia.scm.it.IntegrationTestUtil.createAdminClient;
-import static sonia.scm.it.IntegrationTestUtil.createRandomFile;
-import static sonia.scm.it.IntegrationTestUtil.createRepositoryTypeParameters;
-import static sonia.scm.it.IntegrationTestUtil.createResource;
-import static sonia.scm.it.IntegrationTestUtil.createTempDirectory;
-import static sonia.scm.it.IntegrationTestUtil.readJson;
-import static sonia.scm.it.RepositoryITUtil.createUrl;
-import static sonia.scm.it.UserITUtil.postUser;
-
-//~--- JDK imports ------------------------------------------------------------
-
-/**
- *
- * @author Sebastian Sdorra
- */
-public class RepositoryITCaseBase
-{
-
-  private static final Collection<RepositoryDto> CREATED_REPOSITORIES = new ArrayList<>();
-
-  protected User nopermUser;
-  protected User ownerUser;
-  protected String password;
-  protected User readUser;
-  protected RepositoryDto repository;
-  protected User writeUser;
-
-  /**
-   * Constructs ...
-   *
-   *
-   * @param repository
-   * @param owner
-   * @param write
-   * @param read
-   * @param noperm
-   * @param password
-   */
-  public RepositoryITCaseBase(RepositoryDto repository, User owner, User write,
-    User read, User noperm, String password)
-  {
-    this.repository = repository;
-    this.ownerUser = owner;
-    this.writeUser = write;
-    this.readUser = read;
-    this.nopermUser = noperm;
-    this.password = password;
-  }
-
-  //~--- methods --------------------------------------------------------------
-
-  /**
-   * Method description
-   *
-   *
-   * @param client
-   *
-   * @throws IOException
-   */
-  public static void addTestFiles(RepositoryClient client) throws IOException
-  {
-    for (int i = 0; i < 5; i++)
-    {
-      createRandomFile(client);
-    }
-
-    commit(client, "added some test files");
-  }
-
-  /**
-   * Method description
-   *
-   * @param repository
-   * @param username
-   * @param password
-   *
-   * @throws IOException
-   */
-  public static void addTestFiles(RepositoryDto repository, String username,
-    String password)
-  {
-    File directory = createTempDirectory();
-
-    try {
-      RepositoryClientFactory clientFactory = new RepositoryClientFactory();
-      RepositoryClient client = clientFactory.create(
-        repository.getType(), createUrl(repository),
-        username, password, directory
-      );
-
-      addTestFiles(client);
-    } catch (IOException e) {
-      throw new RuntimeException(e);
-    } finally {
-      try {
-        IOUtil.delete(directory);
-      } catch (IOException e) {
-        e.printStackTrace();
-      }
-    }
-  }
-
-  /**
-   * Method description
-   *
-   */
-  @AfterClass
-  public static void cleanup()
-  {
-    ScmClient client = createAdminClient();
-
-    deleteUser(client, UserTestData.createTrillian());
-    deleteUser(client, UserTestData.createZaphod());
-    deleteUser(client, UserTestData.createMarvin());
-    deleteUser(client, UserTestData.createPerfect());
-
-    for (RepositoryDto r : CREATED_REPOSITORIES)
-    {
-      createResource(client, "repositories/" + r.getNamespace() + "/"  + r.getName()).delete();
-    }
-  }
-
-  /**
-   * Method description
-   *
-   *
-   * @return
-   *
-   * @throws IOException
-   */
-  @Parameters(name = "{6}")
-  public static Collection<Object[]> createParameters() throws IOException
-  {
-    Collection<Object[]> params = new ArrayList<>();
-    User owner = UserTestData.createTrillian();
-
-    createUser(owner);
-
-    User write = UserTestData.createZaphod();
-
-    createUser(write);
-
-    User read = UserTestData.createMarvin();
-
-    createUser(read);
-
-    User noperm = UserTestData.createPerfect();
-
-    createUser(noperm);
-    createRepositoryTypeParameters().forEach(t -> appendTestParameter(params, t, owner, write, read, noperm));
-
-    return params;
-  }
-
-  /**
-   * Method description
-   *
-   *
-   * @param params
-   * @param type
-   * @param owner
-   * @param write
-   * @param read
-   * @param noperm
-   *
-   * @throws IOException
-   */
-  private static void appendTestParameter(Collection<Object[]> params,
-    String type, User owner, User write, User read, User noperm)
-  {
-    RepositoryDto repository = createTestRepository(type, owner, write, read);
-    params.add(new Object[]
-      {
-        repository, owner, write, read, noperm, "secret", repository.getType() + "-" + owner.getId()
-      });
-  }
-
-  /**
-   * Method description
-   *
-   *
-   *
-   * @param type
-   * @param owner
-   * @param write
-   * @param read
-   *
-   * @return
-   *
-   * @throws IOException
-   */
-  private static RepositoryDto createTestRepository(String type,
-    User owner, User write, User read)
-  {
-    ScmClient client = createAdminClient();
-
-    // TODO Activate for tests when implemented
-//    repository.setPermissions(Arrays.asList(
-//      new Permission(owner.getName(), PermissionType.OWNER),
-//      new Permission(write.getName(), PermissionType.WRITE),
-//      new Permission(read.getName(), PermissionType.READ))
-//    );
-    String repositoryJson = readJson("repository-" + type + ".json");
-    RepositoryDto repository = RepositoryITUtil.createRepository(client, repositoryJson);
-
-    CREATED_REPOSITORIES.add(repository);
-
-    addTestFiles(repository, ADMIN_USERNAME, ADMIN_PASSWORD);
-
-    return repository;
-  }
-
-  /**
-   * Method description
-   *
-   *
-   * @param user
-   */
-  private static void createUser(User user)
-  {
-    ScmClient client = createAdminClient();
-
-    user.setPassword("secret");
-
-    postUser(client, user);
-  }
-
-  /**
-   * Method description
-   *
-   *
-   * @param client
-   * @param user
-   */
-  private static void deleteUser(ScmClient client, User user)
-  {
-    createResource(client, "users/".concat(user.getName())).delete();
-  }
-
-  /**
-   * Method description
-   *
-   *
-   * @param user
-   * @param directory
-   *
-   * @return
-   *
-   * @throws IOException
-   */
-  protected RepositoryClient createRepositoryClient(User user, File directory) throws IOException
-  {
-    RepositoryClientFactory clientFactory = new RepositoryClientFactory();
-    return clientFactory.create(repository.getType(), createUrl(repository),
-      user.getName(), password, directory);
-  }
-}

From 62f0e3f50596588f57f98f5239fc207d7dfe72e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Mon, 6 Aug 2018 14:06:36 +0200
Subject: [PATCH 37/51] Add checks to repository tests

---
 .../java/sonia/scm/it/RepositoriesITCase.java | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/scm-it/src/test/java/sonia/scm/it/RepositoriesITCase.java b/scm-it/src/test/java/sonia/scm/it/RepositoriesITCase.java
index a6efc64c3f..749875f122 100644
--- a/scm-it/src/test/java/sonia/scm/it/RepositoriesITCase.java
+++ b/scm-it/src/test/java/sonia/scm/it/RepositoriesITCase.java
@@ -155,22 +155,25 @@ public class RepositoriesITCase {
 
   @Test
   public void shouldCloneRepository() throws IOException {
-    RepositoryClient rc = createRepositoryClient();
-    assertEquals(1, rc.getWorkingCopy().list().length);
+    RepositoryClient client = createRepositoryClient();
+    assertEquals("expected metadata dir", 1, client.getWorkingCopy().list().length);
   }
 
   @Test
   public void shouldCommitFiles() throws IOException {
-    RepositoryClient rc = createRepositoryClient();
+    RepositoryClient client = createRepositoryClient();
 
     for (int i = 0; i < 5; i++) {
-      createRandomFile(rc);
+      createRandomFile(client);
     }
 
-    commit(rc, "added some test files");
+    commit(client);
+
+    RepositoryClient checkClient = createRepositoryClient();
+    assertEquals("expected 5 files and metadata dir", 6, checkClient.getWorkingCopy().list().length);
   }
 
-  public static void createRandomFile(RepositoryClient client) throws IOException {
+  private static void createRandomFile(RepositoryClient client) throws IOException {
     String uuid = UUID.randomUUID().toString();
     String name = "file-" + uuid + ".uuid";
 
@@ -182,8 +185,8 @@ public class RepositoriesITCase {
     client.getAddCommand().add(name);
   }
 
-  public static void commit(RepositoryClient repositoryClient, String message) throws IOException {
-    repositoryClient.getCommitCommand().commit(AUTHOR, message);
+  private static void commit(RepositoryClient repositoryClient) throws IOException {
+    repositoryClient.getCommitCommand().commit(AUTHOR, "commit");
     if ( repositoryClient.isCommandSupported(ClientCommand.PUSH) ) {
       repositoryClient.getPushCommand().push();
     }

From 07e7fd91aa7331a68ddde1955d7f28155f8664c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Mon, 6 Aug 2018 14:22:07 +0200
Subject: [PATCH 38/51] Use existing constants

---
 scm-it/src/test/java/sonia/scm/it/RepositoriesITCase.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scm-it/src/test/java/sonia/scm/it/RepositoriesITCase.java b/scm-it/src/test/java/sonia/scm/it/RepositoriesITCase.java
index 749875f122..eaab0f29b7 100644
--- a/scm-it/src/test/java/sonia/scm/it/RepositoriesITCase.java
+++ b/scm-it/src/test/java/sonia/scm/it/RepositoriesITCase.java
@@ -60,6 +60,7 @@ import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.nullValue;
 import static org.junit.Assert.assertEquals;
 import static sonia.scm.it.RegExMatcher.matchesPattern;
+import static sonia.scm.it.RestUtil.BASE_URL;
 import static sonia.scm.it.RestUtil.createResourceUrl;
 import static sonia.scm.it.RestUtil.given;
 
@@ -194,7 +195,7 @@ public class RepositoriesITCase {
 
   private RepositoryClient createRepositoryClient() throws IOException {
     RepositoryClientFactory clientFactory = new RepositoryClientFactory();
-    return clientFactory.create(repositoryType, "http://localhost:8081/scm/" + repositoryType + "/scmadmin/HeartOfGold-" + repositoryType, "scmadmin", "scmadmin", temporaryFolder.newFolder());
+    return clientFactory.create(repositoryType, BASE_URL + repositoryType + "/scmadmin/HeartOfGold-" + repositoryType, "scmadmin", "scmadmin", temporaryFolder.newFolder());
   }
 
   private String repositoryJson() {

From 6fff26eb7647e7501983290c6d504143d932e648 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Mon, 6 Aug 2018 15:34:31 +0200
Subject: [PATCH 39/51] Add http protocol link to repository object response

---
 .../java/sonia/scm/it/RepositoriesITCase.java     | 15 +++++++++++++--
 .../RepositoryToRepositoryDtoMapper.java          |  1 +
 .../sonia/scm/api/v2/resources/ResourceLinks.java |  7 +++++++
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/scm-it/src/test/java/sonia/scm/it/RepositoriesITCase.java b/scm-it/src/test/java/sonia/scm/it/RepositoriesITCase.java
index eaab0f29b7..44cbb9dac6 100644
--- a/scm-it/src/test/java/sonia/scm/it/RepositoriesITCase.java
+++ b/scm-it/src/test/java/sonia/scm/it/RepositoriesITCase.java
@@ -60,7 +60,6 @@ import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.nullValue;
 import static org.junit.Assert.assertEquals;
 import static sonia.scm.it.RegExMatcher.matchesPattern;
-import static sonia.scm.it.RestUtil.BASE_URL;
 import static sonia.scm.it.RestUtil.createResourceUrl;
 import static sonia.scm.it.RestUtil.given;
 
@@ -195,7 +194,19 @@ public class RepositoriesITCase {
 
   private RepositoryClient createRepositoryClient() throws IOException {
     RepositoryClientFactory clientFactory = new RepositoryClientFactory();
-    return clientFactory.create(repositoryType, BASE_URL + repositoryType + "/scmadmin/HeartOfGold-" + repositoryType, "scmadmin", "scmadmin", temporaryFolder.newFolder());
+    String cloneUrl = readCloneUrl();
+    return clientFactory.create(repositoryType, cloneUrl, "scmadmin", "scmadmin", temporaryFolder.newFolder());
+  }
+
+  private String readCloneUrl() {
+    return given(VndMediaType.REPOSITORY)
+
+      .when()
+      .get(repositoryUrl)
+
+      .then()
+      .extract()
+      .path("_links.httpProtocol.href");
   }
 
   private String repositoryJson() {
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryToRepositoryDtoMapper.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryToRepositoryDtoMapper.java
index 2f13723d39..cb89f0ea63 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryToRepositoryDtoMapper.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryToRepositoryDtoMapper.java
@@ -25,6 +25,7 @@ public abstract class RepositoryToRepositoryDtoMapper extends BaseMapper<Reposit
   @AfterMapping
   void appendLinks(Repository repository, @MappingTarget RepositoryDto target) {
     Links.Builder linksBuilder = linkingTo().self(resourceLinks.repository().self(target.getNamespace(), target.getName()));
+    linksBuilder.single(link("httpProtocol", resourceLinks.repository().clone(target.getType(), target.getNamespace(), target.getName())));
     if (RepositoryPermissions.delete(repository).isPermitted()) {
       linksBuilder.single(link("delete", resourceLinks.repository().delete(target.getNamespace(), target.getName())));
     }
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ResourceLinks.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ResourceLinks.java
index d02747d2af..f025001ca1 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ResourceLinks.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ResourceLinks.java
@@ -2,6 +2,7 @@ package sonia.scm.api.v2.resources;
 
 import javax.inject.Inject;
 import javax.ws.rs.core.UriInfo;
+import java.net.URI;
 
 class ResourceLinks {
 
@@ -127,15 +128,21 @@ class ResourceLinks {
 
   static class RepositoryLinks {
     private final LinkBuilder repositoryLinkBuilder;
+    private final UriInfo uriInfo;
 
     RepositoryLinks(UriInfo uriInfo) {
       repositoryLinkBuilder = new LinkBuilder(uriInfo, RepositoryRootResource.class, RepositoryResource.class);
+      this.uriInfo = uriInfo;
     }
 
     String self(String namespace, String name) {
       return repositoryLinkBuilder.method("getRepositoryResource").parameters(namespace, name).method("get").parameters().href();
     }
 
+    String clone(String type, String namespace, String name) {
+      return uriInfo.getBaseUri().resolve(URI.create("../../" + type + "/" + namespace + "/" + name)).toASCIIString();
+    }
+
     String delete(String namespace, String name) {
       return repositoryLinkBuilder.method("getRepositoryResource").parameters(namespace, name).method("delete").parameters().href();
     }

From 9a4896b55dda99033f73a8fbfb45a3524d34e6d5 Mon Sep 17 00:00:00 2001
From: Philipp Czora <philipp.czora@cloudogu.com>
Date: Mon, 6 Aug 2018 15:41:20 +0200
Subject: [PATCH 40/51] Implemented editing of repos (in UI)

---
 scm-ui/public/locales/en/repos.json           |   9 +-
 scm-ui/src/components/forms/Textarea.js       |   5 +-
 scm-ui/src/containers/Main.js                 |   1 -
 scm-ui/src/repos/components/EditNavLink.js    |  22 ++++
 .../src/repos/components/EditNavLink.test.js  |  32 +++++
 scm-ui/src/repos/containers/Edit.js           |  80 +++++++++++++
 scm-ui/src/repos/containers/RepositoryRoot.js |   7 ++
 scm-ui/src/repos/modules/repos.js             |  71 +++++++++++
 scm-ui/src/repos/modules/repos.test.js        | 110 +++++++++++++++++-
 9 files changed, 331 insertions(+), 6 deletions(-)
 create mode 100644 scm-ui/src/repos/components/EditNavLink.js
 create mode 100644 scm-ui/src/repos/components/EditNavLink.test.js
 create mode 100644 scm-ui/src/repos/containers/Edit.js

diff --git a/scm-ui/public/locales/en/repos.json b/scm-ui/public/locales/en/repos.json
index e28ea3754c..29074a49ba 100644
--- a/scm-ui/public/locales/en/repos.json
+++ b/scm-ui/public/locales/en/repos.json
@@ -26,8 +26,15 @@
     "title": "Create Repository",
     "subtitle": "Create a new repository"
   },
+  "edit": {
+    "title": "Edit Repository",
+    "subtitle": "Edit an existing repository"
+  },
   "repository-form": {
-    "submit": "Speichern"
+    "submit": "Save"
+  },
+  "edit-nav-link": {
+    "label": "Edit"
   },
   "delete-nav-action": {
     "label": "Delete",
diff --git a/scm-ui/src/components/forms/Textarea.js b/scm-ui/src/components/forms/Textarea.js
index 3144c00d0c..721bbae77f 100644
--- a/scm-ui/src/components/forms/Textarea.js
+++ b/scm-ui/src/components/forms/Textarea.js
@@ -42,9 +42,8 @@ class Textarea extends React.Component<Props> {
             }}
             placeholder={placeholder}
             onChange={this.handleInput}
-          >
-            {value}
-          </textarea>
+            value={value}
+          />
         </div>
       </div>
     );
diff --git a/scm-ui/src/containers/Main.js b/scm-ui/src/containers/Main.js
index 2c93cb06d0..331d5e7c7b 100644
--- a/scm-ui/src/containers/Main.js
+++ b/scm-ui/src/containers/Main.js
@@ -47,7 +47,6 @@ class Main extends React.Component<Props> {
             authenticated={authenticated}
           />
           <ProtectedRoute
-            exact
             path="/repo/:namespace/:name"
             component={RepositoryRoot}
             authenticated={authenticated}
diff --git a/scm-ui/src/repos/components/EditNavLink.js b/scm-ui/src/repos/components/EditNavLink.js
new file mode 100644
index 0000000000..2a5c4adf9d
--- /dev/null
+++ b/scm-ui/src/repos/components/EditNavLink.js
@@ -0,0 +1,22 @@
+//@flow
+import React from "react";
+import { NavLink } from "../../components/navigation";
+import { translate } from "react-i18next";
+import type { Repository } from "../types/Repositories";
+
+type Props = { editUrl: string, t: string => string, repository: Repository };
+
+class EditNavLink extends React.Component<Props> {
+  isEditable = () => {
+    return this.props.repository._links.update;
+  };
+  render() {
+    if (!this.isEditable()) {
+      return null;
+    }
+    const { editUrl, t } = this.props;
+    return <NavLink to={editUrl} label={t("edit-nav-link.label")} />;
+  }
+}
+
+export default translate("repos")(EditNavLink);
diff --git a/scm-ui/src/repos/components/EditNavLink.test.js b/scm-ui/src/repos/components/EditNavLink.test.js
new file mode 100644
index 0000000000..8289f0fb3b
--- /dev/null
+++ b/scm-ui/src/repos/components/EditNavLink.test.js
@@ -0,0 +1,32 @@
+import React from "react";
+import { mount, shallow } from "enzyme";
+import "../../tests/enzyme";
+import "../../tests/i18n";
+import EditNavLink from "./EditNavLink";
+
+jest.mock("../../components/modals/ConfirmAlert");
+jest.mock("../../components/navigation/NavLink", () => () => <div>foo</div>);
+
+describe("EditNavLink", () => {
+  it("should render nothing, if the modify link is missing", () => {
+    const repository = {
+      _links: {}
+    };
+
+    const navLink = shallow(<EditNavLink repository={repository} editUrl="" />);
+    expect(navLink.text()).toBe("");
+  });
+
+  it("should render the navLink", () => {
+    const repository = {
+      _links: {
+        update: {
+          href: "/repositories"
+        }
+      }
+    };
+
+    const navLink = mount(<EditNavLink repository={repository} editUrl="" />);
+    expect(navLink.text()).toBe("foo");
+  });
+});
diff --git a/scm-ui/src/repos/containers/Edit.js b/scm-ui/src/repos/containers/Edit.js
new file mode 100644
index 0000000000..3a5662ecf1
--- /dev/null
+++ b/scm-ui/src/repos/containers/Edit.js
@@ -0,0 +1,80 @@
+// @flow
+import React from "react";
+import { connect } from "react-redux";
+import { translate } from "react-i18next";
+import { Page } from "../../components/layout";
+import RepositoryForm from "../components/form";
+import type { Repository } from "../types/Repositories";
+import {
+  modifyRepo,
+  isModifyRepoPending,
+  getModifyRepoFailure
+} from "../modules/repos";
+import { withRouter } from "react-router-dom";
+import type { History } from "history";
+
+type Props = {
+  repository: Repository,
+  modifyRepo: (Repository, () => void) => void,
+  modifyLoading: boolean,
+  error: Error,
+
+  // context props
+  t: string => string,
+  history: History
+};
+
+class Edit extends React.Component<Props> {
+  componentDidMount() {}
+
+  repoModified = () => {
+    const { history, repository } = this.props;
+    history.push(`/repo/${repository.namespace}/${repository.name}`);
+  };
+
+  render() {
+    const { t, modifyLoading, error } = this.props;
+    return (
+      <Page
+        title={t("edit.title")}
+        subtitle={t("edit.subtitle")}
+        error={error}
+        showContentOnError={true}
+      >
+        <RepositoryForm
+          repository={this.props.repository}
+          loading={modifyLoading}
+          submitForm={repo => {
+            this.props.modifyRepo(repo, this.repoModified);
+          }}
+        />
+      </Page>
+    );
+  }
+}
+
+const mapStateToProps = (state, ownProps) => {
+  const { namespace, name } = ownProps.repository;
+
+  const modifyLoading = isModifyRepoPending(state, namespace, name);
+
+  const error = getModifyRepoFailure(state, namespace, name);
+
+  return {
+    modifyLoading,
+    error
+  };
+};
+
+const mapDispatchToProps = dispatch => {
+  return {
+    modifyRepo: (repo: Repository, callback: () => void) => {
+      dispatch(modifyRepo(repo, callback));
+    }
+  };
+};
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(translate("repos")(withRouter(Edit)));
diff --git a/scm-ui/src/repos/containers/RepositoryRoot.js b/scm-ui/src/repos/containers/RepositoryRoot.js
index 97390aaa52..fe343b4be3 100644
--- a/scm-ui/src/repos/containers/RepositoryRoot.js
+++ b/scm-ui/src/repos/containers/RepositoryRoot.js
@@ -17,8 +17,10 @@ import { translate } from "react-i18next";
 import { Navigation, NavLink, Section } from "../../components/navigation";
 import RepositoryDetails from "../components/RepositoryDetails";
 import DeleteNavAction from "../components/DeleteNavAction";
+import Edit from "../containers/Edit";
 
 import type { History } from "history";
+import EditNavLink from "../components/EditNavLink";
 
 type Props = {
   namespace: string,
@@ -91,10 +93,15 @@ class RepositoryRoot extends React.Component<Props> {
               exact
               component={() => <RepositoryDetails repository={repository} />}
             />
+            <Route
+              path={`${url}/edit`}
+              component={() => <Edit repository={repository} />}
+            />
           </div>
           <div className="column">
             <Navigation>
               <Section label={t("repository-root.actions-label")}>
+                <EditNavLink repository={repository} editUrl={`${url}/edit`} />
                 <DeleteNavAction repository={repository} delete={this.delete} />
                 <NavLink to="/repos" label={t("repository-root.back-label")} />
               </Section>
diff --git a/scm-ui/src/repos/modules/repos.js b/scm-ui/src/repos/modules/repos.js
index 8f401e00ce..da0a69850e 100644
--- a/scm-ui/src/repos/modules/repos.js
+++ b/scm-ui/src/repos/modules/repos.js
@@ -22,6 +22,11 @@ export const CREATE_REPO_SUCCESS = `${CREATE_REPO}_${types.SUCCESS_SUFFIX}`;
 export const CREATE_REPO_FAILURE = `${CREATE_REPO}_${types.FAILURE_SUFFIX}`;
 export const CREATE_REPO_RESET = `${CREATE_REPO}_${types.RESET_SUFFIX}`;
 
+export const MODIFY_REPO = "scm/repos/MODIFY_REPO";
+export const MODIFY_REPO_PENDING = `${MODIFY_REPO}_${types.PENDING_SUFFIX}`;
+export const MODIFY_REPO_SUCCESS = `${MODIFY_REPO}_${types.SUCCESS_SUFFIX}`;
+export const MODIFY_REPO_FAILURE = `${MODIFY_REPO}_${types.FAILURE_SUFFIX}`;
+
 export const DELETE_REPO = "scm/repos/DELETE_REPO";
 export const DELETE_REPO_PENDING = `${DELETE_REPO}_${types.PENDING_SUFFIX}`;
 export const DELETE_REPO_SUCCESS = `${DELETE_REPO}_${types.SUCCESS_SUFFIX}`;
@@ -188,6 +193,54 @@ export function createRepoReset(): Action {
   };
 }
 
+// modify
+
+export function modifyRepo(repository: Repository, callback?: () => void) {
+  return function(dispatch: any) {
+    dispatch(modifyRepoPending(repository));
+
+    return apiClient
+      .put(repository._links.update.href, repository, CONTENT_TYPE)
+      .then(() => {
+        dispatch(modifyRepoSuccess(repository));
+        if (callback) {
+          callback();
+        }
+      })
+      .catch(cause => {
+        const error = new Error(`failed to modify repo: ${cause.message}`);
+        dispatch(modifyRepoFailure(repository, error));
+      });
+  };
+}
+
+export function modifyRepoPending(repository: Repository): Action {
+  return {
+    type: MODIFY_REPO_PENDING,
+    payload: repository,
+    itemId: createIdentifier(repository)
+  };
+}
+
+export function modifyRepoSuccess(repository: Repository): Action {
+  return {
+    type: MODIFY_REPO_SUCCESS,
+    payload: repository,
+    itemId: createIdentifier(repository)
+  };
+}
+
+export function modifyRepoFailure(
+  repository: Repository,
+  error: Error
+): Action {
+  return {
+    type: MODIFY_REPO_FAILURE,
+    payload: { error, repository },
+    itemId: createIdentifier(repository)
+  };
+}
+
 // delete
 
 export function deleteRepo(repository: Repository, callback?: () => void) {
@@ -288,6 +341,8 @@ export default function reducer(
   switch (action.type) {
     case FETCH_REPOS_SUCCESS:
       return normalizeByNamespaceAndName(action.payload);
+    case MODIFY_REPO_SUCCESS:
+      return reducerByNames(state, action.payload);
     case FETCH_REPO_SUCCESS:
       return reducerByNames(state, action.payload);
     default:
@@ -359,6 +414,22 @@ export function getCreateRepoFailure(state: Object) {
   return getFailure(state, CREATE_REPO);
 }
 
+export function isModifyRepoPending(
+  state: Object,
+  namespace: string,
+  name: string
+) {
+  return isPending(state, MODIFY_REPO, namespace + "/" + name);
+}
+
+export function getModifyRepoFailure(
+  state: Object,
+  namespace: string,
+  name: string
+) {
+  return getFailure(state, MODIFY_REPO, namespace + "/" + name);
+}
+
 export function isDeleteRepoPending(
   state: Object,
   namespace: string,
diff --git a/scm-ui/src/repos/modules/repos.test.js b/scm-ui/src/repos/modules/repos.test.js
index 0544f56d16..27dfb481a0 100644
--- a/scm-ui/src/repos/modules/repos.test.js
+++ b/scm-ui/src/repos/modules/repos.test.js
@@ -37,7 +37,15 @@ import reducer, {
   DELETE_REPO_PENDING,
   DELETE_REPO_FAILURE,
   isDeleteRepoPending,
-  getDeleteRepoFailure
+  getDeleteRepoFailure,
+  modifyRepo,
+  MODIFY_REPO_PENDING,
+  MODIFY_REPO_SUCCESS,
+  MODIFY_REPO_FAILURE,
+  MODIFY_REPO,
+  isModifyRepoPending,
+  getModifyRepoFailure,
+  modifyRepoSuccess
 } from "./repos";
 import type { Repository, RepositoryCollection } from "../types/Repositories";
 
@@ -485,6 +493,64 @@ describe("repos fetch", () => {
       expect(actions[1].payload.error).toBeDefined();
     });
   });
+
+  it("should successfully modify slarti/fjords repo", () => {
+    fetchMock.putOnce(slartiFjords._links.update.href, {
+      status: 204
+    });
+
+    let editedFjords = {...slartiFjords};
+    editedFjords.description = "coast of africa";
+
+    const store = mockStore({});
+
+    return store.dispatch(modifyRepo(editedFjords)).then(() => {
+      const actions = store.getActions();
+      expect(actions[0].type).toEqual(MODIFY_REPO_PENDING);
+      expect(actions[1].type).toEqual(MODIFY_REPO_SUCCESS);
+    });
+  });
+
+  it("should successfully modify slarti/fjords repo and call the callback", () => {
+    fetchMock.putOnce(slartiFjords._links.update.href, {
+      status: 204
+    });
+
+    let editedFjords = {...slartiFjords};
+    editedFjords.description = "coast of africa";
+
+    const store = mockStore({});
+
+    let called = false;
+    const callback = () => {
+      called = true;
+    };
+
+    return store.dispatch(modifyRepo(editedFjords, callback)).then(() => {
+      const actions = store.getActions();
+      expect(actions[0].type).toEqual(MODIFY_REPO_PENDING);
+      expect(actions[1].type).toEqual(MODIFY_REPO_SUCCESS);
+      expect(called).toBe(true);
+    });
+  });
+
+  it("should fail modifying on HTTP 500", () => {
+    fetchMock.putOnce(slartiFjords._links.update.href, {
+      status: 500
+    });
+
+    let editedFjords = { ...slartiFjords };
+    editedFjords.description = "coast of africa";
+
+    const store = mockStore({});
+
+    return store.dispatch(modifyRepo(editedFjords)).then(() => {
+      const actions = store.getActions();
+      expect(actions[0].type).toEqual(MODIFY_REPO_PENDING);
+      expect(actions[1].type).toEqual(MODIFY_REPO_FAILURE);
+      expect(actions[1].payload).toBeDefined();
+    });
+  });
 });
 
 describe("repos reducer", () => {
@@ -521,6 +587,18 @@ describe("repos reducer", () => {
     const newState = reducer({}, fetchRepoSuccess(slartiFjords));
     expect(newState.byNames["slarti/fjords"]).toBe(slartiFjords);
   });
+
+  it("should update reposByNames", () => {
+    const oldState = {
+      byNames: {
+        "slarti/fjords": slartiFjords
+      }
+    };
+    let slartiFjordsEdited = { ...slartiFjords };
+    slartiFjordsEdited.description = "I bless the rains down in Africa";
+    const newState = reducer(oldState, modifyRepoSuccess(slartiFjordsEdited));
+    expect(newState.byNames["slarti/fjords"]).toEqual(slartiFjordsEdited);
+  });
 });
 
 describe("repos selectors", () => {
@@ -635,6 +713,36 @@ describe("repos selectors", () => {
     expect(getCreateRepoFailure({})).toBe(undefined);
   });
 
+  // modify
+
+  it("should return true, when modify repo is pending", () => {
+    const state = {
+      pending: {
+        [MODIFY_REPO + "/slarti/fjords"]: true
+      }
+    };
+
+    expect(isModifyRepoPending(state, "slarti", "fjords")).toEqual(true);
+  });
+
+  it("should return false, when modify repo is not pending", () => {
+    expect(isModifyRepoPending({}, "slarti", "fjords")).toEqual(false);
+  });
+
+  it("should return error, when modify repo failed", () => {
+    const state = {
+      failure: {
+        [MODIFY_REPO + "/slarti/fjords"]: error
+      }
+    };
+
+    expect(getModifyRepoFailure(state, "slarti", "fjords")).toEqual(error);
+  });
+
+  it("should return undefined, when modify did not fail", () => {
+    expect(getModifyRepoFailure({}, "slarti", "fjords")).toBeUndefined();
+  });
+
   // delete
 
   it("should return true, when delete repo is pending", () => {

From 04999bba867546d54d2340c92ee73c8bacbad354 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Mon, 6 Aug 2018 16:16:19 +0200
Subject: [PATCH 41/51] Move test data creation to class TestData

---
 .../java/sonia/scm/it/RepositoriesITCase.java | 37 +++-----------
 ...IntegrationTestUtil.java => ScmTypes.java} |  4 +-
 .../src/test/java/sonia/scm/it/TestData.java  | 50 +++++++++++++++++--
 3 files changed, 55 insertions(+), 36 deletions(-)
 rename scm-it/src/test/java/sonia/scm/it/{ScmParameterizedIntegrationTestUtil.java => ScmTypes.java} (76%)

diff --git a/scm-it/src/test/java/sonia/scm/it/RepositoriesITCase.java b/scm-it/src/test/java/sonia/scm/it/RepositoriesITCase.java
index 44cbb9dac6..cd791cb013 100644
--- a/scm-it/src/test/java/sonia/scm/it/RepositoriesITCase.java
+++ b/scm-it/src/test/java/sonia/scm/it/RepositoriesITCase.java
@@ -34,7 +34,6 @@ package sonia.scm.it;
 //~--- non-JDK imports --------------------------------------------------------
 
 import org.apache.http.HttpStatus;
-import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -48,7 +47,6 @@ import sonia.scm.repository.client.api.RepositoryClient;
 import sonia.scm.repository.client.api.RepositoryClientFactory;
 import sonia.scm.web.VndMediaType;
 
-import javax.json.Json;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -62,6 +60,8 @@ import static org.junit.Assert.assertEquals;
 import static sonia.scm.it.RegExMatcher.matchesPattern;
 import static sonia.scm.it.RestUtil.createResourceUrl;
 import static sonia.scm.it.RestUtil.given;
+import static sonia.scm.it.ScmTypes.availableScmTypes;
+import static sonia.scm.it.TestData.repositoryJson;
 
 @RunWith(Parameterized.class)
 public class RepositoriesITCase {
@@ -77,34 +77,21 @@ public class RepositoriesITCase {
 
   public RepositoriesITCase(String repositoryType) {
     this.repositoryType = repositoryType;
+    this.repositoryUrl = TestData.getDefaultRepositoryUrl(repositoryType);
   }
 
   @Parameters(name = "{0}")
   public static Collection<String> createParameters() {
-    return ScmParameterizedIntegrationTestUtil.createParameters();
+    return availableScmTypes();
   }
 
   @Before
   public void createRepository() {
-    this.repositoryUrl = given(VndMediaType.REPOSITORY)
-      .body(repositoryJson())
-
-      .when()
-      .post(createResourceUrl("repositories"))
-
-      .then()
-      .statusCode(HttpStatus.SC_CREATED)
-      .extract()
-      .header("location");
-  }
-
-  @After
-  public void cleanup() {
-    TestData.cleanup();
+    TestData.createDefault();
   }
 
   @Test
-  public void shouldCreateSuccessfully() throws IOException {
+  public void shouldCreateSuccessfully() {
     given(VndMediaType.REPOSITORY)
 
       .when()
@@ -142,7 +129,7 @@ public class RepositoriesITCase {
 
   @Test
   public void shouldRejectMultipleCreations() {
-    String repositoryJson = repositoryJson();
+    String repositoryJson = repositoryJson(repositoryType);
     given(VndMediaType.REPOSITORY)
       .body(repositoryJson)
 
@@ -208,14 +195,4 @@ public class RepositoriesITCase {
       .extract()
       .path("_links.httpProtocol.href");
   }
-
-  private String repositoryJson() {
-    return Json.createObjectBuilder()
-      .add("contact", "zaphod.beeblebrox@hitchhiker.com")
-      .add("description", "Heart of Gold")
-      .add("name", "HeartOfGold-" + repositoryType)
-      .add("archived", false)
-      .add("type", repositoryType)
-      .build().toString();
-  }
 }
diff --git a/scm-it/src/test/java/sonia/scm/it/ScmParameterizedIntegrationTestUtil.java b/scm-it/src/test/java/sonia/scm/it/ScmTypes.java
similarity index 76%
rename from scm-it/src/test/java/sonia/scm/it/ScmParameterizedIntegrationTestUtil.java
rename to scm-it/src/test/java/sonia/scm/it/ScmTypes.java
index d8b43aef30..e8ba67e561 100644
--- a/scm-it/src/test/java/sonia/scm/it/ScmParameterizedIntegrationTestUtil.java
+++ b/scm-it/src/test/java/sonia/scm/it/ScmTypes.java
@@ -5,8 +5,8 @@ import sonia.scm.util.IOUtil;
 import java.util.ArrayList;
 import java.util.Collection;
 
-class ScmParameterizedIntegrationTestUtil {
-  static Collection<String> createParameters() {
+class ScmTypes {
+  static Collection<String> availableScmTypes() {
     Collection<String> params = new ArrayList<>();
 
     params.add("git");
diff --git a/scm-it/src/test/java/sonia/scm/it/TestData.java b/scm-it/src/test/java/sonia/scm/it/TestData.java
index 4127b74b9d..b2785b2051 100644
--- a/scm-it/src/test/java/sonia/scm/it/TestData.java
+++ b/scm-it/src/test/java/sonia/scm/it/TestData.java
@@ -5,11 +5,15 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import sonia.scm.web.VndMediaType;
 
+import javax.json.Json;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import static java.util.Arrays.asList;
 import static sonia.scm.it.RestUtil.createResourceUrl;
 import static sonia.scm.it.RestUtil.given;
+import static sonia.scm.it.ScmTypes.availableScmTypes;
 
 public class TestData {
 
@@ -17,13 +21,24 @@ public class TestData {
 
   private static final List<String> PROTECTED_USERS = asList("scmadmin", "anonymous");
 
+  private static Map<String, String> DEFAULT_REPOSITORIES = new HashMap<>();
+
+  public static void createDefault() {
+    cleanup();
+    createDefaultRepositories();
+  }
+
   public static void cleanup() {
     cleanupRepositories();
     cleanupGroups();
     cleanupUsers();
   }
 
-  public static void cleanupRepositories() {
+  public static String getDefaultRepositoryUrl(String repositoryType) {
+    return DEFAULT_REPOSITORIES.get(repositoryType);
+  }
+
+  private static void cleanupRepositories() {
     List<String> repositories = given(VndMediaType.REPOSITORY_COLLECTION)
       .when()
       .get(createResourceUrl("repositories"))
@@ -33,9 +48,10 @@ public class TestData {
       .body().jsonPath().getList("_embedded.repositories._links.self.href");
     LOG.info("about to delete {} repositories", repositories.size());
     repositories.forEach(TestData::delete);
+    DEFAULT_REPOSITORIES.clear();
   }
 
-  public static void cleanupGroups() {
+  private static void cleanupGroups() {
     List<String> groups = given(VndMediaType.GROUP_COLLECTION)
       .when()
       .get(createResourceUrl("groups"))
@@ -47,7 +63,7 @@ public class TestData {
     groups.forEach(TestData::delete);
   }
 
-  public static void cleanupUsers() {
+  private static void cleanupUsers() {
     List<String> users = given(VndMediaType.USER_COLLECTION)
       .when()
       .get(createResourceUrl("users"))
@@ -59,7 +75,7 @@ public class TestData {
     users.stream().filter(url -> PROTECTED_USERS.stream().noneMatch(url::contains)).forEach(TestData::delete);
   }
 
-  public static void delete(String url) {
+  private static void delete(String url) {
     given(VndMediaType.REPOSITORY)
       .when()
       .delete(url)
@@ -68,6 +84,32 @@ public class TestData {
     LOG.info("deleted {}", url);
   }
 
+  private static void createDefaultRepositories() {
+    for (String repositoryType : availableScmTypes()) {
+      String url = given(VndMediaType.REPOSITORY)
+        .body(repositoryJson(repositoryType))
+
+        .when()
+        .post(createResourceUrl("repositories"))
+
+        .then()
+        .statusCode(HttpStatus.SC_CREATED)
+        .extract()
+        .header("location");
+      DEFAULT_REPOSITORIES.put(repositoryType, url);
+    }
+  }
+
+  public static String repositoryJson(String repositoryType) {
+    return Json.createObjectBuilder()
+      .add("contact", "zaphod.beeblebrox@hitchhiker.com")
+      .add("description", "Heart of Gold")
+      .add("name", "HeartOfGold-" + repositoryType)
+      .add("archived", false)
+      .add("type", repositoryType)
+      .build().toString();
+  }
+
   public static void main(String[] args) {
     cleanup();
   }

From a33c5246117255bb3d6a8837a707aa585cf195c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Mon, 6 Aug 2018 16:37:22 +0200
Subject: [PATCH 42/51] Add integration test stage in CI build

---
 Jenkinsfile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Jenkinsfile b/Jenkinsfile
index aa6cd6b33b..558fb8aeda 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -34,6 +34,10 @@ node() { // No specific label
         mvn 'test -Dsonia.scm.test.skip.hg=true -Dmaven.test.failure.ignore=true'
       }
 
+      stage('Integration Test') {
+        mvn 'verify -Pit -pl :scm-webapp,:scm-it'
+      }
+
       stage('SonarQube') {
 
         analyzeWith(mvn)

From 5731b607beeaf51b35de6134599deffbb183c69e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maren=20S=C3=BCwer?= <maren.suewer@cloudogu.com>
Date: Tue, 7 Aug 2018 12:58:16 +0200
Subject: [PATCH 43/51] change repository-types to repositoryTypes

---
 scm-ui/package.json                                  |  2 +-
 scm-ui/src/repos/modules/repository-types.js         |  4 ++--
 scm-ui/src/repos/modules/repository-types.test.js    | 12 ++++++------
 scm-ui/src/repos/types/RepositoryTypes.js            |  2 +-
 .../RepositoryTypeCollectionToDtoMapper.java         |  2 +-
 .../api/v2/resources/RepositoryTypeRootResource.java |  2 +-
 .../RepositoryTypeCollectionToDtoMapperTest.java     |  4 ++--
 .../RepositoryTypeToRepositoryTypeDtoMapperTest.java |  2 +-
 8 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/scm-ui/package.json b/scm-ui/package.json
index 6ce2e8880e..69563bedea 100644
--- a/scm-ui/package.json
+++ b/scm-ui/package.json
@@ -37,7 +37,7 @@
     "test-ci": "jest --ci --coverage",
     "eject": "react-scripts eject",
     "flow": "flow",
-    "pre-commit": "jest && flow && eslint src"
+    "pre-commit": "jest && eslint src"
   },
   "proxy": {
     "/scm/api": {
diff --git a/scm-ui/src/repos/modules/repository-types.js b/scm-ui/src/repos/modules/repository-types.js
index 1231486cfc..ecc3594c2b 100644
--- a/scm-ui/src/repos/modules/repository-types.js
+++ b/scm-ui/src/repos/modules/repository-types.js
@@ -32,7 +32,7 @@ export function fetchRepositoryTypesIfNeeded() {
 function fetchRepositoryTypes(dispatch: any) {
   dispatch(fetchRepositoryTypesPending());
   return apiClient
-    .get("repository-types")
+    .get("repositoryTypes")
     .then(response => response.json())
     .then(repositoryTypes => {
       dispatch(fetchRepositoryTypesSuccess(repositoryTypes));
@@ -84,7 +84,7 @@ export default function reducer(
   action: Action = { type: "UNKNOWN" }
 ): RepositoryType[] {
   if (action.type === FETCH_REPOSITORY_TYPES_SUCCESS && action.payload) {
-    return action.payload._embedded["repository-types"];
+    return action.payload._embedded["repositoryTypes"];
   }
   return state;
 }
diff --git a/scm-ui/src/repos/modules/repository-types.test.js b/scm-ui/src/repos/modules/repository-types.test.js
index 578a814ff0..fe7ca19ef5 100644
--- a/scm-ui/src/repos/modules/repository-types.test.js
+++ b/scm-ui/src/repos/modules/repository-types.test.js
@@ -22,7 +22,7 @@ const git = {
   displayName: "Git",
   _links: {
     self: {
-      href: "http://localhost:8081/scm/api/rest/v2/repository-types/git"
+      href: "http://localhost:8081/scm/api/rest/v2/repositoryTypes/git"
     }
   }
 };
@@ -32,7 +32,7 @@ const hg = {
   displayName: "Mercurial",
   _links: {
     self: {
-      href: "http://localhost:8081/scm/api/rest/v2/repository-types/hg"
+      href: "http://localhost:8081/scm/api/rest/v2/repositoryTypes/hg"
     }
   }
 };
@@ -42,18 +42,18 @@ const svn = {
   displayName: "Subversion",
   _links: {
     self: {
-      href: "http://localhost:8081/scm/api/rest/v2/repository-types/svn"
+      href: "http://localhost:8081/scm/api/rest/v2/repositoryTypes/svn"
     }
   }
 };
 
 const collection = {
   _embedded: {
-    "repository-types": [git, hg, svn]
+    repositoryTypes: [git, hg, svn]
   },
   _links: {
     self: {
-      href: "http://localhost:8081/scm/api/rest/v2/repository-types"
+      href: "http://localhost:8081/scm/api/rest/v2/repositoryTypes"
     }
   }
 };
@@ -97,7 +97,7 @@ describe("repository types caching", () => {
 });
 
 describe("repository types fetch", () => {
-  const URL = "/scm/api/rest/v2/repository-types";
+  const URL = "/scm/api/rest/v2/repositoryTypes";
   const mockStore = configureMockStore([thunk]);
 
   afterEach(() => {
diff --git a/scm-ui/src/repos/types/RepositoryTypes.js b/scm-ui/src/repos/types/RepositoryTypes.js
index 069b901b56..c9e77185e5 100644
--- a/scm-ui/src/repos/types/RepositoryTypes.js
+++ b/scm-ui/src/repos/types/RepositoryTypes.js
@@ -9,6 +9,6 @@ export type RepositoryType = {
 
 export type RepositoryTypeCollection = Collection & {
   _embedded: {
-    "repository-types": RepositoryType[]
+    "repositoryTypes": RepositoryType[]
   }
 };
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryTypeCollectionToDtoMapper.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryTypeCollectionToDtoMapper.java
index b9d7ff46c9..c3b6953eec 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryTypeCollectionToDtoMapper.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryTypeCollectionToDtoMapper.java
@@ -10,7 +10,7 @@ public class RepositoryTypeCollectionToDtoMapper extends CollectionToDtoMapper<R
 
   @Inject
   public RepositoryTypeCollectionToDtoMapper(RepositoryTypeToRepositoryTypeDtoMapper mapper, ResourceLinks resourceLinks) {
-    super("repository-types", mapper);
+    super("repositoryTypes", mapper);
     this.resourceLinks = resourceLinks;
   }
 
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryTypeRootResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryTypeRootResource.java
index 0adc198e96..5b5998a0a9 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryTypeRootResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryTypeRootResource.java
@@ -10,7 +10,7 @@ import javax.ws.rs.Path;
 @Path(RepositoryTypeRootResource.PATH)
 public class RepositoryTypeRootResource {
 
-  static final String PATH = "v2/repository-types/";
+  static final String PATH = "v2/repositoryTypes/";
 
   private Provider<RepositoryTypeCollectionResource> collectionResourceProvider;
   private Provider<RepositoryTypeResource> resourceProvider;
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryTypeCollectionToDtoMapperTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryTypeCollectionToDtoMapperTest.java
index ecde79ae1f..dbd46ec5f9 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryTypeCollectionToDtoMapperTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryTypeCollectionToDtoMapperTest.java
@@ -45,7 +45,7 @@ public class RepositoryTypeCollectionToDtoMapperTest {
   public void shouldHaveEmbeddedDtos() {
     HalRepresentation mappedTypes = collectionMapper.map(types);
     Embedded embedded = mappedTypes.getEmbedded();
-    List<RepositoryTypeDto> embeddedTypes = embedded.getItemsBy("repository-types", RepositoryTypeDto.class);
+    List<RepositoryTypeDto> embeddedTypes = embedded.getItemsBy("repositoryTypes", RepositoryTypeDto.class);
     assertEquals("hk", embeddedTypes.get(0).getName());
     assertEquals("hog", embeddedTypes.get(1).getName());
   }
@@ -54,7 +54,7 @@ public class RepositoryTypeCollectionToDtoMapperTest {
   public void shouldHaveSelfLink() {
     HalRepresentation mappedTypes = collectionMapper.map(types);
     Optional<Link> self = mappedTypes.getLinks().getLinkBy("self");
-    assertEquals("https://scm-manager.org/scm/v2/repository-types/", self.get().getHref());
+    assertEquals("https://scm-manager.org/scm/v2/repositoryTypes/", self.get().getHref());
   }
 
 }
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryTypeToRepositoryTypeDtoMapperTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryTypeToRepositoryTypeDtoMapperTest.java
index 9a40c253c4..73f0a5672c 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryTypeToRepositoryTypeDtoMapperTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryTypeToRepositoryTypeDtoMapperTest.java
@@ -35,7 +35,7 @@ public class RepositoryTypeToRepositoryTypeDtoMapperTest {
   public void shouldAppendSelfLink() {
     RepositoryTypeDto dto = mapper.map(type);
     assertEquals(
-      "https://scm-manager.org/scm/v2/repository-types/hk",
+      "https://scm-manager.org/scm/v2/repositoryTypes/hk",
       dto.getLinks().getLinkBy("self").get().getHref()
     );
   }

From 839eb8d618124bb3f47709adae2bc3aa14e9e58f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maren=20S=C3=BCwer?= <maren.suewer@cloudogu.com>
Date: Tue, 7 Aug 2018 14:00:29 +0200
Subject: [PATCH 44/51] renaming of repository-types files to repositoryTypes

---
 scm-ui/src/createReduxStore.js                                | 2 +-
 scm-ui/src/repos/containers/Create.js                         | 2 +-
 scm-ui/src/repos/modules/repos.test.js                        | 4 ++--
 .../repos/modules/{repository-types.js => repositoryTypes.js} | 0
 .../{repository-types.test.js => repositoryTypes.test.js}     | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)
 rename scm-ui/src/repos/modules/{repository-types.js => repositoryTypes.js} (100%)
 rename scm-ui/src/repos/modules/{repository-types.test.js => repositoryTypes.test.js} (98%)

diff --git a/scm-ui/src/createReduxStore.js b/scm-ui/src/createReduxStore.js
index a360381810..e41a72ba64 100644
--- a/scm-ui/src/createReduxStore.js
+++ b/scm-ui/src/createReduxStore.js
@@ -6,7 +6,7 @@ import { routerReducer, routerMiddleware } from "react-router-redux";
 
 import users from "./users/modules/users";
 import repos from "./repos/modules/repos";
-import repositoryTypes from "./repos/modules/repository-types";
+import repositoryTypes from "./repos/modules/repositoryTypes";
 import auth from "./modules/auth";
 import pending from "./modules/pending";
 import failure from "./modules/failure";
diff --git a/scm-ui/src/repos/containers/Create.js b/scm-ui/src/repos/containers/Create.js
index b705788d1d..0fb41ab2c1 100644
--- a/scm-ui/src/repos/containers/Create.js
+++ b/scm-ui/src/repos/containers/Create.js
@@ -10,7 +10,7 @@ import {
   getFetchRepositoryTypesFailure,
   getRepositoryTypes,
   isFetchRepositoryTypesPending
-} from "../modules/repository-types";
+} from "../modules/repositoryTypes";
 import {
   createRepo,
   createRepoReset,
diff --git a/scm-ui/src/repos/modules/repos.test.js b/scm-ui/src/repos/modules/repos.test.js
index 27dfb481a0..75efb69ad7 100644
--- a/scm-ui/src/repos/modules/repos.test.js
+++ b/scm-ui/src/repos/modules/repos.test.js
@@ -499,7 +499,7 @@ describe("repos fetch", () => {
       status: 204
     });
 
-    let editedFjords = {...slartiFjords};
+    let editedFjords = { ...slartiFjords };
     editedFjords.description = "coast of africa";
 
     const store = mockStore({});
@@ -516,7 +516,7 @@ describe("repos fetch", () => {
       status: 204
     });
 
-    let editedFjords = {...slartiFjords};
+    let editedFjords = { ...slartiFjords };
     editedFjords.description = "coast of africa";
 
     const store = mockStore({});
diff --git a/scm-ui/src/repos/modules/repository-types.js b/scm-ui/src/repos/modules/repositoryTypes.js
similarity index 100%
rename from scm-ui/src/repos/modules/repository-types.js
rename to scm-ui/src/repos/modules/repositoryTypes.js
diff --git a/scm-ui/src/repos/modules/repository-types.test.js b/scm-ui/src/repos/modules/repositoryTypes.test.js
similarity index 98%
rename from scm-ui/src/repos/modules/repository-types.test.js
rename to scm-ui/src/repos/modules/repositoryTypes.test.js
index fe7ca19ef5..1f29bfa77f 100644
--- a/scm-ui/src/repos/modules/repository-types.test.js
+++ b/scm-ui/src/repos/modules/repositoryTypes.test.js
@@ -14,8 +14,8 @@ import {
   getRepositoryTypes,
   isFetchRepositoryTypesPending,
   shouldFetchRepositoryTypes
-} from "./repository-types";
-import reducer from "./repository-types";
+} from "./repositoryTypes";
+import reducer from "./repositoryTypes";
 
 const git = {
   name: "git",

From 7bf76a91f5f1ccc89fc6a92ec4d5672db312211b Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Tue, 7 Aug 2018 15:08:44 +0200
Subject: [PATCH 45/51] fixed review notes

---
 scm-ui/public/locales/en/repos.json           |  8 +++---
 .../repos/components/list/RepositoryEntry.js  |  2 --
 scm-ui/src/repos/containers/Edit.js           | 27 +++++++------------
 scm-ui/src/repos/containers/RepositoryRoot.js |  5 +++-
 scm-ui/src/repos/modules/repositoryTypes.js   |  5 +++-
 5 files changed, 20 insertions(+), 27 deletions(-)

diff --git a/scm-ui/public/locales/en/repos.json b/scm-ui/public/locales/en/repos.json
index 29074a49ba..7db2623247 100644
--- a/scm-ui/public/locales/en/repos.json
+++ b/scm-ui/public/locales/en/repos.json
@@ -20,16 +20,14 @@
     "error-title": "Error",
     "error-subtitle": "Unknown repository error",
     "actions-label": "Actions",
-    "back-label": "Back"
+    "back-label": "Back",
+    "navigation-label": "Navigation",
+    "information": "Information"
   },
   "create": {
     "title": "Create Repository",
     "subtitle": "Create a new repository"
   },
-  "edit": {
-    "title": "Edit Repository",
-    "subtitle": "Edit an existing repository"
-  },
   "repository-form": {
     "submit": "Save"
   },
diff --git a/scm-ui/src/repos/components/list/RepositoryEntry.js b/scm-ui/src/repos/components/list/RepositoryEntry.js
index 72ebd70d77..99d59020ce 100644
--- a/scm-ui/src/repos/components/list/RepositoryEntry.js
+++ b/scm-ui/src/repos/components/list/RepositoryEntry.js
@@ -9,8 +9,6 @@ import classNames from "classnames";
 
 import icon from "../../../images/blib.jpg";
 
-// TODO we need a variable or something central for the hover
-
 const styles = {
   outer: {
     position: "relative"
diff --git a/scm-ui/src/repos/containers/Edit.js b/scm-ui/src/repos/containers/Edit.js
index 3a5662ecf1..201ab3f2a7 100644
--- a/scm-ui/src/repos/containers/Edit.js
+++ b/scm-ui/src/repos/containers/Edit.js
@@ -2,7 +2,6 @@
 import React from "react";
 import { connect } from "react-redux";
 import { translate } from "react-i18next";
-import { Page } from "../../components/layout";
 import RepositoryForm from "../components/form";
 import type { Repository } from "../types/Repositories";
 import {
@@ -12,11 +11,12 @@ import {
 } from "../modules/repos";
 import { withRouter } from "react-router-dom";
 import type { History } from "history";
+import ErrorNotification from "../../components/ErrorNotification";
 
 type Props = {
   repository: Repository,
   modifyRepo: (Repository, () => void) => void,
-  modifyLoading: boolean,
+  loading: boolean,
   error: Error,
 
   // context props
@@ -25,43 +25,34 @@ type Props = {
 };
 
 class Edit extends React.Component<Props> {
-  componentDidMount() {}
-
   repoModified = () => {
     const { history, repository } = this.props;
     history.push(`/repo/${repository.namespace}/${repository.name}`);
   };
 
   render() {
-    const { t, modifyLoading, error } = this.props;
+    const { loading, error } = this.props;
     return (
-      <Page
-        title={t("edit.title")}
-        subtitle={t("edit.subtitle")}
-        error={error}
-        showContentOnError={true}
-      >
+      <div>
+        <ErrorNotification error={error} />
         <RepositoryForm
           repository={this.props.repository}
-          loading={modifyLoading}
+          loading={loading}
           submitForm={repo => {
             this.props.modifyRepo(repo, this.repoModified);
           }}
         />
-      </Page>
+      </div>
     );
   }
 }
 
 const mapStateToProps = (state, ownProps) => {
   const { namespace, name } = ownProps.repository;
-
-  const modifyLoading = isModifyRepoPending(state, namespace, name);
-
+  const loading = isModifyRepoPending(state, namespace, name);
   const error = getModifyRepoFailure(state, namespace, name);
-
   return {
-    modifyLoading,
+    loading,
     error
   };
 };
diff --git a/scm-ui/src/repos/containers/RepositoryRoot.js b/scm-ui/src/repos/containers/RepositoryRoot.js
index fe343b4be3..820aedf964 100644
--- a/scm-ui/src/repos/containers/RepositoryRoot.js
+++ b/scm-ui/src/repos/containers/RepositoryRoot.js
@@ -100,8 +100,11 @@ class RepositoryRoot extends React.Component<Props> {
           </div>
           <div className="column">
             <Navigation>
-              <Section label={t("repository-root.actions-label")}>
+              <Section label={t("repository-root.navigation-label")}>
+                <NavLink to={url} label={t("repository-root.information")} />
                 <EditNavLink repository={repository} editUrl={`${url}/edit`} />
+              </Section>
+              <Section label={t("repository-root.actions-label")}>
                 <DeleteNavAction repository={repository} delete={this.delete} />
                 <NavLink to="/repos" label={t("repository-root.back-label")} />
               </Section>
diff --git a/scm-ui/src/repos/modules/repositoryTypes.js b/scm-ui/src/repos/modules/repositoryTypes.js
index ecc3594c2b..c41fdcfc67 100644
--- a/scm-ui/src/repos/modules/repositoryTypes.js
+++ b/scm-ui/src/repos/modules/repositoryTypes.js
@@ -38,7 +38,10 @@ function fetchRepositoryTypes(dispatch: any) {
       dispatch(fetchRepositoryTypesSuccess(repositoryTypes));
     })
     .catch(err => {
-      dispatch(fetchRepositoryTypesFailure(err));
+      const error = new Error(
+        `failed to fetch repository types: ${err.message}`
+      );
+      dispatch(fetchRepositoryTypesFailure(error));
     });
 }
 

From b251f61471271848e91b60ef5396559a2090ce93 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Tue, 7 Aug 2018 15:10:47 +0200
Subject: [PATCH 46/51] reenable flow for pre-commit

---
 scm-ui/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scm-ui/package.json b/scm-ui/package.json
index 69563bedea..6ce2e8880e 100644
--- a/scm-ui/package.json
+++ b/scm-ui/package.json
@@ -37,7 +37,7 @@
     "test-ci": "jest --ci --coverage",
     "eject": "react-scripts eject",
     "flow": "flow",
-    "pre-commit": "jest && eslint src"
+    "pre-commit": "jest && flow && eslint src"
   },
   "proxy": {
     "/scm/api": {

From 0a887be34926b236f36776a68b7085347072f6ee Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Tue, 7 Aug 2018 15:39:39 +0200
Subject: [PATCH 47/51] cleanup pom of scm-it module

---
 scm-it/pom.xml | 52 ++++++++++++++------------------------------------
 1 file changed, 14 insertions(+), 38 deletions(-)

diff --git a/scm-it/pom.xml b/scm-it/pom.xml
index 7fe464ccf5..3753f06d4d 100644
--- a/scm-it/pom.xml
+++ b/scm-it/pom.xml
@@ -21,6 +21,7 @@
       <artifactId>scm-core</artifactId>
       <version>2.0.0-SNAPSHOT</version>
     </dependency>
+
     <dependency>
       <groupId>sonia.scm</groupId>
       <artifactId>scm-test</artifactId>
@@ -33,6 +34,7 @@
       <version>2.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
+
     <dependency>
       <groupId>sonia.scm.plugins</groupId>
       <artifactId>scm-git-plugin</artifactId>
@@ -40,12 +42,14 @@
       <classifier>tests</classifier>
       <scope>test</scope>
     </dependency>
+
     <dependency>
       <groupId>sonia.scm.plugins</groupId>
       <artifactId>scm-hg-plugin</artifactId>
       <version>2.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
+
     <dependency>
       <groupId>sonia.scm.plugins</groupId>
       <artifactId>scm-hg-plugin</artifactId>
@@ -53,12 +57,14 @@
       <classifier>tests</classifier>
       <scope>test</scope>
     </dependency>
+
     <dependency>
       <groupId>sonia.scm.plugins</groupId>
       <artifactId>scm-svn-plugin</artifactId>
       <version>2.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
+
     <dependency>
       <groupId>sonia.scm.plugins</groupId>
       <artifactId>scm-svn-plugin</artifactId>
@@ -73,11 +79,14 @@
       <version>3.1.0</version>
       <scope>test</scope>
     </dependency>
+
     <dependency>
       <groupId>javax</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0</version>
+      <scope>test</scope>
     </dependency>
+
     <dependency>
       <groupId>org.glassfish</groupId>
       <artifactId>javax.json</artifactId>
@@ -102,51 +111,13 @@
           <excludes>
             <exclude>target/**</exclude>
             <exclude>.hg/**</exclude>
-            <exclude>src/main/webapp/resources/extjs/**</exclude>
-            <exclude>src/main/webapp/resources/syntaxhighlighter/**</exclude>
-            <exclude>src/main/webapp/resources/moment/**</exclude>
-            <exclude>**/*.mustache</exclude>
           </excludes>
           <strictCheck>true</strictCheck>
         </configuration>
       </plugin>
-
-      <plugin>
-        <groupId>org.eclipse.jetty</groupId>
-        <artifactId>jetty-maven-plugin</artifactId>
-        <version>${jetty.maven.version}</version>
-        <configuration>
-          <stopPort>8005</stopPort>
-          <stopKey>STOP</stopKey>
-          <systemProperties>
-            <systemProperty>
-              <name>scm.home</name>
-              <value>${scm.home}</value>
-            </systemProperty>
-            <systemProperty>
-              <name>scm.stage</name>
-              <value>${scm.stage}</value>
-            </systemProperty>
-            <systemProperty>
-              <name>java.awt.headless</name>
-              <value>true</value>
-            </systemProperty>
-          </systemProperties>
-          <webApp>
-            <contextPath>/scm</contextPath>
-          </webApp>
-          <jettyXml>${project.basedir}/src/main/conf/jetty.xml</jettyXml>
-          <scanIntervalSeconds>0</scanIntervalSeconds>
-        </configuration>
-      </plugin>
     </plugins>
-
-    <finalName>scm-it</finalName>
   </build>
 
-  <properties>
-  </properties>
-
   <profiles>
 
     <profile>
@@ -223,6 +194,11 @@
         </plugins>
       </build>
 
+      <properties>
+        <scm.stage>DEVELOPMENT</scm.stage>
+        <scm.home>target/scm-it</scm.home>
+      </properties>
+
     </profile>
   </profiles>
 

From 77edb49f2a4f91f152a1cf5b1246770f391ebf3b Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Tue, 7 Aug 2018 15:50:38 +0200
Subject: [PATCH 48/51] use scm-webapp from local repository and not from
 target directory

---
 scm-it/pom.xml | 38 ++++++++++++++++++++++++++++++++++++--
 1 file changed, 36 insertions(+), 2 deletions(-)

diff --git a/scm-it/pom.xml b/scm-it/pom.xml
index 3753f06d4d..251fe4d957 100644
--- a/scm-it/pom.xml
+++ b/scm-it/pom.xml
@@ -151,6 +151,33 @@
             </executions>
           </plugin>
 
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-dependency-plugin</artifactId>
+            <version>2.10</version>
+            <configuration>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>sonia.scm</groupId>
+                  <artifactId>scm-webapp</artifactId>
+                  <version>${project.version}</version>
+                  <type>war</type>
+                  <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+                  <destFileName>scm-webapp.war</destFileName>
+                </artifactItem>
+              </artifactItems>
+            </configuration>
+            <executions>
+              <execution>
+                <id>copy-war</id>
+                <phase>pre-integration-test</phase>
+                <goals>
+                  <goal>copy</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+
           <plugin>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-maven-plugin</artifactId>
@@ -161,15 +188,22 @@
               <systemProperties>
                 <systemProperty>
                   <name>scm.home</name>
-                  <value>target/scm-it</value>
+                  <value>${scm.home}</value>
                 </systemProperty>
                 <systemProperty>
                   <name>scm.stage</name>
                   <value>${scm.stage}</value>
                 </systemProperty>
+                <systemProperty>
+                  <name>java.awt.headless</name>
+                  <value>true</value>
+                </systemProperty>
               </systemProperties>
+              <webApp>
+                <contextPath>/scm</contextPath>
+              </webApp>
               <jettyXml>${project.basedir}/src/main/conf/jetty.xml</jettyXml>
-              <war>${project.basedir}/../scm-webapp/target/scm-webapp.war</war>
+              <war>${project.build.outputDirectory}/scm-webapp.war</war>
               <scanIntervalSeconds>0</scanIntervalSeconds>
               <daemon>true</daemon>
             </configuration>

From eaa99bf4458b0a4967f9f32c1b1435ef2a6a7f8b Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Tue, 7 Aug 2018 16:05:44 +0200
Subject: [PATCH 49/51] mark build as unstable, if an integration test fails

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 558fb8aeda..6694b2eb7c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -35,7 +35,7 @@ node() { // No specific label
       }
 
       stage('Integration Test') {
-        mvn 'verify -Pit -pl :scm-webapp,:scm-it'
+        mvn 'verify -Pit -pl :scm-webapp,:scm-it  -Dmaven.test.failure.ignore=true'
       }
 
       stage('SonarQube') {

From 75933c4f8221957ac5b21c311836ebc38f862574 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Tue, 7 Aug 2018 14:14:43 +0000
Subject: [PATCH 50/51] Close branch feature/integration_test_v2


From 0efbf05cb66064d4c6c32adf38df4563dde44cb5 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Tue, 7 Aug 2018 16:18:24 +0200
Subject: [PATCH 51/51] close branch feature/repositories-ui