diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 1c4f15f3f..0030c76a8 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -2,9 +2,9 @@ name: test and build
 
 on:
   push:
-    branches: [ master ]
+    branches: [ master, development ]
   pull_request:
-    branches: [ master ]
+    branches: [ master, development ]
 
 jobs:
   build_and_test:
diff --git a/AMW_angular/io/.eslintrc.json b/AMW_angular/io/.eslintrc.json
index d77d6de87..fd4ffce00 100644
--- a/AMW_angular/io/.eslintrc.json
+++ b/AMW_angular/io/.eslintrc.json
@@ -16,7 +16,7 @@
           "error",
           {
             "type": "attribute",
-            "prefix": "amw",
+            "prefix": "app",
             "style": "camelCase"
           }
         ],
@@ -24,7 +24,7 @@
           "error",
           {
             "type": "element",
-            "prefix": "amw",
+            "prefix": "app",
             "style": "kebab-case"
           }
         ]
diff --git a/AMW_angular/io/angular.json b/AMW_angular/io/angular.json
index c3bffc589..fcc3ccb93 100644
--- a/AMW_angular/io/angular.json
+++ b/AMW_angular/io/angular.json
@@ -33,13 +33,7 @@
               }
             ],
             "styles": ["src/styles.scss", "./node_modules/bootstrap-icons/font/bootstrap-icons.scss"],
-            "scripts": [
-              "node_modules/codemirror/lib/codemirror.js",
-              "node_modules/codemirror/addon/mode/simple.js",
-              "node_modules/codemirror/addon/dialog/dialog.js",
-              "node_modules/codemirror/addon/search/searchcursor.js",
-              "node_modules/codemirror/addon/search/search.js"
-            ],
+            "scripts": [],
             "extractLicenses": false,
             "sourceMap": true,
             "optimization": true,
diff --git a/AMW_angular/io/coding-guidelines.md b/AMW_angular/io/coding-guidelines.md
index 023f9d09f..285ff09fb 100644
--- a/AMW_angular/io/coding-guidelines.md
+++ b/AMW_angular/io/coding-guidelines.md
@@ -1,9 +1,8 @@
 # Coding Guidelines
 
-
 ## Inject() over Constructor-Injections
 
-Use `inject()` instead of constuctor-injection to make the code more explicit and obvious.
+Use `inject()` instead of constructor-injection to make the code more explicit and obvious.
 
 ```typescript
 // use
@@ -16,39 +15,40 @@ constructor(
 ```
 
 ## RxJS
+
 Leverage RxJS for API calls, web sockets, and complex data flows, especially when handling multiple asynchronous events. Combine with Signals to simplify component state management.
 
 ## Signals
 
-Use signals for changing values in Components
+Use Signals for changing values in Components
 
 ### Signal from Observable
 
 #### GET
 
-Make API-requests with observables and expose the state as a signal:
+Make API-requests with observables and expose the state as a Signal:
 
 ```typescript
-// retrive data from API using RxJS
+// retrieve data from API using RxJS
 private users$ = this.http.get<User[]>(this.userUrl);
 
-// expose as signal
+// expose as Signal
 users = toSignal(this.users$, { initialValue: [] as User[]});
 ```
 
-The observable `users$` is just used to pass the state to the _readonly_ signal `users`. (The signals created from an observable are always _readonly_!)
+The observable `users$` is just used to pass the state to the _readonly_ Signal `users`. (The Signals created from an observable are always _readonly_!)
 No need for unsubscription - this is handled by `toSignal()` automatically.
 
-Use the signal in the component not in the template. (Separation of concerns)
+Use the Signal in the component not in the template. (Separation of concerns)
 
 #### POST / DELETE etc.
 
-To update data in a signal you have to create a WritableSignal:
+To update data in a Signal you have to create a WritableSignal:
 
 ```typescript
 // WritableSignal
 users = signal<Tag[]>([]);
-// retrive data from API using RxJS and write it in the WritableSignal
+// retrieve data from API using RxJS and write it in the WritableSignal
 private users$ = this.http.get<User[]>(this.userUrl).pipe(tap((users) => this.users.set(users)));
 // only used to automatically un-/subscribe to the observable
 readOnlyUsers = toSignal(this.users$, { initialValue: [] as User[]});
@@ -56,7 +56,7 @@ readOnlyUsers = toSignal(this.users$, { initialValue: [] as User[]});
 
 ## Auth Service
 
-The frontend provides a singelton auth-service which holds all restrictions for the current user. 
+The frontend provides a singelton auth-service which holds all restrictions for the current user.
 
 After injecting the service in your component you can get Permissions/Actions depending on your needs:
 
@@ -67,10 +67,9 @@ authService = inject(AuthService);
 // get actions for a specific permission
 const actions = this.authService.getActionsForPermission('MY_PERMISSION');
 
-// verify role in an action and set signal
+// verify role in an action and set Signal
 this.canCreate.set(actions.some(isAllowed('CREATE')));
 
-// or directly set signal based on a concret permission and action value
+// or directly set Signal based on a concrete permission and action value
 this.canViewSettings.set(this.authService.hasPermission('SETTINGS', 'READ'));
-
 ```
diff --git a/AMW_angular/io/package-lock.json b/AMW_angular/io/package-lock.json
index 67acacefa..181061ca4 100644
--- a/AMW_angular/io/package-lock.json
+++ b/AMW_angular/io/package-lock.json
@@ -17,13 +17,14 @@
         "@angular/platform-browser": "^18.0.5",
         "@angular/platform-browser-dynamic": "^18.0.5",
         "@angular/router": "^18.0.5",
-        "@ctrl/ngx-codemirror": "^7.0.0",
+        "@codemirror/merge": "^6.0.0",
+        "@codemirror/theme-one-dark": "^6.0.0",
         "@ng-bootstrap/ng-bootstrap": "^17.0.0",
         "@ng-select/ng-select": "^13.3.0",
         "@popperjs/core": "^2.11.8",
         "bootstrap": "5.3.2",
         "bootstrap-icons": "^1.11.1",
-        "codemirror": "^5.65.15",
+        "codemirror": "^6.0.0",
         "date-fns": "^2.30.0",
         "rxjs": "^7.8.1",
         "tslib": "^2.6.2",
@@ -2422,6 +2423,114 @@
         "node": ">=6.9.0"
       }
     },
+    "node_modules/@codemirror/autocomplete": {
+      "version": "6.18.1",
+      "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.18.1.tgz",
+      "integrity": "sha512-iWHdj/B1ethnHRTwZj+C1obmmuCzquH29EbcKr0qIjA9NfDeBDJ7vs+WOHsFeLeflE4o+dHfYndJloMKHUkWUA==",
+      "license": "MIT",
+      "dependencies": {
+        "@codemirror/language": "^6.0.0",
+        "@codemirror/state": "^6.0.0",
+        "@codemirror/view": "^6.17.0",
+        "@lezer/common": "^1.0.0"
+      },
+      "peerDependencies": {
+        "@codemirror/language": "^6.0.0",
+        "@codemirror/state": "^6.0.0",
+        "@codemirror/view": "^6.0.0",
+        "@lezer/common": "^1.0.0"
+      }
+    },
+    "node_modules/@codemirror/commands": {
+      "version": "6.7.1",
+      "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.7.1.tgz",
+      "integrity": "sha512-llTrboQYw5H4THfhN4U3qCnSZ1SOJ60ohhz+SzU0ADGtwlc533DtklQP0vSFaQuCPDn3BPpOd1GbbnUtwNjsrw==",
+      "license": "MIT",
+      "dependencies": {
+        "@codemirror/language": "^6.0.0",
+        "@codemirror/state": "^6.4.0",
+        "@codemirror/view": "^6.27.0",
+        "@lezer/common": "^1.1.0"
+      }
+    },
+    "node_modules/@codemirror/language": {
+      "version": "6.10.3",
+      "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.10.3.tgz",
+      "integrity": "sha512-kDqEU5sCP55Oabl6E7m5N+vZRoc0iWqgDVhEKifcHzPzjqCegcO4amfrYVL9PmPZpl4G0yjkpTpUO/Ui8CzO8A==",
+      "license": "MIT",
+      "dependencies": {
+        "@codemirror/state": "^6.0.0",
+        "@codemirror/view": "^6.23.0",
+        "@lezer/common": "^1.1.0",
+        "@lezer/highlight": "^1.0.0",
+        "@lezer/lr": "^1.0.0",
+        "style-mod": "^4.0.0"
+      }
+    },
+    "node_modules/@codemirror/lint": {
+      "version": "6.8.2",
+      "resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.8.2.tgz",
+      "integrity": "sha512-PDFG5DjHxSEjOXk9TQYYVjZDqlZTFaDBfhQixHnQOEVDDNHUbEh/hstAjcQJaA6FQdZTD1hquXTK0rVBLADR1g==",
+      "license": "MIT",
+      "dependencies": {
+        "@codemirror/state": "^6.0.0",
+        "@codemirror/view": "^6.0.0",
+        "crelt": "^1.0.5"
+      }
+    },
+    "node_modules/@codemirror/merge": {
+      "version": "6.7.2",
+      "resolved": "https://registry.npmjs.org/@codemirror/merge/-/merge-6.7.2.tgz",
+      "integrity": "sha512-HSzuWoV4E+F0DROOSwGZMYIDXh+y4iA64ffRADXPBbKKSwx9bsYNM4i7qN8t0mc8H0PYNBoehOvsW2Nitmnx9g==",
+      "license": "MIT",
+      "dependencies": {
+        "@codemirror/language": "^6.0.0",
+        "@codemirror/state": "^6.0.0",
+        "@codemirror/view": "^6.17.0",
+        "@lezer/highlight": "^1.0.0",
+        "style-mod": "^4.1.0"
+      }
+    },
+    "node_modules/@codemirror/search": {
+      "version": "6.5.6",
+      "resolved": "https://registry.npmjs.org/@codemirror/search/-/search-6.5.6.tgz",
+      "integrity": "sha512-rpMgcsh7o0GuCDUXKPvww+muLA1pDJaFrpq/CCHtpQJYz8xopu4D1hPcKRoDD0YlF8gZaqTNIRa4VRBWyhyy7Q==",
+      "license": "MIT",
+      "dependencies": {
+        "@codemirror/state": "^6.0.0",
+        "@codemirror/view": "^6.0.0",
+        "crelt": "^1.0.5"
+      }
+    },
+    "node_modules/@codemirror/state": {
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.4.1.tgz",
+      "integrity": "sha512-QkEyUiLhsJoZkbumGZlswmAhA7CBU02Wrz7zvH4SrcifbsqwlXShVXg65f3v/ts57W3dqyamEriMhij1Z3Zz4A==",
+      "license": "MIT"
+    },
+    "node_modules/@codemirror/theme-one-dark": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/@codemirror/theme-one-dark/-/theme-one-dark-6.1.2.tgz",
+      "integrity": "sha512-F+sH0X16j/qFLMAfbciKTxVOwkdAS336b7AXTKOZhy8BR3eH/RelsnLgLFINrpST63mmN2OuwUt0W2ndUgYwUA==",
+      "license": "MIT",
+      "dependencies": {
+        "@codemirror/language": "^6.0.0",
+        "@codemirror/state": "^6.0.0",
+        "@codemirror/view": "^6.0.0",
+        "@lezer/highlight": "^1.0.0"
+      }
+    },
+    "node_modules/@codemirror/view": {
+      "version": "6.34.1",
+      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.34.1.tgz",
+      "integrity": "sha512-t1zK/l9UiRqwUNPm+pdIT0qzJlzuVckbTEMVNFhfWkGiBQClstzg+78vedCvLSX0xJEZ6lwZbPpnljL7L6iwMQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@codemirror/state": "^6.4.0",
+        "style-mod": "^4.1.0",
+        "w3c-keyname": "^2.2.4"
+      }
+    },
     "node_modules/@colors/colors": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz",
@@ -2455,20 +2564,6 @@
         "@jridgewell/sourcemap-codec": "^1.4.10"
       }
     },
-    "node_modules/@ctrl/ngx-codemirror": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@ctrl/ngx-codemirror/-/ngx-codemirror-7.0.0.tgz",
-      "integrity": "sha512-qvIWtSTw/8fdXDnofBTX6LmTW9646HhawG2+Qyagf1vH40jCy0ZbHnkC20UYOVpUX+QCd1e/PQpkvWQ/1iGFzQ==",
-      "dependencies": {
-        "@types/codemirror": "^5.60.7",
-        "tslib": "^2.3.0"
-      },
-      "peerDependencies": {
-        "@angular/core": ">=16.0.0-0",
-        "@angular/forms": ">=16.0.0-0",
-        "codemirror": "^5.65.9"
-      }
-    },
     "node_modules/@discoveryjs/json-ext": {
       "version": "0.5.7",
       "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz",
@@ -3640,6 +3735,30 @@
       "integrity": "sha512-Vo+PSpZG2/fmgmiNzYK9qWRh8h/CHrwD0mo1h1DzL4yzHNSfWYujGTYsWGreD000gcgmZ7K4Ys6Tx9TxtsKdDw==",
       "dev": true
     },
+    "node_modules/@lezer/common": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.2.3.tgz",
+      "integrity": "sha512-w7ojc8ejBqr2REPsWxJjrMFsA/ysDCFICn8zEOR9mrqzOu2amhITYuLD8ag6XZf0CFXDrhKqw7+tW8cX66NaDA==",
+      "license": "MIT"
+    },
+    "node_modules/@lezer/highlight": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.2.1.tgz",
+      "integrity": "sha512-Z5duk4RN/3zuVO7Jq0pGLJ3qynpxUVsh7IbUbGj88+uV2ApSAn6kWg2au3iJb+0Zi7kKtqffIESgNcRXWZWmSA==",
+      "license": "MIT",
+      "dependencies": {
+        "@lezer/common": "^1.0.0"
+      }
+    },
+    "node_modules/@lezer/lr": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/@lezer/lr/-/lr-1.4.2.tgz",
+      "integrity": "sha512-pu0K1jCIdnQ12aWNaAVU5bzi7Bd1w54J3ECgANPmYLtQKP0HBj2cE/5coBD66MT10xbtIuUr7tg0Shbsvk0mDA==",
+      "license": "MIT",
+      "dependencies": {
+        "@lezer/common": "^1.0.0"
+      }
+    },
     "node_modules/@listr2/prompt-adapter-inquirer": {
       "version": "2.0.13",
       "resolved": "https://registry.npmjs.org/@listr2/prompt-adapter-inquirer/-/prompt-adapter-inquirer-2.0.13.tgz",
@@ -4967,14 +5086,6 @@
         "@types/qs": "*"
       }
     },
-    "node_modules/@types/codemirror": {
-      "version": "5.60.15",
-      "resolved": "https://registry.npmjs.org/@types/codemirror/-/codemirror-5.60.15.tgz",
-      "integrity": "sha512-dTOvwEQ+ouKJ/rE9LT1Ue2hmP6H1mZv5+CCnNWu2qtiOe2LQa9lCprEY20HxiDmV/Bxh+dXjywmy5aKvoGjULA==",
-      "dependencies": {
-        "@types/tern": "*"
-      }
-    },
     "node_modules/@types/command-line-args": {
       "version": "5.2.3",
       "resolved": "https://registry.npmjs.org/@types/command-line-args/-/command-line-args-5.2.3.tgz",
@@ -5072,7 +5183,8 @@
     "node_modules/@types/estree": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
-      "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw=="
+      "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
+      "dev": true
     },
     "node_modules/@types/express": {
       "version": "4.17.21",
@@ -5297,14 +5409,6 @@
         "@types/node": "*"
       }
     },
-    "node_modules/@types/tern": {
-      "version": "0.23.9",
-      "resolved": "https://registry.npmjs.org/@types/tern/-/tern-0.23.9.tgz",
-      "integrity": "sha512-ypzHFE/wBzh+BlH6rrBgS5I/Z7RD21pGhZ2rltb/+ZrVM1awdZwjx7hE5XfuYgHWk9uvV5HLZN3SloevCAp3Bw==",
-      "dependencies": {
-        "@types/estree": "*"
-      }
-    },
     "node_modules/@types/wrap-ansi": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/@types/wrap-ansi/-/wrap-ansi-3.0.0.tgz",
@@ -7854,9 +7958,19 @@
       }
     },
     "node_modules/codemirror": {
-      "version": "5.65.17",
-      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.65.17.tgz",
-      "integrity": "sha512-1zOsUx3lzAOu/gnMAZkQ9kpIHcPYOc9y1Fbm2UVk5UBPkdq380nhkelG0qUwm1f7wPvTbndu9ZYlug35EwAZRQ=="
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-6.0.1.tgz",
+      "integrity": "sha512-J8j+nZ+CdWmIeFIGXEFbFPtpiYacFMDR8GlHK3IyHQJMCaVRfGx9NT+Hxivv1ckLWPvNdZqndbr/7lVhrf/Svg==",
+      "license": "MIT",
+      "dependencies": {
+        "@codemirror/autocomplete": "^6.0.0",
+        "@codemirror/commands": "^6.0.0",
+        "@codemirror/language": "^6.0.0",
+        "@codemirror/lint": "^6.0.0",
+        "@codemirror/search": "^6.0.0",
+        "@codemirror/state": "^6.0.0",
+        "@codemirror/view": "^6.0.0"
+      }
     },
     "node_modules/color-convert": {
       "version": "1.9.3",
@@ -8292,6 +8406,12 @@
       "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
       "dev": true
     },
+    "node_modules/crelt": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/crelt/-/crelt-1.0.6.tgz",
+      "integrity": "sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g==",
+      "license": "MIT"
+    },
     "node_modules/critters": {
       "version": "0.0.24",
       "resolved": "https://registry.npmjs.org/critters/-/critters-0.0.24.tgz",
@@ -16723,6 +16843,12 @@
         "node": ">=4"
       }
     },
+    "node_modules/style-mod": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.1.2.tgz",
+      "integrity": "sha512-wnD1HyVqpJUI2+eKZ+eo1UwghftP6yuFheBqqe+bWCotBjC2K1YnteJILRMs3SM4V/0dLEW1SC27MWP5y+mwmw==",
+      "license": "MIT"
+    },
     "node_modules/supports-color": {
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
@@ -17676,6 +17802,12 @@
         "url": "https://opencollective.com/eslint"
       }
     },
+    "node_modules/w3c-keyname": {
+      "version": "2.2.8",
+      "resolved": "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.8.tgz",
+      "integrity": "sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ==",
+      "license": "MIT"
+    },
     "node_modules/watchpack": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.1.tgz",
diff --git a/AMW_angular/io/package.json b/AMW_angular/io/package.json
index 6ebaa6cd9..4ec060e42 100644
--- a/AMW_angular/io/package.json
+++ b/AMW_angular/io/package.json
@@ -26,13 +26,14 @@
     "@angular/platform-browser": "^18.0.5",
     "@angular/platform-browser-dynamic": "^18.0.5",
     "@angular/router": "^18.0.5",
-    "@ctrl/ngx-codemirror": "^7.0.0",
+    "@codemirror/merge": "^6.0.0",
+    "@codemirror/theme-one-dark": "^6.0.0",
     "@ng-bootstrap/ng-bootstrap": "^17.0.0",
     "@ng-select/ng-select": "^13.3.0",
     "@popperjs/core": "^2.11.8",
     "bootstrap": "5.3.2",
     "bootstrap-icons": "^1.11.1",
-    "codemirror": "^5.65.15",
+    "codemirror": "^6.0.0",
     "date-fns": "^2.30.0",
     "rxjs": "^7.8.1",
     "tslib": "^2.6.2",
diff --git a/AMW_angular/io/src/app/app.component.spec.ts b/AMW_angular/io/src/app/app.component.spec.ts
index 7b5a06b20..3b08a4c16 100644
--- a/AMW_angular/io/src/app/app.component.spec.ts
+++ b/AMW_angular/io/src/app/app.component.spec.ts
@@ -1,7 +1,6 @@
 import { ChangeDetectorRef } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { Router } from '@angular/router';
-import { RouterTestingModule } from '@angular/router/testing';
+import { provideRouter, Router, withHashLocation } from '@angular/router';
 import { of } from 'rxjs';
 import { AppComponent } from './app.component';
 import { NavigationComponent } from './navigation/navigation.component';
@@ -10,6 +9,7 @@ import { AppConfiguration } from './setting/app-configuration';
 import { SettingService } from './setting/setting.service';
 import { provideHttpClientTesting } from '@angular/common/http/testing';
 import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
+import { routes } from './app.routes';
 
 class RouterStub {
   navigateByUrl(url: string) {
@@ -18,17 +18,23 @@ class RouterStub {
 }
 
 describe('App', () => {
-  let router: Router;
   let app: AppComponent;
   let fixture: ComponentFixture<AppComponent>;
   let settingService: SettingService;
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-    imports: [RouterTestingModule, NavigationComponent, AppComponent],
-    providers: [SettingService, ChangeDetectorRef, AppComponent, { provide: Router, useClass: RouterStub }, provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting()]
-}).compileComponents();
-    router = TestBed.inject(Router);
+      imports: [NavigationComponent, AppComponent],
+      providers: [
+        SettingService,
+        ChangeDetectorRef,
+        AppComponent,
+        { provide: Router, useClass: RouterStub },
+        provideHttpClient(withInterceptorsFromDi()),
+        provideHttpClientTesting(),
+        provideRouter(routes, withHashLocation()),
+      ],
+    }).compileComponents();
     settingService = TestBed.inject(SettingService);
 
     fixture = TestBed.createComponent(AppComponent);
@@ -54,7 +60,6 @@ describe('App', () => {
 
   it('should set empty logoutUrl if config not found', () => {
     // given
-    const expectedKey: string = 'logoutUrl';
     const expectedValue: string = '';
     const appConf: AppConfiguration = {
       key: { value: 'test', env: 'TEST' },
@@ -63,6 +68,6 @@ describe('App', () => {
 
     app.ngOnInit();
 
-    expect(app.logoutUrl).toEqual('');
+    expect(app.logoutUrl).toEqual(expectedValue);
   });
 });
diff --git a/AMW_angular/io/src/app/app.component.ts b/AMW_angular/io/src/app/app.component.ts
index c72601d1c..2c0f43850 100644
--- a/AMW_angular/io/src/app/app.component.ts
+++ b/AMW_angular/io/src/app/app.component.ts
@@ -18,9 +18,7 @@ import { ToastContainerComponent } from './shared/elements/toast/toast-container
 export class AppComponent implements OnInit {
   logoutUrl: string;
 
-  constructor(
-    private settingService: SettingService
-  ) { }
+  constructor(private settingService: SettingService) {}
 
   ngOnInit(): void {
     this.settingService.getAllAppSettings().subscribe((r) => this.configureSettings(r));
diff --git a/AMW_angular/io/src/app/app.routes.ts b/AMW_angular/io/src/app/app.routes.ts
index 3c9cc8025..11e65f3c0 100644
--- a/AMW_angular/io/src/app/app.routes.ts
+++ b/AMW_angular/io/src/app/app.routes.ts
@@ -1,14 +1,20 @@
 import { Routes } from '@angular/router';
-import { DeploymentsComponent } from './deployments/deployments.component';
+import { appsRoutes } from './apps/apps.routes';
 import { auditviewRoutes } from './auditview/auditview.routes';
 import { deploymentRoutes } from './deployment/deployment-routes';
 import { settingsRoutes } from './settings/settings.routes';
 import { deploymentsRoutes } from './deployments/deployments.routes';
+import { serversRoute } from './servers/servers.route';
+import { resourcesRoute } from './resources/resources.route';
+import { AppsComponent } from './apps/apps.component';
 
 export const routes: Routes = [
   // default route only, the rest is done in module routing
-  { path: '', component: DeploymentsComponent },
+  { path: '', component: AppsComponent },
 
+  ...appsRoutes,
+  ...serversRoute,
+  ...resourcesRoute,
   ...settingsRoutes,
   ...auditviewRoutes,
   ...deploymentRoutes,
diff --git a/AMW_angular/io/src/app/apps/app-add/app-add.component.html b/AMW_angular/io/src/app/apps/app-add/app-add.component.html
new file mode 100644
index 000000000..bd499858a
--- /dev/null
+++ b/AMW_angular/io/src/app/apps/app-add/app-add.component.html
@@ -0,0 +1,44 @@
+<app-modal-header [title]="'Create application'" (cancel)="cancel()"></app-modal-header>
+<div class="modal-body">
+  <div class="form-horizontal mx-2">
+    <div class="mb-3">
+      <label for="name" class="form-label">Application</label>
+      <input type="text" class="form-control" id="name" [(ngModel)]="app.appName" />
+    </div>
+    <div class="mb-3">
+      <label class="form-label">Release</label>
+      <ng-select id="selectRelease" [(ngModel)]="app.appReleaseId" placeholder="Select release">
+        @for (release of releases(); track release.id) {
+        <ng-option [value]="release.id">{{ release.name }}</ng-option>
+        }
+      </ng-select>
+    </div>
+    <div class="mb-3">
+      <label class="form-label">Applicationserver</label>
+      <ng-select id="selectAppServer" [(ngModel)]="appServerGroup" placeholder="Select applicationserver">
+        @for (appServer of appServerGroups(); track appServer.id) {
+        <ng-option [value]="appServer">{{ appServer.name }}</ng-option>
+        }
+      </ng-select>
+    </div>
+    <div class="mb-3">
+      <label class="form-label">Applicationserver Release</label>
+      <ng-select
+        id="selectAppServerRelease"
+        [(ngModel)]="appServerRelease"
+        [disabled]="hasInvalidGroup()"
+        placeholder="Select AS release"
+      >
+        @if (appServerGroup && appServerGroup.releases) { @for (release of appServerGroup.releases; track release.id) {
+        <ng-option [value]="release">{{ release.release }}</ng-option>
+        } }
+      </ng-select>
+    </div>
+  </div>
+</div>
+<div class="modal-footer">
+  <app-button [variant]="'light'" [dataCy]="'button-cancel'" (click)="cancel()">Cancel</app-button>
+  <app-button [variant]="'primary'" [disabled]="hasInvalidFields()" [dataCy]="'button-save'" (click)="save()"
+    >Save</app-button
+  >
+</div>
diff --git a/AMW_angular/io/src/app/apps/app-add/app-add.component.spec.ts b/AMW_angular/io/src/app/apps/app-add/app-add.component.spec.ts
new file mode 100644
index 000000000..88f171596
--- /dev/null
+++ b/AMW_angular/io/src/app/apps/app-add/app-add.component.spec.ts
@@ -0,0 +1,15 @@
+import { AppAddComponent } from './app-add.component';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+
+describe('AppAddComponent', () => {
+  let component: AppAddComponent;
+  const activeModal = new NgbActiveModal();
+
+  beforeEach(async () => {
+    component = new AppAddComponent(activeModal);
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/AMW_angular/io/src/app/apps/app-add/app-add.component.ts b/AMW_angular/io/src/app/apps/app-add/app-add.component.ts
new file mode 100644
index 000000000..046b0e61e
--- /dev/null
+++ b/AMW_angular/io/src/app/apps/app-add/app-add.component.ts
@@ -0,0 +1,63 @@
+import { Component, EventEmitter, Input, Output, Signal } from '@angular/core';
+import { FormsModule } from '@angular/forms';
+import { NgSelectModule } from '@ng-select/ng-select';
+import { Release } from '../../settings/releases/release';
+import { Release as Rel } from '../../resource/release';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { Resource } from '../../resource/resource';
+import { AppCreate } from '../app-create';
+import { ModalHeaderComponent } from '../../shared/modal-header/modal-header.component';
+import { ButtonComponent } from '../../shared/button/button.component';
+
+@Component({
+  selector: 'app-app-add',
+  standalone: true,
+  imports: [FormsModule, NgSelectModule, ModalHeaderComponent, ButtonComponent],
+  templateUrl: './app-add.component.html',
+})
+export class AppAddComponent {
+  @Input() releases: Signal<Release[]>;
+  @Input() appServerGroups: Signal<Resource[]>;
+  @Output() saveApp: EventEmitter<AppCreate> = new EventEmitter<AppCreate>();
+
+  app: AppCreate = { appName: '', appReleaseId: null, appServerId: null, appServerReleaseId: null };
+  appServerGroup: Resource;
+  appServerRelease: Rel;
+
+  constructor(public activeModal: NgbActiveModal) {
+    this.activeModal = activeModal;
+  }
+
+  hasInvalidGroup(): boolean {
+    const isInvalid =
+      this.appServerGroup === undefined || this.appServerGroup === null || this.appServerGroup?.releases.length === 0;
+    if (isInvalid) {
+      this.appServerRelease = undefined;
+    }
+    return isInvalid;
+  }
+
+  // apps without appserver are valid too
+  hasInvalidFields(): boolean {
+    return (
+      this.app.appName === '' ||
+      this.app.appReleaseId === null ||
+      (!this.hasInvalidGroup() && (this.appServerRelease === undefined || this.appServerRelease === null))
+    );
+  }
+
+  cancel() {
+    this.activeModal.close();
+  }
+
+  save() {
+    const app: AppCreate = {
+      appName: this.app.appName,
+      appReleaseId: this.app.appReleaseId,
+      appServerId: this.appServerGroup?.id,
+      appServerReleaseId: this.appServerRelease?.id,
+    };
+    this.saveApp.emit(app);
+    this.activeModal.close();
+  }
+}
diff --git a/AMW_angular/io/src/app/apps/app-create.ts b/AMW_angular/io/src/app/apps/app-create.ts
new file mode 100644
index 000000000..b9dd628d2
--- /dev/null
+++ b/AMW_angular/io/src/app/apps/app-create.ts
@@ -0,0 +1,6 @@
+export interface AppCreate {
+  appName: string;
+  appReleaseId: number;
+  appServerId: number;
+  appServerReleaseId: number;
+}
diff --git a/AMW_angular/io/src/app/apps/app-server-add/app-server-add.component.html b/AMW_angular/io/src/app/apps/app-server-add/app-server-add.component.html
new file mode 100644
index 000000000..90694cb84
--- /dev/null
+++ b/AMW_angular/io/src/app/apps/app-server-add/app-server-add.component.html
@@ -0,0 +1,21 @@
+<app-modal-header [title]="'Create application server'" (cancel)="cancel()"></app-modal-header>
+<div class="modal-body">
+  <div class="form-horizontal mx-2">
+    <div class="mb-3">
+      <label for="name" class="form-label">Applicationserver</label>
+      <input type="text" class="form-control" id="name" [(ngModel)]="appServer.name" />
+    </div>
+    <div class="mb-3">
+      <label class="form-label">Release</label>
+      <ng-select id="selectRelease" [(ngModel)]="appServer.release" placeholder="Select release">
+        @for (release of releases(); track release.id) {
+        <ng-option [value]="release">{{ release.name }}</ng-option>
+        }
+      </ng-select>
+    </div>
+  </div>
+</div>
+<div class="modal-footer">
+  <app-button [variant]="'light'" (click)="cancel()">Cancel</app-button>
+  <app-button [variant]="'primary'" [disabled]="hasInvalidFields()" (click)="save()">Save</app-button>
+</div>
diff --git a/AMW_angular/io/src/app/apps/app-server-add/app-server-add.component.spec.ts b/AMW_angular/io/src/app/apps/app-server-add/app-server-add.component.spec.ts
new file mode 100644
index 000000000..537cd92c5
--- /dev/null
+++ b/AMW_angular/io/src/app/apps/app-server-add/app-server-add.component.spec.ts
@@ -0,0 +1,15 @@
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { AppServerAddComponent } from './app-server-add.component';
+
+describe('AppServerAddComponent', () => {
+  let component: AppServerAddComponent;
+  const activeModal = new NgbActiveModal();
+
+  beforeEach(async () => {
+    component = new AppServerAddComponent(activeModal);
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/AMW_angular/io/src/app/apps/app-server-add/app-server-add.component.ts b/AMW_angular/io/src/app/apps/app-server-add/app-server-add.component.ts
new file mode 100644
index 000000000..f29a1302a
--- /dev/null
+++ b/AMW_angular/io/src/app/apps/app-server-add/app-server-add.component.ts
@@ -0,0 +1,46 @@
+import { Component, EventEmitter, Input, Output, Signal } from '@angular/core';
+import { Release } from '../../settings/releases/release';
+import { AppServer } from '../app-server';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { FormsModule } from '@angular/forms';
+import { NgSelectModule } from '@ng-select/ng-select';
+import { ModalHeaderComponent } from '../../shared/modal-header/modal-header.component';
+import { ButtonComponent } from '../../shared/button/button.component';
+
+@Component({
+  selector: 'app-server-add',
+  standalone: true,
+  imports: [FormsModule, NgSelectModule, ModalHeaderComponent, ButtonComponent],
+  templateUrl: './app-server-add.component.html',
+})
+export class AppServerAddComponent {
+  @Input() releases: Signal<Release[]>;
+  @Output() saveAppServer: EventEmitter<AppServer> = new EventEmitter<AppServer>();
+
+  appServer: AppServer = { name: '', apps: [], deletable: false, id: null, runtimeName: '', release: null };
+
+  constructor(public activeModal: NgbActiveModal) {
+    this.activeModal = activeModal;
+  }
+
+  hasInvalidFields(): boolean {
+    return this.appServer.name === '' || this.appServer.release?.id === null || this.appServer.release?.name === '';
+  }
+
+  cancel() {
+    this.activeModal.close();
+  }
+
+  save() {
+    const appServer: AppServer = {
+      name: this.appServer.name,
+      release: this.appServer.release,
+      deletable: this.appServer.deletable,
+      id: this.appServer.id,
+      runtimeName: this.appServer.runtimeName,
+      apps: this.appServer.apps,
+    };
+    this.saveAppServer.emit(appServer);
+    this.activeModal.close();
+  }
+}
diff --git a/AMW_angular/io/src/app/apps/app-server.ts b/AMW_angular/io/src/app/apps/app-server.ts
new file mode 100644
index 000000000..dd80acef9
--- /dev/null
+++ b/AMW_angular/io/src/app/apps/app-server.ts
@@ -0,0 +1,11 @@
+import { Release } from '../settings/releases/release';
+import { App } from './app';
+
+export interface AppServer {
+  id: number;
+  name: string;
+  deletable: boolean;
+  runtimeName: string;
+  release: Release;
+  apps: App[];
+}
diff --git a/AMW_angular/io/src/app/apps/app.ts b/AMW_angular/io/src/app/apps/app.ts
new file mode 100644
index 000000000..a75f9c0b4
--- /dev/null
+++ b/AMW_angular/io/src/app/apps/app.ts
@@ -0,0 +1,7 @@
+import { Release } from '../settings/releases/release';
+
+export interface App {
+  id: number;
+  name: string;
+  release: Release;
+}
diff --git a/AMW_angular/io/src/app/apps/apps-filter/apps-filter.component.html b/AMW_angular/io/src/app/apps/apps-filter/apps-filter.component.html
new file mode 100644
index 000000000..f288f5266
--- /dev/null
+++ b/AMW_angular/io/src/app/apps/apps-filter/apps-filter.component.html
@@ -0,0 +1,29 @@
+<div class="container border-bottom border-light-subtle pb-4">
+  <div class="row mb-3">
+    <div class="col-sm">
+      <b>Add Filter</b>
+    </div>
+  </div>
+  <div class="row justify-content-between align-items-end">
+    <div class="col-sm-4">
+      <label for="appName" class="form-label">Application/AS name</label>
+      <input class="form-control" id="appName" type="text" [(ngModel)]="appName" />
+    </div>
+    <div class="col-sm-2">
+      <label class="form-label">Release</label>
+      <ng-select
+        id="selectRelease"
+        [clearable]="false"
+        [ngModel]="selection().selected()"
+        (change)="selection().selected.set($event)"
+      >
+        @for (release of selection().releases; track release.id) {
+        <ng-option [value]="release.id">{{ release.name }}</ng-option>
+        }
+      </ng-select>
+    </div>
+    <div class="col-sm">
+      <app-button [variant]="'primary'" [additionalClasses]="'float-start'" (click)="search()">Search</app-button>
+    </div>
+  </div>
+</div>
diff --git a/AMW_angular/io/src/app/apps/apps-filter/apps-filter.component.spec.ts b/AMW_angular/io/src/app/apps/apps-filter/apps-filter.component.spec.ts
new file mode 100644
index 000000000..f2c34c7e2
--- /dev/null
+++ b/AMW_angular/io/src/app/apps/apps-filter/apps-filter.component.spec.ts
@@ -0,0 +1,26 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { AppsFilterComponent } from './apps-filter.component';
+import { InputSignal, signal } from '@angular/core';
+import { Release } from '../../settings/releases/release';
+
+describe('AppsFilterComponent', () => {
+  let component: AppsFilterComponent;
+  let fixture: ComponentFixture<AppsFilterComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [AppsFilterComponent],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(AppsFilterComponent);
+    component = fixture.componentInstance;
+    component.releases = signal<Release[]>([]) as unknown as InputSignal<Release[]>;
+    component.upcoming = signal<number>(0) as unknown as InputSignal<number>;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/AMW_angular/io/src/app/apps/apps-filter/apps-filter.component.ts b/AMW_angular/io/src/app/apps/apps-filter/apps-filter.component.ts
new file mode 100644
index 000000000..6d2c0976e
--- /dev/null
+++ b/AMW_angular/io/src/app/apps/apps-filter/apps-filter.component.ts
@@ -0,0 +1,33 @@
+import { ChangeDetectionStrategy, Component, computed, input, output, signal } from '@angular/core';
+
+import { NgSelectModule } from '@ng-select/ng-select';
+import { Release } from '../../settings/releases/release';
+import { FormsModule } from '@angular/forms';
+import { ButtonComponent } from '../../shared/button/button.component';
+
+@Component({
+  selector: 'app-apps-filter',
+  standalone: true,
+  imports: [FormsModule, NgSelectModule, ButtonComponent],
+  templateUrl: './apps-filter.component.html',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class AppsFilterComponent {
+  releases = input.required<Release[]>();
+  upcoming = input.required<number>();
+
+  selection = computed(() => {
+    return {
+      releases: this.releases(),
+      selected: signal(this.upcoming()),
+    };
+  });
+
+  appName = signal<string>('');
+
+  filterEvent = output<{ filter: string; releaseId: number }>();
+
+  search() {
+    this.filterEvent.emit({ filter: this.appName(), releaseId: this.selection().selected() });
+  }
+}
diff --git a/AMW_angular/io/src/app/apps/apps-list/apps-list-component.ts b/AMW_angular/io/src/app/apps/apps-list/apps-list-component.ts
new file mode 100644
index 000000000..f523b43ec
--- /dev/null
+++ b/AMW_angular/io/src/app/apps/apps-list/apps-list-component.ts
@@ -0,0 +1,16 @@
+import { Component, Input } from '@angular/core';
+import { AsyncPipe } from '@angular/common';
+import { PaginationComponent } from '../../shared/pagination/pagination.component';
+import { App } from '../app';
+
+@Component({
+  selector: 'app-apps-list',
+  standalone: true,
+  imports: [AsyncPipe, PaginationComponent],
+  templateUrl: './apps-list.component.html',
+  styleUrl: './apps-list.component.scss',
+})
+export class AppsListComponent {
+  @Input() apps: App[];
+  @Input() even: boolean;
+}
diff --git a/AMW_angular/io/src/app/apps/apps-list/apps-list.component.html b/AMW_angular/io/src/app/apps/apps-list/apps-list.component.html
new file mode 100644
index 000000000..e75302fe3
--- /dev/null
+++ b/AMW_angular/io/src/app/apps/apps-list/apps-list.component.html
@@ -0,0 +1,16 @@
+@if (apps && apps.length > 0) {
+<table class="table table-sm table-borderless mb-0">
+  <tbody>
+    @for (app of apps; track app) {
+    <tr [class.table-light]="!even">
+      <td class="align-middle ps-2 w-90 border-0 py-2">
+        <a href="/AMW_web/pages/editResourceView.xhtml?ctx=1&id={{ app.id }}">{{ app.name }}</a>
+      </td>
+      <td class="align-middle ps-4 w-10 border-0 py-2">
+        <a href="/AMW_web/pages/editResourceView.xhtml?ctx=1&id={{ app.id }}">{{ app.release.name }}</a>
+      </td>
+    </tr>
+    }
+  </tbody>
+</table>
+}
diff --git a/AMW_angular/io/src/app/apps/apps-list/apps-list.component.scss b/AMW_angular/io/src/app/apps/apps-list/apps-list.component.scss
new file mode 100644
index 000000000..d6d827123
--- /dev/null
+++ b/AMW_angular/io/src/app/apps/apps-list/apps-list.component.scss
@@ -0,0 +1,6 @@
+table .w-10 {
+  width: 10%;
+}
+table .w-90 {
+  width: 90%;
+}
diff --git a/AMW_angular/io/src/app/apps/apps-list/apps-list.component.spec.ts b/AMW_angular/io/src/app/apps/apps-list/apps-list.component.spec.ts
new file mode 100644
index 000000000..2c95fe1fb
--- /dev/null
+++ b/AMW_angular/io/src/app/apps/apps-list/apps-list.component.spec.ts
@@ -0,0 +1,22 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { AppsListComponent } from './apps-list-component';
+
+describe('AppsListComponent', () => {
+  let component: AppsListComponent;
+  let fixture: ComponentFixture<AppsListComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [AppsListComponent],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(AppsListComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/AMW_angular/io/src/app/apps/apps-servers-list/apps-servers-list.component.html b/AMW_angular/io/src/app/apps/apps-servers-list/apps-servers-list.component.html
new file mode 100644
index 000000000..e7bbd1e9e
--- /dev/null
+++ b/AMW_angular/io/src/app/apps/apps-servers-list/apps-servers-list.component.html
@@ -0,0 +1,39 @@
+<div class="table-responsive">
+  @if (appServers && appServers.length > 0) {
+  <table class="table table-sm table-borderless">
+    <thead class="table-light">
+      <tr>
+        <th class="w-90">App Name</th>
+        <th class="w-10">Release</th>
+      </tr>
+    </thead>
+    <tbody>
+      @for (appServer of appServers; track appServer; let even = $even) {
+
+      <tr [class.table-light]="!even">
+        <td class="align-middle w-90">
+          @if (!appServer.deletable) {
+          <div id="appServer.id">{{ appServer.name }}</div>
+          } @else {
+          <a href="/AMW_web/pages/editResourceView.xhtml?ctx=1&id={{ appServer.id }}">{{ appServer.name }}</a> [
+          {{ appServer.runtimeName }} ] }
+        </td>
+        <td class="align-middle w-10">
+          <a href="/AMW_web/pages/editResourceView.xhtml?ctx=1&id={{ appServer.release.id }}">{{
+            appServer.release.name
+          }}</a>
+        </td>
+      </tr>
+      @if (appServer.apps && appServer.apps.length > 0) {
+      <tr class="py-0 borderless" [class.table-light]="!even">
+        <td colspan="2" class="py-0 border-0">
+          <app-apps-list [apps]="appServer.apps" [even]="even"></app-apps-list>
+        </td>
+      </tr>
+      } }
+    </tbody>
+  </table>
+  } @else {
+  <div class="empty-container">No results found in database</div>
+  }
+</div>
diff --git a/AMW_angular/io/src/app/apps/apps-servers-list/apps-servers-list.component.scss b/AMW_angular/io/src/app/apps/apps-servers-list/apps-servers-list.component.scss
new file mode 100644
index 000000000..6d505a116
--- /dev/null
+++ b/AMW_angular/io/src/app/apps/apps-servers-list/apps-servers-list.component.scss
@@ -0,0 +1,11 @@
+table .w-10 {
+  width: 10%;
+}
+table .w-90 {
+  width: 90%;
+}
+
+.empty-container {
+  padding: 1em;
+  text-align: center;
+}
diff --git a/AMW_angular/io/src/app/apps/apps-servers-list/apps-servers-list.component.spec.ts b/AMW_angular/io/src/app/apps/apps-servers-list/apps-servers-list.component.spec.ts
new file mode 100644
index 000000000..0f5284f14
--- /dev/null
+++ b/AMW_angular/io/src/app/apps/apps-servers-list/apps-servers-list.component.spec.ts
@@ -0,0 +1,22 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { AppsServersListComponent } from './apps-servers-list.component';
+
+describe('AppsListComponent', () => {
+  let component: AppsServersListComponent;
+  let fixture: ComponentFixture<AppsServersListComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [AppsServersListComponent],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(AppsServersListComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/AMW_angular/io/src/app/apps/apps-servers-list/apps-servers-list.component.ts b/AMW_angular/io/src/app/apps/apps-servers-list/apps-servers-list.component.ts
new file mode 100644
index 000000000..2cbe6ebae
--- /dev/null
+++ b/AMW_angular/io/src/app/apps/apps-servers-list/apps-servers-list.component.ts
@@ -0,0 +1,16 @@
+import { Component, Input } from '@angular/core';
+import { AsyncPipe } from '@angular/common';
+import { PaginationComponent } from '../../shared/pagination/pagination.component';
+import { AppServer } from '../app-server';
+import { AppsListComponent } from '../apps-list/apps-list-component';
+
+@Component({
+  selector: 'app-apps-servers-list',
+  standalone: true,
+  imports: [AsyncPipe, AppsListComponent, PaginationComponent],
+  templateUrl: './apps-servers-list.component.html',
+  styleUrl: './apps-servers-list.component.scss',
+})
+export class AppsServersListComponent {
+  @Input() appServers: AppServer[];
+}
diff --git a/AMW_angular/io/src/app/apps/apps.component.html b/AMW_angular/io/src/app/apps/apps.component.html
new file mode 100644
index 000000000..c5b821a3f
--- /dev/null
+++ b/AMW_angular/io/src/app/apps/apps.component.html
@@ -0,0 +1,58 @@
+<app-loading-indicator [isLoading]="isLoading()"></app-loading-indicator>
+<app-page>
+  <div class="page-title">Apps</div>
+  <div class="page-content">
+    <div>
+      <div class="container">
+        <div class="card row mt-2 mb-3">
+          <div class="card-header">
+            <div class="row justify-content-between align-items-center">
+              <div class="col-sm">
+                <b>Application servers and applications</b>
+              </div>
+              <div class="col-sm">
+                @if (permissions().canCreateApp) {
+                <app-button
+                  [variant]="'primary'"
+                  [additionalClasses]="'float-end'"
+                  [dataCy]="'button-add-app'"
+                  (click)="addApp()"
+                >
+                  <app-icon icon="plus-circle"></app-icon>
+                  Add Application
+                </app-button>
+                } @if (permissions().canCreateAppServer) {
+                <app-button [variant]="'primary'" [additionalClasses]="'float-end'" (click)="addServer()">
+                  <app-icon icon="plus-circle"></app-icon>
+                  Add Application Server
+                </app-button>
+                }
+              </div>
+            </div>
+          </div>
+          @if (permissions().canViewAppList) {
+          <div class="card-body">
+            <app-apps-filter
+              [releases]="releases()"
+              [upcoming]="upcomingRelease() ? upcomingRelease().id : null"
+              (filterEvent)="updateFilter($event)"
+            ></app-apps-filter>
+            <app-apps-servers-list [appServers]="appServers()"></app-apps-servers-list>
+          </div>
+          <div class="card-footer py-1">
+            <div class="row bg-light align-items-center">
+              <app-pagination
+                [currentPage]="currentPage()"
+                [lastPage]="lastPage()"
+                (doSetMax)="setMaxResultsPerPage($event)"
+                (doSetOffset)="setNewOffset($event)"
+              >
+              </app-pagination>
+            </div>
+          </div>
+          }
+        </div>
+      </div>
+    </div>
+  </div>
+</app-page>
diff --git a/AMW_angular/io/src/app/apps/apps.component.spec.ts b/AMW_angular/io/src/app/apps/apps.component.spec.ts
new file mode 100644
index 000000000..01d44bdf1
--- /dev/null
+++ b/AMW_angular/io/src/app/apps/apps.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { AppsComponent } from './apps.component';
+import { provideHttpClientTesting } from '@angular/common/http/testing';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
+
+describe('AppsComponent', () => {
+  let component: AppsComponent;
+  let fixture: ComponentFixture<AppsComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [AppsComponent],
+      providers: [provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting()],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(AppsComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/AMW_angular/io/src/app/apps/apps.component.ts b/AMW_angular/io/src/app/apps/apps.component.ts
new file mode 100644
index 000000000..88dc877a1
--- /dev/null
+++ b/AMW_angular/io/src/app/apps/apps.component.ts
@@ -0,0 +1,177 @@
+import { ChangeDetectionStrategy, Component, computed, inject, OnDestroy, OnInit, signal, Signal } from '@angular/core';
+import { BehaviorSubject, skip, Subject, take } from 'rxjs';
+import { LoadingIndicatorComponent } from '../shared/elements/loading-indicator.component';
+import { AsyncPipe } from '@angular/common';
+import { IconComponent } from '../shared/icon/icon.component';
+import { PageComponent } from '../layout/page/page.component';
+import { AppsFilterComponent } from './apps-filter/apps-filter.component';
+import { AuthService } from '../auth/auth.service';
+import { ReleasesService } from '../settings/releases/releases.service';
+import { AppsService } from './apps.service';
+import { Release } from '../settings/releases/release';
+import { takeUntil } from 'rxjs/operators';
+import { ToastService } from '../shared/elements/toast/toast.service';
+import { AppServer } from './app-server';
+import { AppsServersListComponent } from './apps-servers-list/apps-servers-list.component';
+import { PaginationComponent } from '../shared/pagination/pagination.component';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { AppServerAddComponent } from './app-server-add/app-server-add.component';
+import { toObservable, toSignal } from '@angular/core/rxjs-interop';
+import { AppAddComponent } from './app-add/app-add.component';
+import { ResourceService } from '../resource/resource.service';
+import { Resource } from '../resource/resource';
+import { AppCreate } from './app-create';
+import { ButtonComponent } from '../shared/button/button.component';
+
+@Component({
+  selector: 'app-apps',
+  standalone: true,
+  imports: [
+    AppsFilterComponent,
+    AppsServersListComponent,
+    AsyncPipe,
+    IconComponent,
+    LoadingIndicatorComponent,
+    PageComponent,
+    PaginationComponent,
+    ButtonComponent,
+  ],
+  templateUrl: './apps.component.html',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class AppsComponent implements OnInit, OnDestroy {
+  private appsService = inject(AppsService);
+  private authService = inject(AuthService);
+  private modalService = inject(NgbModal);
+  private releaseService = inject(ReleasesService); // getCount -> getReleases(0, count)
+  private resourceService = inject(ResourceService);
+  private toastService = inject(ToastService);
+
+  upcomingRelease: Signal<Release> = toSignal(this.releaseService.getUpcomingRelease());
+
+  releases: Signal<Release[]> = toSignal(this.releaseService.getReleases(0, 50), { initialValue: [] as Release[] });
+  appServerGroups = toSignal(this.resourceService.getByType('APPLICATIONSERVER'), {
+    initialValue: [] as Resource[],
+  });
+  appServers = this.appsService.apps;
+  count = this.appsService.count;
+  maxResults = this.appsService.limit;
+  offset = this.appsService.offset;
+  filter = this.appsService.filter;
+  releaseId = this.appsService.releaseId;
+  private error$ = new BehaviorSubject<string>('');
+  private destroy$ = new Subject<void>();
+
+  showLoader = signal(false);
+  isLoading = computed(() => {
+    return this.appServers() === undefined || this.showLoader();
+  });
+
+  permissions = computed(() => {
+    if (this.authService.restrictions().length > 0) {
+      return {
+        canCreateApp: this.authService.hasResourcePermission('RESOURCE', 'CREATE', 'APPLICATION'),
+        canCreateAppServer: this.authService.hasResourcePermission('RESOURCE', 'CREATE', 'APPLICATIONSERVER'),
+        canViewAppList: this.authService.hasPermission('APP_AND_APPSERVER_LIST', 'READ'),
+      };
+    } else {
+      return { canCreateApp: false, canCreateAppServer: false, canViewAppList: false };
+    }
+  });
+
+  currentPage = computed(() => Math.floor(this.offset() / this.maxResults()) + 1);
+  lastPage = computed(() => Math.ceil(this.count() / this.maxResults()));
+
+  constructor() {
+    toObservable(this.upcomingRelease)
+      .pipe(takeUntil(this.destroy$), skip(1), take(1))
+      .subscribe((release) => {
+        this.releaseId.set(release.id);
+        this.appsService.refreshData();
+      });
+  }
+
+  ngOnInit(): void {
+    this.error$.pipe(takeUntil(this.destroy$)).subscribe((msg) => {
+      msg !== '' ? this.toastService.error(msg) : null;
+    });
+  }
+
+  addApp() {
+    const modalRef = this.modalService.open(AppAddComponent);
+    modalRef.componentInstance.releases = this.releases;
+    modalRef.componentInstance.appServerGroups = this.appServerGroups;
+    modalRef.componentInstance.saveApp.pipe(takeUntil(this.destroy$)).subscribe((app: AppCreate) => this.saveApp(app));
+  }
+
+  addServer() {
+    const modalRef = this.modalService.open(AppServerAddComponent);
+    modalRef.componentInstance.releases = this.releases;
+    modalRef.componentInstance.saveAppServer
+      .pipe(takeUntil(this.destroy$))
+      .subscribe((appServer: AppServer) => this.saveAppServer(appServer));
+  }
+
+  saveAppServer(appServer: AppServer) {
+    this.showLoader.set(true);
+    this.appsService
+      .createAppServer(appServer)
+      .pipe(takeUntil(this.destroy$))
+      .subscribe({
+        next: () => {
+          this.toastService.success('AppServer saved successfully.');
+        },
+        error: (e) => {
+          this.error$.next(e.toString());
+        },
+        complete: () => {
+          this.appsService.refreshData();
+        },
+      });
+  }
+
+  saveApp(app: AppCreate) {
+    this.showLoader.set(true);
+    this.appsService
+      .createApp(app)
+      .pipe(takeUntil(this.destroy$))
+      .subscribe({
+        next: () => this.toastService.success('App saved successfully.'),
+        error: (e) => this.error$.next(e.toString()),
+        complete: () => {
+          this.appsService.refreshData();
+        },
+      });
+  }
+
+  setMaxResultsPerPage(max: number) {
+    this.maxResults.set(max);
+    this.offset.set(0);
+    this.appsService.refreshData();
+  }
+
+  setNewOffset(offset: number) {
+    this.offset.set(offset);
+    this.appsService.refreshData();
+  }
+
+  updateFilter(values: { filter: string; releaseId: number }) {
+    let update = false;
+    if (values.filter !== undefined && this.filter() !== values.filter) {
+      this.filter.set(values.filter);
+      update = true;
+    }
+
+    if (values.releaseId > 0 && this.releaseId() !== values.releaseId) {
+      this.releaseId.set(values.releaseId);
+      update = true;
+    }
+    if (update) {
+      this.appsService.refreshData();
+    }
+  }
+
+  ngOnDestroy(): void {
+    this.destroy$.next(undefined);
+  }
+}
diff --git a/AMW_angular/io/src/app/apps/apps.routes.ts b/AMW_angular/io/src/app/apps/apps.routes.ts
new file mode 100644
index 000000000..ce28c07bb
--- /dev/null
+++ b/AMW_angular/io/src/app/apps/apps.routes.ts
@@ -0,0 +1,3 @@
+import { AppsComponent } from './apps.component';
+
+export const appsRoutes = [{ path: 'apps', component: AppsComponent }];
diff --git a/AMW_angular/io/src/app/apps/apps.service.ts b/AMW_angular/io/src/app/apps/apps.service.ts
new file mode 100644
index 000000000..7dd56ba18
--- /dev/null
+++ b/AMW_angular/io/src/app/apps/apps.service.ts
@@ -0,0 +1,94 @@
+import { inject, Injectable, signal, WritableSignal } from '@angular/core';
+import { BaseService } from '../base/base.service';
+import { HttpClient, HttpResponse } from '@angular/common/http';
+import { Observable, of, startWith, Subject } from 'rxjs';
+import { catchError, map, shareReplay, switchMap } from 'rxjs/operators';
+import { AppServer } from './app-server';
+import { toSignal } from '@angular/core/rxjs-interop';
+import { AppCreate } from './app-create';
+
+@Injectable({ providedIn: 'root' })
+export class AppsService extends BaseService {
+  private http = inject(HttpClient);
+  private appsUrl = `${this.getBaseUrl()}/apps`;
+
+  private reload$ = new Subject<AppServer[]>();
+
+  offset = signal(0);
+  limit = signal(20);
+  filter = signal<string>(null);
+  releaseId: WritableSignal<number | undefined> = signal(undefined);
+  private apps$: Observable<AppServer[]> = this.reload$.pipe(
+    startWith(null),
+    switchMap(() => this.getApps(this.offset(), this.limit(), this.filter(), this.releaseId())),
+    shareReplay(1),
+  );
+  count = signal(0);
+  apps = toSignal(this.apps$, { initialValue: [] as AppServer[] });
+
+  constructor() {
+    super();
+  }
+
+  refreshData() {
+    this.reload$.next([]);
+  }
+
+  private getApps(offset: number, limit: number, filter: string, releaseId: number | undefined) {
+    if (!releaseId) return of([]);
+
+    let urlParams = '';
+    if (offset != null) {
+      urlParams = `start=${offset}&`;
+    }
+
+    if (limit != null) {
+      urlParams += `limit=${limit}&`;
+    }
+
+    if (filter != null) {
+      urlParams += `appServerName=${filter}&`;
+    }
+
+    return this.http
+      .get<AppServer[]>(`${this.appsUrl}?${urlParams}releaseId=${releaseId}`, {
+        headers: this.getHeaders(),
+        observe: 'response',
+      })
+      .pipe(catchError(this.handleError))
+      .pipe(
+        map((response: HttpResponse<AppServer[]>) => {
+          if (response.body.length <= 0) {
+            this.count.set(0);
+          } else {
+            this.count.set(Number(response.headers.get('x-total-count')));
+          }
+          return response.body;
+        }),
+      );
+  }
+
+  createAppServer(appServer: AppServer) {
+    return this.http
+      .post<string>(`${this.appsUrl}/appServer?appServerName=${appServer.name}&releaseId=${appServer.release.id}`, {
+        headers: this.getHeaders(),
+      })
+      .pipe(catchError(this.handleError));
+  }
+
+  createApp(app: AppCreate) {
+    if (app.appServerId) {
+      return this.http
+        .post<AppCreate>(`${this.appsUrl}/appWithServer`, app, {
+          headers: this.getHeaders(),
+        })
+        .pipe(catchError(this.handleError));
+    }
+
+    return this.http
+      .post<AppCreate>(`${this.appsUrl}?appName=${app.appName}&releaseId=${app.appReleaseId}`, app, {
+        headers: this.getHeaders(),
+      })
+      .pipe(catchError(this.handleError));
+  }
+}
diff --git a/AMW_angular/io/src/app/auditview/auditview.component.ts b/AMW_angular/io/src/app/auditview/auditview.component.ts
index 4467cbb0c..fa101595e 100644
--- a/AMW_angular/io/src/app/auditview/auditview.component.ts
+++ b/AMW_angular/io/src/app/auditview/auditview.component.ts
@@ -11,7 +11,7 @@ import { AuditviewTableService } from './auditview-table/auditview-table.service
 import { PageComponent } from '../layout/page/page.component';
 
 @Component({
-  selector: 'amw-auditview',
+  selector: 'app-auditview',
   templateUrl: './auditview.component.html',
   standalone: true,
   providers: [AuditviewService, AuditviewTableService, DatePipe],
diff --git a/AMW_angular/io/src/app/auth/auth.service.ts b/AMW_angular/io/src/app/auth/auth.service.ts
index 29de855c3..ef5593823 100644
--- a/AMW_angular/io/src/app/auth/auth.service.ts
+++ b/AMW_angular/io/src/app/auth/auth.service.ts
@@ -1,13 +1,15 @@
-import { Injectable } from '@angular/core';
+import { inject, Injectable } from '@angular/core';
 import { BaseService } from '../base/base.service';
 import { HttpClient } from '@angular/common/http';
 import { Observable, startWith, Subject } from 'rxjs';
 import { catchError, shareReplay, switchMap } from 'rxjs/operators';
 import { Restriction } from '../settings/permission/restriction';
 import { toSignal } from '@angular/core/rxjs-interop';
+import { DefaultResourceType } from './defaultResourceType';
 
 @Injectable({ providedIn: 'root' })
 export class AuthService extends BaseService {
+  private http = inject(HttpClient);
   private reload$ = new Subject<Restriction[]>();
   private restrictions$ = this.reload$.pipe(
     startWith(null),
@@ -16,7 +18,7 @@ export class AuthService extends BaseService {
   );
   restrictions = toSignal(this.restrictions$, { initialValue: [] as Restriction[] });
 
-  constructor(private http: HttpClient) {
+  constructor() {
     super();
   }
 
@@ -43,6 +45,22 @@ export class AuthService extends BaseService {
       this.getActionsForPermission(permissionName).find((value) => value === 'ALL' || value === action) !== undefined
     );
   }
+
+  hasResourcePermission(permissionName: string, action: string, resourceType: string): boolean {
+    return (
+      this.restrictions()
+        .filter((entry) => entry.permission.name === permissionName)
+        .filter((entry) => entry.resourceTypeName === resourceType || this.isDefaultType(entry, resourceType))
+        .map((entry) => entry.action)
+        .find((entry) => entry === 'ALL' || entry === action) !== undefined
+    );
+  }
+
+  private isDefaultType(entry: Restriction, resourceType: string) {
+    if (entry.resourceTypeName === null && entry.resourceTypePermission === 'DEFAULT_ONLY') {
+      return Object.keys(DefaultResourceType).find((key) => key === resourceType);
+    } else return false;
+  }
 }
 
 // curried function to verify a role in an action
diff --git a/AMW_angular/io/src/app/auth/defaultResourceType.ts b/AMW_angular/io/src/app/auth/defaultResourceType.ts
new file mode 100644
index 000000000..703cf24b4
--- /dev/null
+++ b/AMW_angular/io/src/app/auth/defaultResourceType.ts
@@ -0,0 +1,6 @@
+export enum DefaultResourceType {
+  APPLICATIONSERVER = 'Applicationserver',
+  APPLICATION = 'Application',
+  NODE = 'Node',
+  RUNTIME = 'Runtime',
+}
diff --git a/AMW_angular/io/src/app/core/amw-constants.ts b/AMW_angular/io/src/app/core/amw-constants.ts
index 12697a286..27357536b 100644
--- a/AMW_angular/io/src/app/core/amw-constants.ts
+++ b/AMW_angular/io/src/app/core/amw-constants.ts
@@ -1,4 +1,9 @@
 export const AMW_LOGOUT_URL = 'amw.logoutUrl';
+export const ENVIRONMENT = {
+  AMW_VM_DETAILS_URL: 'amw.vmDetailUrl',
+  AMW_VM_URL_PARAM: 'amw.vmUrlParam',
+};
+
 // used for date-fns
 export const DATE_TIME_FORMAT = 'dd.MM.yyyy HH:mm';
 export const DATE_FORMAT = 'dd.MM.yyyy';
diff --git a/AMW_angular/io/src/app/deployment/deployment-request.ts b/AMW_angular/io/src/app/deployment/deployment-request.ts
index ca202aaa6..b9afe6106 100644
--- a/AMW_angular/io/src/app/deployment/deployment-request.ts
+++ b/AMW_angular/io/src/app/deployment/deployment-request.ts
@@ -7,8 +7,6 @@ export interface DeploymentRequest {
   releaseName: string;
   requestOnly: boolean;
   simulate: boolean;
-  executeShakedownTest: boolean;
-  neighbourhoodTest: boolean;
   sendEmail: boolean;
   appsWithVersion: AppWithVersion[];
   stateToDeploy: number;
diff --git a/AMW_angular/io/src/app/deployment/deployment.component.html b/AMW_angular/io/src/app/deployment/deployment.component.html
index 80e29f4d1..0f1f4ff78 100644
--- a/AMW_angular/io/src/app/deployment/deployment.component.html
+++ b/AMW_angular/io/src/app/deployment/deployment.component.html
@@ -144,9 +144,7 @@ <h5 class="environments-title">
           </div>
           <div class="col-sm-2">
             @if (transDeploymentParameter.key && transDeploymentParameter.value) {
-            <button type="button" class="btn btn-secondary" (click)="onAddParam()">
-              <app-icon icon="plus"></app-icon>
-            </button>
+            <app-button [variant]="'secondary'" (click)="onAddParam()"><app-icon icon="plus"></app-icon></app-button>
             }
           </div>
         </div>
@@ -162,9 +160,9 @@ <h5 class="environments-title">
             <input class="form-control" disabled type="text" value="{{ transDepParam.value }}" />
           </div>
           <div class="col-sm-2">
-            <button type="button" class="btn btn-secondary" (click)="onRemoveParam(transDepParam)">
-              <app-icon icon="trash"></app-icon>
-            </button>
+            <app-button [variant]="'secondary'" (click)="onRemoveParam(transDepParam)"
+              ><app-icon icon="trash"></app-icon
+            ></app-button>
           </div>
         </div>
         } }
@@ -180,50 +178,27 @@ <h5 class="environments-title">
               <input class="form-check-input" id="email" type="checkbox" [(ngModel)]="doSendEmail" />
               <label for="email">send an email when deployed</label>
             </div>
-            @if (hasPermissionShakedownTest) {
-            <div class="form-check">
-              <input
-                class="form-check-input"
-                id="doExecuteShakedownTest"
-                type="checkbox"
-                [(ngModel)]="doExecuteShakedownTest"
-              />
-              <label for="doExecuteShakedownTest">execute shakedown tests when deployed</label>
-            </div>
-            } @if (doExecuteShakedownTest) {
-            <div class="form-check">
-              <input
-                class="form-check-input"
-                id="doNeighbourhoodTest"
-                type="checkbox"
-                [(ngModel)]="doNeighbourhoodTest"
-              />
-              <label for="doNeighbourhoodTest">test neighbourhood</label>
-            </div>
-            }
           </div>
         </div>
 
         <div class="form-group row" [attr.disabled]="isReadyForDeployment() ? null : ''">
           <div class="offset-2 col">
-            <button
-              type="submit"
-              class="btn btn-secondary btn-main"
-              [attr.data-cy]="'btn-request-deployment'"
-              [attr.disabled]="hasPermissionToRequestDeployment ? null : ''"
+            <app-button
+              [variant]="'secondary'"
+              [additionalClasses]="'mb-2 me-2'"
+              [disabled]="!hasPermissionToRequestDeployment"
               (click)="requestDeployment()"
             >
               Request deployment
-            </button>
-            <button
-              type="submit"
-              class="btn btn-primary btn-main"
-              [attr.data-cy]="'btn-deploy'"
-              [attr.disabled]="hasPermissionToDeploy ? null : ''"
+            </app-button>
+            <app-button
+              [variant]="'primary'"
+              [additionalClasses]="'mb-2 me-2'"
+              [disabled]="!hasPermissionToDeploy"
+              [dataCy]="'btn-deploy'"
               (click)="createDeployment()"
+              >Deploy</app-button
             >
-              Deploy
-            </button>
           </div>
         </div>
       </span>
diff --git a/AMW_angular/io/src/app/deployment/deployment.component.spec.ts b/AMW_angular/io/src/app/deployment/deployment.component.spec.ts
index c4f7de033..3537023ef 100644
--- a/AMW_angular/io/src/app/deployment/deployment.component.spec.ts
+++ b/AMW_angular/io/src/app/deployment/deployment.component.spec.ts
@@ -89,7 +89,7 @@ describe('DeploymentComponent (create deployment)', () => {
   });
 
   it('should populate groupedEnvironments on ngOnInit', () => {
-    const environments: Environment[] = [{ id: 1, name: 'A', parent: 'DEV' } as Environment];
+    const environments: Environment[] = [{ id: 1, name: 'A', parentName: 'DEV' } as Environment];
     spyOn(environmentService, 'getAll').and.returnValue(of(environments));
     expect(component.groupedEnvironments).toEqual({});
     component.ngOnInit();
@@ -151,9 +151,9 @@ describe('DeploymentComponent (create deployment)', () => {
 
   it('should return environementGroupNames on getEnvironmentGroups()', () => {
     const environments: Environment[] = [
-      { id: 1, name: 'A', parent: 'DEV' } as Environment,
-      { id: 2, name: 'B', parent: 'DEV' } as Environment,
-      { id: 3, name: 'P', parent: 'PROD' } as Environment,
+      { id: 1, name: 'A', parentName: 'DEV' } as Environment,
+      { id: 2, name: 'B', parentName: 'DEV' } as Environment,
+      { id: 3, name: 'P', parentName: 'PROD' } as Environment,
     ];
     spyOn(environmentService, 'getAll').and.returnValue(of(environments));
     component.ngOnInit();
@@ -184,14 +184,11 @@ describe('DeploymentComponent (create deployment)', () => {
     const appServer: Resource = { name: 'testServer', id: 3 } as Resource;
     component.environments = [{ id: 1 } as Environment, { id: 2, selected: true } as Environment];
     component.selectedAppserver = appServer;
-    spyOn(resourceService, 'canCreateShakedownTest').and.returnValue(of(false));
     spyOn(deploymentService, 'canDeploy').and.returnValue(of(true));
     // when
     component.onChangeAppserver();
     // then
-    expect(resourceService.canCreateShakedownTest).toHaveBeenCalledWith(3);
     expect(deploymentService.canDeploy).toHaveBeenCalledWith(3, [2]);
-    expect(component.hasPermissionShakedownTest).toBeFalsy();
     expect(component.hasPermissionToDeploy).toBeTruthy();
   });
 
@@ -282,7 +279,6 @@ describe('DeploymentComponent (create deployment)', () => {
     component.selectedAppserver = { name: 'testServer' } as Resource;
     component.selectedRelease = { id: 1, release: 'testRelease' } as Release;
     component.environments = [{ id: 2, name: 'A' } as Environment, { id: 3, name: 'B', selected: true } as Environment];
-    component.doExecuteShakedownTest = true;
     component.appsWithVersion = [
       {
         applicationId: 4,
@@ -305,8 +301,6 @@ describe('DeploymentComponent (create deployment)', () => {
       releaseName: 'testRelease',
       simulate: false,
       sendEmail: false,
-      executeShakedownTest: component.doExecuteShakedownTest,
-      neighbourhoodTest: false,
       requestOnly: true,
       appsWithVersion: component.appsWithVersion,
       stateToDeploy: component.selectedResourceTag.tagDate,
@@ -329,7 +323,6 @@ describe('DeploymentComponent (create deployment)', () => {
       { id: 2, name: 'A', selected: true } as Environment,
       { id: 3, name: 'B', selected: true } as Environment,
     ];
-    component.doExecuteShakedownTest = true;
     component.simulate = true;
     component.appsWithVersion = [
       {
@@ -357,8 +350,6 @@ describe('DeploymentComponent (create deployment)', () => {
       releaseName: 'testRelease',
       simulate: component.simulate,
       sendEmail: false,
-      executeShakedownTest: component.doExecuteShakedownTest,
-      neighbourhoodTest: false,
       requestOnly: false,
       appsWithVersion: component.appsWithVersion,
       stateToDeploy: component.selectedResourceTag.tagDate,
@@ -616,8 +607,6 @@ describe('DeploymentComponent (redeployment)', () => {
       contextIds: [2],
       simulate: false,
       sendEmail: false,
-      executeShakedownTest: false,
-      neighbourhoodTest: false,
       requestOnly: false,
       appsWithVersion,
       deploymentParameters,
diff --git a/AMW_angular/io/src/app/deployment/deployment.component.ts b/AMW_angular/io/src/app/deployment/deployment.component.ts
index 340ace6dd..2981bfa59 100644
--- a/AMW_angular/io/src/app/deployment/deployment.component.ts
+++ b/AMW_angular/io/src/app/deployment/deployment.component.ts
@@ -23,9 +23,10 @@ import { NgSelectModule } from '@ng-select/ng-select';
 import { NotificationComponent } from '../shared/elements/notification/notification.component';
 import { LoadingIndicatorComponent } from '../shared/elements/loading-indicator.component';
 import { PageComponent } from '../layout/page/page.component';
+import { ButtonComponent } from '../shared/button/button.component';
 
 @Component({
-  selector: 'amw-deployment',
+  selector: 'app-deployment',
   templateUrl: './deployment.component.html',
   standalone: true,
   imports: [
@@ -36,6 +37,7 @@ import { PageComponent } from '../layout/page/page.component';
     DateTimePickerComponent,
     IconComponent,
     PageComponent,
+    ButtonComponent,
   ],
 })
 export class DeploymentComponent implements OnInit, AfterViewInit {
@@ -65,7 +67,6 @@ export class DeploymentComponent implements OnInit, AfterViewInit {
   transDeploymentParameter: DeploymentParameter = {} as DeploymentParameter;
   transDeploymentParameters: DeploymentParameter[] = [];
   deploymentResponse: any = {};
-  hasPermissionShakedownTest: boolean = false;
   hasPermissionToDeploy: boolean = false;
   hasPermissionToRequestDeployment: boolean = false;
 
@@ -77,9 +78,6 @@ export class DeploymentComponent implements OnInit, AfterViewInit {
   simulate: boolean = false;
   requestOnly: boolean = false;
   doSendEmail: boolean = false;
-  doExecuteShakedownTest: boolean = false;
-  // may only be enabled if above is true
-  doNeighbourhoodTest: boolean = false;
 
   bestForSelectedRelease: Release = null;
 
@@ -136,7 +134,6 @@ export class DeploymentComponent implements OnInit, AfterViewInit {
   onChangeAppserver() {
     this.resetVars();
     this.loadReleases();
-    this.canCreateShakedownTest();
     this.canDeploy();
   }
 
@@ -301,7 +298,6 @@ export class DeploymentComponent implements OnInit, AfterViewInit {
     this.errorMessage = '';
     this.successMessage = '';
     this.isDeploymentBlocked = false;
-    this.hasPermissionShakedownTest = false;
     this.selectedRelease = null;
     this.bestForSelectedRelease = null;
     this.resourceTags = [this.defaultResourceTag];
@@ -309,19 +305,11 @@ export class DeploymentComponent implements OnInit, AfterViewInit {
     this.deploymentDate = null;
     this.simulate = false;
     this.doSendEmail = false;
-    this.doExecuteShakedownTest = false;
-    this.doNeighbourhoodTest = false;
     this.appsWithVersion = [];
     this.transDeploymentParameter = {} as DeploymentParameter;
     this.transDeploymentParameters = [];
   }
 
-  private canCreateShakedownTest() {
-    this.resourceService
-      .canCreateShakedownTest(this.selectedAppserver.id)
-      .subscribe({ next: (r) => (this.hasPermissionShakedownTest = r), error: (e) => (this.errorMessage = e) });
-  }
-
   private canDeploy() {
     if (this.selectedAppserver != null) {
       this.hasPermissionToDeploy = false;
@@ -380,8 +368,6 @@ export class DeploymentComponent implements OnInit, AfterViewInit {
     deploymentRequest.contextIds = contextIds;
     deploymentRequest.simulate = this.simulate;
     deploymentRequest.sendEmail = this.doSendEmail;
-    deploymentRequest.executeShakedownTest = this.doExecuteShakedownTest;
-    deploymentRequest.neighbourhoodTest = this.doNeighbourhoodTest;
     deploymentRequest.requestOnly = this.requestOnly;
     deploymentRequest.appsWithVersion = this.appsWithVersion;
     if (!this.isRedeployment) {
@@ -425,10 +411,10 @@ export class DeploymentComponent implements OnInit, AfterViewInit {
 
   private extractEnvironmentGroups() {
     this.environments.forEach((environment) => {
-      if (!this.groupedEnvironments[environment['parent']]) {
-        this.groupedEnvironments[environment['parent']] = [];
+      if (!this.groupedEnvironments[environment['parentName']]) {
+        this.groupedEnvironments[environment['parentName']] = [];
       }
-      this.groupedEnvironments[environment['parent']].push(environment);
+      this.groupedEnvironments[environment['parentName']].push(environment);
     });
   }
 
diff --git a/AMW_angular/io/src/app/deployment/deployment.service.spec.ts b/AMW_angular/io/src/app/deployment/deployment.service.spec.ts
index 7cb47d0f5..d04712f7e 100644
--- a/AMW_angular/io/src/app/deployment/deployment.service.spec.ts
+++ b/AMW_angular/io/src/app/deployment/deployment.service.spec.ts
@@ -5,18 +5,16 @@ import { Deployment } from './deployment';
 import { DeploymentService } from './deployment.service';
 
 describe('DeploymentService', () => {
-  let httpClient: HttpClient;
   let httpTestingController: HttpTestingController;
   let service: DeploymentService;
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-    imports: [],
-    providers: [DeploymentService, provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting()]
-});
+      imports: [],
+      providers: [DeploymentService, provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting()],
+    });
 
     httpTestingController = TestBed.inject(HttpTestingController);
-    httpClient = TestBed.inject(HttpClient);
     service = TestBed.inject(DeploymentService);
   });
 
@@ -87,7 +85,5 @@ describe('DeploymentService', () => {
     stateToDeploy: 1,
     sendEmailWhenDeployed: true,
     simulateBeforeDeployment: true,
-    shakedownTestsWhenDeployed: true,
-    neighbourhoodTest: false,
   };
 });
diff --git a/AMW_angular/io/src/app/deployment/deployment.ts b/AMW_angular/io/src/app/deployment/deployment.ts
index 15c1e4abf..97552fc88 100644
--- a/AMW_angular/io/src/app/deployment/deployment.ts
+++ b/AMW_angular/io/src/app/deployment/deployment.ts
@@ -33,6 +33,4 @@ export interface Deployment {
   stateToDeploy: number;
   sendEmailWhenDeployed: boolean;
   simulateBeforeDeployment: boolean;
-  shakedownTestsWhenDeployed: boolean;
-  neighbourhoodTest: boolean;
 }
diff --git a/AMW_angular/io/src/app/deployment/environment.service.spec.ts b/AMW_angular/io/src/app/deployment/environment.service.spec.ts
index 807c5923d..217bf732f 100644
--- a/AMW_angular/io/src/app/deployment/environment.service.spec.ts
+++ b/AMW_angular/io/src/app/deployment/environment.service.spec.ts
@@ -1,11 +1,10 @@
-import { HttpClient, provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing';
 import { TestBed } from '@angular/core/testing';
 import { Environment } from './environment';
 import { EnvironmentService } from './environment.service';
 
-describe('DeploymentService', () => {
-  let httpClient: HttpClient;
+describe('EnvironmentService', () => {
   let httpTestingController: HttpTestingController;
   let service: EnvironmentService;
 
@@ -13,28 +12,30 @@ describe('DeploymentService', () => {
     id: 1,
     name: 'env',
     nameAlias: 'env-alias',
-    parent: 'parens',
+    parentName: 'parent',
+    parentId: null,
     selected: true,
     disabled: false,
   };
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-    imports: [],
-    providers: [EnvironmentService, provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting()]
-});
+      imports: [],
+      providers: [EnvironmentService, provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting()],
+    });
 
     httpTestingController = TestBed.inject(HttpTestingController);
-    httpClient = TestBed.inject(HttpClient);
     service = TestBed.inject(EnvironmentService);
   });
 
   afterEach(() => {
+    httpTestingController.expectOne('/AMW_rest/resources/environments/contexts');
     httpTestingController.verify();
   });
 
   it('should be created', () => {
     expect(service).toBeTruthy();
+    httpTestingController.expectOne('/AMW_rest/resources/environments');
   });
 
   it('should invoke the correct endpoint on getAll()', () => {
@@ -42,11 +43,16 @@ describe('DeploymentService', () => {
       expect(environments).toEqual([environment]);
     });
 
-    const req = httpTestingController.expectOne('/AMW_rest/resources/environments');
+    const requests = httpTestingController.match('/AMW_rest/resources/environments');
+    expect(requests.length).toBe(2);
     httpTestingController.expectNone('/AMW_rest/resources/environments?includingGroups=true');
 
-    expect(req.request.method).toEqual('GET');
-    req.flush([environment]);
+    requests.forEach((req) => {
+      expect(req.request.method).toEqual('GET');
+    });
+
+    requests[0].flush([environment]);
+    requests[1].flush([environment]);
   });
 
   it('should invoke the correct endpoint on getAllIncludingGroups ', () => {
@@ -54,7 +60,7 @@ describe('DeploymentService', () => {
       expect(environmentIncludingGroups).toEqual([environment]);
     });
 
-    httpTestingController.expectNone('/AMW_rest/resources/environments');
+    httpTestingController.expectOne('/AMW_rest/resources/environments');
     const req = httpTestingController.expectOne('/AMW_rest/resources/environments?includingGroups=true');
 
     expect(req.request.method).toEqual('GET');
diff --git a/AMW_angular/io/src/app/deployment/environment.service.ts b/AMW_angular/io/src/app/deployment/environment.service.ts
index 375645663..89fead359 100644
--- a/AMW_angular/io/src/app/deployment/environment.service.ts
+++ b/AMW_angular/io/src/app/deployment/environment.service.ts
@@ -1,12 +1,27 @@
-import { Injectable } from '@angular/core';
+import { Injectable, Signal } from '@angular/core';
 import { HttpClient, HttpParams } from '@angular/common/http';
-import { Observable } from 'rxjs';
-import { catchError } from 'rxjs/operators';
+import { Observable, startWith, Subject } from 'rxjs';
+import { catchError, shareReplay, switchMap } from 'rxjs/operators';
 import { Environment } from './environment';
 import { BaseService } from '../base/base.service';
+import { toSignal } from '@angular/core/rxjs-interop';
 
 @Injectable({ providedIn: 'root' })
 export class EnvironmentService extends BaseService {
+  private reload$ = new Subject<Environment[]>();
+  private reloadedContexts = this.reload$.pipe(
+    startWith(null),
+    switchMap(() => this.getContexts()),
+    shareReplay(1),
+  );
+  private reloadedEnvs = this.reload$.pipe(
+    startWith(null),
+    switchMap(() => this.getAll()),
+    shareReplay(1),
+  );
+  contexts: Signal<Environment[]> = toSignal(this.reloadedContexts, { initialValue: [] as Environment[] });
+  envs: Signal<Environment[]> = toSignal(this.reloadedEnvs, { initialValue: [] as Environment[] });
+
   constructor(private http: HttpClient) {
     super();
   }
@@ -33,4 +48,43 @@ export class EnvironmentService extends BaseService {
       })
       .pipe(catchError(this.handleError));
   }
+
+  getContexts(): Observable<Environment[]> {
+    return this.http
+      .get<Environment[]>(`${this.getBaseUrl()}/environments/contexts`)
+      .pipe(catchError(this.handleError));
+  }
+
+  save(environment: Environment) {
+    if (environment.id) return this.update(environment);
+    return this.create(environment);
+  }
+
+  private create(environment: Environment) {
+    return this.http
+      .post<Environment>(`${this.getBaseUrl()}/environments/contexts`, environment, {
+        headers: this.getHeaders(),
+      })
+      .pipe(catchError(this.handleError));
+  }
+
+  private update(environment: Environment) {
+    return this.http
+      .put<Environment>(`${this.getBaseUrl()}/environments/contexts/${environment.id}`, environment, {
+        headers: this.getHeaders(),
+      })
+      .pipe(catchError(this.handleError));
+  }
+
+  delete(id: number) {
+    return this.http
+      .delete<number>(`${this.getBaseUrl()}/environments/contexts/${id}`, {
+        headers: this.getHeaders(),
+      })
+      .pipe(catchError(this.handleError));
+  }
+
+  refreshData() {
+    this.reload$.next([]);
+  }
 }
diff --git a/AMW_angular/io/src/app/deployment/environment.ts b/AMW_angular/io/src/app/deployment/environment.ts
index ee5f7c812..8c7c002b4 100644
--- a/AMW_angular/io/src/app/deployment/environment.ts
+++ b/AMW_angular/io/src/app/deployment/environment.ts
@@ -2,7 +2,19 @@ export interface Environment {
   id: number;
   name: string;
   nameAlias: string;
-  parent: string;
+  parentName: string;
+  parentId: number;
+  selected: boolean;
+  disabled: boolean;
+}
+
+export interface EnvironmentTree {
+  id: number;
+  name: string;
+  nameAlias: string;
+  parentName: string;
+  parentId: number;
+  children: EnvironmentTree[];
   selected: boolean;
   disabled: boolean;
 }
diff --git a/AMW_angular/io/src/app/deployments/deployment-container/deployment-container.component.ts b/AMW_angular/io/src/app/deployments/deployment-container/deployment-container.component.ts
index 929afef9b..40084e819 100644
--- a/AMW_angular/io/src/app/deployments/deployment-container/deployment-container.component.ts
+++ b/AMW_angular/io/src/app/deployments/deployment-container/deployment-container.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import { Component } from '@angular/core';
 import { RouterOutlet } from '@angular/router';
 import { EnvironmentService } from '../../deployment/environment.service';
 import { DeploymentService } from '../../deployment/deployment.service';
@@ -12,8 +12,6 @@ import { DeploymentService } from '../../deployment/deployment.service';
 
   imports: [RouterOutlet],
 })
-export class DeploymentContainerComponent implements OnInit {
+export class DeploymentContainerComponent {
   constructor() {}
-
-  ngOnInit(): void {}
 }
diff --git a/AMW_angular/io/src/app/deployments/deployments-edit-modal.component.html b/AMW_angular/io/src/app/deployments/deployments-edit-modal.component.html
index 921b6a50a..f928f7c44 100644
--- a/AMW_angular/io/src/app/deployments/deployments-edit-modal.component.html
+++ b/AMW_angular/io/src/app/deployments/deployments-edit-modal.component.html
@@ -1,13 +1,4 @@
-<div class="modal-header">
-  <h6 class="modal-title">Edit deployments</h6>
-  <button
-    type="button"
-    class="btn-close"
-    data-dismiss="modal"
-    aria-hidden="true"
-    (click)="activeModal.dismiss('Cross click')"
-  ></button>
-</div>
+<app-modal-header [title]="'Edit deployments'" (cancel)="activeModal.dismiss('Cross click')"></app-modal-header>
 <div class="modal-body">
   <span class="form-horizontal">
     <label for="selectEditAction" class="col-sm-2 form-label">Action</label>
@@ -57,29 +48,9 @@ <h6 class="modal-title">Edit deployments</h6>
       <label for="simulate">simulate before deployment</label>
     </div>
 
-    @if (hasPermissionShakedownTest) {
-    <div class="form-check">
-      <input
-        type="checkbox"
-        class="form-check-input"
-        id="shakedownTestsWhenDeployed"
-        [(ngModel)]="confirmationAttributes.shakedownTestsWhenDeployed"
-      />
-      <label for="shakedownTestsWhenDeployed">execute shakedown tests when deployed</label>
-    </div>
-    } @if (confirmationAttributes.shakedownTestsWhenDeployed) {
-    <div class="form-check">
-      <input
-        type="checkbox"
-        class="form-check-input"
-        id="neighbourhoodTest"
-        [(ngModel)]="confirmationAttributes.neighbourhoodTest"
-      />
-      <label for="neighbourhoodTest">test neighbourhood</label>
-    </div>
-    } }
+    }
   </span>
 </div>
 <div class="modal-footer">
-  <button type="button" class="btn btn-primary" (click)="doEdit()">Edit</button>
+  <app-button [variant]="'primary'" (click)="doEdit()">Edit</app-button>
 </div>
diff --git a/AMW_angular/io/src/app/deployments/deployments-edit-modal.component.ts b/AMW_angular/io/src/app/deployments/deployments-edit-modal.component.ts
index e2e3f3796..8c27b8891 100644
--- a/AMW_angular/io/src/app/deployments/deployments-edit-modal.component.ts
+++ b/AMW_angular/io/src/app/deployments/deployments-edit-modal.component.ts
@@ -4,16 +4,18 @@ import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { DateTimeModel } from '../shared/date-time-picker/date-time.model';
 import { DateTimePickerComponent } from '../shared/date-time-picker/date-time-picker.component';
 import { FormsModule } from '@angular/forms';
+import { ModalHeaderComponent } from '../shared/modal-header/modal-header.component';
+import { ButtonComponent } from '../shared/button/button.component';
+import { IconComponent } from '../shared/icon/icon.component';
 
 @Component({
-  selector: 'amw-deployments-edit-modal',
+  selector: 'app-deployments-edit-modal',
   templateUrl: './deployments-edit-modal.component.html',
   standalone: true,
-  imports: [FormsModule, DateTimePickerComponent],
+  imports: [FormsModule, DateTimePickerComponent, ModalHeaderComponent, ButtonComponent, IconComponent],
 })
 export class DeploymentsEditModalComponent {
   @Input() deployments: Deployment[] = [];
-  @Input() hasPermissionShakedownTest: boolean;
 
   @Output() errorMessage: EventEmitter<string> = new EventEmitter<string>();
   @Output() doConfirmDeployment: EventEmitter<Deployment> = new EventEmitter<Deployment>();
@@ -68,8 +70,6 @@ export class DeploymentsEditModalComponent {
     for (const deployment of this.deployments) {
       deployment.sendEmailWhenDeployed = this.confirmationAttributes.sendEmailWhenDeployed;
       deployment.simulateBeforeDeployment = this.confirmationAttributes.simulateBeforeDeployment;
-      deployment.shakedownTestsWhenDeployed = this.confirmationAttributes.shakedownTestsWhenDeployed;
-      deployment.neighbourhoodTest = this.confirmationAttributes.neighbourhoodTest;
       this.doConfirmDeployment.emit(deployment);
     }
   }
diff --git a/AMW_angular/io/src/app/deployments/deployments-list.component.html b/AMW_angular/io/src/app/deployments/deployments-list.component.html
index d4869ebc1..fc9113092 100644
--- a/AMW_angular/io/src/app/deployments/deployments-list.component.html
+++ b/AMW_angular/io/src/app/deployments/deployments-list.component.html
@@ -169,19 +169,17 @@
 </div>
 
 <ng-template #deploymentDetails let-modal>
-  <div class="modal-header">
-    <h6 class="modal-title">
-      Details for deployment #{{ deployment.id }} [tracking id: {{ deployment.trackingId }}] for app server:
-      {{ deployment.appServerName }}
-    </h6>
-    <button
-      type="button"
-      class="btn-close"
-      data-dismiss="modal"
-      aria-hidden="true"
-      (click)="modal.dismiss('Cross click')"
-    ></button>
-  </div>
+  <app-modal-header
+    [title]="
+      'Details for deployment #' +
+      deployment.id +
+      ' [tracking id: ' +
+      deployment.trackingId +
+      '] for app server: ' +
+      deployment.appServerName
+    "
+    (cancel)="modal.dismiss('Cross click')"
+  ></app-modal-header>
   <div class="modal-body">
     <h6>{{ deployment.state }}</h6>
     <p>
@@ -241,18 +239,10 @@ <h6>state message</h6>
 </ng-template>
 
 <ng-template #deploymentDateChange let-modal>
-  <div class="modal-header">
-    <h6 class="modal-title">
-      Change deployment date of deployment #{{ deployment.id }} for app server {{ deployment.appServerName }}
-    </h6>
-    <button
-      type="button"
-      class="btn-close"
-      data-dismiss="modal"
-      aria-hidden="true"
-      (click)="modal.dismiss('Cross click')"
-    ></button>
-  </div>
+  <app-modal-header
+    [title]="'Change deployment date of deployment #' + deployment.id + ' for app server ' + deployment.appServerName"
+    (cancel)="modal.dismiss('Cross click')"
+  ></app-modal-header>
   <div class="modal-body">
     <div class="input-group date">
       <app-date-time-picker [(ngModel)]="deploymentDate" name="dateDeployment" id="datetimepicker" class="w-100">
@@ -260,24 +250,15 @@ <h6 class="modal-title">
     </div>
   </div>
   <div class="modal-footer">
-    <button type="button" class="btn btn-primary" ngbAutofocus (click)="modal.close('Confirm click')">Save</button>
+    <app-button [variant]="'primary'" (click)="modal.close('Confirm click')" ngbAutofocus>Save</app-button>
   </div>
 </ng-template>
 
 <ng-template #deploymentConfirmation let-modal>
-  <div class="modal-header">
-    <h6 class="modal-title">
-      Confirm deployment #{{ deployment.id }} for app server
-      {{ deployment.appServerName }}
-    </h6>
-    <button
-      type="button"
-      class="btn-close"
-      data-dismiss="modal"
-      aria-hidden="true"
-      (click)="modal.dismiss('Cross click')"
-    ></button>
-  </div>
+  <app-modal-header
+    [title]="'Confirm deployment #' + deployment.id + ' for app server ' + deployment.appServerName"
+    (cancel)="modal.dismiss('Cross click')"
+  ></app-modal-header>
   <div class="modal-body">
     <div class="modal-body">
       <div>
@@ -293,63 +274,35 @@ <h6 class="modal-title">
           simulate before deployment
         </label>
       </div>
-
-      @if (hasPermissionShakedownTest) {
-      <div class="checkbox">
-        <label>
-          <input type="checkbox" [(ngModel)]="deployment.shakedownTestsWhenDeployed" />
-          execute shakedown tests when deployed
-        </label>
-      </div>
-      } @if (deployment.shakedownTestsWhenDeployed) {
-      <div class="checkbox">
-        <label>
-          <input type="checkbox" [(ngModel)]="deployment.neighbourhoodTest" />
-          test neighbourhood
-        </label>
-      </div>
-      }
     </div>
   </div>
   <div class="modal-footer">
-    <button type="button" class="btn btn-primary" ngbAutofocus (click)="modal.close('Confirm click')">Confirm</button>
+    <app-button [variant]="'primary'" (click)="modal.close('Confirm click')" ngbAutofocus>Confirm </app-button>
   </div>
 </ng-template>
 
 <ng-template #deploymentRejection let-modal>
-  <div class="modal-header">
-    <h6 class="modal-title">Reject deployment #{{ deployment.id }} for app server {{ deployment.appServerName }}</h6>
-    <button
-      type="button"
-      class="btn-close"
-      data-dismiss="modal"
-      aria-hidden="true"
-      (click)="modal.dismiss('Cross click')"
-    ></button>
-  </div>
+  <app-modal-header
+    [title]="'Reject deployment #' + deployment.id + ' for app server ' + deployment.appServerName"
+    (cancel)="modal.dismiss('Cross click')"
+  ></app-modal-header>
   <div class="modal-body">
     <p class="text-warning-2">Are you sure that you want to reject this deployment?</p>
   </div>
   <div class="modal-footer">
-    <button type="button" class="btn btn-primary" ngbAutofocus (click)="modal.close('Confirm click')">Confirm</button>
+    <app-button [variant]="'primary'" (click)="modal.close('Confirm click')" ngbAutofocus>Confirm </app-button>
   </div>
 </ng-template>
 
 <ng-template #deploymentCancelation let-modal>
-  <div class="modal-header">
-    <h6 class="modal-title">Cancel deployment #{{ deployment.id }} for app server {{ deployment.appServerName }}</h6>
-    <button
-      type="button"
-      class="btn-close"
-      data-dismiss="modal"
-      aria-hidden="true"
-      (click)="modal.dismiss('Cross click')"
-    ></button>
-  </div>
+  <app-modal-header
+    [title]="'Cancel deployment #' + deployment.id + ' for app server ' + deployment.appServerName"
+    (cancel)="modal.dismiss('Cross click')"
+  ></app-modal-header>
   <div class="modal-body">
     <p class="text-warning-2">Are you sure that you want to cancel this deployment?</p>
   </div>
   <div class="modal-footer">
-    <button type="button" class="btn btn-primary" ngbAutofocus (click)="modal.close('Confirm click')">Confirm</button>
+    <app-button [variant]="'primary'" (click)="modal.close('Confirm click')" ngbAutofocus>Confirm </app-button>
   </div>
 </ng-template>
diff --git a/AMW_angular/io/src/app/deployments/deployments-list.component.ts b/AMW_angular/io/src/app/deployments/deployments-list.component.ts
index 6aa1b0068..f001416a5 100644
--- a/AMW_angular/io/src/app/deployments/deployments-list.component.ts
+++ b/AMW_angular/io/src/app/deployments/deployments-list.component.ts
@@ -12,9 +12,11 @@ import { IconComponent } from '../shared/icon/icon.component';
 import { FormsModule } from '@angular/forms';
 import { SortableIconComponent } from '../shared/sortable-icon/sortable-icon.component';
 import { DatePipe } from '@angular/common';
+import { ModalHeaderComponent } from '../shared/modal-header/modal-header.component';
+import { ButtonComponent } from '../shared/button/button.component';
 
 @Component({
-  selector: 'amw-deployments-list',
+  selector: 'app-deployments-list',
   templateUrl: './deployments-list.component.html',
   standalone: true,
   imports: [
@@ -24,6 +26,8 @@ import { DatePipe } from '@angular/common';
     RouterLink,
     DateTimePickerComponent,
     DatePipe,
+    ModalHeaderComponent,
+    ButtonComponent,
   ],
 })
 export class DeploymentsListComponent {
@@ -40,7 +44,6 @@ export class DeploymentsListComponent {
 
   deployment: Deployment;
   deploymentDate: DateTimeModel = new DateTimeModel();
-  hasPermissionShakedownTest: boolean = null;
   allSelected: boolean = false;
   // TODO: show this error somewhere?
   errorMessage = '';
@@ -71,12 +74,12 @@ export class DeploymentsListComponent {
     this.deployment = _.find(this.deployments, ['id', deploymentId]);
     this.deploymentDate = DateTimeModel.fromEpoch(this.deployment.deploymentDate);
     this.modalService.open(content).result.then(
-      (result) => {
+      () => {
         this.deployment.deploymentDate = this.deploymentDate.toEpoch();
         this.editDeploymentDate.emit(this.deployment);
         delete this.deploymentDate;
       },
-      (reason) => {
+      () => {
         delete this.deploymentDate;
       },
     );
@@ -84,36 +87,32 @@ export class DeploymentsListComponent {
 
   showConfirm(content, deploymentId: number) {
     this.deployment = _.find(this.deployments, ['id', deploymentId]);
-    this.resourceService.canCreateShakedownTest(this.deployment.appServerId).subscribe({
-      next: (r) => (this.hasPermissionShakedownTest = r),
-      error: (e) => (this.errorMessage = e),
-      complete: () =>
-        this.modalService.open(content).result.then(
-          (result) => {
-            this.doConfirmDeployment.emit(this.deployment);
-          },
-          (reason) => {},
-        ),
-    });
+
+    this.modalService.open(content).result.then(
+      () => {
+        this.doConfirmDeployment.emit(this.deployment);
+      },
+      () => {},
+    );
   }
 
   showReject(content, deploymentId: number) {
     this.deployment = _.find(this.deployments, ['id', deploymentId]);
     this.modalService.open(content).result.then(
-      (result) => {
+      () => {
         this.doRejectDeployment.emit(this.deployment);
       },
-      (reason) => {},
+      () => {},
     );
   }
 
   showCancel(content, deploymentId: number) {
     this.deployment = _.find(this.deployments, ['id', deploymentId]);
     this.modalService.open(content).result.then(
-      (result) => {
+      () => {
         this.doCancelDeployment.emit(this.deployment);
       },
-      (reason) => {},
+      () => {},
     );
   }
 
diff --git a/AMW_angular/io/src/app/deployments/deployments.component.html b/AMW_angular/io/src/app/deployments/deployments.component.html
index 7fd3f8dc5..9d532d884 100644
--- a/AMW_angular/io/src/app/deployments/deployments.component.html
+++ b/AMW_angular/io/src/app/deployments/deployments.component.html
@@ -42,7 +42,7 @@
             <select
               id="selectFilterComp"
               class="form-control"
-              [attr.disabled]="filter.compOptions.length == 1 ? '' : null"
+              [attr.disabled]="filter.compOptions.length === 1 ? '' : null"
               [(ngModel)]="filter.comp"
             >
               @for (compOption of filter.compOptions; track compOption) {
@@ -82,57 +82,53 @@
           </div>
           } }
           <div class="col-sm-1">
-            <button type="button" class="btn btn-link" (click)="removeFilter(filter)">
-              <app-icon icon="trash"></app-icon>
-            </button>
+            <app-button [variant]="'link'" (click)="removeFilter(filter)"
+              ><app-icon icon="trash"></app-icon
+            ></app-button>
           </div>
         </div>
         } }
 
         <div class="form-group row">
           <div class="col-sm-11 offset-1">
-            <button type="submit" class="btn btn-primary btn-main" (click)="applyFilters()">Apply filter</button>
-            <button
-              type="submit"
-              class="btn btn-danger btn-main"
-              [attr.disabled]="filters.length < 1 ? '' : null"
+            <app-button [variant]="'primary'" [additionalClasses]="'mb-2 me-2'" (click)="applyFilters()"
+              >Apply filter</app-button
+            >
+            <app-button
+              [variant]="'danger'"
+              [additionalClasses]="'mb-2 me-2'"
+              [disabled]="filters.length < 1"
               (click)="clearFilters()"
             >
-              Clear filters
-            </button>
-            <button
-              class="btn btn-secondary btn-main"
-              [attr.disabled]="filters.length < 1 ? '' : null"
+              Clear filters</app-button
+            >
+            <app-button
+              [variant]="'secondary'"
+              [additionalClasses]="'mb-2 me-2'"
+              [disabled]="filters.length < 1"
               (click)="copyURL()"
+              ><app-icon icon="clipboard"></app-icon> Clipboard</app-button
             >
-              <app-icon icon="clipboard"></app-icon>
-              Clipboard
-            </button>
-            <button
-              type="submit"
-              class="btn btn-secondary btn-main"
-              [attr.disabled]="deployments.length < 1 ? '' : null"
+            <app-button
+              [variant]="'secondary'"
+              [additionalClasses]="'mb-2 me-2'"
+              [disabled]="deployments.length < 1"
               (click)="exportCSV()"
+              ><app-icon icon="cloud-arrow-down"></app-icon> Export</app-button
             >
-              <app-icon icon="cloud-arrow-down"></app-icon>
-              Export
-            </button>
-            <button
-              type="submit"
-              class="btn btn-secondary btn-main"
-              [attr.disabled]="editableDeployments() ? null : ''"
+            <app-button
+              [variant]="'secondary'"
+              [additionalClasses]="'mb-2 me-2'"
+              [disabled]="!editableDeployments()"
               (click)="showEdit()"
+              ><app-icon icon="pencil-square"></app-icon> Edit</app-button
             >
-              <app-icon icon="pencil-square"></app-icon>
-              Edit
-            </button>
             @if (hasPermissionToRequestDeployments) {
 
             <a href="#/deployment/">
-              <button type="submit" class="btn btn-secondary btn-main" data-cy="create-button ">
-                <app-icon icon="plus-circle"></app-icon>
-                Create
-              </button>
+              <app-button [variant]="'secondary'" [additionalClasses]="'mb-2 me-2'" [dataCy]="'create-button'"
+                ><app-icon icon="plus-circle"></app-icon> Create</app-button
+              >
             </a>
 
             }
@@ -164,7 +160,7 @@
         <div class="form-group row">
           <div>
             <div class="border border-muted rounded">
-              <amw-deployments-list
+              <app-deployments-list
                 [deployments]="deployments"
                 [sortCol]="sortCol"
                 [sortDirection]="sortDirection"
@@ -176,15 +172,15 @@
                 (selectAllDeployments)="switchDeployments($event)"
                 (doSort)="sortDeploymentsBy($event)"
               >
-              </amw-deployments-list>
+              </app-deployments-list>
               <div class="bg-light">
-                <amw-pagination
+                <app-pagination
                   [currentPage]="currentPage"
                   [lastPage]="lastPage"
                   (doSetMax)="setMaxResultsPerPage($event)"
                   (doSetOffset)="setNewOffset($event)"
                 >
-                </amw-pagination>
+                </app-pagination>
               </div>
             </div>
           </div>
diff --git a/AMW_angular/io/src/app/deployments/deployments.component.spec.ts b/AMW_angular/io/src/app/deployments/deployments.component.spec.ts
index f1d566cb6..d1ff6b7e7 100644
--- a/AMW_angular/io/src/app/deployments/deployments.component.spec.ts
+++ b/AMW_angular/io/src/app/deployments/deployments.component.spec.ts
@@ -1,9 +1,8 @@
 import { provideHttpClientTesting } from '@angular/common/http/testing';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { FormsModule } from '@angular/forms';
-import { ActivatedRoute } from '@angular/router';
-import { RouterTestingModule } from '@angular/router/testing';
-import { of, Subject } from 'rxjs';
+import { ActivatedRoute, Router } from '@angular/router';
+import { BehaviorSubject, of } from 'rxjs';
 import { ResourceService } from '../resource/resource.service';
 import { DeploymentsComponent } from './deployments.component';
 import { DeploymentService } from '../deployment/deployment.service';
@@ -16,16 +15,15 @@ import { Deployment } from '../deployment/deployment';
 import { PaginationComponent } from '../shared/pagination/pagination.component';
 import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 
-declare let $: any;
-
 describe('DeploymentsComponent (with query params)', () => {
   let component: DeploymentsComponent;
   let fixture: ComponentFixture<DeploymentsComponent>;
 
-  const mockRoute: any = { snapshot: {} };
-
-  mockRoute.params = new Subject<any>();
-  mockRoute.queryParams = new Subject<any>();
+  const activatedRouteStub = { queryParams: new BehaviorSubject<any>({}) };
+  const routerStub = jasmine.createSpyObj('router', ['navigate']);
+  routerStub.navigate.and.callFake((commands: any, navigationExtras: { queryParams: any }) =>
+    activatedRouteStub.queryParams.next(navigationExtras.queryParams),
+  );
 
   const filter: string = JSON.stringify([
     { name: 'Application', val: 'test' },
@@ -37,7 +35,6 @@ describe('DeploymentsComponent (with query params)', () => {
       teardown: { destroyAfterEach: false },
       imports: [
         FormsModule,
-        RouterTestingModule.withRoutes([]),
         DeploymentsComponent,
         DeploymentsListComponent,
         PaginationComponent,
@@ -46,10 +43,8 @@ describe('DeploymentsComponent (with query params)', () => {
       providers: [
         DeploymentService,
         ResourceService,
-        {
-          provide: ActivatedRoute,
-          useValue: mockRoute,
-        },
+        { provide: Router, useValue: routerStub },
+        { provide: ActivatedRoute, useValue: activatedRouteStub },
         provideHttpClient(withInterceptorsFromDi()),
         provideHttpClientTesting(),
       ],
@@ -72,7 +67,7 @@ describe('DeploymentsComponent (with query params)', () => {
 
     // when
     component.ngOnInit();
-    mockRoute.queryParams.next({ filters: filter });
+    activatedRouteStub.queryParams.next({ filters: filter });
 
     // then
     expect(component.paramFilters.length).toEqual(2);
@@ -96,7 +91,7 @@ describe('DeploymentsComponent (with query params)', () => {
 
     // when
     component.ngOnInit();
-    mockRoute.queryParams.next({ filters: filter });
+    activatedRouteStub.queryParams.next({ filters: filter });
 
     // then
     expect(component.paramFilters[0].compOptions.length).toEqual(1);
@@ -124,7 +119,7 @@ describe('DeploymentsComponent (with query params)', () => {
 
     // when
     component.ngOnInit();
-    mockRoute.queryParams.next({ filters: filter });
+    activatedRouteStub.queryParams.next({ filters: filter });
 
     // then
     expect(component.paramFilters[0].valOptions.length).toEqual(2);
@@ -144,7 +139,7 @@ describe('DeploymentsComponent (with query params)', () => {
 
     // when
     component.ngOnInit();
-    mockRoute.queryParams.next({ filters: filter });
+    activatedRouteStub.queryParams.next({ filters: filter });
 
     // then
     expect(component.autoload).toBeTruthy();
@@ -176,10 +171,11 @@ describe('DeploymentsComponent (with illegal query params)', () => {
   let component: DeploymentsComponent;
   let fixture: ComponentFixture<DeploymentsComponent>;
 
-  const mockRoute: any = { snapshot: {} };
-
-  mockRoute.params = new Subject<any>();
-  mockRoute.queryParams = new Subject<any>();
+  const activatedRouteStub = { queryParams: new BehaviorSubject<any>({}) };
+  const routerStub = jasmine.createSpyObj('router', ['navigate']);
+  routerStub.navigate.and.callFake((commands: any, navigationExtras: { queryParams: any }) =>
+    activatedRouteStub.queryParams.next(navigationExtras.queryParams),
+  );
 
   const filter: string = JSON.stringify([
     { name: 'Application', val: 'test' },
@@ -190,7 +186,6 @@ describe('DeploymentsComponent (with illegal query params)', () => {
     TestBed.configureTestingModule({
       imports: [
         FormsModule,
-        RouterTestingModule.withRoutes([]),
         DeploymentsComponent,
         DeploymentsListComponent,
         PaginationComponent,
@@ -199,10 +194,8 @@ describe('DeploymentsComponent (with illegal query params)', () => {
       providers: [
         DeploymentService,
         ResourceService,
-        {
-          provide: ActivatedRoute,
-          useValue: mockRoute,
-        },
+        { provide: Router, useValue: routerStub },
+        { provide: ActivatedRoute, useValue: activatedRouteStub },
         provideHttpClient(withInterceptorsFromDi()),
         provideHttpClientTesting(),
       ],
@@ -223,8 +216,8 @@ describe('DeploymentsComponent (with illegal query params)', () => {
     spyOn(deploymentService, 'getAllComparatorFilterOptions').and.returnValue(of([]));
 
     // when
+    activatedRouteStub.queryParams.next({ filters: 'invalid filter' });
     component.ngOnInit();
-    mockRoute.queryParams.next({ filters: 'invalid filter' });
 
     // then
     expect(component.autoload).toBeFalsy();
@@ -238,8 +231,11 @@ describe('DeploymentsComponent (without query params)', () => {
   let component: DeploymentsComponent;
   let fixture: ComponentFixture<DeploymentsComponent>;
 
-  const mockRoute: any = { snapshot: {} };
-  mockRoute.queryParams = new Subject<any>();
+  const activatedRouteStub = { queryParams: new BehaviorSubject<any>({}) };
+  const routerStub = jasmine.createSpyObj('router', ['navigate']);
+  routerStub.navigate.and.callFake((commands: any, navigationExtras: { queryParams: any }) =>
+    activatedRouteStub.queryParams.next(navigationExtras.queryParams),
+  );
 
   const filter: string = JSON.stringify([
     { name: 'Application', val: 'test' },
@@ -251,7 +247,6 @@ describe('DeploymentsComponent (without query params)', () => {
     TestBed.configureTestingModule({
       imports: [
         FormsModule,
-        RouterTestingModule.withRoutes([]),
         DeploymentsComponent,
         DeploymentsListComponent,
         PaginationComponent,
@@ -260,10 +255,8 @@ describe('DeploymentsComponent (without query params)', () => {
       providers: [
         DeploymentService,
         ResourceService,
-        {
-          provide: ActivatedRoute,
-          useValue: mockRoute,
-        },
+        { provide: Router, useValue: routerStub },
+        { provide: ActivatedRoute, useValue: activatedRouteStub },
         provideHttpClient(withInterceptorsFromDi()),
         provideHttpClientTesting(),
       ],
@@ -281,7 +274,7 @@ describe('DeploymentsComponent (without query params)', () => {
 
     // when
     component.ngOnInit();
-    mockRoute.queryParams.next({});
+    activatedRouteStub.queryParams.next({});
 
     // then
     expect(deploymentService.canRequestDeployments).toHaveBeenCalled();
@@ -660,21 +653,6 @@ describe('DeploymentsComponent (without query params)', () => {
     );
   });
 
-  it('should check permission on showEdit', () => {
-    // given
-    component.deployments = [
-      { id: 1, appServerId: 12, selected: false } as Deployment,
-      { id: 21, appServerId: 22, selected: true } as Deployment,
-    ];
-    spyOn(resourceService, 'canCreateShakedownTest').and.returnValue(of(true));
-
-    // when
-    component.showEdit();
-
-    // then
-    expect(resourceService.canCreateShakedownTest).toHaveBeenCalledWith(22);
-  });
-
   it('should confirm a deployment and reload it', () => {
     // given
     const deployment: Deployment = { id: 1 } as Deployment;
diff --git a/AMW_angular/io/src/app/deployments/deployments.component.ts b/AMW_angular/io/src/app/deployments/deployments.component.ts
index 0df68fdc1..2c16dc1c6 100644
--- a/AMW_angular/io/src/app/deployments/deployments.component.ts
+++ b/AMW_angular/io/src/app/deployments/deployments.component.ts
@@ -22,6 +22,7 @@ import { NotificationComponent } from '../shared/elements/notification/notificat
 import { LoadingIndicatorComponent } from '../shared/elements/loading-indicator.component';
 import { PageComponent } from '../layout/page/page.component';
 import { ToastService } from '../shared/elements/toast/toast.service';
+import { ButtonComponent } from '../shared/button/button.component';
 
 declare let $: any;
 
@@ -38,6 +39,7 @@ declare let $: any;
     DeploymentsListComponent,
     PaginationComponent,
     PageComponent,
+    ButtonComponent,
   ],
 })
 export class DeploymentsComponent implements OnInit {
@@ -60,7 +62,6 @@ export class DeploymentsComponent implements OnInit {
   csvSeparator = '';
 
   // available edit actions
-  hasPermissionShakedownTest = false;
   deploymentDate: number; // for deployment date change
 
   // available filterValues (if any)
@@ -226,33 +227,22 @@ export class DeploymentsComponent implements OnInit {
     if (!this.editableDeployments()) {
       return;
     }
-    // get shakeDownTestPermission for first element
-    const indexOfFirstSelectedElem = _.findIndex(this.deployments, {
-      selected: true,
-    });
-    const firstDeployment = this.deployments[indexOfFirstSelectedElem];
-    this.resourceService.canCreateShakedownTest(firstDeployment.appServerId).subscribe({
-      next: (r) => (this.hasPermissionShakedownTest = r),
-      error: (e) => (this.errorMessage = e),
-      complete: () => {
-        const modalRef = this.modalService.open(DeploymentsEditModalComponent);
-        modalRef.componentInstance.deployments = this.getSelectedDeployments();
-        modalRef.componentInstance.hasPermissionShakedownTest = this.hasPermissionShakedownTest;
-
-        modalRef.componentInstance.doConfirmDeployment.subscribe((deployment: Deployment) =>
-          this.confirmDeployment(deployment),
-        );
-        modalRef.componentInstance.doRejectDeployment.subscribe((deployment: Deployment) =>
-          this.rejectDeployment(deployment),
-        );
-        modalRef.componentInstance.doCancelDeployment.subscribe((deployment: Deployment) =>
-          this.cancelDeployment(deployment),
-        );
-        modalRef.componentInstance.doEditDeploymentDate.subscribe((deployment: Deployment) =>
-          this.changeDeploymentDate(deployment),
-        );
-      },
-    });
+
+    const modalRef = this.modalService.open(DeploymentsEditModalComponent);
+    modalRef.componentInstance.deployments = this.getSelectedDeployments();
+
+    modalRef.componentInstance.doConfirmDeployment.subscribe((deployment: Deployment) =>
+      this.confirmDeployment(deployment),
+    );
+    modalRef.componentInstance.doRejectDeployment.subscribe((deployment: Deployment) =>
+      this.rejectDeployment(deployment),
+    );
+    modalRef.componentInstance.doCancelDeployment.subscribe((deployment: Deployment) =>
+      this.cancelDeployment(deployment),
+    );
+    modalRef.componentInstance.doEditDeploymentDate.subscribe((deployment: Deployment) =>
+      this.changeDeploymentDate(deployment),
+    );
   }
 
   confirmDeployment(deployment: Deployment) {
diff --git a/AMW_angular/io/src/app/deployments/deployments.scss b/AMW_angular/io/src/app/deployments/deployments.scss
index 3e37ca806..5fcdbdae4 100644
--- a/AMW_angular/io/src/app/deployments/deployments.scss
+++ b/AMW_angular/io/src/app/deployments/deployments.scss
@@ -48,14 +48,6 @@ span.state {
   margin-left: 8px;
 }
 
-/*
- * Nicer alignment of large buttons when they are getting wrapped
- */
-.btn-main {
-  margin-bottom: 0.5rem;
-  margin-right: 0.5rem;
-}
-
 /*
  * Nicer alignment of label after selection
  */
diff --git a/AMW_angular/io/src/app/deployments/logs/deployment-log-content.component.ts b/AMW_angular/io/src/app/deployments/logs/deployment-log-content.component.ts
index 26475c4fc..f97955a79 100644
--- a/AMW_angular/io/src/app/deployments/logs/deployment-log-content.component.ts
+++ b/AMW_angular/io/src/app/deployments/logs/deployment-log-content.component.ts
@@ -1,33 +1,29 @@
 import { Component, Input } from '@angular/core';
 import { FormsModule } from '@angular/forms';
-import { CodemirrorModule } from '@ctrl/ngx-codemirror';
 import { DeploymentLog } from './deployment-log';
+import { CodeEditorComponent } from '../../shared/codemirror/code-editor.component';
 
 type Failed = 'failed';
 @Component({
-  selector: 'amw-deployment-log-content',
+  selector: 'app-deployment-log-content',
   template: `
     <div class="m-2 h-100">
       @if (content !== null && content !== 'failed') {
 
-      <div class="h-100">
-        <ngx-codemirror
-          class="h-100"
+      <div class="editor border border-primary-subtle rounded">
+        <app-code-editor
+          [theme]="'light'"
+          [setup]="'minimal'"
+          [readonly]="true"
           [(ngModel)]="content.content"
-          [options]="{
-            lineNumbers: false,
-            theme: 'default',
-            mode: 'simplemode',
-            readOnly: true
-          }"
-        ></ngx-codemirror>
+        ></app-code-editor>
       </div>
 
       } @else { ... }
     </div>
   `,
   standalone: true,
-  imports: [FormsModule, CodemirrorModule],
+  imports: [FormsModule, CodeEditorComponent],
 })
 export class DeploymentLogContentComponent {
   @Input() content: DeploymentLog | Failed;
diff --git a/AMW_angular/io/src/app/deployments/logs/deployment-log-file-selector.component.ts b/AMW_angular/io/src/app/deployments/logs/deployment-log-file-selector.component.ts
index 449348ab4..7fedf7cba 100644
--- a/AMW_angular/io/src/app/deployments/logs/deployment-log-file-selector.component.ts
+++ b/AMW_angular/io/src/app/deployments/logs/deployment-log-file-selector.component.ts
@@ -4,7 +4,7 @@ import { NgbDropdown, NgbDropdownItem, NgbDropdownMenu, NgbDropdownToggle } from
 
 type Failed = 'failed';
 @Component({
-  selector: 'amw-deployment-logs-selector',
+  selector: 'app-deployment-logs-selector',
   standalone: true,
   template: `
     @if(logFiles === 'failed') {
diff --git a/AMW_angular/io/src/app/deployments/logs/deployment-logs.component.html b/AMW_angular/io/src/app/deployments/logs/deployment-logs.component.html
index 0e6ce85ec..ffeb41ea2 100644
--- a/AMW_angular/io/src/app/deployments/logs/deployment-logs.component.html
+++ b/AMW_angular/io/src/app/deployments/logs/deployment-logs.component.html
@@ -9,12 +9,12 @@ <h1>Logs for Deployment {{ deploymentId$ | async }}</h1>
     <span>There are no log files for deployment {{ deploymentId$ | async }}</span>
     } @if (logFiles !== FAIL && logFiles.length > 0) {
     <div class="card mt-3 h-100">
-      <amw-deployment-logs-selector
+      <app-deployment-logs-selector
         [logFiles]="logFiles"
         [selected]="currentDeploymentLog$ | async"
         (fileSelected)="this.selectFile($event)"
-      ></amw-deployment-logs-selector>
-      <amw-deployment-log-content [content]="selectedDeploymentLogContent$ | async"></amw-deployment-log-content>
+      ></app-deployment-logs-selector>
+      <app-deployment-log-content [content]="selectedDeploymentLogContent$ | async"></app-deployment-log-content>
     </div>
     } } }
   </div>
diff --git a/AMW_angular/io/src/app/deployments/logs/deployment-logs.component.ts b/AMW_angular/io/src/app/deployments/logs/deployment-logs.component.ts
index c8e715fcb..d88816c7c 100644
--- a/AMW_angular/io/src/app/deployments/logs/deployment-logs.component.ts
+++ b/AMW_angular/io/src/app/deployments/logs/deployment-logs.component.ts
@@ -1,5 +1,5 @@
 import { Location, AsyncPipe } from '@angular/common';
-import { Component, OnDestroy, OnInit, ViewChild, ViewEncapsulation } from '@angular/core';
+import { Component, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { BehaviorSubject, combineLatest, merge, Observable, of, Subject } from 'rxjs';
 import { catchError, distinctUntilChanged, map, shareReplay, switchMap, takeUntil } from 'rxjs/operators';
@@ -8,7 +8,7 @@ import { DeploymentLog } from './deployment-log';
 import { DeploymentLogsService } from './deployment-logs.service';
 import { LoadingIndicatorComponent } from '../../shared/elements/loading-indicator.component';
 import { FormsModule } from '@angular/forms';
-import { CodemirrorModule } from '@ctrl/ngx-codemirror';
+
 import {
   NgbDropdown,
   NgbDropdownToggle,
@@ -23,8 +23,6 @@ import { Deployment } from '../../deployment/deployment';
 import { DeploymentLogContentComponent } from './deployment-log-content.component';
 import { DeploymentLogFileSelectorComponent } from './deployment-log-file-selector.component';
 
-declare let CodeMirror: any;
-
 type Failed = 'failed';
 
 const FAIL: Failed = 'failed';
@@ -45,7 +43,6 @@ function failed(): Observable<Failed> {
     NgbDropdownMenu,
     NgbDropdownButtonItem,
     NgbDropdownItem,
-    CodemirrorModule,
     FormsModule,
     LoadingIndicatorComponent,
     AsyncPipe,
@@ -121,19 +118,6 @@ export class DeploymentLogsComponent implements OnInit, OnDestroy {
     this.error$.pipe(takeUntil(this.destroy$)).subscribe((msg) => {
       if (msg !== null) this.toastService.error(msg);
     });
-
-    CodeMirror.defineSimpleMode('simplemode', {
-      start: [
-        {
-          regex: /^.*\b(error|failure|failed|fatal|not found)\b.*$/i,
-          token: 'error',
-        },
-        {
-          regex: /^.*\b(warn.*)\b.*$/i,
-          token: 'warning',
-        },
-      ],
-    });
   }
 
   ngOnDestroy(): void {
diff --git a/AMW_angular/io/src/app/layout/page/page.component.ts b/AMW_angular/io/src/app/layout/page/page.component.ts
index fcdd467a0..db064df76 100644
--- a/AMW_angular/io/src/app/layout/page/page.component.ts
+++ b/AMW_angular/io/src/app/layout/page/page.component.ts
@@ -10,7 +10,7 @@ import { RouterLink } from '@angular/router';
   template: `
     <div class="row">
       <div class="col-12 bg-dark-subtle pt-2">
-        <h4><ng-content select=".page-title"></ng-content></h4>
+        <h4 data-cy="page-title"><ng-content select=".page-title"></ng-content></h4>
       </div>
     </div>
     <div class="container mt-4">
diff --git a/AMW_angular/io/src/app/navigation/navigation.component.ts b/AMW_angular/io/src/app/navigation/navigation.component.ts
index abe14cf02..49d089584 100644
--- a/AMW_angular/io/src/app/navigation/navigation.component.ts
+++ b/AMW_angular/io/src/app/navigation/navigation.component.ts
@@ -30,35 +30,21 @@ import { NgbCollapse } from '@ng-bootstrap/ng-bootstrap';
         >
           <ul class="navbar-nav p-3 p-lg-0">
             <li class="nav-item">
-              <form>
-                <div class="d-flex form-check ps-0">
-                  <input class="m-0 form-check-inline" type="checkbox" id="favoritesOnly" />
-                  <label class="ps-1 form-check-label nav-link font-weight-light" for="favoritesOnly">
-                    Favorites only
-                  </label>
-                </div>
-              </form>
-            </li>
-
-            <li class="nav-item">
-              <a class="nav-link" href="/AMW_web/pages/applist.xhtml">Apps</a>
+              <a class="nav-link" href="#/apps/">Apps</a>
             </li>
             <li class="nav-item"></li>
             <li>
-              <a class="nav-link" href="/AMW_web/pages/serverListView.xhtml">Servers</a>
+              <a class="nav-link" href="#/servers">Servers</a>
             </li>
 
             <li class="nav-item">
-              <a class="nav-link" href="/AMW_web/pages/resourceList.xhtml">Resources</a>
+              <a class="nav-link" href="#/resources">Resources</a>
             </li>
             <li class="nav-item">
               <a class="nav-link" href="#/deployments/">Deploy</a>
             </li>
             <li class="nav-item">
-              <a class="nav-link" href="/AMW_web/pages/shakedownTest.xhtml">Shakedown Test</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" href="/AMW_web/pages/settings.xhtml">Settings</a>
+              <a class="nav-link" href="#/settings">Settings</a>
             </li>
             <li class="nav-item">
               <a class="nav-link" href="{{ logoutUrl }}">Logout</a>
diff --git a/AMW_angular/io/src/app/resource/resource-type-request.ts b/AMW_angular/io/src/app/resource/resource-type-request.ts
new file mode 100644
index 000000000..9f4418eac
--- /dev/null
+++ b/AMW_angular/io/src/app/resource/resource-type-request.ts
@@ -0,0 +1,4 @@
+export interface ResourceTypeRequest {
+  name: string;
+  parentId?: number;
+}
diff --git a/AMW_angular/io/src/app/resource/resource-type.ts b/AMW_angular/io/src/app/resource/resource-type.ts
index ef36a96c6..cc059d39c 100644
--- a/AMW_angular/io/src/app/resource/resource-type.ts
+++ b/AMW_angular/io/src/app/resource/resource-type.ts
@@ -1,4 +1,8 @@
 export interface ResourceType {
   id: number;
   name: string;
+  hasChildren: boolean;
+  children: ResourceType[];
+  isApplication: boolean;
+  isDefaultResourceType: boolean;
 }
diff --git a/AMW_angular/io/src/app/resource/resource-types.service.ts b/AMW_angular/io/src/app/resource/resource-types.service.ts
new file mode 100644
index 000000000..7dacfb62b
--- /dev/null
+++ b/AMW_angular/io/src/app/resource/resource-types.service.ts
@@ -0,0 +1,56 @@
+import { Injectable } from '@angular/core';
+import { HttpClient } from '@angular/common/http';
+import { Observable, startWith, Subject } from 'rxjs';
+import { toSignal } from '@angular/core/rxjs-interop';
+import { catchError, shareReplay, switchMap } from 'rxjs/operators';
+import { BaseService } from '../base/base.service';
+import { ResourceType } from './resource-type';
+import { ResourceTypeRequest } from './resource-type-request';
+
+@Injectable({ providedIn: 'root' })
+export class ResourceTypesService extends BaseService {
+  private reload$ = new Subject<ResourceType[]>();
+
+  private predefinedResourceTypes$ = this.getPredefinedResourceTypes();
+
+  private rootResourceTypes$ = this.reload$.pipe(
+    startWith(null),
+    switchMap(() => this.getRootResourceTypes()),
+    shareReplay(1),
+  );
+
+  predefinedResourceTypes = toSignal(this.predefinedResourceTypes$, { initialValue: [] as ResourceType[] });
+  rootResourceTypes = toSignal(this.rootResourceTypes$, { initialValue: [] as ResourceType[] });
+
+  constructor(private http: HttpClient) {
+    super();
+  }
+
+  getAllResourceTypes(): Observable<ResourceType[]> {
+    return this.http.get<ResourceType[]>(`${this.getBaseUrl()}/resources/resourceTypes`);
+  }
+
+  getPredefinedResourceTypes(): Observable<ResourceType[]> {
+    return this.http.get<ResourceType[]>(`${this.getBaseUrl()}/resources/predefinedResourceTypes`);
+  }
+
+  getRootResourceTypes(): Observable<ResourceType[]> {
+    return this.http.get<ResourceType[]>(`${this.getBaseUrl()}/resources/rootResourceTypes`);
+  }
+
+  addNewResourceType(resourceTypeRequest: ResourceTypeRequest): Observable<void> {
+    return this.http.post<void>(`${this.getBaseUrl()}/resources/resourceTypes`, resourceTypeRequest);
+  }
+
+  refreshData() {
+    this.reload$.next([]);
+  }
+
+  delete(id: number): Observable<number> {
+    return this.http
+      .delete<number>(`${this.getBaseUrl()}/resources/resourceTypes/${id}`, {
+        headers: this.getHeaders(),
+      })
+      .pipe(catchError(this.handleError));
+  }
+}
diff --git a/AMW_angular/io/src/app/resource/resource.service.spec.ts b/AMW_angular/io/src/app/resource/resource.service.spec.ts
index 8f8f6fa2a..0c9d6b607 100644
--- a/AMW_angular/io/src/app/resource/resource.service.spec.ts
+++ b/AMW_angular/io/src/app/resource/resource.service.spec.ts
@@ -6,17 +6,15 @@ import { Resource } from './resource';
 import { Release } from './release';
 
 describe('ResourceService', () => {
-  let httpClient: HttpClient;
   let httpTestingController: HttpTestingController;
   let resourceService: ResourceService;
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-    imports: [],
-    providers: [ResourceService, provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting()]
-});
+      imports: [],
+      providers: [ResourceService, provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting()],
+    });
 
-    httpClient = TestBed.inject(HttpClient);
     httpTestingController = TestBed.inject(HttpTestingController);
     resourceService = TestBed.inject(ResourceService);
   });
@@ -31,7 +29,7 @@ describe('ResourceService', () => {
       name: 'workflow',
       type: 'applicationserver',
       version: '1.0',
-      release: {
+      defaultRelease: {
         id: 22,
         release: 'release_2020',
         relations: [],
diff --git a/AMW_angular/io/src/app/resource/resource.service.ts b/AMW_angular/io/src/app/resource/resource.service.ts
index c9bf9f5fa..b4c3fcf2c 100644
--- a/AMW_angular/io/src/app/resource/resource.service.ts
+++ b/AMW_angular/io/src/app/resource/resource.service.ts
@@ -1,14 +1,15 @@
 import { Injectable } from '@angular/core';
 import { HttpClient, HttpParams } from '@angular/common/http';
-import { Observable } from 'rxjs';
-import { map, catchError } from 'rxjs/operators';
+import { Observable, startWith, Subject } from 'rxjs';
+import { map, catchError, switchMap, shareReplay } from 'rxjs/operators';
 import { Resource } from './resource';
-import { ResourceType } from './resource-type';
 import { Release } from './release';
 import { Relation } from './relation';
 import { Property } from './property';
 import { AppWithVersion } from '../deployment/app-with-version';
 import { BaseService } from '../base/base.service';
+import { ResourceType } from './resource-type';
+import { toSignal } from '@angular/core/rxjs-interop';
 
 interface Named {
   name: string;
@@ -16,10 +17,24 @@ interface Named {
 
 @Injectable({ providedIn: 'root' })
 export class ResourceService extends BaseService {
+  private resourceType$: Subject<ResourceType> = new Subject<ResourceType>();
+
+  private resourceGroupListForType$: Observable<Resource[]> = this.resourceType$.pipe(
+    switchMap((resourceType: ResourceType) => this.getGroupsForType(resourceType)),
+    startWith(null),
+    shareReplay(1),
+  );
+
+  resourceGroupListForType = toSignal(this.resourceGroupListForType$, { initialValue: [] as Resource[] });
+
   constructor(private http: HttpClient) {
     super();
   }
 
+  setTypeForResourceGroupList(resourcesType: ResourceType) {
+    this.resourceType$.next(resourcesType);
+  }
+
   getAll(): Observable<Resource[]> {
     return this.http
       .get<Resource[]>(`${this.getBaseUrl()}/resources`, {
@@ -31,6 +46,14 @@ export class ResourceService extends BaseService {
       );
   }
 
+  createResourceForResourceType(resource: any) {
+    return this.http
+      .post<Resource>(`${this.getBaseUrl()}/resources`, resource, {
+        headers: this.getHeaders(),
+      })
+      .pipe(catchError(this.handleError));
+  }
+
   getResourceName(resourceId: number): Observable<Named> {
     return this.http
       .get<Named>(`${this.getBaseUrl()}/resources/name/${resourceId}`, {
@@ -39,6 +62,17 @@ export class ResourceService extends BaseService {
       .pipe(catchError(this.handleError));
   }
 
+  getGroupsForType(resourceType: ResourceType): Observable<Resource[]> {
+    return this.http
+      .get<Resource[]>(`${this.getBaseUrl()}/resources?typeId=${resourceType.id}`, {
+        headers: this.getHeaders(),
+      })
+      .pipe(
+        map((resources) => resources.map(toResource)),
+        catchError(this.handleError),
+      );
+  }
+
   get(resourceGroupName: string): Observable<Resource> {
     return this.http
       .get(`${this.getBaseUrl()}/resources/${resourceGroupName}`, {
@@ -66,17 +100,6 @@ export class ResourceService extends BaseService {
       );
   }
 
-  getAllResourceTypes(): Observable<ResourceType[]> {
-    return this.http
-      .get<ResourceType[]>(`${this.getBaseUrl()}/resources/resourceTypes`, {
-        headers: this.getHeaders(),
-      })
-      .pipe(
-        map((resources) => resources.map(toResource)),
-        catchError(this.handleError),
-      );
-  }
-
   getByType(type: string): Observable<Resource[]> {
     return this.http
       .get<Resource[]>(`${this.getBaseUrl()}/resources?type=${type}`, {
@@ -151,14 +174,6 @@ export class ResourceService extends BaseService {
         catchError(this.handleError),
       );
   }
-
-  canCreateShakedownTest(resourceGroupId: number): Observable<boolean> {
-    return this.http
-      .get<boolean>(`${this.getBaseUrl()}/resources/resourceGroups/${resourceGroupId}/canCreateShakedownTest`, {
-        headers: this.getHeaders(),
-      })
-      .pipe(catchError(this.handleError));
-  }
 }
 
 function toAppWithVersion(r: any): AppWithVersion {
@@ -167,12 +182,11 @@ function toAppWithVersion(r: any): AppWithVersion {
 }
 
 function toResource(r: Resource): Resource {
-  r.release = r.release && toRelease(r.release);
+  r.defaultRelease = r.defaultRelease && toRelease(r.defaultRelease);
   r.releases = (r.releases || []).map(toRelease);
   return r;
 }
 
 function toRelease(r: any): Release {
-  delete r.templates;
-  return r;
+  return { properties: [], relations: [], resourceTags: [], id: r.id, release: r.name };
 }
diff --git a/AMW_angular/io/src/app/resource/resource.ts b/AMW_angular/io/src/app/resource/resource.ts
index 8965e1cb3..766f767bc 100644
--- a/AMW_angular/io/src/app/resource/resource.ts
+++ b/AMW_angular/io/src/app/resource/resource.ts
@@ -5,6 +5,7 @@ export interface Resource {
   name: string;
   type: string;
   version: string;
-  release: Release;
+  defaultRelease: Release;
   releases: Release[];
+  defaultResourceId?: number;
 }
diff --git a/AMW_angular/io/src/app/resources/resource-add/resource-add.component.html b/AMW_angular/io/src/app/resources/resource-add/resource-add.component.html
new file mode 100644
index 000000000..bcf358fb0
--- /dev/null
+++ b/AMW_angular/io/src/app/resources/resource-add/resource-add.component.html
@@ -0,0 +1,36 @@
+<div class="container">
+  <app-modal-header [title]="getTitle()" (cancel)="cancel()"></app-modal-header>
+  <div class="modal-body">
+    <div class="needs-validation mb-3">
+      <label for="resourceName" class="form-label">Resource name</label>
+      <input
+        type="text"
+        class="form-control"
+        id="resourceName"
+        [(ngModel)]="resourceName"
+        required
+        pattern="^[a-zA-Z0-9_\-]+$"
+      />
+      <div class="invalid-feedback">
+        The name must not contain any other than alphanumerical and "_" / "-" characters.
+      </div>
+    </div>
+    <div class="mb-3">
+      <label class="form-label">Release</label>
+      <ng-select
+        id="selectRelease"
+        [clearable]="false"
+        [(ngModel)]="selectedReleaseName"
+        (change)="setSelectedRelease($event)"
+      >
+        @for (release of releases; track release.id) {
+        <ng-option [value]="release.name">{{ release.name }}</ng-option>
+        }
+      </ng-select>
+    </div>
+  </div>
+  <div class="modal-footer">
+    <app-button [variant]="'light'" (click)="cancel()">Cancel</app-button>
+    <app-button [variant]="'primary'" [disabled]="!isValidForm()" (click)="save()">Save </app-button>
+  </div>
+</div>
diff --git a/AMW_angular/io/src/app/resources/resource-add/resource-add.component.spec.ts b/AMW_angular/io/src/app/resources/resource-add/resource-add.component.spec.ts
new file mode 100644
index 000000000..87c117598
--- /dev/null
+++ b/AMW_angular/io/src/app/resources/resource-add/resource-add.component.spec.ts
@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { ResourceAddComponent } from './resource-add.component';
+
+describe('ResourceAddComponent', () => {
+  let component: ResourceAddComponent;
+  let fixture: ComponentFixture<ResourceAddComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [ResourceAddComponent],
+      providers: [NgbActiveModal],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(ResourceAddComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/AMW_angular/io/src/app/resources/resource-add/resource-add.component.ts b/AMW_angular/io/src/app/resources/resource-add/resource-add.component.ts
new file mode 100644
index 000000000..652e5e318
--- /dev/null
+++ b/AMW_angular/io/src/app/resources/resource-add/resource-add.component.ts
@@ -0,0 +1,57 @@
+import { ChangeDetectionStrategy, Component, EventEmitter, inject, Input, Output } from '@angular/core';
+import { NgbActiveModal, NgbTypeahead } from '@ng-bootstrap/ng-bootstrap';
+import { FormsModule } from '@angular/forms';
+import { ModalHeaderComponent } from '../../shared/modal-header/modal-header.component';
+import { ButtonComponent } from '../../shared/button/button.component';
+import { ResourceType } from '../../resource/resource-type';
+import { Release } from '../../settings/releases/release';
+import { NgSelectModule } from '@ng-select/ng-select';
+
+@Component({
+  selector: 'app-resource-add',
+  standalone: true,
+  imports: [FormsModule, ModalHeaderComponent, ButtonComponent, NgbTypeahead, NgSelectModule],
+  templateUrl: './resource-add.component.html',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class ResourceAddComponent {
+  activeModal = inject(NgbActiveModal);
+  @Input() resourceType: ResourceType;
+  @Input() releases: Release[];
+  @Input() selectedReleaseName: Release;
+  resourceName: string;
+  @Output() saveResource: EventEmitter<any> = new EventEmitter<any>();
+
+  getTitle() {
+    if (!this.resourceType) return;
+    return this.resourceType.name ? `Create new instance for ${this.resourceType.name}` : `Create new instance`;
+  }
+
+  save() {
+    let forms: NodeListOf<Element> = document.querySelectorAll('.needs-validation');
+    if (this.isValidForm()) {
+      const resourceToAdd = {
+        name: this.resourceName,
+        type: this.resourceType.name,
+        releaseName: this.selectedReleaseName,
+      };
+      this.saveResource.emit(resourceToAdd);
+      this.activeModal.close();
+    } else {
+      forms[0].classList.add('was-validated');
+    }
+  }
+
+  cancel() {
+    this.activeModal.close();
+  }
+
+  setSelectedRelease($event: any) {
+    this.selectedReleaseName = $event;
+  }
+
+  isValidForm() {
+    const REGEXP_ALPHANUMERIC_WITH_UNDERSCORE_HYPHEN = /^[a-zA-Z0-9_-]+$/;
+    return this.resourceName ? REGEXP_ALPHANUMERIC_WITH_UNDERSCORE_HYPHEN.test(this.resourceName) : false;
+  }
+}
diff --git a/AMW_angular/io/src/app/resources/resource-type-add/resource-type-add.component.html b/AMW_angular/io/src/app/resources/resource-type-add/resource-type-add.component.html
new file mode 100644
index 000000000..48b0099e7
--- /dev/null
+++ b/AMW_angular/io/src/app/resources/resource-type-add/resource-type-add.component.html
@@ -0,0 +1,37 @@
+<app-modal-header [title]="'Create new Resource Type'" (cancel)="cancel()"></app-modal-header>
+<div class="modal-body">
+  <div class="form-horizontal mx-2">
+    <div class="needs-validation mb-3">
+      <label for="name" class="form-label">Resource Type name</label>
+      <input
+        type="text"
+        class="form-control"
+        id="name"
+        [(ngModel)]="resourceType.name"
+        [class.is-invalid]="!isValid() && resourceType.name.length > 0"
+        [class.is-valid]="isValid() && resourceType.name.length > 0"
+        required
+        pattern="^[a-zA-Z0-9_\-]+$"
+      />
+      @if (!isValid() && resourceType.name.length > 0) {
+      <div class="invalid-feedback">
+        The name must not contain any other than alphanumerical and "_" / "-" characters.
+      </div>
+      }
+    </div>
+    <div class="mb-3">
+      <label for="selectParentType" class="form-label">Parent Resource Type (optional)</label>
+      <ng-select id="selectParentType" [(ngModel)]="parentId" placeholder="Select Resource Type">
+        @for (resourceType of rootResourceTypes(); track resourceType.name) {
+        <ng-option [value]="resourceType.id">{{ resourceType.name }}</ng-option>
+        }
+      </ng-select>
+    </div>
+  </div>
+</div>
+<div class="modal-footer">
+  <app-button [variant]="'light'" (click)="cancel()">Cancel</app-button>
+  <app-button [variant]="'primary'" [disabled]="resourceType.name.length === 0 || !isValid()" (click)="save()"
+    >Create</app-button
+  >
+</div>
diff --git a/AMW_angular/io/src/app/resources/resource-type-add/resource-type-add.component.spec.ts b/AMW_angular/io/src/app/resources/resource-type-add/resource-type-add.component.spec.ts
new file mode 100644
index 000000000..20c51a6b3
--- /dev/null
+++ b/AMW_angular/io/src/app/resources/resource-type-add/resource-type-add.component.spec.ts
@@ -0,0 +1,34 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { ResourceTypeAddComponent } from './resource-type-add.component';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { provideHttpClient } from '@angular/common/http';
+
+describe('ResourceTypeAddComponent', () => {
+  let component: ResourceTypeAddComponent;
+  let fixture: ComponentFixture<ResourceTypeAddComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [ResourceTypeAddComponent],
+      providers: [NgbActiveModal, provideHttpClient()],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(ResourceTypeAddComponent);
+    component = fixture.componentInstance;
+
+    component.resourceType = {
+      id: 0,
+      name: '',
+      hasChildren: false,
+      children: [],
+      isApplication: false,
+      isDefaultResourceType: false,
+    };
+
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/AMW_angular/io/src/app/resources/resource-type-add/resource-type-add.component.ts b/AMW_angular/io/src/app/resources/resource-type-add/resource-type-add.component.ts
new file mode 100644
index 000000000..b0fb7184a
--- /dev/null
+++ b/AMW_angular/io/src/app/resources/resource-type-add/resource-type-add.component.ts
@@ -0,0 +1,45 @@
+import { Component, EventEmitter, inject, Input, Output, Signal } from '@angular/core';
+import { ResourceType } from '../../resource/resource-type';
+import { ResourceTypesService } from '../../resource/resource-types.service';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { ModalHeaderComponent } from '../../shared/modal-header/modal-header.component';
+import { ButtonComponent } from '../../shared/button/button.component';
+import { FormsModule } from '@angular/forms';
+import { ResourceTypeRequest } from '../../resource/resource-type-request';
+import { NgSelectModule } from '@ng-select/ng-select';
+
+@Component({
+  selector: 'app-resource-type-add',
+  standalone: true,
+  imports: [ModalHeaderComponent, ButtonComponent, FormsModule, NgSelectModule],
+  templateUrl: './resource-type-add.component.html',
+})
+export class ResourceTypeAddComponent {
+  @Input() resourceType: ResourceType;
+  @Output() saveResourceType: EventEmitter<ResourceTypeRequest> = new EventEmitter<ResourceTypeRequest>();
+  private resourceTypesService = inject(ResourceTypesService);
+  rootResourceTypes: Signal<ResourceType[]> = this.resourceTypesService.rootResourceTypes;
+  parentId: number;
+
+  constructor(public activeModal: NgbActiveModal) {}
+
+  cancel() {
+    this.activeModal.close();
+  }
+
+  save() {
+    if (this.isValid()) {
+      const request: ResourceTypeRequest = {
+        name: this.resourceType.name,
+        parentId: this.parentId,
+      };
+      this.saveResourceType.emit(request);
+      this.activeModal.close();
+    }
+  }
+
+  isValid(): boolean {
+    const REGEXP_ALPHANUMERIC_WITH_UNDERSCORE_HYPHEN = /^[a-zA-Z0-9_-]+$/;
+    return this.resourceType.name ? REGEXP_ALPHANUMERIC_WITH_UNDERSCORE_HYPHEN.test(this.resourceType.name) : false;
+  }
+}
diff --git a/AMW_angular/io/src/app/resources/resource-type-delete/resource-type-delete.component.html b/AMW_angular/io/src/app/resources/resource-type-delete/resource-type-delete.component.html
new file mode 100644
index 000000000..ad7d949f5
--- /dev/null
+++ b/AMW_angular/io/src/app/resources/resource-type-delete/resource-type-delete.component.html
@@ -0,0 +1,17 @@
+<div class="container">
+  <app-modal-header [title]="'Delete resource type'" (cancel)="cancel()"></app-modal-header>
+  <div class="modal-body">
+    <div class="form-horizontal mx-2">
+      <div class="mb-3">
+        <div class="text-body">
+          Do you really want to delete {{ resourceType.name }}? <br />
+          (This will also remove all resource instances as well as sub resource types)
+        </div>
+      </div>
+    </div>
+  </div>
+  <div class="modal-footer">
+    <app-button [variant]="'light'" (click)="cancel()">Cancel</app-button>
+    <app-button [variant]="'primary'" (click)="delete()">Delete</app-button>
+  </div>
+</div>
diff --git a/AMW_angular/io/src/app/resources/resource-type-delete/resource-type-delete.component.spec.ts b/AMW_angular/io/src/app/resources/resource-type-delete/resource-type-delete.component.spec.ts
new file mode 100644
index 000000000..24d932fbe
--- /dev/null
+++ b/AMW_angular/io/src/app/resources/resource-type-delete/resource-type-delete.component.spec.ts
@@ -0,0 +1,33 @@
+import { ResourceTypeDeleteComponent } from './resource-type-delete.component';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+describe('ResourceTypeDeleteComponent', () => {
+  let component: ResourceTypeDeleteComponent;
+  let fixture: ComponentFixture<ResourceTypeDeleteComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [ResourceTypeDeleteComponent],
+      providers: [NgbActiveModal],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(ResourceTypeDeleteComponent);
+    component = fixture.componentInstance;
+
+    component.resourceType = {
+      id: 1258,
+      name: 'Keystore',
+      hasChildren: false,
+      children: [],
+      isApplication: false,
+      isDefaultResourceType: false,
+    };
+
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/AMW_angular/io/src/app/resources/resource-type-delete/resource-type-delete.component.ts b/AMW_angular/io/src/app/resources/resource-type-delete/resource-type-delete.component.ts
new file mode 100644
index 000000000..1bbcd862e
--- /dev/null
+++ b/AMW_angular/io/src/app/resources/resource-type-delete/resource-type-delete.component.ts
@@ -0,0 +1,26 @@
+import { Component, EventEmitter, inject, Input, Output } from '@angular/core';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { ResourceType } from '../../resource/resource-type';
+import { ModalHeaderComponent } from '../../shared/modal-header/modal-header.component';
+import { ButtonComponent } from '../../shared/button/button.component';
+
+@Component({
+  selector: 'app-resource-type-delete',
+  standalone: true,
+  templateUrl: './resource-type-delete.component.html',
+  imports: [ModalHeaderComponent, ButtonComponent, ModalHeaderComponent, ButtonComponent],
+})
+export class ResourceTypeDeleteComponent {
+  activeModal = inject(NgbActiveModal);
+  @Input() resourceType: ResourceType;
+  @Output() resourceTypeToDelete: EventEmitter<ResourceType> = new EventEmitter<ResourceType>();
+
+  cancel() {
+    this.activeModal.close();
+  }
+
+  delete() {
+    this.resourceTypeToDelete.emit(this.resourceType);
+    this.activeModal.close();
+  }
+}
diff --git a/AMW_angular/io/src/app/resources/resources-list/resources-list.component.html b/AMW_angular/io/src/app/resources/resources-list/resources-list.component.html
new file mode 100644
index 000000000..ac3d61426
--- /dev/null
+++ b/AMW_angular/io/src/app/resources/resources-list/resources-list.component.html
@@ -0,0 +1,51 @@
+<div class="container">
+  @if (resourceType() && permissions().canReadResources) {
+  <h1>
+    {{ resourceType().name }}
+    <a href="/AMW_web/pages/editResourceView.xhtml?ctx=1&resTypId={{ resourceType().id }}">
+      <app-button [variant]="'link'">
+        <app-icon icon="pencil"></app-icon>
+      </app-button>
+    </a>
+    @if (permissions().canDeleteResourceType && !resourceType().isDefaultResourceType) {
+    <app-button [variant]="'link'" [additionalClasses]="'link-danger'" (click)="deleteResourceType()">
+      <app-icon icon="trash"></app-icon>
+    </app-button>
+    }
+  </h1>
+  @if (permissions().canCreateResource && !resourceType().isApplication) {
+  <div class="row my-3">
+    <app-button [variant]="'primary'" (click)="addResource()">
+      <app-icon icon="plus-circle"></app-icon>
+      New Resource
+    </app-button>
+  </div>
+  }
+  <table class="table table-sm table-striped">
+    <thead>
+      <tr>
+        <th class="w-80">Resource name</th>
+        <th class="w-10">Release</th>
+        <th class="w-10" style="text-align: center">Actions</th>
+      </tr>
+    </thead>
+    <tbody>
+      @for (resource of resourceGroupList(); track resource.id) {
+      <tr>
+        <td class="w-80 align-middle">{{ resource.name }}</td>
+        <td class="w-10 align-middle">{{ resource.defaultRelease ? resource.defaultRelease.release : '' }}</td>
+        <td class="w-10 align-middle" style="text-align: center">
+          <a
+            href="/AMW_web/pages/editResourceView.xhtml?ctx=1&id={{
+              resource.defaultResourceId ? resource.defaultResourceId : resource.id
+            }}"
+          >
+            <app-button [variant]="'primary'" [size]="'sm'"> <app-icon icon="pencil"></app-icon></app-button>
+          </a>
+        </td>
+      </tr>
+      }
+    </tbody>
+  </table>
+  }
+</div>
diff --git a/AMW_angular/io/src/app/resources/resources-list/resources-list.component.scss b/AMW_angular/io/src/app/resources/resources-list/resources-list.component.scss
new file mode 100644
index 000000000..2c51a7d9a
--- /dev/null
+++ b/AMW_angular/io/src/app/resources/resources-list/resources-list.component.scss
@@ -0,0 +1,6 @@
+table .w-10 {
+  width: 10%;
+}
+table .w-80 {
+  width: 80%;
+}
diff --git a/AMW_angular/io/src/app/resources/resources-list/resources-list.component.spec.ts b/AMW_angular/io/src/app/resources/resources-list/resources-list.component.spec.ts
new file mode 100644
index 000000000..59b0b7184
--- /dev/null
+++ b/AMW_angular/io/src/app/resources/resources-list/resources-list.component.spec.ts
@@ -0,0 +1,41 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { ResourcesListComponent } from './resources-list.component';
+import { ComponentRef } from '@angular/core';
+import { Resource } from '../../resource/resource';
+import { ResourceType } from '../../resource/resource-type';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
+import { provideHttpClientTesting } from '@angular/common/http/testing';
+
+describe('ResourcesListComponent', () => {
+  let component: ResourcesListComponent;
+  let componentRef: ComponentRef<ResourcesListComponent>;
+  let fixture: ComponentFixture<ResourcesListComponent>;
+  const resourceType: ResourceType = {
+    id: 1,
+    name: 'type',
+    hasChildren: false,
+    children: [],
+    isApplication: false,
+    isDefaultResourceType: false,
+  };
+
+  const resourceGroupsOfResourceType: Resource[] = [];
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [ResourcesListComponent],
+      providers: [provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting()],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(ResourcesListComponent);
+    component = fixture.componentInstance;
+    componentRef = fixture.componentRef;
+    componentRef.setInput('resourceType', resourceType);
+    componentRef.setInput('resourceGroupList', resourceGroupsOfResourceType);
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/AMW_angular/io/src/app/resources/resources-list/resources-list.component.ts b/AMW_angular/io/src/app/resources/resources-list/resources-list.component.ts
new file mode 100644
index 000000000..d42b3a324
--- /dev/null
+++ b/AMW_angular/io/src/app/resources/resources-list/resources-list.component.ts
@@ -0,0 +1,64 @@
+import { Component, computed, inject, input, output } from '@angular/core';
+import { Resource } from '../../resource/resource';
+import { ResourceType } from '../../resource/resource-type';
+import { ButtonComponent } from '../../shared/button/button.component';
+import { IconComponent } from '../../shared/icon/icon.component';
+import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
+import { takeUntil } from 'rxjs/operators';
+import { Subject } from 'rxjs';
+import { ResourceAddComponent } from '../resource-add/resource-add.component';
+import { Release } from '../../settings/releases/release';
+import { AuthService } from '../../auth/auth.service';
+import { ResourceTypeDeleteComponent } from '../resource-type-delete/resource-type-delete.component';
+
+@Component({
+  selector: 'app-resources-list',
+  standalone: true,
+  templateUrl: './resources-list.component.html',
+  styleUrl: './resources-list.component.scss',
+  imports: [ButtonComponent, IconComponent],
+})
+export class ResourcesListComponent {
+  private modalService = inject(NgbModal);
+  private authService = inject(AuthService);
+  private destroy$ = new Subject<void>();
+  resourceType = input.required<ResourceType>();
+  resourceGroupList = input.required<Resource[]>();
+  releases = input.required<Release[]>();
+  resourceToAdd = output<any>();
+  resourceTypeToDelete = output<ResourceType>();
+
+  permissions = computed(() => {
+    if (this.authService.restrictions().length > 0) {
+      return {
+        canReadResources: this.authService.hasPermission('RESOURCE', 'READ'),
+        canCreateResource: this.authService.hasPermission('RESOURCE', 'CREATE'),
+        canDeleteResourceType: this.authService.hasPermission('RESOURCETYPE', 'DELETE'),
+      };
+    } else {
+      return {
+        canReadResources: false,
+        canCreateResource: false,
+        canDeleteResourceType: false,
+      };
+    }
+  });
+
+  addResource() {
+    const modalRef: NgbModalRef = this.modalService.open(ResourceAddComponent);
+    modalRef.componentInstance.resourceType = this.resourceType();
+    modalRef.componentInstance.releases = this.releases();
+    modalRef.componentInstance.selectedReleaseName = this.releases()[0].name;
+    modalRef.componentInstance.saveResource
+      .pipe(takeUntil(this.destroy$))
+      .subscribe((resource: any) => this.resourceToAdd.emit(resource));
+  }
+
+  deleteResourceType() {
+    const modalRef: NgbModalRef = this.modalService.open(ResourceTypeDeleteComponent);
+    modalRef.componentInstance.resourceType = this.resourceType();
+    modalRef.componentInstance.resourceTypeToDelete
+      .pipe(takeUntil(this.destroy$))
+      .subscribe((resourceType: ResourceType) => this.resourceTypeToDelete.emit(resourceType));
+  }
+}
diff --git a/AMW_angular/io/src/app/resources/resources-page.component.css b/AMW_angular/io/src/app/resources/resources-page.component.css
new file mode 100644
index 000000000..f75f8476d
--- /dev/null
+++ b/AMW_angular/io/src/app/resources/resources-page.component.css
@@ -0,0 +1,9 @@
+.nav-item,
+.nav-link {
+  cursor: pointer;
+}
+
+.nav-link:hover,
+.nav-link.active {
+  font-weight: bold;
+}
diff --git a/AMW_angular/io/src/app/resources/resources-page.component.html b/AMW_angular/io/src/app/resources/resources-page.component.html
new file mode 100644
index 000000000..b0617c286
--- /dev/null
+++ b/AMW_angular/io/src/app/resources/resources-page.component.html
@@ -0,0 +1,76 @@
+<app-loading-indicator [isLoading]="isLoading()"></app-loading-indicator>
+<app-page>
+  <div class="page-title">Resources</div>
+  <div class="page-content">
+    <div class="row">
+      <div class="col ps-3">
+        <h5 class="mb-3">Resource types</h5>
+        @if (permissions().canViewResourceTypes) {
+        <ul class="nav flex-column">
+          @for (resourceType of predefinedResourceTypes(); track resourceType.name) {
+          <li class="nav-item">
+            <a
+              class="nav-link ps-0"
+              [ngClass]="{ active: selection === resourceType }"
+              style="display: inline-block"
+              (click)="toggleChildrenAndOrLoadResourcesList(resourceType)"
+              >{{ resourceType.name }}</a
+            >
+          </li>
+          }
+        </ul>
+        <hr />
+        @if (permissions().canCreateResourceTypes) {
+        <div>
+          <app-button [variant]="'primary'" (click)="addResourceType()">
+            <app-icon icon="plus-circle"></app-icon> New Resource Type
+          </app-button>
+        </div>
+        } }
+        <ul class="nav flex-column">
+          @for (resourceType of rootResourceTypes(); track resourceType.name) {
+          <li class="nav-item">
+            <a
+              class="nav-link ps-0"
+              [ngClass]="{ active: selection === resourceType }"
+              style="display: inline-block"
+              (click)="toggleChildrenAndOrLoadResourcesList(resourceType)"
+            >
+              @if (resourceType.hasChildren) { @if (isExpanded(resourceType)) {
+              <app-icon icon="dash"></app-icon>
+              } @else {
+              <app-icon icon="plus"></app-icon>
+              } }
+              {{ resourceType.name }}
+            </a>
+            @if (resourceType.hasChildren && isExpanded(resourceType) ) {
+            <ul class="nav flex-column ps-4">
+              @for (child of resourceType.children; track child.name) {
+              <li class="nav-item">
+                <a
+                  class="nav-link ps-0"
+                  [ngClass]="{ active: selection === child }"
+                  style="display: inline-block"
+                  (click)="toggleChildrenAndOrLoadResourcesList(child)"
+                  >{{ child.name }}</a
+                >
+              </li>
+              }
+            </ul>
+            }
+          </li>
+          }
+        </ul>
+      </div>
+      <div class="col-10">
+        <app-resources-list
+          [resourceType]="selectedResourceTypeOrDefault()"
+          [resourceGroupList]="resourceGroupListForType()"
+          [releases]="releases()"
+          (resourceToAdd)="addResource($event)"
+          (resourceTypeToDelete)="deleteResourceType($event)"
+        ></app-resources-list>
+      </div>
+    </div>
+  </div>
+</app-page>
diff --git a/AMW_angular/io/src/app/resources/resources-page.component.spec.ts b/AMW_angular/io/src/app/resources/resources-page.component.spec.ts
new file mode 100644
index 000000000..9da026b47
--- /dev/null
+++ b/AMW_angular/io/src/app/resources/resources-page.component.spec.ts
@@ -0,0 +1,24 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { ResourcesPageComponent } from './resources-page.component';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
+import { provideHttpClientTesting } from '@angular/common/http/testing';
+
+describe('ResourcesPageComponent', () => {
+  let component: ResourcesPageComponent;
+  let fixture: ComponentFixture<ResourcesPageComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [ResourcesPageComponent],
+      providers: [provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting()],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(ResourcesPageComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/AMW_angular/io/src/app/resources/resources-page.component.ts b/AMW_angular/io/src/app/resources/resources-page.component.ts
new file mode 100644
index 000000000..3f543ee10
--- /dev/null
+++ b/AMW_angular/io/src/app/resources/resources-page.component.ts
@@ -0,0 +1,152 @@
+import {
+  ChangeDetectionStrategy,
+  Component,
+  computed,
+  inject,
+  Signal,
+  signal,
+  OnDestroy,
+  WritableSignal,
+} from '@angular/core';
+import { NgClass } from '@angular/common';
+import { AuthService } from '../auth/auth.service';
+import { PageComponent } from '../layout/page/page.component';
+import { LoadingIndicatorComponent } from '../shared/elements/loading-indicator.component';
+import { ResourceTypesService } from '../resource/resource-types.service';
+import { ResourceType } from '../resource/resource-type';
+import { ButtonComponent } from '../shared/button/button.component';
+import { IconComponent } from '../shared/icon/icon.component';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { ResourceTypeAddComponent } from './resource-type-add/resource-type-add.component';
+import { ResourceTypeRequest } from '../resource/resource-type-request';
+import { ResourcesListComponent } from './resources-list/resources-list.component';
+import { ResourceService } from '../resource/resource.service';
+import { Resource } from '../resource/resource';
+import { ReleasesService } from '../settings/releases/releases.service';
+import { Release } from '../settings/releases/release';
+import { ToastService } from '../shared/elements/toast/toast.service';
+import { BehaviorSubject, Subject } from 'rxjs';
+import { takeUntil } from 'rxjs/operators';
+
+@Component({
+  selector: 'app-resources-page',
+  standalone: true,
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  imports: [PageComponent, LoadingIndicatorComponent, ButtonComponent, IconComponent, ResourcesListComponent, NgClass],
+  templateUrl: './resources-page.component.html',
+  styleUrl: 'resources-page.component.css',
+})
+export class ResourcesPageComponent implements OnDestroy {
+  private authService = inject(AuthService);
+  private resourceTypesService = inject(ResourceTypesService);
+  private resourceService = inject(ResourceService);
+  private releaseService = inject(ReleasesService);
+  private toastService = inject(ToastService);
+  private error$ = new BehaviorSubject<string>('');
+  private destroy$ = new Subject<void>();
+  private modalService = inject(NgbModal);
+
+  predefinedResourceTypes: Signal<ResourceType[]> = this.resourceTypesService.predefinedResourceTypes;
+  rootResourceTypes: Signal<ResourceType[]> = this.resourceTypesService.rootResourceTypes;
+  resourceGroupListForType: Signal<Resource[]> = this.resourceService.resourceGroupListForType;
+  releases: Signal<Release[]> = this.releaseService.allReleases;
+  isLoading = signal(false);
+  expandedResourceTypeId: number | null = null;
+  expandedItems: ResourceType[] = [];
+  selectedResourceType: WritableSignal<ResourceType | null> = signal(null);
+  selection: any;
+
+  permissions = computed(() => {
+    if (this.authService.restrictions().length > 0) {
+      return {
+        canViewResourceTypes: this.authService.hasPermission('RES_TYPE_LIST_TAB', 'ALL'),
+        canCreateResourceTypes: this.authService.hasPermission('RESOURCETYPE', 'CREATE'),
+      };
+    } else {
+      return { canViewResourceTypes: false, canCreateResourceTypes: false };
+    }
+  });
+
+  ngOnDestroy(): void {
+    this.destroy$.next(undefined);
+  }
+  selectedResourceTypeOrDefault: Signal<ResourceType> = computed(() => {
+    if (!this.selectedResourceType() && this.rootResourceTypes() && this.rootResourceTypes().length > 0) {
+      this.resourceService.setTypeForResourceGroupList(this.rootResourceTypes()[0]);
+      return this.rootResourceTypes()[0];
+    }
+    return this.selectedResourceType() || null;
+  });
+
+  toggleChildrenAndOrLoadResourcesList(resourceType: ResourceType): void {
+    this.selection = resourceType;
+    this.resourceService.setTypeForResourceGroupList(resourceType);
+    if (resourceType && resourceType.hasChildren) this.getUpdateExpandedItems(resourceType);
+    this.expandedResourceTypeId = this.expandedResourceTypeId === resourceType.id ? null : resourceType.id;
+    this.selectedResourceType.set(resourceType);
+  }
+
+  isExpanded(resourceType: ResourceType) {
+    return this.expandedItems.find((element) => element.id === resourceType.id);
+  }
+
+  addResource(resource: any) {
+    this.resourceService
+      .createResourceForResourceType(resource)
+      .pipe(takeUntil(this.destroy$))
+      .subscribe({
+        next: () => this.toastService.success('Resource saved successfully.'),
+        error: (e) => this.error$.next(e),
+        complete: () => this.resourceService.setTypeForResourceGroupList(this.selectedResourceTypeOrDefault()), // refresh data of the selected resource type
+      });
+  }
+
+  addResourceType() {
+    const modalRef = this.modalService.open(ResourceTypeAddComponent, {
+      size: 'sm',
+    });
+
+    modalRef.componentInstance.resourceType = {
+      name: '',
+      parentId: null,
+    };
+
+    modalRef.componentInstance.saveResourceType
+      .pipe(takeUntil(this.destroy$))
+      .subscribe((resourceTypeData: ResourceTypeRequest) => this.saveResourceType(resourceTypeData));
+  }
+
+  saveResourceType(resourceTypeData: ResourceTypeRequest): void {
+    this.resourceTypesService
+      .addNewResourceType(resourceTypeData)
+      .pipe(takeUntil(this.destroy$))
+      .subscribe({
+        next: () => this.toastService.success('Resource type saved successfully.'),
+        error: (err) => this.error$.next(err.message),
+        complete: () => this.resourceTypesService.refreshData(),
+      });
+  }
+
+  deleteResourceType(resourceType: ResourceType) {
+    this.resourceTypesService
+      .delete(resourceType.id)
+      .pipe(takeUntil(this.destroy$))
+      .subscribe({
+        next: () => this.toastService.success('Resource type deleted successfully.'),
+        error: (e) => this.error$.next(e),
+        complete: () => {
+          this.resourceTypesService.refreshData();
+          this.selectedResourceType.set(null);
+        },
+      });
+  }
+
+  private getUpdateExpandedItems(resourceType: ResourceType) {
+    const index = this.expandedItems?.findIndex((element: ResourceType) => element.id === resourceType.id);
+    if (index > -1) {
+      this.expandedItems.splice(index, 1);
+    } else {
+      this.expandedItems.push(resourceType);
+    }
+  }
+}
diff --git a/AMW_angular/io/src/app/resources/resources.route.ts b/AMW_angular/io/src/app/resources/resources.route.ts
new file mode 100644
index 000000000..6a9e1f221
--- /dev/null
+++ b/AMW_angular/io/src/app/resources/resources.route.ts
@@ -0,0 +1,3 @@
+import { ResourcesPageComponent } from './resources-page.component';
+
+export const resourcesRoute = [{ path: 'resources', component: ResourcesPageComponent }];
diff --git a/AMW_angular/io/src/app/servers/server.ts b/AMW_angular/io/src/app/servers/server.ts
new file mode 100644
index 000000000..6acfdd9e7
--- /dev/null
+++ b/AMW_angular/io/src/app/servers/server.ts
@@ -0,0 +1,15 @@
+export type Server = {
+  host: string;
+  appServer: string;
+  appServerRelease: string;
+  runtime: string;
+  node: string;
+  nodeRelease: string;
+  environment: string;
+  appServerId: number;
+  nodeId: number;
+  environmentId: number;
+  domain: string;
+  domainId: string;
+  definedOnNode: boolean;
+};
diff --git a/AMW_angular/io/src/app/servers/servers-filter/server-filter.ts b/AMW_angular/io/src/app/servers/servers-filter/server-filter.ts
new file mode 100644
index 000000000..f8a254e3a
--- /dev/null
+++ b/AMW_angular/io/src/app/servers/servers-filter/server-filter.ts
@@ -0,0 +1,18 @@
+export type ServerFilter = {
+  environmentName: string;
+  runtimeName: string;
+  appServer: string;
+  host: string;
+  node: string;
+};
+export function isServerFilterEmpty(filter: ServerFilter): boolean {
+  if (filter)
+    return (
+      (!filter.environmentName || filter.environmentName === 'All' || filter.environmentName.trim().length === 0) &&
+      (!filter.runtimeName || filter.runtimeName === 'All' || filter.runtimeName.trim().length === 0) &&
+      (!filter.appServer || filter.appServer.trim().length === 0) &&
+      (!filter.host || filter.host.trim().length === 0) &&
+      (!filter.node || filter.node.trim().length === 0)
+    );
+  return true;
+}
diff --git a/AMW_angular/io/src/app/servers/servers-filter/servers-filter.component.html b/AMW_angular/io/src/app/servers/servers-filter/servers-filter.component.html
new file mode 100644
index 000000000..7c8cfb73a
--- /dev/null
+++ b/AMW_angular/io/src/app/servers/servers-filter/servers-filter.component.html
@@ -0,0 +1,40 @@
+<div class="container">
+  <div class="row g-4 mb-4">
+    <div class="col-md-3">
+      <label for="appServer" class="form-label">AppServer</label>
+      <input type="text" class="form-control" id="appServer" [ngbTypeahead]="search" [(ngModel)]="appServer"/>
+    </div>
+    <div class="col-md-3">
+      <label class="form-label">Runtime</label>
+      <select class="form-select" [(ngModel)]="selectedRuntimeName">
+        <option [value]="'All'">All</option>
+        @for (runtime of runtimes(); track runtime.id) {
+          <option [value]="runtime.name">{{ runtime.name }}</option>
+        }
+      </select>
+    </div>
+    <div class="col-md-3">
+      <label class="form-label">Env</label>
+      <select class="form-select in" [(ngModel)]="selectedEnvironmentName">
+        <option [value]="'All'">All</option>
+        @for (env of environments(); track env.id) {
+          <option [value]="env.name">{{ env.name }}</option>
+        }
+      </select>
+    </div>
+  </div>
+  <div class="row g-4 mb-4">
+    <div class="col-md-3">
+      <label for="host" class="form-label">Host</label>
+      <input type="text" class="form-control" id="host" [(ngModel)]="host"/>
+    </div>
+    <div class="col-md-3">
+      <label for="node" class="form-label">Node</label>
+      <input type="text" class="form-control" id="node" [(ngModel)]="node"/>
+    </div>
+    <div class="col-md-3 d-flex align-items-end">
+      <app-button [variant]="'primary'" (click)="searchServerFilter()">Search</app-button>
+      <app-button [variant]="'light'" (click)="reset()">Clear filters</app-button>
+    </div>
+  </div>
+</div>
diff --git a/AMW_angular/io/src/app/servers/servers-filter/servers-filter.component.spec.ts b/AMW_angular/io/src/app/servers/servers-filter/servers-filter.component.spec.ts
new file mode 100644
index 000000000..238dbbba1
--- /dev/null
+++ b/AMW_angular/io/src/app/servers/servers-filter/servers-filter.component.spec.ts
@@ -0,0 +1,28 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { ServersFilterComponent } from './servers-filter.component';
+import { InputSignal, signal } from '@angular/core';
+import { Environment } from '../../deployment/environment';
+import { Resource } from '../../resource/resource';
+
+describe('ServersFilterComponent', () => {
+  let component: ServersFilterComponent;
+  let fixture: ComponentFixture<ServersFilterComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [ServersFilterComponent],
+      providers: [],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(ServersFilterComponent);
+    component = fixture.componentInstance;
+    component.environments = signal<Environment[]>([]) as unknown as InputSignal<Environment[]>;
+    component.runtimes = signal<Resource[]>([]) as unknown as InputSignal<Resource[]>;
+    component.appServerSuggestions = signal<string[]>([]) as unknown as InputSignal<string[]>;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/AMW_angular/io/src/app/servers/servers-filter/servers-filter.component.ts b/AMW_angular/io/src/app/servers/servers-filter/servers-filter.component.ts
new file mode 100644
index 000000000..8125b9796
--- /dev/null
+++ b/AMW_angular/io/src/app/servers/servers-filter/servers-filter.component.ts
@@ -0,0 +1,61 @@
+import { ChangeDetectionStrategy, Component, input, output } from '@angular/core';
+import { NgSelectModule } from '@ng-select/ng-select';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { Environment } from '../../deployment/environment';
+import { Resource } from '../../resource/resource';
+import { ServerFilter } from './server-filter';
+import { NgbTypeahead } from '@ng-bootstrap/ng-bootstrap';
+import { Observable, OperatorFunction } from 'rxjs';
+import { debounceTime, distinctUntilChanged, map } from 'rxjs/operators';
+import { ButtonComponent } from '../../shared/button/button.component';
+
+@Component({
+  selector: 'app-servers-filter',
+  standalone: true,
+  imports: [NgSelectModule, ReactiveFormsModule, FormsModule, NgbTypeahead, ButtonComponent],
+  templateUrl: './servers-filter.component.html',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class ServersFilterComponent {
+  environments = input.required<Environment[]>();
+  runtimes = input.required<Resource[]>();
+  appServerSuggestions = input.required<string[]>();
+  searchFilter = output<ServerFilter>();
+  selectedEnvironmentName: string = 'All';
+  selectedRuntimeName: string = 'All';
+  appServer: string;
+  host: string;
+  node: string;
+
+  search: OperatorFunction<string, readonly string[]> = (text$: Observable<string>) =>
+    text$.pipe(
+      debounceTime(200),
+      distinctUntilChanged(),
+      map((term) =>
+        term.length < 1
+          ? []
+          : this.appServerSuggestions()
+              .filter((v) => v.toLowerCase().indexOf(term.toLowerCase()) > -1)
+              .slice(0, 10),
+      ),
+    );
+
+  searchServerFilter() {
+    const filter: ServerFilter = {
+      environmentName: this.selectedEnvironmentName,
+      runtimeName: this.selectedRuntimeName,
+      appServer: this.appServer,
+      host: this.host,
+      node: this.node,
+    };
+    this.searchFilter.emit(filter);
+  }
+
+  reset() {
+    this.selectedEnvironmentName = 'All';
+    this.selectedRuntimeName = 'All';
+    this.appServer = null;
+    this.host = null;
+    this.node = null;
+  }
+}
diff --git a/AMW_angular/io/src/app/servers/servers-list/servers-list.component.spec.ts b/AMW_angular/io/src/app/servers/servers-list/servers-list.component.spec.ts
new file mode 100644
index 000000000..bb04a30cf
--- /dev/null
+++ b/AMW_angular/io/src/app/servers/servers-list/servers-list.component.spec.ts
@@ -0,0 +1,68 @@
+import { ServersListComponent } from './servers-list.component';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentRef } from '@angular/core';
+import { Server } from '../server';
+
+describe(ServersListComponent.name, () => {
+  let component: ServersListComponent;
+  let componentRef: ComponentRef<ServersListComponent>;
+  let fixture: ComponentFixture<ServersListComponent>;
+
+  const servers: Server[] = [
+    {
+      host: 'host1',
+      appServer: 'Application Server 1',
+      appServerRelease: 'multiple',
+      runtime: 'multiple runtimes',
+      node: 'node1',
+      nodeRelease: '1.1',
+      environment: 'A',
+      appServerId: 1,
+      nodeId: 2,
+      environmentId: 3,
+      domain: 'domain 1',
+      domainId: '1',
+      definedOnNode: true,
+    },
+    {
+      host: 'host2',
+      appServer: 'Application Server 2',
+      appServerRelease: 'multiple',
+      runtime: 'multiple runtimes',
+      node: 'node2',
+      nodeRelease: '1.2',
+      environment: 'B',
+      appServerId: 2,
+      nodeId: 3,
+      environmentId: 4,
+      domain: 'domain 2',
+      domainId: '2',
+      definedOnNode: false,
+    },
+  ];
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [ServersListComponent],
+      providers: [],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(ServersListComponent);
+
+    component = fixture.componentInstance;
+    componentRef = fixture.componentRef;
+    componentRef.setInput('servers', servers);
+    componentRef.setInput('canReadAppServer', true);
+    componentRef.setInput('canReadResources', false);
+    componentRef.setInput('linkToHostUrl', '/link/to/host');
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeDefined();
+    expect(component.servers().length).toBe(2);
+    expect(component.canReadResources()).toBeFalse();
+    expect(component.canReadAppServer()).toBeTrue();
+    expect(component.linkToHostUrl()).toEqual('/link/to/host');
+  });
+});
diff --git a/AMW_angular/io/src/app/servers/servers-list/servers-list.component.ts b/AMW_angular/io/src/app/servers/servers-list/servers-list.component.ts
new file mode 100644
index 000000000..48b4d9549
--- /dev/null
+++ b/AMW_angular/io/src/app/servers/servers-list/servers-list.component.ts
@@ -0,0 +1,64 @@
+import { ChangeDetectionStrategy, Component, inject, input, Signal } from '@angular/core';
+import { AppsListComponent } from '../../apps/apps-list/apps-list-component';
+import { Server } from '../server';
+
+@Component({
+  selector: 'app-servers-list',
+  standalone: true,
+  imports: [AppsListComponent],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  template: `<div class="table-responsive">
+    @if (servers() && servers().length > 0) {
+    <table class="table table-sm table-borderless">
+      <thead class="table-light">
+        <tr>
+          <th>Host</th>
+          <th>Env</th>
+          <th>AppServer</th>
+          <th>AppServer Release</th>
+          <th>Runtime</th>
+          <th>Node</th>
+          <th>Node Release</th>
+        </tr>
+      </thead>
+      <tbody>
+        @for (server of servers(); track server; let even = $even) {
+        <tr [class.table-light]="!even">
+          <td>
+            <a href="{{ linkToHostUrl() }}={{ server.host }}">{{ server.host }}</a>
+          </td>
+          <td>{{ server.environment }}</td>
+          <td>
+            @if(canReadAppServer()) {
+            <a
+              href="/AMW_web/pages/editResourceView.xhtml?ctx={{ server.environmentId }}&id={{ server.appServerId }}"
+              >{{ server.appServer }}</a
+            >
+            } @else {
+            {{ server.appServer }} }
+          </td>
+          <td>{{ server.appServerRelease }}</td>
+          <td>{{ server.runtime }}</td>
+          <td>
+            @if (canReadResources()) {
+            <a href="/AMW_web/pages/editResourceView.xhtml?ctx={{ server.environmentId }}&id={{ server.nodeId }}">{{
+              server.node
+            }}</a>
+            } @else {
+            {{ server.node }}
+            }
+          </td>
+          <td>{{ server.nodeRelease }}</td>
+        </tr>
+        }
+      </tbody>
+    </table>
+    }
+  </div>`,
+})
+export class ServersListComponent {
+  servers = input.required<Server[]>();
+  canReadAppServer = input.required<boolean>();
+  canReadResources = input.required<boolean>();
+  linkToHostUrl = input.required<string>();
+}
diff --git a/AMW_angular/io/src/app/servers/servers-page-component.spec.ts b/AMW_angular/io/src/app/servers/servers-page-component.spec.ts
new file mode 100644
index 000000000..0f716e3e1
--- /dev/null
+++ b/AMW_angular/io/src/app/servers/servers-page-component.spec.ts
@@ -0,0 +1,25 @@
+import { ServersPageComponent } from './servers-page.component';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
+import { provideHttpClientTesting } from '@angular/common/http/testing';
+
+describe(ServersPageComponent.name, () => {
+  let component: ServersPageComponent;
+  let fixture: ComponentFixture<ServersPageComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [ServersPageComponent],
+      providers: [provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting()],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(ServersPageComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+    expect(component.isLoading).toBeFalse();
+  });
+});
diff --git a/AMW_angular/io/src/app/servers/servers-page.component.ts b/AMW_angular/io/src/app/servers/servers-page.component.ts
new file mode 100644
index 000000000..2e7e99e2c
--- /dev/null
+++ b/AMW_angular/io/src/app/servers/servers-page.component.ts
@@ -0,0 +1,83 @@
+import { ChangeDetectionStrategy, Component, computed, inject, Signal } from '@angular/core';
+import { PageComponent } from '../layout/page/page.component';
+import { LoadingIndicatorComponent } from '../shared/elements/loading-indicator.component';
+import { AuthService } from '../auth/auth.service';
+import { ServersListComponent } from './servers-list/servers-list.component';
+import { ServersService } from './servers.service';
+import { ConfigurationService } from '../shared/service/configuration.service';
+import { ENVIRONMENT } from '../core/amw-constants';
+import { Config, pluck } from '../shared/configuration';
+import { ServersFilterComponent } from './servers-filter/servers-filter.component';
+import { EnvironmentService } from '../deployment/environment.service';
+import { ServerFilter } from './servers-filter/server-filter';
+
+@Component({
+  selector: 'app-servers-page',
+  standalone: true,
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  imports: [PageComponent, LoadingIndicatorComponent, ServersListComponent, ServersFilterComponent],
+  template: ` <app-loading-indicator [isLoading]="isLoading"></app-loading-indicator>
+    <app-page>
+      <div class="page-title">Servers</div>
+      <div class="page-content">
+        <div class="container">
+          <app-servers-filter
+            [environments]="environments()"
+            [runtimes]="runtimes()"
+            [appServerSuggestions]="appServerSuggestions()"
+            (searchFilter)="searchFilter($event)"
+          />
+          <app-servers-list
+            [servers]="servers()"
+            [canReadAppServer]="permissions().canReadAppServer"
+            [canReadResources]="permissions().canReadResources"
+            [linkToHostUrl]="linkToHostUrl()"
+          />
+        </div>
+      </div>
+    </app-page>`,
+})
+export class ServersPageComponent {
+  private authService = inject(AuthService);
+  private serversService = inject(ServersService);
+  private environmentsService = inject(EnvironmentService);
+  private configurationService = inject(ConfigurationService);
+
+  isLoading: boolean = false;
+
+  environments = this.environmentsService.envs;
+  runtimes = this.serversService.runtimes;
+  appServerSuggestions = this.serversService.appServersSuggestions;
+  servers = computed(() => {
+    this.isLoading = false;
+    return this.serversService.servers();
+  });
+  configuration: Signal<Config[]> = this.configurationService.configuration;
+
+  linkToHostUrl = computed(() => {
+    if (!this.configuration()) return;
+    const config = this.configuration();
+    const vmDetailUrl = pluck(ENVIRONMENT.AMW_VM_DETAILS_URL, config);
+    const vmUrlParam = pluck(ENVIRONMENT.AMW_VM_URL_PARAM, config);
+    return `${vmDetailUrl}?${vmUrlParam}=`;
+  });
+
+  permissions = computed(() => {
+    if (this.authService.restrictions().length > 0) {
+      return {
+        canReadAppServer: this.authService.hasResourcePermission('RESOURCE', 'CREATE', 'APPLICATION'),
+        canReadResources: this.authService.hasPermission('RESOURCE', 'READ'),
+      };
+    } else {
+      return {
+        canReadAppServer: false,
+        canReadResources: false,
+      };
+    }
+  });
+
+  searchFilter($event: ServerFilter) {
+    this.isLoading = true;
+    this.serversService.setServerFilter($event);
+  }
+}
diff --git a/AMW_angular/io/src/app/servers/servers.route.ts b/AMW_angular/io/src/app/servers/servers.route.ts
new file mode 100644
index 000000000..6951570a3
--- /dev/null
+++ b/AMW_angular/io/src/app/servers/servers.route.ts
@@ -0,0 +1,3 @@
+import { ServersPageComponent } from './servers-page.component';
+
+export const serversRoute = [{ path: 'servers', component: ServersPageComponent }];
diff --git a/AMW_angular/io/src/app/servers/servers.service.ts b/AMW_angular/io/src/app/servers/servers.service.ts
new file mode 100644
index 000000000..36358397f
--- /dev/null
+++ b/AMW_angular/io/src/app/servers/servers.service.ts
@@ -0,0 +1,64 @@
+import { BaseService } from '../base/base.service';
+import { catchError, map, shareReplay, switchMap } from 'rxjs/operators';
+import { inject, Injectable, Signal } from '@angular/core';
+import { HttpClient } from '@angular/common/http';
+import { Server } from './server';
+import { toSignal } from '@angular/core/rxjs-interop';
+import { Observable, startWith, Subject } from 'rxjs';
+import { Resource } from '../resource/resource';
+import { isServerFilterEmpty, ServerFilter } from './servers-filter/server-filter';
+
+@Injectable({ providedIn: 'root' })
+export class ServersService extends BaseService {
+  private http = inject(HttpClient);
+  private serversUrl = `${this.getBaseUrl()}/servers`;
+  private serverFilter$: Subject<ServerFilter> = new Subject<ServerFilter>();
+  private reloadedServers: Observable<Server[]> = this.serverFilter$.pipe(
+    switchMap((filter: ServerFilter) => this.getServers(filter)),
+    startWith(null),
+    shareReplay(1),
+  );
+
+  servers: Signal<Server[]> = toSignal(this.reloadedServers, { initialValue: [] as Server[] });
+
+  private runtimes$ = this.http
+    .get<Resource[]>(`${this.serversUrl}/runtimes`)
+    .pipe(catchError(this.handleError))
+    .pipe(map((data) => data.sort((a, b) => (a.name < b.name ? -1 : 1))));
+  runtimes: Signal<Resource[]> = toSignal(this.runtimes$);
+
+  private appServersSuggestions$ = this.http
+    .get<string[]>(`${this.serversUrl}/appServersSuggestions`)
+    .pipe(catchError(this.handleError));
+  appServersSuggestions: Signal<string[]> = toSignal(this.appServersSuggestions$);
+
+  getServers(filter?: ServerFilter): Observable<Server[]> {
+    if (isServerFilterEmpty(filter)) {
+      return this.http
+        .get<Server[]>(`${this.serversUrl}`, {
+          headers: this.getHeaders(),
+          observe: 'response',
+        })
+        .pipe(catchError(this.handleError))
+        .pipe(map((response) => response.body));
+    } else {
+      const urlParams = this.buildUrlParam(filter);
+      return this.http.get<Server[]>(`${this.serversUrl}${urlParams}`).pipe(catchError(this.handleError));
+    }
+  }
+
+  buildUrlParam(filter: ServerFilter) {
+    let urlParams: string = `/filter?`;
+    if (filter.environmentName && filter.environmentName !== 'All')
+      urlParams += `environment=${filter.environmentName}`;
+    if (filter.runtimeName && filter.runtimeName !== 'All') urlParams += `&runtime=${filter.runtimeName}`;
+    if (filter.appServer) urlParams += `&appServer=${filter.appServer}`;
+    if (filter.host) urlParams += `&host=${filter.host}`;
+    if (filter.node) urlParams += `&node=${filter.node}`;
+    return urlParams;
+  }
+
+  setServerFilter(filter: ServerFilter) {
+    this.serverFilter$.next(filter);
+  }
+}
diff --git a/AMW_angular/io/src/app/setting/app-information.ts b/AMW_angular/io/src/app/setting/app-information.ts
new file mode 100644
index 000000000..5964a93c8
--- /dev/null
+++ b/AMW_angular/io/src/app/setting/app-information.ts
@@ -0,0 +1,4 @@
+export interface AppInformation {
+  key: string;
+  value: string | null;
+}
diff --git a/AMW_angular/io/src/app/setting/setting.service.spec.ts b/AMW_angular/io/src/app/setting/setting.service.spec.ts
index 32378eac6..4e194207b 100644
--- a/AMW_angular/io/src/app/setting/setting.service.spec.ts
+++ b/AMW_angular/io/src/app/setting/setting.service.spec.ts
@@ -10,9 +10,9 @@ describe('SettingService', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-    imports: [],
-    providers: [SettingService, provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting()]
-});
+      imports: [],
+      providers: [SettingService, provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting()],
+    });
 
     httpTestingController = TestBed.inject(HttpTestingController);
     httpClient = TestBed.inject(HttpClient);
diff --git a/AMW_angular/io/src/app/setting/setting.service.ts b/AMW_angular/io/src/app/setting/setting.service.ts
index 975733140..cbffe3d19 100644
--- a/AMW_angular/io/src/app/setting/setting.service.ts
+++ b/AMW_angular/io/src/app/setting/setting.service.ts
@@ -4,6 +4,7 @@ import { Observable } from 'rxjs';
 import { catchError } from 'rxjs/operators';
 import { AppConfiguration } from './app-configuration';
 import { BaseService } from '../base/base.service';
+import { AppInformation } from './app-information';
 
 @Injectable({ providedIn: 'root' })
 export class SettingService extends BaseService {
@@ -18,4 +19,8 @@ export class SettingService extends BaseService {
       })
       .pipe(catchError(this.handleError));
   }
+
+  getAppInformation(): Observable<AppInformation[]> {
+    return this.http.get<AppInformation[]>(`${this.getBaseUrl()}/settings/appInfo`).pipe(catchError(this.handleError));
+  }
 }
diff --git a/AMW_angular/io/src/app/settings/application-info/application-info.component.html b/AMW_angular/io/src/app/settings/application-info/application-info.component.html
index d1819e59b..0ee0b0617 100644
--- a/AMW_angular/io/src/app/settings/application-info/application-info.component.html
+++ b/AMW_angular/io/src/app/settings/application-info/application-info.component.html
@@ -1,4 +1,4 @@
-<app-loading-indicator [isLoading]="isLoading$ | async"></app-loading-indicator>
+<app-loading-indicator [isLoading]="isLoading()"></app-loading-indicator>
 
 <div class="container">
   <h1>Application Information</h1>
@@ -6,7 +6,7 @@ <h1>Application Information</h1>
     <div class="card-header"><b>Application Information</b></div>
     <div class="card-body">
       <div class="table-responsive">
-        @if ((appVersions$ | async)?.length > 0) {
+        @if (appVersions().length > 0) {
         <table class="table table-sm table-striped">
           <thead>
             <tr>
@@ -16,7 +16,7 @@ <h1>Application Information</h1>
           </thead>
 
           <tbody>
-            @for (item of appVersions$ | async; track item) {
+            @for (item of appVersions(); track item.key) {
             <tr>
               <td>{{ item.key }}</td>
               <td>{{ item.value }}</td>
@@ -34,7 +34,7 @@ <h1>Application Information</h1>
     <div class="card-header"><b>Application Configuration</b></div>
     <div class="card-body">
       <div class="table-responsive">
-        @if ((appConfigs$ | async)?.length > 0) {
+        @if (appConfigs().length > 0) {
         <table class="table table-sm table-striped">
           <thead>
             <tr>
@@ -46,7 +46,7 @@ <h1>Application Information</h1>
           </thead>
 
           <tbody>
-            @for (item of appConfigs$ | async; track item) {
+            @for (item of appConfigs(); track item.key.value) {
             <tr>
               <td>{{ item.key.value }}</td>
               <td>{{ item.key.env }}</td>
diff --git a/AMW_angular/io/src/app/settings/application-info/application-info.component.spec.ts b/AMW_angular/io/src/app/settings/application-info/application-info.component.spec.ts
index 1d76d77b8..b68a78a52 100644
--- a/AMW_angular/io/src/app/settings/application-info/application-info.component.spec.ts
+++ b/AMW_angular/io/src/app/settings/application-info/application-info.component.spec.ts
@@ -1,25 +1,20 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ApplicationInfoComponent } from './application-info.component';
-import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing';
-import { HttpClient, provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
+import { provideHttpClientTesting } from '@angular/common/http/testing';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 
 describe('ApplicationInfoComponent', () => {
   let component: ApplicationInfoComponent;
   let fixture: ComponentFixture<ApplicationInfoComponent>;
-  let httpTestingController: HttpTestingController;
-  let httpClient: HttpClient;
-
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-    imports: [ApplicationInfoComponent],
-    providers: [provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting()]
-}).compileComponents();
+      imports: [ApplicationInfoComponent],
+      providers: [provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting()],
+    }).compileComponents();
 
     fixture = TestBed.createComponent(ApplicationInfoComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
-    httpTestingController = TestBed.inject(HttpTestingController);
-    httpClient = TestBed.inject(HttpClient);
   });
 
   it('should create', () => {
diff --git a/AMW_angular/io/src/app/settings/application-info/application-info.component.ts b/AMW_angular/io/src/app/settings/application-info/application-info.component.ts
index ffa9dc3cb..e7094ee91 100644
--- a/AMW_angular/io/src/app/settings/application-info/application-info.component.ts
+++ b/AMW_angular/io/src/app/settings/application-info/application-info.component.ts
@@ -1,27 +1,20 @@
-import { Component } from '@angular/core';
+import { Component, computed, inject } from '@angular/core';
 import { LoadingIndicatorComponent } from '../../shared/elements/loading-indicator.component';
-import { HttpClient } from '@angular/common/http';
 import { AsyncPipe } from '@angular/common';
-import { BehaviorSubject, forkJoin, Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
-
-type Config = { key: { value: string; env: string }; value: string; defaultValue: string };
-type Version = { key: string; value: string };
+import { SettingService } from '../../setting/setting.service';
+import { toSignal } from '@angular/core/rxjs-interop';
+import { AppInformation } from '../../setting/app-information';
+import { AppConfiguration } from '../../setting/app-configuration';
 
 @Component({
-  selector: 'amw-application-info',
+  selector: 'app-application-info',
   standalone: true,
   imports: [LoadingIndicatorComponent, AsyncPipe],
   templateUrl: './application-info.component.html',
 })
 export class ApplicationInfoComponent {
-  appVersions$: Observable<Version[]>;
-  appConfigs$: Observable<Config[]>;
-  isLoading$: Observable<boolean> = new BehaviorSubject<boolean>(true);
-
-  constructor(private http: HttpClient) {
-    this.appVersions$ = http.get<Version[]>('/AMW_rest/resources/settings/appInfo');
-    this.appConfigs$ = http.get<Config[]>('/AMW_rest/resources/settings');
-    this.isLoading$ = forkJoin([this.appVersions$, this.appConfigs$]).pipe(map(() => false));
-  }
+  private settingService = inject(SettingService);
+  appVersions = toSignal(this.settingService.getAppInformation(), { initialValue: [] as AppInformation[] });
+  appConfigs = toSignal(this.settingService.getAllAppSettings(), { initialValue: [] as AppConfiguration[] });
+  isLoading = computed(() => !this.appVersions().length || !this.appConfigs().length);
 }
diff --git a/AMW_angular/io/src/app/settings/deployment-parameter/deployment-parameter.component.html b/AMW_angular/io/src/app/settings/deployment-parameter/deployment-parameter.component.html
index 346df565a..8610709ff 100644
--- a/AMW_angular/io/src/app/settings/deployment-parameter/deployment-parameter.component.html
+++ b/AMW_angular/io/src/app/settings/deployment-parameter/deployment-parameter.component.html
@@ -3,12 +3,11 @@ <h1>Deployment Parameter Keys</h1>
   <div class="row mt-2 py-4">
     <div class="col-6 ms-auto">
       <div class="input-group">
-        @if (canCreate) {
+        @if (canCreate()) {
         <input id="keyName" type="text" class="form-control" [(ngModel)]="keyName" (keyup.enter)="addKey()" />
-        <button class="btn btn-primary" (click)="addKey()" [attr.data-cy]="'button-add'">
-          <app-icon icon="plus-circle"></app-icon>
-          Add key
-        </button>
+        <app-button [variant]="'primary'" (click)="addKey()"
+          ><app-icon icon="plus-circle"></app-icon> Add key</app-button
+        >
         }
       </div>
     </div>
@@ -26,14 +25,10 @@ <h1>Deployment Parameter Keys</h1>
       <tr>
         <td class="align-middle">{{ paramKey.name }}</td>
         <td>
-          @if (canDelete) {
-          <button
-            class="btn btn-sm btn-danger me-0"
-            (click)="deleteKey(paramKey.id)"
-            [attr.data-cy]="'delete-' + paramKey.id"
-          >
-            <app-icon icon="trash"></app-icon>
-          </button>
+          @if (canDelete()) {
+          <app-button [variant]="'danger'" [size]="'sm'" [additionalClasses]="'me-0'" (click)="deleteKey(paramKey.id)"
+            ><app-icon icon="trash"></app-icon
+          ></app-button>
           }
         </td>
       </tr>
diff --git a/AMW_angular/io/src/app/settings/deployment-parameter/deployment-parameter.component.scss b/AMW_angular/io/src/app/settings/deployment-parameter/deployment-parameter.component.scss
index f36e46dd5..e7409aad0 100644
--- a/AMW_angular/io/src/app/settings/deployment-parameter/deployment-parameter.component.scss
+++ b/AMW_angular/io/src/app/settings/deployment-parameter/deployment-parameter.component.scss
@@ -1,6 +1,4 @@
-.table td, .table th {
+.table td,
+.table th {
   vertical-align: middle;
 }
-
-
-
diff --git a/AMW_angular/io/src/app/settings/deployment-parameter/deployment-parameter.component.spec.ts b/AMW_angular/io/src/app/settings/deployment-parameter/deployment-parameter.component.spec.ts
index 1f8695c7c..98d2cb1da 100644
--- a/AMW_angular/io/src/app/settings/deployment-parameter/deployment-parameter.component.spec.ts
+++ b/AMW_angular/io/src/app/settings/deployment-parameter/deployment-parameter.component.spec.ts
@@ -9,9 +9,9 @@ describe('DeploymentParameterComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-    imports: [DeploymentParameterComponent],
-    providers: [provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting()]
-}).compileComponents();
+      imports: [DeploymentParameterComponent],
+      providers: [provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting()],
+    }).compileComponents();
 
     fixture = TestBed.createComponent(DeploymentParameterComponent);
     component = fixture.componentInstance;
diff --git a/AMW_angular/io/src/app/settings/deployment-parameter/deployment-parameter.component.ts b/AMW_angular/io/src/app/settings/deployment-parameter/deployment-parameter.component.ts
index 5ae6f5dfc..8565c095c 100644
--- a/AMW_angular/io/src/app/settings/deployment-parameter/deployment-parameter.component.ts
+++ b/AMW_angular/io/src/app/settings/deployment-parameter/deployment-parameter.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnDestroy, OnInit, signal } from '@angular/core';
+import { Component, inject, OnDestroy, OnInit, signal } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { HttpClient } from '@angular/common/http';
@@ -6,29 +6,28 @@ import { IconComponent } from '../../shared/icon/icon.component';
 import { AuthService, isAllowed } from '../../auth/auth.service';
 import { Subject } from 'rxjs';
 import { ToastService } from '../../shared/elements/toast/toast.service';
+import { ButtonComponent } from '../../shared/button/button.component';
 
 type Key = { id: number; name: string };
 
 @Component({
   selector: 'app-deployment-parameter',
   standalone: true,
-  imports: [CommonModule, ReactiveFormsModule, FormsModule, IconComponent],
+  imports: [CommonModule, ReactiveFormsModule, FormsModule, IconComponent, ButtonComponent],
   templateUrl: './deployment-parameter.component.html',
   styleUrl: './deployment-parameter.component.scss',
 })
 export class DeploymentParameterComponent implements OnInit, OnDestroy {
+  authService = inject(AuthService);
+  http = inject(HttpClient);
+  toastService = inject(ToastService);
+
   keyName = '';
   paramKeys: Key[] = [];
   canCreate = signal<boolean>(false);
   canDelete = signal<boolean>(false);
   private destroy$ = new Subject<void>();
 
-  constructor(
-    private http: HttpClient,
-    private authService: AuthService,
-    private toastService: ToastService,
-  ) {}
-
   ngOnInit(): void {
     this.getUserPermissions();
     this.http.get<Key[]>('/AMW_rest/resources/deployments/deploymentParameterKeys').subscribe({
diff --git a/AMW_angular/io/src/app/settings/environments/environment-delete/environment-delete.component.html b/AMW_angular/io/src/app/settings/environments/environment-delete/environment-delete.component.html
new file mode 100644
index 000000000..55a14bccb
--- /dev/null
+++ b/AMW_angular/io/src/app/settings/environments/environment-delete/environment-delete.component.html
@@ -0,0 +1,14 @@
+<div class="container">
+  <app-modal-header [title]="'Remove ' + getContextType()" (cancel)="cancel()"></app-modal-header>
+  <div class="modal-body">
+    <div class="form-horizontal mx-2">
+      <div class="mb-3">
+        <div class="text-body">Do you really want to delete the {{ getContextType() }} {{ environment.name }}?</div>
+      </div>
+    </div>
+  </div>
+  <div class="modal-footer">
+    <app-button [variant]="'light'" (click)="cancel()">Cancel</app-button>
+    <app-button [variant]="'primary'" (click)="delete()">Delete</app-button>
+  </div>
+</div>
diff --git a/AMW_angular/io/src/app/settings/environments/environment-delete/environment-delete.component.spec.ts b/AMW_angular/io/src/app/settings/environments/environment-delete/environment-delete.component.spec.ts
new file mode 100644
index 000000000..7ea56b6ba
--- /dev/null
+++ b/AMW_angular/io/src/app/settings/environments/environment-delete/environment-delete.component.spec.ts
@@ -0,0 +1,34 @@
+import { EnvironmentDeleteComponent } from './environment-delete.component';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+describe('EnvironmentDeleteComponent', () => {
+  let component: EnvironmentDeleteComponent;
+  let fixture: ComponentFixture<EnvironmentDeleteComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [EnvironmentDeleteComponent],
+      providers: [NgbActiveModal],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(EnvironmentDeleteComponent);
+    component = fixture.componentInstance;
+
+    component.environment = {
+      id: 2,
+      name: 'Dev',
+      nameAlias: null,
+      parentName: 'Global',
+      parentId: 1,
+      selected: undefined,
+      disabled: undefined,
+    };
+
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/AMW_angular/io/src/app/settings/environments/environment-delete/environment-delete.component.ts b/AMW_angular/io/src/app/settings/environments/environment-delete/environment-delete.component.ts
new file mode 100644
index 000000000..4f8591fbe
--- /dev/null
+++ b/AMW_angular/io/src/app/settings/environments/environment-delete/environment-delete.component.ts
@@ -0,0 +1,32 @@
+import { Component, EventEmitter, inject, Input, Output } from '@angular/core';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { Environment } from '../../../deployment/environment';
+import { ModalHeaderComponent } from '../../../shared/modal-header/modal-header.component';
+import { ButtonComponent } from '../../../shared/button/button.component';
+
+@Component({
+  selector: 'app-environment-delete',
+  standalone: true,
+  templateUrl: './environment-delete.component.html',
+  imports: [ModalHeaderComponent, ButtonComponent],
+})
+export class EnvironmentDeleteComponent {
+  activeModal = inject(NgbActiveModal);
+  @Input() environment: Environment;
+  @Input() globalName: string;
+  @Output() deleteEnvironment: EventEmitter<Environment> = new EventEmitter<Environment>();
+
+  cancel() {
+    this.activeModal.close();
+  }
+
+  delete() {
+    this.deleteEnvironment.emit(this.environment);
+    this.activeModal.close();
+  }
+
+  getContextType() {
+    if (!this.environment) return;
+    return this.environment.parentName === this.globalName ? 'domain' : 'environment';
+  }
+}
diff --git a/AMW_angular/io/src/app/settings/environments/environment-edit/environment-edit.component.html b/AMW_angular/io/src/app/settings/environments/environment-edit/environment-edit.component.html
new file mode 100644
index 000000000..e24ed1b7f
--- /dev/null
+++ b/AMW_angular/io/src/app/settings/environments/environment-edit/environment-edit.component.html
@@ -0,0 +1,27 @@
+<div class="container">
+  <app-modal-header [title]="getTitle()" (cancel)="cancel()"></app-modal-header>
+  <div class="modal-body">
+    <div class="needs-validation mb-3">
+      <label for="name" class="form-label">Name</label>
+      <input type="text" class="form-control" id="name" [(ngModel)]="environment.name" required pattern=".*\S+.*">
+      <div class="invalid-feedback">
+        Please enter a name
+      </div>
+    </div>
+    @if (!isDomain()) {
+      <div class="mb-3">
+        <label for="nameAlias" class="form-label">Alias</label>
+        <input type="text" class="form-control" id="nameAlias" [(ngModel)]="environment.nameAlias"/>
+      </div>
+    }
+  </div>
+  <div class="modal-footer">
+    <app-button [variant]="'light'" (click)="cancel()">Cancel</app-button>
+    @if (permissions().canSave) {
+      <app-button [variant]="'primary'"
+                  [disabled]="!isValidForm()"
+                  (click)="save()">Save
+      </app-button>
+    }
+  </div>
+</div>
diff --git a/AMW_angular/io/src/app/settings/environments/environment-edit/environment-edit.component.spec.ts b/AMW_angular/io/src/app/settings/environments/environment-edit/environment-edit.component.spec.ts
new file mode 100644
index 000000000..ef3a2d018
--- /dev/null
+++ b/AMW_angular/io/src/app/settings/environments/environment-edit/environment-edit.component.spec.ts
@@ -0,0 +1,36 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { EnvironmentEditComponent } from './environment-edit.component';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
+import { provideHttpClientTesting } from '@angular/common/http/testing';
+
+describe('EnvironmentEditComponent', () => {
+  let component: EnvironmentEditComponent;
+  let fixture: ComponentFixture<EnvironmentEditComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [EnvironmentEditComponent],
+      providers: [NgbActiveModal, provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting()],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(EnvironmentEditComponent);
+    component = fixture.componentInstance;
+
+    component.environment = {
+      id: 2,
+      name: 'Dev',
+      nameAlias: null,
+      parentName: 'Global',
+      parentId: 1,
+      selected: undefined,
+      disabled: undefined,
+    };
+
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/AMW_angular/io/src/app/settings/environments/environment-edit/environment-edit.component.ts b/AMW_angular/io/src/app/settings/environments/environment-edit/environment-edit.component.ts
new file mode 100644
index 000000000..680af8074
--- /dev/null
+++ b/AMW_angular/io/src/app/settings/environments/environment-edit/environment-edit.component.ts
@@ -0,0 +1,61 @@
+import { ChangeDetectionStrategy, Component, computed, EventEmitter, inject, Input, Output } from '@angular/core';
+import { Environment } from '../../../deployment/environment';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { FormsModule } from '@angular/forms';
+import { ModalHeaderComponent } from '../../../shared/modal-header/modal-header.component';
+import { AuthService } from '../../../auth/auth.service';
+import { ButtonComponent } from '../../../shared/button/button.component';
+import { IconComponent } from '../../../shared/icon/icon.component';
+
+@Component({
+  selector: 'app-environment-edit',
+  standalone: true,
+  imports: [FormsModule, ModalHeaderComponent, ButtonComponent, IconComponent],
+  templateUrl: './environment-edit.component.html',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class EnvironmentEditComponent {
+  private authService = inject(AuthService);
+  activeModal = inject(NgbActiveModal);
+  @Input() environment: Environment;
+  @Input() globalName: string;
+  @Output() saveEnvironment: EventEmitter<Environment> = new EventEmitter<Environment>();
+
+  permissions = computed(() => {
+    if (this.authService.restrictions().length > 0) {
+      return { canSave: this.authService.hasPermission('SAVE_SETTINGS_ENV', 'ALL') };
+    } else {
+      return { canSave: false };
+    }
+  });
+
+  getTitle(): string {
+    if (!this.environment) return;
+    return this.environment.id
+      ? `Edit ${this.isDomain() ? 'domain' : 'environment'} ${this.environment.name}`
+      : `Add ${this.isDomain() ? 'domain' : 'environment'}`;
+  }
+
+  isDomain(): boolean {
+    if (!this.environment) return;
+    return this.environment.parentName === this.globalName;
+  }
+
+  cancel() {
+    this.activeModal.close();
+  }
+
+  save() {
+    let forms: NodeListOf<Element> = document.querySelectorAll('.needs-validation');
+    if (this.isValidForm()) {
+      this.saveEnvironment.emit(this.environment);
+      this.activeModal.close();
+    } else {
+      forms[0].classList.add('was-validated');
+    }
+  }
+
+  isValidForm() {
+    return this.environment.name.trim().length !== 0;
+  }
+}
diff --git a/AMW_angular/io/src/app/settings/environments/environments-page.component.html b/AMW_angular/io/src/app/settings/environments/environments-page.component.html
new file mode 100644
index 000000000..c66cff221
--- /dev/null
+++ b/AMW_angular/io/src/app/settings/environments/environments-page.component.html
@@ -0,0 +1,96 @@
+<div class="container">
+  <h1>Environments</h1>
+  @if (permissions().canAdd) {
+    <app-button [variant]="'primary'"
+                [additionalClasses]="'mt-3 mb-4'"
+                (click)="addDomain()">
+      <app-icon icon="plus-circle"></app-icon>
+      Add Domain
+    </app-button
+    >
+  }
+  @for (domain of environmentTree(); track domain.id) {
+    <div class="row">
+      <div class="col">
+        <h3>{{ domain.name }}</h3>
+      </div>
+      <div class="col">
+        @if (permissions().canDelete) {
+          <app-button [variant]="'danger'"
+                      [isOutlined]="true"
+                      [additionalClasses]="'float-end'"
+                      (click)="deleteContext(domain)">
+            <app-icon icon="trash"></app-icon>
+            Delete domain
+          </app-button>
+        }
+        @if (permissions().canEdit) {
+          <app-button [variant]="'primary'"
+                      [isOutlined]="true"
+                      [additionalClasses]="'float-end'"
+                      (click)="editContext(domain)">
+            <app-icon icon="pencil"></app-icon>
+            Edit domain
+          </app-button>
+        }
+      </div>
+      @if (domain.children.length > 0) {
+        <table class="table table-group-divider mb-3">
+          <thead>
+          <tr>
+            <th scope="col">Environment name</th>
+            <th scope="col">Environment alias</th>
+            <th class="text-end" scope="col">Actions</th>
+          </tr>
+          </thead>
+          @for (env of domain.children; track env.id) {
+            <tbody>
+            <tr>
+              <th>{{ env.name }}</th>
+              <td>{{ env.nameAlias ? env.nameAlias : '-' }}</td>
+              <td class="text-end mb-5">
+                @if (permissions().canEdit) {
+                  <app-button [variant]="'link'"
+                              (click)="editContext(env)">
+                    <app-icon icon="pencil"></app-icon>
+                  </app-button>
+                }
+                @if (permissions().canDelete) {
+                  <app-button [variant]="'link'"
+                              [additionalClasses]="'link-danger'"
+                              (click)="deleteContext(env)">
+                    <app-icon icon="trash"></app-icon>
+                  </app-button>
+                }
+              </td>
+            </tr>
+            </tbody>
+          }
+        </table>
+        @if (permissions().canAdd) {
+          <app-button style="padding: 0;"
+                      [variant]="'primary'"
+                      [additionalClasses]="'mb-5'"
+                      (click)="addEnvironment(domain)">
+            <app-icon icon="plus-circle"></app-icon>
+            Add Environment
+          </app-button
+          >
+        }
+      } @else {
+        <div class="table-group-divider p-0">
+          <p class="p-2 mb-3">No environments added yet.</p>
+          @if (permissions().canAdd) {
+            <app-button [variant]="'primary'"
+                        [additionalClasses]="'mb-5'"
+                        (click)="addEnvironment(domain)">
+              <app-icon icon="plus-circle"></app-icon>
+              Add Environment
+            </app-button
+            >
+          }
+        </div>
+      }
+    </div>
+  }
+</div>
diff --git a/AMW_angular/io/src/app/settings/environments/environments-page.component.spec.ts b/AMW_angular/io/src/app/settings/environments/environments-page.component.spec.ts
new file mode 100644
index 000000000..e68c6c563
--- /dev/null
+++ b/AMW_angular/io/src/app/settings/environments/environments-page.component.spec.ts
@@ -0,0 +1,24 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { EnvironmentsPageComponent } from './environments-page.component';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
+import { provideHttpClientTesting } from '@angular/common/http/testing';
+
+describe('EnvironmentsPageComponent', () => {
+  let component: EnvironmentsPageComponent;
+  let fixture: ComponentFixture<EnvironmentsPageComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [EnvironmentsPageComponent],
+      providers: [provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting()],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(EnvironmentsPageComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/AMW_angular/io/src/app/settings/environments/environments-page.component.ts b/AMW_angular/io/src/app/settings/environments/environments-page.component.ts
new file mode 100644
index 000000000..bdc6af94d
--- /dev/null
+++ b/AMW_angular/io/src/app/settings/environments/environments-page.component.ts
@@ -0,0 +1,167 @@
+import { ChangeDetectionStrategy, Component, computed, inject, Signal } from '@angular/core';
+import { IconComponent } from '../../shared/icon/icon.component';
+import { EnvironmentService } from '../../deployment/environment.service';
+import { Environment, EnvironmentTree } from '../../deployment/environment';
+import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
+import { EnvironmentEditComponent } from './environment-edit/environment-edit.component';
+import { takeUntil } from 'rxjs/operators';
+import { BehaviorSubject, Subject } from 'rxjs';
+import { ToastService } from '../../shared/elements/toast/toast.service';
+import { LoadingIndicatorComponent } from '../../shared/elements/loading-indicator.component';
+import { EnvironmentDeleteComponent } from './environment-delete/environment-delete.component';
+import { AuthService } from '../../auth/auth.service';
+import { ButtonComponent } from '../../shared/button/button.component';
+
+@Component({
+  selector: 'app-environments-page',
+  standalone: true,
+  imports: [IconComponent, LoadingIndicatorComponent, ButtonComponent],
+  templateUrl: './environments-page.component.html',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class EnvironmentsPageComponent {
+  private authService = inject(AuthService);
+  private environmentsService = inject(EnvironmentService);
+  private modalService = inject(NgbModal);
+  private toastService = inject(ToastService);
+  private error$ = new BehaviorSubject<string>('');
+  private destroy$ = new Subject<void>();
+  contexts: Signal<Environment[]> = this.environmentsService.contexts;
+  globalEnv: EnvironmentTree;
+  environmentTree: Signal<EnvironmentTree[]> = computed(() => {
+    if (!this.contexts()) return;
+    const envTree = this.buildEnvironmentTree(this.contexts());
+    this.globalEnv = envTree[0];
+    if (!(envTree.length > 0)) return;
+    return envTree[0].children;
+  });
+
+  private getUserPermissions() {
+    canAdd: this.authService.hasPermission('ADD_NEW_ENV_OR_DOM', 'ALL');
+    canDelete: this.authService.hasPermission('REMOVE_ENV_OR_DOM', 'ALL');
+    canEdit: this.authService.hasPermission('EDIT_ENV_OR_DOM_NAME', 'ALL');
+  }
+
+  permissions = computed(() => {
+    if (this.authService.restrictions().length > 0) {
+      return {
+        canAdd: this.authService.hasPermission('ADD_NEW_ENV_OR_DOM', 'ALL'),
+        canDelete: this.authService.hasPermission('REMOVE_ENV_OR_DOM', 'ALL'),
+        canEdit: this.authService.hasPermission('EDIT_ENV_OR_DOM_NAME', 'ALL'),
+      };
+    } else {
+      return {
+        canAdd: false,
+        canDelete: false,
+        canEdit: false,
+      };
+    }
+  });
+
+  private buildEnvironmentTree(environments: Environment[], parentName: string | null = null): EnvironmentTree[] {
+    return environments
+      .filter((environment) => environment.parentName === parentName)
+      .map((environment) => {
+        return {
+          id: environment.id,
+          name: environment.name,
+          nameAlias: environment.nameAlias,
+          parentName: environment.parentName,
+          parentId: environment.parentId,
+          children: this.buildEnvironmentTree(environments, environment.name),
+          selected: environment.selected,
+          disabled: environment.disabled,
+        };
+      });
+  }
+
+  addEnvironment(envParent: EnvironmentTree) {
+    const modalRef: NgbModalRef = this.modalService.open(EnvironmentEditComponent);
+    modalRef.componentInstance.globalName = this.globalEnv.name;
+    modalRef.componentInstance.environment = {
+      id: undefined,
+      name: '',
+      nameAlias: '',
+      parentName: envParent.name,
+      parentId: envParent.id,
+      selected: undefined,
+      disabled: undefined,
+    };
+    modalRef.componentInstance.saveEnvironment
+      .pipe(takeUntil(this.destroy$))
+      .subscribe((environment: Environment) => this.save(environment));
+  }
+
+  addDomain() {
+    const modalRef: NgbModalRef = this.modalService.open(EnvironmentEditComponent);
+    modalRef.componentInstance.globalName = this.globalEnv.name;
+    modalRef.componentInstance.environment = {
+      id: undefined,
+      name: '',
+      nameAlias: '',
+      parentName: this.globalEnv.name,
+      parentId: this.globalEnv.id,
+      selected: undefined,
+      disabled: undefined,
+    };
+    modalRef.componentInstance.saveEnvironment
+      .pipe(takeUntil(this.destroy$))
+      .subscribe((environment: Environment) => this.save(environment));
+  }
+
+  editContext(environmentTree: EnvironmentTree) {
+    const modalRef: NgbModalRef = this.modalService.open(EnvironmentEditComponent);
+    modalRef.componentInstance.globalName = this.globalEnv.name;
+    modalRef.componentInstance.environment = {
+      id: environmentTree.id,
+      name: environmentTree.name,
+      nameAlias: environmentTree.nameAlias,
+      parentName: environmentTree.parentName,
+      parentId: environmentTree.parentId,
+      selected: environmentTree.selected,
+      disabled: environmentTree.disabled,
+    } as Environment;
+    modalRef.componentInstance.saveEnvironment
+      .pipe(takeUntil(this.destroy$))
+      .subscribe((environment: Environment) => this.save(environment));
+  }
+
+  deleteContext(environmentTree: EnvironmentTree) {
+    const modalRef: NgbModalRef = this.modalService.open(EnvironmentDeleteComponent);
+    modalRef.componentInstance.globalName = this.globalEnv.name;
+    modalRef.componentInstance.environment = {
+      id: environmentTree.id,
+      name: environmentTree.name,
+      nameAlias: environmentTree.nameAlias,
+      parentName: environmentTree.parentName,
+      parentId: environmentTree.parentId,
+      selected: environmentTree.selected,
+      disabled: environmentTree.disabled,
+    } as Environment;
+    modalRef.componentInstance.deleteEnvironment
+      .pipe(takeUntil(this.destroy$))
+      .subscribe((environment: Environment) => this.delete(environment.id));
+  }
+
+  save(environment: Environment) {
+    this.environmentsService
+      .save(environment)
+      .pipe(takeUntil(this.destroy$))
+      .subscribe({
+        next: () => this.toastService.success('Context saved successfully.'),
+        error: (e) => this.error$.next(e),
+        complete: () => this.environmentsService.refreshData(),
+      });
+  }
+
+  delete(id: number) {
+    this.environmentsService
+      .delete(id)
+      .pipe(takeUntil(this.destroy$))
+      .subscribe({
+        next: () => this.toastService.success('Context deleted successfully.'),
+        error: (e) => this.error$.next(e),
+        complete: () => this.environmentsService.refreshData(),
+      });
+  }
+}
diff --git a/AMW_angular/io/src/app/settings/functions/appFunction.ts b/AMW_angular/io/src/app/settings/functions/appFunction.ts
new file mode 100644
index 000000000..57711ea60
--- /dev/null
+++ b/AMW_angular/io/src/app/settings/functions/appFunction.ts
@@ -0,0 +1,5 @@
+export interface AppFunction {
+  name: string;
+  id: number;
+  content: string;
+}
diff --git a/AMW_angular/io/src/app/settings/functions/function-delete.component.html b/AMW_angular/io/src/app/settings/functions/function-delete.component.html
new file mode 100644
index 000000000..26c275e85
--- /dev/null
+++ b/AMW_angular/io/src/app/settings/functions/function-delete.component.html
@@ -0,0 +1,12 @@
+<app-modal-header [title]="'Remove function'" (cancel)="cancel()"></app-modal-header>
+<div class="modal-body">
+  <div class="form-horizontal mx-2">
+    <div class="mb-3">
+      <div class="text-body">Do you really want to delete the function {{ function.name }}?</div>
+    </div>
+  </div>
+</div>
+<div class="modal-footer">
+  <app-button [variant]="'light'" (click)="cancel()">Cancel</app-button>
+  <app-button [variant]="'primary'" [dataCy]="'button-delete'" (click)="delete()">Delete</app-button>
+</div>
diff --git a/AMW_angular/io/src/app/settings/functions/function-delete.component.spec.ts b/AMW_angular/io/src/app/settings/functions/function-delete.component.spec.ts
new file mode 100644
index 000000000..1c17d0c0d
--- /dev/null
+++ b/AMW_angular/io/src/app/settings/functions/function-delete.component.spec.ts
@@ -0,0 +1,15 @@
+import { FunctionDeleteComponent } from './function-delete.component';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+
+describe('FunctionDeleteComponent', () => {
+  let component: FunctionDeleteComponent;
+  const activeModal = new NgbActiveModal();
+
+  beforeEach(async () => {
+    component = new FunctionDeleteComponent(activeModal);
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/AMW_angular/io/src/app/settings/functions/function-delete.component.ts b/AMW_angular/io/src/app/settings/functions/function-delete.component.ts
new file mode 100644
index 000000000..26f9a7441
--- /dev/null
+++ b/AMW_angular/io/src/app/settings/functions/function-delete.component.ts
@@ -0,0 +1,27 @@
+import { Component, EventEmitter, Input, Output } from '@angular/core';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { AppFunction } from './appFunction';
+import { ModalHeaderComponent } from '../../shared/modal-header/modal-header.component';
+import { ButtonComponent } from '../../shared/button/button.component';
+
+@Component({
+  selector: 'app-function-delete',
+  standalone: true,
+  templateUrl: './function-delete.component.html',
+  imports: [ModalHeaderComponent, ButtonComponent],
+})
+export class FunctionDeleteComponent {
+  @Input() function: AppFunction;
+  @Output() deleteFunction: EventEmitter<AppFunction> = new EventEmitter<AppFunction>();
+
+  constructor(public activeModal: NgbActiveModal) {}
+
+  cancel() {
+    this.activeModal.close();
+  }
+
+  delete() {
+    this.deleteFunction.emit(this.function);
+    this.activeModal.close();
+  }
+}
diff --git a/AMW_angular/io/src/app/settings/functions/function-edit.component.html b/AMW_angular/io/src/app/settings/functions/function-edit.component.html
new file mode 100644
index 000000000..a54e02c31
--- /dev/null
+++ b/AMW_angular/io/src/app/settings/functions/function-edit.component.html
@@ -0,0 +1,88 @@
+<app-modal-header [title]="getTitle()" (cancel)="cancel()"></app-modal-header>
+<div class="modal-body">
+  <div class="form-horizontal mx-2">
+    <div class="mb-3">
+      <label for="name" class="form-label align-self-center">Function name</label>
+      <input type="text" class="form-control" id="name" [(ngModel)]="function.name" />
+    </div>
+
+    <div class="mb-3">
+      <div class="d-flex justify-content-between align-content-center mb-1">
+        <div>
+          <label class="form-label">Function content</label>
+        </div>
+        <div class="d-flex">
+          @if (revisions.length > 0) {
+          <div class="d-flex me-1">
+            <label class="align-self-center me-1">Compare with history</label>
+            <div ngbDropdown>
+              <app-button
+                [additionalClasses]="'dropdown-toggle'"
+                [variant]="'secondary'"
+                ngbDropdownToggle
+                [dataCy]="'button-dropdown'"
+              >
+                {{ selectedRevisionName || 'Select Revision' }}
+              </app-button>
+
+              <ul ngbDropdownMenu>
+                @for (revision of revisions.slice().reverse(); track revision) {
+                <li ngbDropdownItem>
+                  <a
+                    class="dropdown-item"
+                    (click)="selectRevision(function.id, revision.revision, revision.displayName)"
+                    >{{ revision.displayName }}</a
+                  >
+                </li>
+                }
+              </ul>
+            </div>
+          </div>
+
+          }
+          <div class="col-1">
+            <app-button [variant]="'light'" (click)="toggleFullscreen()">
+              <app-icon [icon]="toggleFullscreenIcon"></app-icon>
+            </app-button>
+          </div>
+        </div>
+      </div>
+      @if (!revision) {
+      <div class="editor border border-primary-subtle rounded">
+        <app-code-editor
+          [theme]="'light'"
+          [placeholder]="'Enter your code...'"
+          [(ngModel)]="function.content"
+        ></app-code-editor>
+      </div>
+      } @else {
+      <div class="mx-0 row">
+        <label class="col badge bg-info">Current version</label>
+        <label class="col badge bg-secondary">Version: {{ selectedRevisionName }}</label>
+      </div>
+      <div class="editor border border-primary-subtle rounded">
+        <app-diff-editor [(ngModel)]="diffValue" revertControls="b-to-a"></app-diff-editor>
+      </div>
+      }
+    </div>
+  </div>
+</div>
+<div class="modal-footer">
+  <app-button [variant]="'light'" (click)="cancel()" [dataCy]="'button-cancel'">Cancel</app-button>
+  @if (canManage) {
+  <span
+    class="d-inline-block"
+    tabindex="0"
+    data-toggle="tooltip"
+    [title]="!function.name || !function.content ? 'Please provide function name and content' : ''"
+  >
+    <app-button
+      [variant]="'primary'"
+      [disabled]="function.name.length === 0 || function.content.length === 0"
+      [dataCy]="'button-save'"
+      (click)="save()"
+      >Save changes
+    </app-button>
+  </span>
+  }
+</div>
diff --git a/AMW_angular/io/src/app/settings/functions/function-edit.component.scss b/AMW_angular/io/src/app/settings/functions/function-edit.component.scss
new file mode 100644
index 000000000..7c4e1630e
--- /dev/null
+++ b/AMW_angular/io/src/app/settings/functions/function-edit.component.scss
@@ -0,0 +1,3 @@
+app-button.dropdown-toggle:after {
+  display: none;
+}
diff --git a/AMW_angular/io/src/app/settings/functions/function-edit.component.spec.ts b/AMW_angular/io/src/app/settings/functions/function-edit.component.spec.ts
new file mode 100644
index 000000000..c13b19104
--- /dev/null
+++ b/AMW_angular/io/src/app/settings/functions/function-edit.component.spec.ts
@@ -0,0 +1,32 @@
+import { TestBed } from '@angular/core/testing';
+import { FunctionEditComponent } from './function-edit.component';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { FunctionsService } from './functions.service';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
+
+describe('FunctionEditComponent', () => {
+  let component: FunctionEditComponent;
+  let fixture;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [FunctionEditComponent],
+      providers: [NgbActiveModal, FunctionsService, provideHttpClient(withInterceptorsFromDi())],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(FunctionEditComponent);
+    component = fixture.componentInstance;
+
+    component.function = {
+      id: null,
+      name: '',
+      content: '',
+    };
+
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/AMW_angular/io/src/app/settings/functions/function-edit.component.ts b/AMW_angular/io/src/app/settings/functions/function-edit.component.ts
new file mode 100644
index 000000000..b9ee3c407
--- /dev/null
+++ b/AMW_angular/io/src/app/settings/functions/function-edit.component.ts
@@ -0,0 +1,90 @@
+import { Component, EventEmitter, inject, Input, Output, OnInit } from '@angular/core';
+import { FormsModule } from '@angular/forms';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { CommonModule } from '@angular/common';
+import { AppFunction } from './appFunction';
+import { FunctionsService } from './functions.service';
+import { RevisionInformation } from './revisionInformation';
+import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
+import { ButtonComponent } from '../../shared/button/button.component';
+import { ModalHeaderComponent } from '../../shared/modal-header/modal-header.component';
+import { CodeEditorComponent } from '../../shared/codemirror/code-editor.component';
+import { DiffEditorComponent } from '../../shared/codemirror/diff-editor.component';
+import { IconComponent } from '../../shared/icon/icon.component';
+
+@Component({
+  selector: 'app-function-edit',
+  templateUrl: './function-edit.component.html',
+  styleUrl: './function-edit.component.scss',
+  standalone: true,
+  imports: [
+    CodeEditorComponent,
+    DiffEditorComponent,
+    FormsModule,
+    CommonModule,
+    IconComponent,
+    NgbDropdownModule,
+    ModalHeaderComponent,
+    ButtonComponent,
+  ],
+})
+export class FunctionEditComponent implements OnInit {
+  @Input() function: AppFunction;
+  @Input() canManage: boolean;
+  @Output() saveFunction: EventEmitter<AppFunction> = new EventEmitter<AppFunction>();
+
+  private functionsService = inject(FunctionsService);
+  public revisions: RevisionInformation[] = [];
+  public revision: AppFunction;
+  public selectedRevisionName: string;
+  public isFullscreen = false;
+  public toggleFullscreenIcon = 'arrows-fullscreen';
+
+  public diffValue = {
+    original: '',
+    modified: '',
+  };
+
+  constructor(public activeModal: NgbActiveModal) {}
+
+  ngOnInit(): void {
+    if (this.function && this.function.id) {
+      this.loadRevisions(this.function.id);
+    }
+  }
+
+  getTitle(): string {
+    return this.function.id ? 'Edit function' : 'Add function';
+  }
+
+  cancel() {
+    this.activeModal.close();
+    this.functionsService.refreshData();
+  }
+
+  save() {
+    if (this.revision) this.function.content = this.diffValue.original;
+    this.saveFunction.emit(this.function);
+    this.activeModal.close();
+  }
+
+  loadRevisions(functionId: number): void {
+    this.functionsService.getFunctionRevisions(functionId).subscribe((revisions) => {
+      this.revisions = revisions;
+    });
+  }
+
+  selectRevision(functionId: number, revisionId: number, displayName: string): void {
+    this.functionsService.getFunctionByIdAndRevision(functionId, revisionId).subscribe((revision) => {
+      this.revision = revision;
+      this.selectedRevisionName = displayName;
+      this.diffValue = { original: this.function.content, modified: this.revision.content };
+    });
+  }
+
+  toggleFullscreen() {
+    this.isFullscreen = !this.isFullscreen;
+    this.toggleFullscreenIcon = this.isFullscreen ? 'fullscreen-exit' : 'arrows-fullscreen';
+    this.activeModal.update({ fullscreen: this.isFullscreen });
+  }
+}
diff --git a/AMW_angular/io/src/app/settings/functions/functions.component.html b/AMW_angular/io/src/app/settings/functions/functions.component.html
new file mode 100644
index 000000000..0a08bd5c3
--- /dev/null
+++ b/AMW_angular/io/src/app/settings/functions/functions.component.html
@@ -0,0 +1,66 @@
+<div class="container">
+  <h1>Functions</h1>
+  <div class="card row mt-2 mb-3">
+    <div class="card-header">
+      <div class="row justify-content-between align-items-center">
+        <div class="col-sm"></div>
+        <div class="col-sm">
+          @if (permissions().canManage) {
+          <app-button
+            [variant]="'primary'"
+            [additionalClasses]="'float-end'"
+            [dataCy]="'button-add'"
+            (click)="addFunction()"
+            ><app-icon icon="plus-circle"></app-icon> Add function</app-button
+          >
+          }
+        </div>
+      </div>
+    </div>
+    <div class="card-body">
+      <div class="table-responsive">
+        <table class="table table-sm table-striped">
+          <thead>
+            <tr>
+              <th>Function Name</th>
+              <th class="text-center">Edit</th>
+              <th class="text-center">Delete</th>
+            </tr>
+          </thead>
+          <tbody>
+            @for (function of functions(); track function; let idx = $index) {
+            <tr>
+              <td class="align-middle">{{ function.name }}</td>
+              <td class="text-center">
+                @if (permissions().canView) {
+                <app-button
+                  [variant]="'primary'"
+                  [size]="'sm'"
+                  [dataCy]="'button-edit'"
+                  [additionalClasses]="'me-0'"
+                  (click)="editFunction(function)"
+                >
+                  <app-icon icon="pencil"></app-icon
+                ></app-button>
+                }
+              </td>
+              <td class="text-center">
+                @if (permissions().canManage) {
+                <app-button
+                  [variant]="'danger'"
+                  [size]="'sm'"
+                  [additionalClasses]="'me-0'"
+                  [dataCy]="'icon-delete'"
+                  (click)="deleteFunction(function)"
+                  ><app-icon icon="trash"></app-icon
+                ></app-button>
+                }
+              </td>
+            </tr>
+            }
+          </tbody>
+        </table>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/AMW_angular/io/src/app/settings/functions/functions.component.spec.ts b/AMW_angular/io/src/app/settings/functions/functions.component.spec.ts
new file mode 100644
index 000000000..9e04c33d2
--- /dev/null
+++ b/AMW_angular/io/src/app/settings/functions/functions.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { FunctionsComponent } from './functions.component';
+import { provideHttpClientTesting } from '@angular/common/http/testing';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
+
+describe('FunctionsComponent', () => {
+  let component: FunctionsComponent;
+  let fixture: ComponentFixture<FunctionsComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [FunctionsComponent],
+      providers: [provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting()],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(FunctionsComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/AMW_angular/io/src/app/settings/functions/functions.component.ts b/AMW_angular/io/src/app/settings/functions/functions.component.ts
new file mode 100644
index 000000000..f20536a92
--- /dev/null
+++ b/AMW_angular/io/src/app/settings/functions/functions.component.ts
@@ -0,0 +1,126 @@
+import { Component, inject, Signal, computed, OnDestroy } from '@angular/core';
+import { AsyncPipe } from '@angular/common';
+import { LoadingIndicatorComponent } from '../../shared/elements/loading-indicator.component';
+import { BehaviorSubject, Subject } from 'rxjs';
+import { IconComponent } from '../../shared/icon/icon.component';
+import { PaginationComponent } from '../../shared/pagination/pagination.component';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { AuthService } from '../../auth/auth.service';
+import { takeUntil } from 'rxjs/operators';
+import { ToastService } from '../../shared/elements/toast/toast.service';
+import { AppFunction } from './appFunction';
+import { FunctionsService } from './functions.service';
+import { FunctionEditComponent } from './function-edit.component';
+import { FunctionDeleteComponent } from './function-delete.component';
+import { ButtonComponent } from '../../shared/button/button.component';
+
+@Component({
+  selector: 'app-functions',
+  standalone: true,
+  imports: [
+    AsyncPipe,
+    IconComponent,
+    LoadingIndicatorComponent,
+    PaginationComponent,
+    FunctionEditComponent,
+    FunctionDeleteComponent,
+    ButtonComponent,
+  ],
+  templateUrl: './functions.component.html',
+})
+export class FunctionsComponent implements OnDestroy {
+  private authService = inject(AuthService);
+  private modalService = inject(NgbModal);
+  private functionsService = inject(FunctionsService);
+  private toastService = inject(ToastService);
+
+  functions: Signal<AppFunction[]> = this.functionsService.functions;
+
+  private error$ = new BehaviorSubject<string>('');
+  private destroy$ = new Subject<void>();
+
+  permissions = computed(() => {
+    if (this.authService.restrictions().length > 0) {
+      return {
+        canManage: this.authService.hasPermission('MANAGE_GLOBAL_FUNCTIONS', 'ALL'),
+        canView: this.authService.hasPermission('VIEW_GLOBAL_FUNCTIONS', 'ALL'),
+      };
+    } else {
+      return {
+        canManage: false,
+        canView: false,
+      };
+    }
+  });
+
+  ngOnDestroy(): void {
+    this.destroy$.next(undefined);
+  }
+
+  addFunction() {
+    const modalRef = this.modalService.open(FunctionEditComponent, {
+      size: 'xl',
+    });
+    modalRef.componentInstance.function = {
+      id: null,
+      name: '',
+      content: '',
+    };
+    modalRef.componentInstance.canManage = this.permissions().canManage;
+    modalRef.componentInstance.saveFunction
+      .pipe(takeUntil(this.destroy$))
+      .subscribe((functionData: AppFunction) => this.saveNew(functionData));
+  }
+
+  editFunction(functionData: AppFunction) {
+    const modalRef = this.modalService.open(FunctionEditComponent, {
+      size: 'xl',
+    });
+    modalRef.componentInstance.function = functionData;
+    modalRef.componentInstance.canManage = this.permissions().canManage;
+    modalRef.componentInstance.saveFunction
+      .pipe(takeUntil(this.destroy$))
+      .subscribe((functionData: AppFunction) => this.saveModified(functionData));
+  }
+
+  saveNew(functionData: AppFunction) {
+    this.functionsService
+      .addNewFunction(functionData)
+      .pipe(takeUntil(this.destroy$))
+      .subscribe({
+        next: (r) => this.toastService.success('Function saved successfully.'),
+        error: (e) => this.error$.next(e),
+        complete: () => this.functionsService.refreshData(),
+      });
+  }
+
+  saveModified(functionData: AppFunction) {
+    this.functionsService
+      .modifyFunction(functionData)
+      .pipe(takeUntil(this.destroy$))
+      .subscribe({
+        next: (r) => this.toastService.success('Function saved successfully.'),
+        error: (e) => this.error$.next(e),
+        complete: () => this.functionsService.refreshData(),
+      });
+  }
+
+  deleteFunction(functionData: AppFunction) {
+    const modalRef = this.modalService.open(FunctionDeleteComponent);
+    modalRef.componentInstance.function = functionData;
+    modalRef.componentInstance.deleteFunction
+      .pipe(takeUntil(this.destroy$))
+      .subscribe((functionData: AppFunction) => this.delete(functionData));
+  }
+
+  delete(functionData: AppFunction) {
+    this.functionsService
+      .deleteFunction(functionData.id)
+      .pipe(takeUntil(this.destroy$))
+      .subscribe({
+        next: (r) => this.toastService.success('Function deleted.'),
+        error: (e) => this.error$.next(e),
+        complete: () => this.functionsService.refreshData(),
+      });
+  }
+}
diff --git a/AMW_angular/io/src/app/settings/functions/functions.service.ts b/AMW_angular/io/src/app/settings/functions/functions.service.ts
new file mode 100644
index 000000000..7f5bed3d1
--- /dev/null
+++ b/AMW_angular/io/src/app/settings/functions/functions.service.ts
@@ -0,0 +1,51 @@
+import { Injectable } from '@angular/core';
+import { BaseService } from '../../base/base.service';
+import { HttpClient } from '@angular/common/http';
+import { AppFunction } from './appFunction';
+import { Observable, startWith, Subject } from 'rxjs';
+import { toSignal } from '@angular/core/rxjs-interop';
+import { shareReplay, switchMap } from 'rxjs/operators';
+import { RevisionInformation } from './revisionInformation';
+
+@Injectable({ providedIn: 'root' })
+export class FunctionsService extends BaseService {
+  private reload$ = new Subject<AppFunction[]>();
+  private function$ = this.reload$.pipe(
+    startWith(null),
+    switchMap(() => this.getAllFunctions()),
+    shareReplay(1),
+  );
+  functions = toSignal(this.function$, { initialValue: [] as AppFunction[] });
+
+  constructor(private http: HttpClient) {
+    super();
+  }
+
+  getAllFunctions(): Observable<AppFunction[]> {
+    return this.http.get<AppFunction[]>(`${this.getBaseUrl()}/settings/functions`);
+  }
+
+  addNewFunction(newFunction: AppFunction): Observable<void> {
+    return this.http.post<void>(`${this.getBaseUrl()}/settings/functions`, newFunction);
+  }
+
+  modifyFunction(newFunction: AppFunction): Observable<void> {
+    return this.http.put<void>(`${this.getBaseUrl()}/settings/functions`, newFunction);
+  }
+
+  deleteFunction(id: number): Observable<void> {
+    return this.http.delete<void>(`${this.getBaseUrl()}/settings/functions/${id}`);
+  }
+
+  getFunctionRevisions(id: number): Observable<RevisionInformation[]> {
+    return this.http.get<RevisionInformation[]>(`${this.getBaseUrl()}/settings/functions/${id}/revisions`);
+  }
+
+  getFunctionByIdAndRevision(id: number, revisionId: number): Observable<AppFunction> {
+    return this.http.get<AppFunction>(`${this.getBaseUrl()}/settings/functions/${id}/revisions/${revisionId}`);
+  }
+
+  refreshData() {
+    this.reload$.next([]);
+  }
+}
diff --git a/AMW_angular/io/src/app/settings/functions/revisionInformation.ts b/AMW_angular/io/src/app/settings/functions/revisionInformation.ts
new file mode 100644
index 000000000..e38da1375
--- /dev/null
+++ b/AMW_angular/io/src/app/settings/functions/revisionInformation.ts
@@ -0,0 +1,6 @@
+export interface RevisionInformation {
+  revision: number;
+  revisionDate: number;
+  userName: string;
+  displayName: string;
+}
diff --git a/AMW_angular/io/src/app/settings/permission/permission.component.html b/AMW_angular/io/src/app/settings/permission/permission.component.html
index 58acbd502..3e77f058b 100644
--- a/AMW_angular/io/src/app/settings/permission/permission.component.html
+++ b/AMW_angular/io/src/app/settings/permission/permission.component.html
@@ -4,6 +4,7 @@
   <h1>Roles and Permissions</h1>
   <ul ngbNav #nav="ngbNav" [(activeId)]="restrictionType" class="nav-tabs mt-2 pt-4">
     <li [ngbNavItem]="'role'">
+      <!-- TODO: convert this button-->
       <button ngbNavLink (click)="changeType('role')">Role</button>
       <ng-template ngbNavContent>
         <div class="form-group row">
@@ -27,6 +28,7 @@ <h1>Roles and Permissions</h1>
       </ng-template>
     </li>
     <li [ngbNavItem]="'user'">
+      <!-- TODO: convert this button-->
       <button ngbNavLink (click)="changeType('user')">User</button>
       <ng-template ngbNavContent>
         <div class="form-group row">
@@ -54,14 +56,13 @@ <h1>Roles and Permissions</h1>
     <div class="col">
       @if (selectedRoleName || selectedUserNames.length > 0) { @if (!restriction && !create) {
 
-      <button type="button" class="btn btn-primary offset-1" (click)="addRestriction()">
-        <app-icon icon="plus-circle"></app-icon>
-        Add permission
-      </button>
+      <app-button [variant]="'primary'" [additionalClasses]="'offset-1'" (click)="addRestriction()"
+        ><app-icon icon="plus-circle"></app-icon> Add permission
+      </app-button>
 
       } @if (restriction) {
 
-      <amw-restriction-edit
+      <app-restriction-edit
         class="bg-light"
         [restriction]="restriction"
         [groupedEnvironments]="groupedEnvironments"
@@ -72,11 +73,11 @@ <h1>Roles and Permissions</h1>
         [delegationMode]="delegationMode"
         (cancelEdit)="cancel()"
         (saveRestriction)="persistRestriction()"
-      ></amw-restriction-edit>
+      ></app-restriction-edit>
 
       } @if (create) {
 
-      <amw-restriction-add
+      <app-restriction-add
         [roleName]="selectedRoleName"
         [userNames]="selectedUserNames"
         [groupedEnvironments]="groupedEnvironments"
@@ -87,7 +88,7 @@ <h1>Roles and Permissions</h1>
         [delegationMode]="delegationMode"
         (cancelEdit)="cancel()"
         (saveRestrictions)="createRestrictions($event)"
-      ></amw-restriction-add>
+      ></app-restriction-add>
 
       } }
     </div>
@@ -97,13 +98,13 @@ <h1>Roles and Permissions</h1>
   <div class="form-group">
     <label class="col-sm-1"></label>
     <div class="col">
-      <amw-restriction-list
+      <app-restriction-list
         [restrictions]="assignedRestrictions"
         [resourceGroups]="resourceGroups"
         [delegationMode]="delegationMode"
         (deleteRestriction)="removeRestriction($event)"
         (editRestriction)="modifyRestriction($event)"
-      ></amw-restriction-list>
+      ></app-restriction-list>
     </div>
   </div>
   }
diff --git a/AMW_angular/io/src/app/settings/permission/permission.component.spec.ts b/AMW_angular/io/src/app/settings/permission/permission.component.spec.ts
index 7862370e4..af4c96224 100644
--- a/AMW_angular/io/src/app/settings/permission/permission.component.spec.ts
+++ b/AMW_angular/io/src/app/settings/permission/permission.component.spec.ts
@@ -16,6 +16,7 @@ import { Restriction } from './restriction';
 import { Tag } from './tag';
 import { EnvironmentService } from '../../deployment/environment.service';
 import { ResourceService } from '../../resource/resource.service';
+import { ResourceTypesService } from '../../resource/resource-types.service';
 import { Environment } from 'src/app/deployment/environment';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
@@ -27,6 +28,7 @@ describe('PermissionComponent without any params (default: type Role)', () => {
   let permissionService: PermissionService;
   let environmentService: EnvironmentService;
   let resourceService: ResourceService;
+  let resourceTypesService: ResourceTypesService;
 
   const mockRoute: any = { snapshot: {} };
   mockRoute.params = new Subject<any>();
@@ -50,6 +52,7 @@ describe('PermissionComponent without any params (default: type Role)', () => {
         EnvironmentService,
         PermissionService,
         ResourceService,
+        ResourceTypesService,
         { provide: ActivatedRoute, useValue: mockRoute },
         provideHttpClient(withInterceptorsFromDi()),
         provideHttpClientTesting(),
@@ -63,6 +66,7 @@ describe('PermissionComponent without any params (default: type Role)', () => {
     permissionService = TestBed.inject(PermissionService);
     environmentService = TestBed.inject(EnvironmentService);
     resourceService = TestBed.inject(ResourceService);
+    resourceTypesService = TestBed.inject(ResourceTypesService);
   });
 
   it('should have default data', () => {
@@ -75,12 +79,14 @@ describe('PermissionComponent without any params (default: type Role)', () => {
       {
         id: null,
         name: null,
-        parent: 'All',
+        parentName: 'All',
         selected: false,
       } as Environment,
     ]);
     expect(component.resourceGroups).toEqual([]);
-    expect(component.resourceTypes).toEqual([{ id: null, name: null }]);
+    expect(component.resourceTypes).toEqual([
+      { id: null, name: null, hasChildren: false, children: [], isApplication: false, isDefaultResourceType: false },
+    ]);
     expect(component.restrictionType).toEqual('role');
   });
 
@@ -91,14 +97,14 @@ describe('PermissionComponent without any params (default: type Role)', () => {
       { name: 'RESOURCE_TYPE', old: false } as Permission,
     ];
     const environments: Environment[] = [
-      { id: 1, name: 'U', parent: 'Dev' } as Environment,
-      { id: 2, name: 'V', parent: 'Dev' } as Environment,
-      { id: 3, name: 'T', parent: 'Test' } as Environment,
+      { id: 1, name: 'U', parentName: 'Dev' } as Environment,
+      { id: 2, name: 'V', parentName: 'Dev' } as Environment,
+      { id: 3, name: 'T', parentName: 'Test' } as Environment,
     ];
     spyOn(permissionService, 'getAllPermissionEnumValues').and.returnValue(of(permissions));
     spyOn(environmentService, 'getAllIncludingGroups').and.returnValue(of(environments));
     spyOn(resourceService, 'getAllResourceGroups').and.callThrough();
-    spyOn(resourceService, 'getAllResourceTypes').and.callThrough();
+    spyOn(resourceTypesService, 'getAllResourceTypes').and.callThrough();
     // when
     component.ngOnInit();
     mockRoute.params.next({ restrictionType: 'role' });
@@ -109,31 +115,31 @@ describe('PermissionComponent without any params (default: type Role)', () => {
     expect(permissionService.getAllPermissionEnumValues).toHaveBeenCalled();
     expect(environmentService.getAllIncludingGroups).toHaveBeenCalled();
     expect(resourceService.getAllResourceGroups).toHaveBeenCalled();
-    expect(resourceService.getAllResourceTypes).toHaveBeenCalled();
+    expect(resourceTypesService.getAllResourceTypes).toHaveBeenCalled();
     expect(component.permissions).toEqual(permissions);
     expect(component.restriction).toBeNull();
     expect(component.groupedEnvironments['All']).toContain({
       id: null,
       name: null,
-      parent: 'All',
+      parentName: 'All',
       selected: false,
     } as Environment);
     expect(component.groupedEnvironments['Dev']).toContain({
       id: 1,
       name: 'U',
-      parent: 'Dev',
+      parentName: 'Dev',
       selected: false,
     } as Environment);
     expect(component.groupedEnvironments['Dev']).toContain({
       id: 2,
       name: 'V',
-      parent: 'Dev',
+      parentName: 'Dev',
       selected: false,
     } as Environment);
     expect(component.groupedEnvironments['Test']).toContain({
       id: 3,
       name: 'T',
-      parent: 'Test',
+      parentName: 'Test',
       selected: false,
     } as Environment);
   });
@@ -402,6 +408,7 @@ describe('PermissionComponent with param restrictionType (type User)', () => {
   let permissionService: PermissionService;
   let environmentService: EnvironmentService;
   let resourceService: ResourceService;
+  let resourceTypesService: ResourceTypesService;
 
   const mockRoute: any = { snapshot: {} };
   mockRoute.params = new Subject<any>();
@@ -424,6 +431,7 @@ describe('PermissionComponent with param restrictionType (type User)', () => {
         EnvironmentService,
         PermissionService,
         ResourceService,
+        ResourceTypesService,
         { provide: ActivatedRoute, useValue: mockRoute },
         provideHttpClient(withInterceptorsFromDi()),
         provideHttpClientTesting(),
@@ -436,6 +444,7 @@ describe('PermissionComponent with param restrictionType (type User)', () => {
     permissionService = TestBed.inject(PermissionService);
     environmentService = TestBed.inject(EnvironmentService);
     resourceService = TestBed.inject(ResourceService);
+    resourceTypesService = TestBed.inject(ResourceTypesService);
   });
 
   it('should invoke some services on ngOnInt', () => {
@@ -445,14 +454,14 @@ describe('PermissionComponent with param restrictionType (type User)', () => {
       { name: 'RESOURCE_TYPE', old: false } as Permission,
     ];
     const environments: Environment[] = [
-      { id: 1, name: 'U', parent: 'Dev' } as Environment,
-      { id: 2, name: 'V', parent: 'Dev' } as Environment,
-      { id: 3, name: 'T', parent: 'Test' } as Environment,
+      { id: 1, name: 'U', parentName: 'Dev' } as Environment,
+      { id: 2, name: 'V', parentName: 'Dev' } as Environment,
+      { id: 3, name: 'T', parentName: 'Test' } as Environment,
     ];
     spyOn(permissionService, 'getAllPermissionEnumValues').and.returnValue(of(permissions));
     spyOn(environmentService, 'getAllIncludingGroups').and.returnValue(of(environments));
     spyOn(resourceService, 'getAllResourceGroups').and.callThrough();
-    spyOn(resourceService, 'getAllResourceTypes').and.callThrough();
+    spyOn(resourceTypesService, 'getAllResourceTypes').and.callThrough();
     spyOn(permissionService, 'getAllUserRestrictionNames').and.callThrough();
     // when
     component.ngOnInit();
@@ -463,7 +472,7 @@ describe('PermissionComponent with param restrictionType (type User)', () => {
     expect(permissionService.getAllPermissionEnumValues).toHaveBeenCalled();
     expect(environmentService.getAllIncludingGroups).toHaveBeenCalled();
     expect(resourceService.getAllResourceGroups).toHaveBeenCalled();
-    expect(resourceService.getAllResourceTypes).toHaveBeenCalled();
+    expect(resourceTypesService.getAllResourceTypes).toHaveBeenCalled();
     expect(permissionService.getAllUserRestrictionNames).toHaveBeenCalled();
     expect(component.permissions).toEqual(permissions);
     expect(component.restriction).toBeNull();
@@ -471,25 +480,25 @@ describe('PermissionComponent with param restrictionType (type User)', () => {
     expect(component.groupedEnvironments['All']).toContain({
       id: null,
       name: null,
-      parent: 'All',
+      parentName: 'All',
       selected: false,
     } as Environment);
     expect(component.groupedEnvironments['Dev']).toContain({
       id: 1,
       name: 'U',
-      parent: 'Dev',
+      parentName: 'Dev',
       selected: false,
     } as Environment);
     expect(component.groupedEnvironments['Dev']).toContain({
       id: 2,
       name: 'V',
-      parent: 'Dev',
+      parentName: 'Dev',
       selected: false,
     } as Environment);
     expect(component.groupedEnvironments['Test']).toContain({
       id: 3,
       name: 'T',
-      parent: 'Test',
+      parentName: 'Test',
       selected: false,
     } as Environment);
   });
@@ -502,6 +511,7 @@ describe('PermissionComponent with param actingUser (delegation mode)', () => {
   let permissionService: PermissionService;
   let environmentService: EnvironmentService;
   let resourceService: ResourceService;
+  let resourceTypesService: ResourceTypesService;
 
   const mockRoute: any = { snapshot: {} };
   mockRoute.params = new Subject<any>();
@@ -524,6 +534,7 @@ describe('PermissionComponent with param actingUser (delegation mode)', () => {
         EnvironmentService,
         PermissionService,
         ResourceService,
+        ResourceTypesService,
         { provide: ActivatedRoute, useValue: mockRoute },
         provideHttpClient(withInterceptorsFromDi()),
         provideHttpClientTesting(),
@@ -536,6 +547,7 @@ describe('PermissionComponent with param actingUser (delegation mode)', () => {
     permissionService = TestBed.inject(PermissionService);
     environmentService = TestBed.inject(EnvironmentService);
     resourceService = TestBed.inject(ResourceService);
+    resourceTypesService = TestBed.inject(ResourceTypesService);
   });
   it('should invoke some services on ngOnInt', () => {
     // given
@@ -557,15 +569,15 @@ describe('PermissionComponent with param actingUser (delegation mode)', () => {
       { name: 'RESOURCE_TYPE', old: false, longName: 'RESOURCE_TYPE' },
     ];
     const environments: Environment[] = [
-      { id: 1, name: 'U', parent: 'Dev' } as Environment,
-      { id: 2, name: 'V', parent: 'Dev' } as Environment,
-      { id: 3, name: 'T', parent: 'Test' } as Environment,
+      { id: 1, name: 'U', parentName: 'Dev' } as Environment,
+      { id: 2, name: 'V', parentName: 'Dev' } as Environment,
+      { id: 3, name: 'T', parentName: 'Test' } as Environment,
     ];
     spyOn(permissionService, 'getAllUserRestrictionNames').and.returnValue(of(userNames));
     spyOn(permissionService, 'getOwnUserAndRoleRestrictions').and.returnValue(of(restrictions));
     spyOn(environmentService, 'getAllIncludingGroups').and.returnValue(of(environments));
     spyOn(resourceService, 'getAllResourceGroups').and.callThrough();
-    spyOn(resourceService, 'getAllResourceTypes').and.callThrough();
+    spyOn(resourceTypesService, 'getAllResourceTypes').and.callThrough();
     // when
     component.ngOnInit();
     mockRoute.params.next({ actingUser: 'testUser' });
@@ -578,7 +590,7 @@ describe('PermissionComponent with param actingUser (delegation mode)', () => {
     expect(component.userNames).not.toContain('testUser');
     expect(environmentService.getAllIncludingGroups).toHaveBeenCalled();
     expect(resourceService.getAllResourceGroups).toHaveBeenCalled();
-    expect(resourceService.getAllResourceTypes).toHaveBeenCalled();
+    expect(resourceTypesService.getAllResourceTypes).toHaveBeenCalled();
     expect(permissionService.getOwnUserAndRoleRestrictions).toHaveBeenCalled();
     expect(component.assignableRestrictions).toEqual(restrictions);
     expect(component.assignablePermissions).toEqual(permissions);
diff --git a/AMW_angular/io/src/app/settings/permission/permission.component.ts b/AMW_angular/io/src/app/settings/permission/permission.component.ts
index 4b47b7c27..de99696a1 100644
--- a/AMW_angular/io/src/app/settings/permission/permission.component.ts
+++ b/AMW_angular/io/src/app/settings/permission/permission.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit, OnDestroy, AfterViewInit } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { PermissionService } from './permission.service';
 import { Restriction } from './restriction';
@@ -27,9 +27,11 @@ import {
   NgbNavOutlet,
 } from '@ng-bootstrap/ng-bootstrap';
 import { LoadingIndicatorComponent } from '../../shared/elements/loading-indicator.component';
+import { ButtonComponent } from '../../shared/button/button.component';
+import { ResourceTypesService } from '../../resource/resource-types.service';
 
 @Component({
-  selector: 'amw-permission',
+  selector: 'app-permission',
   templateUrl: './permission.component.html',
   standalone: true,
   imports: [
@@ -47,20 +49,23 @@ import { LoadingIndicatorComponent } from '../../shared/elements/loading-indicat
     RestrictionEditComponent,
     RestrictionAddComponent,
     RestrictionListComponent,
+    ButtonComponent,
   ],
 })
-export class PermissionComponent implements OnInit, OnDestroy, AfterViewInit {
+export class PermissionComponent implements OnInit {
   // loaded only once
   roleNames: string[] = [];
   userNames: string[] = [];
   permissions: Permission[] = [];
-  environments: Environment[] = [{ id: null, name: null, parent: 'All', selected: false } as Environment];
+  environments: Environment[] = [{ id: null, name: null, parentName: 'All', selected: false } as Environment];
   groupedEnvironments: { [key: string]: Environment[] } = {
     All: [],
     Global: [],
   };
   resourceGroups: Resource[] = [];
-  resourceTypes: ResourceType[] = [{ id: null, name: null }];
+  resourceTypes: ResourceType[] = [
+    { id: null, name: null, hasChildren: false, children: [], isApplication: false, isDefaultResourceType: false },
+  ];
 
   defaultNavItem: string = 'Roles';
   // role | user
@@ -88,6 +93,7 @@ export class PermissionComponent implements OnInit, OnDestroy, AfterViewInit {
     private permissionService: PermissionService,
     private environmentService: EnvironmentService,
     private resourceService: ResourceService,
+    private resourceTypesService: ResourceTypesService,
     private activatedRoute: ActivatedRoute,
     private location: Location,
   ) {
@@ -113,10 +119,6 @@ export class PermissionComponent implements OnInit, OnDestroy, AfterViewInit {
     this.getAllResourceTypes();
   }
 
-  ngAfterViewInit(): void {}
-
-  ngOnDestroy() {}
-
   onChangeRole() {
     this.selectedRoleName = this.selectedRoleName.trim();
     if (this.isExistingRole(this.selectedRoleName)) {
@@ -141,7 +143,7 @@ export class PermissionComponent implements OnInit, OnDestroy, AfterViewInit {
     this.clearMessages();
     if (id) {
       this.permissionService.removeRestriction(id).subscribe({
-        next: (r) => '',
+        next: () => '',
         error: (e) => (this.errorMessage = e),
         complete: () => _.remove(this.assignedRestrictions, { id }),
       });
@@ -172,7 +174,7 @@ export class PermissionComponent implements OnInit, OnDestroy, AfterViewInit {
     this.isLoading = true;
     if (this.restriction.id != null) {
       this.permissionService.updateRestriction(this.restriction).subscribe({
-        next: (r) => '',
+        next: () => '',
         error: (e) => (this.errorMessage = e),
         complete: () => {
           this.updatePermissions(this.restriction);
@@ -202,7 +204,7 @@ export class PermissionComponent implements OnInit, OnDestroy, AfterViewInit {
     this.clearMessages();
     this.isLoading = true;
     this.permissionService.createRestrictions(restrictionsCreation, this.delegationMode).subscribe({
-      next: (r) => '',
+      next: () => '',
       error: (e) => (this.errorMessage = e),
       complete: () => {
         this.create = false;
@@ -394,7 +396,7 @@ export class PermissionComponent implements OnInit, OnDestroy, AfterViewInit {
 
   private getAllResourceTypes() {
     this.isLoading = true;
-    this.resourceService.getAllResourceTypes().subscribe({
+    this.resourceTypesService.getAllResourceTypes().subscribe({
       next: (r) => (this.resourceTypes = this.resourceTypes.concat(r)),
       error: (e) => (this.errorMessage = e),
       complete: () => (this.isLoading = false),
@@ -447,10 +449,10 @@ export class PermissionComponent implements OnInit, OnDestroy, AfterViewInit {
   private extractEnvironmentGroups() {
     this.environments.forEach((environment) => {
       environment.selected = false;
-      if (!this.groupedEnvironments[environment['parent']]) {
-        this.groupedEnvironments[environment['parent']] = [];
+      if (!this.groupedEnvironments[environment['parentName']]) {
+        this.groupedEnvironments[environment['parentName']] = [];
       }
-      this.groupedEnvironments[environment['parent']].push(environment);
+      this.groupedEnvironments[environment['parentName']].push(environment);
     });
     this.isLoading = false;
   }
diff --git a/AMW_angular/io/src/app/settings/permission/permission.service.spec.ts b/AMW_angular/io/src/app/settings/permission/permission.service.spec.ts
index f664e2153..848e3b7b7 100644
--- a/AMW_angular/io/src/app/settings/permission/permission.service.spec.ts
+++ b/AMW_angular/io/src/app/settings/permission/permission.service.spec.ts
@@ -8,17 +8,15 @@ describe('PermissionService', () => {
   let service: PermissionService;
 
   let httpTestingController: HttpTestingController;
-  let httpClient: HttpClient;
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-    imports: [],
-    providers: [PermissionService, provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting()]
-});
+      imports: [],
+      providers: [PermissionService, provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting()],
+    });
     service = TestBed.inject(PermissionService);
 
     httpTestingController = TestBed.inject(HttpTestingController);
-    httpClient = TestBed.inject(HttpClient);
   });
 
   afterEach(() => {
diff --git a/AMW_angular/io/src/app/settings/permission/restriction-add.component.html b/AMW_angular/io/src/app/settings/permission/restriction-add.component.html
index b34efec14..1aad0297c 100644
--- a/AMW_angular/io/src/app/settings/permission/restriction-add.component.html
+++ b/AMW_angular/io/src/app/settings/permission/restriction-add.component.html
@@ -123,10 +123,10 @@ <h5 class="environments-title">{{ group }}:</h5>
     <div class="form-group row">
       <label class="col-sm-3 text-end fw-bold"></label>
       <div class="offset-3 col-sm-9">
-        <button type="button" class="btn btn-primary" [disabled]="!isValidForm()" (click)="persistRestriction()">
-          <app-icon icon="cloud-arrow-down"></app-icon> Save
-        </button>
-        <button type="button" class="btn btn-light" (click)="cancel()">Cancel</button>
+        <app-button [variant]="'primary'" [disabled]="!isValidForm()" (click)="persistRestriction()">
+          <app-icon icon="cloud-arrow-down"></app-icon> Save</app-button
+        >
+        <app-button [variant]="'light'" (click)="cancel()">Cancel</app-button>
       </div>
     </div>
   </div>
diff --git a/AMW_angular/io/src/app/settings/permission/restriction-add.component.spec.ts b/AMW_angular/io/src/app/settings/permission/restriction-add.component.spec.ts
index 7ccc0fda2..80db05f3b 100644
--- a/AMW_angular/io/src/app/settings/permission/restriction-add.component.spec.ts
+++ b/AMW_angular/io/src/app/settings/permission/restriction-add.component.spec.ts
@@ -218,9 +218,30 @@ describe('RestrictionAddComponent', () => {
       // given
       restrictionComponent.delegationMode = true;
       restrictionComponent.resourceTypes = [
-        { id: 1, name: 'APP' },
-        { id: 2, name: 'AS' },
-        { id: 3, name: 'FOO' },
+        {
+          id: 1,
+          name: 'APP',
+          hasChildren: false,
+          children: [],
+          isApplication: false,
+          isDefaultResourceType: false,
+        },
+        {
+          id: 2,
+          name: 'AS',
+          hasChildren: false,
+          children: [],
+          isApplication: false,
+          isDefaultResourceType: false,
+        },
+        {
+          id: 3,
+          name: 'FOO',
+          hasChildren: false,
+          children: [],
+          isApplication: false,
+          isDefaultResourceType: false,
+        },
       ];
       restrictionComponent.selectedPermissionNames = ['NEO'];
       restrictionComponent.selectedContextNames = ['T', 'S'];
@@ -262,9 +283,30 @@ describe('RestrictionAddComponent', () => {
       // given
       restrictionComponent.delegationMode = true;
       restrictionComponent.resourceTypes = [
-        { id: 1, name: 'APP' },
-        { id: 2, name: 'AS' },
-        { id: 3, name: 'FOO' },
+        {
+          id: 1,
+          name: 'APP',
+          hasChildren: false,
+          children: [],
+          isApplication: false,
+          isDefaultResourceType: false,
+        },
+        {
+          id: 2,
+          name: 'AS',
+          hasChildren: false,
+          children: [],
+          isApplication: false,
+          isDefaultResourceType: false,
+        },
+        {
+          id: 3,
+          name: 'FOO',
+          hasChildren: false,
+          children: [],
+          isApplication: false,
+          isDefaultResourceType: false,
+        },
       ];
       restrictionComponent.selectedPermissionNames = ['NEO'];
       restrictionComponent.selectedContextNames = ['T'];
@@ -306,9 +348,30 @@ describe('RestrictionAddComponent', () => {
       // given
       restrictionComponent.delegationMode = true;
       restrictionComponent.resourceTypes = [
-        { id: 1, name: 'APP' },
-        { id: 2, name: 'AS' },
-        { id: 3, name: 'FOO' },
+        {
+          id: 1,
+          name: 'APP',
+          hasChildren: false,
+          children: [],
+          isApplication: false,
+          isDefaultResourceType: false,
+        },
+        {
+          id: 2,
+          name: 'AS',
+          hasChildren: false,
+          children: [],
+          isApplication: false,
+          isDefaultResourceType: false,
+        },
+        {
+          id: 3,
+          name: 'FOO',
+          hasChildren: false,
+          children: [],
+          isApplication: false,
+          isDefaultResourceType: false,
+        },
       ];
       restrictionComponent.selectedPermissionNames = ['NEO'];
       restrictionComponent.selectedContextNames = ['T'];
@@ -488,11 +551,11 @@ describe('RestrictionAddComponent', () => {
     (restrictionComponent: RestrictionAddComponent) => {
       // given
       const emptyEnvironment: Environment[] = [
-        { id: null, name: null, nameAlias: null, parent: 'All', selected: false, disabled: false },
+        { id: null, name: null, nameAlias: null, parentName: 'All', parentId: null, selected: false, disabled: false },
       ];
       const devEnvironments: Environment[] = [
-        { id: 1, name: 'B', nameAlias: 'Test', parent: 'Dev', selected: false, disabled: false },
-        { id: 2, name: 'C', nameAlias: null, parent: 'Dev', selected: false, disabled: false },
+        { id: 1, name: 'B', nameAlias: 'Test', parentName: 'Dev', parentId: 2, selected: false, disabled: false },
+        { id: 2, name: 'C', nameAlias: null, parentName: 'Dev', parentId: 2, selected: false, disabled: false },
       ];
       restrictionComponent.groupedEnvironments = { All: emptyEnvironment, Dev: devEnvironments };
       restrictionComponent.delegationMode = true;
diff --git a/AMW_angular/io/src/app/settings/permission/restriction-add.component.ts b/AMW_angular/io/src/app/settings/permission/restriction-add.component.ts
index 2097b4984..d516257ec 100644
--- a/AMW_angular/io/src/app/settings/permission/restriction-add.component.ts
+++ b/AMW_angular/io/src/app/settings/permission/restriction-add.component.ts
@@ -10,12 +10,13 @@ import { ResourceType } from 'src/app/resource/resource-type';
 import { IconComponent } from '../../shared/icon/icon.component';
 import { FormsModule } from '@angular/forms';
 import { NgSelectModule } from '@ng-select/ng-select';
+import { ButtonComponent } from '../../shared/button/button.component';
 
 @Component({
-  selector: 'amw-restriction-add',
+  selector: 'app-restriction-add',
   templateUrl: './restriction-add.component.html',
   standalone: true,
-  imports: [NgSelectModule, FormsModule, IconComponent],
+  imports: [NgSelectModule, FormsModule, IconComponent, ButtonComponent],
 })
 export class RestrictionAddComponent implements OnChanges, AfterViewChecked {
   actions: Action[] = [
diff --git a/AMW_angular/io/src/app/settings/permission/restriction-edit.component.html b/AMW_angular/io/src/app/settings/permission/restriction-edit.component.html
index ab9ca6aa5..1a7c88e5b 100644
--- a/AMW_angular/io/src/app/settings/permission/restriction-edit.component.html
+++ b/AMW_angular/io/src/app/settings/permission/restriction-edit.component.html
@@ -140,11 +140,11 @@
       <label class="col-sm-3 fw-bold text-end"></label>
       <div class="col-sm-9">
         @if (restriction.permission) {
-        <button type="button" class="btn btn-primary" [disabled]="!isValidForm()" (click)="persistRestriction()">
-          <app-icon icon="cloud-arrow-down"></app-icon> Save
-        </button>
+        <app-button [variant]="'primary'" [disabled]="!isValidForm()" (click)="persistRestriction()">
+          <app-icon icon="cloud-arrow-down"></app-icon> Save</app-button
+        >
         }
-        <button type="button" class="btn btn-light" (click)="cancel()">Cancel</button>
+        <app-button [variant]="'light'" (click)="cancel()">Cancel</app-button>
       </div>
     </div>
 
diff --git a/AMW_angular/io/src/app/settings/permission/restriction-edit.component.spec.ts b/AMW_angular/io/src/app/settings/permission/restriction-edit.component.spec.ts
index aad371beb..56202239f 100644
--- a/AMW_angular/io/src/app/settings/permission/restriction-edit.component.spec.ts
+++ b/AMW_angular/io/src/app/settings/permission/restriction-edit.component.spec.ts
@@ -23,7 +23,8 @@ describe('RestrictionEditComponent', () => {
           id: null,
           name: null,
           nameAlias: null,
-          parent: 'All',
+          parentName: 'All',
+          parentId: null,
           selected: false,
           disabled: false,
         },
@@ -33,7 +34,8 @@ describe('RestrictionEditComponent', () => {
           id: 1,
           name: 'B',
           nameAlias: 'Test',
-          parent: 'Dev',
+          parentName: 'Dev',
+          parentId: 2,
           selected: false,
           disabled: false,
         },
@@ -41,7 +43,8 @@ describe('RestrictionEditComponent', () => {
           id: 2,
           name: 'C',
           nameAlias: null,
-          parent: 'Dev',
+          parentName: 'Dev',
+          parentId: 2,
           selected: false,
           disabled: false,
         },
@@ -107,8 +110,22 @@ describe('RestrictionEditComponent', () => {
     (restrictionComponent: RestrictionEditComponent) => {
       // given
       restrictionComponent.resourceTypes = [
-        { id: 1, name: 'APP' },
-        { id: 2, name: 'APPSERVER' },
+        {
+          id: 1,
+          name: 'APP',
+          hasChildren: false,
+          children: [],
+          isApplication: false,
+          isDefaultResourceType: false,
+        },
+        {
+          id: 2,
+          name: 'APPSERVER',
+          hasChildren: false,
+          children: [],
+          isApplication: false,
+          isDefaultResourceType: false,
+        },
       ];
       restrictionComponent.restriction = {
         resourceTypeName: 'INVALID',
@@ -123,8 +140,22 @@ describe('RestrictionEditComponent', () => {
     (restrictionComponent: RestrictionEditComponent) => {
       // given
       restrictionComponent.resourceTypes = [
-        { id: 1, name: 'APP' },
-        { id: 2, name: 'APPSERVER' },
+        {
+          id: 1,
+          name: 'APP',
+          hasChildren: false,
+          children: [],
+          isApplication: false,
+          isDefaultResourceType: false,
+        },
+        {
+          id: 2,
+          name: 'APPSERVER',
+          hasChildren: false,
+          children: [],
+          isApplication: false,
+          isDefaultResourceType: false,
+        },
       ];
       restrictionComponent.restriction = {
         resourceTypeName: 'APPSERVER',
@@ -263,14 +294,14 @@ describe('RestrictionEditComponent', () => {
     (restrictionComponent: RestrictionEditComponent) => {
       // given
       restrictionComponent.delegationMode = true;
-      const emptyEnvironment: Environment[] = [{ id: null, name: null, parent: 'All' } as Environment];
+      const emptyEnvironment: Environment[] = [{ id: null, name: null, parentName: 'All' } as Environment];
       const devEnvironments: Environment[] = [
-        { id: 1, name: 'B', parent: 'Dev' } as Environment,
-        { id: 2, name: 'C', parent: 'Dev' } as Environment,
+        { id: 1, name: 'B', parentName: 'Dev' } as Environment,
+        { id: 2, name: 'C', parentName: 'Dev' } as Environment,
       ];
       const prodEnvironments: Environment[] = [
-        { id: 12, name: 'P', parent: 'Dev' } as Environment,
-        { id: 22, name: 'S', parent: 'Dev' } as Environment,
+        { id: 12, name: 'P', parentName: 'Dev' } as Environment,
+        { id: 22, name: 'S', parentName: 'Dev' } as Environment,
       ];
       restrictionComponent.groupedEnvironments = {
         All: emptyEnvironment,
@@ -425,9 +456,30 @@ describe('RestrictionEditComponent', () => {
       // given
       restrictionComponent.delegationMode = true;
       restrictionComponent.resourceTypes = [
-        { id: 1, name: 'APP' },
-        { id: 2, name: 'AS' },
-        { id: 3, name: 'FOO' },
+        {
+          id: 1,
+          name: 'APP',
+          hasChildren: false,
+          children: [],
+          isApplication: false,
+          isDefaultResourceType: false,
+        },
+        {
+          id: 2,
+          name: 'AS',
+          hasChildren: false,
+          children: [],
+          isApplication: false,
+          isDefaultResourceType: false,
+        },
+        {
+          id: 3,
+          name: 'FOO',
+          hasChildren: false,
+          children: [],
+          isApplication: false,
+          isDefaultResourceType: false,
+        },
       ];
       restrictionComponent.restriction = {
         action: 'CREATE',
@@ -469,9 +521,30 @@ describe('RestrictionEditComponent', () => {
       // given
       restrictionComponent.delegationMode = true;
       restrictionComponent.resourceTypes = [
-        { id: 1, name: 'APP' },
-        { id: 2, name: 'AS' },
-        { id: 3, name: 'FOO' },
+        {
+          id: 1,
+          name: 'APP',
+          hasChildren: false,
+          children: [],
+          isApplication: false,
+          isDefaultResourceType: false,
+        },
+        {
+          id: 2,
+          name: 'AS',
+          hasChildren: false,
+          children: [],
+          isApplication: false,
+          isDefaultResourceType: false,
+        },
+        {
+          id: 3,
+          name: 'FOO',
+          hasChildren: false,
+          children: [],
+          isApplication: false,
+          isDefaultResourceType: false,
+        },
       ];
       restrictionComponent.restriction = {
         action: 'CREATE',
@@ -512,9 +585,30 @@ describe('RestrictionEditComponent', () => {
       // given
       restrictionComponent.delegationMode = true;
       restrictionComponent.resourceTypes = [
-        { id: 1, name: 'APP' },
-        { id: 2, name: 'AS' },
-        { id: 3, name: 'FOO' },
+        {
+          id: 1,
+          name: 'APP',
+          hasChildren: false,
+          children: [],
+          isApplication: false,
+          isDefaultResourceType: false,
+        },
+        {
+          id: 2,
+          name: 'AS',
+          hasChildren: false,
+          children: [],
+          isApplication: false,
+          isDefaultResourceType: false,
+        },
+        {
+          id: 3,
+          name: 'FOO',
+          hasChildren: false,
+          children: [],
+          isApplication: false,
+          isDefaultResourceType: false,
+        },
       ];
       restrictionComponent.restriction = {
         action: 'CREATE',
diff --git a/AMW_angular/io/src/app/settings/permission/restriction-edit.component.ts b/AMW_angular/io/src/app/settings/permission/restriction-edit.component.ts
index 37421ab90..492500a73 100644
--- a/AMW_angular/io/src/app/settings/permission/restriction-edit.component.ts
+++ b/AMW_angular/io/src/app/settings/permission/restriction-edit.component.ts
@@ -8,12 +8,13 @@ import { ResourceType } from '../../resource/resource-type';
 import { IconComponent } from '../../shared/icon/icon.component';
 import { FormsModule } from '@angular/forms';
 import { NgClass } from '@angular/common';
+import { ButtonComponent } from '../../shared/button/button.component';
 
 @Component({
-  selector: 'amw-restriction-edit',
+  selector: 'app-restriction-edit',
   templateUrl: './restriction-edit.component.html',
   standalone: true,
-  imports: [FormsModule, NgClass, IconComponent],
+  imports: [FormsModule, NgClass, IconComponent, ButtonComponent],
 })
 export class RestrictionEditComponent implements OnChanges, AfterViewChecked {
   actions: string[] = ['ALL', 'CREATE', 'DELETE', 'READ', 'UPDATE'];
@@ -171,12 +172,12 @@ export class RestrictionEditComponent implements OnChanges, AfterViewChecked {
 
   checkUnique(env: Environment) {
     if (this.delegationMode) {
-      const index: number = this.groupedEnvironments[env.parent].indexOf(env);
-      const isSelected: boolean = this.groupedEnvironments[env.parent][index].selected;
+      const index: number = this.groupedEnvironments[env.parentName].indexOf(env);
+      const isSelected: boolean = this.groupedEnvironments[env.parentName][index].selected;
       this.deSelectAllEnvironments();
-      this.groupedEnvironments[env.parent][index].selected = isSelected;
+      this.groupedEnvironments[env.parentName][index].selected = isSelected;
       if (isSelected) {
-        this.restriction.contextName = this.groupedEnvironments[env.parent][index].name;
+        this.restriction.contextName = this.groupedEnvironments[env.parentName][index].name;
       }
     }
   }
diff --git a/AMW_angular/io/src/app/settings/permission/restriction-list.component.html b/AMW_angular/io/src/app/settings/permission/restriction-list.component.html
index fcd2e41af..b2c718049 100644
--- a/AMW_angular/io/src/app/settings/permission/restriction-list.component.html
+++ b/AMW_angular/io/src/app/settings/permission/restriction-list.component.html
@@ -33,12 +33,12 @@
           <td>
             @if (!delegationMode) {
 
-            <button class="btn btn-sm btn-primary" (click)="modifyRestriction(restriction)">
-              <app-icon icon="pencil"></app-icon>
-            </button>
-            <button class="btn btn-sm btn-danger" (click)="removeRestriction(restriction.id)">
-              <app-icon icon="trash"></app-icon>
-            </button>
+            <app-button [variant]="'primary'" [size]="'sm'" (click)="modifyRestriction(restriction)"
+              ><app-icon icon="pencil"></app-icon>
+            </app-button>
+            <app-button [variant]="'danger'" [size]="'sm'" (click)="removeRestriction(restriction.id)"
+              ><app-icon icon="trash"></app-icon>
+            </app-button>
 
             }
           </td>
diff --git a/AMW_angular/io/src/app/settings/permission/restriction-list.component.ts b/AMW_angular/io/src/app/settings/permission/restriction-list.component.ts
index 8be254e2b..b397e7067 100644
--- a/AMW_angular/io/src/app/settings/permission/restriction-list.component.ts
+++ b/AMW_angular/io/src/app/settings/permission/restriction-list.component.ts
@@ -3,12 +3,13 @@ import { Restriction } from './restriction';
 import * as _ from 'lodash';
 import { Resource } from '../../resource/resource';
 import { IconComponent } from '../../shared/icon/icon.component';
+import { ButtonComponent } from '../../shared/button/button.component';
 
 @Component({
-  selector: 'amw-restriction-list',
+  selector: 'app-restriction-list',
   templateUrl: './restriction-list.component.html',
   standalone: true,
-  imports: [IconComponent],
+  imports: [IconComponent, ButtonComponent],
 })
 export class RestrictionListComponent {
   @Input() delegationMode: boolean;
diff --git a/AMW_angular/io/src/app/settings/property-types/property-tag.ts b/AMW_angular/io/src/app/settings/property-types/property-tag.ts
new file mode 100644
index 000000000..ec150c9f7
--- /dev/null
+++ b/AMW_angular/io/src/app/settings/property-types/property-tag.ts
@@ -0,0 +1,4 @@
+export interface PropertyTag {
+  name: string;
+  type: string;
+}
diff --git a/AMW_angular/io/src/app/settings/property-types/property-type-delete.component.html b/AMW_angular/io/src/app/settings/property-types/property-type-delete.component.html
new file mode 100644
index 000000000..562d15f09
--- /dev/null
+++ b/AMW_angular/io/src/app/settings/property-types/property-type-delete.component.html
@@ -0,0 +1,12 @@
+<app-modal-header [title]="getTitle()" (cancel)="cancel()"></app-modal-header>
+<div class="modal-body">
+  <div class="form-horizontal mx-2">
+    <div class="mb-3">
+      <div class="text-body">Do you really want to delete the property type {{ propertyType.name }} ?</div>
+    </div>
+  </div>
+</div>
+<div class="modal-footer">
+  <app-button [variant]="'light'" (click)="cancel()">Cancel</app-button>
+  <app-button [variant]="'primary'" [dataCy]="'button-delete'" (click)="delete()">Delete</app-button>
+</div>
diff --git a/AMW_angular/io/src/app/settings/property-types/property-type-delete.component.spec.ts b/AMW_angular/io/src/app/settings/property-types/property-type-delete.component.spec.ts
new file mode 100644
index 000000000..2ab62eabd
--- /dev/null
+++ b/AMW_angular/io/src/app/settings/property-types/property-type-delete.component.spec.ts
@@ -0,0 +1,15 @@
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { PropertyTypeDeleteComponent } from './property-type-delete.component';
+
+describe('PropertyTypeDeleteComponent', () => {
+  let component: PropertyTypeDeleteComponent;
+  const activeModal = new NgbActiveModal();
+
+  beforeEach(async () => {
+    component = new PropertyTypeDeleteComponent(activeModal);
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/AMW_angular/io/src/app/settings/property-types/property-type-delete.component.ts b/AMW_angular/io/src/app/settings/property-types/property-type-delete.component.ts
new file mode 100644
index 000000000..3c806ee39
--- /dev/null
+++ b/AMW_angular/io/src/app/settings/property-types/property-type-delete.component.ts
@@ -0,0 +1,34 @@
+import { Component, EventEmitter, Input, Output } from '@angular/core';
+import { PropertyType } from './property-type';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { FormsModule } from '@angular/forms';
+import { ModalHeaderComponent } from '../../shared/modal-header/modal-header.component';
+import { ButtonComponent } from '../../shared/button/button.component';
+
+@Component({
+  selector: 'app-property-type-delete',
+  standalone: true,
+  imports: [FormsModule, ModalHeaderComponent, ButtonComponent],
+  templateUrl: './property-type-delete.component.html',
+})
+export class PropertyTypeDeleteComponent {
+  @Input() propertyType: PropertyType;
+  @Output() deletePropertyType: EventEmitter<PropertyType> = new EventEmitter<PropertyType>();
+
+  constructor(public activeModal: NgbActiveModal) {
+    this.activeModal = activeModal;
+  }
+
+  getTitle(): string {
+    return 'Remove property type';
+  }
+
+  cancel() {
+    this.activeModal.close();
+  }
+
+  delete() {
+    this.deletePropertyType.emit(this.propertyType);
+    this.activeModal.close();
+  }
+}
diff --git a/AMW_angular/io/src/app/settings/property-types/property-type-edit.component.html b/AMW_angular/io/src/app/settings/property-types/property-type-edit.component.html
new file mode 100644
index 000000000..07b74e5c0
--- /dev/null
+++ b/AMW_angular/io/src/app/settings/property-types/property-type-edit.component.html
@@ -0,0 +1,68 @@
+<app-modal-header [title]="getTitle()" (cancel)="cancel()"></app-modal-header>
+<div class="modal-body">
+  <div class="form-horizontal mx-2">
+    <div class="mb-3">
+      <label for="name" class="form-label">Property name</label>
+      <input type="text" class="form-control" id="name" [(ngModel)]="propertyType.name" />
+    </div>
+    <div class="mb-3">
+      <div class="form-check">
+        <label for="encrypted" class="form-check-label">Encrypted</label>
+        <input type="checkbox" class="form-check-input" id="encrypted" [(ngModel)]="propertyType.encrypted" />
+      </div>
+    </div>
+    <div class="mb-3">
+      <label for="regex" class="form-label">Validation</label>
+      <input type="text" class="form-control" id="regex" [(ngModel)]="propertyType.validationRegex" />
+      @if (!isValidRegex()) {
+      <div class="text-warning">Invalid regular expression pattern.</div>
+      }
+    </div>
+    <div class="mb-3">
+      <label for="addtags" class="form-label">Add Tag</label>
+      <div class="input-group">
+        <input
+          type="text"
+          class="form-control"
+          id="addtags"
+          [(ngModel)]="newTag"
+          (keyup.enter)="addTag()"
+          placeholder="Type something and hit enter"
+        />
+        <div class="input-group-append ms-1">
+          <app-button [variant]="'light'" [disabled]="newTag === ''" (click)="addTag()">
+            <app-icon icon="plus"></app-icon
+          ></app-button>
+        </div>
+      </div>
+    </div>
+    @if (propertyType.propertyTags !== null && propertyType.propertyTags.length > 0) {
+    <div class="mb-3">
+      <label for="tags" class="form-label">Tags</label>
+      <div class="list-group-horizontal row justify-content-start" id="tags">
+        @for (item of propertyType.propertyTags; track item.name) {
+        <div class="list-group-item col-2 mx-2">
+          <span class="badge bg-light text-dark rounded-pill">
+            {{ item.name }}
+            <app-icon icon="x-circle" (click)="deleteTag(item)"></app-icon>
+          </span>
+        </div>
+        }
+      </div>
+    </div>
+    }
+  </div>
+</div>
+<div class="modal-footer">
+  <app-button [variant]="'light'" (click)="cancel()">Cancel</app-button>
+  <span
+    class="d-inline-block"
+    tabindex="0"
+    data-toggle="tooltip"
+    [title]="!isValidForm() ? 'Please provide a name and validation' : 'Save'"
+  >
+    <app-button [variant]="'primary'" [disabled]="!isValidForm()" [dataCy]="'button-save'" (click)="save()"
+      >Save changes</app-button
+    >
+  </span>
+</div>
diff --git a/AMW_angular/io/src/app/settings/property-types/property-type-edit.component.spec.ts b/AMW_angular/io/src/app/settings/property-types/property-type-edit.component.spec.ts
new file mode 100644
index 000000000..6a2bcb31d
--- /dev/null
+++ b/AMW_angular/io/src/app/settings/property-types/property-type-edit.component.spec.ts
@@ -0,0 +1,15 @@
+import { PropertyTypeEditComponent } from './property-type-edit.component';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+
+describe('ReleasesEditComponent', () => {
+  let component: PropertyTypeEditComponent;
+  const activeModal = new NgbActiveModal();
+
+  beforeEach(async () => {
+    component = new PropertyTypeEditComponent(activeModal);
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/AMW_angular/io/src/app/settings/property-types/property-type-edit.component.ts b/AMW_angular/io/src/app/settings/property-types/property-type-edit.component.ts
new file mode 100644
index 000000000..d6b08d6ce
--- /dev/null
+++ b/AMW_angular/io/src/app/settings/property-types/property-type-edit.component.ts
@@ -0,0 +1,78 @@
+import { Component, EventEmitter, Input, Output } from '@angular/core';
+import { FormsModule } from '@angular/forms';
+
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { DatePickerComponent } from '../../shared/date-picker/date-picker.component';
+import { PropertyType } from './property-type';
+import { IconComponent } from '../../shared/icon/icon.component';
+import { PropertyTag } from './property-tag';
+import { ModalHeaderComponent } from '../../shared/modal-header/modal-header.component';
+import { ButtonComponent } from '../../shared/button/button.component';
+
+@Component({
+  selector: 'app-property-type-edit',
+  templateUrl: './property-type-edit.component.html',
+  standalone: true,
+  imports: [DatePickerComponent, IconComponent, FormsModule, ModalHeaderComponent, ButtonComponent],
+})
+export class PropertyTypeEditComponent {
+  @Input() propertyType: PropertyType;
+  @Output() savePropertyType: EventEmitter<PropertyType> = new EventEmitter<PropertyType>();
+
+  title = 'property type';
+  newTag: string = '';
+
+  constructor(public activeModal: NgbActiveModal) {
+    this.activeModal = activeModal;
+  }
+
+  getTitle(): string {
+    return this.propertyType.id ? `Edit ${this.title}` : `Add ${this.title}`;
+  }
+
+  cancel() {
+    this.activeModal.close();
+  }
+
+  isValidRegex() {
+    if (this.propertyType.validationRegex === '') {
+      return true;
+    }
+    try {
+      ''.match(this.propertyType.validationRegex);
+      return true;
+    } catch (e) {
+      return false;
+    }
+  }
+
+  isValidForm() {
+    return this.propertyType.name !== '' && this.propertyType.validationRegex !== '';
+  }
+
+  save() {
+    const propertyType: PropertyType = {
+      name: this.propertyType.name,
+      id: this.propertyType.id ? this.propertyType.id : null,
+      validationRegex: this.propertyType.validationRegex,
+      encrypted: this.propertyType.encrypted,
+      propertyTags: this.propertyType.propertyTags,
+    };
+    this.savePropertyType.emit(propertyType);
+    this.activeModal.close();
+  }
+
+  deleteTag(tag: PropertyTag) {
+    this.propertyType.propertyTags = this.propertyType.propertyTags.filter((value) => {
+      return value.type !== tag.type || value.name !== tag.name;
+    });
+  }
+
+  addTag() {
+    const tag = this.newTag.trim();
+    if (tag !== '') {
+      this.propertyType.propertyTags.push({ name: tag, type: 'LOCAL' });
+    }
+    this.newTag = '';
+  }
+}
diff --git a/AMW_angular/io/src/app/settings/property-types/property-type.ts b/AMW_angular/io/src/app/settings/property-types/property-type.ts
new file mode 100644
index 000000000..323325700
--- /dev/null
+++ b/AMW_angular/io/src/app/settings/property-types/property-type.ts
@@ -0,0 +1,9 @@
+import { PropertyTag } from './property-tag';
+
+export interface PropertyType {
+  id: number;
+  name: string;
+  encrypted: boolean;
+  validationRegex: string;
+  propertyTags: PropertyTag[];
+}
diff --git a/AMW_angular/io/src/app/settings/property-types/property-types.component.html b/AMW_angular/io/src/app/settings/property-types/property-types.component.html
new file mode 100644
index 000000000..3ce7f1b22
--- /dev/null
+++ b/AMW_angular/io/src/app/settings/property-types/property-types.component.html
@@ -0,0 +1,81 @@
+<app-loading-indicator [isLoading]="isLoading"></app-loading-indicator>
+<div class="container">
+  <h1>Property Types</h1>
+  <div class="card row mt-2 mb-3">
+    <div class="card-header">
+      <div class="row justify-content-between align-items-center">
+        <div class="col-sm"></div>
+
+        <div class="col-sm">
+          @if (canAdd()) {
+          <app-button
+            [variant]="'primary'"
+            [additionalClasses]="'float-end'"
+            [dataCy]="'button-add'"
+            (click)="addModal()"
+            ><app-icon icon="plus-circle"></app-icon> Add property type</app-button
+          >
+          }
+        </div>
+      </div>
+    </div>
+    <div class="card-body">
+      <div class="table-responsive">
+        <table class="table table-sm table-striped">
+          <thead>
+            <tr>
+              <th>Property Name</th>
+              <th>Encrypted</th>
+              <th>Validation</th>
+              <th>Tags</th>
+              <th>Edit</th>
+              <th>Delete</th>
+            </tr>
+          </thead>
+          <tbody>
+            @for (property of propertyTypes(); track property.id) {
+            <tr>
+              <td class="align-middle">{{ property.name }}</td>
+              @if (canDisplay()) {
+              <td class="align-middle">{{ property.encrypted ? 'Yes' : 'No' }}</td>
+              <td class="align-middle">{{ property.validationRegex }}</td>
+              <td class="align-middle">
+                <div>
+                  @for (tag of property.propertyTags; track tag.name) {
+                  <span class="badge bg-light text-dark rounded-pill">{{ tag.name }}</span>
+                  }
+                </div>
+              </td>
+              <td class="text-center">
+                @if (canEditName()) {
+                <app-button
+                  [variant]="'primary'"
+                  [size]="'sm'"
+                  [additionalClasses]="'me-0'"
+                  [dataCy]="'edit-' + property.name"
+                  (click)="editModal(property)"
+                  ><app-icon icon="pencil"></app-icon
+                ></app-button>
+                }
+              </td>
+              <td class="text-center">
+                @if (canDelete()) {
+                <app-button
+                  [variant]="'danger'"
+                  [size]="'sm'"
+                  [additionalClasses]="'me-0'"
+                  [dataCy]="'delete-' + property.name"
+                  (click)="deleteModal(property)"
+                  ><app-icon icon="trash"></app-icon
+                ></app-button>
+                }
+              </td>
+              }
+            </tr>
+            }
+          </tbody>
+        </table>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/AMW_angular/io/src/app/settings/property-types/property-types.component.spec.ts b/AMW_angular/io/src/app/settings/property-types/property-types.component.spec.ts
new file mode 100644
index 000000000..c0a949cc2
--- /dev/null
+++ b/AMW_angular/io/src/app/settings/property-types/property-types.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { PropertyTypesComponent } from './property-types.component';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
+import { provideHttpClientTesting } from '@angular/common/http/testing';
+
+describe('PropertyTypesComponent', () => {
+  let component: PropertyTypesComponent;
+  let fixture: ComponentFixture<PropertyTypesComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [PropertyTypesComponent],
+      providers: [provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting()],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(PropertyTypesComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/AMW_angular/io/src/app/settings/property-types/property-types.component.ts b/AMW_angular/io/src/app/settings/property-types/property-types.component.ts
new file mode 100644
index 000000000..39f607638
--- /dev/null
+++ b/AMW_angular/io/src/app/settings/property-types/property-types.component.ts
@@ -0,0 +1,132 @@
+import { Component, computed, inject, OnDestroy, OnInit, Signal, signal } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { AuthService } from '../../auth/auth.service';
+import { LoadingIndicatorComponent } from '../../shared/elements/loading-indicator.component';
+import { IconComponent } from '../../shared/icon/icon.component';
+import { PropertyTypesService } from './property-types.service';
+import { PropertyType } from './property-type';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { ToastService } from '../../shared/elements/toast/toast.service';
+import { takeUntil } from 'rxjs/operators';
+import { PropertyTypeEditComponent } from './property-type-edit.component';
+import { Subject } from 'rxjs';
+import { PropertyTypeDeleteComponent } from './property-type-delete.component';
+import { ButtonComponent } from '../../shared/button/button.component';
+
+@Component({
+  selector: 'app-property-types',
+  standalone: true,
+  imports: [CommonModule, IconComponent, LoadingIndicatorComponent, ButtonComponent],
+  templateUrl: './property-types.component.html',
+})
+export class PropertyTypesComponent implements OnInit, OnDestroy {
+  private authService = inject(AuthService);
+  private propertyTypeService = inject(PropertyTypesService);
+  private modalService = inject(NgbModal);
+  private toastService = inject(ToastService);
+
+  private destroy$ = new Subject<void>();
+
+  canAdd = signal<boolean>(false);
+  canDelete = signal<boolean>(false);
+  canDisplay = signal<boolean>(false);
+  canEditName = signal<boolean>(false);
+  canEditValidation = signal<boolean>(false);
+  canSave = signal<boolean>(false);
+
+  propertyTypes: Signal<PropertyType[]>;
+  error = signal<string>('');
+  handleError = computed(() => {
+    if (this.error() != '') {
+      this.toastService.error(this.error());
+    }
+  });
+
+  private readonly PROPERTY_TYPE = 'Property type';
+  isLoading = true;
+
+  ngOnInit(): void {
+    this.getUserPermissions();
+    this.getPropertyTypes();
+    this.isLoading = false;
+  }
+
+  ngOnDestroy(): void {
+    this.destroy$.next(undefined);
+  }
+
+  private getUserPermissions() {
+    this.canAdd.set(this.authService.hasPermission('ADD_PROPTYPE', 'ALL'));
+    this.canDelete.set(this.authService.hasPermission('DELETE_PROPTYPE', 'ALL'));
+    this.canDisplay.set(this.authService.hasPermission('PROP_TYPE_NAME_VALUE', 'ALL'));
+    this.canEditName.set(this.authService.hasPermission('EDIT_PROP_TYPE_NAME', 'ALL'));
+    this.canEditValidation.set(this.authService.hasPermission('EDIT_PROP_TYPE_VALIDATION', 'ALL'));
+    this.canSave.set(this.authService.hasPermission('SAVE_SETTINGS_PROPTYPE', 'ALL'));
+  }
+
+  private getPropertyTypes() {
+    this.propertyTypes = this.propertyTypeService.propertyTypes;
+  }
+
+  addModal() {
+    const modalRef = this.modalService.open(PropertyTypeEditComponent);
+    modalRef.componentInstance.propertyType = {
+      id: 0,
+      name: '',
+      encrypted: false,
+      validationRegex: '',
+      propertyTags: [],
+    };
+    modalRef.componentInstance.savePropertyType
+      .pipe(takeUntil(this.destroy$))
+      .subscribe((propertyType: PropertyType) => this.save(propertyType));
+  }
+
+  editModal(propertyType: PropertyType) {
+    const modalRef = this.modalService.open(PropertyTypeEditComponent);
+    modalRef.componentInstance.propertyType = propertyType;
+    modalRef.componentInstance.savePropertyType
+      .pipe(takeUntil(this.destroy$))
+      .subscribe((propertyType: PropertyType) => this.save(propertyType));
+  }
+
+  deleteModal(propertyType: PropertyType) {
+    const modalRef = this.modalService.open(PropertyTypeDeleteComponent);
+    modalRef.componentInstance.propertyType = propertyType;
+    modalRef.componentInstance.deletePropertyType
+      .pipe(takeUntil(this.destroy$))
+      .subscribe((propertyType: PropertyType) => this.delete(propertyType));
+  }
+
+  save(propertyType: PropertyType) {
+    this.isLoading = true;
+    if (this.canSave() && this.canEditValidation && this.canEditName) {
+      this.propertyTypeService
+        .save(propertyType)
+        .pipe(takeUntil(this.destroy$))
+        .subscribe({
+          next: () => this.toastService.success(`${this.PROPERTY_TYPE} saved.`),
+          error: (e) => this.error.set(e),
+          complete: () => {
+            this.propertyTypeService.reload();
+          },
+        });
+    }
+    this.isLoading = false;
+  }
+
+  delete(propertyType: PropertyType) {
+    this.isLoading = true;
+    this.propertyTypeService
+      .delete(propertyType.id)
+      .pipe(takeUntil(this.destroy$))
+      .subscribe({
+        next: () => this.toastService.success(`${this.PROPERTY_TYPE} deleted.`),
+        error: (e) => this.error.set(e),
+        complete: () => {
+          this.propertyTypeService.reload();
+        },
+      });
+    this.isLoading = false;
+  }
+}
diff --git a/AMW_angular/io/src/app/settings/property-types/property-types.service.ts b/AMW_angular/io/src/app/settings/property-types/property-types.service.ts
new file mode 100644
index 000000000..914c3e9ad
--- /dev/null
+++ b/AMW_angular/io/src/app/settings/property-types/property-types.service.ts
@@ -0,0 +1,64 @@
+import { inject, Injectable } from '@angular/core';
+import { BaseService } from '../../base/base.service';
+import { HttpClient } from '@angular/common/http';
+import { Observable, startWith, Subject } from 'rxjs';
+import { PropertyType } from './property-type';
+import { catchError, shareReplay, switchMap } from 'rxjs/operators';
+import { toSignal } from '@angular/core/rxjs-interop';
+
+@Injectable({ providedIn: 'root' })
+export class PropertyTypesService extends BaseService {
+  private url = `${this.getBaseUrl()}/settings/propertyTypes`;
+  private http = inject(HttpClient);
+  private reload$ = new Subject<PropertyType[]>();
+  private propertyTypes$ = this.reload$.pipe(
+    startWith(null),
+    switchMap(() => this.fetchPropertyTypes()),
+    shareReplay(1),
+  );
+  propertyTypes = toSignal(this.propertyTypes$, { initialValue: [] as PropertyType[] });
+
+  constructor() {
+    super();
+  }
+
+  private fetchPropertyTypes(): Observable<PropertyType[]> {
+    return this.http.get<PropertyType[]>(this.url).pipe(catchError(this.handleError));
+  }
+
+  reload() {
+    this.reload$.next([]);
+  }
+
+  save(propertyType: PropertyType) {
+    if (propertyType.id) {
+      return this.update(propertyType);
+    } else {
+      return this.create(propertyType);
+    }
+  }
+
+  delete(id: number) {
+    return this.http
+      .delete<number>(`${this.url}/${id}`, {
+        headers: this.getHeaders(),
+      })
+      .pipe(catchError(this.handleError));
+  }
+
+  private create(propertyType: PropertyType) {
+    return this.http
+      .post<PropertyType>(this.url, propertyType, {
+        headers: this.getHeaders(),
+      })
+      .pipe(catchError(this.handleError));
+  }
+
+  private update(propertyType: PropertyType) {
+    return this.http
+      .put<PropertyType>(`${this.url}/${propertyType.id}`, propertyType, {
+        headers: this.getHeaders(),
+      })
+      .pipe(catchError(this.handleError));
+  }
+}
diff --git a/AMW_angular/io/src/app/settings/releases/release-delete.component.html b/AMW_angular/io/src/app/settings/releases/release-delete.component.html
index 4e655af15..98728dece 100644
--- a/AMW_angular/io/src/app/settings/releases/release-delete.component.html
+++ b/AMW_angular/io/src/app/settings/releases/release-delete.component.html
@@ -1,9 +1,4 @@
-<div class="modal-header">
-  <h5 class="modal-title" id="deleteReleaseTitle">{{ getTitle() }}</h5>
-  <button type="button" class="btn btn-light close" aria-label="Close" (click)="cancel()">
-    <span aria-hidden="true">&times;</span>
-  </button>
-</div>
+<app-modal-header [title]="getTitle()" (cancel)="cancel()"></app-modal-header>
 <div class="modal-body">
   <div class="form-horizontal mx-2">
     <div class="mb-3">
@@ -34,6 +29,6 @@ <h5 class="modal-title" id="deleteReleaseTitle">{{ getTitle() }}</h5>
   </div>
 </div>
 <div class="modal-footer">
-  <button type="button" class="btn btn-light" (click)="cancel()">Cancel</button>
-  <button type="button" class="btn btn-primary" [disabled]="hasResources" (click)="delete()">Delete</button>
+  <app-button [variant]="'light'" (click)="cancel()">Cancel</app-button>
+  <app-button [variant]="'primary'" [disabled]="hasResources" (click)="delete()">Delete</app-button>
 </div>
diff --git a/AMW_angular/io/src/app/settings/releases/release-delete.component.spec.ts b/AMW_angular/io/src/app/settings/releases/release-delete.component.spec.ts
index 2302337d1..eda8dc2fe 100644
--- a/AMW_angular/io/src/app/settings/releases/release-delete.component.spec.ts
+++ b/AMW_angular/io/src/app/settings/releases/release-delete.component.spec.ts
@@ -1,4 +1,3 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { ReleaseDeleteComponent } from './release-delete.component';
 
diff --git a/AMW_angular/io/src/app/settings/releases/release-delete.component.ts b/AMW_angular/io/src/app/settings/releases/release-delete.component.ts
index 97c4a3419..f0935a351 100644
--- a/AMW_angular/io/src/app/settings/releases/release-delete.component.ts
+++ b/AMW_angular/io/src/app/settings/releases/release-delete.component.ts
@@ -3,12 +3,14 @@ import { FormsModule } from '@angular/forms';
 import { Release } from './release';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { AsyncPipe, KeyValuePipe } from '@angular/common';
-import { ResourceEntity } from './resourceEntity';
+import { ResourceEntity } from './resource-entity';
+import { ModalHeaderComponent } from '../../shared/modal-header/modal-header.component';
+import { ButtonComponent } from '../../shared/button/button.component';
 
 @Component({
-  selector: 'amw-release-delete',
+  selector: 'app-release-delete',
   standalone: true,
-  imports: [AsyncPipe, KeyValuePipe, FormsModule],
+  imports: [AsyncPipe, KeyValuePipe, FormsModule, ModalHeaderComponent, ButtonComponent],
   templateUrl: './release-delete.component.html',
 })
 export class ReleaseDeleteComponent implements OnInit {
diff --git a/AMW_angular/io/src/app/settings/releases/release-edit.component.html b/AMW_angular/io/src/app/settings/releases/release-edit.component.html
index 3143c8c73..c0dbb8cfd 100644
--- a/AMW_angular/io/src/app/settings/releases/release-edit.component.html
+++ b/AMW_angular/io/src/app/settings/releases/release-edit.component.html
@@ -1,9 +1,4 @@
-<div class="modal-header">
-  <h5 class="modal-title" id="editReleaseTitle">{{ getTitle() }}</h5>
-  <button type="button" class="btn btn-light close" aria-label="Close" (click)="cancel()">
-    <span aria-hidden="true">&times;</span>
-  </button>
-</div>
+<app-modal-header [title]="getTitle()" (cancel)="cancel()"></app-modal-header>
 <div class="modal-body">
   <div class="form-horizontal mx-2">
     <div class="mb-3">
@@ -38,6 +33,6 @@ <h5 class="modal-title" id="editReleaseTitle">{{ getTitle() }}</h5>
   </div>
 </div>
 <div class="modal-footer">
-  <button type="button" class="btn btn-light" (click)="cancel()">Cancel</button>
-  <button type="button" class="btn btn-primary" [disabled]="hasInvalidDate()" (click)="save()">Save changes</button>
+  <app-button [variant]="'light'" (click)="cancel()">Cancel</app-button>
+  <app-button [variant]="'primary'" [disabled]="hasInvalidDate()" (click)="save()">Save changes</app-button>
 </div>
diff --git a/AMW_angular/io/src/app/settings/releases/release-edit.component.ts b/AMW_angular/io/src/app/settings/releases/release-edit.component.ts
index 9c456357b..67a4a0ffe 100644
--- a/AMW_angular/io/src/app/settings/releases/release-edit.component.ts
+++ b/AMW_angular/io/src/app/settings/releases/release-edit.component.ts
@@ -5,12 +5,14 @@ import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { DatePickerComponent } from '../../shared/date-picker/date-picker.component';
 import { DATE_FORMAT } from '../../core/amw-constants';
 import { DateModel } from '../../shared/date-picker/date.model';
+import { ModalHeaderComponent } from '../../shared/modal-header/modal-header.component';
+import { ButtonComponent } from '../../shared/button/button.component';
 
 @Component({
-  selector: 'amw-release-edit',
+  selector: 'app-release-edit',
   templateUrl: './release-edit.component.html',
   standalone: true,
-  imports: [DatePickerComponent, FormsModule],
+  imports: [DatePickerComponent, FormsModule, ModalHeaderComponent, ButtonComponent],
 })
 export class ReleaseEditComponent implements OnInit {
   @Input() release: Release;
diff --git a/AMW_angular/io/src/app/settings/releases/releases.component.html b/AMW_angular/io/src/app/settings/releases/releases.component.html
index bef3abdab..0fb1497b6 100644
--- a/AMW_angular/io/src/app/settings/releases/releases.component.html
+++ b/AMW_angular/io/src/app/settings/releases/releases.component.html
@@ -5,14 +5,11 @@ <h1>Releases</h1>
     <div class="card-header">
       <div class="row justify-content-between align-items-center">
         <div class="col-sm">
-          <b>Releases</b>
-        </div>
-        <div class="col-sm">
-          @if (canCreate) {
-          <button type="button" class="btn btn-primary float-end" (click)="addRelease()">
+          @if (canCreate()) {
+          <app-button [variant]="'primary'" [additionalClasses]="'float-end'" (click)="addRelease()">
             <app-icon icon="plus-circle"></app-icon>
-            Add release
-          </button>
+            Add release</app-button
+          >
           }
         </div>
       </div>
@@ -40,17 +37,27 @@ <h1>Releases</h1>
               <td class="align-middle">{{ item.description }}</td>
               <td class="align-middle">{{ item.installationInProductionAt | date: dateFormat }}</td>
               <td class="text-center">
-                @if (item.default != true && canEdit) {
-                <button class="btn btn-sm btn-primary me-0" (click)="editRelease(item)">
-                  <app-icon icon="pencil"></app-icon>
-                </button>
+                @if (item.default !== true && canEdit()) {
+                <app-button
+                  [variant]="'primary'"
+                  [size]="'sm'"
+                  [additionalClasses]="'me-0'"
+                  (click)="editRelease(item)"
+                >
+                  <app-icon icon="pencil"></app-icon
+                ></app-button>
                 }
               </td>
               <td class="text-center">
-                @if (item.default != true && canDelete) {
-                <button class="btn btn-sm btn-danger me-0" (click)="deleteRelease(item)">
-                  <app-icon icon="trash"></app-icon>
-                </button>
+                @if (item.default !== true && canDelete()) {
+                <app-button
+                  [variant]="'danger'"
+                  [size]="'sm'"
+                  [additionalClasses]="'me-0'"
+                  (click)="deleteRelease(item)"
+                >
+                  <app-icon icon="trash"></app-icon
+                ></app-button>
                 }
               </td>
             </tr>
@@ -62,13 +69,13 @@ <h1>Releases</h1>
     </div>
     <div class="card-footer py-1">
       <div class="row bg-light align-items-center">
-        <amw-pagination
+        <app-pagination
           [currentPage]="currentPage"
           [lastPage]="lastPage"
           (doSetMax)="setMaxResultsPerPage($event)"
           (doSetOffset)="setNewOffset($event)"
         >
-        </amw-pagination>
+        </app-pagination>
       </div>
     </div>
   </div>
diff --git a/AMW_angular/io/src/app/settings/releases/releases.component.spec.ts b/AMW_angular/io/src/app/settings/releases/releases.component.spec.ts
index ce0284079..82acead56 100644
--- a/AMW_angular/io/src/app/settings/releases/releases.component.spec.ts
+++ b/AMW_angular/io/src/app/settings/releases/releases.component.spec.ts
@@ -1,26 +1,22 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { ReleasesComponent } from './releases.component';
-import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing';
-import { HttpClient, provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
+import { provideHttpClientTesting } from '@angular/common/http/testing';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 
 describe('ReleasesComponent', () => {
   let component: ReleasesComponent;
   let fixture: ComponentFixture<ReleasesComponent>;
-  let httpTestingController: HttpTestingController;
-  let httpClient: HttpClient;
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-    imports: [ReleasesComponent],
-    providers: [provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting()]
-}).compileComponents();
+      imports: [ReleasesComponent],
+      providers: [provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting()],
+    }).compileComponents();
 
     fixture = TestBed.createComponent(ReleasesComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
-    httpTestingController = TestBed.inject(HttpTestingController);
-    httpClient = TestBed.inject(HttpClient);
   });
 
   it('should create', () => {
diff --git a/AMW_angular/io/src/app/settings/releases/releases.component.ts b/AMW_angular/io/src/app/settings/releases/releases.component.ts
index dc8769dec..87321d762 100644
--- a/AMW_angular/io/src/app/settings/releases/releases.component.ts
+++ b/AMW_angular/io/src/app/settings/releases/releases.component.ts
@@ -1,4 +1,4 @@
-import { Component, inject, OnInit, signal } from '@angular/core';
+import { Component, inject, OnDestroy, OnInit, signal } from '@angular/core';
 import { AsyncPipe, DatePipe } from '@angular/common';
 import { LoadingIndicatorComponent } from '../../shared/elements/loading-indicator.component';
 import { BehaviorSubject, combineLatest, Observable, Subject } from 'rxjs';
@@ -13,6 +13,7 @@ import { AuthService, isAllowed } from '../../auth/auth.service';
 import { map, takeUntil } from 'rxjs/operators';
 import { ReleaseDeleteComponent } from './release-delete.component';
 import { ToastService } from '../../shared/elements/toast/toast.service';
+import { ButtonComponent } from '../../shared/button/button.component';
 
 @Component({
   selector: 'app-releases',
@@ -25,10 +26,11 @@ import { ToastService } from '../../shared/elements/toast/toast.service';
     PaginationComponent,
     ReleaseEditComponent,
     ReleaseDeleteComponent,
+    ButtonComponent,
   ],
   templateUrl: './releases.component.html',
 })
-export class ReleasesComponent implements OnInit {
+export class ReleasesComponent implements OnInit, OnDestroy {
   private authService = inject(AuthService);
   private modalService = inject(NgbModal);
   private releasesService = inject(ReleasesService);
@@ -130,12 +132,9 @@ export class ReleasesComponent implements OnInit {
       .save(release)
       .pipe(takeUntil(this.destroy$))
       .subscribe({
-        next: (r) => r,
+        next: () => this.toastService.success('Release saved successfully.'),
         error: (e) => this.error$.next(e),
-        complete: () => {
-          this.toastService.success('Release saved successfully.');
-          this.getReleases();
-        },
+        complete: () => this.getReleases(),
       });
     this.isLoading = false;
   }
@@ -160,12 +159,9 @@ export class ReleasesComponent implements OnInit {
       .delete(release.id)
       .pipe(takeUntil(this.destroy$))
       .subscribe({
-        next: (r) => r,
+        next: () => this.toastService.success('Release deleted.'),
         error: (e) => this.error$.next(e),
-        complete: () => {
-          this.toastService.success('Release deleted.');
-          this.getReleases();
-        },
+        complete: () => this.getReleases(),
       });
     this.isLoading = false;
   }
diff --git a/AMW_angular/io/src/app/settings/releases/releases.service.ts b/AMW_angular/io/src/app/settings/releases/releases.service.ts
index f20ffecbd..6b5f2301d 100644
--- a/AMW_angular/io/src/app/settings/releases/releases.service.ts
+++ b/AMW_angular/io/src/app/settings/releases/releases.service.ts
@@ -4,10 +4,14 @@ import { HttpClient } from '@angular/common/http';
 import { map, catchError } from 'rxjs/operators';
 import { Release } from './release';
 import { Observable } from 'rxjs';
-import { ResourceEntity } from './resourceEntity';
+import { ResourceEntity } from './resource-entity';
+import { toSignal } from '@angular/core/rxjs-interop';
 
 @Injectable({ providedIn: 'root' })
 export class ReleasesService extends BaseService {
+  private allReleases$ = this.getAllReleases();
+  allReleases = toSignal(this.allReleases$, { initialValue: [] as Release[] });
+
   constructor(private http: HttpClient) {
     super();
   }
@@ -20,17 +24,25 @@ export class ReleasesService extends BaseService {
     return this.http.get<Release>(`${this.getBaseUrl()}/releases/default`).pipe(catchError(this.handleError));
   }
 
+  getUpcomingRelease(): Observable<Release> {
+    return this.http.get<Release>(`${this.getBaseUrl()}/releases/upcomingRelease`).pipe(catchError(this.handleError));
+  }
+
   getReleases(offset: number, limit: number): Observable<Release[]> {
     return this.http
       .get<Release[]>(`${this.getBaseUrl()}/releases?start=${offset}&limit=${limit}`)
       .pipe(catchError(this.handleError));
   }
 
+  getAllReleases(): Observable<Release[]> {
+    return this.http.get<Release[]>(`${this.getBaseUrl()}/releases`).pipe(catchError(this.handleError));
+  }
+
   getReleaseResources(id: number): Observable<Map<string, ResourceEntity[]>> {
     return this.http.get(`${this.getBaseUrl()}/releases/${id}/resources`).pipe(
       map((jsonObject) => {
-        let resourceMap = new Map<string, ResourceEntity[]>();
-        for (var value in jsonObject) {
+        const resourceMap = new Map<string, ResourceEntity[]>();
+        for (const value in jsonObject) {
           resourceMap.set(value, jsonObject[value]);
         }
         return resourceMap;
diff --git a/AMW_angular/io/src/app/settings/releases/resourceEntity.ts b/AMW_angular/io/src/app/settings/releases/resource-entity.ts
similarity index 100%
rename from AMW_angular/io/src/app/settings/releases/resourceEntity.ts
rename to AMW_angular/io/src/app/settings/releases/resource-entity.ts
diff --git a/AMW_angular/io/src/app/settings/settings.component.html b/AMW_angular/io/src/app/settings/settings.component.html
index c1010d9e4..eff95c2f2 100644
--- a/AMW_angular/io/src/app/settings/settings.component.html
+++ b/AMW_angular/io/src/app/settings/settings.component.html
@@ -1,26 +1,22 @@
 <app-page>
   <div class="page-title">Settings</div>
-  @if (canViewSettings) {
+  @if (permissions().canViewSettings) {
   <div class="page-content row">
     <div class="col-2">
       <nav class="nav nav-pills flex-column">
-        <a class="nav-link" href="/AMW_web/pages/settings.xhtml?mode=envs">Environments</a>
-        <a class="nav-link" href="/AMW_web/pages/settings.xhtml?mode=props">Property Types</a>
-        @if (canViewPermissionsTab) {
+        <a class="nav-link" routerLink="/settings/environments" routerLinkActive="active">Environments</a>
+        <a class="nav-link" routerLink="/settings/property-types" routerLinkActive="active">Property Types</a>
+        @if (permissions().canViewPermissionsTab) {
         <a class="nav-link" routerLink="/settings/tags" routerLinkActive="active">Tags</a>
         }
-        <a class="nav-link" href="/AMW_web/pages/settings.xhtml?mode=functions">Functions</a>
-        <a class="nav-link" routerLink="/settings/deployment-parameter" routerLinkActive="active">Deployment
-          Parameter</a>
-        <a class="nav-link" href="/AMW_web/pages/settings.xhtml?mode=myAmw">My favorites</a>
-        @if (canViewStpTab) {
-        <a class="nav-link" href="/AMW_web/pages/settings.xhtml?mode=STP">STP Management</a>
-        }
+        <a class="nav-link" routerLink="/settings/functions" routerLinkActive="active">Functions</a>
+        <a class="nav-link" routerLink="/settings/deployment-parameter" routerLinkActive="active"
+          >Deployment Parameter</a
+        >
         <a class="nav-link" routerLink="/settings/releases" routerLinkActive="active">Releases</a>
-        @if (canViewPermissionsTab) {
+        @if (permissions().canViewPermissionsTab) {
         <a class="nav-link" routerLink="/settings/permission" routerLinkActive="active">Roles and Permissions</a>
-        }
-        @if (canViewAppInfo) {
+        } @if (permissions().canViewAppInfo) {
         <a class="nav-link" routerLink="/settings/application-info" routerLinkActive="active">Application Info</a>
         }
       </nav>
@@ -29,5 +25,5 @@
       <router-outlet></router-outlet>
     </div>
   </div>
-}
-</app-page>
\ No newline at end of file
+  }
+</app-page>
diff --git a/AMW_angular/io/src/app/settings/settings.component.spec.ts b/AMW_angular/io/src/app/settings/settings.component.spec.ts
index 0826ca2e8..f117f30b7 100644
--- a/AMW_angular/io/src/app/settings/settings.component.spec.ts
+++ b/AMW_angular/io/src/app/settings/settings.component.spec.ts
@@ -1,27 +1,22 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { RouterTestingModule } from '@angular/router/testing';
 import { SettingsComponent } from './settings.component';
-import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing';
-import { HttpClient, provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
+import { provideHttpClientTesting } from '@angular/common/http/testing';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 
 describe('SettingsComponent', () => {
   let component: SettingsComponent;
   let fixture: ComponentFixture<SettingsComponent>;
-  let httpTestingController: HttpTestingController;
-  let httpClient: HttpClient;
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [SettingsComponent, RouterTestingModule],
-      providers: [provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting()]
+      imports: [SettingsComponent],
+      providers: [provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting()],
     }).compileComponents();
 
     fixture = TestBed.createComponent(SettingsComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
-    httpTestingController = TestBed.inject(HttpTestingController);
-    httpClient = TestBed.inject(HttpClient);
   });
 
   it('should create', () => {
diff --git a/AMW_angular/io/src/app/settings/settings.component.ts b/AMW_angular/io/src/app/settings/settings.component.ts
index 672636515..dff209ab7 100644
--- a/AMW_angular/io/src/app/settings/settings.component.ts
+++ b/AMW_angular/io/src/app/settings/settings.component.ts
@@ -1,4 +1,4 @@
-import { Component, inject, OnInit, signal } from '@angular/core';
+import { Component, computed, inject } from '@angular/core';
 import { RouterLink, RouterLinkActive, RouterOutlet } from '@angular/router';
 import { AuthService } from '../auth/auth.service';
 import { PageComponent } from '../layout/page/page.component';
@@ -10,22 +10,18 @@ import { PageComponent } from '../layout/page/page.component';
   standalone: true,
   imports: [RouterLink, RouterLinkActive, RouterOutlet, PageComponent],
 })
-export class SettingsComponent implements OnInit {
-  canViewSettings = signal<boolean>(false);
-  canViewPermissionsTab = signal<boolean>(false);
-  canViewStpTab = signal<boolean>(false);
-  canViewAppInfo = signal<boolean>(false);
-
+export class SettingsComponent {
   authService = inject(AuthService);
 
-  ngOnInit(): void {
-    this.getUserPermissions();
-  }
-
-  private getUserPermissions() {
-    this.canViewSettings.set(this.authService.hasPermission('SETTING_PANEL_LIST', 'ALL'));
-    this.canViewPermissionsTab.set(this.authService.hasPermission('ROLES_AND_PERMISSIONS_TAB', 'ALL'));
-    this.canViewStpTab.set(this.authService.hasPermission('SHAKEDOWNTEST', 'ALL'));
-    this.canViewAppInfo.set(this.authService.hasPermission('RELEASE', 'READ'));
-  }
+  permissions = computed(() => {
+    if (this.authService.restrictions().length > 0) {
+      return {
+        canViewSettings: this.authService.hasPermission('SETTING_PANEL_LIST', 'ALL'),
+        canViewPermissionsTab: this.authService.hasPermission('ROLES_AND_PERMISSIONS_TAB', 'ALL'),
+        canViewAppInfo: this.authService.hasPermission('RELEASE', 'READ'),
+      };
+    } else {
+      return { canViewSettings: false, canViewPermissionsTab: false, canViewAppInfo: false };
+    }
+  });
 }
diff --git a/AMW_angular/io/src/app/settings/settings.routes.ts b/AMW_angular/io/src/app/settings/settings.routes.ts
index 0fb6c92e5..5628bf05a 100644
--- a/AMW_angular/io/src/app/settings/settings.routes.ts
+++ b/AMW_angular/io/src/app/settings/settings.routes.ts
@@ -4,6 +4,9 @@ import { PermissionComponent } from './permission/permission.component';
 import { ApplicationInfoComponent } from './application-info/application-info.component';
 import { ReleasesComponent } from './releases/releases.component';
 import { DeploymentParameterComponent } from './deployment-parameter/deployment-parameter.component';
+import { PropertyTypesComponent } from './property-types/property-types.component';
+import { FunctionsComponent } from './functions/functions.component';
+import { EnvironmentsPageComponent } from './environments/environments-page.component';
 
 export const settingsRoutes = [
   {
@@ -11,6 +14,7 @@ export const settingsRoutes = [
     component: SettingsComponent,
     title: 'Settings',
     children: [
+      { path: '', component: EnvironmentsPageComponent },
       { path: 'releases', component: ReleasesComponent },
       { title: 'Settings - Tags', path: 'tags', component: TagsComponent },
       {
@@ -21,6 +25,9 @@ export const settingsRoutes = [
       { path: 'permission', component: PermissionComponent },
       { path: 'application-info', component: ApplicationInfoComponent },
       { path: 'deployment-parameter', component: DeploymentParameterComponent },
+      { path: 'property-types', component: PropertyTypesComponent },
+      { path: 'functions', component: FunctionsComponent },
+      { path: 'environments', component: EnvironmentsPageComponent },
     ],
   },
 ];
diff --git a/AMW_angular/io/src/app/settings/tags/tags.component.html b/AMW_angular/io/src/app/settings/tags/tags.component.html
index 42e484b1c..fe6cf973a 100644
--- a/AMW_angular/io/src/app/settings/tags/tags.component.html
+++ b/AMW_angular/io/src/app/settings/tags/tags.component.html
@@ -3,11 +3,11 @@ <h1>{{ pageTitle }}</h1>
   <div class="row mt-2 py-4">
     <div class="col-6 ms-auto">
       <div class="input-group">
-        @if (canCreate) {
+        @if (canCreate()) {
         <input id="tagName" type="text" class="form-control" [(ngModel)]="tagName" (keyup.enter)="addTag()" />
-        <button class="btn btn-primary" (click)="addTag()" [attr.data-cy]="'button-add'">
-          <app-icon icon="plus-circle"></app-icon> Add tag
-        </button>
+        <app-button [variant]="'primary'" [dataCy]="'button-add'" (click)="addTag()"
+          ><app-icon icon="plus-circle"></app-icon> Add tag</app-button
+        >
         }
       </div>
     </div>
@@ -25,10 +25,10 @@ <h1>{{ pageTitle }}</h1>
       <tr>
         <td>{{ tag.name }}</td>
         <td>
-          @if (canDelete) {
-          <button class="btn btn-sm btn-danger me-0" (click)="deleteTag(tag.id)" [attr.data-cy]="'delete-' + tag.name">
-            <app-icon icon="trash"></app-icon>
-          </button>
+          @if (canDelete()) {
+          <app-button [variant]="'danger'" [size]="'sm'" [dataCy]="'delete-' + tag.name" (click)="deleteTag(tag.id)"
+            ><app-icon icon="trash"></app-icon
+          ></app-button>
           }
         </td>
       </tr>
diff --git a/AMW_angular/io/src/app/settings/tags/tags.component.scss b/AMW_angular/io/src/app/settings/tags/tags.component.scss
index af303c15d..e7409aad0 100644
--- a/AMW_angular/io/src/app/settings/tags/tags.component.scss
+++ b/AMW_angular/io/src/app/settings/tags/tags.component.scss
@@ -1,3 +1,4 @@
-.table td, .table th {
+.table td,
+.table th {
   vertical-align: middle;
 }
diff --git a/AMW_angular/io/src/app/settings/tags/tags.component.ts b/AMW_angular/io/src/app/settings/tags/tags.component.ts
index 014e899ac..194644926 100644
--- a/AMW_angular/io/src/app/settings/tags/tags.component.ts
+++ b/AMW_angular/io/src/app/settings/tags/tags.component.ts
@@ -5,13 +5,14 @@ import { Subject } from 'rxjs';
 import { AuthService, isAllowed } from '../../auth/auth.service';
 import { ToastService } from '../../shared/elements/toast/toast.service';
 import { TagsService } from './tags.service';
+import { ButtonComponent } from '../../shared/button/button.component';
 
 @Component({
   selector: 'app-tags',
   templateUrl: './tags.component.html',
   styleUrl: './tags.component.scss',
   standalone: true,
-  imports: [FormsModule, IconComponent],
+  imports: [FormsModule, IconComponent, ButtonComponent],
 })
 export class TagsComponent implements OnInit, OnDestroy {
   private tagsService = inject(TagsService);
diff --git a/AMW_angular/io/src/app/shared/button/button.component.spec.ts b/AMW_angular/io/src/app/shared/button/button.component.spec.ts
new file mode 100644
index 000000000..a7a7f56c2
--- /dev/null
+++ b/AMW_angular/io/src/app/shared/button/button.component.spec.ts
@@ -0,0 +1,22 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ButtonComponent } from './button.component';
+
+describe('ButtonComponent', () => {
+  let component: ButtonComponent;
+  let fixture: ComponentFixture<ButtonComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [ButtonComponent],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(ButtonComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/AMW_angular/io/src/app/shared/button/button.component.ts b/AMW_angular/io/src/app/shared/button/button.component.ts
new file mode 100644
index 000000000..4929c67a5
--- /dev/null
+++ b/AMW_angular/io/src/app/shared/button/button.component.ts
@@ -0,0 +1,36 @@
+import { Component, input } from '@angular/core';
+import { NgClass } from '@angular/common';
+
+@Component({
+  selector: 'app-button',
+  template: `
+    <button
+      type="button"
+      class="btn"
+      [ngClass]="[variantClass(), sizeClass(), additionalClasses()]"
+      [disabled]="disabled()"
+      [attr.data-cy]="dataCy()"
+    >
+      <ng-content select="[data-cy-slot]"></ng-content>
+      <ng-content></ng-content>
+    </button>
+  `,
+  standalone: true,
+  imports: [NgClass],
+})
+export class ButtonComponent {
+  variant = input<'primary' | 'secondary' | 'danger' | 'light' | 'close' | 'link'>();
+  size = input<'sm' | 'lg'>();
+  additionalClasses = input<string>('');
+  disabled = input<boolean>(false);
+  isOutlined = input<boolean>(false);
+  dataCy = input<string>('');
+
+  variantClass(): string {
+    return this.variant() ? (this.isOutlined() ? `btn-outline-${this.variant()}` : `btn-${this.variant()}`) : '';
+  }
+
+  sizeClass(): string {
+    return this.size() ? `btn-${this.size()}` : '';
+  }
+}
diff --git a/AMW_angular/io/src/app/shared/codemirror/code-editor.component.ts b/AMW_angular/io/src/app/shared/codemirror/code-editor.component.ts
new file mode 100644
index 000000000..beb383022
--- /dev/null
+++ b/AMW_angular/io/src/app/shared/codemirror/code-editor.component.ts
@@ -0,0 +1,358 @@
+import {
+  ChangeDetectionStrategy,
+  Component,
+  ElementRef,
+  EventEmitter,
+  Input,
+  OnChanges,
+  OnDestroy,
+  OnInit,
+  Output,
+  SimpleChanges,
+  ViewEncapsulation,
+  booleanAttribute,
+  forwardRef,
+} from '@angular/core';
+import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
+
+import { indentWithTab } from '@codemirror/commands';
+import { LanguageDescription, indentUnit } from '@codemirror/language';
+import { Annotation, Compartment, EditorState, Extension, StateEffect } from '@codemirror/state';
+import { oneDark } from '@codemirror/theme-one-dark';
+import { EditorView, highlightWhitespace, keymap, placeholder } from '@codemirror/view';
+import { basicSetup, minimalSetup } from 'codemirror';
+
+export type Theme = 'light' | 'dark' | Extension;
+export type Setup = 'basic' | 'minimal' | null;
+
+export const External = Annotation.define<boolean>();
+
+@Component({
+  selector: 'app-code-editor',
+  standalone: true,
+  template: ``,
+  styles: `
+    .code-editor {
+      display: block;
+
+      .cm-editor {
+        height: 100%;
+      }
+    }
+  `,
+  host: {
+    class: 'app-code-editor',
+  },
+  encapsulation: ViewEncapsulation.None,
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  providers: [
+    {
+      provide: NG_VALUE_ACCESSOR,
+      useExisting: forwardRef(() => CodeEditorComponent),
+      multi: true,
+    },
+  ],
+})
+export class CodeEditorComponent implements OnChanges, OnInit, OnDestroy, ControlValueAccessor {
+  /**
+   * EditorView's [root](https://codemirror.net/docs/ref/#view.EditorView.root).
+   *
+   * Don't support change dynamically!
+   */
+  @Input() root?: Document | ShadowRoot;
+
+  /**
+   * Whether focus on the editor after init.
+   *
+   * Don't support change dynamically!
+   */
+  @Input({ transform: booleanAttribute }) autoFocus = false;
+
+  /** The editor's value. */
+  @Input() value = '';
+
+  /** Whether the editor is disabled.  */
+  @Input({ transform: booleanAttribute }) disabled = false;
+
+  /** Whether the editor is readonly. */
+  @Input({ transform: booleanAttribute }) readonly = false;
+
+  /** The editor's theme. */
+  @Input() theme: Theme = 'light';
+
+  /** The editor's placecholder. */
+  @Input() placeholder = '';
+
+  /** Whether indent with Tab key. */
+  @Input({ transform: booleanAttribute }) indentWithTab = false;
+
+  /** Should be a string consisting either entirely of the same whitespace character. */
+  @Input() indentUnit = '';
+
+  /** Whether the editor wraps lines. */
+  @Input({ transform: booleanAttribute }) lineWrapping = false;
+
+  /** Whether highlight the whitespace. */
+  @Input({ transform: booleanAttribute }) highlightWhitespace = false;
+
+  /**
+   * An array of language descriptions for known
+   * [language-data](https://github.com/codemirror/language-data/blob/main/src/language-data.ts).
+   *
+   * Don't support change dynamically!
+   */
+  @Input() languages: LanguageDescription[] = [];
+
+  /** The editor's language. You should set the `languages` prop at first. */
+  @Input() language = '';
+
+  /**
+   * The editor's built-in setup. The value can be set to
+   * [`basic`](https://codemirror.net/docs/ref/#codemirror.basicSetup),
+   * [`minimal`](https://codemirror.net/docs/ref/#codemirror.minimalSetup) or `null`.
+   */
+  @Input() setup: Setup = 'basic';
+
+  /**
+   * It will be appended to the root
+   * [extensions](https://codemirror.net/docs/ref/#state.EditorStateConfig.extensions).
+   */
+  @Input() extensions: Extension[] = [];
+
+  /** Event emitted when the editor's value changes. */
+  @Output() change = new EventEmitter<string>();
+
+  /** Event emitted when focus on the editor. */
+  @Output() focus = new EventEmitter<void>();
+
+  /** Event emitted when the editor has lost focus. */
+  @Output() blur = new EventEmitter<void>();
+
+  private _onChange: (value: string) => void = () => {};
+  private _onTouched: () => void = () => {};
+
+  constructor(private _elementRef: ElementRef<Element>) {}
+
+  /**
+   * The instance of [EditorView](https://codemirror.net/docs/ref/#view.EditorView).
+   */
+  view?: EditorView;
+
+  private _updateListener = EditorView.updateListener.of((vu) => {
+    if (vu.docChanged && !vu.transactions.some((tr) => tr.annotation(External))) {
+      const value = vu.state.doc.toString();
+      this._onChange(value);
+      this.change.emit(value);
+    }
+  });
+
+  // Extension compartments can be used to make a configuration dynamic.
+  // https://codemirror.net/docs/ref/#state.Compartment
+  private _editableConf = new Compartment();
+  private _readonlyConf = new Compartment();
+  private _themeConf = new Compartment();
+  private _placeholderConf = new Compartment();
+  private _indentWithTabConf = new Compartment();
+  private _indentUnitConf = new Compartment();
+  private _lineWrappingConf = new Compartment();
+  private _highlightWhitespaceConf = new Compartment();
+  private _languageConf = new Compartment();
+
+  private _getAllExtensions() {
+    return [
+      this._updateListener,
+
+      this._editableConf.of([]),
+      this._readonlyConf.of([]),
+      this._themeConf.of([]),
+      this._placeholderConf.of([]),
+      this._indentWithTabConf.of([]),
+      this._indentUnitConf.of([]),
+      this._lineWrappingConf.of([]),
+      this._highlightWhitespaceConf.of([]),
+      this._languageConf.of([]),
+
+      this.setup === 'basic' ? basicSetup : this.setup === 'minimal' ? minimalSetup : [],
+
+      ...this.extensions,
+    ];
+  }
+
+  ngOnChanges(changes: SimpleChanges): void {
+    if (changes['value']) {
+      this.setValue(this.value);
+    }
+    if (changes['disabled']) {
+      this.setEditable(!this.disabled);
+    }
+    if (changes['readonly']) {
+      this.setReadonly(this.readonly);
+    }
+    if (changes['theme']) {
+      this.setTheme(this.theme);
+    }
+    if (changes['placeholder']) {
+      this.setPlaceholder(this.placeholder);
+    }
+    if (changes['indentWithTab']) {
+      this.setIndentWithTab(this.indentWithTab);
+    }
+    if (changes['indentUnit']) {
+      this.setIndentUnit(this.indentUnit);
+    }
+    if (changes['lineWrapping']) {
+      this.setLineWrapping(this.lineWrapping);
+    }
+    if (changes['highlightWhitespace']) {
+      this.setHighlightWhitespace(this.highlightWhitespace);
+    }
+    if (changes['language']) {
+      this.setLanguage(this.language);
+    }
+    if (changes['setup'] || changes['extensions']) {
+      this.setExtensions(this._getAllExtensions());
+    }
+  }
+
+  ngOnInit(): void {
+    this.view = new EditorView({
+      root: this.root,
+      parent: this._elementRef.nativeElement,
+      state: EditorState.create({ doc: this.value, extensions: this._getAllExtensions() }),
+    });
+
+    if (this.autoFocus) {
+      this.view?.focus();
+    }
+
+    this.view?.contentDOM.addEventListener('focus', () => {
+      this._onTouched();
+      this.focus.emit();
+    });
+
+    this.view?.contentDOM.addEventListener('blur', () => {
+      this._onTouched();
+      this.blur.emit();
+    });
+
+    this.setEditable(!this.disabled);
+    this.setReadonly(this.readonly);
+    this.setTheme(this.theme);
+    this.setPlaceholder(this.placeholder);
+    this.setIndentWithTab(this.indentWithTab);
+    this.setIndentUnit(this.indentUnit);
+    this.setLineWrapping(this.lineWrapping);
+    this.setHighlightWhitespace(this.highlightWhitespace);
+    this.setLanguage(this.language);
+  }
+
+  ngOnDestroy(): void {
+    this.view?.destroy();
+  }
+
+  writeValue(value: string): void {
+    if (this.view) {
+      this.setValue(value);
+    }
+  }
+
+  registerOnChange(fn: (value: string) => void) {
+    this._onChange = fn;
+  }
+
+  registerOnTouched(fn: () => void) {
+    this._onTouched = fn;
+  }
+
+  setDisabledState(isDisabled: boolean) {
+    this.disabled = isDisabled;
+    this.setEditable(!isDisabled);
+  }
+
+  /** Sets editor's value. */
+  setValue(value: string) {
+    this.view?.dispatch({
+      changes: { from: 0, to: this.view.state.doc.length, insert: value },
+    });
+  }
+
+  private _dispatchEffects(effects: StateEffect<any> | readonly StateEffect<any>[]) {
+    return this.view?.dispatch({ effects });
+  }
+
+  /** Sets the root extensions of the editor. */
+  setExtensions(value: Extension[]) {
+    this._dispatchEffects(StateEffect.reconfigure.of(value));
+  }
+
+  /** Sets editor's editable state. */
+  setEditable(value: boolean) {
+    this._dispatchEffects(this._editableConf.reconfigure(EditorView.editable.of(value)));
+  }
+
+  /** Sets editor's readonly state. */
+  setReadonly(value: boolean) {
+    this._dispatchEffects(this._readonlyConf.reconfigure(EditorState.readOnly.of(value)));
+  }
+
+  /** Sets editor's theme. */
+  setTheme(value: Theme) {
+    this._dispatchEffects(this._themeConf.reconfigure(value === 'light' ? [] : value === 'dark' ? oneDark : value));
+  }
+
+  /** Sets editor's placeholder. */
+  setPlaceholder(value: string) {
+    this._dispatchEffects(this._placeholderConf.reconfigure(value ? placeholder(value) : []));
+  }
+
+  /** Sets editor' indentWithTab. */
+  setIndentWithTab(value: boolean) {
+    this._dispatchEffects(this._indentWithTabConf.reconfigure(value ? keymap.of([indentWithTab]) : []));
+  }
+
+  /** Sets editor's indentUnit. */
+  setIndentUnit(value: string) {
+    this._dispatchEffects(this._indentUnitConf.reconfigure(value ? indentUnit.of(value) : []));
+  }
+
+  /** Sets editor's lineWrapping. */
+  setLineWrapping(value: boolean) {
+    this._dispatchEffects(this._lineWrappingConf.reconfigure(value ? EditorView.lineWrapping : []));
+  }
+
+  /** Sets editor's highlightWhitespace. */
+  setHighlightWhitespace(value: boolean) {
+    this._dispatchEffects(this._highlightWhitespaceConf.reconfigure(value ? highlightWhitespace() : []));
+  }
+
+  /** Sets editor's language dynamically. */
+  setLanguage(lang: string) {
+    if (!lang) {
+      return;
+    }
+    if (this.languages.length === 0) {
+      if (this.view) {
+        console.error('No supported languages. Please set the `languages` prop at first.');
+      }
+      return;
+    }
+    const langDesc = this._findLanguage(lang);
+    langDesc?.load().then((lang) => {
+      this._dispatchEffects(this._languageConf.reconfigure([lang]));
+    });
+  }
+
+  /** Find the language's extension by its name. Case insensitive. */
+  private _findLanguage(name: string) {
+    for (const lang of this.languages) {
+      for (const alias of [lang.name, ...lang.alias]) {
+        if (name.toLowerCase() === alias.toLowerCase()) {
+          return lang;
+        }
+      }
+    }
+    console.error('Language not found:', name);
+    console.info('Supported language names:', this.languages.map((lang) => lang.name).join(', '));
+    return null;
+  }
+}
diff --git a/AMW_angular/io/src/app/shared/codemirror/diff-editor.component.ts b/AMW_angular/io/src/app/shared/codemirror/diff-editor.component.ts
new file mode 100644
index 000000000..6cde2d7d0
--- /dev/null
+++ b/AMW_angular/io/src/app/shared/codemirror/diff-editor.component.ts
@@ -0,0 +1,300 @@
+import {
+  ChangeDetectionStrategy,
+  Component,
+  ElementRef,
+  EventEmitter,
+  Input,
+  OnChanges,
+  OnDestroy,
+  OnInit,
+  Output,
+  SimpleChanges,
+  ViewEncapsulation,
+  booleanAttribute,
+  forwardRef,
+} from '@angular/core';
+import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
+
+import { DiffConfig, MergeView } from '@codemirror/merge';
+import { Annotation, Compartment, Extension } from '@codemirror/state';
+import { EditorView } from '@codemirror/view';
+import { basicSetup, minimalSetup } from 'codemirror';
+
+export type Orientation = 'a-b' | 'b-a';
+export type RevertControls = 'a-to-b' | 'b-to-a';
+export type RenderRevertControl = () => HTMLElement;
+export type Setup = 'basic' | 'minimal' | null;
+
+export const External = Annotation.define<boolean>();
+
+export interface DiffEditorModel {
+  original: string;
+  modified: string;
+}
+
+@Component({
+  selector: 'app-diff-editor',
+  standalone: true,
+  template: ``,
+  styles: `
+    .diff-editor {
+      display: block;
+
+      .cm-mergeView,
+      .cm-mergeViewEditors {
+        height: 100%;
+      }
+
+      .cm-mergeView .cm-editor,
+      .cm-mergeView .cm-scroller {
+        height: 100% !important;
+      }
+    }
+  `,
+  host: {
+    class: 'diff-editor',
+  },
+  encapsulation: ViewEncapsulation.None,
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  providers: [
+    {
+      provide: NG_VALUE_ACCESSOR,
+      useExisting: forwardRef(() => DiffEditorComponent),
+      multi: true,
+    },
+  ],
+})
+export class DiffEditorComponent implements OnChanges, OnInit, OnDestroy, ControlValueAccessor {
+  /**
+   * The editor's built-in setup. The value can be set to
+   * [`basic`](https://codemirror.net/docs/ref/#codemirror.basicSetup),
+   * [`minimal`](https://codemirror.net/docs/ref/#codemirror.minimalSetup) or `null`.
+   *
+   * Don't support change dynamically!
+   */
+  @Input() setup: Setup = 'basic';
+
+  /** The diff-editor's original value. */
+  @Input() originalValue: string = '';
+
+  /**
+   * The MergeView original config's
+   * [extensions](https://codemirror.net/docs/ref/#state.EditorStateConfig.extensions).
+   *
+   * Don't support change dynamically!
+   */
+  @Input() originalExtensions: Extension[] = [];
+
+  /** The diff-editor's modified value. */
+  @Input() modifiedValue: string = '';
+
+  /**
+   * The MergeView modified config's
+   * [extensions](https://codemirror.net/docs/ref/#state.EditorStateConfig.extensions).
+   *
+   * Don't support change dynamically!
+   */
+  @Input() modifiedExtensions: Extension[] = [];
+
+  /** Controls whether editor A or editor B is shown first. Defaults to `"a-b"`. */
+  @Input() orientation?: Orientation;
+
+  /** Controls whether revert controls are shown between changed chunks. */
+  @Input() revertControls?: RevertControls;
+
+  /** When given, this function is called to render the button to revert a chunk. */
+  @Input() renderRevertControl?: RenderRevertControl;
+
+  /**
+   * By default, the merge view will mark inserted and deleted text
+   * in changed chunks. Set this to false to turn that off.
+   */
+  @Input({ transform: booleanAttribute }) highlightChanges = true;
+
+  /** Controls whether a gutter marker is shown next to changed lines. */
+  @Input({ transform: booleanAttribute }) gutter = true;
+
+  /** Whether the diff-editor is disabled.  */
+  @Input({ transform: booleanAttribute }) disableA = false;
+  @Input({ transform: booleanAttribute }) disableB = true;
+
+  /**
+   * When given, long stretches of unchanged text are collapsed.
+   * `margin` gives the number of lines to leave visible after/before
+   * a change (default is 3), and `minSize` gives the minimum amount
+   * of collapsible lines that need to be present (defaults to 4).
+   */
+  @Input()
+  collapseUnchanged?: { margin?: number; minSize?: number };
+
+  /** Pass options to the diff algorithm. */
+  @Input() diffConfig?: DiffConfig;
+
+  /** Event emitted when the editor's original value changes. */
+  @Output() originalValueChange = new EventEmitter<string>();
+
+  /** Event emitted when focus on the original editor. */
+  @Output() originalFocus = new EventEmitter<void>();
+
+  /** Event emitted when blur on the original editor. */
+  @Output() originalBlur = new EventEmitter<void>();
+
+  /** Event emitted when the editor's modified value changes. */
+  @Output() modifiedValueChange = new EventEmitter<string>();
+
+  /** Event emitted when focus on the modified editor. */
+  @Output() modifiedFocus = new EventEmitter<void>();
+
+  /** Event emitted when blur on the modified editor. */
+  @Output() modifiedBlur = new EventEmitter<void>();
+
+  private _onChange: (value: DiffEditorModel) => void = () => {};
+  private _onTouched: () => void = () => {};
+
+  constructor(private _elementRef: ElementRef<Element>) {}
+
+  /** The merge view instance. */
+  mergeView?: MergeView;
+
+  private _updateListener = (editor: 'a' | 'b') => {
+    return EditorView.updateListener.of((vu) => {
+      if (vu.docChanged && !vu.transactions.some((tr) => tr.annotation(External))) {
+        const value = vu.state.doc.toString();
+        if (editor == 'a') {
+          this._onChange({ original: value, modified: this.modifiedValue });
+          this.originalValue = value;
+          this.originalValueChange.emit(value);
+        } else if (editor == 'b') {
+          this._onChange({ original: this.originalValue, modified: value });
+          this.modifiedValue = value;
+          this.modifiedValueChange.emit(value);
+        }
+      }
+    });
+  };
+
+  private _editableConf = new Compartment();
+
+  ngOnChanges(changes: SimpleChanges): void {
+    if (changes['originalValue']) {
+      this.setValue('a', this.originalValue);
+    }
+    if (changes['modifiedValue']) {
+      this.setValue('b', this.modifiedValue);
+    }
+    if (changes['orientation']) {
+      this.mergeView?.reconfigure({ orientation: this.orientation });
+    }
+    if (changes['revertControls']) {
+      this.mergeView?.reconfigure({ revertControls: this.revertControls });
+    }
+    if (changes['renderRevertControl']) {
+      this.mergeView?.reconfigure({ renderRevertControl: this.renderRevertControl });
+    }
+    if (changes['highlightChanges']) {
+      this.mergeView?.reconfigure({ highlightChanges: this.highlightChanges });
+    }
+    if (changes['gutter']) {
+      this.mergeView?.reconfigure({ gutter: this.gutter });
+    }
+    if (changes['collapseUnchanged']) {
+      this.mergeView?.reconfigure({ collapseUnchanged: this.collapseUnchanged });
+    }
+    if (changes['diffConfig']) {
+      this.mergeView?.reconfigure({ diffConfig: this.diffConfig });
+    }
+    if (changes['disabled']) {
+      this.setEditable('a', !this.disableA);
+      this.setEditable('b', !this.disableB);
+    }
+  }
+
+  ngOnInit(): void {
+    this.mergeView = new MergeView({
+      parent: this._elementRef.nativeElement,
+      a: {
+        doc: this.originalValue,
+        extensions: [
+          this._updateListener('a'),
+          this._editableConf.of([]),
+          this.setup === 'basic' ? basicSetup : this.setup === 'minimal' ? minimalSetup : [],
+          ...this.originalExtensions,
+        ],
+      },
+      b: {
+        doc: this.modifiedValue,
+        extensions: [
+          this._updateListener('b'),
+          this._editableConf.of([]),
+          this.setup === 'basic' ? basicSetup : this.setup === 'minimal' ? minimalSetup : [],
+          ...this.modifiedExtensions,
+        ],
+      },
+      orientation: this.orientation,
+      revertControls: this.revertControls,
+      renderRevertControl: this.renderRevertControl,
+      highlightChanges: this.highlightChanges,
+      gutter: this.gutter,
+      collapseUnchanged: this.collapseUnchanged,
+      diffConfig: this.diffConfig,
+    });
+
+    this.mergeView?.a.contentDOM.addEventListener('focus', () => {
+      this._onTouched();
+      this.originalFocus.emit();
+    });
+
+    this.mergeView?.a.contentDOM.addEventListener('blur', () => {
+      this._onTouched();
+      this.originalBlur.emit();
+    });
+
+    this.mergeView?.b.contentDOM.addEventListener('focus', () => {
+      this._onTouched();
+      this.modifiedFocus.emit();
+    });
+
+    this.mergeView?.b.contentDOM.addEventListener('blur', () => {
+      this._onTouched();
+      this.modifiedBlur.emit();
+    });
+
+    this.setEditable('a', !this.disableA);
+    this.setEditable('b', !this.disableB);
+  }
+
+  ngOnDestroy(): void {
+    this.mergeView?.destroy();
+  }
+
+  writeValue(value: DiffEditorModel): void {
+    if (this.mergeView && value != null && typeof value === 'object') {
+      this.originalValue = value.original;
+      this.modifiedValue = value.modified;
+      this.setValue('a', value.original);
+      this.setValue('b', value.modified);
+    }
+  }
+
+  registerOnChange(fn: (value: DiffEditorModel) => void) {
+    this._onChange = fn;
+  }
+
+  registerOnTouched(fn: () => void) {
+    this._onTouched = fn;
+  }
+
+  /** Sets diff-editor's value. */
+  setValue(editor: 'a' | 'b', value: string) {
+    this.mergeView?.[editor].dispatch({
+      changes: { from: 0, to: this.mergeView[editor].state.doc.length, insert: value },
+    });
+  }
+
+  /** Sets diff-editor's editable state. */
+  setEditable(editor: 'a' | 'b', value: boolean) {
+    this.mergeView?.[editor].dispatch({
+      effects: this._editableConf.reconfigure(EditorView.editable.of(value)),
+    });
+  }
+}
diff --git a/AMW_angular/io/src/app/shared/configuration.ts b/AMW_angular/io/src/app/shared/configuration.ts
new file mode 100644
index 000000000..b49287caf
--- /dev/null
+++ b/AMW_angular/io/src/app/shared/configuration.ts
@@ -0,0 +1,5 @@
+export type Config = { key: { value: string; env: string }; value: string; defaultValue: string };
+
+export function pluck(key: string, config: Config[]): string {
+  return config.filter((c) => c.key.value === key).map((c) => c.value)[0];
+}
diff --git a/AMW_angular/io/src/app/shared/date-picker/date-picker.component.html b/AMW_angular/io/src/app/shared/date-picker/date-picker.component.html
index 295ce7d81..b177d38e6 100644
--- a/AMW_angular/io/src/app/shared/date-picker/date-picker.component.html
+++ b/AMW_angular/io/src/app/shared/date-picker/date-picker.component.html
@@ -1,7 +1,7 @@
 @if (errorMessage) {
 <div class="alert alert-warning alert-dismissible" role="alert">
   <span [innerHTML]="errorMessage"></span>
-  <button type="button" class="btn-close" data-dismiss="alert" aria-label="Close"></button>
+  <app-button [variant]="'close'" (click)="cancel()"></app-button>
 </div>
 }
 <div class="input-group me-2">
@@ -17,6 +17,7 @@
   />
 
   <div class="input-group-append">
+    <!-- TODO: convert this button-->
     <button class="btn btn-secondary" [ngbPopover]="calendarContent" [disabled]="disabled" type="button">
       <app-icon icon="calendar3"></app-icon>
     </button>
@@ -27,9 +28,13 @@
   <div>
     <div class="d-grid">
       <ngb-datepicker name="datepicker" [ngModel]="date" (ngModelChange)="onDateChange($event)"></ngb-datepicker>
-      <button class="btn btn-secondary m-0" [disabled]="!date?.day" type="button" (click)="toggleDateTimeState($event)">
-        OK
-      </button>
+      <app-button
+        [variant]="'secondary'"
+        [additionalClasses]="'m-0 w-100'"
+        [disabled]="!date?.day"
+        (click)="toggleDateTimeState($event)"
+        >OK</app-button
+      >
     </div>
   </div>
 </ng-template>
diff --git a/AMW_angular/io/src/app/shared/date-picker/date-picker.component.ts b/AMW_angular/io/src/app/shared/date-picker/date-picker.component.ts
index 53f074a66..e3d5fc122 100644
--- a/AMW_angular/io/src/app/shared/date-picker/date-picker.component.ts
+++ b/AMW_angular/io/src/app/shared/date-picker/date-picker.component.ts
@@ -6,6 +6,7 @@ import { DateModel } from './date.model';
 import { noop } from 'rxjs';
 import { DATE_FORMAT } from 'src/app/core/amw-constants';
 import { IconComponent } from '../icon/icon.component';
+import { ButtonComponent } from '../button/button.component';
 
 @Component({
   selector: 'app-date-picker',
@@ -19,7 +20,7 @@ import { IconComponent } from '../icon/icon.component';
     },
   ],
   standalone: true,
-  imports: [FormsModule, NgClass, NgbPopover, IconComponent, NgbDatepicker],
+  imports: [FormsModule, NgClass, NgbPopover, IconComponent, NgbDatepicker, ButtonComponent],
 })
 export class DatePickerComponent implements ControlValueAccessor, OnInit {
   @Input()
@@ -115,4 +116,8 @@ export class DatePickerComponent implements ControlValueAccessor, OnInit {
   inputBlur($event) {
     this.onTouched();
   }
+
+  cancel() {
+    this.errorMessage = '';
+  }
 }
diff --git a/AMW_angular/io/src/app/shared/date-time-picker/date-time-picker.component.html b/AMW_angular/io/src/app/shared/date-time-picker/date-time-picker.component.html
index 3a585d0c3..263f6b168 100644
--- a/AMW_angular/io/src/app/shared/date-time-picker/date-time-picker.component.html
+++ b/AMW_angular/io/src/app/shared/date-time-picker/date-time-picker.component.html
@@ -1,7 +1,7 @@
 @if (errorMessage) {
 <div class="alert alert-warning alert-dismissible" role="alert">
   <span [innerHTML]="errorMessage"></span>
-  <button type="button" class="btn-close" data-dismiss="alert" aria-label="Close"></button>
+  <app-button [variant]="'close'" (click)="cancel()"></app-button>
 </div>
 }
 <div class="input-group me-2">
@@ -17,6 +17,7 @@
   />
 
   <div class="input-group-append">
+    <!-- TODO: convert this button-->
     <button class="btn btn-secondary" [ngbPopover]="calendarContent" [disabled]="disabled" type="button">
       <app-icon icon="calendar3"></app-icon>
     </button>
@@ -28,6 +29,7 @@
     @if (!showTimePickerToggle) {
     <div class="d-grid">
       <ngb-datepicker name="datepicker" [ngModel]="datetime" (ngModelChange)="onDateChange($event)"></ngb-datepicker>
+      <!-- TODO: convert this button-->
       <button
         class="btn btn-secondary m-0"
         [disabled]="!datetime?.day"
@@ -40,6 +42,7 @@
     </div>
     } @if (showTimePickerToggle) {
     <div class="d-grid">
+      <!-- TODO: convert this button-->
       <button
         class="btn btn-secondary m-0"
         [ngbPopover]="calendarContent"
diff --git a/AMW_angular/io/src/app/shared/date-time-picker/date-time-picker.component.ts b/AMW_angular/io/src/app/shared/date-time-picker/date-time-picker.component.ts
index f0d09c84f..1d47fdcbe 100644
--- a/AMW_angular/io/src/app/shared/date-time-picker/date-time-picker.component.ts
+++ b/AMW_angular/io/src/app/shared/date-time-picker/date-time-picker.component.ts
@@ -13,6 +13,7 @@ import { DateTimeModel } from './date-time.model';
 import { noop } from 'rxjs';
 import { DATE_TIME_FORMAT } from 'src/app/core/amw-constants';
 import { IconComponent } from '../icon/icon.component';
+import { ButtonComponent } from '../button/button.component';
 
 @Component({
   selector: 'app-date-time-picker',
@@ -27,7 +28,7 @@ import { IconComponent } from '../icon/icon.component';
     },
   ],
   standalone: true,
-  imports: [FormsModule, NgClass, NgbPopover, IconComponent, NgbDatepicker, NgbTimepicker],
+  imports: [FormsModule, NgClass, NgbPopover, IconComponent, NgbDatepicker, NgbTimepicker, ButtonComponent],
 })
 export class DateTimePickerComponent implements ControlValueAccessor, OnInit, AfterViewInit {
   @Input()
@@ -148,4 +149,8 @@ export class DateTimePickerComponent implements ControlValueAccessor, OnInit, Af
   inputBlur($event) {
     this.onTouched();
   }
+
+  cancel() {
+    this.errorMessage = '';
+  }
 }
diff --git a/AMW_angular/io/src/app/shared/elements/toast/toast-container.component.spec.ts b/AMW_angular/io/src/app/shared/elements/toast/toast-container.component.spec.ts
index 97eafb6c5..7e8bb9cc5 100644
--- a/AMW_angular/io/src/app/shared/elements/toast/toast-container.component.spec.ts
+++ b/AMW_angular/io/src/app/shared/elements/toast/toast-container.component.spec.ts
@@ -1,19 +1,16 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ToastContainerComponent } from './toast-container.component';
-import { ToastService } from './toast.service';
 
 describe('ToastContainerComponent', () => {
   let component: ToastContainerComponent;
-  let toastService: ToastService;
   let fixture: ComponentFixture<ToastContainerComponent>;
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      providers: [ToastContainerComponent, { provide: ToastService, useClass: ToastService }],
+      providers: [ToastContainerComponent],
     });
     fixture = TestBed.createComponent(ToastContainerComponent);
     component = TestBed.inject(ToastContainerComponent);
-    toastService = TestBed.inject(ToastService);
   });
 
   it('should create the component', () => {
diff --git a/AMW_angular/io/src/app/shared/icon/icon.component.css b/AMW_angular/io/src/app/shared/icon/icon.component.css
new file mode 100644
index 000000000..5e14dbedb
--- /dev/null
+++ b/AMW_angular/io/src/app/shared/icon/icon.component.css
@@ -0,0 +1,11 @@
+:host {
+  height: 17px;
+  width: 17px;
+  display: inline-block;
+  vertical-align: middle
+
+}
+
+.icon {
+  vertical-align: unset;
+}
diff --git a/AMW_angular/io/src/app/shared/icon/icon.component.ts b/AMW_angular/io/src/app/shared/icon/icon.component.ts
index 6fde749d9..e397ce658 100644
--- a/AMW_angular/io/src/app/shared/icon/icon.component.ts
+++ b/AMW_angular/io/src/app/shared/icon/icon.component.ts
@@ -2,10 +2,10 @@ import { Component, Input, OnChanges } from '@angular/core';
 
 @Component({
   selector: 'app-icon',
-  template: ` <svg class="bi" width="16" height="16" fill="currentColor">
+  template: ` <svg class="icon" width="16" height="16" fill="currentColor">
     <use [attr.xlink:href]="iconPath" />
   </svg>`,
-  styles: [],
+  styleUrl: './icon.component.css',
   standalone: true,
 })
 export class IconComponent implements OnChanges {
diff --git a/AMW_angular/io/src/app/shared/interceptors/http-toast.interceptor.ts b/AMW_angular/io/src/app/shared/interceptors/http-toast.interceptor.ts
index 84fcf4157..b248183ec 100644
--- a/AMW_angular/io/src/app/shared/interceptors/http-toast.interceptor.ts
+++ b/AMW_angular/io/src/app/shared/interceptors/http-toast.interceptor.ts
@@ -12,7 +12,6 @@ export function provideHttpToastInterceptor(): Provider[] {
 })
 export class HttpToastInterceptor implements HttpInterceptor {
   toastService = inject(ToastService);
-
   intercept(req: HttpRequest<any>, next: HttpHandler) {
     return next.handle(req).pipe(
       catchError((error) => {
diff --git a/AMW_angular/io/src/app/shared/modal-header/modal-header.component.spec.ts b/AMW_angular/io/src/app/shared/modal-header/modal-header.component.spec.ts
new file mode 100644
index 000000000..aeeddbb32
--- /dev/null
+++ b/AMW_angular/io/src/app/shared/modal-header/modal-header.component.spec.ts
@@ -0,0 +1,22 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ModalHeaderComponent } from './modal-header.component';
+
+describe('ModalHeaderComponent', () => {
+  let component: ModalHeaderComponent;
+  let fixture: ComponentFixture<ModalHeaderComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [ModalHeaderComponent],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(ModalHeaderComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/AMW_angular/io/src/app/shared/modal-header/modal-header.component.ts b/AMW_angular/io/src/app/shared/modal-header/modal-header.component.ts
new file mode 100644
index 000000000..43dd968ee
--- /dev/null
+++ b/AMW_angular/io/src/app/shared/modal-header/modal-header.component.ts
@@ -0,0 +1,21 @@
+import { Component, input, output } from '@angular/core';
+
+@Component({
+  selector: 'app-modal-header',
+  standalone: true,
+  imports: [],
+  template: `<div class="modal-header">
+    <h5 class="modal-title">{{ title() }}</h5>
+    <button type="button" class="btn btn-light close" aria-label="Close" (click)="onCancel()">
+      <span aria-hidden="true">&times;</span>
+    </button>
+  </div> `,
+})
+export class ModalHeaderComponent {
+  title = input<string>();
+  cancel = output<void>();
+
+  onCancel(): void {
+    this.cancel.emit();
+  }
+}
diff --git a/AMW_angular/io/src/app/shared/pagination/pagination.component.html b/AMW_angular/io/src/app/shared/pagination/pagination.component.html
index 9aeced220..17cb1a76e 100644
--- a/AMW_angular/io/src/app/shared/pagination/pagination.component.html
+++ b/AMW_angular/io/src/app/shared/pagination/pagination.component.html
@@ -16,7 +16,7 @@
       @for (page of pages(); track page) {
       <li class="page-item {{ currentPage === page ? 'active' : '' }}">
         <a class="page-link" (click)="toPage(page)"
-        >{{ page }} @if (currentPage === page) {
+          >{{ page }} @if (currentPage === page) {
           <span class="visually-hidden">(current)</span>
           }</a
         >
diff --git a/AMW_angular/io/src/app/shared/pagination/pagination.component.ts b/AMW_angular/io/src/app/shared/pagination/pagination.component.ts
index c368194a7..088337a9a 100644
--- a/AMW_angular/io/src/app/shared/pagination/pagination.component.ts
+++ b/AMW_angular/io/src/app/shared/pagination/pagination.component.ts
@@ -2,7 +2,7 @@ import { Component, Input, EventEmitter, Output } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 
 @Component({
-  selector: 'amw-pagination',
+  selector: 'app-pagination',
   templateUrl: './pagination.component.html',
   standalone: true,
   imports: [FormsModule],
diff --git a/AMW_angular/io/src/app/shared/service/configuration.service.ts b/AMW_angular/io/src/app/shared/service/configuration.service.ts
new file mode 100644
index 000000000..0d72e9c00
--- /dev/null
+++ b/AMW_angular/io/src/app/shared/service/configuration.service.ts
@@ -0,0 +1,23 @@
+import { BaseService } from '../../base/base.service';
+import { inject, Injectable, Signal } from '@angular/core';
+import { HttpClient, HttpResponse } from '@angular/common/http';
+import { catchError, map } from 'rxjs/operators';
+import { toSignal } from '@angular/core/rxjs-interop';
+import { Observable } from 'rxjs';
+import { Config } from '../configuration';
+
+@Injectable({ providedIn: 'root' })
+export class ConfigurationService extends BaseService {
+  private http = inject(HttpClient);
+  private settingsUrl = `${this.getBaseUrl()}/settings`;
+
+  private configuration$: Observable<Config[]> = this.http
+    .get<Config[]>(`${this.settingsUrl}`, {
+      headers: this.getHeaders(),
+      observe: 'response',
+    })
+    .pipe(catchError(this.handleError))
+    .pipe(map((response: HttpResponse<Config[]>): Config[] => response.body));
+
+  configuration: Signal<Config[]> = toSignal(this.configuration$);
+}
diff --git a/AMW_angular/io/src/styles.scss b/AMW_angular/io/src/styles.scss
index b58939eea..7a2e6fa26 100644
--- a/AMW_angular/io/src/styles.scss
+++ b/AMW_angular/io/src/styles.scss
@@ -15,8 +15,6 @@ $toast-padding-y: 0;
 
 @import 'bootstrap/scss/bootstrap';
 @import '@ng-select/ng-select/themes/default.theme.css';
-@import 'codemirror/lib/codemirror';
-@import 'codemirror/addon/dialog/dialog.css';
 
 .text-warning-2 {
   color: #8a6d3b;
@@ -51,3 +49,10 @@ $toast-padding-y: 0;
 .btn {
   margin-right: 0.3rem;
 }
+
+.editor {
+  min-height: 20vh;
+  max-height: 60vh;
+  overflow-y: auto;
+
+}
diff --git a/AMW_angular/pom.xml b/AMW_angular/pom.xml
index 59e584d46..7a1f3250d 100644
--- a/AMW_angular/pom.xml
+++ b/AMW_angular/pom.xml
@@ -44,7 +44,7 @@
                 <version>1.13.3</version>
                 <configuration>
                     <nodeVersion>v20.11.1</nodeVersion>
-                    <npmVersion>10.4.0</npmVersion>
+                    <npmVersion>10.8.2</npmVersion>
                     <workingDirectory>io</workingDirectory>
                     <installDirectory>${user.home}/.node</installDirectory>
                 </configuration>
@@ -63,17 +63,17 @@
                             <goal>npm</goal>
                         </goals>
                         <configuration>
-                            <arguments>ci</arguments>
+                            <arguments>install</arguments>
                         </configuration>
                     </execution>
                     <execution>
-                        <id>npm run-script mavenbuild</id>
+                        <id>npm run mavenbuild</id>
                         <phase>compile</phase>
                         <goals>
                             <goal>npm</goal>
                         </goals>
                         <configuration>
-                            <arguments>run-script mavenbuild</arguments>
+                            <arguments>run mavenbuild</arguments>
                         </configuration>
                     </execution>
                 </executions>
diff --git a/AMW_business/pom.xml b/AMW_business/pom.xml
index 66b380b2b..94036c309 100644
--- a/AMW_business/pom.xml
+++ b/AMW_business/pom.xml
@@ -90,10 +90,6 @@
 			<scope>provided</scope>
 		</dependency>
 
-		<!-- Envers -->
-		<!-- <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-envers</artifactId> <version>3.6.8.Final</version> 
-			</dependency> -->
-
 		<!-- JSR-303 (Bean Validation) Implementation -->
 		<!-- Provides portable constraints such as @Email -->
 		<!-- Hibernate Validator is shipped in JBoss AS 7 -->
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/apps/boundary/AddAppCommand.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/apps/boundary/AddAppCommand.java
new file mode 100644
index 000000000..d93ebb534
--- /dev/null
+++ b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/apps/boundary/AddAppCommand.java
@@ -0,0 +1,26 @@
+package ch.puzzle.itc.mobiliar.business.apps.boundary;
+
+import ch.puzzle.itc.mobiliar.business.apps.validation.ValidAppName;
+import lombok.Getter;
+
+import javax.validation.ValidationException;
+import javax.validation.constraints.NotNull;
+
+import static ch.puzzle.itc.mobiliar.business.utils.Validation.validate;
+
+@Getter
+public class AddAppCommand {
+
+    @ValidAppName
+    private final String appName;
+
+    @NotNull
+    private final Integer releaseId;
+
+    public AddAppCommand(String appName, Integer releaseId) throws ValidationException {
+        this.appName = appName;
+        this.releaseId = releaseId;
+        validate(this);
+    }
+
+}
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/apps/boundary/AddAppServerUseCase.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/apps/boundary/AddAppServerUseCase.java
new file mode 100644
index 000000000..0103c6ac5
--- /dev/null
+++ b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/apps/boundary/AddAppServerUseCase.java
@@ -0,0 +1,7 @@
+package ch.puzzle.itc.mobiliar.business.apps.boundary;
+
+import ch.puzzle.itc.mobiliar.common.exception.NotFoundException;
+
+public interface AddAppServerUseCase {
+    Integer add(AppServerCommand appServerCommand) throws NotFoundException, IllegalStateException;
+}
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/apps/boundary/AddAppUseCase.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/apps/boundary/AddAppUseCase.java
new file mode 100644
index 000000000..4441f911b
--- /dev/null
+++ b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/apps/boundary/AddAppUseCase.java
@@ -0,0 +1,8 @@
+package ch.puzzle.itc.mobiliar.business.apps.boundary;
+
+import ch.puzzle.itc.mobiliar.common.exception.*;
+
+
+public interface AddAppUseCase {
+    Integer add(AddAppCommand addAppCommand) throws NotFoundException, IllegalStateException;
+}
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/apps/boundary/AddAppWithServerCommand.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/apps/boundary/AddAppWithServerCommand.java
new file mode 100644
index 000000000..07a17b5e1
--- /dev/null
+++ b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/apps/boundary/AddAppWithServerCommand.java
@@ -0,0 +1,30 @@
+package ch.puzzle.itc.mobiliar.business.apps.boundary;
+
+import ch.puzzle.itc.mobiliar.business.apps.validation.ValidAppName;
+import lombok.Getter;
+
+import javax.validation.ValidationException;
+import javax.validation.constraints.NotNull;
+
+import static ch.puzzle.itc.mobiliar.business.utils.Validation.validate;
+
+@Getter
+public class AddAppWithServerCommand {
+
+    @ValidAppName
+    private final String appName;
+    @NotNull
+    private final Integer releaseId;
+    @NotNull
+    private final Integer appServerId;
+    @NotNull
+    private final Integer appServerReleaseId;
+
+    public AddAppWithServerCommand(String appName, Integer releaseId, Integer appServerId, Integer appServerReleaseId) throws ValidationException {
+        this.appName = appName;
+        this.releaseId = releaseId;
+        this.appServerId = appServerId;
+        this.appServerReleaseId = appServerReleaseId;
+        validate(this);
+    }
+}
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/apps/boundary/AddAppWithServerUseCase.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/apps/boundary/AddAppWithServerUseCase.java
new file mode 100644
index 000000000..0d8873723
--- /dev/null
+++ b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/apps/boundary/AddAppWithServerUseCase.java
@@ -0,0 +1,8 @@
+package ch.puzzle.itc.mobiliar.business.apps.boundary;
+
+import ch.puzzle.itc.mobiliar.common.exception.NotFoundException;
+
+
+public interface AddAppWithServerUseCase {
+    Integer add(AddAppWithServerCommand addAppWithServerCommand) throws NotFoundException, IllegalStateException;
+}
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/apps/boundary/AppServerCommand.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/apps/boundary/AppServerCommand.java
new file mode 100644
index 000000000..6ac9879d9
--- /dev/null
+++ b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/apps/boundary/AppServerCommand.java
@@ -0,0 +1,24 @@
+package ch.puzzle.itc.mobiliar.business.apps.boundary;
+
+import ch.puzzle.itc.mobiliar.business.apps.validation.ValidAppName;
+import lombok.Getter;
+
+import javax.validation.ValidationException;
+import javax.validation.constraints.NotNull;
+
+import static ch.puzzle.itc.mobiliar.business.utils.Validation.validate;
+
+@Getter
+public class AppServerCommand {
+    @ValidAppName
+    private final String appServerName;
+
+    @NotNull
+    private final Integer releaseId;
+
+    public AppServerCommand(String serverName, Integer releaseId) throws ValidationException {
+        this.appServerName = serverName;
+        this.releaseId = releaseId;
+        validate(this);
+    }
+}
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/apps/boundary/ListAppsUseCase.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/apps/boundary/ListAppsUseCase.java
new file mode 100644
index 000000000..4ea02cdb8
--- /dev/null
+++ b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/apps/boundary/ListAppsUseCase.java
@@ -0,0 +1,13 @@
+package ch.puzzle.itc.mobiliar.business.apps.boundary;
+
+import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.ResourceWithRelations;
+import ch.puzzle.itc.mobiliar.common.exception.NotFoundException;
+import ch.puzzle.itc.mobiliar.common.util.Tuple;
+
+import java.util.List;
+
+public interface ListAppsUseCase {
+
+    Tuple<List<ResourceWithRelations>, Long> appsFor(Integer startIndex, Integer maxResults, String filter, Integer releaseId) throws NotFoundException;
+
+}
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/apps/control/AppsService.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/apps/control/AppsService.java
new file mode 100644
index 000000000..8f091a04b
--- /dev/null
+++ b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/apps/control/AppsService.java
@@ -0,0 +1,121 @@
+package ch.puzzle.itc.mobiliar.business.apps.control;
+
+import ch.puzzle.itc.mobiliar.business.apps.boundary.*;
+import ch.puzzle.itc.mobiliar.business.foreignable.entity.ForeignableOwner;
+import ch.puzzle.itc.mobiliar.business.releasing.boundary.ReleaseLocator;
+import ch.puzzle.itc.mobiliar.business.releasing.entity.ReleaseEntity;
+import ch.puzzle.itc.mobiliar.business.resourcegroup.boundary.ResourceBoundary;
+import ch.puzzle.itc.mobiliar.business.resourcegroup.boundary.ResourceRelations;
+import ch.puzzle.itc.mobiliar.business.resourcegroup.control.ResourceTypeRepository;
+import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.Application;
+import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.Resource;
+import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.ResourceTypeEntity;
+import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.ResourceWithRelations;
+import ch.puzzle.itc.mobiliar.business.security.boundary.PermissionBoundary;
+import ch.puzzle.itc.mobiliar.business.security.entity.Permission;
+import ch.puzzle.itc.mobiliar.business.security.interceptor.HasPermission;
+import ch.puzzle.itc.mobiliar.common.exception.AMWException;
+import ch.puzzle.itc.mobiliar.common.exception.ElementAlreadyExistsException;
+import ch.puzzle.itc.mobiliar.common.exception.NotFoundException;
+import ch.puzzle.itc.mobiliar.common.exception.ResourceTypeNotFoundException;
+import ch.puzzle.itc.mobiliar.common.util.DefaultResourceTypeDefinition;
+import ch.puzzle.itc.mobiliar.common.util.Tuple;
+
+import javax.ejb.Stateless;
+import javax.inject.Inject;
+import java.util.List;
+
+import static ch.puzzle.itc.mobiliar.business.security.entity.Action.CREATE;
+
+@Stateless
+public class AppsService implements ListAppsUseCase, AddAppServerUseCase, AddAppUseCase, AddAppWithServerUseCase {
+
+    @Inject
+    private ReleaseLocator releaseLocator;
+
+    @Inject
+    private ResourceRelations resourceRelations;
+
+    @Inject
+    private ResourceBoundary resourceBoundary;
+
+    @Inject
+    private PermissionBoundary permissionBoundary;
+
+    @Inject
+    private ResourceTypeRepository resourceTypeRepository;
+
+    @Override
+    public Tuple<List<ResourceWithRelations>, Long> appsFor(Integer startIndex, Integer maxResults, String filter, Integer releaseId) throws NotFoundException {
+        ReleaseEntity release = releaseLocator.getReleaseById(releaseId);
+        return resourceRelations.getAppServersWithApplications(startIndex, maxResults, filter, release);
+    }
+
+
+    @Override
+    @HasPermission(permission = Permission.RESOURCE, action = CREATE)
+    public Integer add(AddAppCommand command) throws NotFoundException, IllegalStateException {
+
+            try {
+                Application app = resourceBoundary.createNewApplicationWithoutAppServerByName(
+                        ForeignableOwner.getSystemOwner(), null, null, command.getAppName(), command.getReleaseId(), false);
+                permissionBoundary.createAutoAssignedRestrictions(app.getEntity());
+
+                return app.getId();
+
+            } catch (ElementAlreadyExistsException e) {
+                throw new IllegalStateException(e.getMessage());
+            } catch (ResourceTypeNotFoundException e) {
+                throw new IllegalStateException("A resource with group name \"" + command.getAppName() + "\" already exist and can not be created!");
+            } catch (AMWException e) {
+                throw new IllegalStateException("Failed to create auto assigned restrictions for app: " + command.getAppName(), e);
+            }
+        }
+
+    @Override
+    @HasPermission(permission = Permission.RESOURCE, action = CREATE)
+    public Integer add(AddAppWithServerCommand command) throws NotFoundException, IllegalStateException {
+        try {
+            Application app = resourceBoundary.createNewUniqueApplicationForAppServer(
+                    ForeignableOwner.getSystemOwner(),
+                    command.getAppName(),
+                    command.getAppServerId(),
+                    command.getReleaseId(),
+                    command.getAppServerReleaseId());
+            permissionBoundary.createAutoAssignedRestrictions(app.getEntity());
+
+            return app.getId();
+
+        } catch (ElementAlreadyExistsException  e) {
+            String type = e.getExistingObjectClass() == Application.class ? "application" : "application server";
+            throw new IllegalStateException("An " + type + " with the name " + e.getExistingObjectName()
+                    + " already exists.");
+        } catch (ResourceTypeNotFoundException e) {
+            throw new IllegalStateException("A resource with group name \"" + command.getAppName() + "\" already exist and can not be created!");
+        } catch (AMWException e) {
+            throw new IllegalStateException("Failed to create auto assigned restrictions for app: " + command.getAppName(), e);
+        }
+    }
+
+
+    @Override
+    @HasPermission(permission = Permission.RESOURCE, action = CREATE)
+    public Integer add(AppServerCommand command) throws NotFoundException, IllegalStateException {
+        ResourceTypeEntity resourceType = resourceTypeRepository.getByName(String.valueOf(DefaultResourceTypeDefinition.APPLICATIONSERVER));
+        ReleaseEntity release = releaseLocator.getReleaseById(command.getReleaseId());
+        try {
+            Resource resource = resourceBoundary.createNewResourceByName(ForeignableOwner.getSystemOwner(), command.getAppServerName(),
+                    resourceType.getId(), release.getId());
+            permissionBoundary.createAutoAssignedRestrictions(resource.getEntity());
+
+            return resource.getId();
+
+        } catch (ElementAlreadyExistsException | ResourceTypeNotFoundException e) {
+            throw new IllegalStateException(e.getMessage());
+        } catch (AMWException e) {
+            throw new IllegalStateException("Failed to create auto assigned restrictions for app: " + command.getAppServerName(), e);
+        }
+
+    }
+}
+
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/apps/validation/ValidAppName.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/apps/validation/ValidAppName.java
new file mode 100644
index 000000000..498bf3cd7
--- /dev/null
+++ b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/apps/validation/ValidAppName.java
@@ -0,0 +1,23 @@
+package ch.puzzle.itc.mobiliar.business.apps.validation;
+
+
+import javax.validation.Constraint;
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@Target({ FIELD })
+@Retention(RUNTIME)
+@Constraint(validatedBy = ValidAppNameValidator.class)
+@Documented
+public @interface ValidAppName {
+
+    String message() default "The name contains empty space or dots";
+
+    Class<?>[] groups() default {};
+
+    Class<?>[] payload() default {};
+}
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/apps/validation/ValidAppNameValidator.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/apps/validation/ValidAppNameValidator.java
new file mode 100644
index 000000000..ff0ee8eea
--- /dev/null
+++ b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/apps/validation/ValidAppNameValidator.java
@@ -0,0 +1,15 @@
+package ch.puzzle.itc.mobiliar.business.apps.validation;
+
+import ch.puzzle.itc.mobiliar.common.util.NameChecker;
+
+import javax.validation.ConstraintValidator;
+import javax.validation.ConstraintValidatorContext;
+
+public class ValidAppNameValidator implements ConstraintValidator<ValidAppName, String> {
+
+    @Override
+    public boolean isValid(String appName, ConstraintValidatorContext constraintValidatorContext) {
+        if (appName == null) return false;
+        return NameChecker.isNameValid(appName);
+    }
+}
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/deploy/boundary/DeploymentBoundary.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/deploy/boundary/DeploymentBoundary.java
index aad0819e3..c0617a7b7 100644
--- a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/deploy/boundary/DeploymentBoundary.java
+++ b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/deploy/boundary/DeploymentBoundary.java
@@ -51,7 +51,6 @@
 import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.ResourceGroupEntity;
 import ch.puzzle.itc.mobiliar.business.security.control.PermissionService;
 import ch.puzzle.itc.mobiliar.business.security.entity.Action;
-import ch.puzzle.itc.mobiliar.business.shakedown.control.ShakedownTestService;
 import ch.puzzle.itc.mobiliar.business.auditview.control.AuditService;
 import ch.puzzle.itc.mobiliar.business.utils.database.DatabaseUtil;
 import ch.puzzle.itc.mobiliar.common.exception.*;
@@ -79,7 +78,6 @@
 import java.util.stream.Collectors;
 
 import static ch.puzzle.itc.mobiliar.business.deploy.entity.DeploymentFilterTypes.QLConstants.DEPLOYMENT_QL_ALIAS;
-import static ch.puzzle.itc.mobiliar.business.deploy.entity.DeploymentFilterTypes.QLConstants.GROUP_QL;
 
 
 @Stateless
@@ -115,9 +113,6 @@ public boolean isPossible() {
     @Inject
     private ResourceDependencyResolverService dependencyResolver;
 
-    @Inject
-    private ShakedownTestService shakedownTestService;
-
     @Inject
     private SequencesService sequencesService;
 
@@ -179,12 +174,9 @@ public ComparatorFilterOption[] getComparatorFilterOptions() {
      * @param filters
      * @param colToSort
      * @param sortingDirection
-     * @param myAmw
      * @return a Tuple containing the filter deployments and the total deployments for that filter if doPagingCalculation is true
      */
-    public Tuple<Set<DeploymentEntity>, Integer> getFilteredDeployments(Integer startIndex,
-                                                                        Integer maxResults, List<CustomFilter> filters, String colToSort,
-                                                                        Sort.SortingDirectionType sortingDirection, List<Integer> myAmw) {
+    public Tuple<Set<DeploymentEntity>, Integer> getFilteredDeployments(Integer startIndex, Integer maxResults, List<CustomFilter> filters, String colToSort, Sort.SortingDirectionType sortingDirection) {
         Integer totalItemsForCurrentFilter;
         boolean doPaging = maxResults != null && (maxResults > 0);
 
@@ -216,10 +208,8 @@ public Tuple<Set<DeploymentEntity>, Integer> getFilteredDeployments(Integer star
             } else {
                 stringQuery.append("select " + DEPLOYMENT_QL_ALIAS + " from " + DEPLOYMENT_ENTITY_NAME + " " + DEPLOYMENT_QL_ALIAS + " ");
             }
-            commonFilterService.appendWhereAndMyAmwParameter(myAmw, stringQuery, "and " + getEntityDependantMyAmwParameterQl());
         } else {
             stringQuery.append("select " + DEPLOYMENT_QL_ALIAS + " from " + DEPLOYMENT_ENTITY_NAME + " " + DEPLOYMENT_QL_ALIAS + " ");
-            commonFilterService.appendWhereAndMyAmwParameter(myAmw, stringQuery, getEntityDependantMyAmwParameterQl());
         }
 
         String baseQuery = stringQuery.toString();
@@ -239,7 +229,7 @@ public Tuple<Set<DeploymentEntity>, Integer> getFilteredDeployments(Integer star
         sortBuilder.order(DeploymentOrder.of(DeploymentFilterTypes.ID.getFilterTabColumnName(), Sort.SortingDirectionType.DESC, false));
 
         Query query = commonFilterService.addFilterAndCreateQuery(stringQuery, filters, sortBuilder.build(), hasLastDeploymentForAsEnvFilterSet, false);
-        query = commonFilterService.setParameterToQuery(startIndex, maxResults, myAmw, query);
+        query = commonFilterService.setParameterToQuery(startIndex, maxResults, query);
 
         Set<DeploymentEntity> deployments = new LinkedHashSet<>();
         // some stuff may be lazy loaded
@@ -265,7 +255,7 @@ public Tuple<Set<DeploymentEntity>, Integer> getFilteredDeployments(Integer star
             // last param needs to be true if we are dealing with a combination of "State" and "Latest deployment job for App Server and Env"
             Query countQuery = commonFilterService.addFilterAndCreateQuery(new StringBuilder(countQueryString), filters, Sort.nothing(), hasLastDeploymentForAsEnvFilterSet, lastDeploymentState != null);
 
-            commonFilterService.setParameterToQuery(null, null, myAmw, countQuery);
+            commonFilterService.setParameterToQuery(null, null, countQuery);
             totalItemsForCurrentFilter = (lastDeploymentState == null) ? ((Long) countQuery.getSingleResult()).intValue() : countQuery.getResultList().size();
             // fix for the special case of multiple deployments on the same environment with exactly the same deployment date
             if (hasLastDeploymentForAsEnvFilterSet && lastDeploymentState == null && deployments.size() != allResults) {
@@ -437,10 +427,6 @@ public int compare(DeploymentEntity o1, DeploymentEntity o2) {
         return deploymentsList;
     }
 
-    private String getEntityDependantMyAmwParameterQl() {
-        return "(" + GROUP_QL + ".id in (:" + CommonFilterService.MY_AMW + ")) ";
-    }
-
     private boolean isLastDeploymentForAsEnvFilterSet(List<CustomFilter> filter) {
         if (filter != null) {
             for (CustomFilter deploymentFilter : filter) {
@@ -525,8 +511,7 @@ public Integer createDeploymentReturnTrackingId(Integer appServerGroupId, Intege
                                                     List<Integer> contextIds,
                                                     List<ApplicationWithVersion> applicationWithVersion,
                                                     List<DeploymentParameter> deployParams,
-                                                    boolean sendEmail, boolean requestOnly, boolean doSimulate,
-                                                    boolean isExecuteShakedownTest, boolean isNeighbourhoodTest) {
+                                                    boolean sendEmail, boolean requestOnly, boolean doSimulate) {
 
         Integer trackingId = sequencesService.getNextValueAndUpdate(DeploymentEntity.SEQ_NAME);
 
@@ -535,7 +520,7 @@ public Integer createDeploymentReturnTrackingId(Integer appServerGroupId, Intege
             deploymentDate = now;
         }
         requestOnly = createDeploymentForAppserver(appServerGroupId, releaseId, deploymentDate, stateToDeploy, contextIds, applicationWithVersion, deployParams, sendEmail, requestOnly, doSimulate,
-                isExecuteShakedownTest, isNeighbourhoodTest, trackingId);
+                trackingId);
 
         if (deploymentDate == now && !requestOnly) {
             deploymentEvent.fire(new DeploymentEvent(DeploymentEventType.NEW, DeploymentState.scheduled));
@@ -557,14 +542,11 @@ public Integer createDeploymentReturnTrackingId(Integer appServerGroupId, Intege
      * @param sendEmail
      * @param requestOnly
      * @param doSimulate
-     * @param isExecuteShakedownTest
-     * @param isNeighbourhoodTest
      * @param trackingId
      * @return boolean true if deployment request only
      */
     private boolean createDeploymentForAppserver(Integer appServerGroupId, Integer releaseId, Date deploymentDate, Date stateToDeploy, List<Integer> contextIds, List<ApplicationWithVersion>
-            applicationWithVersion, List<DeploymentParameter> deployParams, boolean sendEmail, boolean requestOnly, boolean doSimulate, boolean isExecuteShakedownTest, boolean
-                                                         isNeighbourhoodTest, Integer trackingId) {
+            applicationWithVersion, List<DeploymentParameter> deployParams, boolean sendEmail, boolean requestOnly, boolean doSimulate, Integer trackingId) {
         ResourceGroupEntity group = em.find(ResourceGroupEntity.class, appServerGroupId);
         ReleaseEntity release = em.find(ReleaseEntity.class, releaseId);
         ResourceEntity resource = dependencyResolver.getResourceEntityForRelease(group, release);
@@ -586,13 +568,6 @@ private boolean createDeploymentForAppserver(Integer appServerGroupId, Integer r
 
             deployment.setDeploymentRequestUser(permissionService.getCurrentUserName());
 
-            deployment.setCreateTestAfterDeployment(isExecuteShakedownTest);
-            if (isExecuteShakedownTest && isNeighbourhoodTest) {
-                deployment.setCreateTestForNeighborhoodAfterDeployment(true);
-            } else {
-                deployment.setCreateTestForNeighborhoodAfterDeployment(false);
-            }
-
             // Permission DEPLOYMENT.UPDATE is required for confirming Deployments
             if (requestOnly || !(permissionService.hasPermissionAndActionForDeploymentOnContext(context, group, Action.UPDATE)
                     && permissionService.hasPermissionAndActionForDeploymentOnContext(context, group, Action.CREATE))) {
@@ -1099,22 +1074,6 @@ public void updateDeploymentInfoAndSendNotification(GenerationModus generationMo
         }
     }
 
-
-    /**
-     * Look up which other deployments (than just this one) belong together (via the tracking id) and create
-     * shakedowntests after all of them are executed.
-     *
-     * @param trackingId
-     */
-    public void createShakedownTestForTrackinIdOfDeployment(Integer trackingId) {
-        // hole alle deployments mit derselben trackingId
-        List<DeploymentEntity> deploymentsWithSameTrackingId = getDeplyomentsWithSameTrackingId(trackingId);
-
-        if (isAllDeploymentsWithSameTrackingIdExecuted(deploymentsWithSameTrackingId)) {
-            shakedownTestService.createAndExecuteShakedowntestForDeployments(deploymentsWithSameTrackingId);
-        }
-    }
-
     /**
      * Look up which other deployments (than just this one) belong together (via the tracking id) and send a
      * single email notification if all of them are executed (independent of their success state).
@@ -1174,12 +1133,9 @@ public DeploymentEntity confirmDeployment(DeploymentEntity deployment) throws De
     }
 
     public DeploymentEntity confirmDeployment(Integer deploymentId, boolean sendEmail,
-                                              boolean executeShakedownTest, boolean neighbourhoodTest,
                                               boolean simulateGeneration, Date deploymentDate) throws DeploymentStateException {
         DeploymentEntity deployment = getDeploymentById(deploymentId);
         deployment.setSendEmailConfirmation(sendEmail);
-        deployment.setCreateTestAfterDeployment(executeShakedownTest);
-        deployment.setCreateTestForNeighborhoodAfterDeployment(neighbourhoodTest);
         deployment.setSimulating(simulateGeneration);
         deployment.setDeploymentDate(deploymentDate);
 
@@ -1414,17 +1370,17 @@ private List<Key> getAllDeployParamKeys() {
 
     private List<ResourceGroupEntity> getApplicationServerGroups() {
         return resourceGroupLocator.getGroupsForType(
-                DefaultResourceTypeDefinition.APPLICATIONSERVER.name(), Collections.EMPTY_LIST, false, true);
+                DefaultResourceTypeDefinition.APPLICATIONSERVER.name(), false, true);
     }
 
     private List<ResourceGroupEntity> getApplicationGroups() {
         return resourceGroupLocator.getGroupsForType(
-                DefaultResourceTypeDefinition.APPLICATION.name(), Collections.EMPTY_LIST, false, true);
+                DefaultResourceTypeDefinition.APPLICATION.name(), false, true);
     }
 
     private List<ResourceGroupEntity> getRuntimesGroups() {
         return resourceGroupLocator.getGroupsForType(
-                DefaultResourceTypeDefinition.RUNTIME.name(), Collections.EMPTY_LIST, false, true);
+                DefaultResourceTypeDefinition.RUNTIME.name(), false, true);
     }
 
     private <K extends NamedIdentifiable> List<String> converToStringList(List<K> namedIdentifiables) {
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/deploy/control/DeploymentExecutionResultHandlerService.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/deploy/control/DeploymentExecutionResultHandlerService.java
index 259253316..c5bacf925 100644
--- a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/deploy/control/DeploymentExecutionResultHandlerService.java
+++ b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/deploy/control/DeploymentExecutionResultHandlerService.java
@@ -61,10 +61,6 @@ public void handleSuccessfulDeployment(GenerationModus generationModus, Generati
 
 		deploymentBoundary.updateDeploymentInfoAndSendNotification(generationModus, deployment.getId(), null, deployment.getResource() != null ? deployment.getResource()
 				.getId() : null, generationResult, null);
-
-		if (deployment.isCreateTestAfterDeployment()) {
-			deploymentBoundary.createShakedownTestForTrackinIdOfDeployment(deployment.getTrackingId());
-		}
 	}
 
 	/**
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/deploy/control/DeploymentNotificationService.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/deploy/control/DeploymentNotificationService.java
index bed9db40c..231eb9c51 100644
--- a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/deploy/control/DeploymentNotificationService.java
+++ b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/deploy/control/DeploymentNotificationService.java
@@ -170,9 +170,6 @@ private Address[] getAllRecipients(final List<DeploymentEntity> deployments)
 			}
 		}
 
-		emailRecipients.addAll(userSettingsService.getRegisteredUsernamesForResourcesIds(groupIds));
-
-
 		final Address[] to = new InternetAddress[emailRecipients.size()];
 		int i = 0;
 		for (final String user : emailRecipients) {
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/deploy/entity/CustomFilter.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/deploy/entity/CustomFilter.java
index de499354c..a26439ade 100644
--- a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/deploy/entity/CustomFilter.java
+++ b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/deploy/entity/CustomFilter.java
@@ -20,7 +20,6 @@
 
 package ch.puzzle.itc.mobiliar.business.deploy.entity;
 
-import ch.puzzle.itc.mobiliar.business.shakedown.entity.ShakedownTestFilterTypes;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -98,14 +97,6 @@ public static CustomFilterBuilder builder(DeploymentFilterTypes deploymentFilter
                 .comparatorSelection(defaultComparator);
     }
 
-    public static CustomFilterBuilder builder(ShakedownTestFilterTypes shakedownTestFilterTypes) {
-        ComparatorFilterOption defaultComperator = ComparatorFilterOption.eq;
-        return new Builder().filterType(shakedownTestFilterTypes.getFilterType())
-                .filterDisplayName(shakedownTestFilterTypes.getFilterDisplayName())
-                .deploymentTableColumnName(shakedownTestFilterTypes.getFilterTabColumnName())
-                .comparatorSelection(defaultComperator);
-    }
-
     public static class Builder extends CustomFilterBuilder {
         Builder() {
             super();
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/deploy/entity/DeploymentEntity.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/deploy/entity/DeploymentEntity.java
index 4afadb443..4fe18890d 100644
--- a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/deploy/entity/DeploymentEntity.java
+++ b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/deploy/entity/DeploymentEntity.java
@@ -26,7 +26,6 @@
 import ch.puzzle.itc.mobiliar.business.releasing.entity.ReleaseEntity;
 import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.ResourceEntity;
 import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.ResourceGroupEntity;
-import ch.puzzle.itc.mobiliar.business.shakedown.entity.ShakedownTestEntity;
 import ch.puzzle.itc.mobiliar.common.exception.DeploymentStateException;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -139,19 +138,6 @@ public class DeploymentEntity implements Serializable {
     @Column(nullable = false)
     private boolean sendEmailConfirmation;
 
-    @Getter
-    @Setter
-    @Column(nullable = false)
-    private boolean createTestAfterDeployment;
-
-    @Column(nullable = false)
-    private boolean neighborhoodTest;
-
-    @Getter
-    @Setter
-    @OneToMany(mappedBy = "deployment", cascade = CascadeType.ALL)
-    private Set<ShakedownTestEntity> shakedownTests;
-
     @Getter
     @Setter
     @OneToMany(mappedBy = "deployment", cascade = CascadeType.ALL, fetch = FetchType.EAGER)
@@ -391,14 +377,6 @@ public boolean isDeploymentDelayed() {
                 && getDeploymentDate() != null && new Date().after(getDeploymentDate());
     }
 
-    public boolean isCreateTestForNeighborhoodAfterDeployment() {
-        return neighborhoodTest;
-    }
-
-    public void setCreateTestForNeighborhoodAfterDeployment(boolean createTestForNeighborhoodAfterDeployment) {
-        this.neighborhoodTest = createTestForNeighborhoodAfterDeployment;
-    }
-
     /**
      * @return the State Date which is used to read the AS from history
      */
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/deploy/scheduler/DeploymentScheduler.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/deploy/scheduler/DeploymentScheduler.java
index 30aa60d81..1ec3e257d 100644
--- a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/deploy/scheduler/DeploymentScheduler.java
+++ b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/deploy/scheduler/DeploymentScheduler.java
@@ -27,10 +27,6 @@
 import ch.puzzle.itc.mobiliar.business.deploy.entity.DeploymentState;
 import ch.puzzle.itc.mobiliar.business.deploy.event.DeploymentEvent;
 import ch.puzzle.itc.mobiliar.business.generator.control.extracted.GenerationModus;
-import ch.puzzle.itc.mobiliar.business.shakedown.control.ShakedownTestExecuterService;
-import ch.puzzle.itc.mobiliar.business.shakedown.control.ShakedownTestService;
-import ch.puzzle.itc.mobiliar.business.shakedown.entity.ShakedownTestEntity;
-import ch.puzzle.itc.mobiliar.business.shakedown.event.ShakedownTestEvent;
 import ch.puzzle.itc.mobiliar.common.util.ConfigurationService;
 import ch.puzzle.itc.mobiliar.common.util.ConfigKey;
 
@@ -55,22 +51,16 @@ public class DeploymentScheduler {
 	@Inject
 	private DeploymentBoundary deploymentBoundary;
 
-	@Inject
-	private ShakedownTestService shakedownTestService;
-
 	@Inject
 	private Logger log;
 
 	@Inject
 	private DeploymentExecuterService deploymentExecuterService;
 
-	@Inject
-	private ShakedownTestExecuterService shakedownTestExecuterService;
-
 	private Level logLevel = Level.INFO;
 
 	/**
-	 * Triggers the Deployment and Test Execution This Method is triggerd by
+	 * Triggers the Deployment. This Method is triggerd by
 	 * the Container
 	 */
 	@Schedule(hour = "*", minute = "*", second = "*/30", persistent = false)
@@ -80,7 +70,6 @@ public void triggerDeyploymentsAndTests() {
 			executePreDeployments();
 			executeDeployments();
 			executeSimulation();
-			executeForTests();
 			checkForFinishedPredeploymentDeployments();
 		}
 	}
@@ -142,13 +131,6 @@ public void handleDeploymentEvent(@Observes(during=TransactionPhase.AFTER_SUCCES
 		}
 	}
 
-	@Asynchronous
-	public void handleShakedownTestEvent(@Observes(during=TransactionPhase.AFTER_SUCCESS) ShakedownTestEvent event) {
-		log.log(logLevel, "ShakedownTest event fired");
-
-		executeForTests();
-	}
-
 	protected synchronized void executeSimulation() {
 		int deploymentSimulationLimit = deploymentBoundary.getDeploymentSimulationLimit();
 		log.log(Level.FINE, "Checking for simulations, max pro run " + deploymentSimulationLimit);
@@ -188,18 +170,6 @@ protected synchronized void executePreDeployments() {
 		}
 	}
 
-	protected synchronized void executeForTests() {
-		log.log(Level.FINE, "Checking for tests");
-		List<ShakedownTestEntity> tests = shakedownTestService.getTestsToExecute();
-		if (!tests.isEmpty()) {
-			log.log(logLevel, tests.size() + " tests found");
-			doTesting(tests);
-		}
-		else {
-			log.log(Level.FINE, "No tests found");
-		}
-	}
-
 	protected synchronized void checkForEndlessDeployments() {
 		log.log(Level.FINE, "Checking deployments inProgress which reached the timeout");
 		List<DeploymentEntity> deployments = deploymentBoundary.getDeploymentsInProgressTimeoutReached();
@@ -262,14 +232,4 @@ private void executeDeployments(List<DeploymentEntity> deployments, GenerationMo
 		}
 	}
 
-	private void doTesting(List<ShakedownTestEntity> tests) {
-		for (ShakedownTestEntity test : tests) {
-			if (test.getContext() != null) {
-				log.log(logLevel, "Checking test of " + test.getApplicationServer().getName() + " on environement "
-						+ test.getContext().getName() + " id " + test.getId());
-				shakedownTestExecuterService.generateConfigurationAndExecuteShakedownTest(test.getId());
-			}
-		}
-	}
-
 }
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/domain/applist/ApplistScreenDomainService.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/domain/applist/ApplistScreenDomainService.java
index bb5b33feb..3ee621af7 100644
--- a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/domain/applist/ApplistScreenDomainService.java
+++ b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/domain/applist/ApplistScreenDomainService.java
@@ -20,7 +20,6 @@
 
 package ch.puzzle.itc.mobiliar.business.domain.applist;
 
-import java.util.Collections;
 import java.util.List;
 
 import javax.ejb.Stateless;
@@ -28,6 +27,7 @@
 
 import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.ResourceEntity;
 import ch.puzzle.itc.mobiliar.common.util.ApplicationServerContainer;
+import ch.puzzle.itc.mobiliar.common.util.Tuple;
 
 /**
  * The ScreenDomainService for Applist Screens
@@ -38,27 +38,24 @@ public class ApplistScreenDomainService {
     @Inject
     private ApplistScreenDomainServiceQueries queries;
 
-    List<ResourceEntity> getApplicationServerResources(String filter, Integer maxResults, List<Integer> myAMW) {
-        if (myAMW != null && myAMW.isEmpty()) {
-            //there is a myAMW-filter, but it doesn't contain any values - so we don't have to ask the db - we know that there is an empty result
-            return Collections.emptyList();
-        }
-        return queries.doFetchApplicationServersWithApplicationsOrderedByAppServerNameCaseInsensitive(filter, myAMW, maxResults);
+    Tuple<List<ResourceEntity>, Long> getApplicationServerResources(Integer startIndex, Integer maxResults, String filter) {
+        return queries.getAppServersWithApps(startIndex, maxResults, filter);
     }
 
 
-    public List<ResourceEntity> getAppServerResourcesWithApplications(String filter, Integer maxResults,
-                                                                      List<Integer> myAmw, boolean withAppServerContainer) {
-        List<ResourceEntity> appServerList = getApplicationServerResources(filter, maxResults, myAmw);
+    public Tuple<List<ResourceEntity>, Long> getAppServerResourcesWithApplications(Integer startIndex, Integer maxResults, String filter, boolean withAppServerContainer) {
+        Tuple<List<ResourceEntity>, Long>  result = getApplicationServerResources(startIndex, maxResults, filter);
+        List<ResourceEntity> appServerList = result.getA();
         for (ResourceEntity as : appServerList) {
             if (as.getName().equals(ApplicationServerContainer.APPSERVERCONTAINER.getDisplayName())) {
-                if (!withAppServerContainer || as.getConsumedMasterRelations().size() == 0) {
+                if (!withAppServerContainer || as.getConsumedMasterRelations().isEmpty()) {
                     appServerList.remove(as);
                     break;
                 }
+                ;
             }
         }
-        return appServerList;
+        return new Tuple<List<ResourceEntity>, Long>(appServerList, result.getB());
     }
 
 }
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/domain/applist/ApplistScreenDomainServiceQueries.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/domain/applist/ApplistScreenDomainServiceQueries.java
index aff9bbfe1..86131e678 100644
--- a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/domain/applist/ApplistScreenDomainServiceQueries.java
+++ b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/domain/applist/ApplistScreenDomainServiceQueries.java
@@ -33,6 +33,7 @@
 import ch.puzzle.itc.mobiliar.business.utils.JpaWildcardConverter;
 import ch.puzzle.itc.mobiliar.business.utils.database.DatabaseUtil;
 import ch.puzzle.itc.mobiliar.common.util.DefaultResourceTypeDefinition;
+import ch.puzzle.itc.mobiliar.common.util.Tuple;
 
 public class ApplistScreenDomainServiceQueries {
 
@@ -42,14 +43,20 @@ public class ApplistScreenDomainServiceQueries {
     @Inject
     private DatabaseUtil dbUtil;
 
-    List<ResourceEntity> doFetchApplicationServersWithApplicationsOrderedByAppServerNameCaseInsensitive(String nameFilter, List<Integer> myAmwIds, Integer maxResult) {
+
+    Tuple<List<ResourceEntity>, Long> getAppServersWithApps(Integer startIndex, Integer maxResult, String nameFilter) {
         CriteriaBuilder cb = entityManager.getCriteriaBuilder();
         Predicate p;
         boolean nameFilterIsEmpty = nameFilter == null || nameFilter.trim().isEmpty();
 
+
+
+        // Count all values before filtering
+        Long totalCount = getTotalCount(cb);
+
+        // Filter and retrieve results
         CriteriaQuery<ResourceEntity> q = cb.createQuery(ResourceEntity.class);
         Root<ResourceEntity> appServer = q.from(ResourceEntity.class);
-
         Join<ResourceEntity, ResourceTypeEntity> appServerType = appServer.join("resourceType", JoinType.LEFT);
         SetJoin<ResourceEntity, ConsumedResourceRelationEntity> relation = appServer.joinSet("consumedMasterRelations", JoinType.LEFT);
         Join<ConsumedResourceRelationEntity, ResourceEntity> app = relation.join("slaveResource", JoinType.LEFT);
@@ -64,13 +71,6 @@ List<ResourceEntity> doFetchApplicationServersWithApplicationsOrderedByAppServer
                             cb.like(cb.lower(appServer.<String>get("name")), nameFilterLower, JpaWildcardConverter.ESCAPE_CHARACTER),
                             cb.like(cb.lower(app.<String>get("name")), nameFilterLower, JpaWildcardConverter.ESCAPE_CHARACTER)));
         }
-        if (myAmwIds != null) {
-            p = cb.and(p,
-                    cb.or(
-                            appServer.get("resourceGroup").get("id").in(myAmwIds),
-                            app.get("resourceGroup").get("id").in(myAmwIds)));
-        }
-
         q.where(p);
 
         q.distinct(true);
@@ -82,12 +82,30 @@ List<ResourceEntity> doFetchApplicationServersWithApplicationsOrderedByAppServer
         }
 
         q.orderBy(cb.asc(appServer.get("deletable")), cb.asc(name));
+
         TypedQuery<ResourceEntity> query = entityManager.createQuery(q);
+
+        if (startIndex != null) {
+            query.setFirstResult(startIndex);
+        }
+
         if (maxResult != null) {
             query.setMaxResults(maxResult);
         }
 
-        return query.getResultList();
+        return  new Tuple<>(query.getResultList(), totalCount);
+    }
+
+    private Long getTotalCount(CriteriaBuilder cb) {
+        CriteriaQuery<Long> countQuery = cb.createQuery(Long.class);
+        Root<ResourceEntity> appServer = countQuery.from(ResourceEntity.class);
+        Join<ResourceEntity, ResourceTypeEntity> appServerType = appServer.join("resourceType", JoinType.LEFT);
+        SetJoin<ResourceEntity, ConsumedResourceRelationEntity> relation = appServer.joinSet("consumedMasterRelations", JoinType.LEFT);
+        Join<ConsumedResourceRelationEntity, ResourceEntity> app = relation.join("slaveResource", JoinType.LEFT);
+        countQuery.select(cb.countDistinct(appServer.get("id")));
+        countQuery.where(cb.equal(appServerType.<String>get("name"), DefaultResourceTypeDefinition.APPLICATIONSERVER.name()));
+        Long totalCount = entityManager.createQuery(countQuery).getSingleResult();
+        return totalCount;
     }
 
-}
\ No newline at end of file
+}
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/domain/commons/CommonDomainService.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/domain/commons/CommonDomainService.java
index 5be5b7747..89b8f489f 100644
--- a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/domain/commons/CommonDomainService.java
+++ b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/domain/commons/CommonDomainService.java
@@ -53,7 +53,6 @@
 
 /**
  * The abstract domain service, used to provide generic functionalities for similar screens
- *
  */
 @Stateless
 public class CommonDomainService {
@@ -170,7 +169,7 @@ public ResourceType getResourceTypeById(Integer resourceTypeId) throws ResourceT
 
     /**
      * Listet alle ResourceTypes auf.
-     *
+     * <p>
      * alphabetic sorted
      *
      * @return
@@ -208,7 +207,7 @@ public List<ResourceType> getAllResourceTypes(boolean rootTypesOnly) {
      *
      * @return
      */
-    public ApplicationServer createOrGetApplicationCollectorServer()  {
+    public ApplicationServer createOrGetApplicationCollectorServer() {
         ApplicationServer result;
         ResourceEntity appServerResource = getUniqueResourceByNameAndType(
                 ApplicationServerContainer.APPSERVERCONTAINER.getDisplayName(), DefaultResourceTypeDefinition.APPLICATIONSERVER.name());
@@ -263,8 +262,7 @@ private ResourceEntity getUniqueResource(String resourceName, String typeName, I
             }
 
             resource = entityManager.createQuery(q).getSingleResult();
-        }
-        catch (NoResultException e) {
+        } catch (NoResultException e) {
             // do nothing
         }
         return resource;
@@ -275,19 +273,21 @@ private ResourceEntity getUniqueResource(String resourceName, String typeName, I
      * Hole für einen Name (prtTypeName) die PropertyType wenn sie existiert.
      *
      * @param prtTypeName
-     * @return
+     * @return Boolean
      */
-    public PropertyTypeEntity getUniquePropertyTypeByName(String prtTypeName) {
+    public Boolean isUnique(String prtTypeName) {
 
-        PropertyTypeEntity propertyTypeEntity = null;
         try {
             Query searchUniquePropertyType = commonQueries.searchPropertyTypeByName(prtTypeName);
-            propertyTypeEntity = (PropertyTypeEntity) searchUniquePropertyType.getSingleResult();
+            var propertyTypeEntity = (PropertyTypeEntity) searchUniquePropertyType.getSingleResult();
+            if (propertyTypeEntity != null) {
+                return false;
+            } else return true;
         } catch (NoResultException nre) {
             String message = "Das Property Type " + prtTypeName + " existiert nicht auf der DB";
             log.log(Level.WARNING, message);
+            return true;
         }
-        return propertyTypeEntity;
     }
 
 }
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/domain/commons/CommonFilterService.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/domain/commons/CommonFilterService.java
index 46bee23ea..2a9508eaa 100644
--- a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/domain/commons/CommonFilterService.java
+++ b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/domain/commons/CommonFilterService.java
@@ -48,20 +48,10 @@ public void setLog(Logger log) {
 		this.log = log;
 	}
 
-
-	public static final String MY_AMW = "myAmw";
-
 	protected static final String SPACE_STRING = " ";
 
 	private static final String WHERE = "where";
 
-	public void appendWhereAndMyAmwParameter(List<Integer> myAmw, StringBuilder stringQuery, String entityDependantMyAmwParameterQl) {
-		if (myAmw != null && !myAmw.isEmpty()) {
-			appendWhereIfNotAlreadyExists(stringQuery);
-			stringQuery.append(entityDependantMyAmwParameterQl);
-		}
-	}
-
 	/**
 	 *
 	 * @param stringQuery
@@ -88,7 +78,7 @@ public Query addFilterAndCreateQuery(StringBuilder stringQuery, List<CustomFilte
 			}
 
 			if (filterQuery.length() > 0) {
-				setzeWhereUndAndStatementsZuQuery(stringQuery);
+				appendWhereOrAndStatementsToQuery(stringQuery);
 				stringQuery.append('(').append(filterQuery).append(')');
 			}
 		}
@@ -183,11 +173,8 @@ private String extractJoiningtableForFilter(List<CustomFilter> filters) {
 		return (uniqueJoiningString.length() == 0) ? "" : (SPACE_STRING + uniqueJoiningString);
 	}
 
-	private void setzeWhereUndAndStatementsZuQuery(StringBuilder stringQuery) {
+	private void appendWhereOrAndStatementsToQuery(StringBuilder stringQuery) {
 		appendWhereIfNotAlreadyExists(stringQuery);
-		// Wenn die query bereits mit einer Klammer endet, bedeutet dies,
-		// dass ein myAmw-Filter gesetzt ist und die zusätzlichen Filter
-		// über ein "and" hinzugefügt werden müssen.
 		if (stringQuery.toString().endsWith(") ")) {
 			stringQuery.append("and ");
 		}
@@ -289,10 +276,7 @@ protected void createQueryForBooleanTypeWithoutAddingParameterToParameterMap(Str
 		}
 	}
 
-	public Query setParameterToQuery(Integer startIndex, Integer maxResults, List<Integer> myAmw, Query query) {
-		if (myAmw != null && !myAmw.isEmpty()) {
-			query.setParameter(MY_AMW, myAmw);
-		}
+	public Query setParameterToQuery(Integer startIndex, Integer maxResults,  Query query) {
 		if (startIndex != null) {
 			query.setFirstResult(startIndex);
 		}
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/environment/control/EnvironmentsScreenDomainService.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/environment/control/EnvironmentsScreenDomainService.java
index cb3390bb5..ceb035e9f 100644
--- a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/environment/control/EnvironmentsScreenDomainService.java
+++ b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/environment/control/EnvironmentsScreenDomainService.java
@@ -88,7 +88,7 @@ public void saveEnvironment(Integer contextId, String newContextName, String con
      * Erstellt einen neuen Context anhand den Name und den superContext. Der Kontext ist an einen Benutzer zugewisen
      */
     @HasPermission(permission = Permission.ADD_NEW_ENV_OR_DOM)
-    public ContextEntity createContextByName(String newName, Integer superContextId) throws ResourceNotFoundException, ElementAlreadyExistsException {
+    public ContextEntity createContextByName(String newName, String newAliasName, Integer superContextId) throws ResourceNotFoundException, ElementAlreadyExistsException {
         try {
             if (getContextByName(newName) != null) {
                 String message = "Der Kontext mit dem Namen " + newName + " ist bereits vorhanden und kann nicht erstellen werden";
@@ -113,6 +113,8 @@ public ContextEntity createContextByName(String newName, Integer superContextId)
             throw new ResourceNotFoundException("Der Superkontext mit der Id " + superContextId + " konnte nicht gefunden werden");
         }
         entity.setName(newName);
+        if(newAliasName != null)
+            entity.setNameAlias(newAliasName);
         entity.setContextType(resourceTypeProvider.getOrCreateContextType(contextName));
         entityManager.persist(entity);
         return entity;
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/environment/entity/ContextEntity.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/environment/entity/ContextEntity.java
index d5f3c0bb8..c866dc93d 100644
--- a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/environment/entity/ContextEntity.java
+++ b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/environment/entity/ContextEntity.java
@@ -25,7 +25,6 @@
 import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.ResourceTypeContextEntity;
 import ch.puzzle.itc.mobiliar.business.resourcerelation.entity.ResourceRelationContextEntity;
 import ch.puzzle.itc.mobiliar.business.resourcerelation.entity.ResourceRelationTypeContextEntity;
-import ch.puzzle.itc.mobiliar.business.shakedown.entity.ShakedownTestEntity;
 import ch.puzzle.itc.mobiliar.common.util.ContextNames;
 import lombok.Getter;
 import lombok.Setter;
@@ -104,12 +103,6 @@ public class ContextEntity extends AbstractContext {
     @NotAudited
     private Set<DeploymentEntity> deploys;
 
-    @Getter
-    @OneToMany(cascade = CascadeType.ALL, mappedBy = "context")
-    @AuditMappedBy(mappedBy = "context")
-    @NotAudited
-    private Set<ShakedownTestEntity> shakedownTests;
-
     @Getter
     private static final long serialVersionUID = 1L;
 
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/generator/control/GeneratorDomainServiceWithAppServerRelations.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/generator/control/GeneratorDomainServiceWithAppServerRelations.java
index 704ba79fe..c4ea83c1a 100644
--- a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/generator/control/GeneratorDomainServiceWithAppServerRelations.java
+++ b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/generator/control/GeneratorDomainServiceWithAppServerRelations.java
@@ -270,7 +270,6 @@ public GenerationResult generateConfigurationAndGetFoldersToExecute(DeploymentEn
         for (final ContextEntity c : getAllEnvironments(context)) {
             GenerationContext generationContext = new GenerationContext(c, applicationServerFromHistory, deployment,
                     deploymentDate, generationModus, resourceDependencyResolver);
-            generationContext.setTesting(false);
 
             generationContext.setGlobalFunctions(globalFunctions);
             result.addEnvironmentGenerationResult(generateApplicationServerConfigurationForEnvironment(generationContext));
@@ -358,7 +357,7 @@ void omitTemplateForLackingPermissions(ContextEntity context, ResourceEntity res
     }
 
     /**
-     * @return a faked deploymentEntity for testing and shakedownTests
+     * @return a faked deploymentEntity for testing
      */
     public DeploymentEntity createFakeDeployment(Integer id, ReleaseEntity release, ResourceEntity runtime, Date stateToDeploy) {
         DeploymentEntity fakeDeplyoment = new DeploymentEntity();
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/generator/control/GeneratorUtils.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/generator/control/GeneratorUtils.java
index d0d268a77..6940d8f72 100644
--- a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/generator/control/GeneratorUtils.java
+++ b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/generator/control/GeneratorUtils.java
@@ -40,30 +40,29 @@ public class GeneratorUtils {
 
     public Set<TemplateDescriptorEntity> getTemplates(ContextEntity context,
                                                       AbstractResourceRelationEntity resourceRelation, Set<TemplateDescriptorEntity> result,
-                                                      Integer platform, boolean testing) {
+                                                      Integer platform) {
         if (result == null) {
             result = new HashSet<>();
         }
-        getTemplateDescriptorsForContext(context, resourceRelation, result, platform, testing);
+        getTemplateDescriptorsForContext(context, resourceRelation, result, platform);
         if (context.getParent() != null) {
-            result = getTemplates(context.getParent(), resourceRelation, result, platform, testing);
+            result = getTemplates(context.getParent(), resourceRelation, result, platform);
         }
         result.addAll(getTemplates(resourceRelation.getResourceRelationType().getResourceTypeA(),
-                resourceRelation.getResourceRelationType().getResourceTypeB(), context, platform, testing));
+                resourceRelation.getResourceRelationType().getResourceTypeB(), context, platform));
         return result;
     }
 
     private Set<TemplateDescriptorEntity> getTemplateDescriptorsForContext(ContextEntity context,
                                                                            AbstractResourceRelationEntity resourceRelation, Set<TemplateDescriptorEntity> result,
-                                                                           Integer platform, boolean testing) {
+                                                                           Integer platform) {
         if (resourceRelation != null) {
             if (resourceRelation.getContexts() != null) {
                 for (ResourceRelationContextEntity resourceRelationContext : resourceRelation
                         .getContexts()) {
                     if (resourceRelationContext.getContext() != null
                             && resourceRelationContext.getContext().getId().equals(context.getId())) {
-                        result = collectTemplateDescriptors(resourceRelationContext, result, platform,
-                                testing);
+                        result = collectTemplateDescriptors(resourceRelationContext, result, platform);
                     }
                 }
             }
@@ -175,7 +174,7 @@ private Map<PropertyDescriptorEntity, List<PropertyEntity>> getPropertyValues(
     /*************************************** START RESOURCE **********************************************/
 
     public Set<TemplateDescriptorEntity> getTemplates(ResourceEntity resource, ContextEntity context,
-                                                      Set<TemplateDescriptorEntity> result, Integer platform, boolean testing) {
+                                                      Set<TemplateDescriptorEntity> result, Integer platform) {
         if (result == null) {
             result = new HashSet<>();
         }
@@ -184,14 +183,13 @@ public Set<TemplateDescriptorEntity> getTemplates(ResourceEntity resource, Conte
                 for (ResourceContextEntity relatedResourceContext : resource.getContexts()) {
                     if (relatedResourceContext.getContext() != null
                             && relatedResourceContext.getContext().getId().equals(context.getId())) {
-                        result = collectTemplateDescriptors(relatedResourceContext, result, platform,
-                                testing);
+                        result = collectTemplateDescriptors(relatedResourceContext, result, platform);
                     }
                 }
             }
-            result = getTemplatesForContext(context, resource.getResourceType(), result, platform, testing);
+            result = getTemplatesForContext(context, resource.getResourceType(), result, platform);
             if (context.getParent() != null) {
-                result = getTemplates(resource, context.getParent(), result, platform, testing);
+                result = getTemplates(resource, context.getParent(), result, platform);
             }
         }
         return result;
@@ -249,8 +247,7 @@ private Set<PropertyDescriptorEntity> getPropertyDescriptorsForContext(ContextEn
     /*************************************** START RELATED RESOURCE TYPES **********************************************/
 
     private Set<TemplateDescriptorEntity> getTemplates(ResourceTypeEntity resourceType,
-                                                       ResourceTypeEntity relatedResourceType, ContextEntity context, Integer targetPlatform,
-                                                       boolean testing) {
+                                                       ResourceTypeEntity relatedResourceType, ContextEntity context, Integer targetPlatform) {
         Set<TemplateDescriptorEntity> result = new HashSet<>();
         for (ResourceRelationTypeEntity relType : TemplateUtils.getAllResourceRelationTypes(resourceType,
                 relatedResourceType)) {
@@ -258,8 +255,8 @@ private Set<TemplateDescriptorEntity> getTemplates(ResourceTypeEntity resourceTy
                     .getContextsByLowestContext(context)) {
                 if (relContextType.getTemplates() != null) {
                     for (TemplateDescriptorEntity template : relContextType.getTemplates()) {
-                        if (testing == template.isTesting() && (targetPlatform != null && containsRuntimeId(targetPlatform,
-                                template.getTargetPlatforms()))) {
+                        if (targetPlatform != null && containsRuntimeId(targetPlatform,
+                                template.getTargetPlatforms())) {
                             template.setRelationTemplate(true);
                             result.add(template);
                         }
@@ -275,8 +272,7 @@ private Set<TemplateDescriptorEntity> getTemplates(ResourceTypeEntity resourceTy
     /*************************************** START RESOURCE TYPE **********************************************/
 
     private Set<TemplateDescriptorEntity> getTemplatesForContext(ContextEntity context,
-                                                                 ResourceTypeEntity resourceType, Set<TemplateDescriptorEntity> result, Integer platform,
-                                                                 boolean testing) {
+                                                                 ResourceTypeEntity resourceType, Set<TemplateDescriptorEntity> result, Integer platform) {
         if (resourceType != null) {
             ResourceTypeEntity resType = resourceType;
             while (resType != null) {
@@ -285,8 +281,7 @@ private Set<TemplateDescriptorEntity> getTemplatesForContext(ContextEntity conte
                     for (ResourceTypeContextEntity resourceTypeContext : resType.getContexts()) {
                         if (resourceTypeContext.getContext() != null
                                 && resourceTypeContext.getContext().getId().equals(context.getId())) {
-                            result = collectTemplateDescriptors(resourceTypeContext, result, platform,
-                                    testing);
+                            result = collectTemplateDescriptors(resourceTypeContext, result, platform);
                         }
                     }
                 }
@@ -376,7 +371,7 @@ private boolean containsRuntimeId(Integer runtime, Set<ResourceGroupEntity> runt
     }
 
     public Set<TemplateDescriptorEntity> collectTemplateDescriptors(AbstractContext context,
-                                                                    Set<TemplateDescriptorEntity> result, Integer targetPlatform, boolean testing) {
+                                                                    Set<TemplateDescriptorEntity> result, Integer targetPlatform) {
         if (result == null) {
             result = new HashSet<>();
         }
@@ -385,11 +380,9 @@ public Set<TemplateDescriptorEntity> collectTemplateDescriptors(AbstractContext
                 // Only consider templates for the given platform
                 if (targetPlatform != null
                         && containsRuntimeId(targetPlatform, template.getTargetPlatforms())) {
-                    // distinct between testing and non-testing templates
-                    if (testing == template.isTesting()) {
+
                         template.setOwnerResource(context);
                         result.add(template);
-                    }
                 }
             }
         }
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/generator/control/LockingService.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/generator/control/LockingService.java
index 920e1c0d6..2572d6f20 100644
--- a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/generator/control/LockingService.java
+++ b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/generator/control/LockingService.java
@@ -23,8 +23,6 @@
 import ch.puzzle.itc.mobiliar.business.deploy.entity.DeploymentEntity;
 import ch.puzzle.itc.mobiliar.business.deploy.entity.DeploymentState;
 import ch.puzzle.itc.mobiliar.business.generator.control.extracted.GenerationModus;
-import ch.puzzle.itc.mobiliar.business.shakedown.entity.ShakedownTestEntity;
-import ch.puzzle.itc.mobiliar.business.shakedown.entity.ShakedownTestEntity.shakedownTest_state;
 
 import javax.ejb.Stateless;
 import javax.ejb.TransactionAttribute;
@@ -86,35 +84,4 @@ public boolean markDeploymentAsRunning(Integer id, GenerationModus generationMod
 		
 		return true;
 	}
-	
-
-	/**
-	 * Locks a shakedown test on the database (therefore it runs in its own transaction) to make sure,
-	 * that the test is only executed once
-	 * 
-	 * @param id
-	 * @return true if the test has successfully been locked and can be executed, false otherwise
-	 */
-	@TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
-	public boolean markShakedownTestAsRunning(Integer id){
-		ShakedownTestEntity s;
-		log.fine("Locking ShakedownTest " + id);
-		try{
-			s = entityManager.find(ShakedownTestEntity.class, id, LockModeType.PESSIMISTIC_FORCE_INCREMENT);
-		}
-		catch (LockTimeoutException e) {
-			log.warning("Locking of ShakedownTest " + id + " not possible!");
-			return false;
-		}
-
-		if (s.isExecuted()) {
-			log.info("Test " + s.getId() + " was already executed.");
-			return false;
-		}
-		
-		s.setExecuted(true);
-		s.setShakedownTestStateDisplayName(shakedownTest_state.inprogress);
-		entityManager.persist(s);
-		return true;	
-	}
 }
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/generator/control/ShakedownTestGeneratorDomainService.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/generator/control/ShakedownTestGeneratorDomainService.java
deleted file mode 100644
index 7ef2819b4..000000000
--- a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/generator/control/ShakedownTestGeneratorDomainService.java
+++ /dev/null
@@ -1,241 +0,0 @@
-/*
- * AMW - Automated Middleware allows you to manage the configurations of
- * your Java EE applications on an unlimited number of different environments
- * with various versions, including the automated deployment of those apps.
- * Copyright (C) 2013-2016 by Puzzle ITC
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package ch.puzzle.itc.mobiliar.business.generator.control;
-
-import java.io.IOException;
-import java.io.StringReader;
-import java.util.Date;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.ejb.Stateless;
-import javax.inject.Inject;
-import javax.persistence.EntityManager;
-import javax.xml.bind.JAXB;
-
-import ch.puzzle.itc.mobiliar.business.deploy.entity.DeploymentEntity;
-import ch.puzzle.itc.mobiliar.business.environment.control.ContextDomainService;
-import ch.puzzle.itc.mobiliar.business.environment.entity.ContextEntity;
-import ch.puzzle.itc.mobiliar.business.generator.control.extracted.GenerationContext;
-import ch.puzzle.itc.mobiliar.business.generator.control.extracted.GenerationModus;
-import ch.puzzle.itc.mobiliar.business.generator.control.extracted.ResourceDependencyResolverService;
-import ch.puzzle.itc.mobiliar.business.globalfunction.control.GlobalFunctionService;
-import ch.puzzle.itc.mobiliar.business.globalfunction.entity.GlobalFunctionEntity;
-import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.ResourceEntity;
-import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.ResourceGroupEntity;
-import ch.puzzle.itc.mobiliar.business.shakedown.control.ShakedownTestExecutionResultHandlerService;
-import ch.puzzle.itc.mobiliar.business.shakedown.control.ShakedownTestGenerationResult;
-import ch.puzzle.itc.mobiliar.business.shakedown.entity.ShakedownTestEntity;
-import ch.puzzle.itc.mobiliar.business.shakedown.xmlmodel.STS;
-import ch.puzzle.itc.mobiliar.business.shakedown.xmlmodel.ShakedownTestEnvironmentGenerationResult;
-import ch.puzzle.itc.mobiliar.common.exception.GeneratorException;
-import ch.puzzle.itc.mobiliar.common.exception.GeneratorException.MISSING;
-import ch.puzzle.itc.mobiliar.common.util.DefaultResourceTypeDefinition;
-
-@Stateless
-public class ShakedownTestGeneratorDomainService {
-
-	public static final String STS_NAME = "STS";
-
-	@Inject
-	private ShakedownTestExecutionResultHandlerService shakedownTestExecutionResultHandlerService;
-
-	@Inject
-	private ContextDomainService contextDomainService;
-	
-	@Inject 
-    private GlobalFunctionService globalFunctionService;
-
-	@Inject
-	GeneratorDomainServiceWithAppServerRelations generatorDomainService;
-
-	@Inject
-	private ResourceDependencyResolverService resourceDependencyResolver;
-
-	@Inject
-	private EntityManager entityManager;
-
-	@Inject
-	Logger log;
-
-	/**
-	 * @param shakedownTest
-	 * @return a ShakedownTestGenerationResult irrespective of the success of the test template generation.
-	 *         In case of failure, the result object contains the updated shakedowntest entity holding the
-	 *         information about the actual failure.
-	 */
-	public ShakedownTestGenerationResult generateConfigurationForShakedownTest(ShakedownTestEntity shakedownTest) {
-
-		log.info("Start schreiben der Konfiguration für alle Nodes des Shakedowntests " + shakedownTest.getId());
-		ShakedownTestGenerationResult result = null;
-		try {
-			result = generateTestingTemplatesForAllNodes(shakedownTest);
-			if (result != null && result.hasErrors()) {
-				shakedownTestExecutionResultHandlerService.handleUnsuccessfulShakedownTest(result.getErrorMessage(), shakedownTest.getId());
-			}
-		} catch (final GeneratorException e) {
-			shakedownTestExecutionResultHandlerService.handleUnsuccessfulShakedownTest(e, shakedownTest.getId());
-		} catch (final IOException e) {
-			shakedownTestExecutionResultHandlerService.handleUnsuccessfulShakedownTest(e, shakedownTest.getId());
-		}
-		return result;
-	}
-
-	/**
-	 * There are two types of templates in AMW: For configuration and for system testing (health check of
-	 * environments, etc.). This method generates the templates for test cases and wraps them into test
-	 * suites (STS) ready to be sent out to the server instances for execution.<br>
-	 * There will be used the actual (not the audited) templates for testing.
-	 * 
-	 * @param shakedownTest
-	 *             - the identifier of the test case the templates should be generated for
-	 * @return
-	 * @throws GeneratorException
-	 */
-	private ShakedownTestGenerationResult generateTestingTemplatesForAllNodes(ShakedownTestEntity shakedownTest) throws GeneratorException, IOException {
-		// A test should always use current (not the audited) testing templates (at the risk that some
-		// properties are different from the deployed version but this is ok).
-		// We therefore are not resolving the resources through the audited tables but directly on the live tables...
-
-		Integer contextId = shakedownTest.getContext().getId();
-		// If the context is not defined, we choose the global context
-		if (contextId == null) {
-			contextId = contextDomainService.getGlobalResourceContextEntity().getId();
-		}
-		// Get the application server group from the database (ensure attached state)
-		final ResourceGroupEntity applicationServerGroup = entityManager.find(ResourceGroupEntity.class, shakedownTest.getApplicationServer().getResourceGroup().getId());
-
-		final ResourceEntity applicationServer = resourceDependencyResolver.getResourceEntityForRelease(applicationServerGroup, shakedownTest.getRelease());
-
-		final ContextEntity context = entityManager.find(ContextEntity.class, contextId);
-
-		if (applicationServer == null) {
-			final String message = "ApplicationServer " + shakedownTest.getResourceGroup().getName() + " does not exist in release "
-					+ shakedownTest.getApplicationServer().getRelease().getName();
-			log.info(message);
-			throw new GeneratorException(message, MISSING.APPSERVER, shakedownTest.getId());
-		}
-		if (context == null) {
-			final String message = "Keine Umgebung vorhanden";
-			log.log(Level.WARNING, message);
-			throw new GeneratorException(message, MISSING.CONTEXT, shakedownTest.getId());
-		}
-
-		final ResourceEntity runtime = resourceDependencyResolver.getResourceEntityForRelease(applicationServer.getRuntime(), shakedownTest.getRelease());
-
-		// find the environments we want to generate the test configuration
-		// for
-		// and actually generate them...
-		log.info("Start schreiben der Test-Konfiguration für alle Nodes");
-		ShakedownTestGenerationResult result = new ShakedownTestGenerationResult();
-		result.setShakedownTestEntity(shakedownTest);
-		
-		Date stateDate = new Date();
-		List<GlobalFunctionEntity> globalFunctions = globalFunctionService.getAllGlobalFunctionsAtDate(stateDate);
-		
-		for (final ContextEntity c : generatorDomainService.getAllEnvironments(context)) {
-
-			// FIXME: Use Shakedowntest Entity in Generation Context
-			DeploymentEntity fakeDeplyoment = generatorDomainService.createFakeDeployment(shakedownTest.getId(), shakedownTest.getRelease(),
-					runtime, stateDate);
-			GenerationContext generationContext = new GenerationContext(c, applicationServer, fakeDeplyoment, new Date(), GenerationModus.DEPLOY, resourceDependencyResolver);
-			generationContext.setTesting(true);
-			generationContext.setGlobalFunctions(globalFunctions);
-
-			ShakedownTestEnvironmentGenerationResult envResult = generateTestingTemplatesForContext(generationContext);
-			result.addEnvironmentGenerationResult(envResult);
-			result.addAllTestingTemplates(envResult.getTestingTemplates());
-		}
-		return result;
-	}
-
-	/**
-	 * Generates the testing templates for the given environment .
-	 * 
-	 * @param context
-	 * @return
-	 * @throws GeneratorException
-	 */
-	private ShakedownTestEnvironmentGenerationResult generateTestingTemplatesForContext(GenerationContext context) throws GeneratorException, IOException {
-		// Get all nodes of this application server
-		final List<ResourceEntity> nodes = context.getApplicationServer().getConsumedRelatedResourcesByResourceType(DefaultResourceTypeDefinition.NODE);
-		if (nodes == null || nodes.isEmpty()) {
-			final String message = "No nodes available";
-			log.info(message);
-			throw new GeneratorException(message, MISSING.NODE, context.getDeploymentId());
-		}
-
-		ShakedownTestEnvironmentGenerationResult result = new ShakedownTestEnvironmentGenerationResult();
-		boolean hasActiveNodes = false;
-	   	for (final ResourceEntity node : nodes) {
-			context.setNode(node);
-			NodeGenerationResult nodeGenerationResult = generatorDomainService.generateApplicationServerConfigPerNode(context);
-			if(nodeGenerationResult.isNodeEnabled()) {
-			    result.addNodeGenerationResult(nodeGenerationResult);
-			    result.addTestingTemplate(
-					    extractAndConvertSTSTemplate(context.getDeploymentId(), nodeGenerationResult));
-			    hasActiveNodes = true;
-			}
-		}
-	     if(!hasActiveNodes){
-		    final String message = "No active nodes available - please define the hostname on the nodes";
-		    log.info(message);
-		    throw new GeneratorException(message, MISSING.NODE, context.getDeploymentId());
-		}
-		return result;
-	}
-
-	/**
-	 * Extracts the STS template out of the given already processed templates and transforms it to a STS
-	 * object.
-	 * 
-	 * @param testId
-	 *             - the identifier of the current test (for creating more meaningful exception messages)
-	 * @param generationResult
-	 *             - holds the already processed templates for the given node
-	 * @return the sts template as a {@link STS} object
-	 * @throws GeneratorException
-	 */
-	private STS extractAndConvertSTSTemplate(final Integer testId, NodeGenerationResult generationResult) throws GeneratorException {
-
-		List<GeneratedTemplate> generatedTemplates = generationResult.getGeneratedTemplates();
-		if (generatedTemplates != null) {
-			for (GeneratedTemplate generatedTemplate : generatedTemplates) {
-				// only consider Templates with the name STS
-				if (STS_NAME.equals(generatedTemplate.getName())) {
-					final String stsContent = generatedTemplate.getContent();
-					if (stsContent != null && !stsContent.trim().isEmpty()) {
-						try {
-							return JAXB.unmarshal(new StringReader(stsContent), STS.class);
-						} catch (final Exception e) {
-							throw new GeneratorException("STS-generation failed!", null, testId, e);
-						}
-					} else {
-						throw new GeneratorException("Invalid STS-template!", null, testId);
-					}
-				}
-			}
-		}
-		throw new GeneratorException("No STS-template available!", MISSING.STS_TEMPLATE, testId);
-	}
-
-}
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/generator/control/extracted/GenerationContext.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/generator/control/extracted/GenerationContext.java
index d6b33bf13..f436a7d78 100644
--- a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/generator/control/extracted/GenerationContext.java
+++ b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/generator/control/extracted/GenerationContext.java
@@ -47,7 +47,6 @@ public class GenerationContext {
 	private GenerationModus generationModus;
 	private List<ApplicationWithVersion> applicationsWithVersion;
 	private ResourceEntity node;
-	private boolean testing;
 	private ResourceDependencyResolverService resourceDependencyResolver;
 
 	private String generationDir;
@@ -133,14 +132,6 @@ public List<ApplicationWithVersion> getApplicationsWithVersion() {
 		return applicationsWithVersion;
 	}
 
-	public boolean isTesting() {
-		return testing;
-	}
-
-	public void setTesting(boolean testing) {
-		this.testing = testing;
-	}
-
 	public Integer getDeploymentId() {
 		return deploymentId;
 	}
@@ -193,8 +184,7 @@ public List<GlobalFunctionEntity> getGlobalFunctions() {
 	
 	public GenerationContext copyGenerationContextForOtherAs(ResourceEntity as){
 		GenerationContext c = new GenerationContext(context, as, deployment, deploymentDate, generationModus, resourceDependencyResolver);
-		c.setTesting(testing);
-		
+
 		return c;
 	}
 	
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/generator/control/extracted/templates/GenerationUnitFactory.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/generator/control/extracted/templates/GenerationUnitFactory.java
index 3c37476fb..3129448fc 100644
--- a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/generator/control/extracted/templates/GenerationUnitFactory.java
+++ b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/generator/control/extracted/templates/GenerationUnitFactory.java
@@ -448,7 +448,7 @@ protected Set<TemplateDescriptorEntity> templatesForResource(GenerationOptions o
 			ResourceEntity resource) {
 		Set<TemplateDescriptorEntity> templates = Sets.newLinkedHashSet();
 		utils.getTemplates(resource, options.getContext().getContext(), templates, options.getContext()
-				.getTargetPlatformId(), options.getContext().isTesting());
+				.getTargetPlatformId());
 		return templates;
 	}
 
@@ -458,7 +458,7 @@ protected Set<TemplateDescriptorEntity> templatesForRelation(GenerationOptions o
 		if (resourceRelation != null) {
 			// relation is null when handed a ASR base on TYPES
 			utils.getTemplates(options.getContext().getContext(), resourceRelation, templates, options
-					.getContext().getTargetPlatformId(), options.getContext().isTesting());
+					.getContext().getTargetPlatformId());
 		}
 		return templates;
 	}
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/globalfunction/boundary/GlobalFunctionsBoundary.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/globalfunction/boundary/GlobalFunctionsBoundary.java
index 8d551022a..9bbbd19af 100644
--- a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/globalfunction/boundary/GlobalFunctionsBoundary.java
+++ b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/globalfunction/boundary/GlobalFunctionsBoundary.java
@@ -28,6 +28,8 @@
 import ch.puzzle.itc.mobiliar.business.template.control.FreemarkerSyntaxValidator;
 import ch.puzzle.itc.mobiliar.business.template.entity.RevisionInformation;
 import ch.puzzle.itc.mobiliar.common.exception.AMWException;
+import ch.puzzle.itc.mobiliar.common.exception.NotFoundException;
+import ch.puzzle.itc.mobiliar.common.exception.ValidationException;
 import org.apache.commons.lang3.StringUtils;
 import org.hibernate.envers.AuditReader;
 import org.hibernate.envers.AuditReaderFactory;
@@ -60,16 +62,23 @@ public List<GlobalFunctionEntity> getAllGlobalFunctions(Date date) {
         return functionService.getAllGlobalFunctionsAtDate(date);
     }
 
-    public GlobalFunctionEntity getFunctionById(Integer globalFunctionId) {
-        return entityManager.find(GlobalFunctionEntity.class, globalFunctionId);
+    public GlobalFunctionEntity getFunctionById(Integer globalFunctionId) throws NotFoundException {
+        GlobalFunctionEntity gf = entityManager.find(GlobalFunctionEntity.class, globalFunctionId);
+        if (gf == null) {
+            throw new NotFoundException("Function not found with Id " + globalFunctionId);
+        }
+        return gf;
     }
 
     /**
      * Returns a AmwFunctionEntity identified by its id and revision id
      */
-    public GlobalFunctionEntity getFunctionByIdAndRevision(Integer functionId, Number revisionId) {
+    public GlobalFunctionEntity getFunctionByIdAndRevision(Integer functionId, Number revisionId) throws NotFoundException {
         GlobalFunctionEntity globalFunctionEntity = AuditReaderFactory.get(entityManager).find(
                 GlobalFunctionEntity.class, functionId, revisionId);
+        if (globalFunctionEntity == null) {
+            throw new NotFoundException("No function with id " + functionId + " and revision id " + revisionId + " found");
+        }
         return globalFunctionEntity;
     }
 
@@ -92,8 +101,11 @@ public List<RevisionInformation> getFunctionRevisions(Integer functionId) {
     }
 
     @HasPermission(permission = Permission.MANAGE_GLOBAL_FUNCTIONS)
-    public void deleteGlobalFunction(Integer globalFunctionId) {
+    public void deleteGlobalFunction(Integer globalFunctionId) throws NotFoundException {
         GlobalFunctionEntity gf = entityManager.find(GlobalFunctionEntity.class, globalFunctionId);
+        if (gf == null) {
+            throw new NotFoundException("Function not found with Id " + globalFunctionId);
+        }
         deleteGlobalFunction(gf);
     }
 
@@ -103,14 +115,25 @@ public void deleteGlobalFunction(GlobalFunctionEntity function) {
     }
 
     @HasPermission(permission = Permission.MANAGE_GLOBAL_FUNCTIONS)
-    public boolean saveGlobalFunction(GlobalFunctionEntity function) throws AMWException {
+    public boolean saveGlobalFunction(GlobalFunctionEntity function) throws ValidationException {
         if (function != null) {
-            if (StringUtils.isEmpty(function.getName())) {
-                throw new AMWException("The function name must not be empty");
+            if (StringUtils.isEmpty(function.getName()) || StringUtils.isEmpty(function.getContent())) {
+                throw new ValidationException("The function must not be empty");
+            }
+            try {
+                freemarkerValidator.validateFreemarkerSyntax(function.getContent());
+            } catch (AMWException e) {
+                throw new ValidationException(e.getMessage(), e);
+            }
+            boolean saved = functionService.saveFunction(function);
+            if (!saved) {
+                throw new ValidationException("Function with same name already exists");
             }
-            freemarkerValidator.validateFreemarkerSyntax(function.getContent());
-            return functionService.saveFunction(function);
         }
         return true;
     }
+
+    public boolean isExistingId(Integer id) {
+        return functionService.isExistingId(id);
+    }
 }
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/globalfunction/control/GlobalFunctionRepository.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/globalfunction/control/GlobalFunctionRepository.java
index 75c45032b..ec775bae0 100644
--- a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/globalfunction/control/GlobalFunctionRepository.java
+++ b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/globalfunction/control/GlobalFunctionRepository.java
@@ -21,6 +21,7 @@
 package ch.puzzle.itc.mobiliar.business.globalfunction.control;
 
 import java.util.List;
+import java.util.Objects;
 
 import javax.inject.Inject;
 import javax.persistence.EntityManager;
@@ -47,6 +48,9 @@ public boolean saveFunction(GlobalFunctionEntity gFunction) {
 			entityManager.persist(gFunction);
 		}
 		else {
+			if (isExistingName(gFunction) && !Objects.equals(gFunction.getId(), Objects.requireNonNull(findFunctionByName(gFunction.getName())).getId())) {
+				return false;
+			}
 			entityManager.merge(gFunction);
 		}
 		return true;
@@ -71,4 +75,15 @@ private GlobalFunctionEntity findFunctionByName(String name) {
 		List<Object> result = tq.getResultList();
 		return result.isEmpty() ? null : (GlobalFunctionEntity) result.get(0);
 	}
+
+	public boolean isExistingId(Integer id) {
+		return findFunctionById(id) != null;
+	}
+
+	private GlobalFunctionEntity findFunctionById(Integer id) {
+		final TypedQuery<GlobalFunctionEntity> query = entityManager.createQuery("from GlobalFunctionEntity g where g.id = :id", GlobalFunctionEntity.class);
+		query.setParameter("id", id);
+		List<GlobalFunctionEntity> result = query.getResultList();
+		return result.isEmpty() ? null : result.get(0);
+	}
 }
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/globalfunction/control/GlobalFunctionService.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/globalfunction/control/GlobalFunctionService.java
index 88df53bdd..63401ceb1 100644
--- a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/globalfunction/control/GlobalFunctionService.java
+++ b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/globalfunction/control/GlobalFunctionService.java
@@ -64,5 +64,9 @@ public boolean saveFunction(GlobalFunctionEntity gFunction) {
     public void deleteFunction(GlobalFunctionEntity gFunction)  {
         globalFunctionRepository.deleteFunction(gFunction);
     }
+
+    public boolean isExistingId(Integer id) {
+        return globalFunctionRepository.isExistingId(id);
+    }
     
 }
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/property/boundary/PropertyEditor.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/property/boundary/PropertyEditor.java
index 948e811d3..e637c69e2 100644
--- a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/property/boundary/PropertyEditor.java
+++ b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/property/boundary/PropertyEditor.java
@@ -167,7 +167,7 @@ public List<PropertyDescriptorEntity> getPropertyDescriptorsForResourceTypeWithN
      * @return all available property types with validation logic
      */
     public List<PropertyTypeEntity> getPropertyTypes() {
-        return propertyTypeService.getPropertyTypes();
+        return propertyTypeService.loadAll();
     }
 
     /**
@@ -684,16 +684,6 @@ private PropertyDescriptorEntity getMatchingPropertyDescriptorEntity(String prop
         return null;
     }
 
-    /**
-     * Checks Permissions and Persists the given shakedown test property descriptor to the database for resource instance
-     */
-    @HasPermission(permission = Permission.SHAKEDOWN_TEST_MODE)
-    public PropertyDescriptorEntity saveTestingPropertyDescriptorForResource(Integer resourceId, PropertyDescriptorEntity descriptor,int foreignableHashBeforeModification, String propertyTagsString) throws AMWException, ForeignableOwnerViolationException {
-        // verify if modifications are allowed
-        foreignableService.verifyEditableByOwner(ForeignableOwner.getSystemOwner(), foreignableHashBeforeModification, descriptor);
-        return savePropertyDescriptorResource(ForeignableOwner.getSystemOwner(), resourceId, descriptor, propertyTagsString);
-    }
-
     /**
      * Checks Permissions and Persists the given property descriptor to the database for resource instance
      */
@@ -718,17 +708,6 @@ private PropertyDescriptorEntity savePropertyDescriptorResource(ForeignableOwner
         return propertyDescriptorService.savePropertyDescriptorForOwner(editingOwner, resourceContext, descriptor, propertyTagEditingService.convertToTags(propertyTagsString), attachedResource);
     }
 
-    /**
-     * Checks Permissions and Persists the given shakedown test property descriptor to the database for resource type
-     */
-    @HasPermission(permission = Permission.SHAKEDOWN_TEST_MODE)
-    public PropertyDescriptorEntity saveTestingPropertyDescriptorForResourceType(Integer resourceTypeId, PropertyDescriptorEntity descriptor, int foreignableHashBeforeModification, String propertyTagsString) throws AMWException, ForeignableOwnerViolationException {
-
-        // verify if modifications are allowed
-        foreignableService.verifyEditableByOwner(ForeignableOwner.getSystemOwner(), foreignableHashBeforeModification, descriptor);
-        return savePropertyDescriptorResourceType(ForeignableOwner.getSystemOwner(), resourceTypeId, descriptor, propertyTagsString);
-    }
-
     /**
      * Checks Permissions and Persists the given property descriptor to the database for resource type
      */
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/property/control/PropertyTypeScreenDomainService.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/property/control/PropertyTypeScreenDomainService.java
deleted file mode 100644
index 8d07da7e9..000000000
--- a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/property/control/PropertyTypeScreenDomainService.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- * AMW - Automated Middleware allows you to manage the configurations of
- * your Java EE applications on an unlimited number of different environments
- * with various versions, including the automated deployment of those apps.
- * Copyright (C) 2013-2016 by Puzzle ITC
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package ch.puzzle.itc.mobiliar.business.property.control;
-
-import java.util.List;
-import java.util.logging.Logger;
-
-import javax.ejb.Stateless;
-import javax.inject.Inject;
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
-import javax.persistence.Query;
-
-import ch.puzzle.itc.mobiliar.business.domain.commons.CommonDomainService;
-import ch.puzzle.itc.mobiliar.business.domain.commons.CommonQueries;
-import ch.puzzle.itc.mobiliar.business.property.entity.PropertyTagEntity;
-import ch.puzzle.itc.mobiliar.business.property.entity.PropertyTypeEntity;
-import ch.puzzle.itc.mobiliar.business.security.entity.Permission;
-import ch.puzzle.itc.mobiliar.business.security.interceptor.HasPermission;
-import ch.puzzle.itc.mobiliar.common.exception.*;
-
-/**
- * @author aromano
- *
- */
-// TODO: transfer to PropertyTypeService
-@Stateless
-public class PropertyTypeScreenDomainService {
-
-	@Inject
-	private Logger log;
-	
-	@Inject
-	private CommonDomainService commonService;
-	
-	@Inject
-	private CommonQueries commonQueries;
-	
-	@Inject
-	private EntityManager entityManager;
-
-    @Inject
-    private PropertyTagEditingService propertyTagEditingService;
-
-	/**
-	 * Speichert/umbenennen den PropertyType anhand den Name und Validation.
-	 * @param id
-	 * @param name
-	 * @param validation
-     * @param propertyTypeTagsString
-	 * @throws PropertyTypeNotFoundException
-	 * @throws ElementAlreadyExistsException
-	 * @throws RenameException
-	 */
-	@HasPermission(permission = Permission.SAVE_SETTINGS_PROPTYPE)
-	public void updatePropertyType(int id, String name, String validation, boolean encrypted, String propertyTypeTagsString)
-			throws PropertyTypeNotFoundException,
-			ElementAlreadyExistsException, RenameException {
-		
-		PropertyTypeEntity propertyTypeEntity = getPropertyTypeById(id);		
-		PropertyTypeEntity propertyByName = getPropertyTypeByName(name);
-		
-		if (propertyByName != null && !propertyByName.getId().equals(propertyTypeEntity.getId())){
-			String message = "An other PropertyType with the same Name already exists.";
-			throw new RenameException(message);
-		}
-		
-		propertyTypeEntity.setValidationRegex(validation);
-		propertyTypeEntity.setPropertyTypeName(name);
-		propertyTypeEntity.setEncrypt(encrypted);
-
-        // Update Tags
-        List<PropertyTagEntity> tags = propertyTagEditingService.convertToTags(propertyTypeTagsString);
-        propertyTagEditingService.updateTags(tags,propertyTypeEntity);
-	}
-	
-	/**
-	 * Erstellt einen neuen PropertyType anhand den Name und Validation..
-	 * @param prtName
-	 * @param prtValidation
-	 * @throws ElementAlreadyExistsException
-	 */
-	@HasPermission(permission = Permission.ADD_PROPTYPE)
-	public PropertyTypeEntity createPropertyTypeByNameAndVal(String prtName,
-			String prtValidation, boolean encrypted, String propertyTypeTagsString) throws ElementAlreadyExistsException {
-		
-		PropertyTypeEntity newPropertyTypeEntity = commonService.getUniquePropertyTypeByName(prtName);
-        PropertyTypeEntity result;
-		
-		if ( newPropertyTypeEntity == null ) {
-
-			result = new PropertyTypeEntity();
-            result.setPropertyTypeName(prtName);
-            result.setValidationRegex(prtValidation);
-			result.setEncrypt(encrypted);
-
-			entityManager.persist(result);
-
-			// Update Tags
-			List<PropertyTagEntity> tags = propertyTagEditingService.convertToTags(propertyTypeTagsString);
-			propertyTagEditingService.updateTags(tags, result);
-
-			log.info("Property Type " + prtName + " in DB persist");
-		} else {
-			String message = "Das Property Type mit dem Namen: " + prtName
-					+ " ist beretis vorhanden und kann nicht erstellen werden";
-			log.info(message);
-			throw new ElementAlreadyExistsException(message,
-					PropertyTypeEntity.class, prtName);
-		}
-		return result;
-	}
-
-	/**
-	 * Löscht den PropertyType anhand der Id.
-	 * @param id
-	 * @throws PropertyTypeNotFoundException
-	 * @throws PropertyTypeNotDeletableException 
-	 */
-	@HasPermission(permission = Permission.DELETE_PROPTYPE)
-	public void deletePropertyTypeById(int id) throws PropertyTypeNotFoundException, PropertyTypeNotDeletableException{
-		
-		PropertyTypeEntity propertyTypeEntity = getPropertyTypeById(id); 
-		if(propertyTypeEntity == null){
-			String message = "Der zu löschende Property Type ist nicht vorhanden";
-			log.info(message);
-			throw new PropertyTypeNotFoundException(message);
-		}
-		if (!propertyTypeEntity.getPropertyDescriptors().isEmpty()){
-			String message = "Propertytype kann nicht gelöscht werden weil dieser von propertydescriptors verwendet wird.";
-			log.info(message);
-			throw new PropertyTypeNotDeletableException(message);
-		}
-		
-		entityManager.remove(propertyTypeEntity);
-		log.info("Property Type mit der Id: " + propertyTypeEntity.getId() + " wurde aus der DB gelöscht");
-	}
-
-	private PropertyTypeEntity getPropertyTypeById(int id) throws PropertyTypeNotFoundException {
-		PropertyTypeEntity propertyTypeEntity = entityManager.find(PropertyTypeEntity.class, id);
-		
-		if(propertyTypeEntity == null){
-			String message = "Der PropertyType mit der Id: " + id + " existiert nicht auf der DB";
-			log.info(message);
-			throw new PropertyTypeNotFoundException(message);
-		}
-		return propertyTypeEntity;
-	}
-	
-	public PropertyTypeEntity getPropertyTypeByName(String propertyTypeName) {
-		PropertyTypeEntity propertyType = null;
-		try {
-			Query searchPropertyTypeQuery = commonQueries.searchPropertyTypeByName(propertyTypeName);
-			propertyType = (PropertyTypeEntity) searchPropertyTypeQuery.getSingleResult();
-		} catch (NoResultException nre) {
-			String message = "Der ResourceType: " + propertyTypeName + " existiert nicht auf der DB";
-			log.info(message);
-		}
-
-		return propertyType;
-	}
-
-}
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/property/control/PropertyTypeService.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/property/control/PropertyTypeService.java
index 7c0b3e621..9a797aed7 100644
--- a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/property/control/PropertyTypeService.java
+++ b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/property/control/PropertyTypeService.java
@@ -20,24 +20,137 @@
 
 package ch.puzzle.itc.mobiliar.business.property.control;
 
+import ch.puzzle.itc.mobiliar.business.domain.commons.CommonDomainService;
+import ch.puzzle.itc.mobiliar.business.domain.commons.CommonQueries;
 import ch.puzzle.itc.mobiliar.business.property.entity.PropertyTypeEntity;
+import ch.puzzle.itc.mobiliar.business.security.entity.Permission;
+import ch.puzzle.itc.mobiliar.business.security.interceptor.HasPermission;
+import ch.puzzle.itc.mobiliar.common.exception.*;
 
 import javax.inject.Inject;
 import javax.persistence.EntityManager;
+import javax.persistence.NoResultException;
+import javax.persistence.Query;
 import javax.persistence.TypedQuery;
 import java.util.List;
+import java.util.logging.Logger;
 
 /**
  * A control service for the provision of property type logic
  */
 public class PropertyTypeService {
 
+    @Inject
+    private Logger log;
+
+    @Inject
+    private CommonDomainService commonService;
+
+    @Inject
+    private CommonQueries commonQueries;
+
+    @Inject
+    private PropertyTagEditingService propertyTagEditingService;
+
     @Inject
     EntityManager entityManager;
 
-    public List<PropertyTypeEntity> getPropertyTypes() {
+    /**
+     * Returns all PropertyTypes with Tags. Because of left join on PropertyTags, PropertyTypes
+     * are listed multiple times when having more than one tag.
+     * @return List<PropertyTypeEntity>
+     */
+    public List<PropertyTypeEntity> loadAll() {
         TypedQuery<PropertyTypeEntity> query = entityManager.createQuery("from PropertyTypeEntity ptype " +
                 "left join fetch ptype.propertyTags order by LOWER(ptype.propertyTypeName) asc", PropertyTypeEntity.class);
         return query.getResultList();
     }
+
+    @HasPermission(permission = Permission.SAVE_SETTINGS_PROPTYPE)
+    public void update(int id, PropertyTypeEntity propertyType)
+            throws NotFoundException, ValidationException {
+
+        PropertyTypeEntity propertyTypeEntity = getById(id);
+        PropertyTypeEntity propertyByName = getByName(propertyType.getPropertyTypeName());
+
+        if (propertyByName != null && !propertyByName.getId().equals(propertyTypeEntity.getId())) {
+            String message = "An other PropertyType with the same Name already exists.";
+            throw new ValidationException(message, propertyType);
+        }
+
+        propertyTypeEntity.setEncrypt(propertyType.isEncrypt());
+        propertyTypeEntity.setValidationRegex(propertyType.getValidationRegex());
+        propertyTypeEntity.setPropertyTypeName(propertyType.getPropertyTypeName());
+
+        entityManager.merge(propertyTypeEntity);
+
+        // Update Tags
+        propertyTagEditingService.updateTags(propertyType.getPropertyTags(), propertyTypeEntity);
+    }
+
+    /**
+     * Erstellt einen neuen PropertyType
+     *
+     * @param propertyType
+     * @return propertyType
+     * @throws ValidationException
+     */
+    @HasPermission(permission = Permission.ADD_PROPTYPE)
+    public PropertyTypeEntity create(PropertyTypeEntity propertyType) throws ValidationException {
+
+        if (commonService.isUnique(propertyType.getPropertyTypeName())) {
+            PropertyTypeEntity propertyTypeEntity = new PropertyTypeEntity();
+            propertyTypeEntity.setPropertyTypeName(propertyType.getPropertyTypeName());
+            propertyTypeEntity.setEncrypt(propertyType.isEncrypt());
+            propertyTypeEntity.setValidationRegex(propertyType.getValidationRegex());
+            entityManager.persist(propertyType);
+
+          propertyTagEditingService.updateTags(propertyType.getPropertyTags(), propertyTypeEntity);
+        } else {
+            throw new ValidationException("Property type already exists.",
+                    propertyType);
+        }
+        return propertyType;
+    }
+
+    /**
+     * Löscht den PropertyType anhand der Id.
+     *
+     * @param id
+     * @throws NotFoundException
+     * @throws ValidationException
+     */
+    @HasPermission(permission = Permission.DELETE_PROPTYPE)
+    public void deleteById(int id) throws NotFoundException, ValidationException {
+        PropertyTypeEntity propertyTypeEntity = getById(id);
+
+        if (!propertyTypeEntity.getPropertyDescriptors().isEmpty()) {
+            throw new ValidationException("Could not delete Property type because it is used by properties.", propertyTypeEntity);
+        }
+
+        entityManager.remove(propertyTypeEntity);
+        log.info("Property type: " + propertyTypeEntity.getPropertyTypeName() + " successfully deleted.");
+    }
+
+    private PropertyTypeEntity getById(int id) throws NotFoundException {
+        PropertyTypeEntity propertyTypeEntity = entityManager.find(PropertyTypeEntity.class, id);
+
+        if (propertyTypeEntity == null) {
+            throw new NotFoundException("Property type with id: " +  id + " has not been found.");
+        }
+        return propertyTypeEntity;
+    }
+
+    public PropertyTypeEntity getByName(String propertyTypeName) {
+        PropertyTypeEntity propertyType = null;
+        try {
+            Query searchPropertyTypeQuery = commonQueries.searchPropertyTypeByName(propertyTypeName);
+            propertyType = (PropertyTypeEntity) searchPropertyTypeQuery.getSingleResult();
+        } catch (NoResultException nre) {
+            String message = "Der ResourceType: " + propertyTypeName + " existiert nicht auf der DB";
+            log.info(message);
+        }
+
+        return propertyType;
+    }
 }
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/property/control/loadPropertyDescriptorsForResource.sql b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/property/control/loadPropertyDescriptorsForResource.sql
index 7702c8158..729c8fded 100644
--- a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/property/control/loadPropertyDescriptorsForResource.sql
+++ b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/property/control/loadPropertyDescriptorsForResource.sql
@@ -20,8 +20,6 @@ descr.OPTIONAL optional,
 descr.ENCRYPT encrypt,
 -- the cardinality of the property 
 descr.CARDINALITYPROPERTY cardinality,
--- if the property is for testing purposes only (shakedown testing)
-descr.TESTING testing,
 -- the validation logic a property has to fulfill (if any)
 descr.VALIDATIONLOGIC validationLogic,
 -- the key which will be used to compute the property's value
@@ -101,4 +99,4 @@ WHERE (res.ID=:resourceId OR resType.ID IN (:resourceTypeIds) OR (resRelation.ID
 
 -- we don't want any descriptors without id (although this shouldn't happen - but just to be sure)
 AND descr.ID IS NOT NULL
--- IMPORTANT! DON'T CLOSE YOUR SQL STATEMENT WITH SEMICOLON - THIS WILL WORK IN H2 BUT NOT IN ORACLE...
\ No newline at end of file
+-- IMPORTANT! DON'T CLOSE YOUR SQL STATEMENT WITH SEMICOLON - THIS WILL WORK IN H2 BUT NOT IN ORACLE...
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/property/control/loadPropertyDescriptorsForResourceOptimized.sql b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/property/control/loadPropertyDescriptorsForResourceOptimized.sql
index 8c6e39ac5..4188017a6 100644
--- a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/property/control/loadPropertyDescriptorsForResourceOptimized.sql
+++ b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/property/control/loadPropertyDescriptorsForResourceOptimized.sql
@@ -9,7 +9,6 @@ WITH descr_with
                 descr.OPTIONAL optional,
                 descr.ENCRYPT encrypt,
                 descr.CARDINALITYPROPERTY CARDINALITY,
-                descr.TESTING testing,
                 descr.VALIDATIONLOGIC validationLogic,
                 descr.MACHINEINTERPRETATIONKEY mik,
                 descr.ID descId,
@@ -97,8 +96,6 @@ SELECT
        descr_with.encrypt,
 -- the cardinality of the property
        descr_with.CARDINALITY,
--- if the property is for testing purposes only (shakedown testing)
-       descr_with.testing,
 -- the validation logic a property has to fulfill (if any)
        descr_with.validationLogic,
 -- the key which will be used to compute the property's value
@@ -140,4 +137,4 @@ SELECT
           ON     prop.propDescrId = descr_with.descID
 -- we don't want any descriptors without id (although this shouldn't happen - but just to be sure)
              AND descr_with.descID IS NOT NULL
--- IMPORTANT! DON'T CLOSE YOUR SQL STATEMENT WITH SEMICOLON - THIS WILL WORK IN H2 BUT NOT IN ORACLE...
\ No newline at end of file
+-- IMPORTANT! DON'T CLOSE YOUR SQL STATEMENT WITH SEMICOLON - THIS WILL WORK IN H2 BUT NOT IN ORACLE...
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/property/control/loadPropertyDescriptorsForResourceType.sql b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/property/control/loadPropertyDescriptorsForResourceType.sql
index c116bff2a..c1f347421 100644
--- a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/property/control/loadPropertyDescriptorsForResourceType.sql
+++ b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/property/control/loadPropertyDescriptorsForResourceType.sql
@@ -18,9 +18,7 @@ descr.OPTIONAL optional,
 -- if the property is encrypted
 descr.ENCRYPT encrypt,
 -- the cardinality of the property 
-descr.CARDINALITYPROPERTY cardinality, 
--- if the property is for testing purposes only (shakedown testing)
-descr.TESTING testing,
+descr.CARDINALITYPROPERTY cardinality,
 -- the validation logic a property has to fulfill (if any)
 descr.VALIDATIONLOGIC validationLogic,
 -- the key which will be used to compute the property's value
@@ -88,4 +86,4 @@ prop ON propDescrId=descr.ID
 WHERE (resType.ID IN (:resourceTypeIds) OR (resRelType.RESOURCETYPEA_ID IN (:masterResourceTypeIds) AND resRelType.RESOURCETYPEB_ID IN (:resourceTypeIds)))
 -- we don't want any descriptors without id (although this shouldn't happen - but just to be sure)
 AND descr.ID IS NOT NULL
--- IMPORTANT! DON'T CLOSE YOUR SQL STATEMENT WITH SEMICOLON - THIS WILL WORK IN H2 BUT NOT IN ORACLE...
\ No newline at end of file
+-- IMPORTANT! DON'T CLOSE YOUR SQL STATEMENT WITH SEMICOLON - THIS WILL WORK IN H2 BUT NOT IN ORACLE...
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/property/entity/FreeMarkerPropertyDescriptor.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/property/entity/FreeMarkerPropertyDescriptor.java
index 4b72c1c9a..3a4d4bb80 100644
--- a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/property/entity/FreeMarkerPropertyDescriptor.java
+++ b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/property/entity/FreeMarkerPropertyDescriptor.java
@@ -44,9 +44,6 @@ public class FreeMarkerPropertyDescriptor implements Serializable {
     @Getter
     private boolean valueOptional;
 
-    @Getter
-    private boolean testing;
-
     @Getter
     private String validationLogic;
 
@@ -80,7 +77,6 @@ public FreeMarkerPropertyDescriptor(PropertyDescriptorEntity propertyDescriptorE
             // TODO: Rename propertyDescriptorEntity.getPropertyName() to TechnicalKey
             technicalKey = propertyDescriptorEntity.getPropertyName();
             valueOptional = propertyDescriptorEntity.isNullable();
-            testing = propertyDescriptorEntity.isTesting();
             validationLogic = propertyDescriptorEntity.getValidationLogic();
             propertyComment = propertyDescriptorEntity.getPropertyComment();
             cardinalityProperty = propertyDescriptorEntity.getCardinalityProperty();
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/property/entity/PropertyDescriptorEntity.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/property/entity/PropertyDescriptorEntity.java
index 987da9fc5..a865cbe42 100644
--- a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/property/entity/PropertyDescriptorEntity.java
+++ b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/property/entity/PropertyDescriptorEntity.java
@@ -76,11 +76,6 @@ public class PropertyDescriptorEntity implements Identifiable, Serializable, Pro
 	// TODO: Rename to valueOptional
 	private boolean nullable;
 
-	@Getter
-	@Setter
-	@Column(nullable = false)
-	private boolean testing;
-
 	@Setter
 	private String validationLogic;
 
@@ -383,7 +378,6 @@ public PropertyDescriptorEntity getCopy(PropertyDescriptorEntity target, CopyUni
 		target.setEncrypt(isEncrypt());
 		target.setPropertyName(getPropertyName());
 		target.setNullable(isNullable());
-		target.setTesting(isTesting());
 		target.setValidationLogic(getValidationLogic());
 		target.setPropertyComment(getPropertyComment());
 		target.setCardinalityProperty(getCardinalityProperty());
@@ -415,7 +409,6 @@ public int foreignableFieldHashCode() {
         eb.append(this.encrypt);
         eb.append(this.propertyName);
         eb.append(this.nullable);
-        eb.append(this.testing);
         eb.append(this.validationLogic);
         eb.append(this.propertyComment);
         eb.append(this.cardinalityProperty);
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/property/entity/PropertyTypeEntity.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/property/entity/PropertyTypeEntity.java
index 07d963be7..2ebbc6d6b 100644
--- a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/property/entity/PropertyTypeEntity.java
+++ b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/property/entity/PropertyTypeEntity.java
@@ -34,10 +34,10 @@
 
 @Entity
 @Audited
-//Dises Query wird gebraucht nur um ein Beispiel zu testen
+//Dieses Query wird gebraucht nur um ein Beispiel zu testen
 @NamedQuery(name = "propertiesNames", query = "select p from PropertyTypeEntity p",  cacheable = true)
 @Table(name="TAMW_propertyType")
-public class PropertyTypeEntity implements PropertyTagEntityHolder{
+public class PropertyTypeEntity implements PropertyTagEntityHolder {
 	
 	@Getter
 	@Setter
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/property/entity/ResourceEditProperty.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/property/entity/ResourceEditProperty.java
index 3e8de946b..bcf5c4377 100644
--- a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/property/entity/ResourceEditProperty.java
+++ b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/property/entity/ResourceEditProperty.java
@@ -67,8 +67,6 @@ public enum Origin {
     @Getter
     @Setter
     private Integer cardinalityProperty;
-    @Getter
-    private boolean isTesting;
     @Setter
     private String validationLogic;
     private String typeValidationRegex;
@@ -194,7 +192,6 @@ public String getUnobfuscatedValue() {
      * @param isOptional if the property is optional (from {@link PropertyDescriptorEntity#isOptional()})
      * @param isEncrypted if the property is encrypted (from {@link PropertyDescriptorEntity#isEncrypt()})
      * @param cardinalityProperty the cardinality of the property (from {@link PropertyDescriptorEntity#cardinalityProperty})
-     * @param isTesting if the property is for testing purposes only (shakedown testing) (from {@link PropertyDescriptorEntity#isTesting()})
      * @param validationLogic the validation logic a property has to fulfill (if any) (from {@link PropertyDescriptorEntity#validationLogic})
      * @param machineInterpretationKey the machine interpretation key, if present, is used to compute the actual value of a property (@ generation time) (from {@link PropertyDescriptorEntity#machineInterpretationKey})
      * @param propContextId the id of the context where the property is defined or null if defined on a resource type (from {@link ch.puzzle.itc.mobiliar.business.environment.entity.ContextEntity#name#id})
@@ -218,7 +215,7 @@ public String getUnobfuscatedValue() {
      */
     public ResourceEditProperty(String technicalKey, String displayName, String propertyValue, String exampleValue, String defaultValue,
                                 String propertyComment, boolean isNullable, boolean isOptional, boolean isEncrypted, Integer cardinalityProperty,
-            boolean isTesting, String validationLogic, String machineInterpretationKey, Integer propContextId, Integer typeContextId,
+            String validationLogic, String machineInterpretationKey, Integer propContextId, Integer typeContextId,
             Integer descriptorId, String propContName, String typeContName, Integer typeId, Integer propertyValueTypeId,
             Integer masterTypeId, String typeName, String validationRegex, Integer propertyId,
             String origin, String loadedFor, String resourceName, String propertyDescriptorOrigin, String fcOwner, String fcExternalKey, String fcExternalLink) {
@@ -244,7 +241,6 @@ public ResourceEditProperty(String technicalKey, String displayName, String prop
         this.isOptional = isOptional;
         this.isEncrypted = isEncrypted;
         this.cardinalityProperty = cardinalityProperty;
-        this.isTesting = isTesting;
         this.validationLogic = validationLogic;
         this.mik = machineInterpretationKey;
         this.propContextId = propContextId;
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/resourcegroup/boundary/CopyResource.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/resourcegroup/boundary/CopyResource.java
index d7dc8d2cc..46ba86a1a 100644
--- a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/resourcegroup/boundary/CopyResource.java
+++ b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/resourcegroup/boundary/CopyResource.java
@@ -91,7 +91,7 @@ public class CopyResource {
 	 */
 	public List<ResourceGroup> loadResourceGroupsForType(Integer typeId, ResourceEntity originResource) {
 		List<ResourceGroup> groups = new ArrayList<ResourceGroup>();
-		List<ResourceGroupEntity> result = resourceGroupRepository.getGroupsForType(typeId, Collections.<Integer> emptyList(), true);
+		List<ResourceGroupEntity> result = resourceGroupRepository.getGroupsForType(typeId, true);
 
 		for (ResourceGroupEntity g : result) {
 			ResourceGroup group = ResourceGroup.createByResource(g, null);
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/resourcegroup/boundary/ResourceBoundary.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/resourcegroup/boundary/ResourceBoundary.java
index 6d8dc5f9d..bc564f649 100644
--- a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/resourcegroup/boundary/ResourceBoundary.java
+++ b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/resourcegroup/boundary/ResourceBoundary.java
@@ -95,12 +95,12 @@ public Resource createNewResourceByName(ForeignableOwner creatingOwner, String n
         if (resourceTypeEntity == null) {
             String message = "ResourceType '" + resourceTypeName + "' doesn't exist";
             log.info(message);
-            throw new ResourceNotFoundException(message);
+            throw new ResourceTypeNotFoundException(message);
         }
         ReleaseEntity release;
         try {
             release = releaseLocator.getReleaseByName(releaseName);
-        } catch (Exception e)  {
+        } catch (Exception e) {
             String message = "Release '" + releaseName + "' doesn't exist";
             log.info(message);
             throw new ResourceNotFoundException(message);
@@ -120,7 +120,7 @@ public Resource createNewResourceByName(ForeignableOwner creatingOwner, String n
     private Resource createNewResourceByName(ForeignableOwner creatingOwner, String newResourceName,
                                              ResourceTypeEntity resourceTypeEntity, Integer releaseId, boolean canCreateReleaseOfExisting)
             throws ElementAlreadyExistsException, ResourceTypeNotFoundException {
-        if (!permissionBoundary.canCreateResourceInstance(resourceTypeEntity)){
+        if (!permissionBoundary.canCreateResourceInstance(resourceTypeEntity)) {
             throw new NotAuthorizedException("Permission Denied");
         }
         ResourceEntity resourceEntity = createResourceEntityByNameForResourceType(creatingOwner, newResourceName,
@@ -162,11 +162,11 @@ private ResourceEntity createResourceEntityByNameForResourceType(ForeignableOwne
                 resourceEntity = ResourceFactory.createNewResourceForOwner(newResourceName, creatingOwner);
                 log.info("Created new Resource " + newResourceName + " and group in Release " + release.getName());
             } else {
-                String message = "A " + anotherGroup.getResourceType().getName()+" with the same name: " + newResourceName + " already exists.";
+                String message = "A " + anotherGroup.getResourceType().getName() + " with the same name: " + newResourceName + " already exists.";
                 log.info(message);
                 throw new ElementAlreadyExistsException(message, Resource.class, newResourceName);
             }
-        } else if (canCreateReleaseOfExisting)  {
+        } else if (canCreateReleaseOfExisting) {
             // check if group contains resource for release
             for (ResourceEntity r : group.getResources()) {
                 if (r.getRelease().getId().equals(releaseId)) {
@@ -180,7 +180,7 @@ private ResourceEntity createResourceEntityByNameForResourceType(ForeignableOwne
                 log.info("Created new Resource " + newResourceName + " for existing group in Release " + release.getName());
             } else {
                 // if resource with given name, type and release already exists throw an exeption
-                String message = "The "+type.getName()+" with name: " + newResourceName + " already exists in release "+release.getName();
+                String message = "The " + type.getName() + " with name: " + newResourceName + " already exists in release " + release.getName();
                 log.info(message);
                 throw new ElementAlreadyExistsException(message, Resource.class, newResourceName);
             }
@@ -202,7 +202,7 @@ private ResourceEntity createResourceEntityByNameForResourceType(ForeignableOwne
      * @throws ResourceTypeNotFoundException
      * @throws ElementAlreadyExistsException
      */
-    private Application createUniqueApplicationByName(ForeignableOwner creatingOwner,String applicationName, int releaseId, boolean canCreateReleaseOfExisting)
+    private Application createUniqueApplicationByName(ForeignableOwner creatingOwner, String applicationName, int releaseId, boolean canCreateReleaseOfExisting)
             throws ResourceTypeNotFoundException, ElementAlreadyExistsException {
         ResourceTypeEntity resourceTypeEntity = resourceTypeProvider.getOrCreateDefaultResourceType(DefaultResourceTypeDefinition.APPLICATION);
         ResourceEntity resourceEntity = createResourceEntityByNameForResourceType(creatingOwner, applicationName,
@@ -225,7 +225,7 @@ public Application createNewUniqueApplicationForAppServer(ForeignableOwner creat
 
         ResourceEntity asResource = commonService.getResourceEntityByGroupAndRelease(asGroupId, asReleaseId);
 
-        if(!permissionBoundary.canCreateAppAndAddToAppServer(asResource)){
+        if (!permissionBoundary.canCreateAppAndAddToAppServer(asResource)) {
             throw new NotAuthorizedException("Missing Permission");
         }
 
@@ -309,7 +309,7 @@ private void doRemoveResourceEntity(ForeignableOwner deletingOwner, Integer reso
 
         foreignableService.verifyDeletableByOwner(deletingOwner, resourceEntity);
 
-        if ( !permissionBoundary.hasPermission(Permission.RESOURCE, contextDomainService.getGlobalResourceContextEntity(),
+        if (!permissionBoundary.hasPermission(Permission.RESOURCE, contextDomainService.getGlobalResourceContextEntity(),
                 Action.DELETE, resourceEntity, resourceEntity.getResourceType())) {
             throw new NotAuthorizedException();
         }
@@ -345,7 +345,7 @@ private void doRemoveResourceEntity(ForeignableOwner deletingOwner, Integer reso
         }
     }
 
-    private long countNumberOfConsumedSlaveRelations(ResourceEntity res){
+    private long countNumberOfConsumedSlaveRelations(ResourceEntity res) {
         return entityManager.createQuery("select count(a.id) from ResourceEntity r left join r.consumedSlaveRelations a where r=:res", Long.class).setParameter("res", res).getSingleResult();
     }
 
@@ -381,8 +381,7 @@ private ResourceEntity getOrCreateResourceEntityByNameForResourceType(Foreignabl
             // if group does not exists a new resource with a new group can be created
             resourceEntity = ResourceFactory.createNewResourceForOwner(newResourceName, creatingOwner);
             log.info("Create new Resource " + newResourceName + "  and group in Release " + release.getName());
-        }
-        else {
+        } else {
             // check if group contains resource for this release
             for (ResourceEntity r : group.getResources()) {
                 if (r.getRelease().getId().equals(releaseId)) {
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/resourcegroup/boundary/ResourceGroupLocator.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/resourcegroup/boundary/ResourceGroupLocator.java
index 765145b9f..89e02b6a1 100644
--- a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/resourcegroup/boundary/ResourceGroupLocator.java
+++ b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/resourcegroup/boundary/ResourceGroupLocator.java
@@ -87,23 +87,22 @@ public List<ResourceGroupEntity> getAllUserAssignableResourceGroupsByName() {
 		
     /**
      * @param resourceTypeName
-     * @param myAmw
      * @param fetchResources determines if resources fetched
      * @return a list of Groups
      */    
-	public List<ResourceGroupEntity> getGroupsForType(String resourceTypeName, List<Integer> myAmw, boolean fetchResources, boolean sorted) {
-		return resourceGroupControl.getGroupsForType(resourceTypeName, myAmw, fetchResources, sorted);
+	public List<ResourceGroupEntity> getGroupsForType(String resourceTypeName, boolean fetchResources, boolean sorted) {
+		return resourceGroupControl.getGroupsForType(resourceTypeName, fetchResources, sorted);
 	}
 	
-	public List<ResourceGroupEntity> getGroupsForType(String resourceTypeName, List<Integer> myAmw, boolean fetchResources) {
-		return resourceGroupControl.getGroupsForType(resourceTypeName, myAmw, fetchResources);
+	public List<ResourceGroupEntity> getGroupsForType(String resourceTypeName, boolean fetchResources) {
+		return resourceGroupControl.getGroupsForType(resourceTypeName, fetchResources);
 	}
 	
-	public List<ResourceGroupEntity> getGroupsForType(int resourceTypeId, List<Integer> myAmw, boolean fetchResources, boolean sorted) {
-		return resourceGroupControl.getGroupsForType(resourceTypeId, myAmw, fetchResources, sorted);
+	public List<ResourceGroupEntity> getGroupsForType(int resourceTypeId, boolean fetchResources, boolean sorted) {
+		return resourceGroupControl.getGroupsForType(resourceTypeId, fetchResources, sorted);
 	}
 	
-	public List<ResourceGroupEntity> getGroupsForType(int resourceTypeId, List<Integer> myAmw, boolean fetchResources) {
-		return resourceGroupControl.getGroupsForType(resourceTypeId, myAmw, fetchResources);
+	public List<ResourceGroupEntity> getGroupsForType(int resourceTypeId, boolean fetchResources) {
+		return resourceGroupControl.getGroupsForType(resourceTypeId, fetchResources);
 	}
 }
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/resourcegroup/boundary/ResourceRelations.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/resourcegroup/boundary/ResourceRelations.java
index 61f3313f4..55494b0eb 100644
--- a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/resourcegroup/boundary/ResourceRelations.java
+++ b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/resourcegroup/boundary/ResourceRelations.java
@@ -26,11 +26,10 @@
 import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.ResourceEntity;
 import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.ResourceGroupEntity;
 import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.ResourceWithRelations;
-import ch.puzzle.itc.mobiliar.business.security.control.PermissionService;
-import ch.puzzle.itc.mobiliar.business.usersettings.control.UserSettingsService;
-import ch.puzzle.itc.mobiliar.business.usersettings.entity.FavoriteResourceEntity;
-import ch.puzzle.itc.mobiliar.business.usersettings.entity.UserSettingsEntity;
+import ch.puzzle.itc.mobiliar.business.security.entity.Permission;
+import ch.puzzle.itc.mobiliar.business.security.interceptor.HasPermission;
 import ch.puzzle.itc.mobiliar.common.util.DefaultResourceTypeDefinition;
+import ch.puzzle.itc.mobiliar.common.util.Tuple;
 
 import javax.ejb.Stateless;
 import javax.ejb.TransactionAttribute;
@@ -46,31 +45,20 @@ public class ResourceRelations {
 
     @Inject
     ApplistScreenDomainService applistScreenDomainService;
-    @Inject
-    UserSettingsService userSettingsService;
-    @Inject
-    PermissionService permissionService;
+
     @Inject
     ResourceDependencyResolverService dependencyResolverService;
 
-    public List<ResourceWithRelations> getAppServersWithApplications(String filter, Integer maxResults, ReleaseEntity release) {
-        UserSettingsEntity userSettings = userSettingsService.getUserSettings(permissionService.getCurrentUserName());
-        List<Integer> myAMWFilter = null;
-        if(userSettings!=null && userSettings.isMyAmwEnabled()) {
-            myAMWFilter = new ArrayList<>();
-            List<FavoriteResourceEntity> favoriteResourceEntities = userSettingsService.fetchFavoriteResources(
-                      userSettings.getUserName());
-            for (FavoriteResourceEntity f : favoriteResourceEntities) {
-                myAMWFilter.add(f.getResourceGroup().getId());
-            }
-        }
-        List<ResourceEntity> appServersWithAllApplications = applistScreenDomainService.getAppServerResourcesWithApplications(filter, maxResults, myAMWFilter, true);
-        return filterAppServersByRelease(release, appServersWithAllApplications, myAMWFilter);
+    @HasPermission(permission = Permission.APP_AND_APPSERVER_LIST)
+    public Tuple<List<ResourceWithRelations>, Long> getAppServersWithApplications(Integer startIndex, Integer maxResults, String filter, ReleaseEntity release) {
+        Tuple<List<ResourceEntity>, Long> result = applistScreenDomainService.getAppServerResourcesWithApplications(startIndex, maxResults, filter, true);
+        List<ResourceEntity> appServersWithAllApplications = result.getA();
+        List<ResourceWithRelations> filteredResult = filterAppServersByRelease(release, appServersWithAllApplications);
+        return new Tuple<>(filteredResult, result.getB());
     }
 
     @TransactionAttribute(TransactionAttributeType.REQUIRED)
-    List<ResourceWithRelations> filterAppServersByRelease(ReleaseEntity release,
-              List<ResourceEntity> appServersWithAllApplications, List<Integer> myAMWFilter) {
+    List<ResourceWithRelations> filterAppServersByRelease(ReleaseEntity release, List<ResourceEntity> appServersWithAllApplications) {
         // filter app server releases
         Set<Integer> idLookup = new HashSet<>();
         List<ResourceWithRelations> result = new ArrayList<>();
@@ -83,7 +71,7 @@ List<ResourceWithRelations> filterAppServersByRelease(ReleaseEntity release,
                     idLookup.add(as.getResourceGroup().getId());
 
                     ResourceWithRelations asWithApps = new ResourceWithRelations(asForRelease);
-                    filterApplicationsByRelease(release, asForRelease, asWithApps, myAMWFilter);
+                    filterApplicationsByRelease(release, asForRelease, asWithApps);
                     result.add(asWithApps);
                 }
             }
@@ -92,18 +80,15 @@ List<ResourceWithRelations> filterAppServersByRelease(ReleaseEntity release,
     }
 
     @TransactionAttribute(TransactionAttributeType.REQUIRED)
-    void filterApplicationsByRelease(ReleaseEntity release, ResourceEntity as,
-              ResourceWithRelations asWithApps, List<Integer> myAMWFilter) {
+    void filterApplicationsByRelease(ReleaseEntity release, ResourceEntity as, ResourceWithRelations asWithApps) {
         List<ResourceEntity> list = as.getConsumedRelatedResourcesByResourceType(DefaultResourceTypeDefinition.APPLICATION);
     	
         for (ResourceEntity r : list) {
-            if(myAMWFilter==null || myAMWFilter.contains(r.getResourceGroup().getId())) {
                 ResourceEntity rel = dependencyResolverService
                           .getResourceEntityForRelease(r.getResourceGroup(), release);
                 if (rel != null && !asWithApps.getRelatedResources().contains(rel)) {
                     asWithApps.getRelatedResources().add(rel);
                 }
-            }
         }
     }
 }
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/resourcegroup/boundary/ResourceTypeLocator.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/resourcegroup/boundary/ResourceTypeLocator.java
index ed662893f..196583e8a 100644
--- a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/resourcegroup/boundary/ResourceTypeLocator.java
+++ b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/resourcegroup/boundary/ResourceTypeLocator.java
@@ -21,11 +21,13 @@
 package ch.puzzle.itc.mobiliar.business.resourcegroup.boundary;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 import javax.ejb.Stateless;
 import javax.inject.Inject;
 
 import ch.puzzle.itc.mobiliar.business.resourcegroup.control.ResourceTypeDomainService;
+import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.ResourceType;
 import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.ResourceTypeEntity;
 
 @Stateless
@@ -47,4 +49,17 @@ public List<ResourceTypeEntity> getAllResourceTypes() {
         return resourceTypeDomainService.getAllResourceTypesWithoutChildren();
     }
 
+    public List<ResourceTypeEntity> getPredefinedResourceTypes() {
+        return resourceTypeDomainService.getResourceTypes()
+                .stream()
+                .filter(e -> e.getParentResourceType() == null && ResourceType.createByResourceType(e, null).isDefaultResourceType())
+                .collect(Collectors.toList());
+    }
+
+    public List<ResourceTypeEntity> getRootResourceTypes() {
+        return resourceTypeDomainService.getResourceTypes()
+                .stream()
+                .filter(e -> e.getParentResourceType() == null && !ResourceType.createByResourceType(e, null).isDefaultResourceType())
+                .collect(Collectors.toList());
+    }
 }
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/resourcegroup/control/CopyResourceDomainService.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/resourcegroup/control/CopyResourceDomainService.java
index dc7a0ac08..f4bdfce97 100644
--- a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/resourcegroup/control/CopyResourceDomainService.java
+++ b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/resourcegroup/control/CopyResourceDomainService.java
@@ -119,11 +119,6 @@
  * <td>nein</td>
  * <td>nein</td>
  * </tr>
- * <tr>
- * <td>Shakedown Tests</td>
- * <td>nein</td>
- * <td>nein</td>
- * </tr>
  * </table>
  *
  * @author cweber
@@ -565,7 +560,7 @@ private void copyPropertyDescriptor(ContextDependency<?> targetContextDependency
     }
 
     protected String createDescriptorKey(PropertyDescriptorEntity desc) {
-        return desc.getPropertyName() + "_" + String.valueOf(desc.isTesting());
+        return desc.getPropertyName();
     }
 
     protected void copyTags(PropertyDescriptorEntity origin, PropertyDescriptorEntity target) {
@@ -690,15 +685,13 @@ protected Set<TemplateDescriptorEntity> copyTemplates(Set<TemplateDescriptorEnti
         Map<String, TemplateDescriptorEntity> targetTemplatesMap = new HashMap<>();
         if (targets != null) {
             for (TemplateDescriptorEntity t : targets) {
-                String key = t.getName() + String.valueOf(t.isTesting());
-                targetTemplatesMap.put(key, t);
+                targetTemplatesMap.put(t.getName(), t);
             }
         }
 
         if (origins != null) {
             for (TemplateDescriptorEntity origin : origins) {
-                String key = origin.getName() + String.valueOf(origin.isTesting());
-                targetTemplatesMap.put(key, origin.getCopy(targetTemplatesMap.get(key), copyUnit));
+                targetTemplatesMap.put(origin.getName(), origin.getCopy(targetTemplatesMap.get(origin.getName()), copyUnit));
             }
         }
         return new HashSet<>(targetTemplatesMap.values());
@@ -722,4 +715,4 @@ protected void copyFunctions(CopyUnit copyUnit) {
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/resourcegroup/control/ResourceGroupPersistenceService.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/resourcegroup/control/ResourceGroupPersistenceService.java
index 048e761e1..70f938a26 100644
--- a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/resourcegroup/control/ResourceGroupPersistenceService.java
+++ b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/resourcegroup/control/ResourceGroupPersistenceService.java
@@ -64,10 +64,9 @@ public ResourceGroupEntity getById(int id) {
 
 	/**
 	 * @param resourceTypeName
-	 * @param myAmw
 	 * @return
 	 */
-	public List<ResourceGroupEntity> loadGroupsForTypeName(String resourceTypeName, List<Integer> myAmw) {
+	public List<ResourceGroupEntity> loadGroupsForTypeName(String resourceTypeName) {
 		List<ResourceGroupEntity> result = new ArrayList<>();
 
 		CriteriaBuilder cb = entityManager.getCriteriaBuilder();
@@ -76,21 +75,12 @@ public List<ResourceGroupEntity> loadGroupsForTypeName(String resourceTypeName,
 		r.fetch("resources");
 		Join<ResourceGroupEntity, ResourceEntity> resources = r.join("resources");
 		Predicate typeNamePred = cb.equal(resources.get("resourceType").get("name"), resourceTypeName);
-		Predicate asContainerPred = cb.notEqual(resources.get("name"),
-				ApplicationServerContainer.APPSERVERCONTAINER.getDisplayName());
-
-		if (myAmw != null && !myAmw.isEmpty()) {
-			Predicate myAmwPred = r.get("id").in(myAmw);
-			q.where(cb.and(cb.and(typeNamePred, asContainerPred), myAmwPred));
-		}
-		else {
-			q.where(cb.and(typeNamePred, asContainerPred));
-		}
+		Predicate asContainerPred = cb.notEqual(resources.get("name"), ApplicationServerContainer.APPSERVERCONTAINER.getDisplayName());
 
+		q.where(cb.and(typeNamePred, asContainerPred));
 		q.distinct(true);
 
 		result = entityManager.createQuery(q).getResultList();
-
 		return result;
 	}
 
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/resourcegroup/control/ResourceGroupRepository.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/resourcegroup/control/ResourceGroupRepository.java
index 68070f90f..2d90320b0 100644
--- a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/resourcegroup/control/ResourceGroupRepository.java
+++ b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/resourcegroup/control/ResourceGroupRepository.java
@@ -83,24 +83,23 @@ public ResourceGroupEntity getResourceGroupForCreateDeploy(Integer groupId) {
 	
     /**
      * @param resourceTypeName
-     * @param myAmw
      * @param fetchResources determines if resources fetched
      * @return a list of Groups
      */    
-	public List<ResourceGroupEntity> getGroupsForType(String resourceTypeName, List<Integer> myAmw, boolean fetchResources, boolean sorted) {
-		return getGroupsForType("name", resourceTypeName, myAmw, fetchResources, sorted);
+	public List<ResourceGroupEntity> getGroupsForType(String resourceTypeName, boolean fetchResources, boolean sorted) {
+		return getGroupsForType("name", resourceTypeName, fetchResources, sorted);
 	}
 	
-	public List<ResourceGroupEntity> getGroupsForType(String resourceTypeName, List<Integer> myAmw, boolean fetchResources) {
-		return getGroupsForType("name", resourceTypeName, myAmw, fetchResources, false);
+	public List<ResourceGroupEntity> getGroupsForType(String resourceTypeName, boolean fetchResources) {
+		return getGroupsForType("name", resourceTypeName, fetchResources, false);
 	}
 	
-	public List<ResourceGroupEntity> getGroupsForType(int resourceTypeId, List<Integer> myAmw, boolean fetchResources, boolean sorted) {
-		return getGroupsForType("id", resourceTypeId, myAmw, fetchResources, sorted);
+	public List<ResourceGroupEntity> getGroupsForType(int resourceTypeId, boolean fetchResources, boolean sorted) {
+		return getGroupsForType("id", resourceTypeId, fetchResources, sorted);
 	}
 	
-	public List<ResourceGroupEntity> getGroupsForType(int resourceTypeId, List<Integer> myAmw, boolean fetchResources) {
-		return getGroupsForType("id", resourceTypeId, myAmw, fetchResources, false);
+	public List<ResourceGroupEntity> getGroupsForType(int resourceTypeId, boolean fetchResources) {
+		return getGroupsForType("id", resourceTypeId, fetchResources, false);
 	}
 
     /**
@@ -132,9 +131,7 @@ public ResourceGroupEntity loadUniqueGroupByNameAndType(String name, Integer res
         return result;
     }
 
-
-	
-	private List<ResourceGroupEntity> getGroupsForType(String typeParam, Object typeParamValue, List<Integer> myAmw, boolean fetchResources, boolean sorted) {
+	private List<ResourceGroupEntity> getGroupsForType(String typeParam, Object typeParamValue, boolean fetchResources, boolean sorted) {
         StringBuilder qString = new StringBuilder();
         String fetchString = StringUtils.EMPTY;
         List<ResourceGroupEntity> result;
@@ -146,17 +143,11 @@ private List<ResourceGroupEntity> getGroupsForType(String typeParam, Object type
         qString.append("SELECT DISTINCT g FROM ResourceGroupEntity g left join " + fetchString + "g.resources r");
         qString.append(" WHERE r.resourceType."+typeParam+"=:typePram");
         qString.append(" AND r.name IS NOT :asContainer");
-        if (myAmw != null && myAmw.size() != 0) {
-            qString.append(" AND g.id in (:myAmw)");
-        }
 
         TypedQuery<ResourceGroupEntity> q = entityManager.createQuery(qString.toString(),
                 ResourceGroupEntity.class);
         q.setParameter("typePram", typeParamValue);
         q.setParameter("asContainer", ApplicationServerContainer.APPSERVERCONTAINER.getDisplayName());
-        if (myAmw != null && myAmw.size() != 0) {
-            q.setParameter("myAmw", myAmw);
-        }
         
         result = q.getResultList();
         
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/resourcegroup/control/ResourceTypeDomainService.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/resourcegroup/control/ResourceTypeDomainService.java
index 881d696b0..099e5bdc3 100644
--- a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/resourcegroup/control/ResourceTypeDomainService.java
+++ b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/resourcegroup/control/ResourceTypeDomainService.java
@@ -129,11 +129,11 @@ public ResourceType addResourceType(String newResourceTypeName, Integer parentId
 				}
 			}
 			entityManager.persist(result.getEntity());
-			log.info("ResourceType " + newResourceTypeName + " in DB persistiert");
+			log.info("Resource Type " + newResourceTypeName + " persisted in DB");
 		}
 		else {
-			String message = "Der ResourceType mit dem Namen: " + newResourceTypeName
-					+ " ist bereits vorhanden und kann nicht erstellt werden";
+			String message = "Resource Type " + newResourceTypeName
+					+ " already exists";
 			log.info(message);
 			throw new ElementAlreadyExistsException(message, ResourceType.class, newResourceTypeName);
 		}
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/resourcegroup/entity/ResourceEntity.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/resourcegroup/entity/ResourceEntity.java
index 4857e1df1..237198365 100644
--- a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/resourcegroup/entity/ResourceEntity.java
+++ b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/resourcegroup/entity/ResourceEntity.java
@@ -38,7 +38,6 @@
 import ch.puzzle.itc.mobiliar.business.resourcerelation.entity.ConsumedResourceRelationEntity;
 import ch.puzzle.itc.mobiliar.business.resourcerelation.entity.ProvidedResourceRelationEntity;
 import ch.puzzle.itc.mobiliar.business.resourcerelation.entity.ResourceRelationTypeEntity;
-import ch.puzzle.itc.mobiliar.business.shakedown.entity.ShakedownTestEntity;
 import ch.puzzle.itc.mobiliar.business.softlinkRelation.entity.SoftlinkRelationEntity;
 import ch.puzzle.itc.mobiliar.business.utils.CopyHelper;
 import ch.puzzle.itc.mobiliar.common.exception.ElementAlreadyExistsException;
@@ -133,11 +132,6 @@ public class ResourceEntity extends HasContexts<ResourceContextEntity> implement
 	@Setter
 	private Set<DeploymentEntity> deployments;
 
-	@OneToMany(cascade = ALL, mappedBy = "applicationServer")
-	@NotAudited
-	@Getter
-	private Set<ShakedownTestEntity> shakedownTests;
-
 	@ManyToOne(optional = false, cascade = PERSIST)
 	@Getter
 	@Setter
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/resourcegroup/entity/ResourceGroupEntity.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/resourcegroup/entity/ResourceGroupEntity.java
index 560840d31..f523fce84 100644
--- a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/resourcegroup/entity/ResourceGroupEntity.java
+++ b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/resourcegroup/entity/ResourceGroupEntity.java
@@ -24,13 +24,11 @@
 import ch.puzzle.itc.mobiliar.business.releasing.entity.ReleaseEntity;
 import ch.puzzle.itc.mobiliar.business.resourceactivation.entity.ResourceActivationEntity;
 import ch.puzzle.itc.mobiliar.business.template.entity.TemplateDescriptorEntity;
-import ch.puzzle.itc.mobiliar.business.usersettings.entity.FavoriteResourceEntity;
 import ch.puzzle.itc.mobiliar.common.util.ApplicationServerContainer;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
 import org.hibernate.envers.Audited;
-import org.hibernate.envers.NotAudited;
 
 import javax.persistence.*;
 import java.io.Serializable;
@@ -45,7 +43,7 @@
 @Entity
 @Audited
 @Table(name = "TAMW_resourceGroup")
-@EqualsAndHashCode(exclude = { "resources", "favorites", "runtimeTemplateDescriptors", "resourceActivationEntities" })
+@EqualsAndHashCode(exclude = { "resources", "runtimeTemplateDescriptors", "resourceActivationEntities" })
 @NamedQuery(name = ResourceGroupEntity.ALLRESOURCESBYTYPE_QUERY, query = "select rg from ResourceGroupEntity rg left join rg.resourceType rt where rt is not null and rt.name=:restype")
 public class ResourceGroupEntity implements Serializable, Comparable<ResourceGroupEntity>, NamedIdentifiable {
 
@@ -75,11 +73,6 @@ public class ResourceGroupEntity implements Serializable, Comparable<ResourceGro
 	@Getter
 	private ResourceTypeEntity resourceType;
 
-	@OneToMany(cascade = CascadeType.ALL, mappedBy = "resourceGroup")
-	@NotAudited
-	@Getter
-	private Set<FavoriteResourceEntity> favorites;
-
 	@OneToMany(cascade = CascadeType.ALL, mappedBy = "resourceGroup")
 	@Getter
 	private Set<ResourceActivationEntity> resourceActivationEntities;
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/resourcegroup/entity/ResourceTypeEntity.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/resourcegroup/entity/ResourceTypeEntity.java
index ee5ba20f3..9a6a3e2b8 100644
--- a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/resourcegroup/entity/ResourceTypeEntity.java
+++ b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/resourcegroup/entity/ResourceTypeEntity.java
@@ -66,7 +66,7 @@ public class ResourceTypeEntity extends HasContexts<ResourceTypeContextEntity>
 	ResourceTypeEntity parentResourceType;
 
 	@Setter
-	@OneToMany(mappedBy="parentResourceType", cascade=ALL)
+	@OneToMany(mappedBy = "parentResourceType", cascade = ALL, fetch = FetchType.EAGER)
 	Set<ResourceTypeEntity> childrenResourceTypes;
 
 	public Set<ResourceTypeEntity> getChildrenResourceTypes() {
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/security/boundary/PermissionBoundary.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/security/boundary/PermissionBoundary.java
index 8eb9cef6d..024bd2b07 100644
--- a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/security/boundary/PermissionBoundary.java
+++ b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/security/boundary/PermissionBoundary.java
@@ -84,29 +84,23 @@ public class PermissionBoundary implements Serializable {
      *
      * @param resourceTypeId
      * @param contextId
-     * @param isTestingMode
      * @return
      */
-    public boolean hasPermissionToEditPropertiesByResourceTypeAndContext(Integer resourceTypeId, Integer contextId,
-                                                                         boolean isTestingMode) {
-        if (!isTestingMode) {
+    public boolean hasPermissionToEditPropertiesByResourceTypeAndContext(Integer resourceTypeId, Integer contextId) {
+
             ResourceTypeEntity resourceType = entityManager.find(ResourceTypeEntity.class, resourceTypeId);
             ContextEntity context = contextId == null ? null : contextLocator.getContextById(contextId);
             return permissionService.hasPermission(Permission.RESOURCETYPE, context, Action.UPDATE, null, resourceType);
-        }
-        // so we must be in TestingMode
-        return permissionService.hasPermission(Permission.SHAKEDOWN_TEST_MODE);
     }
 
     /**
      * Checks if the user is allowed to edit the Properties of a ResourceType without checking its Context
      *
      * @param resourceTypeId
-     * @param isTestingMode
      * @return
      */
-    public boolean hasPermissionToEditPropertiesByResourceType(Integer resourceTypeId, boolean isTestingMode) {
-        return hasPermissionToEditPropertiesByResourceTypeAndContext(resourceTypeId, null, isTestingMode);
+    public boolean hasPermissionToEditPropertiesByResourceType(Integer resourceTypeId) {
+        return hasPermissionToEditPropertiesByResourceTypeAndContext(resourceTypeId, null);
     }
 
     /**
@@ -114,18 +108,13 @@ public boolean hasPermissionToEditPropertiesByResourceType(Integer resourceTypeI
      *
      * @param resourceId
      * @param context
-     * @param isTestingMode
      * @return
      */
-    public boolean hasPermissionToEditPropertiesByResourceAndContext(Integer resourceId, ContextEntity context,
-                                                                     boolean isTestingMode) {
-        if (!isTestingMode) {
+    public boolean hasPermissionToEditPropertiesByResourceAndContext(Integer resourceId, ContextEntity context
+                                                                     ) {
             ResourceEntity resource = entityManager.find(ResourceEntity.class, resourceId);
             return permissionService.hasPermission(Permission.RESOURCE, context, Action.UPDATE,
                     resource.getResourceGroup(), null);
-        }
-        // so we must be in TestingMode
-        return permissionService.hasPermission(Permission.SHAKEDOWN_TEST_MODE);
     }
 
     /**
@@ -133,24 +122,22 @@ public boolean hasPermissionToEditPropertiesByResourceAndContext(Integer resourc
      *
      * @param resourceId
      * @param contextId
-     * @param isTestingMode
      * @return
      */
-    public boolean hasPermissionToEditPropertiesByResourceAndContext(Integer resourceId, boolean isTestingMode,
+    public boolean hasPermissionToEditPropertiesByResourceAndContext(Integer resourceId,
                                                                      Integer contextId) {
         ContextEntity context = contextLocator.getContextById(contextId);
-        return hasPermissionToEditPropertiesByResourceAndContext(resourceId, context, isTestingMode);
+        return hasPermissionToEditPropertiesByResourceAndContext(resourceId, context);
     }
 
     /**
      * Checks if the user is allowed to edit the Properties of a Resource without checking its Context
      *
      * @param resourceId
-     * @param isTestingMode
      * @return
      */
-    public boolean hasPermissionToEditPropertiesByResource(Integer resourceId, boolean isTestingMode) {
-        return hasPermissionToEditPropertiesByResourceAndContext(resourceId, null, isTestingMode);
+    public boolean hasPermissionToEditPropertiesByResource(Integer resourceId) {
+        return hasPermissionToEditPropertiesByResourceAndContext(resourceId, (ContextEntity) null);
     }
 
     public boolean hasPermission(String permissionName) {
@@ -280,19 +267,19 @@ public boolean hasPermissionToAddRelatedResourceType(ResourceTypeEntity resource
     }
 
     /**
-     * Check that the user is config_admin, app_developer or shakedown_admin : shakedown_admin: can
-     * modify(add/edit/delete) all testing templates config_admin: can modify(add/edit/delete) all templates
+     * Check that the user is config_admin, app_developer
+     * config_admin: can modify(add/edit/delete) all templates
      * app_developer: can modify(add/edit/delete) only templates in instances of APPLICATION
      */
-    public boolean hasPermissionToAddTemplate(Identifiable resourceOrResourceTypeEntity, boolean isTestingMode) {
+    public boolean hasPermissionToAddTemplate(Identifiable resourceOrResourceTypeEntity) {
         if (resourceOrResourceTypeEntity != null) {
             if (resourceOrResourceTypeEntity instanceof ResourceEntity) {
                 ResourceEntity mergedResource = entityManager.find(ResourceEntity.class, resourceOrResourceTypeEntity.getId());
-                return permissionService.hasPermissionToAddResourceTemplate(mergedResource, isTestingMode);
+                return permissionService.hasPermissionToAddResourceTemplate(mergedResource);
             }
             if (resourceOrResourceTypeEntity instanceof ResourceTypeEntity) {
                 ResourceTypeEntity mergedResourceType = entityManager.find(ResourceTypeEntity.class, resourceOrResourceTypeEntity.getId());
-                return permissionService.hasPermissionToAddResourceTypeTemplate(mergedResourceType, isTestingMode);
+                return permissionService.hasPermissionToAddResourceTypeTemplate(mergedResourceType);
             }
         }
         return false;
@@ -320,10 +307,7 @@ private boolean canModifyFunctionOfResourceOrResourceType(Integer resourceEntity
         return permissionService.hasPermission(Permission.RESOURCETYPE_AMWFUNCTION, null, action, null, type);
     }
 
-    public boolean canModifyTemplateOfResourceOrResourceType(Integer resourceEntityId, Integer resourceTypeEntityId, Action action, boolean testingMode) {
-        if (testingMode) {
-            return permissionService.hasPermission(Permission.SHAKEDOWN_TEST_MODE);
-        }
+    public boolean canModifyTemplateOfResourceOrResourceType(Integer resourceEntityId, Integer resourceTypeEntityId, Action action) {
         // context is always global
         if (resourceEntityId != null) {
             ResourceEntity resource = resourceRepository.find(resourceEntityId);
@@ -395,11 +379,6 @@ public boolean hasPermissionToCreateDeployment() {
         return permissionService.hasPermissionToCreateDeployment();
     }
 
-    public boolean hasPermissionToCreateShakedownTests(Integer resourceGroupId) {
-        ResourceGroupEntity resourceGroupEntity = resourceGroupRepository.find(resourceGroupId);
-        return permissionService.hasPermission(Permission.SHAKEDOWNTEST, null, Action.CREATE, resourceGroupEntity, null);
-    }
-
     @HasPermission(oneOfPermission = { Permission.ASSIGN_REMOVE_PERMISSION, Permission.PERMISSION_DELEGATION })
     public RestrictionEntity findRestriction(Integer id) {
         return restrictionRepository.find(id);
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/security/control/PermissionService.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/security/control/PermissionService.java
index df59b460f..61e1c5533 100644
--- a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/security/control/PermissionService.java
+++ b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/security/control/PermissionService.java
@@ -719,44 +719,30 @@ public boolean hasPermissionToDeleteRelationType(ResourceTypeEntity resourceType
      * Checks if user may create or edit Templates of Resources
      *
      * @param resource
-     * @param isTestingMode
      */
-    public boolean hasPermissionToAddResourceTemplate(ResourceEntity resource, boolean isTestingMode) {
+    public boolean hasPermissionToAddResourceTemplate(ResourceEntity resource) {
         // ok if user has update permission on the Resource, context is always global, so we set it to null to omit the check
-        if (hasPermission(Permission.RESOURCE_TEMPLATE, null, Action.CREATE, resource.getResourceGroup(), null)) {
-            return true;
-        }
-        return isTestingMode && hasPermission(Permission.SHAKEDOWN_TEST_MODE);
+        return hasPermission(Permission.RESOURCE_TEMPLATE, null, Action.CREATE, resource.getResourceGroup(), null);
     }
 
-    public boolean hasPermissionToUpdateResourceTemplate(ResourceEntity resource, boolean isTestingMode) {
+    public boolean hasPermissionToUpdateResourceTemplate(ResourceEntity resource) {
         // ok if user has update permission on the Resource, context is always global, so we set it to null to omit the check
-        if (hasPermission(Permission.RESOURCE_TEMPLATE, null, Action.UPDATE, resource.getResourceGroup(), null)) {
-            return true;
-        }
-        return isTestingMode && hasPermission(Permission.SHAKEDOWN_TEST_MODE);
+        return hasPermission(Permission.RESOURCE_TEMPLATE, null, Action.UPDATE, resource.getResourceGroup(), null);
     }
 
     /**
      * Checks if user may create or edit Templates of ResourceTypes
      *
      * @param resourceType
-     * @param isTestingMode
      */
-    public boolean hasPermissionToAddResourceTypeTemplate(ResourceTypeEntity resourceType, boolean isTestingMode) {
+    public boolean hasPermissionToAddResourceTypeTemplate(ResourceTypeEntity resourceType) {
         // ok if user has update permission on the ResourceType, context is always global, so we set it to null to omit the check
-        if (hasPermission(Permission.RESOURCETYPE_TEMPLATE, null, Action.CREATE, null, resourceType)) {
-            return true;
-        }
-        return resourceType != null && isTestingMode && hasPermission(Permission.SHAKEDOWN_TEST_MODE);
+        return hasPermission(Permission.RESOURCETYPE_TEMPLATE, null, Action.CREATE, null, resourceType);
     }
 
-    public boolean hasPermissionToUpdateResourceTypeTemplate(ResourceTypeEntity resourceType, boolean isTestingMode) {
+    public boolean hasPermissionToUpdateResourceTypeTemplate(ResourceTypeEntity resourceType) {
         // ok if user has update permission on the ResourceType, context is always global, so we set it to null to omit the check
-        if (hasPermission(Permission.RESOURCETYPE_TEMPLATE, null, Action.UPDATE, null, resourceType)) {
-            return true;
-        }
-        return resourceType != null && isTestingMode && hasPermission(Permission.SHAKEDOWN_TEST_MODE);
+        return hasPermission(Permission.RESOURCETYPE_TEMPLATE, null, Action.UPDATE, null, resourceType);
     }
 
     /**
@@ -973,11 +959,4 @@ private boolean isMoreSpecificRestriction(RestrictionEntity restrictionEntityOne
         }
         return true;
     }
-
-    public void assertHasPermissionShakedownTestMode(boolean testingMode) {
-        if (testingMode) {
-            checkPermissionAndFireException(Permission.SHAKEDOWN_TEST_MODE,
-                                            "execute shakedown test mode");
-        }
-    }
 }
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/security/entity/Permission.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/security/entity/Permission.java
index 86b9201b4..af4c93529 100644
--- a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/security/entity/Permission.java
+++ b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/security/entity/Permission.java
@@ -27,10 +27,6 @@ public enum Permission {
     // FOREIGNABLES PERMISSIONS
     IGNORE_FOREIGNABLE_OWNER("Ignore the owner of a foreignable object. Chuck Norris can edit/delete objects of any owner!", true),
 
-    // SHAKEDOWN TEST
-    SHAKEDOWN_TEST_PAGE("Shakedown test page.", true),
-    SHAKEDOWN_TEST_MODE("", true),
-
     // FUNCTIONS
     MANAGE_GLOBAL_FUNCTIONS("Create, edit and delete GlobalFunctions", true),
     VIEW_GLOBAL_FUNCTIONS("Can see GlobalFunctions", true),
@@ -76,7 +72,6 @@ public enum Permission {
     DEPLOYMENT("The right to deploy.", false),
     RESOURCE_RELEASE_COPY_FROM_RESOURCE ("The right to copy the configuration from one Resources into an other.", false),
     RELEASE("The right to create, read, update or delete Releases", false),
-    SHAKEDOWNTEST("The right to create, read, update or delete ShakedownTests", false),
     RESOURCE("The right to create, read, update or delete Resources", false),
     RESOURCETYPE("The right to create, read, update or delete ResourceTypes", false),
     RESOURCE_TEMPLATE("The right to create, read, update or delete Templates of Resources", false),
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/server/boundary/GetServersUseCase.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/server/boundary/GetServersUseCase.java
new file mode 100644
index 000000000..978b7ab9e
--- /dev/null
+++ b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/server/boundary/GetServersUseCase.java
@@ -0,0 +1,8 @@
+package ch.puzzle.itc.mobiliar.business.server.boundary;
+
+import java.util.List;
+
+public interface GetServersUseCase {
+
+    List<Server> all();
+}
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/server/boundary/Server.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/server/boundary/Server.java
new file mode 100644
index 000000000..eccc49deb
--- /dev/null
+++ b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/server/boundary/Server.java
@@ -0,0 +1,37 @@
+package ch.puzzle.itc.mobiliar.business.server.boundary;
+
+import ch.puzzle.itc.mobiliar.business.server.entity.ServerTuple;
+import lombok.Getter;
+
+@Getter
+public class Server {
+    private final String host;
+    private final String appServer;
+    private final String appServerRelease;
+    private final String runtime;
+    private final String node;
+    private final String nodeRelease;
+    private final String environment;
+    private final Integer appServerId;
+    private final Integer nodeId;
+    private final Integer environmentId;
+    private final String domain;
+    private final Integer domainId;
+    private final boolean definedOnNode;
+
+    public Server(ServerTuple serverTuple) {
+        this.host = serverTuple.getHost();
+        this.appServer = serverTuple.getAppServer();
+        this.appServerRelease = serverTuple.getAppServerRelease();
+        this.runtime = serverTuple.getRuntime();
+        this.node = serverTuple.getNode();
+        this.nodeRelease = serverTuple.getNodeRelease();
+        this.environment = serverTuple.getEnvironment();
+        this.appServerId = serverTuple.getAppServerId();
+        this.nodeId = serverTuple.getNodeId();
+        this.environmentId = serverTuple.getEnvironmentId();
+        this.domain = serverTuple.getDomain();
+        this.domainId = serverTuple.getDomainId();
+        this.definedOnNode = serverTuple.isDefinedOnNode();
+    }
+}
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/server/control/GetServersService.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/server/control/GetServersService.java
new file mode 100644
index 000000000..4e647129e
--- /dev/null
+++ b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/server/control/GetServersService.java
@@ -0,0 +1,23 @@
+package ch.puzzle.itc.mobiliar.business.server.control;
+
+import ch.puzzle.itc.mobiliar.business.server.boundary.GetServersUseCase;
+import ch.puzzle.itc.mobiliar.business.server.boundary.Server;
+import ch.puzzle.itc.mobiliar.business.server.boundary.ServerView;
+
+import javax.inject.Inject;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class GetServersService implements GetServersUseCase {
+
+    @Inject
+    private ServerView serverView;
+
+    @Override
+    public List<Server> all() {
+        return serverView.getServers(null, null, null, null, null, true)
+                .stream()
+                .map(Server::new)
+                .collect(Collectors.toList());
+    }
+}
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/shakedown/control/ShakedownStpService.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/shakedown/control/ShakedownStpService.java
deleted file mode 100644
index c9c42f802..000000000
--- a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/shakedown/control/ShakedownStpService.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- * AMW - Automated Middleware allows you to manage the configurations of
- * your Java EE applications on an unlimited number of different environments
- * with various versions, including the automated deployment of those apps.
- * Copyright (C) 2013-2016 by Puzzle ITC
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package ch.puzzle.itc.mobiliar.business.shakedown.control;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.ejb.Stateless;
-import javax.inject.Inject;
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
-import javax.persistence.PersistenceContext;
-import javax.persistence.TypedQuery;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-
-import ch.puzzle.itc.mobiliar.business.generator.control.ShakedownTestGeneratorDomainService;
-import ch.puzzle.itc.mobiliar.business.security.interceptor.HasPermission;
-import ch.puzzle.itc.mobiliar.business.template.control.TemplatesScreenDomainService;
-import ch.puzzle.itc.mobiliar.business.shakedown.entity.ShakedownStpEntity;
-import ch.puzzle.itc.mobiliar.business.security.entity.Permission;
-import ch.puzzle.itc.mobiliar.common.exception.ElementAlreadyExistsException;
-import ch.puzzle.itc.mobiliar.common.exception.StpNotFoundException;
-import ch.puzzle.itc.mobiliar.common.exception.TemplateNotDeletableException;
-
-import static ch.puzzle.itc.mobiliar.business.security.entity.Action.CREATE;
-import static ch.puzzle.itc.mobiliar.business.security.entity.Action.DELETE;
-import static ch.puzzle.itc.mobiliar.business.security.entity.Action.UPDATE;
-
-@Stateless
-public class ShakedownStpService {
-
-	@Inject
-	private Logger log;
-
-	@PersistenceContext
-	EntityManager em;
-
-	@Inject
-	TemplatesScreenDomainService templatesScreenDomainService;
-
-	public List<ShakedownStpEntity> getSTPs() {
-		try {
-			TypedQuery<ShakedownStpEntity> q = em.createQuery(
-					"from ShakedownStpEntity order by lower(stpName)", ShakedownStpEntity.class);
-			return q.getResultList();
-		}
-		catch (Exception e) {
-			return new ArrayList<>();
-		}
-	}
-
-	public List<ShakedownStpEntity> getSTPsWithoutSTS() {
-		try {
-			CriteriaBuilder cb = em.getCriteriaBuilder();
-			CriteriaQuery<ShakedownStpEntity> q = cb.createQuery(ShakedownStpEntity.class);
-			Root<ShakedownStpEntity> r = q.from(ShakedownStpEntity.class);
-			Predicate stsPred= cb.notLike(r.<String> get("stpName"), ShakedownTestGeneratorDomainService.STS_NAME);
-
-			q.where(stsPred);
-			q.orderBy(cb.asc(cb.lower(r.<String> get("stpName"))));
-
-			TypedQuery<ShakedownStpEntity> query = em.createQuery(q);
-			return query.getResultList();
-		} catch (Exception e) {
-			return new ArrayList<>();
-		}
-	}
-
-	@HasPermission(permission = Permission.SHAKEDOWNTEST, action = DELETE)
-	public void deleteSTPEntity(final Integer stpId) throws StpNotFoundException, TemplateNotDeletableException {
-		ShakedownStpEntity shakedownStpEntity = getSTPById(stpId);
-		if (shakedownStpEntity == null) {
-			String message = "Die zu löschende STP Entität ist nicht vorhanden ";
-			log.info(message);
-			throw new StpNotFoundException(message);
-		}
-
-		// If delete SPT, delete all defined testing-template with
-		// this STP
-		templatesScreenDomainService.deleteSTPTemplate(shakedownStpEntity.getStpName());
-		em.remove(shakedownStpEntity);
-		log.info("STP mit der Id: " + stpId + " wurde aus der DB gelöscht");
-
-	}
-
-	private ShakedownStpEntity getSTPById(final Integer id) {
-		ShakedownStpEntity shakedownStpEntity = null;
-		try {
-			shakedownStpEntity = (ShakedownStpEntity) em
-					.createQuery("from ShakedownStpEntity test where test.id=:id")
-					.setParameter("id", id).getSingleResult();
-		}
-		catch (NoResultException nre) {
-			String message = "Die STP Entität mit der id" + id + " existiert nicht aud der DB";
-			log.log(Level.WARNING, message);
-		}
-		return shakedownStpEntity;
-	}
-
-	private ShakedownStpEntity getSTPByName(final String stpName) {
-		ShakedownStpEntity shakedownStpEntity = null;
-		try {
-			shakedownStpEntity = (ShakedownStpEntity) em
-					.createQuery("from ShakedownStpEntity test where test.stpName=:stpNewName")
-					.setParameter("stpNewName", stpName).getSingleResult();
-		}
-		catch (NoResultException nre) {
-			String message = "Die STP Entität " + stpName + " existiert nicht aud der DB";
-			log.log(Level.WARNING, message);
-		}
-		return shakedownStpEntity;
-	}
-
-	@HasPermission(permission = Permission.SHAKEDOWNTEST, action = CREATE)
-	public ShakedownStpEntity createNewSTP(final String newSTPName, final String newSTPVersion,
-			final List<String> args) throws ElementAlreadyExistsException {
-		ShakedownStpEntity shakedownStpEntity = getSTPByName(newSTPName);
-		ShakedownStpEntity result;
-		if (shakedownStpEntity == null) {
-			result = new ShakedownStpEntity();
-			result.setStpName(newSTPName);
-			result.setVersion(newSTPVersion);
-			if (args != null && !args.isEmpty()) {
-				for (String arg : args) {
-					if (arg != null) {
-						result.addParameter(arg);
-					}
-				}
-			}
-			em.persist(result);
-			log.info("STP " + newSTPName + " in DB persist");
-		}
-		else {
-			String message = "Die STP Entität mit dem Namen: " + newSTPName
-					+ " ist bereits vorhanden und kann nicht erstellen werden";
-			log.info(message);
-			throw new ElementAlreadyExistsException(message, ShakedownStpEntity.class, newSTPName);
-		}
-		return result;
-	}
-
-	/**
-	 * @param stpEntity
-	 * @param args
-	 * @return list with not added args or null if some error occurs
-	 */
-	@HasPermission(permission = Permission.SHAKEDOWNTEST, action = UPDATE)
-	public List<String> editSTPEntity(final ShakedownStpEntity stpEntity, final List<String> args) {
-		List<String> notAddedArgs = new ArrayList<>();
-		if (stpEntity == null) {
-			String message = "Keine STP Entität ist selektiert";
-			log.info(message);
-			return null;
-		} else {
-			ShakedownStpEntity current = em.find(ShakedownStpEntity.class, stpEntity.getId());
-			String oldName = current != null ? current.getStpName() : null;
-			if (args != null && !args.isEmpty()) {
-				stpEntity.setComaSeperatedParameters(null);
-				for (String arg : args) {
-					boolean success = stpEntity.addParameter(arg);
-					if (!success) {
-						notAddedArgs.add(arg);
-					}
-				}
-			}
-			em.merge(stpEntity);
-
-			if (oldName != null && !stpEntity.getStpName().equals(oldName)) {
-				String message = "STP mit dem Namen " + oldName + " wurde geändert und umbenannt zu " + stpEntity.getStpName();
-				log.info(message);
-				// the stpEntity was renamed, we have to rename the template accordingly
-				templatesScreenDomainService.renameTestingTemplates(oldName, stpEntity.getStpName());
-			} else {
-				String message = "STP mit dem Namen " + stpEntity.getStpName() + " wurde geändert";
-				log.info(message);
-			}
-		}
-		return notAddedArgs;
-	}
-
-}
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/shakedown/control/ShakedownTestAsynchronousExecuter.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/shakedown/control/ShakedownTestAsynchronousExecuter.java
deleted file mode 100644
index 6b21016c4..000000000
--- a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/shakedown/control/ShakedownTestAsynchronousExecuter.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * AMW - Automated Middleware allows you to manage the configurations of
- * your Java EE applications on an unlimited number of different environments
- * with various versions, including the automated deployment of those apps.
- * Copyright (C) 2013-2016 by Puzzle ITC
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package ch.puzzle.itc.mobiliar.business.shakedown.control;
-
-import ch.puzzle.itc.mobiliar.business.shakedown.entity.ShakedownTestEntity;
-import ch.puzzle.itc.mobiliar.business.shakedown.entity.ShakedownTestEntity.shakedownTest_state;
-import ch.puzzle.itc.mobiliar.business.shakedown.xmlmodel.STS;
-import ch.puzzle.itc.mobiliar.business.shakedown.xmlmodel.TestSet;
-import ch.puzzle.itc.mobiliar.business.shakedown.xmlmodel.TestSet.OverallStatus;
-
-import javax.ejb.Asynchronous;
-import javax.ejb.Stateless;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-import javax.inject.Inject;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-
-/**
- * Service to asynchronously execute the Shakedown Tests
- */
-@Stateless
-public class ShakedownTestAsynchronousExecuter {
-
-	@Inject
-	private ShakedownTestExecutionResultHandlerService shakedownTestExecutionResultHandlerService;
-
-	@Inject
-	private ShakedownTestRunner shakedownTestRunner;
-
-	@Inject
-	private Logger log;
-
-
-	/**
-	 * Executes the ShakedownTest
-	 * 
-	 * @param generationResult
-	 */
-	@Asynchronous
-	@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
-	public void executeShakedownTest(ShakedownTestGenerationResult generationResult) {
-		ShakedownTestEntity shakedownTest = generationResult.getShakedownTestEntity();
-
-		if (!generationResult.hasErrors()) {
-			try {
-				log.log(Level.INFO, "Starting ShakedownTest: " + shakedownTest.getTrackingId());
-				ShakedownTestEntity result = execute(generationResult);
-				// Handle Result
-				if (result.isSuccess()) {
-					shakedownTestExecutionResultHandlerService.handleSuccessfulShakedownTest(result);
-				} else {
-					shakedownTestExecutionResultHandlerService.handleUnsuccessfulShakedownTest(result.getTestResult(), shakedownTest.getId());
-				}
-			} catch (Exception e) {
-				shakedownTestExecutionResultHandlerService.handleUnsuccessfulShakedownTest(e, shakedownTest.getId());
-			}
-		} else {
-			shakedownTestExecutionResultHandlerService.handleUnsuccessfulShakedownTest(generationResult.getErrorMessage(), shakedownTest.getId());
-		}
-	}
-
-	private ShakedownTestEntity execute(ShakedownTestGenerationResult generationResult) {
-		List<STS> testingTemplates = generationResult.getTestingTemplates();
-		ShakedownTestEntity finalShake = generationResult.getShakedownTestEntity();
-
-		if (testingTemplates == null || testingTemplates.isEmpty()) {
-			finalShake.setTestResult("No STS available");
-			finalShake.setShakedownTestStateDisplayName(shakedownTest_state.failed);
-			log.info("STS " + finalShake.getId() + ": No STS available");
-		}
-		else {
-			StringBuilder sb = new StringBuilder();
-			sb.append("<table>");
-			OverallStatus state = OverallStatus.success;
-			for (STS s : testingTemplates) {
-				sb.append("<tr><td>").append(s.getRemoteHost()).append("</td><td>");
-				if (s.getShakedowntests() == null || s.getShakedowntests().isEmpty()) {
-					sb.append("No tests available");
-					if (state != OverallStatus.failed) {
-						state = OverallStatus.warning;
-					}
-				} else {
-					TestSet set = shakedownTestRunner.executeShakedownTest(s);
-					sb.append(set.getTestMessage());
-					if (set.getOverallStatus() == OverallStatus.warning && state != OverallStatus.failed) {
-						state = OverallStatus.warning;
-					} else if (set.getOverallStatus() == OverallStatus.failed) {
-						state = OverallStatus.failed;
-					}
-				}
-				sb.append("</td></tr>");
-			}
-			sb.append("</table>");
-			log.info("STS " + finalShake.getId() + ": " + sb.toString());
-			shakedownTest_state shakedownState = null;
-			switch (state) {
-			case success:
-				shakedownState = shakedownTest_state.success;
-				break;
-			case failed:
-				shakedownState = shakedownTest_state.failed;
-				break;
-			case warning:
-				shakedownState = shakedownTest_state.warning;
-				break;
-			}
-			finalShake.setTestResult(sb.toString());
-			finalShake.setShakedownTestStateDisplayName(shakedownState);
-		}
-
-		return finalShake;
-	}
-}
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/shakedown/control/ShakedownTestExecuterService.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/shakedown/control/ShakedownTestExecuterService.java
deleted file mode 100644
index a7f099aa1..000000000
--- a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/shakedown/control/ShakedownTestExecuterService.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * AMW - Automated Middleware allows you to manage the configurations of
- * your Java EE applications on an unlimited number of different environments
- * with various versions, including the automated deployment of those apps.
- * Copyright (C) 2013-2016 by Puzzle ITC
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package ch.puzzle.itc.mobiliar.business.shakedown.control;
-
-import ch.puzzle.itc.mobiliar.business.generator.control.LockingService;
-import ch.puzzle.itc.mobiliar.business.generator.control.ShakedownTestGeneratorDomainService;
-import ch.puzzle.itc.mobiliar.business.shakedown.entity.ShakedownTestEntity;
-
-import javax.ejb.Asynchronous;
-import javax.ejb.Stateless;
-import javax.inject.Inject;
-import javax.persistence.EntityManager;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * Service to start ShakedownTest asynchronously for the generated Configuration
- */
-@Stateless
-public class ShakedownTestExecuterService {
-
-	@Inject
-	private ShakedownTestService shakedownTestService;
-
-	@Inject
-	private ShakedownTestGeneratorDomainService generatorDomainService;
-
-	@Inject
-	private ShakedownTestAsynchronousExecuter shakedownTestAsynchronousExecuter;
-
-	@Inject
-	private LockingService lockingService;
-
-	@Inject
-	private EntityManager entityManager;
-
-	@Inject
-	private Logger log;
-
-	/**
-	 * Executes the ShakedownTest
-	 * 
-	 * @param shakeDownTestId
-	 */
-	@Asynchronous
-	public void generateConfigurationAndExecuteShakedownTest(Integer shakeDownTestId) {
-		ShakedownTestEntity shakedownTest = shakedownTestService.getShakedownTestById(shakeDownTestId);
-
-		if(shakedownTest != null){
-			// lock ShakedownTest
-			boolean lockSuccessful = lockingService.markShakedownTestAsRunning(shakeDownTestId);
-			if (lockSuccessful) {
-				log.info("Locking of ShakedownTest " + shakedownTest.getId() + " successful");
-
-				// Reload the entity because it has been changed by another
-				// transaction within the locking mechanism.
-				entityManager.clear();
-				shakedownTest = entityManager.find(ShakedownTestEntity.class, shakedownTest.getId());
-
-				// generate Config
-				ShakedownTestGenerationResult result = generatorDomainService.generateConfigurationForShakedownTest(shakedownTest);
-
-				if (result != null && !result.hasErrors()) {
-					// execute tests
-					shakedownTestAsynchronousExecuter.executeShakedownTest(result);
-				}
-			}else{
-				log.log(Level.SEVERE, "No ShakedownTestEntity found for shakeDownTestId " + shakeDownTestId);
-			}
-		}
-	}
-}
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/shakedown/control/ShakedownTestExecutionResultHandlerService.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/shakedown/control/ShakedownTestExecutionResultHandlerService.java
deleted file mode 100644
index 939f4be8d..000000000
--- a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/shakedown/control/ShakedownTestExecutionResultHandlerService.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * AMW - Automated Middleware allows you to manage the configurations of
- * your Java EE applications on an unlimited number of different environments
- * with various versions, including the automated deployment of those apps.
- * Copyright (C) 2013-2016 by Puzzle ITC
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package ch.puzzle.itc.mobiliar.business.shakedown.control;
-
-import ch.puzzle.itc.mobiliar.business.shakedown.entity.ShakedownTestEntity;
-import ch.puzzle.itc.mobiliar.business.shakedown.entity.ShakedownTestEntity.shakedownTest_state;
-
-import javax.ejb.Stateless;
-import javax.inject.Inject;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * Handles the Result of the ShakedownTest Execution
- *
- */
-@Stateless
-public class ShakedownTestExecutionResultHandlerService {
-
-	@Inject
-	private Logger log;
-
-
-	@Inject
-	private ShakedownTestService shakedownTestService;
-
-	/**
-	 * Handles a successful Execution
-	 * 
-	 * @param shakedownTest
-	 */
-	public void handleSuccessfulShakedownTest(ShakedownTestEntity shakedownTest) {
-		ShakedownTestEntity test = shakedownTestService.updateShakedownInfo(shakedownTest.getId(), shakedownTest.getTestResult(), shakedownTest_state.success);
-		log.info("Shakedown test " + test.getId() + " executed and result parsed");
-	}
-
-	/**
-	 * Handles an unsuccessful Execution
-	 * 
-	 * @param testResult
-	 * @param testId
-	 */
-	public void handleUnsuccessfulShakedownTest(String testResult, Integer testId) {
-		ShakedownTestEntity test = shakedownTestService.updateShakedownInfo(testId, testResult, shakedownTest_state.failed);
-		log.log(Level.WARNING, "Shakedown test " + test.getId() + " had an issue with its generation", testResult);
-	}
-
-
-	/**
-	 * Handles an unsuccessful Execution
-	 * 
-	 * @param e
-	 */
-	public void handleUnsuccessfulShakedownTest(Exception e, Integer testId) {
-		if (testId != null) {
-			ShakedownTestEntity test = shakedownTestService.updateShakedownInfo(testId, e.getMessage(), shakedownTest_state.failed);
-			log.log(Level.SEVERE, "Shakedown test " + test.getId() + " execution failed!", e);
-		} else {
-			log.log(Level.SEVERE, "Shakedown test execution failed!", e);
-		}
-	}
-
-}
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/shakedown/control/ShakedownTestGenerationResult.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/shakedown/control/ShakedownTestGenerationResult.java
deleted file mode 100644
index 58b926e15..000000000
--- a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/shakedown/control/ShakedownTestGenerationResult.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * AMW - Automated Middleware allows you to manage the configurations of
- * your Java EE applications on an unlimited number of different environments
- * with various versions, including the automated deployment of those apps.
- * Copyright (C) 2013-2016 by Puzzle ITC
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package ch.puzzle.itc.mobiliar.business.shakedown.control;
-
-import ch.puzzle.itc.mobiliar.business.generator.control.GenerationResult;
-import ch.puzzle.itc.mobiliar.business.shakedown.entity.ShakedownTestEntity;
-import ch.puzzle.itc.mobiliar.business.shakedown.xmlmodel.STS;
-import lombok.Getter;
-import lombok.Setter;
-import org.apache.commons.lang3.StringUtils;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class ShakedownTestGenerationResult extends GenerationResult {
-
-	@Getter
-	@Setter
-	private ShakedownTestEntity shakedownTestEntity;
-
-	@Getter
-	@Setter
-	private List<STS> testingTemplates;
-
-	public void addTestingTemplate(STS testingTemplate) {
-		if (testingTemplates == null) {
-			testingTemplates = new ArrayList<STS>();
-		}
-		testingTemplates.add(testingTemplate);
-	}
-
-	public void addAllTestingTemplates(List<STS> stsTemplates) {
-		if (this.testingTemplates == null) {
-			this.testingTemplates = new ArrayList<STS>();
-		}
-		if(stsTemplates != null){
-			this.testingTemplates.addAll(stsTemplates);
-		}
-	}
-
-	@Override
-	public boolean hasErrors() {
-		return super.hasErrors() || shakedownTestEntity.isFailed();
-	}
-
-	@Override
-	public String getErrorMessage() {
-		StringBuilder sb = new StringBuilder();
-		if (!StringUtils.isEmpty(shakedownTestEntity.getTestResult())) {
-			sb.append(shakedownTestEntity.getTestResult());
-			sb.append("\n");
-		}
-		sb.append(super.getErrorMessage());
-		return sb.toString();
-	}
-
-}
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/shakedown/control/ShakedownTestRunner.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/shakedown/control/ShakedownTestRunner.java
deleted file mode 100644
index 3ce510cb9..000000000
--- a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/shakedown/control/ShakedownTestRunner.java
+++ /dev/null
@@ -1,332 +0,0 @@
-/*
- * AMW - Automated Middleware allows you to manage the configurations of
- * your Java EE applications on an unlimited number of different environments
- * with various versions, including the automated deployment of those apps.
- * Copyright (C) 2013-2016 by Puzzle ITC
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package ch.puzzle.itc.mobiliar.business.shakedown.control;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
-import java.util.zip.ZipOutputStream;
-
-import javax.ejb.Stateless;
-import javax.inject.Inject;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-import javax.xml.bind.JAXB;
-
-import ch.puzzle.itc.mobiliar.business.shakedown.xmlmodel.STS;
-import ch.puzzle.itc.mobiliar.business.shakedown.xmlmodel.Test;
-import ch.puzzle.itc.mobiliar.business.shakedown.xmlmodel.TestSet;
-import org.apache.commons.io.IOUtils;
-
-import ch.puzzle.itc.mobiliar.business.shakedown.xmlmodel.TestSet.OverallStatus;
-import ch.puzzle.itc.mobiliar.business.shakedown.entity.ShakedownStpEntity;
-import ch.puzzle.itc.mobiliar.common.exception.ShakedownTestException;
-import ch.puzzle.itc.mobiliar.common.util.ConfigurationService;
-import ch.puzzle.itc.mobiliar.common.util.ConfigKey;
-
-@Stateless
-public class ShakedownTestRunner {
-
-	@Inject
-	protected EntityManager entityManager;
-	@Inject
-	protected Logger log;
-
-	/**
-	 * @param sts
-	 * @return
-	 */
-	public TestSet executeShakedownTest(STS sts) {
-		TestSet resultSet;
-		String strcsv = getStrCsv();
-		ArrayList<Test> otherTests = new ArrayList<Test>();
-		String bundle;
-		try {
-			bundle = bundleSTM(strcsv, sts.getShakedowntestsAsCSV(), sts);
-			try {
-				List<String> missingSTPs = copySTMtoRemoteServerAndGetMissingSTPs(bundle, sts);
-				if (missingSTPs != null && !missingSTPs.isEmpty()) {
-					for (String missingSTP : missingSTPs) {
-						try {
-							copySTPtoRemoteServer(missingSTP, sts);
-						} catch (ShakedownTestException e) {
-							Test t = new Test();
-							t.setName(missingSTP);
-							t.setTestStatus(OverallStatus.failed.name());
-							t.setStdErr(e.getMessage());
-							log.log(Level.WARNING, "Was not able to copy STP " + missingSTP + " to remote server", e);
-							otherTests.add(t);
-						}
-					}
-				}
-				try {
-					launchTests(bundle, sts);
-				} catch (ShakedownTestException e) {
-					Test launchTestFailure = new Test();
-					launchTestFailure.setName("General Test Execution");
-					launchTestFailure.setTestStatus(OverallStatus.failed.name());
-					launchTestFailure.setStdErr(e.getMessage());
-					log.log(Level.WARNING, "General Test Execution failed", e);
-					otherTests.add(launchTestFailure);
-				}
-			} catch (ShakedownTestException e1) {
-				Test copySTMFailure = new Test();
-				copySTMFailure.setName("General Test Execution");
-				copySTMFailure.setTestStatus(OverallStatus.failed.name());
-				copySTMFailure.setStdErr(e1.getMessage());
-				log.log(Level.WARNING, "Was not able to copy STM to remote server", e1);
-				otherTests.add(copySTMFailure);
-			}
-
-		} catch (ShakedownTestException e) {
-			Test bundleFailure = new Test();
-			bundleFailure.setName("General Test Execution");
-			bundleFailure.setTestStatus(OverallStatus.failed.name());
-			bundleFailure.setStdErr(e.getMessage());
-			otherTests.add(bundleFailure);
-			log.log(Level.WARNING, "Was not able to bundle STM", e);
-		}
-		String result = null;
-		try {
-			result = analyzeResult(sts);
-		} catch (ShakedownTestException e) {
-			Test resultAnalyzeFailure = new Test();
-			resultAnalyzeFailure.setName("General Test Execution");
-			resultAnalyzeFailure.setTestStatus(OverallStatus.failed.name());
-			resultAnalyzeFailure.setStdErr(e.getMessage());
-			otherTests.add(resultAnalyzeFailure);
-			log.log(Level.WARNING, "Was not able to analyze results", e);
-		}
-		if (result != null) {
-			resultSet = JAXB.unmarshal(new StringReader(result), TestSet.class);
-		} else {
-			resultSet = new TestSet();
-		}
-		if (resultSet.getTests() == null) {
-			resultSet.setTests(otherTests);
-		} else {
-			resultSet.getTests().addAll(otherTests);
-		}
-		return resultSet;
-
-	}
-
-	private String analyzeResult(STS sts) throws ShakedownTestException {
-		String testResultPath = ConfigurationService.getProperty(ConfigKey.TEST_RESULT_PATH);
-		try {
-			StringBuilder sb = new StringBuilder();
-			ZipInputStream zis = null;
-			try {
-				zis = new ZipInputStream(new FileInputStream(testResultPath + File.separator + sts.getTestId() + ".zip"));
-				ZipEntry entry;
-				while ((entry = zis.getNextEntry()) != null) {
-					if (entry.getName().equals("/result.xml")) {
-						BufferedReader reader = new BufferedReader(new InputStreamReader(zis));
-						String s;
-						while ((s = reader.readLine()) != null) {
-							sb.append(s);
-						}
-					}
-				}
-			} finally {
-				if (zis != null) {
-					zis.close();
-				}
-			}
-			return sb.toString();
-		} catch (FileNotFoundException e) {
-			throw new ShakedownTestException("Was not able to analyze the result - no result file found!", e);
-		} catch (IOException e) {
-			throw new ShakedownTestException("Was not able to analyze the result", e);
-		}
-
-	}
-
-	private void launchTests(String bundle, STS sts) throws ShakedownTestException {
-		File f = new File(bundle);
-		// TODO set other parameters to ssh call
-		String resultPath = ConfigurationService.getProperty(ConfigKey.TEST_RESULT_PATH);
-		File resPath = new File(resultPath);
-		if (resultPath != null && resPath.exists() && resPath.isDirectory()) {
-			String launchSTM = "ssh " + sts.getUser() + "@" + sts.getRemoteHost() + " java -jar " + sts.getRemoteSTPPath() + File.separator + "stms" + File.separator + f.getName() + ' '
-					+ sts.getRemoteSTPPath();
-			log.info("EXECUTE: " + launchSTM);
-			try {
-				Process launcher = Runtime.getRuntime().exec(launchSTM);
-				if (launcher.waitFor() == 0) {
-					File stp = new File(sts.getRemoteSTPPath());
-					String fetchResultCommand = "scp " + sts.getUser() + "@" + sts.getRemoteHost() + ":" + stp.getParent() + File.separator + "results" + File.separator + sts.getTestId() + ".zip "
-							+ resultPath + File.separator + sts.getTestId() + ".zip";
-					// TODO save results to configurable folder
-					log.info("EXECUTE: " + fetchResultCommand);
-					Process fetchResult = Runtime.getRuntime().exec(fetchResultCommand);
-					if (fetchResult.waitFor() == 0) {
-						log.info("Copied results from to host " + sts.getRemoteHost());
-					} else {
-						throw new ShakedownTestException("Was not able to copy results from host " + sts.getRemoteHost());
-					}
-				} else {
-					throw new ShakedownTestException("The test manager has exited anormally (exit code != 0)");
-				}
-			} catch (IOException e) {
-				throw new ShakedownTestException("Was not able to launch tests on remote server", e);
-			} catch (InterruptedException e) {
-				throw new ShakedownTestException("Was not able to launch tests on remote server", e);
-			}
-		} else {
-			throw new ShakedownTestException("amw.testResultPath not set or value is not a directory");
-		}
-	}
-
-	private void copyThroughSCP(String filepath, STS sts) throws IOException, InterruptedException, ShakedownTestException {
-		Runtime r = Runtime.getRuntime();
-		File f = new File(filepath);
-		String copyCommand = "scp " + filepath + " " + sts.getUser() + "@" + sts.getRemoteHost() + ":" + sts.getRemoteSTPPath() + File.separator + f.getName();
-		log.info("EXECUTE: " + copyCommand);
-		Process p = r.exec(copyCommand);
-		if (p.waitFor() == 0) {
-			log.info("Copied STP " + filepath + " to host " + sts.getRemoteHost());
-		} else {
-			throw new ShakedownTestException("Was not able to copy STP " + filepath + " to host " + sts.getRemoteHost());
-		}
-	}
-
-	private void copySTPtoRemoteServer(String missingSTP, STS sts) throws ShakedownTestException {
-		String stmrepo = ConfigurationService.getProperty(ConfigKey.STM_REPO);
-		File f = new File(stmrepo + File.separator + missingSTP);
-		if (f.exists()) {
-			try {
-				copyThroughSCP(f.getAbsolutePath(), sts);
-			} catch (IOException e) {
-				throw new ShakedownTestException(e);
-			} catch (InterruptedException e) {
-				throw new ShakedownTestException(e);
-			}
-		} else {
-			throw new ShakedownTestException("STP not found in repository!");
-		}
-	}
-
-	private List<String> copySTMtoRemoteServerAndGetMissingSTPs(String bundle, STS sts) throws ShakedownTestException {
-		List<String> result = new ArrayList<String>();
-		Runtime r = Runtime.getRuntime();
-		File f = new File(bundle);
-		if (!f.exists()) {
-			throw new ShakedownTestException("The STM bundle file " + f.getAbsolutePath() + " does not exist!");
-		}
-		// Create folder if it does not yet exist
-		String createRemoteSTMFolderIfNotExists = "ssh " + sts.getUser() + "@" + sts.getRemoteHost() + " mkdir -p " + sts.getRemoteSTPPath() + File.separator + "stms";
-		log.info("EXECUTE: " + createRemoteSTMFolderIfNotExists);
-		try {
-			Process createRemoteSTMFolder = r.exec(createRemoteSTMFolderIfNotExists);
-			if (createRemoteSTMFolder.waitFor() != 0) {
-				throw new ShakedownTestException("Was not able to create STM folder on remote site: " + sts.getRemoteHost() + File.separator + "stms with user " + sts.getUser());
-			}
-			String copySTMcommand = "scp " + bundle + " " + sts.getUser() + "@" + sts.getRemoteHost() + ":" + sts.getRemoteSTPPath() + File.separator + "stms" + File.separator + f.getName();
-			log.info("EXECUTE: " + copySTMcommand);
-			Process p = r.exec(copySTMcommand);
-			if (p.waitFor() == 0) {
-				log.info("Copied STM bundle " + bundle + " to host " + sts.getRemoteHost());
-				String launchDepMgmtCommand = "ssh " + sts.getUser() + "@" + sts.getRemoteHost() + " java -jar " + sts.getRemoteSTPPath() + File.separator + "stms" + File.separator + f.getName()
-						+ " " + sts.getRemoteSTPPath() + " dependencyManagement";
-				log.info("EXECUTE: " + launchDepMgmtCommand);
-				Process dependencyMgmt = r.exec(launchDepMgmtCommand);
-				BufferedReader bufferedreader = null;
-				try {
-					bufferedreader = new BufferedReader(new InputStreamReader(new BufferedInputStream(dependencyMgmt.getErrorStream())));
-					String errorline;
-					while ((errorline = bufferedreader.readLine()) != null) {
-						if (errorline.startsWith("@{") && errorline.trim().endsWith("}")) {
-							result.add(errorline.trim().substring(2, errorline.trim().length() - 1));
-						}
-					}
-				} finally {
-					if (bufferedreader != null) {
-						bufferedreader.close();
-					}
-				}
-			} else {
-				throw new ShakedownTestException("Was not able to copy STP " + bundle + " to host " + sts.getRemoteHost() + " with ssh user " + sts.getUser());
-			}
-		} catch (IOException e) {
-			throw new ShakedownTestException("Was not able to copy STM to remote server ", e);
-		} catch (InterruptedException e) {
-			throw new ShakedownTestException("Was not able to copy STM to remote server ", e);
-		}
-		return result;
-	}
-
-	String bundleSTM(String strcsv, String stscsv, STS sts) throws ShakedownTestException {
-		String tmpdir = System.getProperty("java.io.tmpdir");
-		String stmpath = ConfigurationService.getProperty(ConfigKey.STM_PATH);
-		if (tmpdir != null && !tmpdir.trim().isEmpty()) {
-			if (stmpath != null && new File(stmpath).exists()) {
-				try {
-					File bundle = new File(tmpdir + File.separator + sts.getTestId() + "stm.jar");
-					ZipOutputStream bundleZOS = new ZipOutputStream(new FileOutputStream(bundle));
-					bundleZOS.putNextEntry(new ZipEntry("str.csv"));
-					IOUtils.write(strcsv, bundleZOS);
-					bundleZOS.putNextEntry(new ZipEntry("sts.csv"));
-					IOUtils.write(stscsv, bundleZOS);
-					ZipInputStream zin = new ZipInputStream(new FileInputStream(stmpath));
-					ZipEntry ze;
-					while ((ze = zin.getNextEntry()) != null) {
-						bundleZOS.putNextEntry(ze);
-						IOUtils.copy(zin, bundleZOS);
-					}
-					bundleZOS.close();
-					log.info("Successfully bundled STM and stored to " + bundle.getAbsolutePath());
-				} catch (IOException e) {
-					throw new ShakedownTestException("Was not able to bundle STM", e);
-				}
-			}
-			else{
-				throw new ShakedownTestException("No STM found at location configured with system property "+ConfigKey.STM_PATH+".");
-			}
-		} else {
-			throw new ShakedownTestException("No temporary folder found - is java.io.tmpdir defined?");
-		}
-		return tmpdir + File.separator + sts.getTestId() + "stm.jar";
-	}
-
-	public String getStrCsv() {
-		StringBuilder sb = new StringBuilder();
-		TypedQuery<ShakedownStpEntity> q = entityManager.createQuery("from ShakedownStpEntity", ShakedownStpEntity.class);
-		List<ShakedownStpEntity> stps = q.getResultList();
-		for (ShakedownStpEntity s : stps) {
-			sb.append(s.getStpName()).append('\t').append(s.getVersion()).append('\n');
-		}
-		return sb.toString();
-	}
-
-}
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/shakedown/control/ShakedownTestService.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/shakedown/control/ShakedownTestService.java
index 28de9e802..e69de29bb 100644
--- a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/shakedown/control/ShakedownTestService.java
+++ b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/shakedown/control/ShakedownTestService.java
@@ -1,415 +0,0 @@
-/*
- * AMW - Automated Middleware allows you to manage the configurations of
- * your Java EE applications on an unlimited number of different environments
- * with various versions, including the automated deployment of those apps.
- * Copyright (C) 2013-2016 by Puzzle ITC
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package ch.puzzle.itc.mobiliar.business.shakedown.control;
-
-import ch.puzzle.itc.mobiliar.business.database.control.SequencesService;
-import ch.puzzle.itc.mobiliar.business.deploy.entity.CustomFilter;
-import ch.puzzle.itc.mobiliar.business.deploy.entity.DeploymentEntity;
-import ch.puzzle.itc.mobiliar.business.deploy.entity.DeploymentEntity.ApplicationWithVersion;
-import ch.puzzle.itc.mobiliar.business.deploy.entity.DeploymentState;
-import ch.puzzle.itc.mobiliar.business.domain.commons.CommonFilterService;
-import ch.puzzle.itc.mobiliar.business.domain.commons.Sort;
-import ch.puzzle.itc.mobiliar.business.environment.control.ContextDomainService;
-import ch.puzzle.itc.mobiliar.business.environment.entity.ContextEntity;
-import ch.puzzle.itc.mobiliar.business.generator.control.extracted.ResourceDependencyResolverService;
-import ch.puzzle.itc.mobiliar.business.releasing.entity.ReleaseEntity;
-import ch.puzzle.itc.mobiliar.business.resourcegroup.control.ResourceTypeProvider;
-import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.*;
-import ch.puzzle.itc.mobiliar.business.resourcerelation.entity.ConsumedResourceRelationEntity;
-import ch.puzzle.itc.mobiliar.business.resourcerelation.entity.ProvidedResourceRelationEntity;
-import ch.puzzle.itc.mobiliar.business.security.entity.Action;
-import ch.puzzle.itc.mobiliar.business.security.entity.Permission;
-import ch.puzzle.itc.mobiliar.business.security.interceptor.HasPermission;
-import ch.puzzle.itc.mobiliar.business.shakedown.entity.ShakedownOrder;
-import ch.puzzle.itc.mobiliar.business.shakedown.entity.ShakedownTestEntity;
-import ch.puzzle.itc.mobiliar.business.shakedown.entity.ShakedownTestEntity.ApplicationsFromApplicationServer;
-import ch.puzzle.itc.mobiliar.business.shakedown.entity.ShakedownTestEntity.shakedownTest_state;
-import ch.puzzle.itc.mobiliar.business.shakedown.entity.ShakedownTestFilterTypes;
-import ch.puzzle.itc.mobiliar.business.shakedown.entity.ShakedownTestOrder;
-import ch.puzzle.itc.mobiliar.business.shakedown.event.ShakedownTestEvent;
-import ch.puzzle.itc.mobiliar.business.shakedown.event.ShakedownTestEvent.ShakedownTestEventType;
-import ch.puzzle.itc.mobiliar.common.util.DefaultResourceTypeDefinition;
-import ch.puzzle.itc.mobiliar.common.util.Tuple;
-
-import javax.ejb.Stateless;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-import javax.enterprise.event.Event;
-import javax.inject.Inject;
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
-import javax.persistence.TypedQuery;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-import java.util.*;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import static ch.puzzle.itc.mobiliar.business.shakedown.entity.ShakedownTestFilterTypes.QLConstants.*;
-
-@Stateless
-public class ShakedownTestService{
-
-	@Inject
-	ContextDomainService context;
-
-	@Inject
-	ResourceTypeProvider resTypeProvider;
-
-	@Inject
-	ShakedownTestRunner shakedownTestRunner;
-
-	@Inject
-	private ResourceDependencyResolverService dependencyResolver;
-
-	@Inject
-	private Event<ShakedownTestEvent> shakedownTestEvent;
-
-	@Inject
-	private SequencesService sequencesService;
-	
-	@Inject
-	private CommonFilterService commonFilterService;
-
-	@Inject
-	private EntityManager em;
-
-	@Inject
-	private Logger log;
-
-	@TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
-	public List<ResourceGroupEntity> getAllApplications(){
-		return em.createNamedQuery(ResourceGroupEntity.ALLRESOURCESBYTYPE_QUERY, ResourceGroupEntity.class).setParameter("restype", DefaultResourceTypeDefinition.APPLICATION.name()).getResultList();
-	}
-
-
-	public Tuple<Set<ShakedownTestEntity>, Integer> getFilteredShakedownTests(boolean doPageingCalculation, Integer startIndex, Integer maxResults,
-																			  List<CustomFilter> filter, String colToSort, Sort.SortingDirectionType sortingDirection, List<Integer> myAMWFilter) {
-
-		Integer totalItemsForCurrentFilter = null;
-		StringBuilder stringQuery = new StringBuilder();
-		String baseQuery;
-
-		stringQuery.append("from " + SHAKEDOWN_ENTITY_QL + " " + SHAKEDOWN_TEST_QL_ALIAS + " ");
-
-		commonFilterService.appendWhereAndMyAmwParameter(myAMWFilter, stringQuery, getEntityDependantMyAmwParameterQl());
-		baseQuery = stringQuery.toString();
-		
-		boolean lowerSortCol = ShakedownTestFilterTypes.APPSERVER_NAME.getFilterTabColumnName().equals(colToSort);
-
-		Sort.SortBuilder builder = Sort.builder();
-		if (colToSort != null) {
-			builder.order(ShakedownOrder.of(colToSort, sortingDirection, lowerSortCol));
-		}
-		builder.order(ShakedownOrder.of(SHAKEDOWN_TEST_QL_ALIAS + ".id", Sort.SortingDirectionType.DESC, false));
-
-		Query query = commonFilterService.addFilterAndCreateQuery(stringQuery, filter, builder.build(), false, false);
-
-		query = commonFilterService.setParameterToQuery(startIndex, maxResults, myAMWFilter, query);
-
-		// some stuff may be lazy loaded
-		List<ShakedownTestEntity> resultList = query.getResultList();
-
-		Set<ShakedownTestEntity> shakedownTests = new LinkedHashSet<>();
-		shakedownTests.addAll(resultList);
-
-		if (doPageingCalculation) {
-			String countQueryString = "select count(" + SHAKEDOWN_TEST_QL_ALIAS + ".id) " + baseQuery;
-			Query countQuery = commonFilterService.addFilterAndCreateQuery(new StringBuilder(countQueryString), filter, Sort.nothing(), false, false);
-
-			commonFilterService.setParameterToQuery(null, null, myAMWFilter, countQuery);
-			totalItemsForCurrentFilter = ((Long) countQuery.getSingleResult()).intValue();
-		}
-
-		return new Tuple<>(shakedownTests, totalItemsForCurrentFilter);
-
-	}
-	
-	private String getEntityDependantMyAmwParameterQl() {
-		return "(" + GROUP_QL + ".id in (:" + CommonFilterService.MY_AMW + ")) ";
-	}
-
-	@HasPermission(permission = Permission.SHAKEDOWNTEST, action = Action.CREATE)
-	public Integer createShakedownTestOrderReturnsTrackingId(List<ShakedownTestOrder> shakedownTestOrder) {
-		Integer orderTrackingId = null;
-		if (shakedownTestOrder != null) {
-
-			orderTrackingId = sequencesService.getNextValueAndUpdate(ShakedownTestEntity.SEQ_NAME);
-
-			for (ShakedownTestOrder orderShakedownTest : shakedownTestOrder) {
-
-				ContextEntity contextEntity = em.find(ContextEntity.class, orderShakedownTest.getEnvironment().getId());
-
-				for (ResourceGroupEntity appServerGroup : orderShakedownTest.getResourceGroups()) {
-					ResourceGroupEntity group = em.find(ResourceGroupEntity.class, appServerGroup.getId());
-					ResourceEntity appServerEntity;
-					DeploymentEntity deploymentForAs;
-					ReleaseEntity selectedRelease;
-
-					if (orderShakedownTest.getRelease() != null) {
-						// find appServer by selected release
-						selectedRelease = orderShakedownTest.getRelease();
-						appServerEntity = dependencyResolver.getResourceEntityForRelease(group, selectedRelease);
-						deploymentForAs = getLastSuccessDeploymentEntityForGroupReleaseAndContext(group, appServerEntity.getRelease(), contextEntity);
-					} else {
-						deploymentForAs = getLastSuccessDeploymentEntityForGroupAndContext(group, contextEntity);
-						appServerEntity = deploymentForAs != null ? deploymentForAs.getResource() : null;
-						selectedRelease = deploymentForAs != null ? deploymentForAs.getRelease() : null;
-					}
-
-					if (appServerEntity != null) {
-						ApplicationServer.createByResource(appServerEntity, resTypeProvider, null);
-
-						Map<Integer, String> appIdWithAppNameMap = new HashMap<>();
-					     Set<ResourceEntity> applications = dependencyResolver.getConsumedRelatedResourcesByResourceType(appServerEntity, DefaultResourceTypeDefinition.APPLICATION, selectedRelease);
-						for (ResourceEntity application : applications) {
-							appIdWithAppNameMap.put(application.getId(), application.getName());
-						}
-
-						createShakedownEntity(orderTrackingId, contextEntity, appServerEntity, deploymentForAs, appIdWithAppNameMap, selectedRelease, group, new Date());
-
-						if (orderShakedownTest.isCreateTestForNeighbourhood()) {
-							createShakedownEntityForProviderAsForAllConsumedResources(appServerEntity, orderTrackingId, contextEntity, selectedRelease);
-						}
-					}
-					else {
-						log.log(Level.WARNING, "Could not find an application server '" + group.getName() + "' in release "
-								+ orderShakedownTest.getRelease().getName());
-					}
-				}
-			}
-		}
-		return orderTrackingId;
-	}
-
-	//TODO: move to DeploymentBoundary
-	private DeploymentEntity getLastSuccessDeploymentEntityForGroupReleaseAndContext(ResourceGroupEntity resourceGroup, ReleaseEntity releaseEntity, ContextEntity contextEntity) {	
-		Query query = em
-				.createQuery("from DeploymentEntity d where d.resourceGroup=:resourceGroup and d.context=:contextEntity and d.release=:releaseEntity and d.deploymentState is :successState order by d.deploymentDate desc");
-		query.setParameter("resourceGroup", resourceGroup);
-		query.setParameter("contextEntity", contextEntity);
-		query.setParameter("releaseEntity", releaseEntity);
-		query.setParameter("successState", DeploymentState.success);
-
-		List<DeploymentEntity> result = query.getResultList();
-
-		if (result == null || result.isEmpty()) {
-			return null;
-		}
-		return result.get(0);
-	}
-	
-	//TODO: move to DeploymentBoundary
-	private DeploymentEntity getLastSuccessDeploymentEntityForGroupAndContext(ResourceGroupEntity resourceGroup, ContextEntity contextEntity) {
-
-		TypedQuery<DeploymentEntity> query = em
-				.createQuery("from DeploymentEntity d where d.resourceGroup=:resourceGroup and d.context=:contextEntity and d.deploymentState is :successState order by d.deploymentDate desc", DeploymentEntity.class);
-		query.setParameter("resourceGroup", resourceGroup);
-		query.setParameter("contextEntity", contextEntity);
-		query.setParameter("successState", DeploymentState.success);
-
-		List<DeploymentEntity> result = query.getResultList();
-
-		if (result == null || result.isEmpty()) {
-			return null;
-		}
-		return result.get(0);
-	}
-
-
-	/**
-	 * Create and execute shakedowntests for all deploymentes in list if deployment was successfull.
-	 * 
-	 * @param deployments
-	 */
-	public void createAndExecuteShakedowntestForDeployments(List<DeploymentEntity> deployments) {
-		for (DeploymentEntity deployment : deployments) {
-			if (DeploymentState.success.equals(deployment.getDeploymentState())) {
-				createShakedownTestOrderForDeploymentOrder(deployment);
-			}
-		}
-
-		// fire the Event to execute the Shakedowntests
-		shakedownTestEvent.fire(new ShakedownTestEvent(ShakedownTestEventType.NEW, shakedownTest_state.scheduled));
-	}
-
-	// TODO überprüfung: permissions für automatische testerstellung bei
-	// deployments!!!
-	protected void createShakedownTestOrderForDeploymentOrder(DeploymentEntity deployment) {
-
-		ResourceEntity appServerEntity = dependencyResolver.getResourceEntityForRelease(deployment.getResourceGroup(), deployment.getRelease());
-		// TODO: get correct appServer from history?
-
-		if (appServerEntity != null) {
-			ContextEntity contextEntity = deployment.getContext();
-
-			List<ApplicationWithVersion> applicationsWithVersion = deployment.getApplicationsWithVersion();
-			Map<Integer, String> appIdWithAppNameMap = new HashMap<>();
-			for (ApplicationWithVersion applicationWithVersion : applicationsWithVersion) {
-				appIdWithAppNameMap.put(applicationWithVersion.getApplicationId(), applicationWithVersion.getApplicationName());
-			}
-
-			createShakedownEntity(deployment.getTrackingId(), contextEntity, appServerEntity, deployment, appIdWithAppNameMap, deployment.getRelease(),
-					deployment.getResourceGroup(),
-					deployment.getDeploymentDate());
-
-			if (deployment.isCreateTestForNeighborhoodAfterDeployment()) {
-				createShakedownEntityForProviderAsForAllConsumedResources(appServerEntity, deployment.getTrackingId(), contextEntity, deployment.getRelease());
-			}
-		} else {
-			log.log(Level.WARNING, "Could not find an application server '" + deployment.getResourceGroup().getName() + "' in release " + deployment.getRelease().getName());
-		}
-	}
-
-	private void createShakedownEntityForProviderAsForAllConsumedResources(ResourceEntity appServerEntity, Integer orderTrackingId,
-			ContextEntity contextEntity, ReleaseEntity releaseEntity) {
-		ApplicationServer as = ApplicationServer.createByResource(appServerEntity, resTypeProvider, context.getGlobalResourceContextEntity());
-		Date testDate = new Date();
-		for (Application a : as.getApplications()) {
-			for (Resource r : a.getRelatedResources()) {
-				for (ProvidedResourceRelationEntity rel : r.getEntity().getProvidedSlaveRelations()) {
-					ResourceEntity providingApp = rel.getMasterResource();
-					for (ConsumedResourceRelationEntity asToApp : providingApp.getConsumedSlaveRelations()) {
-						ResourceEntity providingASEntity = asToApp.getMasterResource();
-						ApplicationServer.createByResource(providingASEntity, resTypeProvider,
-								context.getGlobalResourceContextEntity());
-
-						Map<Integer, String> appIdWithAppNameMap = new HashMap<>();
-					     Set<ResourceEntity> applications = dependencyResolver.getConsumedRelatedResourcesByResourceType(providingASEntity, DefaultResourceTypeDefinition.APPLICATION, releaseEntity);
-
-					    	for (ResourceEntity application : applications) {
-							appIdWithAppNameMap.put(application.getId(), application.getName());
-						}
-
-						DeploymentEntity deploymentForAs = getLastSuccessDeploymentEntityForGroupAndContext(providingASEntity.getResourceGroup(),
-								contextEntity);
-
-						createShakedownEntity(orderTrackingId, contextEntity, providingASEntity, deploymentForAs, appIdWithAppNameMap, appServerEntity.getRelease(),
-								providingASEntity.getResourceGroup(), testDate);
-					}
-				}
-			}
-		}
-	}
-
-	private boolean hasNoShakedownTestForASAndContextWithinCurrentOrder(Integer orderTrackingId, ContextEntity contextEntity,
-			ResourceEntity providingASEntity) {
-
-		TypedQuery<ShakedownTestEntity> q = em.createQuery("from " + SHAKEDOWN_ENTITY_QL
-				+ " test where test.trackingId=:trackingId and test.applicationServer=:appServer and test.context=:context",ShakedownTestEntity.class);
-		q.setParameter("trackingId", orderTrackingId);
-		q.setParameter("appServer", providingASEntity);
-		q.setParameter("context", contextEntity);
-
-		List<ShakedownTestEntity> result = q.getResultList();
-
-		return result == null || result.isEmpty();
-	}
-
-	private void createShakedownEntity(Integer orderTrackingId, ContextEntity contextEntity, ResourceEntity appServerEntity, DeploymentEntity deploymentForAs,
-			Map<Integer, String> applicationIdWithNameMap, ReleaseEntity release, ResourceGroupEntity resourceGroup, Date testDate) {
-
-		if (hasNoShakedownTestForASAndContextWithinCurrentOrder(orderTrackingId, contextEntity, appServerEntity)) {
-
-			ShakedownTestEntity shakedownTest = new ShakedownTestEntity();
-			shakedownTest.setTrackingId(orderTrackingId);
-			shakedownTest.setContext(contextEntity);
-			shakedownTest.setApplicationServer(appServerEntity);
-			shakedownTest.setRelease(release);
-			shakedownTest.setResourceGroup(resourceGroup);
-			shakedownTest.setTestDate(testDate);
-
-			List<ApplicationsFromApplicationServer> appList = new ArrayList<>();
-
-			for (Integer applicationId : applicationIdWithNameMap.keySet()) {
-				appList.add(new ApplicationsFromApplicationServer(applicationIdWithNameMap.get(applicationId), applicationId));
-			}
-
-			shakedownTest.setApplicationsFromApplicationServer(appList);
-
-			shakedownTest.setDeployment(deploymentForAs);
-
-			em.persist(shakedownTest);
-			em.flush();
-		}
-	}
-
-	/**
-	 * Returns all ShakedownTestEntity which are not yet executed
-	 * 
-	 * @return
-	 */
-	public List<ShakedownTestEntity> getTestsToExecute() {
-		try {
-			return em.createQuery("from " + SHAKEDOWN_ENTITY_QL + " test where test.isExecuted=false", ShakedownTestEntity.class).getResultList();
-		}
-		catch (Exception e) {
-			log.warning("Konnte ShakedownTests nicht von der DB auslesen - ein Grund ist womöglich ein Locking eines anderen Servers");
-			return new ArrayList<>();
-		}
-	}
-
-	/**
-	 * Updates the test execution time to "now"
-	 */
-	private void setTestExecutedTime(final ShakedownTestEntity test) {
-		test.setTestDate(new Date());
-	}
-
-	@TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
-	public ShakedownTestEntity updateShakedownInfo(final Integer shakedownId, final String testResult, shakedownTest_state state) {
-
-		ShakedownTestEntity shakedownTest = em.find(ShakedownTestEntity.class, shakedownId);
-		// The shakedowntest could be stale in the meantime because of the
-		// asynchronous update - better refresh from db
-		em.refresh(shakedownTest);
-
-		setTestExecutedTime(shakedownTest);
-		shakedownTest.setTestResult(testResult);
-		shakedownTest.setShakedownTestStateDisplayName(state);
-
-		em.merge(shakedownTest);
-		return shakedownTest;
-	}
-
-	/**
-	 * Returns the ShakedownTest by the given Id
-	 * 
-	 * @param shakeDownTestId
-	 */
-	public ShakedownTestEntity getShakedownTestById(Integer shakeDownTestId) {
-		Query query = em.createQuery("from " + SHAKEDOWN_ENTITY_QL + " test where test.id=:id").setParameter("id", shakeDownTestId);
-		return (ShakedownTestEntity) query.getSingleResult();
-	}
-
-	public List<ShakedownTestEntity> getShakedownTestsByTrackingId(Integer trackingId) {
-		CriteriaBuilder cb = em.getCriteriaBuilder();
-		CriteriaQuery<ShakedownTestEntity> q = cb.createQuery(ShakedownTestEntity.class);
-		Root<ShakedownTestEntity> r = q.from(ShakedownTestEntity.class);
-		Predicate trackingIdPred = cb.equal(r.<String> get("trackingId"), trackingId);
-		q.where(trackingIdPred);
-
-		return em.createQuery(q).getResultList();
-	}
-
-}
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/shakedown/entity/ShakedownOrder.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/shakedown/entity/ShakedownOrder.java
deleted file mode 100644
index 5e6185b06..000000000
--- a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/shakedown/entity/ShakedownOrder.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package ch.puzzle.itc.mobiliar.business.shakedown.entity;
-
-import ch.puzzle.itc.mobiliar.business.domain.commons.Sort;
-import ch.puzzle.itc.mobiliar.business.domain.commons.Sort.Order;
-
-import java.util.Objects;
-import java.util.Set;
-
-import static ch.puzzle.itc.mobiliar.business.shakedown.entity.ShakedownTestFilterTypes.*;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-public class ShakedownOrder extends Order {
-
-    public static Set<ShakedownTestFilterTypes> SHAKEDOWN_TEST_FILTER_TYPES_FOR_ORDER = Set.of(ID, TRACKING_ID, TEST_STATE, APPSERVER_NAME, APPSERVER_RELEASE, ENVIRONMENT_NAME, TEST_DATE);
-
-    private ShakedownOrder(String colToSort, Sort.SortingDirectionType sortingDirection, boolean lowerSortCol) {
-        super(colToSort, sortingDirection, lowerSortCol);
-    }
-
-    public static ShakedownOrder of(String colToSort, Sort.SortingDirectionType sortingDirection, boolean lowerSortCol) {
-        checkNotNull(colToSort, "colToSort may not be null");
-        checkNotNull(sortingDirection, "sortingDirection may not be null");
-        return SHAKEDOWN_TEST_FILTER_TYPES_FOR_ORDER.stream()
-                .map(ShakedownTestFilterTypes::getFilterTabColumnName)
-                .filter(c -> Objects.equals(c, colToSort))
-                .findFirst()
-                .map(c -> new ShakedownOrder(c, sortingDirection, lowerSortCol))
-                .orElseThrow(() -> new IllegalArgumentException("colToSort not found"));
-    }
-}
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/shakedown/entity/ShakedownStpEntity.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/shakedown/entity/ShakedownStpEntity.java
deleted file mode 100644
index b0d4b55ed..000000000
--- a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/shakedown/entity/ShakedownStpEntity.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * AMW - Automated Middleware allows you to manage the configurations of
- * your Java EE applications on an unlimited number of different environments
- * with various versions, including the automated deployment of those apps.
- * Copyright (C) 2013-2016 by Puzzle ITC
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package ch.puzzle.itc.mobiliar.business.shakedown.entity;
-
-import ch.puzzle.itc.mobiliar.business.database.control.Constants;
-import lombok.Getter;
-import lombok.Setter;
-import org.hibernate.envers.Audited;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-/**
- * Entity implementation class for Entity: ShakedownStp
- * 
- */
-@Entity
-@Audited
-@Table(name = "TAMW_shakedownStp")
-public class ShakedownStpEntity implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-
-	@Getter
-	@Setter
-	@TableGenerator(name = "shakedownStpIdGen", table = Constants.GENERATORTABLE, pkColumnName = Constants.GENERATORPKCOLUMNNAME, valueColumnName = Constants.GENERATORVALUECOLUMNNAME, pkColumnValue = "shakedownStpId")
-	@GeneratedValue(strategy = GenerationType.TABLE, generator = "shakedownStpIdGen")
-	@Id
-	@Column(unique = true, nullable = false)
-	private Integer id;
-
-	@Getter
-	@Setter
-	@Column(unique = true, nullable = false)
-	private String stpName;
-
-	@Getter
-	@Setter
-	private String version;
-
-	@Getter
-	@Setter
-	private String comaSeperatedParameters;
-
-	@Getter
-	@Version
-	private long v;
-
-	public ShakedownStpEntity(){
-		comaSeperatedParameters = "";
-	}
-
-
-
-	/**
-	 * adds a Parameter to the list
-	 * 
-	 * @param parameterName
-	 * @return true if parameterName was added, false if parameterName already exists
-	 */
-	public boolean addParameter(String parameterName) {
-		if (comaSeperatedParameters==null || comaSeperatedParameters.isEmpty()) {
-			comaSeperatedParameters = parameterName;
-			return true;
-		} else if (!comaSeperatedParameters.contains(parameterName)) {
-			comaSeperatedParameters += "," + parameterName;
-			return true;
-		}
-		return false;
-	}
-
-}
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/shakedown/entity/ShakedownTestEntity.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/shakedown/entity/ShakedownTestEntity.java
deleted file mode 100644
index 7f82551e2..000000000
--- a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/shakedown/entity/ShakedownTestEntity.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * AMW - Automated Middleware allows you to manage the configurations of
- * your Java EE applications on an unlimited number of different environments
- * with various versions, including the automated deployment of those apps.
- * Copyright (C) 2013-2016 by Puzzle ITC
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package ch.puzzle.itc.mobiliar.business.shakedown.entity;
-
-import ch.puzzle.itc.mobiliar.business.database.control.Constants;
-import ch.puzzle.itc.mobiliar.business.deploy.entity.DeploymentEntity;
-import ch.puzzle.itc.mobiliar.business.environment.entity.ContextEntity;
-import ch.puzzle.itc.mobiliar.business.releasing.entity.ReleaseEntity;
-import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.ResourceEntity;
-import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.ResourceGroupEntity;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.SneakyThrows;
-
-import javax.persistence.*;
-import java.io.Serializable;
-import java.io.StringReader;
-import java.util.Date;
-import java.util.List;
-
-/**
- * Entity implementation class for Entity: Deployment
- * 
- */
-@Entity
-@Table(name = "TAMW_shakedownTest")
-public class ShakedownTestEntity implements Serializable {
-	public static final String SEQ_NAME = "trackingId";
-
-	public enum shakedownTest_state {
-		success("success"), failed("failed"), warning("warning"), scheduled("scheduled"), inprogress("progress");
-
-		private String displayName;
-		private shakedownTest_state(String displayName){
-			this.displayName = displayName;
-		}
-		public String getDisplayName(){
-			return this.displayName;
-		}
-		public void setDisplayName(String displayName){
-			this.displayName = displayName;
-		}
-	}
-
-	private static final long serialVersionUID = 1L;;
-
-
-
-	@Getter
-	@Setter
-	@TableGenerator(name = "shakedownTestIdGen", table = Constants.GENERATORTABLE, pkColumnName = Constants.GENERATORPKCOLUMNNAME, valueColumnName = Constants.GENERATORVALUECOLUMNNAME, pkColumnValue = "shakedownTestId")
-	@GeneratedValue(strategy = GenerationType.TABLE, generator = "shakedownTestIdGen")
-	@Id
-	@Column(unique = true, nullable = false)
-	private Integer id;
-
-	@Getter
-	@Setter
-	private Integer trackingId;
-
-	@Getter
-	@Setter
-	@ManyToOne
-	private DeploymentEntity deployment;
-
-	@Getter
-	@Setter
-	@ManyToOne
-	private ResourceEntity applicationServer;
-
-	@Getter
-	@Setter
-	@ManyToOne
-	private ContextEntity context;
-
-	@Getter
-	@Setter
-	@Column(nullable = false)
-	private boolean isExecuted;
-
-	@Getter
-	@Setter
-	@Column(length = 65536)
-	@Lob
-	private String testResult;
-
-	private String shakedownTestState;
-
-	@Column(length = 65536)
-	@Lob
-	private String appsFromAppServer;
-
-	@ManyToOne
-	@Getter
-	@Setter
-	private ReleaseEntity release;
-
-	@ManyToOne
-	@Getter
-	@Setter
-	private ResourceGroupEntity resourceGroup;
-
-	@Getter
-	@Version
-	private long v;
-
-	@Getter
-	@Setter
-	private Date testDate;
-
-	public static class ApplicationsFromApplicationServer {
-
-		@Getter
-		@Setter
-		private String applicationName;
-
-		@Getter
-		@Setter
-		private Integer applicationId;
-
-		@JsonCreator
-		public ApplicationsFromApplicationServer(@JsonProperty("applicationName") String applicationName,
-												 @JsonProperty("applicationId") Integer applicationId) {
-			this.applicationId = applicationId;
-			this.applicationName = applicationName;
-		}
-
-	}
-
-	public ShakedownTestEntity() {
-		this.isExecuted = false;
-		this.testResult = "";
-		this.shakedownTestState = shakedownTest_state.scheduled.displayName;
-	}
-
-
-	@SneakyThrows
-	public List<ApplicationsFromApplicationServer> getApplicationsFromApplicationServer() {
-		return new ObjectMapper().readValue(new StringReader(appsFromAppServer), new TypeReference<List<ApplicationsFromApplicationServer>>() {});
-	}
-
-	@SneakyThrows
-	public void setApplicationsFromApplicationServer(List<ApplicationsFromApplicationServer> applicationsFromApplicationServer) {
-		this.appsFromAppServer = new ObjectMapper().writeValueAsString(applicationsFromApplicationServer);
-	}
-
-	public shakedownTest_state getShakedownTestState() {
-		for (shakedownTest_state status : shakedownTest_state.values()) {
-			if (shakedownTestState != null && shakedownTestState.equals(status.getDisplayName())){
-				return status;
-			}
-		}
-		return null;
-	}
-
-	public void setShakedownTestStateDisplayName(shakedownTest_state shakedownTestState) {
-		this.shakedownTestState = shakedownTestState.getDisplayName();
-	}
-
-	public boolean isSuccess() {
-		return shakedownTest_state.success.name().equals(shakedownTestState);
-	}
-
-	public boolean isFailed() {
-		return shakedownTest_state.failed.name().equals(shakedownTestState);
-	}
-
-}
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/shakedown/entity/ShakedownTestFilterTypes.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/shakedown/entity/ShakedownTestFilterTypes.java
deleted file mode 100644
index 0e230c1cb..000000000
--- a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/shakedown/entity/ShakedownTestFilterTypes.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package ch.puzzle.itc.mobiliar.business.shakedown.entity;
-
-import ch.puzzle.itc.mobiliar.business.deploy.entity.FilterType;
-
-import java.util.Set;
-
-public enum ShakedownTestFilterTypes {
-    ID("Test Id", QLConstants.SHAKEDOWN_TEST_QL_ALIAS + ".id", FilterType.IntegerType),
-    TRACKING_ID("Test tracking Id", QLConstants.SHAKEDOWN_TEST_QL_ALIAS + ".trackingId", FilterType.IntegerType),
-    TEST_STATE("Test state", QLConstants.SHAKEDOWN_TEST_QL_ALIAS + ".shakedownTestState", FilterType.StringType),
-    APPSERVER_NAME("Application server", QLConstants.GROUP_QL + ".name", FilterType.StringType),
-    APPSERVER_RELEASE("Application server release", QLConstants.RELEASE_QL + ".installationInProductionAt", FilterType.LabeledDateType),
-    ENVIRONMENT_NAME("Environment", QLConstants.ENV_QL + ".name", FilterType.StringType),
-    APPLICATION_NAME("Application", QLConstants.SHAKEDOWN_TEST_QL_ALIAS + ".appsFromAppServer", FilterType.StringType),
-    TEST_DATE("Test date", QLConstants.SHAKEDOWN_TEST_QL_ALIAS + ".testDate", FilterType.DateType);
-
-    private String filterDisplayName;
-    private String filterTabColName;
-    private FilterType filterType;
-
-    public static class QLConstants {
-        public static final String SHAKEDOWN_TEST_QL_ALIAS = "s";
-        public static final String SHAKEDOWN_ENTITY_QL = "ShakedownTestEntity";
-        public static final String GROUP_QL = SHAKEDOWN_TEST_QL_ALIAS + ".resourceGroup";
-        public static final String RELEASE_QL = SHAKEDOWN_TEST_QL_ALIAS + ".release";
-        public static final String ENV_QL = SHAKEDOWN_TEST_QL_ALIAS + ".context";
-    }
-
-    ShakedownTestFilterTypes(String filterDisplayName, String filterTabColName, FilterType filterType) {
-        this.filterDisplayName = filterDisplayName;
-        this.filterTabColName = filterTabColName;
-        this.filterType = filterType;
-    }
-
-    public String getFilterDisplayName() {
-        return filterDisplayName;
-    }
-
-    public String getFilterTabColumnName() {
-        return filterTabColName;
-    }
-
-    public FilterType getFilterType() {
-        return filterType;
-    }
-}
\ No newline at end of file
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/shakedown/entity/ShakedownTestOrder.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/shakedown/entity/ShakedownTestOrder.java
deleted file mode 100644
index b1123496e..000000000
--- a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/shakedown/entity/ShakedownTestOrder.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * AMW - Automated Middleware allows you to manage the configurations of
- * your Java EE applications on an unlimited number of different environments
- * with various versions, including the automated deployment of those apps.
- * Copyright (C) 2013-2016 by Puzzle ITC
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package ch.puzzle.itc.mobiliar.business.shakedown.entity;
-
-
-import ch.puzzle.itc.mobiliar.business.environment.entity.ContextEntity;
-import ch.puzzle.itc.mobiliar.business.releasing.entity.ReleaseEntity;
-import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.ResourceGroupEntity;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.List;
-
-
-
-public class ShakedownTestOrder {
-
-	public static final String allAppServerSelectedText = "All application server on selected environment";
-	public static final String releaseOfLastDeployText = "Release from last deploy";
-
-	@Getter
-	private ContextEntity environment;
-	@Getter
-	@Setter
-	private boolean createTestForNeighbourhood;
-	@Getter
-	private ReleaseEntity release;
-	@Setter
-	@Getter
-	private List<ResourceGroupEntity> resourceGroups;
-
-	public ShakedownTestOrder(ContextEntity environment, ReleaseEntity release, List<ResourceGroupEntity> resourceGroups) {
-		this.environment = environment;
-		this.createTestForNeighbourhood = false;
-		this.release = release;
-		this.resourceGroups = resourceGroups;
-	}
-
-	public String getEnvironmentName(){
-		if (environment != null){
-			return environment.getName();
-		}
-		return "No environment selected";
-	}
-
-	public String getApplicationServerName(){
-		if (resourceGroups != null && !resourceGroups.isEmpty()) {
-			if (resourceGroups.size() > 1) {
-				return allAppServerSelectedText;
-			} else {
-				return resourceGroups.get(0).getName();
-			}
-		}
-		return "No application server selected";
-	}
-
-	public String getReleaseName() {
-		return release != null ? release.getName() : releaseOfLastDeployText;
-	}
-
-}
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/shakedown/event/ShakedownTestEvent.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/shakedown/event/ShakedownTestEvent.java
deleted file mode 100644
index 32c21a931..000000000
--- a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/shakedown/event/ShakedownTestEvent.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * AMW - Automated Middleware allows you to manage the configurations of
- * your Java EE applications on an unlimited number of different environments
- * with various versions, including the automated deployment of those apps.
- * Copyright (C) 2013-2016 by Puzzle ITC
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package ch.puzzle.itc.mobiliar.business.shakedown.event;
-
-import ch.puzzle.itc.mobiliar.business.shakedown.entity.ShakedownTestEntity.shakedownTest_state;
-import lombok.Getter;
-
-/**
- * Event that gets fired when a deployment gets created
- */
-@Getter
-public class ShakedownTestEvent {
-	
-	public enum ShakedownTestEventType {
-		NEW, UPDATE;
-	}
-	
-	private ShakedownTestEventType eventType;
-	private Integer shakedownId;
-	private shakedownTest_state newState;
-	
-	public ShakedownTestEvent(ShakedownTestEventType eventType, shakedownTest_state newState) {
-		this(eventType, null, newState);
-	}
-	
-	public ShakedownTestEvent(ShakedownTestEventType eventType, Integer shakedownId, shakedownTest_state newState) {
-		this.eventType = eventType;
-		this.shakedownId = shakedownId;
-		this.newState = newState;
-	}
-}
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/shakedown/xmlmodel/Command.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/shakedown/xmlmodel/Command.java
deleted file mode 100644
index 3c82d9df9..000000000
--- a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/shakedown/xmlmodel/Command.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * AMW - Automated Middleware allows you to manage the configurations of
- * your Java EE applications on an unlimited number of different environments
- * with various versions, including the automated deployment of those apps.
- * Copyright (C) 2013-2016 by Puzzle ITC
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package ch.puzzle.itc.mobiliar.business.shakedown.xmlmodel;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlValue;
-
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlRootElement(name = "command")
-public class Command {
-	
-	@XmlAttribute
-	private long executionTime;
-	
-	@XmlValue
-	private String command;
-
-	public long getExecutionTime() {
-		return executionTime;
-	}
-
-	public void setExecutionTime(long executionTime) {
-		this.executionTime = executionTime;
-	}
-
-	public String getCommand() {
-		return command;
-	}
-
-	public void setCommand(String command) {
-		this.command = command;
-	}
-	
-	
-
-}
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/shakedown/xmlmodel/STS.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/shakedown/xmlmodel/STS.java
deleted file mode 100644
index b6286f0db..000000000
--- a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/shakedown/xmlmodel/STS.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * AMW - Automated Middleware allows you to manage the configurations of
- * your Java EE applications on an unlimited number of different environments
- * with various versions, including the automated deployment of those apps.
- * Copyright (C) 2013-2016 by Puzzle ITC
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package ch.puzzle.itc.mobiliar.business.shakedown.xmlmodel;
-
-import javax.xml.bind.annotation.*;
-import java.util.List;
-
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlRootElement(name = "sts")
-public class STS {
-	@XmlElement(name = "remoteHost")
-	private String remoteHost;
-	@XmlElement(name = "user")
-	private String user;
-	@XmlElement(name = "remoteSTPPath")
-	private String remoteSTPPath;
-	@XmlElement(name = "testId")
-	private Integer testId;
-	@XmlElementWrapper(name = "shakedowntests")
-	@XmlElement(name = "shakedowntest")
-	private List<String> shakedowntests;
-
-	public String getRemoteHost() {
-		return remoteHost;
-	}
-
-	public void setRemoteHost(String remoteHost) {
-		this.remoteHost = remoteHost;
-	}
-
-	public String getRemoteSTPPath() {
-		return remoteSTPPath;
-	}
-
-	public void setRemoteSTPPath(String remoteSTPPath) {
-		this.remoteSTPPath = remoteSTPPath;
-	}
-
-	public Integer getTestId() {
-		return testId;
-	}
-
-	public void setTestId(Integer testId) {
-		this.testId = testId;
-	}
-
-	public List<String> getShakedowntests() {
-		return shakedowntests;
-	}
-
-	public void setShakedowntests(List<String> shakedowntests) {
-		this.shakedowntests = shakedowntests;
-	}
-
-	/**
-	 * @return cleans line separators (replaces them with space) and returns all shakedowntest lines in a
-	 *         single string
-	 */
-	public String getShakedowntestsAsCSV() {
-		StringBuilder sb = new StringBuilder();
-		sb.append(getTestId()).append(System.lineSeparator());
-		if (shakedowntests != null) {
-			for (String s : shakedowntests) {
-				s = s.trim().replace(System.lineSeparator(), " ");
-				int firstSpace = s.indexOf(' ');
-				if (firstSpace != -1) {
-					sb.append(s.substring(0, firstSpace)).append('\t');
-					if (firstSpace < s.length() + 1) {
-						sb.append(s.substring(firstSpace + 1));
-					}
-				}
-				else {
-					sb.append(s);
-				}
-				sb.append(System.lineSeparator());
-			}
-		}
-		return sb.toString();
-	}
-
-	public String getUser() {
-		return user;
-	}
-
-	public void setUser(String user) {
-		this.user = user;
-	}
-
-}
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/shakedown/xmlmodel/ShakedownTestEnvironmentGenerationResult.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/shakedown/xmlmodel/ShakedownTestEnvironmentGenerationResult.java
deleted file mode 100644
index ad339ef03..000000000
--- a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/shakedown/xmlmodel/ShakedownTestEnvironmentGenerationResult.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * AMW - Automated Middleware allows you to manage the configurations of
- * your Java EE applications on an unlimited number of different environments
- * with various versions, including the automated deployment of those apps.
- * Copyright (C) 2013-2016 by Puzzle ITC
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package ch.puzzle.itc.mobiliar.business.shakedown.xmlmodel;
-
-import ch.puzzle.itc.mobiliar.business.generator.control.EnvironmentGenerationResult;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class ShakedownTestEnvironmentGenerationResult extends EnvironmentGenerationResult {
-
-	@Getter
-	@Setter
-	private List<STS> testingTemplates;
-
-	public void addTestingTemplate(STS testingTemplate) {
-		if (testingTemplates == null) {
-			testingTemplates = new ArrayList<STS>();
-		}
-		testingTemplates.add(testingTemplate);
-	}
-
-}
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/shakedown/xmlmodel/Test.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/shakedown/xmlmodel/Test.java
deleted file mode 100644
index c26a6a9c8..000000000
--- a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/shakedown/xmlmodel/Test.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * AMW - Automated Middleware allows you to manage the configurations of
- * your Java EE applications on an unlimited number of different environments
- * with various versions, including the automated deployment of those apps.
- * Copyright (C) 2013-2016 by Puzzle ITC
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package ch.puzzle.itc.mobiliar.business.shakedown.xmlmodel;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import lombok.Getter;
-import lombok.Setter;
-
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlRootElement(name = "test")
-@Getter 
-@Setter
-public class Test {
-	@XmlAttribute(required = true)
-	private String name;
-	@XmlAttribute(required = true)
-	private String version;
-	@XmlElement(name = "command")
-	private Command command;
-	@XmlElement(name="stdout")
-	private String stdOut;
-	@XmlElement(name="stderr")
-	private String stdErr;
-	@XmlElement(name = "testStatus")
-	private String testStatus;
-	@XmlElement(name = "resourcePath")
-	private String resourcePath;
-}
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/shakedown/xmlmodel/TestSet.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/shakedown/xmlmodel/TestSet.java
deleted file mode 100644
index 9da87d403..000000000
--- a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/shakedown/xmlmodel/TestSet.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * AMW - Automated Middleware allows you to manage the configurations of
- * your Java EE applications on an unlimited number of different environments
- * with various versions, including the automated deployment of those apps.
- * Copyright (C) 2013-2016 by Puzzle ITC
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package ch.puzzle.itc.mobiliar.business.shakedown.xmlmodel;
-
-import java.util.ArrayList;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import org.apache.commons.lang3.StringUtils;
-
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlRootElement(name = "testset")
-@Getter
-@Setter
-public class TestSet {
-
-	@XmlAttribute(required = true)
-	protected int id;
-	@XmlElement(name = "test")
-	private ArrayList<Test> tests;
-	@XmlElement(name = "failure")
-	private String failure;
-	
-	public OverallStatus getOverallStatus() {
-		if(StringUtils.isNotEmpty(failure)){
-			return OverallStatus.failed;
-		}
-		if (tests != null) {
-			boolean potentialWarning = false;
-			for (Test t : tests) {
-				if (t.getTestStatus().equals("failed")) {
-					return OverallStatus.failed;
-				} else if (t.getTestStatus().equals("missing")) {
-					potentialWarning = true;
-				}
-			}
-			return potentialWarning ? OverallStatus.warning : OverallStatus.success;
-		}
-		return OverallStatus.warning;
-
-	}
-
-	public String getTestMessage() {
-		StringBuilder sb = new StringBuilder();
-		if(StringUtils.isNotEmpty(failure)){
-			sb.append("<span class=\"testErrorMsg\">General failure: ").append(failure).append("</span><br/>");
-		}
-		if (tests != null) {
-			for (Test test : tests) {
-				sb.append(test.getName()).append(' ');
-				if(test.getVersion()!=null && !test.getVersion().trim().isEmpty()) {
-					sb.append(" (").append(test.getVersion().trim()).append(")");
-				}
-				sb.append(": <span class=\"testStatus\">").append(test.getTestStatus()).append("</span><br/>");
-				if (test.getStdErr() != null && !test.getStdErr().trim().isEmpty()) {
-					sb.append("<span class=\"testErrorMsg\">").append(test.getStdErr().trim()).append("</span><br/>");
-				}
-				if (test.getStdOut() != null && !test.getStdOut().trim().isEmpty()) {
-					sb.append("<span class=\"testMsg\">").append(test.getStdOut().trim()).append("</span><br/>");
-				}
-				sb.append("<br/>");
-			}
-		}
-		return sb.toString();
-
-	}
-
-	public enum OverallStatus {
-		success, warning, failed;
-	}
-}
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/template/boundary/TemplateEditor.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/template/boundary/TemplateEditor.java
index a19baba2a..59bb0a935 100644
--- a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/template/boundary/TemplateEditor.java
+++ b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/template/boundary/TemplateEditor.java
@@ -73,281 +73,273 @@
 @Stateless
 public class TemplateEditor {
 
-	@Inject
-	EntityManager entityManager;
-
-	@Inject
-	ContextDomainService contextService;
-
-	@Inject
-	ResourceRelationService relationService;
-
-	@Inject
-	PermissionService permissionService;
-
-	@Inject
-	FreemarkerSyntaxValidator freemarkerValidator;
-
-	@Inject
-	AuditService auditService;
-
-	@Inject
-	ResourceLocator resourceLocator;
-
-	@Inject
-	TemplatesScreenDomainService templateService;
-
-	@Inject
-	private Logger log;
-
-	public TemplateDescriptorEntity getTemplateById(Integer templateId) {
-		return entityManager.find(TemplateDescriptorEntity.class, templateId);
-	}
-
-	public TemplateDescriptorEntity getTemplateByIdAndRevision(Integer templateId, Number revisionId) {
-		TemplateDescriptorEntity templateDescriptorEntity = AuditReaderFactory.get(entityManager).find(
-				TemplateDescriptorEntity.class, templateId, revisionId);
-		//We have to ensure, that the target platforms are loaded. To make sure, that the compiler doesn't optimize the access to the target platforms away, we have to do this ugly hack.
-		templateDescriptorEntity.getTargetPlatforms().size();
-		return templateDescriptorEntity;
-	}
-
-	public List<RevisionInformation> getTemplateRevisions(Integer templateId) {
-		List<RevisionInformation> result = new ArrayList<>();
-		AuditReader reader = AuditReaderFactory.get(entityManager);
-		List<Number> list = reader.getRevisions(TemplateDescriptorEntity.class, templateId);
-		for (Number rev : list) {
-			Date date = reader.getRevisionDate(rev);
-			MyRevisionEntity myRev = entityManager.find(MyRevisionEntity.class, rev);
-			result.add(new RevisionInformation(rev, date, myRev.getUsername()));
-		}
-		Collections.sort(result);
-		return result;
-	}
-
-	@TransactionAttribute(TransactionAttributeType.REQUIRED)
-	boolean hasTemplateWithSameName(TemplateDescriptorEntity template, HasContexts<?> hasContext) {
-		for (ContextDependency<?> c : hasContext.getContextsByLowestContext(contextService.getGlobalResourceContextEntity())) {
-			for (TemplateDescriptorEntity t : c.getTemplates()) {
-				// If the template doesn't exist but has the same name, we return true
-				if (!t.getId().equals(template.getId()) && t.getName().equals(template.getName())) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-
-	public <T extends HasContexts<?>> void saveTemplateForRelation(TemplateDescriptorEntity template,
-																   Integer relationId,
-																   boolean resourceEdit) throws AMWException {
-		if (relationId == null) {
-			return;
-		}
-		HasContexts<?> resourceRelation = getResourceRelationAndCheckPermission(relationId, resourceEdit);
-		if (resourceRelation != null) {
-			saveTemplate(template, resourceRelation);
-		}
-	}
-
-	private HasContexts<?> getResourceRelationAndCheckPermission(Integer relationId, boolean resourceEdit) {
-		HasContexts<?> resourceRelation;
-		if (resourceEdit) {
-			AbstractResourceRelationEntity resRel = relationService.getResourceRelation(relationId);
-			resourceRelation = resRel;
-			permissionService.checkPermissionAndFireException(Permission.RESOURCE_TEMPLATE,
-					null,
-					Action.UPDATE,
-					resRel.getMasterResource().getResourceGroup(),
-					null,
-					"update templates for resource relations");
-		} else {
-			ResourceRelationTypeEntity resTypRel = relationService.getResourceTypeRelation(relationId);
-			resourceRelation = resTypRel;
-			permissionService.checkPermissionAndFireException(Permission.RESOURCETYPE_TEMPLATE,
-					null,
-					Action.UPDATE,
-					null,
-					resTypRel.getResourceTypeA(),
-					"update templates for resource type relations");
-		}
-		return resourceRelation;
-	}
-
-	public void saveTemplateForResource(TemplateDescriptorEntity template, ResourceEntity resourceEntity,
-			boolean testingMode) throws AMWException {
-		permissionService.assertHasPermissionShakedownTestMode(testingMode);
-		if (!testingMode) {
-			Action action = getAction(template);
-			permissionService.checkPermissionAndFireException(
-					Permission.RESOURCE_TEMPLATE,
-					null,
-					action,
-					resourceEntity.getResourceGroup(),
-					null,
-					"create/modify resource templates");
-		}
-		saveTemplate(template, resourceEntity);
-	}
-
-	public void saveTemplateForResource(TemplateDescriptorEntity template, Integer resourceId,
-										boolean testingMode) throws AMWException {
-		ResourceEntity resourceEntity = entityManager.find(ResourceEntity.class, resourceId);
-		entityManager.find(ResourceEntity.class, resourceId);
-		this.saveTemplateForResource(template, resourceEntity, testingMode);
-	}
-
-	public void saveTemplateForResource(TemplateDescriptorEntity template, String resourceGroupName, String releaseName,
-			boolean testingMode) throws AMWException {
-		ResourceEntity resourceEntity = resourceLocator.getResourceByGroupNameAndRelease(resourceGroupName, releaseName);
-		if (resourceEntity == null) {
-			throw new ResourceNotFoundException("Resource not found");
-		}
-		this.saveTemplateForResource(template, resourceEntity, testingMode);
-	}
-
-	public void saveTemplateForResourceType(TemplateDescriptorEntity template, Integer resourceTypeId,
-											boolean testingMode) throws AMWException {
-		permissionService.assertHasPermissionShakedownTestMode(testingMode);
-		ResourceTypeEntity resourceTypeEntity = entityManager.find(ResourceTypeEntity.class, resourceTypeId);
-		if (!testingMode) {
-			Action action = getAction(template);
-			permissionService.checkPermissionAndFireException(
-					Permission.RESOURCETYPE_TEMPLATE,
-					null,
-					action,
-					null,
-					resourceTypeEntity,
-					"create/modify resource type templates");
-		}
-		saveTemplate(template, resourceTypeEntity);
-	}
-
-	void validateTemplate(TemplateDescriptorEntity templateDescriptorEntity) throws ValidationException {
-		if (StringUtils.isEmpty(templateDescriptorEntity.getName())) {
-			throw new ValidationException("The template name must not be empty");
-		}
-
-		if (templateDescriptorEntity.getTargetPath() != null && templateDescriptorEntity.getTargetPath()
-																						.startsWith("/")) {
-			throw new ValidationException("Absolute paths are not allowed for file path");
-		}
-
-		if (templateDescriptorEntity.getTargetPath() != null && templateDescriptorEntity.getTargetPath()
-																						.contains("../")) {
-			throw new ValidationException("No path traversals like '../' allowed in file path");
-		}
-	}
-
-	void saveTemplate(TemplateDescriptorEntity template, HasContexts<?> hasContext) throws ValidationException, AMWException {
-		validateTemplate(template);
-		freemarkerValidator.validateFreemarkerSyntax(template.getFileContent());
-		hasContext = entityManager.find(hasContext.getClass(), hasContext.getId());
-		auditService.storeIdInThreadLocalForAuditLog(hasContext);
-		if (hasTemplateWithSameName(template, hasContext)) {
-			throw new ValidationException("The defined template name is already in use");
-		}
-		if (hasContext instanceof HasTypeContext
-				&& hasTemplateWithSameName(template, ((HasTypeContext<?>) hasContext).getTypeContext())) {
-			throw new ValidationException("The defined template name is already in use");
-		}
-
-
-		ContextDependency<?> globalContext = hasContext.getOrCreateContext(contextService.getGlobalResourceContextEntity());
-		if (template.getId() == null) {
-			entityManager.persist(template);
-			globalContext.addTemplate(template);
-			entityManager.persist(globalContext);
-		} else {
-			entityManager.merge(template);
-		}
-	}
-
-	/**
-	 * @param templateId - the id of the template to be deleted.
-	 *
-	 * @throws ResourceTypeNotFoundException
-	 * @throws TemplateNotDeletableException
-	 */
-	public void removeTemplate(Integer templateId) throws TemplateNotDeletableException {
-		TemplateDescriptorEntity templateDescriptor = entityManager.find(TemplateDescriptorEntity.class, templateId);
-		this.removeTemplate(templateDescriptor);
-	}
-
-	private void removeTemplate(TemplateDescriptorEntity templateDescriptor) throws TemplateNotDeletableException {
-		if (templateDescriptor != null && templateDescriptor.getName() != null
-				&& SystemCallTemplate.getName().equals(templateDescriptor.getName())) {
-			String message = SystemCallTemplate.getName() + " Template can't be deleted since it is a system template!";
-			log.info(message);
-			throw new TemplateNotDeletableException(message);
-		}
-		AbstractContext owner = templateService.getOwnerOfTemplate(templateDescriptor);
-		if (owner != null) {
-			if (owner instanceof ResourceContextEntity && !permissionService.hasPermission(Permission.RESOURCE_TEMPLATE,
-																						   null,
-																						   Action.DELETE,
-																						   ((ResourceContextEntity) owner)
-																								   .getContextualizedObject()
-																								   .getResourceGroup(),
-																						   null)) {
-				throw new NotAuthorizedException("Not authorized to remove the template of a resource");
-			} else if (owner instanceof ResourceRelationContextEntity && !permissionService.hasPermission(Permission.RESOURCE_TEMPLATE,
-																										  null,
-																										  Action.DELETE,
-																										  ((ResourceRelationContextEntity) owner)
-																												  .getContextualizedObject()
-																												  .getMasterResource()
-																												  .getResourceGroup(),
-																										  null)) {
-				throw new NotAuthorizedException("Not authorized to remove the template of a resource");
-			} else if (owner instanceof ResourceTypeContextEntity && !permissionService.hasPermission(Permission.RESOURCETYPE_TEMPLATE,
-																									  null,
-																									  Action.DELETE,
-																									  null,
-																									  ((ResourceTypeContextEntity) owner)
-																											  .getContextualizedObject())) {
-				throw new NotAuthorizedException("Not authorized to remove the template of a resource type");
-			}
-			auditService.storeIdInThreadLocalForAuditLog(owner);
-			owner.removeTemplate(templateDescriptor);
-		}
-		entityManager.remove(templateDescriptor);
-		log.info("Template " + templateDescriptor.getId() + " has been deleted successfully.");
-	}
-
-	public void removeTemplate(String resourceGroupName, String releaseName, String templateName, boolean testingMode)
-			throws ValidationException, TemplateNotDeletableException, NotFoundException {
-		ResourceEntity resource = resourceLocator.getResourceByGroupNameAndRelease(resourceGroupName, releaseName);
-		if (resource == null) {
-			throw new ResourceNotFoundException("Resource not found");
-		}
-		List<TemplateDescriptorEntity> templates = templateService.getGlobalTemplateDescriptorsForResource(resource, testingMode);
-
-		TemplateDescriptorEntity temp = null;
-		for (TemplateDescriptorEntity template : templates) {
-			if (templateName.equals(template.getName())) {
-				temp = template;
-				break;
-			}
-		}
-
-		if (temp == null) {
-			throw new NotFoundException("Template not found");
-		}
-		this.removeTemplate(temp);
-	}
-
-	@TransactionAttribute(TransactionAttributeType.REQUIRED)
-	Object getSingleObjectOrNull(Query q) {
-		try {
-			return q.getSingleResult();
-		} catch (NoResultException e) {
-			return null;
-		}
-	}
-
-	private Action getAction(TemplateDescriptorEntity template) {
-		return template.getId() == null ? Action.CREATE : Action.UPDATE;
-	}
+    @Inject
+    EntityManager entityManager;
+
+    @Inject
+    ContextDomainService contextService;
+
+    @Inject
+    ResourceRelationService relationService;
+
+    @Inject
+    PermissionService permissionService;
+
+    @Inject
+    FreemarkerSyntaxValidator freemarkerValidator;
+
+    @Inject
+    AuditService auditService;
+
+    @Inject
+    ResourceLocator resourceLocator;
+
+    @Inject
+    TemplatesScreenDomainService templateService;
+
+    @Inject
+    private Logger log;
+
+    public TemplateDescriptorEntity getTemplateById(Integer templateId) {
+        return entityManager.find(TemplateDescriptorEntity.class, templateId);
+    }
+
+    public TemplateDescriptorEntity getTemplateByIdAndRevision(Integer templateId, Number revisionId) {
+        TemplateDescriptorEntity templateDescriptorEntity = AuditReaderFactory.get(entityManager).find(
+                TemplateDescriptorEntity.class, templateId, revisionId);
+        //We have to ensure, that the target platforms are loaded. To make sure, that the compiler doesn't optimize the access to the target platforms away, we have to do this ugly hack.
+        templateDescriptorEntity.getTargetPlatforms().size();
+        return templateDescriptorEntity;
+    }
+
+    public List<RevisionInformation> getTemplateRevisions(Integer templateId) {
+        List<RevisionInformation> result = new ArrayList<>();
+        AuditReader reader = AuditReaderFactory.get(entityManager);
+        List<Number> list = reader.getRevisions(TemplateDescriptorEntity.class, templateId);
+        for (Number rev : list) {
+            Date date = reader.getRevisionDate(rev);
+            MyRevisionEntity myRev = entityManager.find(MyRevisionEntity.class, rev);
+            result.add(new RevisionInformation(rev, date, myRev.getUsername()));
+        }
+        Collections.sort(result);
+        return result;
+    }
+
+    @TransactionAttribute(TransactionAttributeType.REQUIRED)
+    boolean hasTemplateWithSameName(TemplateDescriptorEntity template, HasContexts<?> hasContext) {
+        for (ContextDependency<?> c : hasContext.getContextsByLowestContext(contextService.getGlobalResourceContextEntity())) {
+            for (TemplateDescriptorEntity t : c.getTemplates()) {
+                // If the template doesn't exist but has the same name, we return true
+                if (!t.getId().equals(template.getId()) && t.getName().equals(template.getName())) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+
+    public <T extends HasContexts<?>> void saveTemplateForRelation(TemplateDescriptorEntity template,
+                                                                   Integer relationId,
+                                                                   boolean resourceEdit) throws AMWException {
+        if (relationId == null) {
+            return;
+        }
+        HasContexts<?> resourceRelation = getResourceRelationAndCheckPermission(relationId, resourceEdit);
+        if (resourceRelation != null) {
+            saveTemplate(template, resourceRelation);
+        }
+    }
+
+    private HasContexts<?> getResourceRelationAndCheckPermission(Integer relationId, boolean resourceEdit) {
+        HasContexts<?> resourceRelation;
+        if (resourceEdit) {
+            AbstractResourceRelationEntity resRel = relationService.getResourceRelation(relationId);
+            resourceRelation = resRel;
+            permissionService.checkPermissionAndFireException(Permission.RESOURCE_TEMPLATE,
+                    null,
+                    Action.UPDATE,
+                    resRel.getMasterResource().getResourceGroup(),
+                    null,
+                    "update templates for resource relations");
+        } else {
+            ResourceRelationTypeEntity resTypRel = relationService.getResourceTypeRelation(relationId);
+            resourceRelation = resTypRel;
+            permissionService.checkPermissionAndFireException(Permission.RESOURCETYPE_TEMPLATE,
+                    null,
+                    Action.UPDATE,
+                    null,
+                    resTypRel.getResourceTypeA(),
+                    "update templates for resource type relations");
+        }
+        return resourceRelation;
+    }
+
+    public void saveTemplateForResource(TemplateDescriptorEntity template, ResourceEntity resourceEntity) throws AMWException {
+        Action action = getAction(template);
+        permissionService.checkPermissionAndFireException(
+                Permission.RESOURCE_TEMPLATE,
+                null,
+                action,
+                resourceEntity.getResourceGroup(),
+                null,
+                "create/modify resource templates");
+
+        saveTemplate(template, resourceEntity);
+    }
+
+    public void saveTemplateForResource(TemplateDescriptorEntity template, Integer resourceId) throws AMWException {
+        ResourceEntity resourceEntity = entityManager.find(ResourceEntity.class, resourceId);
+        entityManager.find(ResourceEntity.class, resourceId);
+        this.saveTemplateForResource(template, resourceEntity);
+    }
+
+    public void saveTemplateForResource(TemplateDescriptorEntity template, String resourceGroupName, String releaseName) throws AMWException {
+        ResourceEntity resourceEntity = resourceLocator.getResourceByGroupNameAndRelease(resourceGroupName, releaseName);
+        if (resourceEntity == null) {
+            throw new ResourceNotFoundException("Resource not found");
+        }
+        this.saveTemplateForResource(template, resourceEntity);
+    }
+
+    public void saveTemplateForResourceType(TemplateDescriptorEntity template, Integer resourceTypeId) throws AMWException {
+        ResourceTypeEntity resourceTypeEntity = entityManager.find(ResourceTypeEntity.class, resourceTypeId);
+
+        Action action = getAction(template);
+        permissionService.checkPermissionAndFireException(
+                Permission.RESOURCETYPE_TEMPLATE,
+                null,
+                action,
+                null,
+                resourceTypeEntity,
+                "create/modify resource type templates");
+
+        saveTemplate(template, resourceTypeEntity);
+    }
+
+    void validateTemplate(TemplateDescriptorEntity templateDescriptorEntity) throws ValidationException {
+        if (StringUtils.isEmpty(templateDescriptorEntity.getName())) {
+            throw new ValidationException("The template name must not be empty");
+        }
+
+        if (templateDescriptorEntity.getTargetPath() != null && templateDescriptorEntity.getTargetPath()
+                .startsWith("/")) {
+            throw new ValidationException("Absolute paths are not allowed for file path");
+        }
+
+        if (templateDescriptorEntity.getTargetPath() != null && templateDescriptorEntity.getTargetPath()
+                .contains("../")) {
+            throw new ValidationException("No path traversals like '../' allowed in file path");
+        }
+    }
+
+    void saveTemplate(TemplateDescriptorEntity template, HasContexts<?> hasContext) throws ValidationException, AMWException {
+        validateTemplate(template);
+        freemarkerValidator.validateFreemarkerSyntax(template.getFileContent());
+        hasContext = entityManager.find(hasContext.getClass(), hasContext.getId());
+        auditService.storeIdInThreadLocalForAuditLog(hasContext);
+        if (hasTemplateWithSameName(template, hasContext)) {
+            throw new ValidationException("The defined template name is already in use");
+        }
+        if (hasContext instanceof HasTypeContext
+                && hasTemplateWithSameName(template, ((HasTypeContext<?>) hasContext).getTypeContext())) {
+            throw new ValidationException("The defined template name is already in use");
+        }
+
+
+        ContextDependency<?> globalContext = hasContext.getOrCreateContext(contextService.getGlobalResourceContextEntity());
+        if (template.getId() == null) {
+            entityManager.persist(template);
+            globalContext.addTemplate(template);
+            entityManager.persist(globalContext);
+        } else {
+            entityManager.merge(template);
+        }
+    }
+
+    /**
+     * @param templateId - the id of the template to be deleted.
+     * @throws ResourceTypeNotFoundException
+     * @throws TemplateNotDeletableException
+     */
+    public void removeTemplate(Integer templateId) throws TemplateNotDeletableException {
+        TemplateDescriptorEntity templateDescriptor = entityManager.find(TemplateDescriptorEntity.class, templateId);
+        this.removeTemplate(templateDescriptor);
+    }
+
+    private void removeTemplate(TemplateDescriptorEntity templateDescriptor) throws TemplateNotDeletableException {
+        if (templateDescriptor != null && templateDescriptor.getName() != null
+                && SystemCallTemplate.getName().equals(templateDescriptor.getName())) {
+            String message = SystemCallTemplate.getName() + " Template can't be deleted since it is a system template!";
+            log.info(message);
+            throw new TemplateNotDeletableException(message);
+        }
+        AbstractContext owner = templateService.getOwnerOfTemplate(templateDescriptor);
+        if (owner != null) {
+            if (owner instanceof ResourceContextEntity && !permissionService.hasPermission(Permission.RESOURCE_TEMPLATE,
+                    null,
+                    Action.DELETE,
+                    ((ResourceContextEntity) owner)
+                            .getContextualizedObject()
+                            .getResourceGroup(),
+                    null)) {
+                throw new NotAuthorizedException("Not authorized to remove the template of a resource");
+            } else if (owner instanceof ResourceRelationContextEntity && !permissionService.hasPermission(Permission.RESOURCE_TEMPLATE,
+                    null,
+                    Action.DELETE,
+                    ((ResourceRelationContextEntity) owner)
+                            .getContextualizedObject()
+                            .getMasterResource()
+                            .getResourceGroup(),
+                    null)) {
+                throw new NotAuthorizedException("Not authorized to remove the template of a resource");
+            } else if (owner instanceof ResourceTypeContextEntity && !permissionService.hasPermission(Permission.RESOURCETYPE_TEMPLATE,
+                    null,
+                    Action.DELETE,
+                    null,
+                    ((ResourceTypeContextEntity) owner)
+                            .getContextualizedObject())) {
+                throw new NotAuthorizedException("Not authorized to remove the template of a resource type");
+            }
+            auditService.storeIdInThreadLocalForAuditLog(owner);
+            owner.removeTemplate(templateDescriptor);
+        }
+        entityManager.remove(templateDescriptor);
+        log.info("Template " + templateDescriptor.getId() + " has been deleted successfully.");
+    }
+
+    public void removeTemplate(String resourceGroupName, String releaseName, String templateName)
+            throws ValidationException, TemplateNotDeletableException, NotFoundException {
+        ResourceEntity resource = resourceLocator.getResourceByGroupNameAndRelease(resourceGroupName, releaseName);
+        if (resource == null) {
+            throw new ResourceNotFoundException("Resource not found");
+        }
+        List<TemplateDescriptorEntity> templates = templateService.getGlobalTemplateDescriptorsForResource(resource);
+
+        TemplateDescriptorEntity temp = null;
+        for (TemplateDescriptorEntity template : templates) {
+            if (templateName.equals(template.getName())) {
+                temp = template;
+                break;
+            }
+        }
+
+        if (temp == null) {
+            throw new NotFoundException("Template not found");
+        }
+        this.removeTemplate(temp);
+    }
+
+    @TransactionAttribute(TransactionAttributeType.REQUIRED)
+    Object getSingleObjectOrNull(Query q) {
+        try {
+            return q.getSingleResult();
+        } catch (NoResultException e) {
+            return null;
+        }
+    }
+
+    private Action getAction(TemplateDescriptorEntity template) {
+        return template.getId() == null ? Action.CREATE : Action.UPDATE;
+    }
 }
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/template/control/TemplatesScreenDomainService.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/template/control/TemplatesScreenDomainService.java
index bcb136bc1..14179a209 100644
--- a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/template/control/TemplatesScreenDomainService.java
+++ b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/template/control/TemplatesScreenDomainService.java
@@ -51,287 +51,263 @@
 @Stateless
 public class TemplatesScreenDomainService {
 
-	@Inject
-	private Logger log;
-
-	@Inject
-	private EntityManager entityManager;
-
-	@Inject
-	private ContextDomainService contextService;
-
-	@Inject
-	ResourceLocator resourceLocator;
-
-	@Inject
-	ResourceRelationService resourceRelationService;
-
-	public List<TemplateDescriptorEntity> getGlobalTemplateDescriptorsForResourceType(ResourceTypeEntity resourceType, boolean testing) {
-		resourceType = entityManager.find(ResourceTypeEntity.class, resourceType.getId());
-		return getTemplateDescriptorsForResourceTypeContext(contextService.getGlobalResourceContextEntity(), resourceType, new ArrayList<TemplateDescriptorEntity>(), testing);
-	}
-
-	public List<TemplateDescriptorEntity> getGlobalTemplateDescriptorsForResource(ResourceEntity resource, boolean testing) {
-		resource = entityManager.find(ResourceEntity.class, resource.getId());
-		return getTemplateDescriptorsForResourceContext(contextService.getGlobalResourceContextEntity(), resource, new ArrayList<TemplateDescriptorEntity>(), testing);
-	}
-
-	public List<TemplateDescriptorEntity> getGlobalTemplateDescriptorsForResource(String resourceGroupName, String releaseName, boolean testing) throws ValidationException {
-		ResourceEntity resource = resourceLocator.getResourceByGroupNameAndRelease(resourceGroupName, releaseName);
-		return getTemplateDescriptorsForResourceContext(contextService.getGlobalResourceContextEntity(), resource, new ArrayList<TemplateDescriptorEntity>(), testing);
-	}
-
-	public List<TemplateDescriptorEntity> getGlobalTemplatesForResourceRelation(ResourceEditRelation relation, boolean testing) {
-		return getTemplateDescriptorsForResourceRelationContext(contextService.getGlobalResourceContextEntity(), resourceRelationService.getResourceRelation(relation.getResRelId()), new ArrayList<TemplateDescriptorEntity>(), testing);
-	}
-
-	public List<TemplateDescriptorEntity> getGlobalTemplatesForResourceRelationType(ResourceEditRelation relation, boolean testing) {
-		ResourceRelationTypeEntity resRelType = entityManager.find(ResourceRelationTypeEntity.class, relation.getResRelTypeId());
-		//TODO parent resource types!?
-		return getTemplateDescriptorsForResourceRelationTypeContext(contextService.getGlobalResourceContextEntity(), resRelType, new ArrayList<TemplateDescriptorEntity>(), testing);
-	}
-
-	public List<TemplateDescriptorEntity> getTemplatesForResourceRelation(AbstractResourceRelationEntity relation, boolean testing) throws ResourceNotFoundException {
-		return getTemplateDescriptorsForResourceRelationContext(contextService.getGlobalResourceContextEntity(), resourceRelationService.getResourceRelation(relation.getId()), new ArrayList<TemplateDescriptorEntity>(), testing);
-	}
-
-	public List<TemplateDescriptorEntity> getGlobalTemplateDescriptorsForResourceRelation(Integer identifier, boolean testing) {
-		ResourceRelationTypeEntity resRelType = entityManager.find(ResourceRelationTypeEntity.class, identifier);
-		return getTemplateDescriptorsForResourceRelationTypeContext(contextService.getGlobalResourceContextEntity(), resRelType, new ArrayList<TemplateDescriptorEntity>(), testing);
-	}
-
-	private List<TemplateDescriptorEntity> getTemplateDescriptorsForResourceTypeContext(ContextEntity context, ResourceTypeEntity resourceType,
-			List<TemplateDescriptorEntity> templateDescriptors, boolean testing) {
-		if (resourceType != null) {
-
-			if (resourceType.getContexts() != null) {
-				// Get templates of resource type context
-				for (ResourceTypeContextEntity resourceTypeContext : resourceType.getContexts()) {
-					if (resourceTypeContext.getContext() != null && resourceTypeContext.getContext().getId().equals(context.getId())) {
-						templateDescriptors = collectTemplateDescriptors(resourceTypeContext, templateDescriptors, testing);
-					}
-				}
-			}
-		}
-
-		if (context.getParent() != null) {
-			templateDescriptors = getTemplateDescriptorsForResourceTypeContext(context.getParent(), resourceType, templateDescriptors, testing);
-		}
-		return templateDescriptors;
-	}
-
-	private List<TemplateDescriptorEntity> getTemplateDescriptorsForResourceContext(ContextEntity context, ResourceEntity resource, List<TemplateDescriptorEntity> templateDescriptors, boolean testing) {
-		if (resource != null) {
-			if (resource.getContexts() != null) {
-				// Get templates of resource context
-				for (ResourceContextEntity resourceContext : resource.getContexts()) {
-					if (resourceContext.getContext() != null && resourceContext.getContext().getId().equals(context.getId())) {
-						templateDescriptors = collectTemplateDescriptors(resourceContext, templateDescriptors, testing);
-					}
-				}
-			}
-		}
-		if (context.getParent() != null) {
-			templateDescriptors = getTemplateDescriptorsForResourceContext(context.getParent(), resource, templateDescriptors, testing);
-		}
-		return templateDescriptors;
-	}
-
-	private List<TemplateDescriptorEntity> getTemplateDescriptorsForResourceRelationTypeContext(ContextEntity context, ResourceRelationTypeEntity relationType,
-			List<TemplateDescriptorEntity> templateDescriptors, boolean testing) {
-		if (relationType != null) {
-
-			if (relationType.getContexts() != null) {
-				// Get templates of resource type context
-				for (ResourceRelationTypeContextEntity resourceRelationTypeContext : relationType.getContexts()) {
-					if (resourceRelationTypeContext.getContext() != null && resourceRelationTypeContext.getContext().getId().equals(context.getId())) {
-						templateDescriptors = collectTemplateDescriptors(resourceRelationTypeContext, templateDescriptors, testing);
-					}
-				}
-			}
-		}
-
-		if (context.getParent() != null) {
-			templateDescriptors = getTemplateDescriptorsForResourceRelationTypeContext(context.getParent(), relationType, templateDescriptors, testing);
-		}
-		return templateDescriptors;
-	}
-
-	private List<TemplateDescriptorEntity> getTemplateDescriptorsForResourceRelationContext(ContextEntity context, AbstractResourceRelationEntity relation,
-			List<TemplateDescriptorEntity> templateDescriptors, boolean testing) {
-
-		if (relation != null) {
-			if (relation.getContexts() != null) {
-				// Get templates of resource context
-				for (ResourceRelationContextEntity resourceRelationContext : relation.getContexts()) {
-					if (resourceRelationContext.getContext() != null && resourceRelationContext.getContext().getId().equals(context.getId())) {
-						templateDescriptors = collectTemplateDescriptors(resourceRelationContext, templateDescriptors, testing);
-					}
-				}
-			}
-		}
-
-		if (context.getParent() != null) {
-			templateDescriptors = getTemplateDescriptorsForResourceRelationContext(context.getParent(), relation, templateDescriptors, testing);
-		}
-		return templateDescriptors;
-	}
-
-	private List<TemplateDescriptorEntity> collectTemplateDescriptors(AbstractContext context, List<TemplateDescriptorEntity> templateDescriptorList, boolean testing) {
-		if (context.getTemplates() != null) {
-			for (TemplateDescriptorEntity templateDescriptor : context.getTemplates()) {
-				if ((testing && templateDescriptor.isTesting()) || (!testing && !templateDescriptor.isTesting())) {
-					templateDescriptor.setOwnerResource(context);
-					templateDescriptorList.add(templateDescriptor);
-				}
-			}
-		}
-		return templateDescriptorList;
-	}
-
-	private void removeTemplate(Integer selectedTemplateId, boolean isTesting, boolean isResType) throws TemplateNotDeletableException {
-		if(isTesting) {
-			//Check that the template is a Testing_Template(Shakedown entity).
-			removeTestingTemplate(selectedTemplateId);
-		} else if(isResType) {
-			removeDefaultResTypeTemplate(selectedTemplateId);
-			//The template is an InstanceResource_Template. Permitted to app_developer
-		} else {
-			removeDefaultResTemplate(selectedTemplateId);
-		}
-	}
-
-	@HasPermission(permission = Permission.RESOURCE_TEMPLATE, action = Action.DELETE)
-	private void removeDefaultResTemplate(Integer selectedTemplateId) throws TemplateNotDeletableException {
-		doRemoveTemplate(selectedTemplateId);
-	}
-
-	@HasPermission(permission = Permission.RESOURCETYPE_TEMPLATE, action = Action.DELETE)
-	private void removeDefaultResTypeTemplate(Integer selectedTemplateId) throws TemplateNotDeletableException {
-		doRemoveTemplate(selectedTemplateId);
-	}
-
-	@HasPermission(permission = Permission.SHAKEDOWN_TEST_MODE)
-	private void removeTestingTemplate(Integer selectedTemplateId) throws TemplateNotDeletableException {
-		doRemoveTemplate(selectedTemplateId);
-	}
+    @Inject
+    private Logger log;
+
+    @Inject
+    private EntityManager entityManager;
+
+    @Inject
+    private ContextDomainService contextService;
+
+    @Inject
+    ResourceLocator resourceLocator;
+
+    @Inject
+    ResourceRelationService resourceRelationService;
+
+    public List<TemplateDescriptorEntity> getGlobalTemplateDescriptorsForResourceType(ResourceTypeEntity resourceType) {
+        resourceType = entityManager.find(ResourceTypeEntity.class, resourceType.getId());
+        return getTemplateDescriptorsForResourceTypeContext(contextService.getGlobalResourceContextEntity(), resourceType, new ArrayList<TemplateDescriptorEntity>());
+    }
+
+    public List<TemplateDescriptorEntity> getGlobalTemplateDescriptorsForResource(ResourceEntity resource) {
+        resource = entityManager.find(ResourceEntity.class, resource.getId());
+        return getTemplateDescriptorsForResourceContext(contextService.getGlobalResourceContextEntity(), resource, new ArrayList<TemplateDescriptorEntity>());
+    }
+
+    public List<TemplateDescriptorEntity> getGlobalTemplateDescriptorsForResource(String resourceGroupName, String releaseName) throws ValidationException {
+        ResourceEntity resource = resourceLocator.getResourceByGroupNameAndRelease(resourceGroupName, releaseName);
+        return getTemplateDescriptorsForResourceContext(contextService.getGlobalResourceContextEntity(), resource, new ArrayList<TemplateDescriptorEntity>());
+    }
+
+    public List<TemplateDescriptorEntity> getGlobalTemplatesForResourceRelation(ResourceEditRelation relation) {
+        return getTemplateDescriptorsForResourceRelationContext(contextService.getGlobalResourceContextEntity(), resourceRelationService.getResourceRelation(relation.getResRelId()), new ArrayList<TemplateDescriptorEntity>());
+    }
+
+    public List<TemplateDescriptorEntity> getGlobalTemplatesForResourceRelationType(ResourceEditRelation relation) {
+        ResourceRelationTypeEntity resRelType = entityManager.find(ResourceRelationTypeEntity.class, relation.getResRelTypeId());
+        //TODO parent resource types!?
+        return getTemplateDescriptorsForResourceRelationTypeContext(contextService.getGlobalResourceContextEntity(), resRelType, new ArrayList<TemplateDescriptorEntity>());
+    }
+
+    public List<TemplateDescriptorEntity> getTemplatesForResourceRelation(AbstractResourceRelationEntity relation) throws ResourceNotFoundException {
+        return getTemplateDescriptorsForResourceRelationContext(contextService.getGlobalResourceContextEntity(), resourceRelationService.getResourceRelation(relation.getId()), new ArrayList<TemplateDescriptorEntity>());
+    }
+
+    public List<TemplateDescriptorEntity> getGlobalTemplateDescriptorsForResourceRelation(Integer identifier) {
+        ResourceRelationTypeEntity resRelType = entityManager.find(ResourceRelationTypeEntity.class, identifier);
+        return getTemplateDescriptorsForResourceRelationTypeContext(contextService.getGlobalResourceContextEntity(), resRelType, new ArrayList<TemplateDescriptorEntity>());
+    }
+
+    private List<TemplateDescriptorEntity> getTemplateDescriptorsForResourceTypeContext(ContextEntity context, ResourceTypeEntity resourceType,
+                                                                                        List<TemplateDescriptorEntity> templateDescriptors) {
+        if (resourceType != null) {
+
+            if (resourceType.getContexts() != null) {
+                // Get templates of resource type context
+                for (ResourceTypeContextEntity resourceTypeContext : resourceType.getContexts()) {
+                    if (resourceTypeContext.getContext() != null && resourceTypeContext.getContext().getId().equals(context.getId())) {
+                        templateDescriptors = collectTemplateDescriptors(resourceTypeContext, templateDescriptors);
+                    }
+                }
+            }
+        }
+
+        if (context.getParent() != null) {
+            templateDescriptors = getTemplateDescriptorsForResourceTypeContext(context.getParent(), resourceType, templateDescriptors);
+        }
+        return templateDescriptors;
+    }
+
+    private List<TemplateDescriptorEntity> getTemplateDescriptorsForResourceContext(ContextEntity context, ResourceEntity resource, List<TemplateDescriptorEntity> templateDescriptors) {
+        if (resource != null) {
+            if (resource.getContexts() != null) {
+                // Get templates of resource context
+                for (ResourceContextEntity resourceContext : resource.getContexts()) {
+                    if (resourceContext.getContext() != null && resourceContext.getContext().getId().equals(context.getId())) {
+                        templateDescriptors = collectTemplateDescriptors(resourceContext, templateDescriptors);
+                    }
+                }
+            }
+        }
+        if (context.getParent() != null) {
+            templateDescriptors = getTemplateDescriptorsForResourceContext(context.getParent(), resource, templateDescriptors);
+        }
+        return templateDescriptors;
+    }
+
+    private List<TemplateDescriptorEntity> getTemplateDescriptorsForResourceRelationTypeContext(ContextEntity context, ResourceRelationTypeEntity relationType,
+                                                                                                List<TemplateDescriptorEntity> templateDescriptors) {
+        if (relationType != null) {
+
+            if (relationType.getContexts() != null) {
+                // Get templates of resource type context
+                for (ResourceRelationTypeContextEntity resourceRelationTypeContext : relationType.getContexts()) {
+                    if (resourceRelationTypeContext.getContext() != null && resourceRelationTypeContext.getContext().getId().equals(context.getId())) {
+                        templateDescriptors = collectTemplateDescriptors(resourceRelationTypeContext, templateDescriptors);
+                    }
+                }
+            }
+        }
+
+        if (context.getParent() != null) {
+            templateDescriptors = getTemplateDescriptorsForResourceRelationTypeContext(context.getParent(), relationType, templateDescriptors);
+        }
+        return templateDescriptors;
+    }
+
+    private List<TemplateDescriptorEntity> getTemplateDescriptorsForResourceRelationContext(ContextEntity context, AbstractResourceRelationEntity relation,
+                                                                                            List<TemplateDescriptorEntity> templateDescriptors) {
+
+        if (relation != null) {
+            if (relation.getContexts() != null) {
+                // Get templates of resource context
+                for (ResourceRelationContextEntity resourceRelationContext : relation.getContexts()) {
+                    if (resourceRelationContext.getContext() != null && resourceRelationContext.getContext().getId().equals(context.getId())) {
+                        templateDescriptors = collectTemplateDescriptors(resourceRelationContext, templateDescriptors);
+                    }
+                }
+            }
+        }
+
+        if (context.getParent() != null) {
+            templateDescriptors = getTemplateDescriptorsForResourceRelationContext(context.getParent(), relation, templateDescriptors);
+        }
+        return templateDescriptors;
+    }
+
+    private List<TemplateDescriptorEntity> collectTemplateDescriptors(AbstractContext context, List<TemplateDescriptorEntity> templateDescriptorList) {
+        if (context.getTemplates() != null) {
+            for (TemplateDescriptorEntity templateDescriptor : context.getTemplates()) {
+                templateDescriptor.setOwnerResource(context);
+                templateDescriptorList.add(templateDescriptor);
+            }
+        }
+        return templateDescriptorList;
+    }
+
+    private void removeTemplate(Integer selectedTemplateId, boolean isResType) throws TemplateNotDeletableException {
+		if (isResType) {
+            removeDefaultResTypeTemplate(selectedTemplateId);
+            //The template is an InstanceResource_Template. Permitted to app_developer
+        } else {
+            removeDefaultResTemplate(selectedTemplateId);
+        }
+    }
+
+    @HasPermission(permission = Permission.RESOURCE_TEMPLATE, action = Action.DELETE)
+    private void removeDefaultResTemplate(Integer selectedTemplateId) throws TemplateNotDeletableException {
+        doRemoveTemplate(selectedTemplateId);
+    }
+
+    @HasPermission(permission = Permission.RESOURCETYPE_TEMPLATE, action = Action.DELETE)
+    private void removeDefaultResTypeTemplate(Integer selectedTemplateId) throws TemplateNotDeletableException {
+        doRemoveTemplate(selectedTemplateId);
+    }
 
 
     /**
      * Retruns a list of templates with the name templateName
+     *
      * @param templateName
      * @return
      */
-    private List<TemplateDescriptorEntity> getTemplateListByName(String templateName){
-		ArrayList<TemplateDescriptorEntity> result = (ArrayList<TemplateDescriptorEntity>) entityManager.createQuery("from TemplateDescriptorEntity tde where tde.name=:templateName", TemplateDescriptorEntity.class)
-				.setParameter("templateName", templateName).getResultList();
-		return result==null ? new ArrayList<TemplateDescriptorEntity>() : result;
-	}
+    private List<TemplateDescriptorEntity> getTemplateListByName(String templateName) {
+        ArrayList<TemplateDescriptorEntity> result = (ArrayList<TemplateDescriptorEntity>) entityManager.createQuery("from TemplateDescriptorEntity tde where tde.name=:templateName", TemplateDescriptorEntity.class)
+                .setParameter("templateName", templateName).getResultList();
+        return result == null ? new ArrayList<TemplateDescriptorEntity>() : result;
+    }
 
     /**
-     * Removes Templates with the given name
-     * @param templateName
+     * Löscht die Template von eine ResourceType.
+     *
+     * @param selectedTemplateId
      * @throws ResourceTypeNotFoundException
      * @throws TemplateNotDeletableException
      */
-	public void deleteSTPTemplate(String templateName) throws TemplateNotDeletableException {
-		for(TemplateDescriptorEntity template : getTemplateListByName(templateName)){
-			if(template!=null) {
-				removeTemplate(template.getId(), template.isTesting(),false);
-			}
-		}
-	}
-
-	/**
-	 * Löscht die Template von eine ResourceType.
-	 *
-	 * @param selectedTemplateId
-	 * @throws ResourceTypeNotFoundException
-	 * @throws TemplateNotDeletableException
-	 */
-	private void doRemoveTemplate(Integer selectedTemplateId) throws TemplateNotDeletableException {
-		TemplateDescriptorEntity templateDescriptor = entityManager.find(TemplateDescriptorEntity.class, selectedTemplateId);
-		if (templateDescriptor != null && templateDescriptor.getName() != null && SystemCallTemplate.getName().equals(templateDescriptor.getName())) {
-			String message = SystemCallTemplate.getName() + " Template can't be deleted!";
-			log.info(message);
-			throw new TemplateNotDeletableException(message);
-		}
-		AbstractContext owner = getOwnerOfTemplate(templateDescriptor);
-		if (owner != null) {
-			owner.removeTemplate(templateDescriptor);
-		}
-		entityManager.remove(templateDescriptor);
-		log.info("Template Id: " + selectedTemplateId + " was deleted successfully.");
-	}
-
-	public AbstractContext getOwnerOfTemplate(TemplateDescriptorEntity templateDescriptor) {
-		// ContextEntity
-		AbstractContext c;
-		c = (AbstractContext) getSingleObjectOrNull(
-				entityManager.createQuery("select distinct n from ContextEntity n where :templ member of n.templates")
-						.setParameter("templ", templateDescriptor));
-		if (c != null) {
-			return c;
-		}
-		c = (AbstractContext) getSingleObjectOrNull(entityManager
-				.createQuery("select distinct n from ContextTypeEntity n where :templ member of n.templates")
-				.setParameter("templ", templateDescriptor));
-		if (c != null) {
-			return c;
-		}
-		c = (AbstractContext) getSingleObjectOrNull(entityManager
-				.createQuery("select distinct n from ResourceContextEntity n where :templ member of n.templates")
-				.setParameter("templ", templateDescriptor));
-		if (c != null) {
-			return c;
-		}
-		c = (AbstractContext) getSingleObjectOrNull(entityManager
-				.createQuery(
-						"select distinct n from ResourceRelationContextEntity n where :templ member of n.templates")
-				.setParameter("templ", templateDescriptor));
-		if (c != null) {
-			return c;
-		}
-		c = (AbstractContext) getSingleObjectOrNull(entityManager
-				.createQuery(
-						"select distinct n from ResourceRelationTypeContextEntity n where :templ member of n.templates")
-				.setParameter("templ", templateDescriptor));
-		if (c != null) {
-			return c;
-		}
-		c = (AbstractContext) getSingleObjectOrNull(entityManager
-				.createQuery("select distinct n from ResourceTypeContextEntity n where :templ member of n.templates")
-				.setParameter("templ", templateDescriptor));
-		return c;
-	}
-
-	private Object getSingleObjectOrNull(Query q) {
-		try {
-			return q.getSingleResult();
-		} catch (NoResultException e) {
-			return null;
-		}
-	}
-
-	protected List<TemplateDescriptorEntity> getTemplateDescriptorByName(String templateName, boolean testing) {
-		CriteriaBuilder cb = entityManager.getCriteriaBuilder();
-		CriteriaQuery<TemplateDescriptorEntity> q = cb.createQuery(TemplateDescriptorEntity.class);
-		Root<TemplateDescriptorEntity> root = q.from(TemplateDescriptorEntity.class);
-		Predicate templateNamePred = cb.like(root.<String> get("name"), templateName);
-		Predicate testingPred = cb.equal(root.<Boolean> get("testing"), testing);
-		q.where(cb.and(templateNamePred, testingPred));
-
-		TypedQuery<TemplateDescriptorEntity> query = entityManager.createQuery(q);
-		return query.getResultList();
-	}
-
-	public void renameTestingTemplates(String oldName, String newName) {
-		List<TemplateDescriptorEntity> templates = getTemplateDescriptorByName(oldName, true);
-		for (TemplateDescriptorEntity t : templates) {
-			t.setName(newName);
-			entityManager.merge(t);
-			String message = "Template with name '" + oldName + "' renamed to '" + newName + "'";
-			log.info(message);
-		}
-	}
+    private void doRemoveTemplate(Integer selectedTemplateId) throws TemplateNotDeletableException {
+        TemplateDescriptorEntity templateDescriptor = entityManager.find(TemplateDescriptorEntity.class, selectedTemplateId);
+        if (templateDescriptor != null && templateDescriptor.getName() != null && SystemCallTemplate.getName().equals(templateDescriptor.getName())) {
+            String message = SystemCallTemplate.getName() + " Template can't be deleted!";
+            log.info(message);
+            throw new TemplateNotDeletableException(message);
+        }
+        AbstractContext owner = getOwnerOfTemplate(templateDescriptor);
+        if (owner != null) {
+            owner.removeTemplate(templateDescriptor);
+        }
+        entityManager.remove(templateDescriptor);
+        log.info("Template Id: " + selectedTemplateId + " was deleted successfully.");
+    }
+
+    public AbstractContext getOwnerOfTemplate(TemplateDescriptorEntity templateDescriptor) {
+        // ContextEntity
+        AbstractContext c;
+        c = (AbstractContext) getSingleObjectOrNull(
+                entityManager.createQuery("select distinct n from ContextEntity n where :templ member of n.templates")
+                        .setParameter("templ", templateDescriptor));
+        if (c != null) {
+            return c;
+        }
+        c = (AbstractContext) getSingleObjectOrNull(entityManager
+                .createQuery("select distinct n from ContextTypeEntity n where :templ member of n.templates")
+                .setParameter("templ", templateDescriptor));
+        if (c != null) {
+            return c;
+        }
+        c = (AbstractContext) getSingleObjectOrNull(entityManager
+                .createQuery("select distinct n from ResourceContextEntity n where :templ member of n.templates")
+                .setParameter("templ", templateDescriptor));
+        if (c != null) {
+            return c;
+        }
+        c = (AbstractContext) getSingleObjectOrNull(entityManager
+                .createQuery(
+                        "select distinct n from ResourceRelationContextEntity n where :templ member of n.templates")
+                .setParameter("templ", templateDescriptor));
+        if (c != null) {
+            return c;
+        }
+        c = (AbstractContext) getSingleObjectOrNull(entityManager
+                .createQuery(
+                        "select distinct n from ResourceRelationTypeContextEntity n where :templ member of n.templates")
+                .setParameter("templ", templateDescriptor));
+        if (c != null) {
+            return c;
+        }
+        c = (AbstractContext) getSingleObjectOrNull(entityManager
+                .createQuery("select distinct n from ResourceTypeContextEntity n where :templ member of n.templates")
+                .setParameter("templ", templateDescriptor));
+        return c;
+    }
+
+    private Object getSingleObjectOrNull(Query q) {
+        try {
+            return q.getSingleResult();
+        } catch (NoResultException e) {
+            return null;
+        }
+    }
+
+    protected List<TemplateDescriptorEntity> getTemplateDescriptorByName(String templateName) {
+        CriteriaBuilder cb = entityManager.getCriteriaBuilder();
+        CriteriaQuery<TemplateDescriptorEntity> q = cb.createQuery(TemplateDescriptorEntity.class);
+        Root<TemplateDescriptorEntity> root = q.from(TemplateDescriptorEntity.class);
+        Predicate templateNamePred = cb.like(root.<String>get("name"), templateName);
+        q.where(cb.and(templateNamePred));
+
+        TypedQuery<TemplateDescriptorEntity> query = entityManager.createQuery(q);
+        return query.getResultList();
+    }
+
+    public void renameTestingTemplates(String oldName, String newName) {
+        List<TemplateDescriptorEntity> templates = getTemplateDescriptorByName(oldName);
+        for (TemplateDescriptorEntity t : templates) {
+            t.setName(newName);
+            entityManager.merge(t);
+            String message = "Template with name '" + oldName + "' renamed to '" + newName + "'";
+            log.info(message);
+        }
+    }
 }
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/template/entity/TemplateDescriptorEntity.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/template/entity/TemplateDescriptorEntity.java
index 70d3e0f2a..59b94a390 100644
--- a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/template/entity/TemplateDescriptorEntity.java
+++ b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/template/entity/TemplateDescriptorEntity.java
@@ -61,8 +61,6 @@ public class TemplateDescriptorEntity implements Identifiable, Serializable, Cop
 	private String name;
 	private String targetPath;
 
-	@Column(nullable = false)
-	private boolean testing = true;
 
 	@ManyToMany(fetch=FetchType.EAGER)
 	@Getter
@@ -157,13 +155,6 @@ public void setOwnerResource(AbstractContext ownerResource) {
 		this.ownerResource = ownerResource;
 	}
 
-	public boolean isTesting() {
-		return testing;
-	}
-
-	public void setTesting(boolean testing) {
-		this.testing = testing;
-	}
 
 	public long getV() {
 		return v;
@@ -198,8 +189,6 @@ public TemplateDescriptorEntity getCopy(TemplateDescriptorEntity target, CopyUni
 		// name
 		target.setName(this.getName());
 
-		// testing
-		target.setTesting(this.isTesting());
 
 		// fileContent
 		if (alreadyExists && !StringUtils.equals(target.getFileContent(), this.getFileContent())) {
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/usersettings/control/UserSettingsService.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/usersettings/control/UserSettingsService.java
index 75462ba5f..8423cee6b 100644
--- a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/usersettings/control/UserSettingsService.java
+++ b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/usersettings/control/UserSettingsService.java
@@ -20,25 +20,15 @@
 
 package ch.puzzle.itc.mobiliar.business.usersettings.control;
 
-import java.io.Serializable;
-import java.util.*;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+import ch.puzzle.itc.mobiliar.business.usersettings.entity.UserSettingsEntity;
 
 import javax.ejb.Stateless;
 import javax.inject.Inject;
 import javax.persistence.EntityManager;
 import javax.persistence.NoResultException;
 import javax.persistence.Query;
-import javax.persistence.TypedQuery;
-import javax.persistence.criteria.*;
-
-import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.ResourceGroupEntity;
-import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.ResourceTypeEntity;
-import ch.puzzle.itc.mobiliar.business.usersettings.entity.FavoriteResourceEntity;
-import ch.puzzle.itc.mobiliar.business.usersettings.entity.MyAMWObject;
-import ch.puzzle.itc.mobiliar.business.usersettings.entity.UserSettingsEntity;
-import ch.puzzle.itc.mobiliar.common.exception.ResourceNotFoundException;
+import java.io.Serializable;
+import java.util.logging.Logger;
 
 @Stateless
 public class UserSettingsService implements Serializable {
@@ -49,45 +39,6 @@ public class UserSettingsService implements Serializable {
 	@Inject
 	protected Logger log;
 
-	public Map<Integer, MyAMWObject> loadFavoriteResources(String userName) {
-		List<FavoriteResourceEntity> tmpResult = fetchFavoriteResources(userName);
-		Map<Integer, MyAMWObject> result = new LinkedHashMap<Integer, MyAMWObject>();
-
-		if (tmpResult != null) {
-			for (FavoriteResourceEntity fav : tmpResult) {
-				// This is a temporary hack - the resource type will be put on the resource group in the
-				// next release, so this is not possible anymore. however for the moment, it still is
-				// possible that a resourcegroup exists without resources and therefore without
-				// resourcetype...
-				ResourceTypeEntity t = fav.getResourceGroup().getResourceType();
-				if (t != null) {
-					result.put(fav.getResourceGroup().getId(), new MyAMWObject(fav.getResourceGroup()
-							.getId(), fav.getResourceGroup().getName(), fav.isEmail(), fav
-							.getResourceGroup().getResourceType().getName()));
-				}
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @param userName
-	 * @return
-	 */
-	public List<FavoriteResourceEntity> fetchFavoriteResources(String userName) {
-		CriteriaBuilder cb = entityManager.getCriteriaBuilder();
-		CriteriaQuery<FavoriteResourceEntity> q = cb.createQuery(FavoriteResourceEntity.class);
-		Root<FavoriteResourceEntity> r = q.from(FavoriteResourceEntity.class);
-		Join<FavoriteResourceEntity, UserSettingsEntity> userSettings = r.join("user");
-		Join<FavoriteResourceEntity, ResourceGroupEntity> resourceGroup = r.join("resourceGroup");
-		Predicate userNamePred = cb.like(userSettings.<String> get("userName"), userName);
-		q.where(userNamePred);
-		q.orderBy(cb.asc(resourceGroup.get("name")));
-		r.fetch("resourceGroup", JoinType.LEFT);
-
-		return entityManager.createQuery(q).getResultList();
-	}
-
 	public UserSettingsEntity saveUserSettings(UserSettingsEntity userSettings) {
 		return entityManager.merge(userSettings);
 	}
@@ -106,92 +57,4 @@ public UserSettingsEntity getUserSettings(String userName) {
 		}
 		return user;
 	}
-
-	public UserSettingsEntity setEmail(Integer groupId, String userName, boolean email) {
-		Query q = entityManager
-				.createQuery(
-						"from FavoriteResourceEntity f where f.resourceGroup.id=:groupId and f.user.userName=:name")
-				.setParameter("name", userName).setParameter("groupId", groupId);
-		FavoriteResourceEntity r = (FavoriteResourceEntity) q.getSingleResult();
-		r.setEmail(email);
-		entityManager.persist(r);
-		return r.getUser();
-	}
-
-	/**
-	 * @param groupId
-	 * @param userName
-	 * @return
-	 * @throws ResourceNotFoundException
-	 */
-	public UserSettingsEntity addFavoriteResource(Integer groupId, String userName)
-			throws ResourceNotFoundException {
-		Query q = entityManager.createQuery(
-				"from UserSettingsEntity u left join fetch u.favoriteResources where u.userName=:name")
-				.setParameter("name", userName);
-		UserSettingsEntity user;
-		try {
-			user = (UserSettingsEntity) q.getSingleResult();
-		}
-		catch (NoResultException e) {
-			user = new UserSettingsEntity();
-			user.setUserName(userName);
-			entityManager.persist(user);
-		}
-
-		FavoriteResourceEntity r = new FavoriteResourceEntity();
-		r.setUser(user);
-		ResourceGroupEntity g = entityManager.find(ResourceGroupEntity.class, groupId);
-		if (g == null) {
-			throw new ResourceNotFoundException("ResourceGroup with id " + groupId + " not found.");
-		}
-		r.setResourceGroup(g);
-		entityManager.persist(r);
-
-		if (user.getFavoriteResources() == null) {
-			user.setFavoriteResources(new HashSet<FavoriteResourceEntity>());
-		}
-		user.getFavoriteResources().add(r);
-		return user;
-	}
-
-	/**
-	 * @param groupId
-	 * @param userName
-	 * @return
-	 */
-	public UserSettingsEntity removeFavoriteResource(Integer groupId, String userName) {
-		Query q = entityManager
-				.createQuery(
-						"from FavoriteResourceEntity f where f.resourceGroup.id=:groupId and f.user.userName=:name")
-				.setParameter("name", userName).setParameter("groupId", groupId);
-		try {
-			FavoriteResourceEntity r = (FavoriteResourceEntity) q.getSingleResult();
-			entityManager.remove(r);
-			return r.getUser();
-		}
-		catch (NoResultException e) {
-			log.log(Level.WARNING, "Error loading FavoriteResourceEntity", e);
-		}
-		return null;
-	}
-
-	/**
-	 * Returns a List of Usernames, which have registered at least one of the given ids as a favorite
-	 * 
-	 * @param ids
-	 * @return
-	 */
-	public List<String> getRegisteredUsernamesForResourcesIds(Set<Integer> ids) {
-		if (ids == null || ids.isEmpty()) {
-			return new ArrayList<String>();
-		}
-
-		// Find registered users for ids
-		final TypedQuery<String> q = entityManager
-				.createQuery(
-						"select distinct u.userName from FavoriteResourceEntity f left join f.user u left join f.resourceGroup g where f.email=true and g.id in (:ids)",
-						String.class).setParameter("ids", ids);
-		return q.getResultList();
-	}
 }
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/usersettings/entity/FavoriteResourceEntity.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/usersettings/entity/FavoriteResourceEntity.java
deleted file mode 100644
index 050b7b105..000000000
--- a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/usersettings/entity/FavoriteResourceEntity.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * AMW - Automated Middleware allows you to manage the configurations of
- * your Java EE applications on an unlimited number of different environments
- * with various versions, including the automated deployment of those apps.
- * Copyright (C) 2013-2016 by Puzzle ITC
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package ch.puzzle.itc.mobiliar.business.usersettings.entity;
-
-import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.ResourceGroupEntity;
-import ch.puzzle.itc.mobiliar.business.database.control.Constants;
-import lombok.Getter;
-import lombok.Setter;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-@Entity
-@Table(name="TAMW_favoriteResource", uniqueConstraints = {
-		@UniqueConstraint(columnNames = { "USER_ID", "RESOURCEGROUP_ID" }) })
-public class FavoriteResourceEntity implements Serializable {
-
-
-	private static final long serialVersionUID = 1L;
-
-	@Getter
-	@Setter
-	@TableGenerator(name = "favoriteResourceIdGen", table = Constants.GENERATORTABLE, pkColumnName = Constants.GENERATORPKCOLUMNNAME, valueColumnName = Constants.GENERATORVALUECOLUMNNAME, pkColumnValue = "favoriteResourceId")
-	@GeneratedValue(strategy = GenerationType.TABLE, generator = "favoriteResourceIdGen")
-	@Id
-	@Column(unique = true, nullable = false)
-	private Integer id;
-
-	@Getter
-	@Setter
-	@Column(nullable = false)
-	private boolean email;
-
-	@Getter
-	@Setter
-	@ManyToOne
-	private UserSettingsEntity user;
-
-	@Getter
-	@Setter
-	@ManyToOne
-	private ResourceGroupEntity resourceGroup;
-
-	@Getter
-	@Version
-	private long v;
-
-}
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/usersettings/entity/MyAMWObject.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/usersettings/entity/MyAMWObject.java
deleted file mode 100644
index 3755670e2..000000000
--- a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/usersettings/entity/MyAMWObject.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * AMW - Automated Middleware allows you to manage the configurations of
- * your Java EE applications on an unlimited number of different environments
- * with various versions, including the automated deployment of those apps.
- * Copyright (C) 2013-2016 by Puzzle ITC
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package ch.puzzle.itc.mobiliar.business.usersettings.entity;
-
-import lombok.Getter;
-import lombok.Setter;
-import ch.puzzle.itc.mobiliar.common.util.DefaultResourceTypeDefinition;
-
-public class MyAMWObject {
-	@Getter
-	private final Integer groupId;
-	@Getter
-	private final String name;
-	@Getter
-	@Setter
-	private boolean email;
-	@Getter
-	private final boolean asOrApp;
-
-
-	public MyAMWObject(Integer groupId, String name, boolean email, String resourceType) {
-		super();
-		this.groupId = groupId;
-		this.name = name;
-		this.email = email;
-		this.asOrApp = resourceType!=null && (resourceType.equals(DefaultResourceTypeDefinition.APPLICATION.name()) || resourceType.equals(DefaultResourceTypeDefinition.APPLICATIONSERVER.name()));
-	}
-
-}
diff --git a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/usersettings/entity/UserSettingsEntity.java b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/usersettings/entity/UserSettingsEntity.java
index 5a8ccf2d0..47bc5f471 100644
--- a/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/usersettings/entity/UserSettingsEntity.java
+++ b/AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/usersettings/entity/UserSettingsEntity.java
@@ -25,7 +25,6 @@
 import lombok.Setter;
 
 import javax.persistence.*;
-import java.util.Set;
 
 @Entity
 @Table(name="TAMW_userSettings")
@@ -43,16 +42,6 @@ public class UserSettingsEntity {
 	@Setter
 	@Column(unique = true)
 	private String userName;
-	
-	@Getter
-	@Setter
-	@Column(nullable = false)
-	private boolean myAmwEnabled;
-	
-	@Getter
-	@Setter
-	@OneToMany(mappedBy = "user")
-	private Set<FavoriteResourceEntity> favoriteResources;
 
 	@Getter
 	@Version
diff --git a/AMW_business/src/main/resources/liquibase/auto.db.changelog.xml b/AMW_business/src/main/resources/liquibase/auto.db.changelog.xml
index 72cd2d447..f481c3d82 100644
--- a/AMW_business/src/main/resources/liquibase/auto.db.changelog.xml
+++ b/AMW_business/src/main/resources/liquibase/auto.db.changelog.xml
@@ -110,4 +110,9 @@
     <!--1.17.31-->
     <include file="changesets/data/config_admin_add_template_restriction.xml" relativeToChangelogFile="true"/>
 
+    <!--1.17.37-->
+    <include file="changesets/model/removeFavorites/removeFavorites.xml" relativeToChangelogFile="true"/>
+    <include file="changesets/data/removeShakedownAndTesting.xml" relativeToChangelogFile="true"/>
+    <include file="changesets/model/removeTesting/removeShakedownAndTesting.xml" relativeToChangelogFile="true"/>
+
 </databaseChangeLog>
diff --git a/AMW_business/src/main/resources/liquibase/changesets/data/removeShakedownAndTesting.xml b/AMW_business/src/main/resources/liquibase/changesets/data/removeShakedownAndTesting.xml
new file mode 100644
index 000000000..53a843886
--- /dev/null
+++ b/AMW_business/src/main/resources/liquibase/changesets/data/removeShakedownAndTesting.xml
@@ -0,0 +1,44 @@
+<databaseChangeLog logicalFilePath="liquibase/changesets/data/removeShakedownAndTesting.xml"
+                   xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd
+    http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd">
+
+    <changeSet author="sgirod" id="removeShakedownAndTestingData" >
+        <comment>
+
+        </comment>
+        <delete tableName="TAMW_resourcetype">
+            <where>NAME like 'shakedown%'</where>
+        </delete>
+        <delete tableName="TAMW_resourcectx_tmpldesc">
+            <where>TEMPLATES_ID in (SELECT ID FROM TAMW_templateDescriptor WHERE TESTING = 1)</where>
+        </delete>
+        <delete tableName="TAMW_restypectx_tmpldesc">
+            <where>TEMPLATES_ID in (SELECT ID FROM TAMW_templateDescriptor WHERE TESTING = 1)</where>
+        </delete>
+        <delete tableName="TAMW_tmplDesc_targetPlat">
+            <where>TEMPLATEDESCRIPTORS_ID in (SELECT ID FROM TAMW_templateDescriptor WHERE TESTING = 1)</where>
+        </delete>
+        <delete tableName="TAMW_templateDescriptor">
+            <where>testing = 1</where>
+        </delete>
+        <delete tableName="tamw_restriction">
+            <where>ROLE_ID in (select id from TAMW_ROLE where name like 'shakedown%')</where>
+        </delete>
+        <delete tableName="TAMW_role">
+            <where>name like 'shakedown%'</where>
+        </delete>
+        <delete tableName="TAMW_restriction">
+            <where>PERMISSION_ID in (select id from TAMW_PERMISSION where VALUE like 'SHAKEDOWN%')</where>
+        </delete>
+        <delete tableName="TAMW_permission">
+            <where>value like 'SHAKEDOWN%' </where>
+        </delete>
+        <delete tableName="TAMW_propertyDescriptor">
+            <where>testing = 1</where>
+        </delete>
+
+        <rollback></rollback>
+    </changeSet>
+</databaseChangeLog>
diff --git a/AMW_business/src/main/resources/liquibase/changesets/model/removeFavorites/removeFavorites.xml b/AMW_business/src/main/resources/liquibase/changesets/model/removeFavorites/removeFavorites.xml
new file mode 100644
index 000000000..55eddbbf1
--- /dev/null
+++ b/AMW_business/src/main/resources/liquibase/changesets/model/removeFavorites/removeFavorites.xml
@@ -0,0 +1,10 @@
+<databaseChangeLog logicalFilePath="liquibase/changesets/model/removeFavorites/removeFavorites.xml"
+                   xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
+
+    <changeSet author="cllorente" id="removeFavorites">
+        <dropTable tableName="TAMW_FAVORITERESOURCE"/>
+        <dropColumn tableName="TAMW_USERSETTINGS" columnName="myAmwEnabled"/>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/AMW_business/src/main/resources/liquibase/changesets/model/removeTesting/removeShakedownAndTesting.xml b/AMW_business/src/main/resources/liquibase/changesets/model/removeTesting/removeShakedownAndTesting.xml
new file mode 100644
index 000000000..6fa7531b4
--- /dev/null
+++ b/AMW_business/src/main/resources/liquibase/changesets/model/removeTesting/removeShakedownAndTesting.xml
@@ -0,0 +1,18 @@
+<databaseChangeLog logicalFilePath="liquibase/changesets/model/removeTesting/removeShakedownAndTesting.xml"
+                   xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
+
+    <changeSet author="sgirod" id="removeShakedownTest">
+        <dropTable tableName="TAMW_shakedownStp"/>
+        <dropTable tableName="TAMW_shakedownStp_aud"/>
+        <dropTable tableName="TAMW_shakedownTest"/>
+        <dropColumn tableName="TAMW_deployment" columnName="createTestAfterDeployment"/>
+        <dropColumn tableName="TAMW_deployment" columnName="neighborhoodTest"/>
+    </changeSet>
+
+    <changeSet author="sgirod" id="removeTesting">
+        <dropColumn tableName="TAMW_templateDescriptor" columnName="testing"/>
+        <dropColumn tableName="TAMW_propertyDescriptor" columnName="testing"/>
+    </changeSet>
+</databaseChangeLog>
diff --git a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/builders/PropertyDescriptorEntityBuilder.java b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/builders/PropertyDescriptorEntityBuilder.java
index 42d4e72ba..e04173ca2 100644
--- a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/builders/PropertyDescriptorEntityBuilder.java
+++ b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/builders/PropertyDescriptorEntityBuilder.java
@@ -44,7 +44,6 @@ public class PropertyDescriptorEntityBuilder extends BaseEntityBuilder {
 	private boolean encrypt;
 	private String propertyName;
 	private boolean nullable;
-	private boolean testing;
 	private String validationLogic;
 	private String propertyComment;
 	private Integer cardinalityProperty;
@@ -72,7 +71,6 @@ public class PropertyDescriptorEntityBuilder extends BaseEntityBuilder {
      * @param encrypted
      * @param nullable
      * @param readOnly
-     * @param testing
      * @param propType
      * @param defaultValue
      * @param exampleValue
@@ -82,7 +80,7 @@ public class PropertyDescriptorEntityBuilder extends BaseEntityBuilder {
 	 * @return
 	 */
 	public PropertyDescriptorEntity mockPropertyDescriptorEntity(Set<PropertyEntity> properties, String name, String comment, boolean encrypted, boolean nullable,
-			boolean readOnly, boolean testing, PropertyTypeEntity propType, String defaultValue, String exampleValue, String machineInterpretationKey, boolean optional, String displayName) {
+			boolean readOnly, PropertyTypeEntity propType, String defaultValue, String exampleValue, String machineInterpretationKey, boolean optional, String displayName) {
 		PropertyDescriptorEntity mock = Mockito.mock(PropertyDescriptorEntity.class);
 		when(mock.getId()).thenReturn(1);
 		when(mock.getProperties()).thenReturn(properties != null ? properties : new HashSet<PropertyEntity>());
@@ -92,7 +90,6 @@ public PropertyDescriptorEntity mockPropertyDescriptorEntity(Set<PropertyEntity>
 		when(mock.getPropertyComment()).thenReturn(!StringUtils.isEmpty(comment) ? comment : COMMENT);
 		when(mock.isEncrypt()).thenReturn(encrypted);
 		when(mock.isNullable()).thenReturn(nullable);
-		when(mock.isTesting()).thenReturn(testing);
 		when(mock.getValidationLogic()).thenReturn(VALIDATION_LOGIC);
 		when(mock.getPropertyTypeEntity()).thenReturn(propType);
         when(mock.getDefaultValue()).thenReturn(defaultValue);
@@ -116,7 +113,6 @@ public PropertyDescriptorEntity mockPropertyDescriptorEntity(Set<PropertyEntity>
 	 * @param encrypted
 	 * @param nullable
 	 * @param readOnly
-	 * @param testing
      * @param propType
      * @param defaultValue
      * @param exampleValue
@@ -126,7 +122,7 @@ public PropertyDescriptorEntity mockPropertyDescriptorEntity(Set<PropertyEntity>
 	 * @return
 	 */
 	public PropertyDescriptorEntity buildPropertyDescriptorEntity(Set<PropertyEntity> properties, String name, String comment, boolean encrypted, boolean nullable,
-			boolean readOnly, boolean testing, PropertyTypeEntity propType, String defaultValue, String exampleValue, String machineInterpretationKey, boolean optional, String displayName) {
+			boolean readOnly, PropertyTypeEntity propType, String defaultValue, String exampleValue, String machineInterpretationKey, boolean optional, String displayName) {
 		PropertyDescriptorEntity propertyDescriptorEntity = new PropertyDescriptorEntity();
 		propertyDescriptorEntity.setProperties(properties);
 		int nextId = getNextId();
@@ -135,7 +131,6 @@ public PropertyDescriptorEntity buildPropertyDescriptorEntity(Set<PropertyEntity
 		propertyDescriptorEntity.setPropertyComment(!StringUtils.isEmpty(comment) ? comment : COMMENT);
 		propertyDescriptorEntity.setEncrypt(encrypted);
 		propertyDescriptorEntity.setNullable(nullable);
-		propertyDescriptorEntity.setTesting(testing);
 		propertyDescriptorEntity.setValidationLogic(VALIDATION_LOGIC);
 		propertyDescriptorEntity.setPropertyTypeEntity(propType);
         propertyDescriptorEntity.setDefaultValue(defaultValue);
@@ -155,7 +150,6 @@ public PropertyDescriptorEntity build(){
 		entity.setPropertyComment(!StringUtils.isEmpty(this.propertyComment) ? propertyComment : COMMENT);
 		entity.setEncrypt(this.encrypt);
 		entity.setNullable(this.nullable);
-		entity.setTesting(this.testing);
 		entity.setValidationLogic(!StringUtils.isEmpty(this.validationLogic) ? this.validationLogic : VALIDATION_LOGIC);
 		entity.setPropertyTypeEntity(this.propertyTypeEntity);
 		entity.setDefaultValue(this.defaultValue);
@@ -268,11 +262,6 @@ public PropertyDescriptorEntityBuilder isNullable(boolean nullable){
         return this;
     }
 
-    public PropertyDescriptorEntityBuilder isTesting(boolean testing){
-        this.testing = testing;
-        return this;
-    }
-
 	public PropertyDescriptorEntityBuilder withTags(PropertyTagEntity... tags){
 		propertyTags = new ArrayList<>();
 		for (PropertyTagEntity tag : tags) {
diff --git a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/builders/ResourceEditPropertyBuilder.java b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/builders/ResourceEditPropertyBuilder.java
index 3a4fc59c0..fa1032d8f 100644
--- a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/builders/ResourceEditPropertyBuilder.java
+++ b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/builders/ResourceEditPropertyBuilder.java
@@ -34,7 +34,6 @@ public class ResourceEditPropertyBuilder {
     private boolean isOptional = false;
 	private boolean isEncrypted = false;
 	private Integer cardinalityProperty = null;
-	private boolean isTesting = false;
 	private String validationLogic = null;
     private String mik = null;
 	private Integer propContextId = null;
@@ -111,14 +110,6 @@ public ResourceEditPropertyBuilder withCardinality(Integer cardinalityProperty)
         return this;
     }
 
-    /**
-     * Indicate if property is in testing mode
-     */
-    public ResourceEditPropertyBuilder withIsTesting(boolean isTesting) {
-        this.isTesting = isTesting;
-        return this;
-    }
-
     /**
      * Validation logic for property
      */
@@ -304,7 +295,6 @@ public ResourceEditPropertyBuilder withDescriptor(PropertyDescriptorEntity descr
         this.isOptional = descriptor.isOptional();
         this.isEncrypted = descriptor.isEncrypt();
         this.cardinalityProperty = descriptor.getCardinalityProperty();
-        this.isTesting = descriptor.isTesting();
         this.validationLogic = descriptor.getValidationLogic();
         this.mik = descriptor.getMachineInterpretationKey();
         this.descriptorId = descriptor.getId();
@@ -314,7 +304,7 @@ public ResourceEditPropertyBuilder withDescriptor(PropertyDescriptorEntity descr
 
 	public ResourceEditProperty build() {
 		return new ResourceEditProperty(technicalKey, displayName, propertyValue, exampleValue, defaultValue, propertyComment,
-				isNullable, isOptional, isEncrypted, cardinalityProperty, isTesting, validationLogic, mik, propContextId,
+				isNullable, isOptional, isEncrypted, cardinalityProperty, validationLogic, mik, propContextId,
 				typeContextId, descriptorId, propContName, typeContName, typeId, propertyValueTypeId, masterTypeId, typeName,
 				validationRegex, propertyId, origin, loadedFor, resourceName, descriptorOrigin, fcOwner, fcExternalKey, fcExternalLink);
 	}
diff --git a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/builders/ShakedownTestEntityBuilder.java b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/builders/ShakedownTestEntityBuilder.java
deleted file mode 100644
index c8595d204..000000000
--- a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/builders/ShakedownTestEntityBuilder.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * AMW - Automated Middleware allows you to manage the configurations of
- * your Java EE applications on an unlimited number of different environments
- * with various versions, including the automated deployment of those apps.
- * Copyright (C) 2013-2016 by Puzzle ITC
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package ch.puzzle.itc.mobiliar.builders;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-import ch.puzzle.itc.mobiliar.business.environment.entity.ContextEntity;
-import ch.puzzle.itc.mobiliar.business.deploy.entity.DeploymentEntity;
-import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.ResourceEntity;
-import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.ResourceGroupEntity;
-import ch.puzzle.itc.mobiliar.business.shakedown.entity.ShakedownTestEntity;
-
-public class ShakedownTestEntityBuilder {
-
-	public static ShakedownTestEntity mockShakedownTestEntity(ContextEntity context, ResourceEntity appServer, DeploymentEntity dep, Integer id, ResourceGroupEntity group) {
-		ShakedownTestEntity test = mock(ShakedownTestEntity.class);
-		when(test.getContext()).thenReturn(context);
-		when(test.getApplicationServer()).thenReturn(appServer);
-		when(test.getDeployment()).thenReturn(dep);
-		when(test.getResourceGroup()).thenReturn(group);
-		when(test.getId()).thenReturn(id);
-		when(test.getRelease()).thenReturn(appServer.getRelease());
-
-		return test;
-	}
-
-}
diff --git a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/builders/ShakedownTestGenerationResultBuilder.java b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/builders/ShakedownTestGenerationResultBuilder.java
deleted file mode 100644
index 0e4921976..000000000
--- a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/builders/ShakedownTestGenerationResultBuilder.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * AMW - Automated Middleware allows you to manage the configurations of
- * your Java EE applications on an unlimited number of different environments
- * with various versions, including the automated deployment of those apps.
- * Copyright (C) 2013-2016 by Puzzle ITC
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package ch.puzzle.itc.mobiliar.builders;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import ch.puzzle.itc.mobiliar.business.shakedown.xmlmodel.STS;
-import ch.puzzle.itc.mobiliar.business.shakedown.control.ShakedownTestGenerationResult;
-import ch.puzzle.itc.mobiliar.business.deploy.entity.DeploymentEntity;
-import ch.puzzle.itc.mobiliar.business.shakedown.entity.ShakedownTestEntity;
-
-public class ShakedownTestGenerationResultBuilder {
-
-	public static ShakedownTestGenerationResult mockGenerationResultWithErrors(ShakedownTestEntity test, DeploymentEntity deployment) {
-		ShakedownTestGenerationResult result = mock(ShakedownTestGenerationResult.class);
-		when(result.getShakedownTestEntity()).thenReturn(test);
-		when(result.getDeployment()).thenReturn(deployment);
-
-		when(result.hasErrors()).thenReturn(true);
-		when(result.getErrorMessage()).thenReturn("errormessage");
-
-		return result;
-	}
-
-	public static ShakedownTestGenerationResult buildGenerationResultSuccess(ShakedownTestEntity test, DeploymentEntity deployment) {
-		ShakedownTestGenerationResult result = new ShakedownTestGenerationResult();
-		result.setShakedownTestEntity(test);
-		result.setDeployment(deployment);
-		STS sts = new STS();
-		List<String> shakedowntests = new ArrayList<String>();
-		shakedowntests.add("foo");
-		sts.setShakedowntests(shakedowntests );
-		result.addTestingTemplate(sts);
-
-		return result;
-	}
-
-	public static ShakedownTestGenerationResult buildGenerationResultSuccessEmptySTS(ShakedownTestEntity test, DeploymentEntity deployment) {
-		ShakedownTestGenerationResult result = new ShakedownTestGenerationResult();
-		result.setShakedownTestEntity(test);
-		result.setDeployment(deployment);
-		result.setTestingTemplates(Collections.<STS> emptyList());
-
-		return result;
-	}
-
-}
diff --git a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/builders/ShakedownTestOrderBuilder.java b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/builders/ShakedownTestOrderBuilder.java
deleted file mode 100644
index 68c201f2e..000000000
--- a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/builders/ShakedownTestOrderBuilder.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * AMW - Automated Middleware allows you to manage the configurations of
- * your Java EE applications on an unlimited number of different environments
- * with various versions, including the automated deployment of those apps.
- * Copyright (C) 2013-2016 by Puzzle ITC
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package ch.puzzle.itc.mobiliar.builders;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import java.util.List;
-
-import ch.puzzle.itc.mobiliar.business.environment.entity.ContextEntity;
-import ch.puzzle.itc.mobiliar.business.shakedown.entity.ShakedownTestOrder;
-import ch.puzzle.itc.mobiliar.business.releasing.entity.ReleaseEntity;
-import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.ResourceGroupEntity;
-
-public class ShakedownTestOrderBuilder {
-
-	public static ShakedownTestOrder mockShakedownTestOrder(ContextEntity context, ReleaseEntity release, List<ResourceGroupEntity> groups) {
-		ShakedownTestOrder order = mock(ShakedownTestOrder.class);
-		when(order.getApplicationServerName()).thenReturn("as");
-		when(order.getEnvironment()).thenReturn(context);
-		when(order.getEnvironmentName()).thenReturn(context.getName());
-		when(order.getRelease()).thenReturn(release);
-		when(order.getReleaseName()).thenReturn(release.getName());
-		when(order.getResourceGroups()).thenReturn(groups);
-		return order;
-	}
-
-}
diff --git a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/builders/TemplateDescriptorEntityBuilder.java b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/builders/TemplateDescriptorEntityBuilder.java
index b1301b740..cee859b37 100644
--- a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/builders/TemplateDescriptorEntityBuilder.java
+++ b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/builders/TemplateDescriptorEntityBuilder.java
@@ -45,7 +45,6 @@ public class TemplateDescriptorEntityBuilder extends BaseEntityBuilder {
 	private String name;
 	private AbstractContext ownerResource;
 	private Set<ResourceGroupEntity> targetPlatforms;
-	private boolean testing;
 	private boolean relationTemplate;
 	private Integer id;
 
@@ -74,11 +73,6 @@ public TemplateDescriptorEntityBuilder withTargetPlatforms(Set<ResourceGroupEnti
 		return this;
 	}
 
-	public TemplateDescriptorEntityBuilder withTesting(boolean testing) {
-		this.testing = testing;
-		return this;
-	}
-
 	public TemplateDescriptorEntityBuilder setId(Integer id) {
 		this.id = id;
 		return this;
@@ -100,7 +94,6 @@ public TemplateDescriptorEntity mock() {
 		when(mock.getName()).thenReturn(name);
 		when(mock.getOwnerResource()).thenReturn(ownerResource);
 		when(mock.getTargetPlatforms()).thenReturn(targetPlatforms);
-		when(mock.isTesting()).thenReturn(testing);
 		when(mock.isRelationTemplate()).thenReturn(relationTemplate);
 
 		return mock;
@@ -117,7 +110,6 @@ public TemplateDescriptorEntity build() {
 		template.setName(name);
 		template.setOwnerResource(ownerResource);
 		template.setTargetPlatforms(targetPlatforms);
-		template.setTesting(testing);
 		template.setRelationTemplate(relationTemplate);
 
 		return template;
diff --git a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/auditview/control/AuditServiceTest.java b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/auditview/control/AuditServiceTest.java
index 740f2f690..d40732da0 100644
--- a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/auditview/control/AuditServiceTest.java
+++ b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/auditview/control/AuditServiceTest.java
@@ -33,7 +33,6 @@
 import ch.puzzle.itc.mobiliar.business.resourcerelation.entity.ProvidedResourceRelationEntity;
 import ch.puzzle.itc.mobiliar.business.resourcerelation.entity.ResourceRelationContextEntity;
 import ch.puzzle.itc.mobiliar.business.resourcerelation.entity.ResourceRelationTypeEntity;
-import ch.puzzle.itc.mobiliar.business.shakedown.entity.ShakedownTestEntity;
 import ch.puzzle.itc.mobiliar.test.testrunner.PersistenceTestRunner;
 import org.hamcrest.MatcherAssert;
 import org.hibernate.envers.RevisionType;
@@ -71,19 +70,6 @@ public void setUp() {
         ThreadLocalUtil.destroy();
     }
 
-    @Test
-    public void shouldReturnNullIfEntityIsNotAudited() {
-        // given
-        ShakedownTestEntity shakedownTest = new ShakedownTestEntity();
-        Integer id = 1;
-
-        // when
-        Object deletedEntity = auditService.getDeletedEntity(shakedownTest, id);
-
-        // then
-        assertNull(deletedEntity);
-    }
-
     @Test
     public void shouldReturnNullIfEntityIsNotDeleted() {
         // given
diff --git a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/deploy/boundary/DeploymentBoundaryPersistenceTest.java b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/deploy/boundary/DeploymentBoundaryPersistenceTest.java
index 2f414d726..9bd534327 100644
--- a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/deploy/boundary/DeploymentBoundaryPersistenceTest.java
+++ b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/deploy/boundary/DeploymentBoundaryPersistenceTest.java
@@ -57,8 +57,8 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.*;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyList;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyList;
 import static org.mockito.Mockito.*;
 
 @RunWith(PersistenceTestRunner.class)
@@ -789,7 +789,7 @@ public void test_getFilteredDeployments_sortByRelease() {
 		// when sorting by release ascending (releaseA - releaseC - releaseB)
 		String colToSort = DeploymentFilterTypes.RELEASE.getFilterTabColumnName();
 		Tuple<Set<DeploymentEntity>, Integer> result1 = deploymentBoundary.getFilteredDeployments(0, 10,
-				Collections.EMPTY_LIST, colToSort, Sort.SortingDirectionType.ASC, null);
+				Collections.EMPTY_LIST, colToSort, Sort.SortingDirectionType.ASC);
 
 		// then
 		assertNotNull(result1);
@@ -801,7 +801,7 @@ public void test_getFilteredDeployments_sortByRelease() {
 
 		// when sorting by release descending (releaseB - releaseC - releaseC)
 		Tuple<Set<DeploymentEntity>, Integer> result2 = deploymentBoundary.getFilteredDeployments(0, 10,
-				Collections.EMPTY_LIST, colToSort, Sort.SortingDirectionType.DESC, null);
+				Collections.EMPTY_LIST, colToSort, Sort.SortingDirectionType.DESC);
 
 		// then
 		assertNotNull(result2);
@@ -857,7 +857,7 @@ public void test_getFilteredDeployments_filterByRelease() {
 				.comparatorSelection(ComparatorFilterOption.gte).build();
 		filter.setValue(CustomFilter.convertDateToString(releaseA.getInstallationInProductionAt()));
 		result = deploymentBoundary.getFilteredDeployments(0, 10, Collections.singletonList(filter), null,
-				Sort.SortingDirectionType.ASC, null);
+				Sort.SortingDirectionType.ASC);
 
 		// then
 		assertNotNull(result);
@@ -870,7 +870,7 @@ public void test_getFilteredDeployments_filterByRelease() {
 		filter.setValue(CustomFilter.convertDateToString(releaseC.getInstallationInProductionAt()));
 		filter.setComparatorSelection(ComparatorFilterOption.lte);
 		result = deploymentBoundary.getFilteredDeployments(0, 10, Collections.singletonList(filter), null,
-				Sort.SortingDirectionType.ASC, null);
+				Sort.SortingDirectionType.ASC);
 
 		// then
 		assertNotNull(result);
@@ -883,7 +883,7 @@ public void test_getFilteredDeployments_filterByRelease() {
 		filter.setValue(CustomFilter.convertDateToString(releaseB.getInstallationInProductionAt()));
 		filter.setComparatorSelection(ComparatorFilterOption.eq);
 		result = deploymentBoundary.getFilteredDeployments(0, 10, Collections.singletonList(filter), null,
-				Sort.SortingDirectionType.ASC, null);
+				Sort.SortingDirectionType.ASC);
 
 		// then
 		assertNotNull(result);
@@ -1123,7 +1123,7 @@ public void shouldReturnTheRightFilteredDeploymentsInTheRightOrderIfLatestDeploy
 
 		// when sorting by release ascending
 		String colToSort = DeploymentFilterTypes.RELEASE.getFilterTabColumnName();
-		Tuple<Set<DeploymentEntity>, Integer> result1 = deploymentBoundary.getFilteredDeployments(0, 10, filters, colToSort, Sort.SortingDirectionType.ASC, null);
+		Tuple<Set<DeploymentEntity>, Integer> result1 = deploymentBoundary.getFilteredDeployments(0, 10, filters, colToSort, Sort.SortingDirectionType.ASC);
 
 		// then
 		assertNotNull(result1);
@@ -1134,7 +1134,7 @@ public void shouldReturnTheRightFilteredDeploymentsInTheRightOrderIfLatestDeploy
 		assertThat(it.next().getRelease(), is(release2));
 
 		// when sorting by release descending
-		Tuple<Set<DeploymentEntity>, Integer> result2 = deploymentBoundary.getFilteredDeployments(0, 10, filters, colToSort, Sort.SortingDirectionType.DESC, null);
+		Tuple<Set<DeploymentEntity>, Integer> result2 = deploymentBoundary.getFilteredDeployments(0, 10, filters, colToSort, Sort.SortingDirectionType.DESC);
 
 		// then
 		assertNotNull(result2);
@@ -1210,7 +1210,7 @@ public void shouldReturnTheRightFilteredDeploymentsIfLatestDeploymentJobFilterAn
 		String colToSort = DeploymentFilterTypes.RELEASE.getFilterTabColumnName();
 
 		// when
-		Tuple<Set<DeploymentEntity>, Integer> result = deploymentBoundary.getFilteredDeployments(0, 10, filters, colToSort, Sort.SortingDirectionType.ASC, null);
+		Tuple<Set<DeploymentEntity>, Integer> result = deploymentBoundary.getFilteredDeployments(0, 10, filters, colToSort, Sort.SortingDirectionType.ASC);
 
 		// then
 		assertNotNull(result);
@@ -1286,7 +1286,7 @@ public void shouldReturnDeploymentWithHighestIdPerEnvironmentIfLatestDeploymentJ
 		String colToSort = DeploymentFilterTypes.RELEASE.getFilterTabColumnName();
 
 		// when
-		Tuple<Set<DeploymentEntity>, Integer> result = deploymentBoundary.getFilteredDeployments(0, 10, filters, colToSort, Sort.SortingDirectionType.ASC, null);
+		Tuple<Set<DeploymentEntity>, Integer> result = deploymentBoundary.getFilteredDeployments(0, 10, filters, colToSort, Sort.SortingDirectionType.ASC);
 
 		// then
 		assertNotNull(result);
@@ -1361,7 +1361,7 @@ public void shouldReturnDeploymentWithHighestIdPerEnvironmentIfLatestDeploymentJ
 
 		// when sorted by tracking id asc
 		String colToSort = DeploymentFilterTypes.TRACKING_ID.getFilterTabColumnName();
-		Tuple<Set<DeploymentEntity>, Integer> result1 = deploymentBoundary.getFilteredDeployments(0, 10, filters, colToSort, Sort.SortingDirectionType.ASC, null);
+		Tuple<Set<DeploymentEntity>, Integer> result1 = deploymentBoundary.getFilteredDeployments(0, 10, filters, colToSort, Sort.SortingDirectionType.ASC);
 
 		// then
 		assertNotNull(result1);
@@ -1379,7 +1379,7 @@ public void shouldReturnDeploymentWithHighestIdPerEnvironmentIfLatestDeploymentJ
 
 		// when sorted by tracking id desc
 		colToSort = DeploymentFilterTypes.TRACKING_ID.getFilterTabColumnName();
-		Tuple<Set<DeploymentEntity>, Integer> result2 = deploymentBoundary.getFilteredDeployments( 0, 10, filters, colToSort, Sort.SortingDirectionType.DESC, null);
+		Tuple<Set<DeploymentEntity>, Integer> result2 = deploymentBoundary.getFilteredDeployments( 0, 10, filters, colToSort, Sort.SortingDirectionType.DESC);
 
 		// then
 		assertNotNull(result2);
diff --git a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/deploy/boundary/DeploymentBoundaryTest.java b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/deploy/boundary/DeploymentBoundaryTest.java
index 66f3643fa..0c5a3f6b3 100644
--- a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/deploy/boundary/DeploymentBoundaryTest.java
+++ b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/deploy/boundary/DeploymentBoundaryTest.java
@@ -161,8 +161,6 @@ public void testConfirmDeployment() throws ParseException {
         Integer deploymentId = 1;
         boolean sendEmailWhenDeployed = true;
         boolean simulateBeforeDeployment = true;
-        boolean shakedownTestsWhenDeployed = true;
-        boolean neighbourhoodTest = true;;
 
         Integer trackingId = 2;
         Date releaseDate = new Date();
@@ -176,8 +174,6 @@ public void testConfirmDeployment() throws ParseException {
         deployment.setDeploymentDate(new Date());
         deployment.setDeploymentState(DeploymentState.requested);
         deployment.setSendEmailConfirmation(false);
-        deployment.setCreateTestAfterDeployment(false);
-        deployment.setCreateTestForNeighborhoodAfterDeployment(false);
         deployment.setSimulating(false);
 
         Mockito.doReturn(DeploymentBoundary.DeploymentOperationValidation.SUCCESS).when(deploymentBoundary).isConfirmPossible(deployment);
@@ -187,7 +183,7 @@ public void testConfirmDeployment() throws ParseException {
 
 		Date deploymentDate = Date.from(LocalDate.now().plusDays(2).atStartOfDay().atZone(ZoneId.systemDefault()).toInstant());
         // when
-        DeploymentEntity deploymentEntity = deploymentBoundary.confirmDeployment(deploymentId, sendEmailWhenDeployed, shakedownTestsWhenDeployed, neighbourhoodTest, simulateBeforeDeployment, deploymentDate);
+        DeploymentEntity deploymentEntity = deploymentBoundary.confirmDeployment(deploymentId, sendEmailWhenDeployed, simulateBeforeDeployment, deploymentDate);
 
         // then
         assertThat(deploymentEntity.getDeploymentState(), is(DeploymentState.scheduled));
@@ -196,8 +192,6 @@ public void testConfirmDeployment() throws ParseException {
 
         assertThat(deploymentEntity.isSendEmailConfirmation(), is(sendEmailWhenDeployed));
         assertThat(deploymentEntity.isSimulating(), is(simulateBeforeDeployment));
-        assertThat(deploymentEntity.isCreateTestAfterDeployment(), is(shakedownTestsWhenDeployed));
-        assertThat(deploymentEntity.isCreateTestForNeighborhoodAfterDeployment(), is(neighbourhoodTest));
         assertThat(deploymentEntity.getDeploymentDate(), is(deploymentDate));
     }
 
@@ -267,10 +261,10 @@ public void shouldSetSortColumnIfColumnKnown() {
 		// given
 		Query query = mock(Query.class);
 		when(commonFilterService.addFilterAndCreateQuery(any(), any(), any(), anyBoolean(), anyBoolean())).thenReturn(query);
-		when(commonFilterService.setParameterToQuery(any(), any(), any(), any())).thenReturn(query);
+		when(commonFilterService.setParameterToQuery(any(), any(), any())).thenReturn(query);
 
 		// when
-		deploymentBoundary.getFilteredDeployments(0, null, emptyList(), "d.trackingId", DESC, emptyList() );
+		deploymentBoundary.getFilteredDeployments(0, null, emptyList(), "d.trackingId", DESC);
 
 		// then
 		ArgumentCaptor<Sort> sortCaptor = ArgumentCaptor.forClass(Sort.class);
@@ -283,10 +277,10 @@ public void shouldIgnoreSortColumnIfNull() {
 		// given
 		Query query = mock(Query.class);
 		when(commonFilterService.addFilterAndCreateQuery(any(), any(), any(), anyBoolean(), anyBoolean())).thenReturn(query);
-		when(commonFilterService.setParameterToQuery(any(), any(), any(), any())).thenReturn(query);
+		when(commonFilterService.setParameterToQuery(any(), any(), any())).thenReturn(query);
 
 		// when
-		deploymentBoundary.getFilteredDeployments(0, null, emptyList(), null, DESC, emptyList() );
+		deploymentBoundary.getFilteredDeployments(0, null, emptyList(), null, DESC);
 
 		// then
 		ArgumentCaptor<Sort> sortCaptor = ArgumentCaptor.forClass(Sort.class);
@@ -301,7 +295,7 @@ public void shouldIgnoreSortColumnIfNull() {
 	public void shouldThrowIfSortColumnUnknown() {
 		try {
 			// when
-			deploymentBoundary.getFilteredDeployments(0, null, emptyList(), "unknown.column", DESC, emptyList());
+			deploymentBoundary.getFilteredDeployments(0, null, emptyList(), "unknown.column", DESC);
 			fail("IllegalArgumentException should have been thrown");
 		} catch (IllegalArgumentException ex) {
 			// then
diff --git a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/deploy/control/DeploymentAsynchronousExecuterTest.java b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/deploy/control/DeploymentAsynchronousExecuterTest.java
index b72a0d73c..56adcdb58 100644
--- a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/deploy/control/DeploymentAsynchronousExecuterTest.java
+++ b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/deploy/control/DeploymentAsynchronousExecuterTest.java
@@ -20,7 +20,7 @@
 
 package ch.puzzle.itc.mobiliar.business.deploy.control;
 
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
diff --git a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/deploy/control/DeploymentExecuterServiceTest.java b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/deploy/control/DeploymentExecuterServiceTest.java
index 9bd3d4518..d86dbf0af 100644
--- a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/deploy/control/DeploymentExecuterServiceTest.java
+++ b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/deploy/control/DeploymentExecuterServiceTest.java
@@ -45,8 +45,8 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.*;
 
 public class DeploymentExecuterServiceTest {
diff --git a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/deploy/control/DeploymentExecutionResultHandlerServiceTest.java b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/deploy/control/DeploymentExecutionResultHandlerServiceTest.java
index 0045efbc3..c918ca27f 100644
--- a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/deploy/control/DeploymentExecutionResultHandlerServiceTest.java
+++ b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/deploy/control/DeploymentExecutionResultHandlerServiceTest.java
@@ -24,7 +24,6 @@
 import ch.puzzle.itc.mobiliar.business.deploy.entity.DeploymentEntity;
 import ch.puzzle.itc.mobiliar.business.generator.control.GenerationResult;
 import ch.puzzle.itc.mobiliar.business.generator.control.extracted.GenerationModus;
-import ch.puzzle.itc.mobiliar.business.shakedown.control.ShakedownTestService;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.InjectMocks;
@@ -48,9 +47,6 @@ public class DeploymentExecutionResultHandlerServiceTest {
 	@Mock
     DeploymentBoundary deploymentBoundary;
 
-	@Mock
-	ShakedownTestService shakedownTestService;
-
 	DeploymentEntity deployment;
 	GenerationResult result;
 
@@ -92,8 +88,6 @@ public void handleSuccessfulDeployment_noSTP_simulation() {
 
 	@Test
 	public void handleSuccessfulDeployment_STP() {
-		// given
-		deployment.setCreateTestAfterDeployment(true);
 
 		// when
 		deploymentExecutionResultHandlerService.handleSuccessfulDeployment(GenerationModus.DEPLOY, result);
@@ -101,7 +95,6 @@ public void handleSuccessfulDeployment_STP() {
 		// then
 		verify(deploymentBoundary, times(1)).updateDeploymentInfoAndSendNotification(GenerationModus.DEPLOY, deployment.getId(), null,
 				deployment.getResource() != null ? deployment.getResource().getId() : null, result, null);
-		verify(deploymentBoundary, times(1)).createShakedownTestForTrackinIdOfDeployment(deployment.getTrackingId());
 	}
 
 	@Test
diff --git a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/deploy/control/DeploymentNotificationServiceTest.java b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/deploy/control/DeploymentNotificationServiceTest.java
index 0a1fe7f67..994c1f8e7 100644
--- a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/deploy/control/DeploymentNotificationServiceTest.java
+++ b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/deploy/control/DeploymentNotificationServiceTest.java
@@ -23,13 +23,10 @@
 import ch.puzzle.itc.mobiliar.business.deploy.entity.DeploymentEntity;
 import ch.puzzle.itc.mobiliar.business.deploy.entity.DeploymentState;
 import ch.puzzle.itc.mobiliar.business.environment.entity.ContextEntity;
-import ch.puzzle.itc.mobiliar.business.generator.control.extracted.ResourceDependencyResolverService;
 import ch.puzzle.itc.mobiliar.business.releasing.control.ReleaseMgmtService;
 import ch.puzzle.itc.mobiliar.business.releasing.entity.ReleaseEntity;
 import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.ResourceEntity;
 import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.ResourceFactory;
-import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.ResourceGroupEntity;
-import ch.puzzle.itc.mobiliar.business.usersettings.control.UserSettingsService;
 import ch.puzzle.itc.mobiliar.business.utils.notification.NotificationService;
 import org.junit.Before;
 import org.junit.Test;
@@ -40,14 +37,12 @@
 import javax.mail.Address;
 import javax.mail.MessagingException;
 import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import static org.junit.Assert.*;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.*;
 
 public class DeploymentNotificationServiceTest {
@@ -57,13 +52,7 @@ public class DeploymentNotificationServiceTest {
 	
 	@Mock
 	private NotificationService notificationService;
-	
-	@Mock 
-	private UserSettingsService userSettingsService;
-	
-	@Mock
-	private ResourceDependencyResolverService dependencyResolverService;
-	
+
 	@Mock
 	private ReleaseMgmtService releaseMgmtService;
 
@@ -87,7 +76,7 @@ public void setUp(){
 	}
 	
 	@Test
-	public void createAndSendMailForDeplyoments_null() {
+	public void createAndSendMailForDeployments_null() {
 		// given
 		
 		// when
@@ -98,7 +87,7 @@ public void createAndSendMailForDeplyoments_null() {
 	}
 	
 	@Test
-	public void createAndSendMailForDeplyoments_empty() {
+	public void createAndSendMailForDeployments_empty() {
 		// given
 		
 		// when
@@ -109,7 +98,7 @@ public void createAndSendMailForDeplyoments_empty() {
 	}
 	
 	@Test
-	public void createAndSendMailForDeplyoments_oneDeployment_noAddress_sending_ok() throws MessagingException {
+	public void createAndSendMailForDeployments_oneDeployment_noAddress_sending_ok() throws MessagingException {
 		// given
 		ArrayList<DeploymentEntity> deployments = new ArrayList<DeploymentEntity>();
 		
@@ -132,7 +121,7 @@ public void createAndSendMailForDeplyoments_oneDeployment_noAddress_sending_ok()
 	}
 	
 	@Test
-	public void createAndSendMailForDeplyoments_oneDeployment_noAddress_sending_nok() throws MessagingException {
+	public void createAndSendMailForDeployments_oneDeployment_noAddress_sending_nok() throws MessagingException {
 		// given
 		ArrayList<DeploymentEntity> deployments = new ArrayList<DeploymentEntity>();
 		
@@ -157,7 +146,7 @@ public void createAndSendMailForDeplyoments_oneDeployment_noAddress_sending_nok(
 	}
 	
 	@Test
-	public void createAndSendMailForDeplyoments_oneDeployment_noAddress_sending_nok_release_onDeployment() throws MessagingException {
+	public void createAndSendMailForDeployments_oneDeployment_noAddress_sending_nok_release_onDeployment() throws MessagingException {
 		// given
 		ArrayList<DeploymentEntity> deployments = new ArrayList<DeploymentEntity>();
 		
@@ -183,7 +172,7 @@ public void createAndSendMailForDeplyoments_oneDeployment_noAddress_sending_nok_
 	}
 	
 	@Test
-	public void createAndSendMailForDeplyoments_oneDeployment_noAddress_sending_Exception() throws MessagingException {
+	public void createAndSendMailForDeployments_oneDeployment_noAddress_sending_Exception() throws MessagingException {
 		// given
 		ArrayList<DeploymentEntity> deployments = new ArrayList<DeploymentEntity>();
 		
@@ -208,7 +197,7 @@ public void createAndSendMailForDeplyoments_oneDeployment_noAddress_sending_Exce
 	
 	
 	@Test
-	public void createAndSendMailForDeplyoments_oneDeployment_noAddress_sending_Recipients() throws MessagingException {
+	public void createAndSendMailForDeployments_oneDeployment_noAddress_sending_Recipients() throws MessagingException {
 		// given
 		ArrayList<DeploymentEntity> deployments = new ArrayList<DeploymentEntity>();
 		
@@ -219,13 +208,12 @@ public void createAndSendMailForDeplyoments_oneDeployment_noAddress_sending_Reci
 		deployment.setResourceGroup(applicationServer.getResourceGroup());
 		deployment.setApplicationsWithVersion(new ArrayList<DeploymentEntity.ApplicationWithVersion>());
 		deployment.setContext(context);
+		deployment.setSendEmail(true);
+		deployment.setDeploymentRequestUser("testuser1");
 		deployments.add(deployment);
 		
 		when(notificationService.createAndSendMail(anyString(), anyString(), any(Address[].class))).thenReturn(true);
 		when(releaseMgmtService.getDefaultRelease()).thenReturn(defaultRelease);
-		List<String> value = new ArrayList<>();
-		value.add("testuser1");
-		when(userSettingsService.getRegisteredUsernamesForResourcesIds(any(Set.class))).thenReturn(value );
 		
 		// when
 		String result = deploymentNotificationService.createAndSendMailForDeplyoments(deployments);
@@ -236,7 +224,7 @@ public void createAndSendMailForDeplyoments_oneDeployment_noAddress_sending_Reci
 	}
 
 	@Test
-	public void createAndSendMailForDeplyoments_archived() throws MessagingException {
+	public void createAndSendMailForDeployments_archived() throws MessagingException {
 		// given
 		ArrayList<DeploymentEntity> deployments = new ArrayList<DeploymentEntity>();
 
diff --git a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/deploy/scheduler/DeploymentSchedulerTest.java b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/deploy/scheduler/DeploymentSchedulerTest.java
index 41b9a85db..924d587a1 100644
--- a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/deploy/scheduler/DeploymentSchedulerTest.java
+++ b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/deploy/scheduler/DeploymentSchedulerTest.java
@@ -29,9 +29,6 @@
 import ch.puzzle.itc.mobiliar.business.generator.control.extracted.GenerationModus;
 import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.ResourceEntity;
 import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.ResourceFactory;
-import ch.puzzle.itc.mobiliar.business.shakedown.control.ShakedownTestExecuterService;
-import ch.puzzle.itc.mobiliar.business.shakedown.control.ShakedownTestService;
-import ch.puzzle.itc.mobiliar.business.shakedown.entity.ShakedownTestEntity;
 import ch.puzzle.itc.mobiliar.common.util.ConfigKey;
 import org.hamcrest.BaseMatcher;
 import org.hamcrest.Description;
@@ -66,10 +63,6 @@ public class DeploymentSchedulerTest {
 	DeploymentBoundary deploymentBoundary;
 	@Mock
 	DeploymentExecuterService deploymentExecuterService;
-	@Mock
-	ShakedownTestExecuterService shakedownTestExecuterService;
-	@Mock
-	ShakedownTestService shakedownTestService;
 
 	ContextEntity contextEntity;
 
@@ -255,91 +248,6 @@ public void test_checkForDeployments_2Deployments_Context() {
 		verify(log, times(3)).log(argThat(matchesLevel(Level.INFO)), anyString());
 	}
 
-
-	@Test
-	public void test_checkForTests_noTest() {
-		// given
-		List<ShakedownTestEntity> tests = new ArrayList<ShakedownTestEntity>();
-
-		when(shakedownTestService.getTestsToExecute()).thenReturn(tests);
-
-		// when
-		deploymentScheduler.executeForTests();
-
-		// then
-		verify(shakedownTestExecuterService, never()).generateConfigurationAndExecuteShakedownTest(any(Integer.class));
-		verify(log, times(2)).log(argThat(matchesLevel(Level.FINE)), anyString());
-	}
-
-	@Test
-	public void test_checkForDeployments_OneTest_noContext() {
-		// given
-		List<ShakedownTestEntity> tests = new ArrayList<ShakedownTestEntity>();
-		ShakedownTestEntity test = new ShakedownTestEntity();
-		tests.add(test);
-
-		when(shakedownTestService.getTestsToExecute()).thenReturn(tests);
-
-		// when
-		deploymentScheduler.executeForTests();
-
-		// then
-		verify(shakedownTestExecuterService, never()).generateConfigurationAndExecuteShakedownTest(any(Integer.class));
-		verify(log, times(1)).log(argThat(matchesLevel(Level.INFO)), anyString());
-	}
-
-	@Test
-	public void test_checkForDeployments_OneTest_Context() {
-		// given
-		List<ShakedownTestEntity> tests = new ArrayList<ShakedownTestEntity>();
-		ResourceEntity resource =  ResourceFactory.createNewResource("testAppserver");
-
-		ShakedownTestEntity test = new ShakedownTestEntity();
-		test.setApplicationServer(resource);
-
-		test.setContext(contextEntity);
-		tests.add(test);
-
-		when(shakedownTestService.getTestsToExecute()).thenReturn(tests);
-
-		// when
-		deploymentScheduler.executeForTests();
-
-		// then
-		verify(shakedownTestExecuterService, times(1)).generateConfigurationAndExecuteShakedownTest(test.getId());
-		verify(log, times(2)).log(argThat(matchesLevel(Level.INFO)), anyString());
-	}
-
-	@Test
-	public void test_checkForDeployments_2Tests_Context() {
-		// given
-		List<ShakedownTestEntity> tests = new ArrayList<ShakedownTestEntity>();
-		ResourceEntity resource =  ResourceFactory.createNewResource("testAppserver");
-
-		ShakedownTestEntity test = new ShakedownTestEntity();
-		test.setId(Integer.valueOf(12));
-		ShakedownTestEntity test2 = new ShakedownTestEntity();
-		test2.setId(Integer.valueOf(13));
-		test.setApplicationServer(resource);
-		test2.setApplicationServer(resource);
-
-		test.setContext(contextEntity);
-		test2.setContext(contextEntity);
-
-		tests.add(test);
-		tests.add(test2);
-
-		when(shakedownTestService.getTestsToExecute()).thenReturn(tests);
-
-		// when
-		deploymentScheduler.executeForTests();
-
-		// then
-		verify(shakedownTestExecuterService, times(1)).generateConfigurationAndExecuteShakedownTest(test.getId());
-		verify(shakedownTestExecuterService, times(1)).generateConfigurationAndExecuteShakedownTest(test2.getId());
-		verify(log, times(3)).log(argThat(matchesLevel(Level.INFO)), anyString());
-	}
-
 	@Test
 	public void test_checkForEndlessDeployments_noDeployments(){
 		// given
@@ -379,7 +287,7 @@ public void test_checkForEndlessDeployments_Deployments(){
 	}
 
 	@Test
-	public void test_checkForDeploymentsAndTests_2Deployments() {
+	public void test_checkForDeployments_2Deployments() {
 		// given
 		List<DeploymentEntity> deployments = new ArrayList<DeploymentEntity>();
 		ResourceEntity resource =  ResourceFactory.createNewResource("testResource");
@@ -397,27 +305,9 @@ public void test_checkForDeploymentsAndTests_2Deployments() {
 		deployments.add(deployment);
 		deployments.add(deployment2);
 
-		List<ShakedownTestEntity> tests = new ArrayList<ShakedownTestEntity>();
-		ResourceEntity appServer =  ResourceFactory.createNewResource("testAppserver");
-
-		ShakedownTestEntity test = new ShakedownTestEntity();
-		test.setId(Integer.valueOf(12));
-		ShakedownTestEntity test2 = new ShakedownTestEntity();
-		test.setId(Integer.valueOf(13));
-		test.setApplicationServer(appServer);
-		test2.setApplicationServer(appServer);
-
-		test.setContext(contextEntity);
-		test2.setContext(contextEntity);
-
-		tests.add(test);
-		tests.add(test2);
-
 		when(deploymentBoundary.getDeploymentsToSimulate()).thenReturn(deployments);
 		when(deploymentBoundary.getDeploymentsToExecute()).thenReturn(deployments);
 		when(deploymentBoundary.getPreDeploymentsToExecute()).thenReturn(deployments);
-		when(shakedownTestService.getTestsToExecute()).thenReturn(tests);
-
 
 		// when
 		deploymentScheduler.triggerDeyploymentsAndTests();
@@ -429,9 +319,7 @@ public void test_checkForDeploymentsAndTests_2Deployments() {
 		verify(deploymentExecuterService, times(1)).generateConfigurationAndExecuteDeployment(Integer.valueOf(2), GenerationModus.SIMULATE);
 		verify(deploymentExecuterService, times(1)).generateConfigurationAndExecuteDeployment(Integer.valueOf(1), GenerationModus.PREDEPLOY);
 		verify(deploymentExecuterService, times(1)).generateConfigurationAndExecuteDeployment(Integer.valueOf(2), GenerationModus.PREDEPLOY);
-		verify(shakedownTestExecuterService, times(1)).generateConfigurationAndExecuteShakedownTest(test.getId());
-		verify(shakedownTestExecuterService, times(1)).generateConfigurationAndExecuteShakedownTest(test2.getId());
-		verify(log, times(12)).log(argThat(matchesLevel(Level.INFO)), anyString());
+		verify(log, times(9)).log(argThat(matchesLevel(Level.INFO)), anyString());
 	}
 	
 	@Test
@@ -446,7 +334,6 @@ public void test_checkForDeploymentsAndTests_2Deployments_SchedulerConfigDisable
 
 		// then
 		verify(deploymentExecuterService, never()).generateConfigurationAndExecuteDeployment(any(Integer.class), any(GenerationModus.class));
-		verify(shakedownTestExecuterService, never()).generateConfigurationAndExecuteShakedownTest(any(Integer.class));
 		verify(log, never()).log(any(Level.class), anyString());
 		//remove Systemconfig
 		System.getProperties().remove(ConfigKey.DEPLOYMENT_SCHEDULER_DISABLED.getValue());
diff --git a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/domain/applist/ApplistScreenDomainServiceTest.java b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/domain/applist/ApplistScreenDomainServiceTest.java
deleted file mode 100644
index 9926ca29a..000000000
--- a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/domain/applist/ApplistScreenDomainServiceTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * AMW - Automated Middleware allows you to manage the configurations of
- * your Java EE applications on an unlimited number of different environments
- * with various versions, including the automated deployment of those apps.
- * Copyright (C) 2013-2016 by Puzzle ITC
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package ch.puzzle.itc.mobiliar.business.domain.applist;
-
-import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.ResourceEntity;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.InjectMocks;
-import org.mockito.MockitoAnnotations;
-
-import java.util.Collections;
-import java.util.List;
-
-public class ApplistScreenDomainServiceTest {
-
-
-    @InjectMocks
-    ApplistScreenDomainService applistScreenDomainService;
-
-    @Before
-    public void before() {
-        MockitoAnnotations.openMocks(this);
-    }
-
-    /**
-     * Ensure, that there is an empty list resulting when asking with an empty myamw-filter (which means "my amw filter on, but no favorite resources available")
-     * @throws Exception
-     */
-    @Test
-    public void testGetApplicationServersWithEmptyMyAMWFilter() throws Exception {
-        List<ResourceEntity> applicationServers = applistScreenDomainService
-                  .getAppServerResourcesWithApplications("*", 42, Collections.<Integer>emptyList(), true);
-        Assert.assertTrue(applicationServers.isEmpty());
-    }
-
-    /**
-     * Ensure, that there is an empty list resulting when asking with an empty myamw-filter (which means "my amw filter on, but no favorite resources available")
-     * @throws Exception
-     */
-    @Test
-    public void testGetApplicationServerResourcesWithNull() throws Exception {
-        List<ResourceEntity> applicationServers = applistScreenDomainService
-                  .getApplicationServerResources("*", 42, Collections.<Integer>emptyList());
-        Assert.assertTrue(applicationServers.isEmpty());
-    }
-}
\ No newline at end of file
diff --git a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/generator/GeneratorUtilsTest.java b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/generator/GeneratorUtilsTest.java
index da1641728..d4eb0c8e1 100644
--- a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/generator/GeneratorUtilsTest.java
+++ b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/generator/GeneratorUtilsTest.java
@@ -122,33 +122,24 @@ public void findEnvironmentAndPropertyForApplicationServer() {
 	@Test
 	public void testCollectTemplateDescriptors() {
 		context.addTemplate(f.createTemplate("foo", "foo", targetPlatformId));
-		Set<TemplateDescriptorEntity> collected = utils.collectTemplateDescriptors(context, null, targetPlatformId, false);
+		Set<TemplateDescriptorEntity> collected = utils.collectTemplateDescriptors(context, null, targetPlatformId);
 		assertEquals(1, collected.size());
 	}
 	
 	@Test
 	public void testCollectTestingTemplateDescriptors(){
 		TemplateDescriptorEntity standardTempl = f.createTemplate("standardTempl", "bla", targetPlatformId);
-		TemplateDescriptorEntity testingTempl = f.createTemplate("testingTempl", "testing", targetPlatformId);
-		testingTempl.setTesting(true);
 		
 		TemplateDescriptorEntity otherPlatformStandardTempl = f.createTemplate("standardTempl", "bla", targetPlatformId+1);
-		TemplateDescriptorEntity otherPlatformTestingTempl = f.createTemplate("testingTempl", "testing", targetPlatformId+1);
-		otherPlatformTestingTempl.setTesting(true);
 		
 		context.addTemplate(standardTempl);
-		context.addTemplate(testingTempl);
-		context.addTemplate(otherPlatformTestingTempl);
 		context.addTemplate(otherPlatformStandardTempl);
-		
-		Set<TemplateDescriptorEntity> collectedTesting = utils.collectTemplateDescriptors(context, null, targetPlatformId, true);
-		Set<TemplateDescriptorEntity> collectedStandard = utils.collectTemplateDescriptors(context, null, targetPlatformId, false);
+
+		Set<TemplateDescriptorEntity> collectedStandard = utils.collectTemplateDescriptors(context, null, targetPlatformId);
 		
 		//Ensure, only the templates of the given runtime are included and they are separated properly depending on their testing-mode.
-		assertEquals(1, collectedTesting.size());
 		assertEquals(1, collectedStandard.size());
-		
-		assertEquals(testingTempl, collectedTesting.iterator().next());
+
 		assertEquals(standardTempl, collectedStandard.iterator().next());
 	}
 	
@@ -164,7 +155,7 @@ public void testGetTemplatesForResource() {
 		resource.setContexts(new HashSet<ResourceContextEntity>());
 		resource.getContexts().add(resourceContext);
 
-		Set<TemplateDescriptorEntity> templates = utils.getTemplates(resource, context, null, targetPlatformId, false);
+		Set<TemplateDescriptorEntity> templates = utils.getTemplates(resource, context, null, targetPlatformId);
 		assertEquals(1, templates.size());
 	}
 
@@ -182,7 +173,7 @@ public void testGetTemplatesForRelation() {
 		resourceRelation.getContexts().add(relationContext);
 
 		Set<TemplateDescriptorEntity> templates = utils.getTemplates(context, resourceRelation, null,
-				targetPlatformId, false);
+				targetPlatformId);
 		assertEquals(1, templates.size());
 
 	}
diff --git a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/generator/control/GeneratorDomainServiceWithAppServerRelationsTest.java b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/generator/control/GeneratorDomainServiceWithAppServerRelationsTest.java
index 9b61087d2..580989a0c 100644
--- a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/generator/control/GeneratorDomainServiceWithAppServerRelationsTest.java
+++ b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/generator/control/GeneratorDomainServiceWithAppServerRelationsTest.java
@@ -35,7 +35,7 @@
 import org.mockito.MockitoAnnotations;
 
 import static org.mockito.ArgumentMatchers.isNull;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 
 public class GeneratorDomainServiceWithAppServerRelationsTest {
 
diff --git a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/generator/control/ShakedownTestGeneratorDomainServiceTest.java b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/generator/control/ShakedownTestGeneratorDomainServiceTest.java
deleted file mode 100644
index caade2dfa..000000000
--- a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/generator/control/ShakedownTestGeneratorDomainServiceTest.java
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
- * AMW - Automated Middleware allows you to manage the configurations of
- * your Java EE applications on an unlimited number of different environments
- * with various versions, including the automated deployment of those apps.
- * Copyright (C) 2013-2016 by Puzzle ITC
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package ch.puzzle.itc.mobiliar.business.generator.control;
-
-import ch.puzzle.itc.mobiliar.builders.ShakedownTestEntityBuilder;
-import ch.puzzle.itc.mobiliar.business.deploy.entity.DeploymentEntity;
-import ch.puzzle.itc.mobiliar.business.foreignable.entity.ForeignableOwner;
-import ch.puzzle.itc.mobiliar.business.generator.control.extracted.GenerationContext;
-import ch.puzzle.itc.mobiliar.business.generator.control.extracted.ResourceDependencyResolverService;
-import ch.puzzle.itc.mobiliar.business.globalfunction.control.GlobalFunctionService;
-import ch.puzzle.itc.mobiliar.business.globalfunction.entity.GlobalFunctionEntity;
-import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.ResourceTypeEntity;
-import ch.puzzle.itc.mobiliar.business.resourcerelation.entity.ConsumedResourceRelationEntity;
-import ch.puzzle.itc.mobiliar.business.shakedown.control.ShakedownTestExecutionResultHandlerService;
-import ch.puzzle.itc.mobiliar.business.shakedown.control.ShakedownTestGenerationResult;
-import ch.puzzle.itc.mobiliar.business.environment.entity.ContextEntity;
-import ch.puzzle.itc.mobiliar.business.releasing.entity.ReleaseEntity;
-import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.ResourceFactory;
-import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.ResourceEntity;
-import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.ResourceGroupEntity;
-import ch.puzzle.itc.mobiliar.business.shakedown.entity.ShakedownTestEntity;
-import ch.puzzle.itc.mobiliar.common.exception.GeneratorException;
-import ch.puzzle.itc.mobiliar.common.exception.GeneratorException.MISSING;
-import ch.puzzle.itc.mobiliar.common.util.DefaultResourceTypeDefinition;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-import javax.persistence.EntityManager;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.logging.Logger;
-
-import static org.junit.Assert.*;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.same;
-import static org.mockito.Mockito.*;
-
-public class ShakedownTestGeneratorDomainServiceTest {
-
-	@Mock
-	Logger log;
-
-	@Mock
-	GeneratorDomainServiceWithAppServerRelations generatorDomainService;
-	@Mock
-	GlobalFunctionService globalFunctionService;
-
-	@Mock
-	private ShakedownTestExecutionResultHandlerService shakedownTestExecutionResultHandlerService;
-
-	@Mock
-	EntityManager entityManager;
-
-	@InjectMocks
-	ShakedownTestGeneratorDomainService service;
-	
-	@Mock
-	ResourceDependencyResolverService resourceDependencyResolver;
-
-	ContextEntity contextEntity;
-	ResourceEntity applicationServer;
-	DeploymentEntity dep;
-	Date stateDate = new Date();
-
-
-	@Before
-	public void setUp() {
-		MockitoAnnotations.openMocks(this);
-
-		contextEntity = new ContextEntity();
-		contextEntity.setName("testContext");
-		contextEntity.setId(Integer.valueOf(2));
-
-		ResourceTypeEntity nodeType = new ResourceTypeEntity();
-		nodeType.setId(1);
-		nodeType.setName(DefaultResourceTypeDefinition.NODE.name());
-
-	    ResourceTypeEntity asType = new ResourceTypeEntity();
-	    asType.setId(2);
-	    asType.setName(DefaultResourceTypeDefinition.APPLICATIONSERVER.name());
-
-
-		ResourceEntity node = ResourceFactory.createNewResource("node1");
-		node.setResourceType(nodeType);
-		node.setId(1);
-
-		ReleaseEntity release = new ReleaseEntity();
-		release.setName("rel-1.0");
-		release.setInstallationInProductionAt(new Date());
-
-		applicationServer = ResourceFactory.createNewResource("testAppserver");
-	    applicationServer.setResourceType(asType);
-		applicationServer.setId(5);
-		applicationServer.setRelease(release);
-		applicationServer.getResourceGroup().setId(2);
-		ConsumedResourceRelationEntity relation = applicationServer.addConsumedResourceRelation(node, null, null, ForeignableOwner.AMW);
-		relation.setId(11);
-
-		dep = mock(DeploymentEntity.class);
-		when(dep.getDeploymentStateDate()).thenReturn(stateDate);
-		
-		when(globalFunctionService.getAllGlobalFunctionsAtDate(stateDate)).thenReturn(new ArrayList<GlobalFunctionEntity>());
-	}
-
-	@Test
-	public void test_generateConfigurationForShakedownTest_missingContext() {
-		// given
-		ShakedownTestEntity test = ShakedownTestEntityBuilder.mockShakedownTestEntity(contextEntity, applicationServer, dep, 123, applicationServer.getResourceGroup());
-		when(test.getId()).thenReturn(123);
-		when(test.getResourceGroup()).thenReturn(applicationServer.getResourceGroup());
-		when(entityManager.find(ResourceEntity.class, applicationServer.getId())).thenReturn(applicationServer);
-
-		// when
-		service.generateConfigurationForShakedownTest(test);
-
-		// then
-		verify(shakedownTestExecutionResultHandlerService, times(1)).handleUnsuccessfulShakedownTest(any(GeneratorException.class), anyInt());
-	}
-
-	@Test
-	public void test_generateConfigurationForShakedownTest_ioException() {
-		// given
-		ShakedownTestEntity test = ShakedownTestEntityBuilder.mockShakedownTestEntity(contextEntity, applicationServer, dep, null, applicationServer.getResourceGroup());
-
-		when(entityManager.find(same(ResourceEntity.class), anyInt())).thenReturn(applicationServer);
-		when(entityManager.find(same(ContextEntity.class), anyInt())).thenReturn(contextEntity);
-		when(entityManager.find(same(ResourceGroupEntity.class), anyInt())).thenReturn(applicationServer.getResourceGroup());
-
-		when(generatorDomainService.getAllEnvironments(contextEntity)).thenReturn(Collections.singletonList(contextEntity));
-		when(resourceDependencyResolver.getResourceEntityForRelease(applicationServer.getResourceGroup(), applicationServer.getRelease())).thenReturn(applicationServer);
-		
-		IOException exception = new IOException("foo");
-
-		try {
-			when(generatorDomainService.generateApplicationServerConfigPerNode(any(GenerationContext.class))).thenThrow(exception);
-		} catch (GeneratorException e) {
-			// TODO Auto-generated catch block
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-		}
-
-		// when
-		ShakedownTestGenerationResult result = service.generateConfigurationForShakedownTest(test);
-
-		// then
-		assertNull(result);
-		verify(shakedownTestExecutionResultHandlerService, times(1)).handleUnsuccessfulShakedownTest(exception, test.getId());
-		verify(shakedownTestExecutionResultHandlerService, times(0)).handleSuccessfulShakedownTest(test);
-	}
-
-	@Test
-	public void test_generateConfigurationForShakedownTest_generatorException() throws GeneratorException, IOException {
-		// given
-		DeploymentEntity dep = mock(DeploymentEntity.class);
-		Date stateDate = new Date();
-		when(dep.getDeploymentStateDate()).thenReturn(stateDate);
-		ShakedownTestEntity test = ShakedownTestEntityBuilder.mockShakedownTestEntity(contextEntity, applicationServer, dep, null, applicationServer.getResourceGroup());
-
-		when(entityManager.find(ResourceEntity.class, applicationServer.getId())).thenReturn(applicationServer);
-		when(entityManager.find(same(ContextEntity.class), anyInt())).thenReturn(contextEntity);
-		when(entityManager.find(same(ResourceGroupEntity.class), anyInt())).thenReturn(applicationServer.getResourceGroup());
-
-		when(generatorDomainService.getAllEnvironments(contextEntity)).thenReturn(Collections.singletonList(contextEntity));
-		when(resourceDependencyResolver.getResourceEntityForRelease(applicationServer.getResourceGroup(), applicationServer.getRelease())).thenReturn(applicationServer);
-		GeneratorException exception = new GeneratorException("foo", MISSING.STS_TEMPLATE);
-
-
-		when(generatorDomainService.generateApplicationServerConfigPerNode(any(GenerationContext.class)))
-						.thenThrow(exception);
-
-		// when
-		ShakedownTestGenerationResult result = service.generateConfigurationForShakedownTest(test);
-
-		// then
-		assertNull(result);
-		verify(shakedownTestExecutionResultHandlerService, times(1)).handleUnsuccessfulShakedownTest(exception, test.getId());
-		verify(shakedownTestExecutionResultHandlerService, times(0)).handleSuccessfulShakedownTest(test);
-	}
-
-	@Test
-	public void test_generateConfigurationForShakedownTest_faultyGenerationResult() throws GeneratorException, IOException {
-		// given
-		DeploymentEntity dep = mock(DeploymentEntity.class);
-		Date stateDate = new Date();
-		when(dep.getDeploymentStateDate()).thenReturn(stateDate);
-		ShakedownTestEntity test = ShakedownTestEntityBuilder.mockShakedownTestEntity(contextEntity, applicationServer, dep, null, applicationServer.getResourceGroup());
-
-		when(entityManager.find(same(ResourceEntity.class), anyInt())).thenReturn(applicationServer);
-		when(entityManager.find(same(ContextEntity.class), anyInt())).thenReturn(contextEntity);
-		when(entityManager.find(same(ResourceGroupEntity.class), anyInt())).thenReturn(applicationServer.getResourceGroup());
-		when(generatorDomainService.getAllEnvironments(contextEntity)).thenReturn(Collections.singletonList(contextEntity));
-		when(resourceDependencyResolver.getResourceEntityForRelease(applicationServer.getResourceGroup(), applicationServer.getRelease())).thenReturn(applicationServer);
-		
-		NodeGenerationResult nodeResult = mock(NodeGenerationResult.class);
-		when(nodeResult.hasErrors()).thenReturn(true);
-		when(nodeResult.isNodeEnabled()).thenReturn(true);
-		when(nodeResult.getErrorMessage()).thenReturn("foo");
-		String content = "<sts><remoteHost>romai.rz.puzzle.ch</remoteHost><user>cweber</user><remoteSTPPath>/tmp/stm/stps</remoteSTPPath><testId>1900</testId><shakedowntests><shakedowntest>AMW_stp_dummy AMW_stp_dummy-0.0.1-SNAPSHOT.jar true</shakedowntest></shakedowntests></sts>";
-		GeneratedTemplate template = new GeneratedTemplate("STS", "", content);
-		when(nodeResult.getGeneratedTemplates()).thenReturn(Collections.singletonList(template));
-
-		when(generatorDomainService.generateApplicationServerConfigPerNode(any(GenerationContext.class))).thenReturn(nodeResult);
-
-		// when
-		ShakedownTestGenerationResult result = service.generateConfigurationForShakedownTest(test);
-
-		// then
-		assertNotNull(result);
-		assertTrue(result.hasErrors());
-		verify(shakedownTestExecutionResultHandlerService, times(1)).handleUnsuccessfulShakedownTest(nodeResult.getErrorMessage(), test.getId());
-		verify(shakedownTestExecutionResultHandlerService, times(0)).handleSuccessfulShakedownTest(test);
-	}
-
-}
diff --git a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/generator/control/factory/GenerationUnitFactoryAmwTest.java b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/generator/control/factory/GenerationUnitFactoryAmwTest.java
index 629ef23c3..816945ec6 100644
--- a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/generator/control/factory/GenerationUnitFactoryAmwTest.java
+++ b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/generator/control/factory/GenerationUnitFactoryAmwTest.java
@@ -31,8 +31,8 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
@@ -157,8 +157,8 @@ public void testPropertyIdentifierWhenRelationExistsTwice() throws TemplateModel
 	@Test
 	@SuppressWarnings("unchecked")
 	public void testTemplateLoading() {
-		verify(utils, times(13)).getTemplates(any(ResourceEntity.class), any(ContextEntity.class), any(Set.class), eq(builder.platform.getId()), eq(false));
-		verify(utils, times(12)).getTemplates(any(ContextEntity.class), any(AbstractResourceRelationEntity.class), any(Set.class), eq(builder.platform.getId()), eq(false));
+		verify(utils, times(13)).getTemplates(any(ResourceEntity.class), any(ContextEntity.class), any(Set.class), eq(builder.platform.getId()));
+		verify(utils, times(12)).getTemplates(any(ContextEntity.class), any(AbstractResourceRelationEntity.class), any(Set.class), eq(builder.platform.getId()));
 	}
 
 }
diff --git a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/property/boundary/PropertyEditorTest.java b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/property/boundary/PropertyEditorTest.java
index 03c9c4dab..81453833f 100644
--- a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/property/boundary/PropertyEditorTest.java
+++ b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/property/boundary/PropertyEditorTest.java
@@ -900,57 +900,6 @@ public void savePropertyDescriptorForResourceShouldVerifyIfEditableByOwner() thr
 
     }
 
-
-    @Test
-    public void saveTestingPropertyDescriptorForResourceShouldSaveAsSystemOwner() throws ForeignableOwnerViolationException, AMWException {
-        // given
-        Integer resourceId = 1;
-        PropertyDescriptorEntity descriptor = new PropertyDescriptorEntityBuilder().withId(2).build();
-        String propertyTagsString = "propertyTagsString";
-
-        ResourceEntity resourceEntityMock = mock(ResourceEntity.class);
-        ResourceTypeEntity resourceTypeEntityMock = mock(ResourceTypeEntity.class);
-        ResourceContextEntity resourceContextEntityMock = mock(ResourceContextEntity.class);
-
-        when(entityManagerMock.find(ResourceEntity.class, resourceId)).thenReturn(resourceEntityMock);
-        when(resourceEntityMock.getOrCreateContext(ArgumentMatchers.<ContextEntity>any())).thenReturn(resourceContextEntityMock);
-        when(resourceEntityMock.getResourceType()).thenReturn(resourceTypeEntityMock);
-        List<PropertyTagEntity> propertyTags = new ArrayList<>();
-        propertyTags.add(new PropertyTagEntity());
-        when(propertyTagEditingServiceMock.convertToTags(propertyTagsString)).thenReturn(propertyTags);
-
-        // when
-        editor.saveTestingPropertyDescriptorForResource(resourceId, descriptor, descriptor.foreignableFieldHashCode(), propertyTagsString);
-
-        // then
-        verify(propertyDescriptorServiceMock).savePropertyDescriptorForOwner(ForeignableOwner.getSystemOwner(), resourceContextEntityMock, descriptor, propertyTags, resourceEntityMock);
-    }
-
-
-    @Test
-    public void saveTestingPropertyDescriptorForResourceShouldVerifyIfEditableBySystemOwner() throws ForeignableOwnerViolationException, AMWException {
-        // given
-        Integer resourceId = 1;
-        PropertyDescriptorEntity descriptor = new PropertyDescriptorEntityBuilder().withId(2).build();
-        String propertyTagsString = "propertyTagsString";
-
-        ResourceEntity resourceEntityMock = mock(ResourceEntity.class);
-        ResourceTypeEntity resourceTypeEntityMock = mock(ResourceTypeEntity.class);
-
-        when(entityManagerMock.find(ResourceEntity.class, resourceId)).thenReturn(resourceEntityMock);
-        when(resourceEntityMock.getResourceType()).thenReturn(resourceTypeEntityMock);
-        List<PropertyTagEntity> propertyTags = new ArrayList<>();
-        propertyTags.add(new PropertyTagEntity());
-        when(propertyTagEditingServiceMock.convertToTags(propertyTagsString)).thenReturn(propertyTags);
-
-        // when
-        editor.saveTestingPropertyDescriptorForResource(resourceId, descriptor, descriptor.foreignableFieldHashCode(), propertyTagsString);
-
-        // then
-        verify(foreignableServiceMock).verifyEditableByOwner(ForeignableOwner.getSystemOwner(), descriptor.foreignableFieldHashCode(), descriptor);
-    }
-
-
     @Test
     public void savePropertyDescriptorForResourceTypeShouldSaveWithOwner() throws ForeignableOwnerViolationException, AMWException {
         // given
@@ -999,53 +948,6 @@ public void savePropertyDescriptorForResourceTypeShouldVerifyIfEditableByOwner()
         verify(foreignableServiceMock).verifyEditableByOwner(changingOwner, descriptor.foreignableFieldHashCode(), descriptor);
     }
 
-
-    @Test
-    public void saveTestingPropertyDescriptorForResourceTypeShouldSaveAsSystemOwner() throws ForeignableOwnerViolationException, AMWException {
-        // given
-        Integer resourceTypeId = 1;
-        PropertyDescriptorEntity descriptor = new PropertyDescriptorEntityBuilder().withId(2).build();
-        String propertyTagsString = "propertyTagsString";
-
-        ResourceTypeEntity resourceTypeEntityMock = mock(ResourceTypeEntity.class);
-        ResourceTypeContextEntity resourceTypeContextEntityMock = mock(ResourceTypeContextEntity.class);
-
-        when(entityManagerMock.find(ResourceTypeEntity.class, resourceTypeId)).thenReturn(resourceTypeEntityMock);
-        when(resourceTypeEntityMock.getOrCreateContext(ArgumentMatchers.<ContextEntity>any())).thenReturn(resourceTypeContextEntityMock);
-
-        List<PropertyTagEntity> propertyTags = new ArrayList<>();
-        propertyTags.add(new PropertyTagEntity());
-        when(propertyTagEditingServiceMock.convertToTags(propertyTagsString)).thenReturn(propertyTags);
-
-        // when
-        editor.saveTestingPropertyDescriptorForResourceType(resourceTypeId, descriptor, descriptor.foreignableFieldHashCode(), propertyTagsString);
-
-        // then
-        verify(propertyDescriptorServiceMock).savePropertyDescriptorForOwner(ForeignableOwner.getSystemOwner(), resourceTypeContextEntityMock, descriptor, propertyTags, resourceTypeEntityMock);
-    }
-
-    @Test
-    public void saveTestingPropertyDescriptorForResourceTypeShouldVerifyIfEditableBySystemOwner() throws ForeignableOwnerViolationException, AMWException {
-        // given
-        Integer resourceTypeId = 1;
-        PropertyDescriptorEntity descriptor = new PropertyDescriptorEntityBuilder().withId(2).build();
-        String propertyTagsString = "propertyTagsString";
-
-        ResourceTypeEntity resourceTypeEntityMock = mock(ResourceTypeEntity.class);
-
-        when(entityManagerMock.find(ResourceTypeEntity.class, resourceTypeId)).thenReturn(resourceTypeEntityMock);
-
-        List<PropertyTagEntity> propertyTags = new ArrayList<>();
-        propertyTags.add(new PropertyTagEntity());
-        when(propertyTagEditingServiceMock.convertToTags(propertyTagsString)).thenReturn(propertyTags);
-
-        // when
-        editor.saveTestingPropertyDescriptorForResourceType(resourceTypeId, descriptor, descriptor.foreignableFieldHashCode(), propertyTagsString);
-
-        // then
-        verify(foreignableServiceMock).verifyEditableByOwner(ForeignableOwner.getSystemOwner(), descriptor.foreignableFieldHashCode(), descriptor);
-    }
-
     @Test
     public void deletePropertyDescriptorForResourceShouldVerifyIfDeletableByOwner() throws ForeignableOwnerViolationException, AMWException {
         // given
diff --git a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/property/entity/PropertyDescriptorEntityTest.java b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/property/entity/PropertyDescriptorEntityTest.java
index f3927c249..2228bfaa9 100644
--- a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/property/entity/PropertyDescriptorEntityTest.java
+++ b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/property/entity/PropertyDescriptorEntityTest.java
@@ -365,19 +365,6 @@ public void foreignableFieldHashCodeWithChangedNullableShouldBeDifferent(){
         assertNotEquals(otherHashCode, foreignableFieldHashCode);
     }
 
-    @Test
-    public void foreignableFieldHashCodeWithChangedTestingShouldBeDifferent(){
-        // given
-        propertyDescriptorEntity = new PropertyDescriptorEntityBuilder().build();
-        int otherHashCode = new PropertyDescriptorEntityBuilder().isTesting(true).build().foreignableFieldHashCode();
-
-        // when
-        int foreignableFieldHashCode = propertyDescriptorEntity.foreignableFieldHashCode();
-
-        // then
-        assertNotEquals(otherHashCode, foreignableFieldHashCode);
-    }
-
     @Test
     public void foreignableFieldHashCodeWithChangedValidationLogicShouldBeDifferent(){
         // given
@@ -518,7 +505,6 @@ private void assertPropDescCopy(PropertyDescriptorEntity copy, PropertyDescripto
         assertEquals(origin.isEncrypt(), copy.isEncrypt());
         assertEquals(origin.getPropertyName(), copy.getPropertyName());
         assertEquals(origin.isNullable(), copy.isNullable());
-        assertEquals(origin.isTesting(), copy.isTesting());
         assertEquals(origin.getValidationLogic(), copy.getValidationLogic());
         assertEquals(origin.getPropertyComment(), copy.getPropertyComment());
         assertEquals(origin.getCardinalityProperty(), copy.getCardinalityProperty());
diff --git a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/property/entity/PropertyEntityTest.java b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/property/entity/PropertyEntityTest.java
index 8a24536d2..82223282d 100644
--- a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/property/entity/PropertyEntityTest.java
+++ b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/property/entity/PropertyEntityTest.java
@@ -148,7 +148,7 @@ public void copyPropertyEntity_targetNull(CopyUnit copyUnit) {
 		// given
 		PropertyTypeEntity origType = propDescBuilder.buildPropertyTypeEntity("type1");
 		PropertyDescriptorEntity origDesc = propDescBuilder.buildPropertyDescriptorEntity(null, "foo",
-				"bar", false, false, false, false, origType, "defaultVal", "exampleVal", "MIK", true,
+				"bar", false, false, false, origType, "defaultVal", "exampleVal", "MIK", true,
 				"displayName");
 		PropertyEntity origin = propBuilder.buildPropertyEntity("foo", origDesc);
 
@@ -166,13 +166,13 @@ public void copyPropertyEntity(CopyUnit copyUnit) {
 		// given
 		PropertyTypeEntity origType = propDescBuilder.mockPropertyTypeEntity("type1");
 		PropertyDescriptorEntity origDesc = propDescBuilder.buildPropertyDescriptorEntity(null, "foo",
-				"bar", false, false, false, false, origType, "defaultVal", "exampleVal", "MIK", true,
+				"bar", false, false, false, origType, "defaultVal", "exampleVal", "MIK", true,
 				"displayName");
 		PropertyEntity origin = propBuilder.buildPropertyEntity("foo", origDesc);
 
 		PropertyTypeEntity targetType = propDescBuilder.mockPropertyTypeEntity("type2");
 		PropertyDescriptorEntity targetDesc = propDescBuilder.buildPropertyDescriptorEntity(null, "foo",
-				"boo", true, true, true, true, targetType, "defaultVal", "exampleVal", "MIK", true,
+				"boo", true, true, true,  targetType, "defaultVal", "exampleVal", "MIK", true,
 				"displayName");
 
 		PropertyEntity target = propBuilder.buildPropertyEntity("foo", targetDesc);
diff --git a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/property/entity/ResourceEditPropertyTest.java b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/property/entity/ResourceEditPropertyTest.java
index 20d86aad5..30d2b992f 100644
--- a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/property/entity/ResourceEditPropertyTest.java
+++ b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/property/entity/ResourceEditPropertyTest.java
@@ -143,18 +143,6 @@ public void constructorIsEncryptedArgumentShouldSetIsEncrypted(){
         assertEquals(isEncrypted, resourceEditProperty.isEncrypted());
     }
 
-    @Test
-    public void constructorIsTestingArgumentShouldSetIsTesting(){
-        // given
-        boolean isTesting = true;
-
-        // when
-        resourceEditProperty = new ResourceEditPropertyBuilder().withIsTesting(isTesting).build();
-
-        // then
-        assertEquals(isTesting, resourceEditProperty.isTesting());
-    }
-
     @Test
     public void constructorValidationLogicArgumentShouldSetValidationLogic(){
         // given
diff --git a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/resourcegroup/boundary/ResourceBoundaryPersistenceTest.java b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/resourcegroup/boundary/ResourceBoundaryPersistenceTest.java
index 5da559c5d..3b6c4770f 100644
--- a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/resourcegroup/boundary/ResourceBoundaryPersistenceTest.java
+++ b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/resourcegroup/boundary/ResourceBoundaryPersistenceTest.java
@@ -60,7 +60,7 @@
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
diff --git a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/resourcegroup/boundary/ResourceRelationsIntegrationTest.java b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/resourcegroup/boundary/ResourceRelationsIntegrationTest.java
deleted file mode 100644
index 96e12a31e..000000000
--- a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/resourcegroup/boundary/ResourceRelationsIntegrationTest.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * AMW - Automated Middleware allows you to manage the configurations of
- * your Java EE applications on an unlimited number of different environments
- * with various versions, including the automated deployment of those apps.
- * Copyright (C) 2013-2016 by Puzzle ITC
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package ch.puzzle.itc.mobiliar.business.resourcegroup.boundary;
-
-import ch.puzzle.itc.mobiliar.business.domain.applist.ApplistScreenDomainService;
-import ch.puzzle.itc.mobiliar.business.foreignable.entity.ForeignableOwner;
-import ch.puzzle.itc.mobiliar.business.generator.control.extracted.ResourceDependencyResolverService;
-import ch.puzzle.itc.mobiliar.business.releasing.entity.ReleaseEntity;
-import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.*;
-import ch.puzzle.itc.mobiliar.business.resourcerelation.entity.ResourceRelationTypeEntity;
-import ch.puzzle.itc.mobiliar.business.security.control.PermissionService;
-import ch.puzzle.itc.mobiliar.business.usersettings.control.UserSettingsService;
-import ch.puzzle.itc.mobiliar.business.usersettings.entity.UserSettingsEntity;
-import ch.puzzle.itc.mobiliar.common.util.DefaultResourceTypeDefinition;
-import ch.puzzle.itc.mobiliar.test.testrunner.PersistenceTestRunner;
-import org.apache.commons.lang3.time.DateUtils;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.MockitoAnnotations;
-
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import java.util.Arrays;
-import java.util.Date;
-
-@RunWith(PersistenceTestRunner.class)
-public class ResourceRelationsIntegrationTest {
-
-	@PersistenceContext
-	private EntityManager entityManager;
-
-	@InjectMocks
-	ResourceRelations service;
-
-     @Mock
-    	UserSettingsService userSettingsService;
-    	@Mock
-    	PermissionService permissionService;
-
-    	@Mock
-    	ApplistScreenDomainService applistScreenDomainService;
-
-    	@Mock
-    	UserSettingsEntity userSettingsEntity;
-
-    @InjectMocks
-    ResourceDependencyResolverService dependencyResolver;
-
-    ReleaseEntity release1;
-    ReleaseEntity release2;
-    ResourceTypeEntity astype;
-    ResourceTypeEntity apptype;
-    ResourceEntity asRel1;
-    ResourceEntity asRel2;
-    ResourceEntity appRel1;
-    ResourceEntity appRel2;
-
-    	@Before
-    	public void before() {
-	   MockitoAnnotations.openMocks(this);
-	   release1 = new ReleaseEntity();
-	   release1.setName("Release 1");
-	   release1.setInstallationInProductionAt(DateUtils.addDays(new Date(), -1));
-	   release2 = new ReleaseEntity();
-	   release2.setName("Release 2");
-	   release2.setInstallationInProductionAt(new Date());
-	   entityManager.persist(release1);
-	   entityManager.persist(release2);
-
-	    astype = new ResourceTypeEntity();
-	    astype.setName(DefaultResourceTypeDefinition.APPLICATIONSERVER.name());
-	    apptype = new ResourceTypeEntity();
-	    apptype.setName(DefaultResourceTypeDefinition.APPLICATION.name());
-	    entityManager.persist(astype);
-	    entityManager.persist(apptype);
-
-	    asRel1 = ResourceFactory.createNewResource("as");
-	    asRel1.setRelease(release1);
-	    asRel2 = ResourceFactory.createNewResource(asRel1.getResourceGroup());
-	    asRel2.setRelease(release2);
-	    entityManager.persist(asRel1);
-	    entityManager.persist(asRel2);
-
-	    appRel1 = ResourceFactory.createNewResource("app");
-	    appRel1.setRelease(release1);
-	    appRel2 = ResourceFactory.createNewResource(appRel1.getResourceGroup());
-	    appRel2.setRelease(release2);
-	    entityManager.persist(appRel1);
-	    entityManager.persist(appRel2);
-
-	    ResourceRelationTypeEntity resRelType = new ResourceRelationTypeEntity();
-	    resRelType.setResourceTypes(astype, apptype);
-	    entityManager.persist(resRelType);
-
-	    entityManager.persist(asRel1.addConsumedResourceRelation(appRel1, resRelType, null, ForeignableOwner.AMW));
-	    entityManager.persist(asRel1.addConsumedResourceRelation(appRel2, resRelType, null, ForeignableOwner.AMW));
-	    entityManager.persist(asRel2.addConsumedResourceRelation(appRel1, resRelType, null, ForeignableOwner.AMW));
-	    entityManager.persist(asRel2.addConsumedResourceRelation(appRel2, resRelType, null, ForeignableOwner.AMW));
-	     Mockito.when(applistScreenDomainService.getAppServerResourcesWithApplications(Mockito.anyString(),
-				Mockito.anyInt(), Mockito.anyList(), Mockito.anyBoolean())).thenReturn(
-			    Arrays.asList(asRel1,asRel2));
-	    service.dependencyResolverService = dependencyResolver;
-	}
-
-	@Test
-	public void testGetAppServersWithApplications() {
-	    Mockito.when(userSettingsEntity.isMyAmwEnabled()).thenReturn(false);
-	    service.getAppServersWithApplications("app", null, release1);
-	}
-
-}
diff --git a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/resourcegroup/boundary/ResourceRelationsTest.java b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/resourcegroup/boundary/ResourceRelationsTest.java
index 54b3a38f5..c27d457a5 100644
--- a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/resourcegroup/boundary/ResourceRelationsTest.java
+++ b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/resourcegroup/boundary/ResourceRelationsTest.java
@@ -30,6 +30,7 @@
 import ch.puzzle.itc.mobiliar.business.usersettings.control.UserSettingsService;
 import ch.puzzle.itc.mobiliar.business.usersettings.entity.UserSettingsEntity;
 import ch.puzzle.itc.mobiliar.common.util.DefaultResourceTypeDefinition;
+import ch.puzzle.itc.mobiliar.common.util.Tuple;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -83,13 +84,12 @@ public void before() {
     @Test
     public void testGetAppServersWithApplications() throws Exception {
         UserSettingsEntity userSettings = Mockito.mock(UserSettingsEntity.class);
-        Mockito.when(userSettings.isMyAmwEnabled()).thenReturn(false);
         Mockito.when(userSettingsService.getUserSettings(Mockito.anyString())).thenReturn(userSettings);
         List<ResourceEntity> aslist = Arrays.asList(as);
         Mockito.when(applistScreenDomainService.getAppServerResourcesWithApplications(Mockito.isNull(),
-                Mockito.isNull(), Mockito.isNull(), Mockito.anyBoolean())).thenReturn(aslist);
-        service.getAppServersWithApplications(null, null, release);
-        Mockito.verify(service).filterAppServersByRelease(release, aslist, null);
+                Mockito.isNull(), Mockito.isNull(), Mockito.anyBoolean())).thenReturn(new Tuple<>(aslist,0L));
+        service.getAppServersWithApplications(null, null, null, release);
+        Mockito.verify(service).filterAppServersByRelease(release, aslist);
     }
 
     @Test
@@ -105,12 +105,10 @@ public Void answer(InvocationOnMock invocation) {
                 return null;
             }
         }).when(service).filterApplicationsByRelease(Mockito.any(ReleaseEntity.class),
-                  Mockito.any(ResourceEntity.class), Mockito.any(ResourceWithRelations.class),
-                  Mockito.any(List.class));
+                  Mockito.any(ResourceEntity.class), Mockito.any(ResourceWithRelations.class));
 
         //when
-        List<ResourceWithRelations> resources = service.filterAppServersByRelease(release, applicationServers,
-                  null);
+        List<ResourceWithRelations> resources = service.filterAppServersByRelease(release, applicationServers);
 
         //then
         Assert.assertEquals(1, resources.size());
@@ -119,32 +117,15 @@ public Void answer(InvocationOnMock invocation) {
     }
 
     @Test
-    public void testFilterApplicationsByReleaseNoMyAmw() throws Exception {
-        ResourceWithRelations resourceWithRelations = doTestFilterApplicationsByRelease(5, null);
+    public void testFilterApplicationsByRelease() throws Exception {
+        ResourceWithRelations resourceWithRelations = doTestFilterApplicationsByRelease(5);
 
         //then
         Assert.assertEquals(1, resourceWithRelations.getRelatedResources().size());
         Assert.assertEquals(resourceWithRelations.getRelatedResources().get(0), app);
     }
 
-    @Test
-    public void testFilterApplicationsByReleaseWithMyAMWFilterOK() throws Exception {
-        ResourceWithRelations resourceWithRelations = doTestFilterApplicationsByRelease(5, Arrays.asList(5));
-
-        //then
-        Assert.assertEquals(1, resourceWithRelations.getRelatedResources().size());
-        Assert.assertEquals(resourceWithRelations.getRelatedResources().get(0), app);
-    }
-
-    @Test
-    public void testFilterApplicationsByReleaseWithMyAMWFilterNOK() throws Exception {
-        ResourceWithRelations resourceWithRelations = doTestFilterApplicationsByRelease(5, Arrays.asList(6));
-
-        //then
-        Assert.assertTrue(resourceWithRelations.getRelatedResources().isEmpty());
-    }
-
-    private ResourceWithRelations doTestFilterApplicationsByRelease(int appId, List<Integer> myAmw)
+    private ResourceWithRelations doTestFilterApplicationsByRelease(int appId)
               throws Exception {
         //given
         Mockito.when(as.getConsumedRelatedResourcesByResourceType(Mockito.any(
@@ -158,7 +139,7 @@ private ResourceWithRelations doTestFilterApplicationsByRelease(int appId, List<
         Mockito.when(appGrp.getId()).thenReturn(appId);
 
         //when
-        service.filterApplicationsByRelease(release, as, resourceWithRelations, myAmw);
+        service.filterApplicationsByRelease(release, as, resourceWithRelations);
         return resourceWithRelations;
     }
-}
\ No newline at end of file
+}
diff --git a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/resourcegroup/control/ResourceGroupPersistenceServiceTest.java b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/resourcegroup/control/ResourceGroupPersistenceServiceTest.java
index 44cb6b20c..d329d2ced 100644
--- a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/resourcegroup/control/ResourceGroupPersistenceServiceTest.java
+++ b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/resourcegroup/control/ResourceGroupPersistenceServiceTest.java
@@ -38,7 +38,6 @@
 
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
-import java.util.ArrayList;
 import java.util.List;
 
 import static org.junit.Assert.*;
@@ -104,36 +103,6 @@ private void init() {
 		entityManager.persist(asContainer);
 	}
 
-
-	@Test
-	public void test_loadGroupsForTypeName_myAmw() {
-		// given
-		init();
-
-		List<Integer> myAmw = new ArrayList<Integer>();
-		myAmw.add(resource1.getId());
-		myAmw.add(resource4.getId());
-
-		// when
-		List<ResourceGroupEntity> result = service.loadGroupsForTypeName(DefaultResourceTypeDefinition.APPLICATIONSERVER.name(), myAmw);
-
-		// then
-		assertNotNull(result);
-		assertEquals(1, result.size());
-		assertEquals(resource1.getId(), result.iterator().next().getId());
-
-		myAmw.add(resource3.getId());
-
-		// when
-		result = service.loadGroupsForTypeName(DefaultResourceTypeDefinition.APPLICATIONSERVER.name(), myAmw);
-
-		// then
-		assertNotNull(result);
-		assertEquals(2, result.size());
-		assertTrue(result.contains(resource1.getResourceGroup()));
-		assertTrue(result.contains(resource4.getResourceGroup()));
-	}
-
 	@Test
 	public void test_loadGroupsForTypeName() {
 		// given
@@ -141,7 +110,7 @@ public void test_loadGroupsForTypeName() {
 
 		// when
 		List<ResourceGroupEntity> result = service.loadGroupsForTypeName(
-				DefaultResourceTypeDefinition.APPLICATIONSERVER.name(), null);
+				DefaultResourceTypeDefinition.APPLICATIONSERVER.name());
 
 		// then
 		assertNotNull(result);
diff --git a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/resourcegroup/control/ResourceGroupRepositoryTest.java b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/resourcegroup/control/ResourceGroupRepositoryTest.java
index 4cf11ec32..b1dbefd44 100644
--- a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/resourcegroup/control/ResourceGroupRepositoryTest.java
+++ b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/resourcegroup/control/ResourceGroupRepositoryTest.java
@@ -24,7 +24,6 @@
 import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.ResourceFactory;
 import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.ResourceGroupEntity;
 import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.ResourceTypeEntity;
-import ch.puzzle.itc.mobiliar.business.usersettings.entity.FavoriteResourceEntity;
 import ch.puzzle.itc.mobiliar.business.usersettings.entity.UserSettingsEntity;
 import ch.puzzle.itc.mobiliar.common.exception.ElementAlreadyExistsException;
 import ch.puzzle.itc.mobiliar.common.exception.ResourceNotFoundException;
@@ -42,8 +41,6 @@
 
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.logging.Logger;
 
@@ -122,14 +119,8 @@ public void test_loadGroupsForType() throws ElementAlreadyExistsException,
         userEntity.setUserName("tester");
         entityManager.persist(userEntity);
 
-        FavoriteResourceEntity fav = new FavoriteResourceEntity();
-        fav.setResourceGroup(resource1.getResourceGroup());
-        fav.setUser(userEntity);
-        entityManager.persist(fav);
-
         // when
-        List<ResourceGroupEntity> result = repository.getGroupsForType(type1.getId(), null, true);
-        List<ResourceGroupEntity> resultFavorites = repository.getGroupsForType(type1.getId(), Collections.singletonList(resource1.getId()), true);
+        List<ResourceGroupEntity> result = repository.getGroupsForType(type1.getId(), true);
 
         // then
         assertNotNull(result);
@@ -139,28 +130,5 @@ public void test_loadGroupsForType() throws ElementAlreadyExistsException,
                 assertEquals(type1.getId(), r.getResourceType().getId());
             }
         }
-
-        assertNotNull(resultFavorites);
-        assertEquals(1, resultFavorites.size());
-    }
-
-    @Test
-    public void test_loadGroupsForType_myAmw() throws ElementAlreadyExistsException, ResourceNotFoundException,
-            ResourceTypeNotFoundException {
-        // given
-        init();
-
-        List<Integer> myAmw = new ArrayList<Integer>();
-        myAmw.add(resource1.getResourceGroup().getId());
-        myAmw.add(resource4.getResourceGroup().getId());
-
-        // when
-        List<ResourceGroupEntity> result = repository.getGroupsForType(type1.getId(), myAmw, true);
-
-        // then
-        assertNotNull(result);
-        assertEquals(2, result.size());
-        assertTrue(result.contains(resource1.getResourceGroup()));
-        assertTrue(result.contains(resource4.getResourceGroup()));
     }
 }
\ No newline at end of file
diff --git a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/security/boundary/PermissionBoundaryTest.java b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/security/boundary/PermissionBoundaryTest.java
index 962d91a85..8d986e253 100644
--- a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/security/boundary/PermissionBoundaryTest.java
+++ b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/security/boundary/PermissionBoundaryTest.java
@@ -56,7 +56,7 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 public class PermissionBoundaryTest {
@@ -305,25 +305,25 @@ public void shouldCreateIfContextAndActionAreNull() throws AMWException {
     @Test
     public void shouldCheckIfCallerHasSimilarRestrictionIfHeWantsToDelegatePermission() throws AMWException {
         // given
-        when(permissionService.hasPermissionToDelegatePermission(Permission.SHAKEDOWNTEST, null, null, null, CREATE)).thenReturn(true);
+        when(permissionService.hasPermissionToDelegatePermission(Permission.DEPLOYMENT, null, null, null, CREATE)).thenReturn(true);
         when(permissionRepository.getUserRestrictionByName("fed")).thenReturn(new UserRestrictionEntity());
         when(permissionRepository.getPermissionByName(anyString())).thenReturn(resourcePermission);
         // when
-        permissionBoundary.createRestriction(null, "fred", "SHAKEDOWNTEST", null, null, null, null, CREATE, true, true);
+        permissionBoundary.createRestriction(null, "fred", "DEPLOYMENT", null, null, null, null, CREATE, true, true);
         // then
-        verify(permissionService).hasPermissionToDelegatePermission(Permission.SHAKEDOWNTEST, null, null, null, CREATE);
+        verify(permissionService).hasPermissionToDelegatePermission(Permission.DEPLOYMENT, null, null, null, CREATE);
         verify(restrictionRepository).create(any(RestrictionEntity.class));
     }
 
     @Test(expected=AMWException.class)
     public void shouldThrowAMWExceptionIfCallerIsNotAllowedToDelegatePermission() throws AMWException {
         // given
-        when(permissionService.hasPermissionToDelegatePermission(Permission.SHAKEDOWNTEST, null, null, null, CREATE)).thenReturn(false);
+        when(permissionService.hasPermissionToDelegatePermission(Permission.DEPLOYMENT, null, null, null, CREATE)).thenReturn(false);
         when(permissionRepository.getUserRestrictionByName("fed")).thenReturn(new UserRestrictionEntity());
         // when
-        permissionBoundary.createRestriction(null, "fred", "SHAKEDOWNTEST", null, null, null, null, CREATE, true, true);
+        permissionBoundary.createRestriction(null, "fred", "DEPLOYMENT", null, null, null, null, CREATE, true, true);
         // then
-        verify(permissionService).hasPermissionToDelegatePermission(Permission.SHAKEDOWNTEST, null, null, null, CREATE);
+        verify(permissionService).hasPermissionToDelegatePermission(Permission.DEPLOYMENT, null, null, null, CREATE);
         verify(restrictionRepository, never()).create(any(RestrictionEntity.class));
     }
 
@@ -663,10 +663,9 @@ public void shouldInvokePermissionServiceMethodsWithCorrectParametersForResource
         when(contextLocator.getContextById(23)).thenReturn(context);
         when(permissionService.hasPermission(Permission.RESOURCETYPE, context, UPDATE, null, type)).thenReturn(true);
         // when
-        permissionBoundary.hasPermissionToEditPropertiesByResourceTypeAndContext(21, 23, false);
+        permissionBoundary.hasPermissionToEditPropertiesByResourceTypeAndContext(21, 23);
         // then
         verify(permissionService).hasPermission(Permission.RESOURCETYPE, context, UPDATE, null, type);
-        verify(permissionService, never()).hasPermission(Permission.SHAKEDOWN_TEST_MODE);
     }
 
     @Test
@@ -682,20 +681,9 @@ public void shouldInvokePermissionServiceMethodWithCorrectParametersForResource(
         when(contextLocator.getContextById(23)).thenReturn(context);
         when(permissionService.hasPermission(Permission.RESOURCE, context, UPDATE, rg, null)).thenReturn(false);
         // when
-        permissionBoundary.hasPermissionToEditPropertiesByResourceAndContext(21, context, false);
+        permissionBoundary.hasPermissionToEditPropertiesByResourceAndContext(21, context);
         // then
         verify(permissionService).hasPermission(Permission.RESOURCE, context, UPDATE, rg, null);
-        verify(permissionService, never()).hasPermission(Permission.SHAKEDOWN_TEST_MODE);
-    }
-
-    @Test
-    public void shouldInvokePermissionServiceMethodsWithCorrectParametersIfInTestingMode() {
-        // given // when
-        permissionBoundary.hasPermissionToEditPropertiesByResourceTypeAndContext(21, 23, true);
-        // then
-        verify(permissionService, never()).hasPermission(any(Permission.class), any(ContextEntity.class),
-                any(Action.class), any(ResourceGroupEntity.class), any(ResourceTypeEntity.class));
-        verify(permissionService).hasPermission(Permission.SHAKEDOWN_TEST_MODE);
     }
 
     @Test
@@ -734,10 +722,10 @@ public void shouldInvokeTheRightMethodOfPermissionServiceToAskForResourceTemplat
         resource.setId(12);
         when(entityManager.find(ResourceEntity.class, 12)).thenReturn(resource);
         // when
-        permissionBoundary.hasPermissionToAddTemplate(resource, false);
+        permissionBoundary.hasPermissionToAddTemplate(resource);
         // then
-        verify(permissionService, never()).hasPermissionToAddResourceTypeTemplate((ResourceTypeEntity) anyObject(), anyBoolean());
-        verify(permissionService).hasPermissionToAddResourceTemplate(resource, false);
+        verify(permissionService, never()).hasPermissionToAddResourceTypeTemplate(any(ResourceTypeEntity.class));
+        verify(permissionService).hasPermissionToAddResourceTemplate(resource);
     }
 
     @Test
@@ -747,10 +735,10 @@ public void shouldInvokeTheRightMethodOfPermissionServiceToAskForResourceTypeTem
         type.setId(23);
         when(entityManager.find(ResourceTypeEntity.class, 23)).thenReturn(type);
         // when
-        permissionBoundary.hasPermissionToAddTemplate(type, true);
+        permissionBoundary.hasPermissionToAddTemplate(type);
         // then
-        verify(permissionService, never()).hasPermissionToAddResourceTemplate((ResourceEntity) anyObject(), anyBoolean());
-        verify(permissionService).hasPermissionToAddResourceTypeTemplate(type, true);
+        verify(permissionService, never()).hasPermissionToAddResourceTemplate(any(ResourceEntity.class));
+        verify(permissionService).hasPermissionToAddResourceTypeTemplate(type);
     }
 
     @Test
diff --git a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/security/control/PermissionServiceTest.java b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/security/control/PermissionServiceTest.java
index 5b57319eb..96b1e26d9 100644
--- a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/security/control/PermissionServiceTest.java
+++ b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/security/control/PermissionServiceTest.java
@@ -53,7 +53,6 @@ public class PermissionServiceTest {
 	private static final String CONFIG_ADMIN = "config_admin";
 	private static final String VIEWER = "viewer";
 	private static final String SERVER_ADMIN = "server_admin";
-	private static final String SHAKEDOWN_ADMIN = "shakedown_admin";
 	private static final String ROLE_NOT_DEPLOY = "role_not_deploy";
 	
 	private PermissionService permissionService;
@@ -631,47 +630,7 @@ public void hasNoPermissionToAddResourceRelationWhenUserUserHasNoPermissionToUpd
     }
 
     @Test
-    public void hasPermissionToTemplateModifyWhenUserIsShakedownAdminAndIsTestingMode() {
-        // given
-        ResourceEntity as = resourceEntityBuilder.mockAppServerEntity("as", null, null, null);
-
-        when(sessionContext.isCallerInRole(SHAKEDOWN_ADMIN)).thenReturn(true);
-		when(sessionContext.getCallerPrincipal()).thenReturn(principal);
-        myRoles = new HashMap<>();
-		RestrictionEntity res = new RestrictionEntity();
-		res.setAction(Action.ALL);
-		myRoles.put(SHAKEDOWN_ADMIN, Arrays.asList(new RestrictionDTOBuilder().mockRestrictionDTO(Permission.SHAKEDOWN_TEST_MODE, res)));
-        permissionService.rolesWithRestrictions = myRoles;
-
-        // when
-        boolean result = permissionService.hasPermissionToAddResourceTemplate(as, true);
-
-        // then
-        Assert.assertTrue(result);
-    }
-
-    @Test
-    public void hasPermissionToTemplateModifyWhenUserIsNotShakedownAdminAndIsTestingMode() {
-        // given
-        ResourceEntity as = resourceEntityBuilder.mockAppServerEntity("as", null, null, null);
-
-        when(sessionContext.isCallerInRole(VIEWER)).thenReturn(true);
-		when(sessionContext.getCallerPrincipal()).thenReturn(principal);
-        myRoles = new HashMap<>();
-		RestrictionEntity res = new RestrictionEntity();
-		res.setAction(Action.ALL);
-		myRoles.put(VIEWER, Arrays.asList(new RestrictionDTOBuilder().mockRestrictionDTO(Permission.DEFAULT, res)));
-        permissionService.rolesWithRestrictions = myRoles;
-
-        // when
-        boolean result = permissionService.hasPermissionToAddResourceTemplate(as, true);
-
-        // then
-        Assert.assertFalse(result);
-    }
-
-    @Test
-    public void hasNoPermissionToAddTemplateWhenUserHasPermissionToUpdateResourceAndIsResourceIsNotTestingMode() {
+    public void hasNoPermissionToAddTemplateWhenUserHasPermissionToUpdateResourceAndIsResource() {
         // given
         ResourceEntity as = resourceEntityBuilder.mockAppServerEntity("as", null, null, null);
 
@@ -684,14 +643,14 @@ public void hasNoPermissionToAddTemplateWhenUserHasPermissionToUpdateResourceAnd
         permissionService.rolesWithRestrictions = myRoles;
 
         // when
-        boolean result = permissionService.hasPermissionToAddResourceTemplate(as, false);
+        boolean result = permissionService.hasPermissionToAddResourceTemplate(as);
 
         // then
         Assert.assertFalse(result);
     }
 
 	@Test
-	public void hasPermissionToAddTemplateWhenUserHasPermissionToCreateTemplateResourceAndIsResourceIsNotTestingMode() {
+	public void hasPermissionToAddTemplateWhenUserHasPermissionToCreateTemplateResourceAndIsResource() {
 		// given
 		ResourceEntity as = resourceEntityBuilder.mockAppServerEntity("as", null, null, null);
 
@@ -704,14 +663,14 @@ public void hasPermissionToAddTemplateWhenUserHasPermissionToCreateTemplateResou
 		permissionService.rolesWithRestrictions = myRoles;
 
 		// when
-		boolean result = permissionService.hasPermissionToAddResourceTemplate(as, false);
+		boolean result = permissionService.hasPermissionToAddResourceTemplate(as);
 
 		// then
 		Assert.assertTrue(result);
 	}
 
     @Test
-    public void hasNoPermissionToAddResourceTypeTemplateWhenUserHasPermissionToUpdateResourceTypeAndIsApplicationResTypeAndIsNotTestingMode() {
+    public void hasNoPermissionToAddResourceTypeTemplateWhenUserHasPermissionToUpdateResourceTypeAndIsApplicationResType() {
         // given
 		ResourceTypeEntity app = ResourceTypeEntityBuilder.APPLICATION_TYPE;
 
@@ -725,14 +684,14 @@ public void hasNoPermissionToAddResourceTypeTemplateWhenUserHasPermissionToUpdat
         permissionService.rolesWithRestrictions = myRoles;
 
         // when
-        boolean result = permissionService.hasPermissionToAddResourceTypeTemplate(app, false);
+        boolean result = permissionService.hasPermissionToAddResourceTypeTemplate(app);
 
         // then
         Assert.assertFalse(result);
     }
 
 	@Test
-	public void hasPermissionToAddResourceTypeTemplateWhenUserHasPermissionToCreateTemplateResourceTypeAndIsApplicationResTypeAndIsNotTestingMode() {
+	public void hasPermissionToAddResourceTypeTemplateWhenUserHasPermissionToCreateTemplateResourceTypeAndIsApplicationResType() {
 		// given
 		ResourceTypeEntity app = ResourceTypeEntityBuilder.APPLICATION_TYPE;
 
@@ -746,32 +705,12 @@ public void hasPermissionToAddResourceTypeTemplateWhenUserHasPermissionToCreateT
 		permissionService.rolesWithRestrictions = myRoles;
 
 		// when
-		boolean result = permissionService.hasPermissionToAddResourceTypeTemplate(app, false);
+		boolean result = permissionService.hasPermissionToAddResourceTypeTemplate(app);
 
 		// then
 		Assert.assertTrue(result);
 	}
 
-    @Test
-    public void hasPermissionToTemplateModifyWhenUserIsShakedownAdminAndIsNotTestingMode() {
-        // given
-        ResourceEntity as = resourceEntityBuilder.mockAppServerEntity("as", null, null, null);
-
-        when(sessionContext.isCallerInRole(SHAKEDOWN_ADMIN)).thenReturn(true);
-		when(sessionContext.getCallerPrincipal()).thenReturn(principal);
-        myRoles = new HashMap<>();
-		RestrictionEntity res = new RestrictionEntity();
-		res.setAction(Action.ALL);
-		myRoles.put(SHAKEDOWN_ADMIN, Arrays.asList(new RestrictionDTOBuilder().mockRestrictionDTO(Permission.SHAKEDOWN_TEST_MODE, res)));
-        permissionService.rolesWithRestrictions = myRoles;
-
-        // when
-        boolean result = permissionService.hasPermissionToAddResourceTemplate(as, false);
-
-        // then
-        Assert.assertFalse(result);
-    }
-	
 	@Test
 	public void canCreateDeploymentWhenPermissionOnOneRes(){
 		// given
@@ -855,49 +794,9 @@ public void multipleDeployUserRestriction(){
 		Assert.assertTrue(result2);
 		Assert.assertFalse(result3);
 	}
-	
-	@Test
-	public void hasPermissionToAddResourceTypeTemplateWhenUserIsShakedownAdminAndIsTestingMode() {
-		// given
-		ResourceTypeEntity as = ResourceTypeEntityBuilder.APPLICATION_SERVER_TYPE;
-
-		when(sessionContext.isCallerInRole(SHAKEDOWN_ADMIN)).thenReturn(true);
-		when(sessionContext.getCallerPrincipal()).thenReturn(principal);
-		myRoles = new HashMap<>();
-		RestrictionEntity res = new RestrictionEntity();
-		res.setAction(Action.ALL);
-		myRoles.put(SHAKEDOWN_ADMIN, Arrays.asList(new RestrictionDTOBuilder().mockRestrictionDTO(Permission.SHAKEDOWN_TEST_MODE, res)));
-		permissionService.rolesWithRestrictions = myRoles;
-
-		// when
-		boolean result = permissionService.hasPermissionToAddResourceTypeTemplate(as, true);
-
-		// then
-		Assert.assertTrue(result);
-	}
-
-	@Test
-	public void hasPermissionToAddResourceTypeTemplateWhenUserIsNotShakedownAdminAndIsTestingMode() {
-		// given
-		ResourceTypeEntity as = ResourceTypeEntityBuilder.APPLICATION_SERVER_TYPE;
-
-		when(sessionContext.isCallerInRole(VIEWER)).thenReturn(true);
-		when(sessionContext.getCallerPrincipal()).thenReturn(principal);
-		myRoles = new HashMap<>();
-		RestrictionEntity res = new RestrictionEntity();
-		res.setAction(Action.ALL);
-		myRoles.put(VIEWER, Arrays.asList(new RestrictionDTOBuilder().mockRestrictionDTO(Permission.DEFAULT, res)));
-		permissionService.rolesWithRestrictions = myRoles;
-
-		// when
-		boolean result = permissionService.hasPermissionToAddResourceTypeTemplate(as, true);
-
-		// then
-		Assert.assertFalse(result);
-	}
 
 	@Test
-	public void hasPermissionToAddResourceTypeTemplateWhenUserHasResourceTypePermissionAndIsNotTestingMode() {
+	public void hasPermissionToAddResourceTypeTemplateWhenUserHasResourceTypePermission() {
 		// given
 		ResourceTypeEntity as = ResourceTypeEntityBuilder.APPLICATION_SERVER_TYPE;
 
@@ -912,14 +811,14 @@ public void hasPermissionToAddResourceTypeTemplateWhenUserHasResourceTypePermiss
 		permissionService.rolesWithRestrictions = myRoles;
 
 		// when
-		boolean result = permissionService.hasPermissionToAddResourceTypeTemplate(as, false);
+		boolean result = permissionService.hasPermissionToAddResourceTypeTemplate(as);
 
 		// then
 		Assert.assertTrue(result);
 	}
 
 	@Test
-	public void hasNoPermissionToAddResourceTypeTemplateWhenUserHasOnlyResourceTypePermissionAndIsApplicationResTypeAndIsNotTestingMode() {
+	public void hasNoPermissionToAddResourceTypeTemplateWhenUserHasOnlyResourceTypePermissionAndIsApplicationResType() {
 		// given
 		ResourceTypeEntity app = ResourceTypeEntityBuilder.APPLICATION_TYPE;
 
@@ -933,27 +832,7 @@ public void hasNoPermissionToAddResourceTypeTemplateWhenUserHasOnlyResourceTypeP
 		permissionService.rolesWithRestrictions = myRoles;
 
 		// when
-		boolean result = permissionService.hasPermissionToAddResourceTypeTemplate(app, false);
-
-		// then
-		Assert.assertFalse(result);
-	}
-
-	@Test
-	public void hasNoPermissionToAddResourceTypeTemplateWhenUserIsShakedownAdminAndIsNotTestingMode() {
-		// given
-		ResourceTypeEntity as = ResourceTypeEntityBuilder.APPLICATION_SERVER_TYPE;
-
-		when(sessionContext.isCallerInRole(SHAKEDOWN_ADMIN)).thenReturn(true);
-		when(sessionContext.getCallerPrincipal()).thenReturn(principal);
-		myRoles = new HashMap<>();
-		RestrictionEntity res = new RestrictionEntity();
-		res.setAction(Action.ALL);
-		myRoles.put(SHAKEDOWN_ADMIN, Arrays.asList(new RestrictionDTOBuilder().mockRestrictionDTO(Permission.SHAKEDOWN_TEST_MODE, res)));
-		permissionService.rolesWithRestrictions = myRoles;
-
-		// when
-		boolean result = permissionService.hasPermissionToAddResourceTypeTemplate(as, false);
+		boolean result = permissionService.hasPermissionToAddResourceTypeTemplate(app);
 
 		// then
 		Assert.assertFalse(result);
@@ -2226,4 +2105,4 @@ public void shouldReturnFalseIfCallerHasALessPowerfulPermissionGrantedByItsRole(
 		Assert.assertFalse(exists);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/shakedown/control/ShakedownStpServicePersistenceTest.java b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/shakedown/control/ShakedownStpServicePersistenceTest.java
deleted file mode 100644
index 424d937eb..000000000
--- a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/shakedown/control/ShakedownStpServicePersistenceTest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * AMW - Automated Middleware allows you to manage the configurations of
- * your Java EE applications on an unlimited number of different environments
- * with various versions, including the automated deployment of those apps.
- * Copyright (C) 2013-2016 by Puzzle ITC
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package ch.puzzle.itc.mobiliar.business.shakedown.control;
-
-import ch.puzzle.itc.mobiliar.business.generator.control.ShakedownTestGeneratorDomainService;
-import ch.puzzle.itc.mobiliar.business.shakedown.entity.ShakedownStpEntity;
-import ch.puzzle.itc.mobiliar.test.testrunner.PersistenceTestRunner;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.mockito.Spy;
-
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import java.util.List;
-import java.util.logging.Logger;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-@RunWith(PersistenceTestRunner.class)
-public class ShakedownStpServicePersistenceTest {
-
-	@Spy
-	@PersistenceContext
-	EntityManager entityManager;
-
-	@InjectMocks
-	ShakedownStpService service;
-
-	@Mock
-	Logger log;
-
-	@Before
-	public void before() {
-		MockitoAnnotations.openMocks(this);
-	}
-
-	@Test
-	public void test_getSTPsWithoutSTS() {
-		// given
-		ShakedownStpEntity foo = new ShakedownStpEntity();
-		foo.setStpName("foo");
-		entityManager.persist(foo);
-
-		ShakedownStpEntity sts = new ShakedownStpEntity();
-		sts.setStpName(ShakedownTestGeneratorDomainService.STS_NAME);
-		entityManager.persist(sts);
-
-		// when
-		List<ShakedownStpEntity> result = service.getSTPsWithoutSTS();
-
-		// then
-		assertNotNull(result);
-		assertEquals(1, result.size());
-		assertEquals(foo, result.get(0));
-	}
-
-}
diff --git a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/shakedown/control/ShakedownTestAsynchronousExecuterTest.java b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/shakedown/control/ShakedownTestAsynchronousExecuterTest.java
deleted file mode 100644
index 8472ffbe5..000000000
--- a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/shakedown/control/ShakedownTestAsynchronousExecuterTest.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * AMW - Automated Middleware allows you to manage the configurations of
- * your Java EE applications on an unlimited number of different environments
- * with various versions, including the automated deployment of those apps.
- * Copyright (C) 2013-2016 by Puzzle ITC
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package ch.puzzle.itc.mobiliar.business.shakedown.control;
-
-import ch.puzzle.itc.mobiliar.builders.ShakedownTestGenerationResultBuilder;
-import ch.puzzle.itc.mobiliar.business.environment.entity.ContextEntity;
-import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.ResourceEntity;
-import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.ResourceFactory;
-import ch.puzzle.itc.mobiliar.business.shakedown.entity.ShakedownTestEntity;
-import ch.puzzle.itc.mobiliar.business.shakedown.xmlmodel.STS;
-import ch.puzzle.itc.mobiliar.business.shakedown.xmlmodel.TestSet;
-import ch.puzzle.itc.mobiliar.business.shakedown.xmlmodel.TestSet.OverallStatus;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-import java.util.logging.Logger;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.*;
-
-public class ShakedownTestAsynchronousExecuterTest {
-
-
-	@InjectMocks
-	ShakedownTestAsynchronousExecuter shakedownTestAsynchronousExecuter;
-
-	@Mock
-	ShakedownTestExecutionResultHandlerService shakedownTestExecutionResultHandlerService;
-
-	@Mock
-	ShakedownTestRunner testRunner;
-
-	@Mock
-	Logger log;
-
-	ContextEntity contextEntity;
-
-	ResourceEntity applicationServer;
-
-	@Before
-	public void setUp() {
-		MockitoAnnotations.openMocks(this);
-
-		contextEntity = new ContextEntity();
-		contextEntity.setName("testContext");
-		contextEntity.setId(Integer.valueOf(2));
-
-		applicationServer =  ResourceFactory.createNewResource("testAppserver");
-		applicationServer.setId(5);
-	}
-
-	@Test
-	public void test_executeShakedownTest_success() {
-		// given
-		ShakedownTestEntity test = new ShakedownTestEntity();
-		test.setId(1);
-		test.setApplicationServer(applicationServer);
-		test.setContext(contextEntity);
-
-		ShakedownTestGenerationResult result = ShakedownTestGenerationResultBuilder.buildGenerationResultSuccess(test, null);
-		TestSet testSet = mock(TestSet.class);
-		when(testSet.getOverallStatus()).thenReturn(OverallStatus.success);
-		when(testSet.getTestMessage()).thenReturn("success");
-		when(testRunner.executeShakedownTest(any(STS.class))).thenReturn(testSet);
-
-		// when
-		shakedownTestAsynchronousExecuter.executeShakedownTest(result);
-
-		// then
-		verify(shakedownTestExecutionResultHandlerService, times(1)).handleSuccessfulShakedownTest(test);
-		verify(shakedownTestExecutionResultHandlerService, times(0)).handleUnsuccessfulShakedownTest(any(Exception.class), anyInt());
-		verify(shakedownTestExecutionResultHandlerService, times(0)).handleUnsuccessfulShakedownTest(anyString(), anyInt());
-	}
-
-	@Test
-	public void test_executeShakedownTest_noSTS() {
-		// given
-		ShakedownTestEntity test = new ShakedownTestEntity();
-		test.setId(1);
-		test.setApplicationServer(applicationServer);
-		test.setContext(contextEntity);
-
-		ShakedownTestGenerationResult result = ShakedownTestGenerationResultBuilder.buildGenerationResultSuccessEmptySTS(test, null);
-
-		// when
-		shakedownTestAsynchronousExecuter.executeShakedownTest(result);
-
-		// then
-		verify(shakedownTestExecutionResultHandlerService, times(0)).handleSuccessfulShakedownTest(test);
-		verify(shakedownTestExecutionResultHandlerService, times(0)).handleUnsuccessfulShakedownTest(any(Exception.class), anyInt());
-		verify(shakedownTestExecutionResultHandlerService, times(1)).handleUnsuccessfulShakedownTest(anyString(), anyInt());
-	}
-
-	@Test
-	public void test_executeShakedownTest_resultFailure() {
-		// given
-		ShakedownTestEntity test = new ShakedownTestEntity();
-		test.setId(1);
-		test.setApplicationServer(applicationServer);
-		test.setContext(contextEntity);
-
-		ShakedownTestGenerationResult result = ShakedownTestGenerationResultBuilder.mockGenerationResultWithErrors(test, null);
-
-		// when
-		shakedownTestAsynchronousExecuter.executeShakedownTest(result);
-
-		// then
-		verify(shakedownTestExecutionResultHandlerService, times(0)).handleSuccessfulShakedownTest(test);
-		verify(shakedownTestExecutionResultHandlerService, times(0)).handleUnsuccessfulShakedownTest(any(Exception.class), anyInt());
-		verify(shakedownTestExecutionResultHandlerService, times(1)).handleUnsuccessfulShakedownTest(anyString(), anyInt());
-	}
-}
diff --git a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/shakedown/control/ShakedownTestExecuterServiceTest.java b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/shakedown/control/ShakedownTestExecuterServiceTest.java
deleted file mode 100644
index a69f1c44a..000000000
--- a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/shakedown/control/ShakedownTestExecuterServiceTest.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * AMW - Automated Middleware allows you to manage the configurations of
- * your Java EE applications on an unlimited number of different environments
- * with various versions, including the automated deployment of those apps.
- * Copyright (C) 2013-2016 by Puzzle ITC
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package ch.puzzle.itc.mobiliar.business.shakedown.control;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import java.util.logging.Logger;
-
-import javax.persistence.EntityManager;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-import ch.puzzle.itc.mobiliar.builders.ShakedownTestGenerationResultBuilder;
-import ch.puzzle.itc.mobiliar.business.generator.control.GeneratorDomainServiceWithAppServerRelations;
-import ch.puzzle.itc.mobiliar.business.generator.control.LockingService;
-import ch.puzzle.itc.mobiliar.business.generator.control.ShakedownTestGeneratorDomainService;
-import ch.puzzle.itc.mobiliar.business.environment.entity.ContextEntity;
-import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.ResourceEntity;
-import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.ResourceFactory;
-import ch.puzzle.itc.mobiliar.business.shakedown.entity.ShakedownTestEntity;
-
-public class ShakedownTestExecuterServiceTest {
-
-	@InjectMocks
-	ShakedownTestExecuterService shakedownTestExecuterService;
-
-	@Mock
-	ShakedownTestService shakedownTestService;
-
-	@Mock
-	ShakedownTestAsynchronousExecuter shakedownTestAsynchronousExecuter;
-
-	@Mock
-	private GeneratorDomainServiceWithAppServerRelations generatorDomainServiceWithAppServerRelations;
-
-	@Mock
-	private ShakedownTestGeneratorDomainService shakedownTestGeneratorDomainService;
-
-	@Mock
-	LockingService locking;
-
-	@Mock
-	EntityManager entityManager;
-
-	@Mock
-	Logger log;
-
-	ContextEntity contextEntity;
-
-	ResourceEntity applicationServer;
-
-	@Before
-	public void setUp() {
-		MockitoAnnotations.openMocks(this);
-
-		contextEntity = new ContextEntity();
-		contextEntity.setName("testContext");
-		contextEntity.setId(Integer.valueOf(2));
-
-		applicationServer =  ResourceFactory.createNewResource("testAppserver");
-		applicationServer.setId(5);
-	}
-
-	@Test
-	public void test_executeShakedownTest() {
-		// given
-		ShakedownTestEntity test = new ShakedownTestEntity();
-		test.setId(1);
-		test.setApplicationServer(applicationServer);
-		test.setContext(contextEntity);
-
-		final ShakedownTestEntity resultShakedownTestEntity = new ShakedownTestEntity();
-
-
-		ShakedownTestGenerationResult generationResult = ShakedownTestGenerationResultBuilder.buildGenerationResultSuccess(resultShakedownTestEntity, null);
-
-		when(shakedownTestService.getShakedownTestById(test.getId())).thenReturn(test);
-		when(locking.markShakedownTestAsRunning(test.getId())).thenReturn(true);
-		when(entityManager.find(ShakedownTestEntity.class, test.getId())).thenReturn(test);
-		when(shakedownTestGeneratorDomainService.generateConfigurationForShakedownTest(test)).thenReturn(generationResult);
-
-		// when
-		shakedownTestExecuterService.generateConfigurationAndExecuteShakedownTest(test.getId());
-
-		// then
-		verify(shakedownTestAsynchronousExecuter, times(1)).executeShakedownTest(generationResult);
-	}
-
-	@Test
-	public void test_executeShakedownTest_faultyGenerationResult() {
-		// given
-		ShakedownTestEntity test = new ShakedownTestEntity();
-		test.setId(1);
-		test.setApplicationServer(applicationServer);
-		test.setContext(contextEntity);
-
-		ShakedownTestGenerationResult generationResult = ShakedownTestGenerationResultBuilder.mockGenerationResultWithErrors(test, null);
-
-		when(shakedownTestService.getShakedownTestById(test.getId())).thenReturn(test);
-		when(locking.markShakedownTestAsRunning(test.getId())).thenReturn(true);
-		when(entityManager.find(ShakedownTestEntity.class, test.getId())).thenReturn(test);
-		when(shakedownTestGeneratorDomainService.generateConfigurationForShakedownTest(test)).thenReturn(generationResult);
-
-		// when
-		shakedownTestExecuterService.generateConfigurationAndExecuteShakedownTest(test.getId());
-
-		// then
-		verify(shakedownTestAsynchronousExecuter, times(0)).executeShakedownTest(any(ShakedownTestGenerationResult.class));
-	}
-
-	@Test
-	public void test_executeShakedownTest_nullGenerationResult() {
-		// given
-		ShakedownTestEntity test = new ShakedownTestEntity();
-		test.setId(1);
-		test.setApplicationServer(applicationServer);
-		test.setContext(contextEntity);
-
-		when(shakedownTestService.getShakedownTestById(test.getId())).thenReturn(test);
-		when(locking.markShakedownTestAsRunning(test.getId())).thenReturn(true);
-		when(entityManager.find(ShakedownTestEntity.class, test.getId())).thenReturn(test);
-		when(shakedownTestGeneratorDomainService.generateConfigurationForShakedownTest(test)).thenReturn(null);
-
-		// when
-		shakedownTestExecuterService.generateConfigurationAndExecuteShakedownTest(test.getId());
-
-		// then
-		verify(shakedownTestAsynchronousExecuter, times(0)).executeShakedownTest(any(ShakedownTestGenerationResult.class));
-	}
-
-	@Test
-	public void test_executeShakedownTest_noShakedowntTest() {
-		// given
-		ShakedownTestEntity test = new ShakedownTestEntity();
-		test.setId(1);
-		test.setApplicationServer(applicationServer);
-		test.setContext(contextEntity);
-
-		when(shakedownTestService.getShakedownTestById(test.getId())).thenReturn(null);
-
-		// when
-		shakedownTestExecuterService.generateConfigurationAndExecuteShakedownTest(test.getId());
-
-		// then
-		verify(shakedownTestAsynchronousExecuter, times(0)).executeShakedownTest(any(ShakedownTestGenerationResult.class));
-	}
-
-}
-
-
diff --git a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/shakedown/control/ShakedownTestExecutionResultHandlerServiceTest.java b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/shakedown/control/ShakedownTestExecutionResultHandlerServiceTest.java
deleted file mode 100644
index 232dce0af..000000000
--- a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/shakedown/control/ShakedownTestExecutionResultHandlerServiceTest.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * AMW - Automated Middleware allows you to manage the configurations of
- * your Java EE applications on an unlimited number of different environments
- * with various versions, including the automated deployment of those apps.
- * Copyright (C) 2013-2016 by Puzzle ITC
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package ch.puzzle.itc.mobiliar.business.shakedown.control;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-import ch.puzzle.itc.mobiliar.business.shakedown.entity.ShakedownTestEntity;
-import ch.puzzle.itc.mobiliar.business.shakedown.entity.ShakedownTestEntity.shakedownTest_state;
-import ch.puzzle.itc.mobiliar.common.exception.GeneratorException;
-import ch.puzzle.itc.mobiliar.common.exception.GeneratorException.MISSING;
-
-public class ShakedownTestExecutionResultHandlerServiceTest {
-
-	@InjectMocks
-	ShakedownTestExecutionResultHandlerService shakedownTestExecutionResultHandlerService;
-
-	@Mock
-	Logger log;
-
-	@Mock
-	ShakedownTestService shakedownTestService;
-
-	@Before
-	public void setUp() {
-		MockitoAnnotations.openMocks(this);
-	}
-
-	@Test
-	public void test_handleSuccessfulShakedownTest() {
-		// given
-		ShakedownTestEntity test = mock(ShakedownTestEntity.class);
-		when(test.getId()).thenReturn(12);
-		when(test.getTestResult()).thenReturn("success");
-		when(shakedownTestService.updateShakedownInfo(anyInt(), anyString(), any(shakedownTest_state.class))).thenReturn(test);
-
-		// when
-		shakedownTestExecutionResultHandlerService.handleSuccessfulShakedownTest(test);
-
-		// then
-		verify(shakedownTestService, times(1)).updateShakedownInfo(Integer.valueOf(12), "success", shakedownTest_state.success);
-		verify(log, times(1)).info("Shakedown test 12 executed and result parsed");
-	}
-
-	@Test
-	public void test_handleUnsuccessfulShakedownTest_withTestresult() {
-		// given
-		ShakedownTestEntity test = mock(ShakedownTestEntity.class);
-		when(test.getId()).thenReturn(12);
-		when(shakedownTestService.updateShakedownInfo(anyInt(), anyString(), any(shakedownTest_state.class))).thenReturn(test);
-
-		// when
-		shakedownTestExecutionResultHandlerService.handleUnsuccessfulShakedownTest("foo", 12);
-
-		// then
-		verify(shakedownTestService, times(1)).updateShakedownInfo(Integer.valueOf(12), "foo", shakedownTest_state.failed);
-		verify(log, times(1)).log(Level.WARNING, "Shakedown test 12 had an issue with its generation", "foo");
-	}
-
-	@Test
-	public void test_handleUnsuccessfulShakedownTest_withException() {
-		// given
-		GeneratorException exception = new GeneratorException("exception", MISSING.APPLICATION);
-		ShakedownTestEntity test = mock(ShakedownTestEntity.class);
-		when(test.getId()).thenReturn(12);
-		when(shakedownTestService.updateShakedownInfo(anyInt(), anyString(), any(shakedownTest_state.class))).thenReturn(test);
-
-		// when
-		shakedownTestExecutionResultHandlerService.handleUnsuccessfulShakedownTest(exception, 12);
-
-		// then
-		verify(shakedownTestService, times(1)).updateShakedownInfo(Integer.valueOf(12), exception.getMessage(), shakedownTest_state.failed);
-		verify(log, times(1)).log(Level.SEVERE, "Shakedown test 12 execution failed!", exception);
-	}
-
-	@Test
-	public void test_handleUnsuccessfulShakedownTest_ResourceIdNotSet() {
-		// given
-		GeneratorException exception = new GeneratorException("exception", MISSING.APPLICATION);
-		ShakedownTestEntity test = mock(ShakedownTestEntity.class);
-		when(test.getId()).thenReturn(null);
-		when(shakedownTestService.updateShakedownInfo(anyInt(), anyString(), any(shakedownTest_state.class))).thenReturn(test);
-
-		// when
-		shakedownTestExecutionResultHandlerService.handleUnsuccessfulShakedownTest(exception, null);
-
-		// then
-		verify(shakedownTestService, times(0)).updateShakedownInfo(null, exception.getMessage(), shakedownTest_state.failed);
-		verify(log, times(1)).log(Level.SEVERE, "Shakedown test execution failed!", exception);
-	}
-
-}
diff --git a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/shakedown/control/ShakedownTestServicePersistenceTest.java b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/shakedown/control/ShakedownTestServicePersistenceTest.java
deleted file mode 100644
index 57917cd0e..000000000
--- a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/shakedown/control/ShakedownTestServicePersistenceTest.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * AMW - Automated Middleware allows you to manage the configurations of
- * your Java EE applications on an unlimited number of different environments
- * with various versions, including the automated deployment of those apps.
- * Copyright (C) 2013-2016 by Puzzle ITC
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package ch.puzzle.itc.mobiliar.business.shakedown.control;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.when;
-
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
-import java.util.logging.Logger;
-
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-
-import ch.puzzle.itc.mobiliar.business.resourcegroup.control.ResourceTypeRepository;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.mockito.Spy;
-
-import ch.puzzle.itc.mobiliar.builders.ContextEntityBuilder;
-import ch.puzzle.itc.mobiliar.builders.DeploymentEntityBuilder;
-import ch.puzzle.itc.mobiliar.builders.ReleaseEntityBuilder;
-import ch.puzzle.itc.mobiliar.builders.ResourceEntityBuilder;
-import ch.puzzle.itc.mobiliar.builders.ShakedownTestOrderBuilder;
-import ch.puzzle.itc.mobiliar.business.generator.control.extracted.ResourceDependencyResolverService;
-import ch.puzzle.itc.mobiliar.business.shakedown.entity.ShakedownTestOrder;
-import ch.puzzle.itc.mobiliar.business.resourcegroup.control.ResourceTypeProvider;
-import ch.puzzle.itc.mobiliar.business.database.control.SequencesService;
-import ch.puzzle.itc.mobiliar.business.environment.entity.ContextEntity;
-import ch.puzzle.itc.mobiliar.business.deploy.entity.DeploymentEntity;
-import ch.puzzle.itc.mobiliar.business.releasing.entity.ReleaseEntity;
-import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.ResourceEntity;
-import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.ResourceFactory;
-import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.ResourceTypeEntity;
-import ch.puzzle.itc.mobiliar.business.shakedown.entity.ShakedownTestEntity;
-import ch.puzzle.itc.mobiliar.business.shakedown.entity.ShakedownTestEntity.shakedownTest_state;
-import ch.puzzle.itc.mobiliar.test.testrunner.PersistenceTestRunner;
-
-@RunWith(PersistenceTestRunner.class)
-public class ShakedownTestServicePersistenceTest {
-
-	@Spy
-	@PersistenceContext
-	EntityManager entityManager;
-
-	@Mock
-	Logger log;
-
-	@Spy
-	ResourceDependencyResolverService dependencyResolverService;
-
-	@Mock
-	SequencesService sequencesService;
-
-	@Mock
-	ResourceTypeProvider resourceTypeProvider;
-
-	@Mock
-	ResourceTypeRepository resourceTypeRepository;
-
-	@InjectMocks
-	ShakedownTestService service;
-
-	private DeploymentEntityBuilder deploymentEntityBuilder;
-	private ReleaseEntityBuilder releaseEntityBuilder;
-	private ResourceEntityBuilder resourceEntityBuilder;
-	private ContextEntityBuilder contextEntityBuilder;
-
-
-	@Before
-	public void before() {
-		MockitoAnnotations.openMocks(this);
-		int trackingId = 200;
-		when(sequencesService.getNextValueAndUpdate(DeploymentEntity.SEQ_NAME)).thenReturn(trackingId++);
-		when(sequencesService.getNextValueAndUpdate(ShakedownTestEntity.SEQ_NAME)).thenReturn(trackingId++);
-
-		deploymentEntityBuilder = new DeploymentEntityBuilder();
-		releaseEntityBuilder = new ReleaseEntityBuilder();
-		resourceEntityBuilder = new ResourceEntityBuilder();
-		contextEntityBuilder = new ContextEntityBuilder();
-	}
-
-	@Test
-	public void test_createShakedownTestOrderReturnsTrackingId() {
-		// given
-		ContextEntity context = new ContextEntity();
-		context.setName("B");
-		entityManager.persist(context);
-
-		ResourceTypeEntity type = new ResourceTypeEntity();
-		type.setName("applicationServer");
-		entityManager.persist(type);
-
-		ReleaseEntity release = new ReleaseEntity();
-		release.setName("rel-1.0");
-		release.setInstallationInProductionAt(new Date());
-		entityManager.persist(release);
-
-		ResourceEntity appServer = ResourceFactory.createNewResource();
-		appServer.setRelease(release);
-		entityManager.persist(appServer);
-
-		when(resourceTypeRepository.getByName(type.getName())).thenReturn(type);
-
-		ShakedownTestOrder order = ShakedownTestOrderBuilder.mockShakedownTestOrder(context, release,
-				Collections.singletonList(appServer.getResourceGroup()));
-
-		// when
-		Integer result = service.createShakedownTestOrderReturnsTrackingId(Collections.singletonList(order));
-
-		// then
-		assertNotNull(result);
-	}
-
-	@Test
-	public void test_updateShakedownInfo() {
-		// given
-		ShakedownTestEntity st = new ShakedownTestEntity();
-		Date testDate = new Date(System.currentTimeMillis() - 1);
-		st.setTestDate(testDate);
-		entityManager.persist(st);
-		entityManager.flush();
-
-		// when
-		ShakedownTestEntity test = service.updateShakedownInfo(st.getId(), "success", shakedownTest_state.success);
-
-		// then
-		assertNotNull(test);
-		assertEquals(shakedownTest_state.success.getDisplayName(), test.getShakedownTestState().getDisplayName());
-		assertEquals("success", test.getTestResult());
-		assertTrue(testDate.before(test.getTestDate()));
-	}
-
-	@Test
-	public void test_createShakedownTestOrderForDeploymentOrder() {
-		// given
-		Integer trackingId = 300;
-		ReleaseEntity rel = releaseEntityBuilder.buildReleaseEntity("rl2.3", new Date(), false);
-		ResourceEntity as = resourceEntityBuilder.buildAppServerEntity("as1", null, rel, false);
-		ContextEntity contextDev = contextEntityBuilder.buildContextEntity("DEV", null, null, false);
-		ContextEntity contextInt = contextEntityBuilder.buildContextEntity("INT", null, null, false);
-		DeploymentEntity deployment1 = deploymentEntityBuilder.buildDeploymentEntity(trackingId, rel, as.getResourceGroup(), as, true, contextDev, false);
-		DeploymentEntity deployment2 = deploymentEntityBuilder.buildDeploymentEntity(trackingId, rel, as.getResourceGroup(), as, true, contextInt, false);
-
-		entityManager.persist(rel);
-		entityManager.persist(as);
-		entityManager.persist(contextDev);
-		entityManager.persist(contextInt);
-		entityManager.persist(deployment1);
-		entityManager.persist(deployment2);
-
-		// when
-		service.createShakedownTestOrderForDeploymentOrder(deployment1);
-		service.createShakedownTestOrderForDeploymentOrder(deployment2);
-
-		// then
-		List<ShakedownTestEntity> result = service.getShakedownTestsByTrackingId(trackingId);
-		assertNotNull(result);
-		assertEquals(2, result.size());
-
-	}
-
-}
diff --git a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/shakedown/entity/ShakedownStpEntityTest.java b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/shakedown/entity/ShakedownStpEntityTest.java
deleted file mode 100644
index ee1acab14..000000000
--- a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/shakedown/entity/ShakedownStpEntityTest.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * AMW - Automated Middleware allows you to manage the configurations of
- * your Java EE applications on an unlimited number of different environments
- * with various versions, including the automated deployment of those apps.
- * Copyright (C) 2013-2016 by Puzzle ITC
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package ch.puzzle.itc.mobiliar.business.shakedown.entity;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-
-public class ShakedownStpEntityTest {
-	ShakedownStpEntity shakedownStpEntity;
-	
-	@Before
-	public void initTest(){
-		shakedownStpEntity = new ShakedownStpEntity();
-		shakedownStpEntity.setStpName("STP");
-		shakedownStpEntity.setVersion("Version");
-	}
-	
-	@Test
-	public void addParameter(){
-		//when
-		shakedownStpEntity.addParameter("param1");
-		// then
-		assertFalse(shakedownStpEntity.getComaSeperatedParameters().isEmpty());
-		assertEquals("param1", shakedownStpEntity.getComaSeperatedParameters());
-	}
-	
-	@Test
-	public void add2Parameter(){
-		//when
-		shakedownStpEntity.addParameter("param1");
-		shakedownStpEntity.addParameter("param2");
-		// then
-		assertFalse(shakedownStpEntity.getComaSeperatedParameters().isEmpty());
-		assertEquals("param1,param2", shakedownStpEntity.getComaSeperatedParameters());
-	}
-	
-	@Test
-	public void addTwiceSameParameter(){
-		
-		// when
-		shakedownStpEntity.addParameter("param1");
-		shakedownStpEntity.addParameter("param1");
-		// then
-		assertFalse(shakedownStpEntity.getComaSeperatedParameters().isEmpty());
-		assertEquals("param1", shakedownStpEntity.getComaSeperatedParameters());
-		
-	}
-	
-	
-}
diff --git a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/shakedown/entity/ShakedownTestEntityTest.java b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/shakedown/entity/ShakedownTestEntityTest.java
deleted file mode 100644
index 6056a510e..000000000
--- a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/shakedown/entity/ShakedownTestEntityTest.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * AMW - Automated Middleware allows you to manage the configurations of
- * your Java EE applications on an unlimited number of different environments
- * with various versions, including the automated deployment of those apps.
- * Copyright (C) 2013-2016 by Puzzle ITC
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package ch.puzzle.itc.mobiliar.business.shakedown.entity;
-
-import ch.puzzle.itc.mobiliar.business.shakedown.entity.ShakedownTestEntity;
-import ch.puzzle.itc.mobiliar.business.shakedown.entity.ShakedownTestEntity.ApplicationsFromApplicationServer;
-import org.junit.Test;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.junit.Assert.assertEquals;
-
-public class ShakedownTestEntityTest
-{
-
-	@Test
-	public void setApplicationsFromApplicationServer() {
-		// given
-		ShakedownTestEntity ste = new ShakedownTestEntity();
-
-		List<ApplicationsFromApplicationServer> input = new ArrayList<ShakedownTestEntity.ApplicationsFromApplicationServer>();
-		ApplicationsFromApplicationServer a1 = new ApplicationsFromApplicationServer("test1", Integer.valueOf(1));
-		ApplicationsFromApplicationServer a2 = new ApplicationsFromApplicationServer("test1", Integer.valueOf(1));
-		ApplicationsFromApplicationServer a3 = new ApplicationsFromApplicationServer("test1", Integer.valueOf(1));
-
-		input.add(a1);
-		input.add(a2);
-		input.add(a3);
-
-		// when
-		ste.setApplicationsFromApplicationServer(input);
-
-		List<ApplicationsFromApplicationServer> result = ste.getApplicationsFromApplicationServer();
-
-		// then
-		assertEquals(input.size(), result.size());
-		assertEquals(3, result.size());
-		assertEquals(input.get(0).getApplicationId(), result.get(0).getApplicationId());
-		assertEquals(input.get(0).getApplicationName(), result.get(0).getApplicationName());
-		assertEquals(input.get(1).getApplicationId(), result.get(1).getApplicationId());
-		assertEquals(input.get(1).getApplicationName(), result.get(1).getApplicationName());
-		assertEquals(input.get(2).getApplicationId(), result.get(2).getApplicationId());
-		assertEquals(input.get(2).getApplicationName(), result.get(2).getApplicationName());
-	}
-
-	@Test
-	public void setApplicationsFromApplicationServer_empty() {
-		// given
-		ShakedownTestEntity ste = new ShakedownTestEntity();
-
-		List<ApplicationsFromApplicationServer> input = new ArrayList<ShakedownTestEntity.ApplicationsFromApplicationServer>();
-
-		// when
-
-		ste.setApplicationsFromApplicationServer(input);
-
-		List<ApplicationsFromApplicationServer> result = ste.getApplicationsFromApplicationServer();
-
-		// then
-		assertEquals(input.size(), result.size());
-		assertEquals(0, result.size());
-	}
-
-}
diff --git a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/shakedown/xmlmodel/STSTest.java b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/shakedown/xmlmodel/STSTest.java
deleted file mode 100644
index 2ec9f1693..000000000
--- a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/shakedown/xmlmodel/STSTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * AMW - Automated Middleware allows you to manage the configurations of
- * your Java EE applications on an unlimited number of different environments
- * with various versions, including the automated deployment of those apps.
- * Copyright (C) 2013-2016 by Puzzle ITC
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package ch.puzzle.itc.mobiliar.business.shakedown.xmlmodel;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-public class STSTest {
-
-	STS sts = new STS();
-
-	@Before
-	public void setUp() throws Exception {
-		sts.setTestId(12);
-	}
-
-	@Test
-	public void testGetShakedowntestsAsCSV() {
-		List<String> shakedownTests = new ArrayList<String>();
-		shakedownTests.add("stp_module1 firstparam \"param with"+System.lineSeparator()+"space\"");	
-		shakedownTests.add(" stp_module2 secondparam");
-		shakedownTests.add("stp_module3");
-		sts.setShakedowntests(shakedownTests);
-		
-		String csv = sts.getShakedowntestsAsCSV();
-		Assert.assertTrue(csv.startsWith("12"));
-		
-		String line = csv.substring(csv.indexOf(System.lineSeparator())+System.lineSeparator().length());
-		Assert.assertEquals("stp_module1\tfirstparam \"param with space\""+System.lineSeparator()+"stp_module2\tsecondparam"+System.lineSeparator()+"stp_module3"+System.lineSeparator(), line);
-		System.out.println(line);		
-	}
-
-}
diff --git a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/shakedown/xmlmodel/TestSetTest.java b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/shakedown/xmlmodel/TestSetTest.java
deleted file mode 100644
index 2bd50013f..000000000
--- a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/shakedown/xmlmodel/TestSetTest.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * AMW - Automated Middleware allows you to manage the configurations of
- * your Java EE applications on an unlimited number of different environments
- * with various versions, including the automated deployment of those apps.
- * Copyright (C) 2013-2016 by Puzzle ITC
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package ch.puzzle.itc.mobiliar.business.shakedown.xmlmodel;
-
-import ch.puzzle.itc.mobiliar.business.shakedown.xmlmodel.TestSet.OverallStatus;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-import javax.xml.bind.JAXB;
-import java.io.StringReader;
-
-public class TestSetTest {
-	
-	@Before
-	public void setUp() throws Exception {
-	}
-
-	@Test
-	public void testGeneralFailure() {
-		String message = "<testset id=\"1504\"><test name=\"AMW_stp_tcpping\" version=\"0.0.1-SNAPSHOT\">"
-				+ "<command executionTime=\"1413894337461\">/tmp/0.39768303476961575/runtest.sh localhost -c 5</command>"
-				+ "<stderr><![CDATA[  		]]></stderr>"
-				+ "<stdout><![CDATA[SUCCESS: PING localhost.localdomain (127.0.0.1) 56(84) bytes of data."
-				+ "64 bytes from localhost.localdomain (127.0.0.1): icmp_seq=1 ttl=64 time=0.032 ms"
-				+ "64 bytes from localhost.localdomain (127.0.0.1): icmp_seq=2 ttl=64 time=0.041 ms"
-				+ "64 bytes from localhost.localdomain (127.0.0.1): icmp_seq=3 ttl=64 time=0.039 ms"
-				+ "64 bytes from localhost.localdomain (127.0.0.1): icmp_seq=4 ttl=64 time=0.041 ms"
-				+ "64 bytes from localhost.localdomain (127.0.0.1): icmp_seq=5 ttl=64 time=0.040 ms"
-				+ "--- localhost.localdomain ping statistics ---"
-				+ "5 packets transmitted, 5 received, 0% packet loss, time 4000ms"
-				+ "rtt min/avg/max/mdev = 0.032/0.038/0.041/0.007 ms"
-				+ "]]></stdout>"
-				+ "<testStatus>successful</testStatus>"
-				+ "</test><failure>Exception: java.io.FileNotFoundException: /tmp/0.6569873192883965/lib/commons-codec-1.9.jar (Not a directory)</failure></testset>";
-		TestSet set = JAXB.unmarshal(new StringReader(message), TestSet.class);
-		Assert.assertEquals(OverallStatus.failed, set.getOverallStatus());
-		Assert.assertTrue(set.getTestMessage().contains("testErrorMsg"));
-		Assert.assertTrue(set.getTestMessage().contains("FileNotFoundException"));
-	}
-	
-	@Test
-	public void testPartialFailure() {
-		String message = "<testset id=\"1504\"><test name=\"AMW_stp_tcpping\" version=\"0.0.1-SNAPSHOT\">"
-				+ "<command executionTime=\"1413894337461\">/tmp/0.39768303476961575/runtest.sh localhost -c 5</command>"
-				+ "<stderr><![CDATA[  		]]></stderr>"
-				+ "<stdout><![CDATA[SUCCESS   ]]></stdout>"
-				+ "<testStatus>successful</testStatus>"
-				
-				+ "</test>"
-				+ "<test name=\"AMW_stp_tcpping\" version=\"0.0.1-SNAPSHOT\">"
-				+ "<command executionTime=\"1413894337461\">/tmp/0.39768303476961575/runtest.sh localhost -c 5</command>"
-				+ "<stderr><![CDATA[  SOMETHING WRONG		]]></stderr>"
-				+ "<stdout><![CDATA[      ]]></stdout>"
-				+ "<testStatus>failed</testStatus>"				
-				+ "</test></testset>";
-		TestSet set = JAXB.unmarshal(new StringReader(message), TestSet.class);
-		Assert.assertEquals(OverallStatus.failed, set.getOverallStatus());
-		Assert.assertTrue(set.getTestMessage().contains("testErrorMsg"));
-		Assert.assertTrue(set.getTestMessage().contains("SOMETHING WRONG"));
-	}
-	
-	@Test
-	public void testSuccess() {
-		String message = "<testset id=\"1504\"><test name=\"AMW_stp_tcpping\" version=\"0.0.1-SNAPSHOT\">"
-				+ "<command executionTime=\"1413894337461\">/tmp/0.39768303476961575/runtest.sh localhost -c 5</command>"
-				+ "<stderr><![CDATA[  		]]></stderr>"
-				+ "<stdout><![CDATA[SUCCESS   ]]></stdout>"
-				+ "<testStatus>successful</testStatus>"				
-				+ "</test>"
-				+ "<test name=\"AMW_stp_tcpping\" version=\"0.0.1-SNAPSHOT\">"
-				+ "<command executionTime=\"1413894337461\">/tmp/0.39768303476961575/runtest.sh localhost -c 5</command>"
-				+ "<stderr><![CDATA[		]]></stderr>"
-				+ "<stdout><![CDATA[      ]]></stdout>"
-				+ "<testStatus>successful</testStatus>"				
-				+ "</test></testset>";
-		TestSet set = JAXB.unmarshal(new StringReader(message), TestSet.class);
-		Assert.assertEquals(OverallStatus.success, set.getOverallStatus());
-	}
-
-	@Test
-	public void testWarning() {
-		String message = "<testset id=\"1504\"><test name=\"AMW_stp_tcpping\" version=\"0.0.1-SNAPSHOT\">"
-				+ "<command executionTime=\"1413894337461\">/tmp/0.39768303476961575/runtest.sh localhost -c 5</command>"
-				+ "<stderr><![CDATA[  		]]></stderr>"
-				+ "<stdout><![CDATA[SUCCESS   ]]></stdout>"
-				+ "<testStatus>successful</testStatus>"				
-				+ "</test>"
-				+ "<test name=\"AMW_stp_tcpping\" version=\"0.0.1-SNAPSHOT\">"
-				+ "<testStatus>missing</testStatus>"				
-				+ "</test></testset>";
-		TestSet set = JAXB.unmarshal(new StringReader(message), TestSet.class);
-		Assert.assertEquals(OverallStatus.warning, set.getOverallStatus());
-	}
-}
diff --git a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/template/boundary/TemplateEditorTest.java b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/template/boundary/TemplateEditorTest.java
index 8b89ae9f8..732e1db9a 100644
--- a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/template/boundary/TemplateEditorTest.java
+++ b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/template/boundary/TemplateEditorTest.java
@@ -119,35 +119,6 @@ public void shouldNotThrowExceptionForTemplateWithNameAndValidPath() throws AMWE
         // test fails if an exception is thrown
     }
 
-    @Test
-    public void shouldRejectSaveTemplateForResourceTypeInTestingMode_missingPermission() {
-        // given
-        doReturn(false).when(permissionService).hasPermission(Permission.SHAKEDOWN_TEST_MODE);
-        // when
-        NotAuthorizedException exception = assertThrows(NotAuthorizedException.class,
-                                                        () -> templateEditor.saveTemplateForResourceType(
-                                                                templateDescriptorEntity,
-                                                                1,
-                                                                true));
-        // then
-        assertThat(exception.getMessage(), is("Not Authorized! You're not allowed to execute shakedown test mode!"));
-    }
-
-    @Test
-    public void shouldAllowSaveTemplateForResourceTypeInTestingMode_withPermission() throws AMWException {
-        // given
-        doReturn(true).when(permissionService).hasPermission(Permission.SHAKEDOWN_TEST_MODE);
-        ResourceTypeEntity resourceTypeEntity = new ResourceTypeEntity();
-        doReturn(resourceTypeEntity).when(entityManager).find(ResourceTypeEntity.class, 1);
-        doNothing().when(templateEditor).saveTemplate(templateDescriptorEntity, resourceTypeEntity);
-
-        // when
-        templateEditor.saveTemplateForResourceType(templateDescriptorEntity, 1, true);
-
-        // then
-        verify(templateEditor).saveTemplate(templateDescriptorEntity, resourceTypeEntity);
-    }
-
     @Test
     public void shouldRejectSaveTemplateForResourceType_missingPermissionForActionCreate() {
         // given
@@ -159,8 +130,7 @@ public void shouldRejectSaveTemplateForResourceType_missingPermissionForActionCr
         NotAuthorizedException exception = assertThrows(NotAuthorizedException.class,
                                                         () -> templateEditor.saveTemplateForResourceType(
                                                                 templateDescriptorEntity,
-                                                                1,
-                                                                false));
+                                                                1));
 
         // then
         assertThat(exception.getMessage(),
@@ -179,8 +149,7 @@ public void shouldRejectSaveTemplateForResourceType_missingPermissionForActionUp
         NotAuthorizedException exception = assertThrows(NotAuthorizedException.class,
                                                         () -> templateEditor.saveTemplateForResourceType(
                                                                 templateDescriptorEntity,
-                                                                1,
-                                                                false));
+                                                                1));
 
         // then
         assertThat(exception.getMessage(),
@@ -196,7 +165,7 @@ public void shouldAllowSaveTemplateForResourceType_actionAdd() throws AMWExcepti
         doNothing().when(templateEditor).saveTemplate(templateDescriptorEntity, resourceTypeEntity);
 
         // when
-        templateEditor.saveTemplateForResourceType(templateDescriptorEntity, 1, false);
+        templateEditor.saveTemplateForResourceType(templateDescriptorEntity, 1);
 
         // then
         verify(templateEditor).saveTemplate(templateDescriptorEntity, resourceTypeEntity);
@@ -212,41 +181,12 @@ public void shouldAllowSaveTemplateForResourceType_actionUpdate() throws AMWExce
         doNothing().when(templateEditor).saveTemplate(templateDescriptorEntity, resourceTypeEntity);
 
         // when
-        templateEditor.saveTemplateForResourceType(templateDescriptorEntity, 1, false);
+        templateEditor.saveTemplateForResourceType(templateDescriptorEntity, 1);
 
         // then
         verify(templateEditor).saveTemplate(templateDescriptorEntity, resourceTypeEntity);
     }
 
-    @Test
-    public void shouldRejectSaveTemplateForResourceInTestingMode_missingPermission() {
-        // given
-        doReturn(false).when(permissionService).hasPermission(Permission.SHAKEDOWN_TEST_MODE);
-        // when
-        NotAuthorizedException exception = assertThrows(NotAuthorizedException.class,
-                                                        () -> templateEditor.saveTemplateForResource(
-                                                                templateDescriptorEntity,
-                                                                1,
-                                                                true));
-        // then
-        assertThat(exception.getMessage(), is("Not Authorized! You're not allowed to execute shakedown test mode!"));
-    }
-
-    @Test
-    public void shouldAllowSaveTemplateForResourceInTestingMode_withPermission() throws AMWException {
-        // given
-        doReturn(true).when(permissionService).hasPermission(Permission.SHAKEDOWN_TEST_MODE);
-        ResourceEntity resourceEntity = new ResourceEntity();
-        doReturn(resourceEntity).when(entityManager).find(ResourceEntity.class, 1);
-        doNothing().when(templateEditor).saveTemplate(templateDescriptorEntity, resourceEntity);
-
-        // when
-        templateEditor.saveTemplateForResource(templateDescriptorEntity, 1, true);
-
-        // then
-        verify(templateEditor).saveTemplate(templateDescriptorEntity, resourceEntity);
-    }
-
     @Test
     public void shouldRejectSaveTemplateForResource_missingPermissionForActionCreate() {
         // given        
@@ -259,8 +199,7 @@ public void shouldRejectSaveTemplateForResource_missingPermissionForActionCreate
         NotAuthorizedException exception = assertThrows(NotAuthorizedException.class,
                                                         () -> templateEditor.saveTemplateForResource(
                                                                 templateDescriptorEntity,
-                                                                1,
-                                                                false));
+                                                                1));
 
         // then
         assertThat(exception.getMessage(),
@@ -280,8 +219,7 @@ public void shouldRejectSaveTemplateForResource_missingPermissionForActionUpdate
         NotAuthorizedException exception = assertThrows(NotAuthorizedException.class,
                                                         () -> templateEditor.saveTemplateForResource(
                                                                 templateDescriptorEntity,
-                                                                1,
-                                                                false));
+                                                                1));
 
         // then
         assertThat(exception.getMessage(),
@@ -298,7 +236,7 @@ public void shouldAllowSaveTemplateForResource_actionAdd() throws AMWException {
         doNothing().when(templateEditor).saveTemplate(templateDescriptorEntity, resourceEntity);
 
         // when
-        templateEditor.saveTemplateForResource(templateDescriptorEntity, 1, false);
+        templateEditor.saveTemplateForResource(templateDescriptorEntity, 1);
 
         // then
         verify(templateEditor).saveTemplate(templateDescriptorEntity, resourceEntity);
@@ -315,7 +253,7 @@ public void shouldAllowSaveTemplateForResource_actionUpdate() throws AMWExceptio
         doNothing().when(templateEditor).saveTemplate(templateDescriptorEntity, resourceEntity);
 
         // when
-        templateEditor.saveTemplateForResource(templateDescriptorEntity, 1, false);
+        templateEditor.saveTemplateForResource(templateDescriptorEntity, 1);
 
         // then
         verify(templateEditor).saveTemplate(templateDescriptorEntity, resourceEntity);
@@ -406,4 +344,4 @@ public void shouldAllowSaveTemplateForRelation_notResourceEdit() throws AMWExcep
         // then
         verify(templateEditor).saveTemplate(templateDescriptorEntity, resourceTypeRelation);
     }
-}
\ No newline at end of file
+}
diff --git a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/template/control/TemplatesScreenDomainServicePersistenceTest.java b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/template/control/TemplatesScreenDomainServicePersistenceTest.java
index 99890e13d..4bd7b5a36 100644
--- a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/template/control/TemplatesScreenDomainServicePersistenceTest.java
+++ b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/template/control/TemplatesScreenDomainServicePersistenceTest.java
@@ -61,21 +61,17 @@ public void test_getTemplateDescriptorByName() {
 		// given
 		TemplateDescriptorEntity template1 = new TemplateDescriptorEntity();
 		template1.setName("datasource_db2");
-		template1.setTesting(false);
 
 		TemplateDescriptorEntity template2 = new TemplateDescriptorEntity();
 		template2.setName("AMW_stp_ws");
-		template2.setTesting(true);
 
 		entityManager.persist(template1);
 		entityManager.persist(template2);
 
 		// when
-		List<TemplateDescriptorEntity> result1 = service.getTemplateDescriptorByName("datasource_db2", false);
-		List<TemplateDescriptorEntity> result2 = service.getTemplateDescriptorByName("AMW_stp_ws", true);
-		List<TemplateDescriptorEntity> result3 = service.getTemplateDescriptorByName("datasource_db2", true);
-		List<TemplateDescriptorEntity> result4 = service.getTemplateDescriptorByName("AMW_stp_ws", false);
-		List<TemplateDescriptorEntity> result5 = service.getTemplateDescriptorByName("db2", false);
+		List<TemplateDescriptorEntity> result1 = service.getTemplateDescriptorByName("datasource_db2");
+		List<TemplateDescriptorEntity> result2 = service.getTemplateDescriptorByName("AMW_stp_ws");
+		List<TemplateDescriptorEntity> result3 = service.getTemplateDescriptorByName("db2");
 
 		// then
 		assertNotNull(result1);
@@ -88,10 +84,6 @@ public void test_getTemplateDescriptorByName() {
 
 		assertNotNull(result3);
 		assertEquals(0, result3.size());
-		assertNotNull(result4);
-		assertEquals(0, result4.size());
-		assertNotNull(result5);
-		assertEquals(0, result5.size());
 	}
 
 	@Test
@@ -99,7 +91,6 @@ public void test_renameTestingTemplates() {
 		// given
 		TemplateDescriptorEntity template = new TemplateDescriptorEntity();
 		template.setName("AMW_stp_ws");
-		template.setTesting(true);
 		entityManager.persist(template);
 
 		// when
diff --git a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/usersettings/control/UserSettingsServicePersistenceTest.java b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/usersettings/control/UserSettingsServicePersistenceTest.java
deleted file mode 100644
index 5a9402264..000000000
--- a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/usersettings/control/UserSettingsServicePersistenceTest.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * AMW - Automated Middleware allows you to manage the configurations of
- * your Java EE applications on an unlimited number of different environments
- * with various versions, including the automated deployment of those apps.
- * Copyright (C) 2013-2016 by Puzzle ITC
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package ch.puzzle.itc.mobiliar.business.usersettings.control;
-
-import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.ResourceEntity;
-import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.ResourceTypeEntity;
-import ch.puzzle.itc.mobiliar.business.usersettings.entity.FavoriteResourceEntity;
-import ch.puzzle.itc.mobiliar.business.usersettings.entity.MyAMWObject;
-import ch.puzzle.itc.mobiliar.business.usersettings.entity.UserSettingsEntity;
-import ch.puzzle.itc.mobiliar.common.exception.ResourceNotFoundException;
-import ch.puzzle.itc.mobiliar.test.PersistingEntityBuilder;
-import ch.puzzle.itc.mobiliar.test.testrunner.PersistenceTestRunner;
-import org.hibernate.exception.ConstraintViolationException;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.mockito.Spy;
-
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.PersistenceException;
-import java.util.Map;
-import java.util.logging.Logger;
-
-import static org.junit.Assert.*;
-
-@RunWith(PersistenceTestRunner.class)
-public class UserSettingsServicePersistenceTest {
-
-	@Spy
-	@PersistenceContext
-	EntityManager entityManager;
-
-	@Mock
-	Logger log;
-
-	@InjectMocks
-	UserSettingsService service;
-
-
-
-	@Before
-	public void before() {
-		MockitoAnnotations.openMocks(this);
-	}
-
-	@Test
-	public void test_addFavoriteResource_single() throws ResourceNotFoundException {
-		// given
-		ResourceTypeEntity appType = PersistingEntityBuilder.buildResourceType(entityManager, "application");
-		ResourceEntity app1 = PersistingEntityBuilder.buildResourceEntityWithRelease(entityManager, appType, "app1", null, null);
-		UserSettingsEntity user = new UserSettingsEntity();
-		user.setUserName("mobi");
-		entityManager.persist(user);
-
-		// when
-		UserSettingsEntity resultUser = service.addFavoriteResource(app1.getResourceGroup().getId(), user.getUserName());
-
-		// then
-		assertNotNull(resultUser);
-		assertNotNull(resultUser.getFavoriteResources());
-		assertEquals(1, resultUser.getFavoriteResources().size());
-		FavoriteResourceEntity fav = entityManager.find(FavoriteResourceEntity.class, resultUser.getFavoriteResources().iterator().next().getId());
-		assertNotNull(fav);
-		assertEquals(app1.getResourceGroup().getId(), fav.getResourceGroup().getId());
-		assertEquals(user.getId(), fav.getUser().getId());
-	}
-
-	@Test
-	public void test_addFavoriteResource_sameGroup() throws ResourceNotFoundException {
-		// given
-		ResourceTypeEntity appType = PersistingEntityBuilder.buildResourceType(entityManager, "application");
-		ResourceEntity app1 = PersistingEntityBuilder.buildResourceEntityWithRelease(entityManager, appType, "app1", null, null);
-		UserSettingsEntity user = new UserSettingsEntity();
-		user.setUserName("mobi");
-		entityManager.persist(user);
-
-		// when
-		UserSettingsEntity resultUser = service.addFavoriteResource(app1.getResourceGroup().getId(), user.getUserName());
-		entityManager.flush();
-
-		// then
-		assertNotNull(resultUser);
-		assertNotNull(resultUser.getFavoriteResources());
-		assertEquals(1, resultUser.getFavoriteResources().size());
-		FavoriteResourceEntity fav = entityManager.find(FavoriteResourceEntity.class, resultUser.getFavoriteResources().iterator().next().getId());
-		assertNotNull(fav);
-		assertEquals(app1.getResourceGroup().getId(), fav.getResourceGroup().getId());
-		assertEquals(user.getId(), fav.getUser().getId());
-
-		// when
-		boolean trownException = false;
-		try {
-			service.addFavoriteResource(app1.getResourceGroup().getId(), user.getUserName());
-			entityManager.flush();
-		} catch (PersistenceException e) {
-			if (e.getCause() instanceof ConstraintViolationException) {
-				trownException = true;
-			}
-		}
-		assertTrue("ConstraintViolationException expected but not thrown", trownException);
-	}
-
-	@Test
-	public void test_loadFavoriteResources() throws ResourceNotFoundException {
-		// given
-		ResourceTypeEntity appType = PersistingEntityBuilder.buildResourceType(entityManager, "application");
-		entityManager.persist(appType);
-		ResourceTypeEntity wsType = PersistingEntityBuilder.buildResourceType(entityManager, "webservice");
-		entityManager.persist(wsType);
-		ResourceEntity app1 = PersistingEntityBuilder.buildResourceEntityWithRelease(entityManager, appType, "app1", null, null);
-		entityManager.persist(app1);
-		ResourceEntity app2 = PersistingEntityBuilder.buildResourceEntityWithRelease(entityManager, appType, "app2", app1.getResourceGroup(), null);
-		entityManager.persist(app2);
-		ResourceEntity ws1 = PersistingEntityBuilder.buildResourceEntityWithRelease(entityManager, wsType, "ws1", null, null);
-		entityManager.persist(ws1);
-		UserSettingsEntity user = new UserSettingsEntity();
-		user.setUserName("mobi");
-		entityManager.persist(user);
-
-		service.addFavoriteResource(app1.getResourceGroup().getId(), user.getUserName());
-		service.addFavoriteResource(ws1.getResourceGroup().getId(), user.getUserName());
-
-		// when
-		Map<Integer, MyAMWObject> result = service.loadFavoriteResources(user.getUserName());
-
-		// then
-		assertNotNull(result);
-		assertEquals(2, result.size());
-	}
-
-}
diff --git a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/test/EntityBuilder.java b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/test/EntityBuilder.java
index d8df6cafa..5c65ad9f7 100644
--- a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/test/EntityBuilder.java
+++ b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/test/EntityBuilder.java
@@ -359,7 +359,6 @@ protected TemplateDescriptorEntity buildTemplate(String name, String content, St
 		TemplateDescriptorEntity template = new TemplateDescriptorEntity();
 		template.setFileContent(content);
 		template.setName(name);
-		template.setTesting(false);
 		template.setTargetPlatforms(new LinkedHashSet<ResourceGroupEntity>(Arrays.asList(platform
 				.getResourceGroup())));
 		template.setTargetPath(path);
diff --git a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/test/GeneratorObjectFactory.java b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/test/GeneratorObjectFactory.java
index d32bb36d3..b0e638b3e 100644
--- a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/test/GeneratorObjectFactory.java
+++ b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/test/GeneratorObjectFactory.java
@@ -146,7 +146,6 @@ public TemplateDescriptorEntity createTemplate(String name, String content, Inte
 		TemplateDescriptorEntity templateDesc = new TemplateDescriptorEntity();
 		templateDesc.setFileContent(content);
 		templateDesc.setName(name);
-		templateDesc.setTesting(false);
 		templateDesc.setTargetPlatforms(new HashSet<ResourceGroupEntity>());
 		templateDesc.getTargetPlatforms().add(createTargetPlatform(targetPlatformId));
 
diff --git a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/test/PersistingEntityBuilder.java b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/test/PersistingEntityBuilder.java
index c78b67dc2..97a4eddd3 100644
--- a/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/test/PersistingEntityBuilder.java
+++ b/AMW_business/src/test/java/ch/puzzle/itc/mobiliar/test/PersistingEntityBuilder.java
@@ -49,7 +49,7 @@ public PersistingEntityBuilder(EntityManager entityManager) {
 
 	@Override
 	protected void build() {
-		// dont build amw by default
+		// don't build amw by default
 	}
 
 	public PersistingEntityBuilder buildAmw() {
diff --git a/AMW_business/src/test/resources/META-INF/persistence.xml b/AMW_business/src/test/resources/META-INF/persistence.xml
index c6b93e2db..014f13d92 100644
--- a/AMW_business/src/test/resources/META-INF/persistence.xml
+++ b/AMW_business/src/test/resources/META-INF/persistence.xml
@@ -17,7 +17,6 @@
                <class>ch.puzzle.itc.mobiliar.business.function.entity.AmwFunctionEntity</class>
                <class>ch.puzzle.itc.mobiliar.business.deploy.entity.DeploymentEntity</class>
                <class>ch.puzzle.itc.mobiliar.business.deploy.entity.NodeJobEntity</class>
-               <class>ch.puzzle.itc.mobiliar.business.usersettings.entity.FavoriteResourceEntity</class>
                <class>ch.puzzle.itc.mobiliar.business.database.entity.MyRevisionEntity</class>
                <class>ch.puzzle.itc.mobiliar.business.property.entity.MikEntity</class>
                <class>ch.puzzle.itc.mobiliar.business.property.entity.PropertyDescriptorEntity</class>
@@ -33,8 +32,6 @@
                <class>ch.puzzle.itc.mobiliar.business.configurationtag.entity.ResourceTagEntity</class>
                <class>ch.puzzle.itc.mobiliar.business.resourcegroup.entity.ResourceTypeContextEntity</class>
                <class>ch.puzzle.itc.mobiliar.business.resourcegroup.entity.ResourceTypeEntity</class>
-               <class>ch.puzzle.itc.mobiliar.business.shakedown.entity.ShakedownStpEntity</class>
-               <class>ch.puzzle.itc.mobiliar.business.shakedown.entity.ShakedownTestEntity</class>
                <class>ch.puzzle.itc.mobiliar.business.template.entity.TemplateDescriptorEntity</class>
                <class>ch.puzzle.itc.mobiliar.business.usersettings.entity.UserSettingsEntity</class>
                <class>ch.puzzle.itc.mobiliar.business.security.entity.PermissionEntity</class>
diff --git a/AMW_business/src/test/resources/integration-test/generator/AppServerTemplateProcessorIntegrationTest/modellFromAppServer b/AMW_business/src/test/resources/integration-test/generator/AppServerTemplateProcessorIntegrationTest/modellFromAppServer
index 281395395..b679ab350 100644
--- a/AMW_business/src/test/resources/integration-test/generator/AppServerTemplateProcessorIntegrationTest/modellFromAppServer
+++ b/AMW_business/src/test/resources/integration-test/generator/AppServerTemplateProcessorIntegrationTest/modellFromAppServer
@@ -118,9 +118,6 @@ recursion v2.0:
             logoutUrl: http://mobiwiki.mobicorp.ch/wiki/index.php/AMW_Tool
             logsPath: /home/jboss/amw/logs
             name: ch_puzzle_itc_mobi_amw
-            stmpath: /home/jboss/amw/shakedown/stm.jar
-            stmrepo: /home/jboss/amw/shakedown/stps
-            testResultPath: /home/jboss/amw/shakedown/results
             # <== app
             # ==> appServer:
             additionalJavaOpts: 
@@ -474,12 +471,6 @@ recursion v2.0:
 	       /home/jboss/amw/build
            logsPath: 
 	       /home/jboss/amw/logs
-           stmpath: 
-	       /home/jboss/amw/shakedown/stm.jar
-           stmrepo: 
-	       /home/jboss/amw/shakedown/stps
-           testResultPath: 
-	       /home/jboss/amw/shakedown/results
             # <== Path
             # ==> Port:
            port: 
@@ -493,9 +484,6 @@ recursion v2.0:
             # <== propertyTypes
             # ==> providedResTypes:
             # <== providedResTypes
-            stmpath: /home/jboss/amw/shakedown/stm.jar
-            stmrepo: /home/jboss/amw/shakedown/stps
-            testResultPath: /home/jboss/amw/shakedown/results
             # <== ch_puzzle_itc_mobi_amw
             # <== applications
             serverLogLevel: INFO
diff --git a/AMW_business/src/test/resources/integration-test/generator/AppServerTemplateProcessorIntegrationTest/modellFromNode b/AMW_business/src/test/resources/integration-test/generator/AppServerTemplateProcessorIntegrationTest/modellFromNode
index d4449bb9d..07673cc96 100644
--- a/AMW_business/src/test/resources/integration-test/generator/AppServerTemplateProcessorIntegrationTest/modellFromNode
+++ b/AMW_business/src/test/resources/integration-test/generator/AppServerTemplateProcessorIntegrationTest/modellFromNode
@@ -10,9 +10,6 @@ amw.generatorPath=/home/jboss/amw/build
 amw.logsPath=/home/jboss/amw/logs
 amw.hibernate.dialect=org.hibernate.dialect.DB2390Dialect
 amw.mailDomain=mobi.ch
-amw.stmpath=/home/jboss/amw/shakedown/stm.jar
-amw.stmrepo=/home/jboss/amw/shakedown/stps
-amw.testResultPath=/home/jboss/amw/shakedown/results
 amw.logoutUrl=http://mobiwiki.mobicorp.ch/wiki/index.php/AMW_Tool
 
 #Für grosse MAIA-Imports in standalone.xml:
@@ -125,7 +122,7 @@ ch.mobi.db2.host.currentSchema=DB2BVIEW
             # <== application-users.properties ch_puzzle_itc_mobi_amw
             # ==> application-role-mapping.properties ch_puzzle_itc_mobi_amw:
             content: L899DIR=viewer
-AAMW_CONFIG_ADMIN=config_admin,shakedown_admin
+AAMW_CONFIG_ADMIN=config_admin
 AAMW_APP_DEVELOPER=app_developer
 AAMW_SERVER_ADMIN=server_admin
 
@@ -133,7 +130,7 @@ AAMW_ADMIN_DEPLOYER=admin_deployer
 #Unbenutzt
 #AAMW_TEST_DEPLOYER=
 AAMW_DEVELOPER_DEPLOYER=developer_deployer
-AAMW_MANAGEMENT_DEPLOYER=env_management_deployer,test_deployer,shakedown_tester
+AAMW_MANAGEMENT_DEPLOYER=env_management_deployer,test_deployer
 
 #Maia WS Aufruf
 AAMW_MAIA_WS=maia_import
@@ -288,7 +285,6 @@ AAMW_MAIA_WS=maia_import
             id: 8745
             name: ch_puzzle_itc_mobi_amw
             logsPath: /home/jboss/amw/logs
-            testResultPath: /home/jboss/amw/shakedown/results
             # ==> app_jspCertJKS:
             fileName: jspStore_dev.jks
             id: 1254
@@ -506,15 +502,6 @@ AAMW_MAIA_WS=maia_import
             # => logsPath
 	       /home/jboss/amw/logs
             # <= logsPath
-            # => stmpath
-	       /home/jboss/amw/shakedown/stm.jar
-            # <= stmpath
-            # => stmrepo
-	       /home/jboss/amw/shakedown/stps
-            # <= stmrepo
-            # => testResultPath
-	       /home/jboss/amw/shakedown/results
-            # <= testResultPath
             # <== Path
             # ==> Port:
             # => port
@@ -563,11 +550,7 @@ AAMW_MAIA_WS=maia_import
             logoutUrl: http://mobiwiki.mobicorp.ch/wiki/index.php/AMW_Tool
             logsPath: /home/jboss/amw/logs
             name: ch_puzzle_itc_mobi_amw
-            stmpath: /home/jboss/amw/shakedown/stm.jar
-            stmrepo: /home/jboss/amw/shakedown/stps
-            testResultPath: /home/jboss/amw/shakedown/results
             # <== app
-            stmrepo: /home/jboss/amw/shakedown/stps
             MavenArtifactId: AMW_ear
             # ==> app_certAdIntern:
             id: 13242
@@ -611,7 +594,6 @@ AAMW_MAIA_WS=maia_import
             MavenGroupId: ch.puzzle.itc.mobiliar
             # ==> providedResTypes:
             # <== providedResTypes
-            stmpath: /home/jboss/amw/shakedown/stm.jar
             generatorPath: /home/jboss/amw/build
             # ==> app_mobiTrustJKS:
             fileName: mobiJspDynWesTrust_dev.jks
@@ -723,9 +705,6 @@ AAMW_MAIA_WS=maia_import
             logoutUrl: http://mobiwiki.mobicorp.ch/wiki/index.php/AMW_Tool
             logsPath: /home/jboss/amw/logs
             name: ch_puzzle_itc_mobi_amw
-            stmpath: /home/jboss/amw/shakedown/stm.jar
-            stmrepo: /home/jboss/amw/shakedown/stps
-            testResultPath: /home/jboss/amw/shakedown/results
             # <== app
             # ==> appServer:
             additionalJavaOpts: 
@@ -1079,12 +1058,6 @@ AAMW_MAIA_WS=maia_import
 	       /home/jboss/amw/build
            logsPath: 
 	       /home/jboss/amw/logs
-           stmpath: 
-	       /home/jboss/amw/shakedown/stm.jar
-           stmrepo: 
-	       /home/jboss/amw/shakedown/stps
-           testResultPath: 
-	       /home/jboss/amw/shakedown/results
             # <== Path
             # ==> Port:
            port: 
@@ -1098,9 +1071,6 @@ AAMW_MAIA_WS=maia_import
             # <== propertyTypes
             # ==> providedResTypes:
             # <== providedResTypes
-            stmpath: /home/jboss/amw/shakedown/stm.jar
-            stmrepo: /home/jboss/amw/shakedown/stps
-            testResultPath: /home/jboss/amw/shakedown/results
             # <== ch_puzzle_itc_mobi_amw
             # <== applications
             # ==> propertyTypes:
diff --git a/AMW_business/src/test/resources/integration-test/testdb/amwFileDbIntegrationEmpty.mv.db b/AMW_business/src/test/resources/integration-test/testdb/amwFileDbIntegrationEmpty.mv.db
index aff573169..480ab1bd2 100644
Binary files a/AMW_business/src/test/resources/integration-test/testdb/amwFileDbIntegrationEmpty.mv.db and b/AMW_business/src/test/resources/integration-test/testdb/amwFileDbIntegrationEmpty.mv.db differ
diff --git a/AMW_commons/src/main/java/ch/puzzle/itc/mobiliar/common/exception/PropertyTypeNotFoundException.java b/AMW_commons/src/main/java/ch/puzzle/itc/mobiliar/common/exception/PropertyTypeNotFoundException.java
deleted file mode 100644
index 37581f4b5..000000000
--- a/AMW_commons/src/main/java/ch/puzzle/itc/mobiliar/common/exception/PropertyTypeNotFoundException.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * AMW - Automated Middleware allows you to manage the configurations of
- * your Java EE applications on an unlimited number of different environments
- * with various versions, including the automated deployment of those apps.
- * Copyright (C) 2013-2016 by Puzzle ITC
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package ch.puzzle.itc.mobiliar.common.exception;
-
-public class PropertyTypeNotFoundException extends NotFoundException{
-
-	private static final long serialVersionUID = 1L;
-
-	public PropertyTypeNotFoundException(String message) {
-		super(message);
-	}
-	
-	public PropertyTypeNotFoundException(String message, Throwable cause){
-		super(message, cause);
-	}
-}
diff --git a/AMW_commons/src/main/java/ch/puzzle/itc/mobiliar/common/exception/ShakedownTestException.java b/AMW_commons/src/main/java/ch/puzzle/itc/mobiliar/common/exception/ShakedownTestException.java
deleted file mode 100644
index 98b6816bd..000000000
--- a/AMW_commons/src/main/java/ch/puzzle/itc/mobiliar/common/exception/ShakedownTestException.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * AMW - Automated Middleware allows you to manage the configurations of
- * your Java EE applications on an unlimited number of different environments
- * with various versions, including the automated deployment of those apps.
- * Copyright (C) 2013-2016 by Puzzle ITC
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package ch.puzzle.itc.mobiliar.common.exception;
-
-public class ShakedownTestException extends Throwable{
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-	public ShakedownTestException() {
-		super();
-		// TODO Auto-generated constructor stub
-	}
-
-	public ShakedownTestException(String message, Throwable cause) {
-		super(message, cause);
-		// TODO Auto-generated constructor stub
-	}
-
-	public ShakedownTestException(String message) {
-		super(message);
-		// TODO Auto-generated constructor stub
-	}
-
-	public ShakedownTestException(Throwable cause) {
-		super(cause);
-		// TODO Auto-generated constructor stub
-	}
-	
-	
-
-}
diff --git a/AMW_commons/src/main/java/ch/puzzle/itc/mobiliar/common/exception/StpNotFoundException.java b/AMW_commons/src/main/java/ch/puzzle/itc/mobiliar/common/exception/StpNotFoundException.java
deleted file mode 100644
index b33124c59..000000000
--- a/AMW_commons/src/main/java/ch/puzzle/itc/mobiliar/common/exception/StpNotFoundException.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * AMW - Automated Middleware allows you to manage the configurations of
- * your Java EE applications on an unlimited number of different environments
- * with various versions, including the automated deployment of those apps.
- * Copyright (C) 2013-2016 by Puzzle ITC
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package ch.puzzle.itc.mobiliar.common.exception;
-
-public class StpNotFoundException extends AMWException{
-
-	private static final long serialVersionUID = 1L;
-
-	public StpNotFoundException(String message) {
-		super(message);
-	}
-	
-	public StpNotFoundException(String message, Throwable cause){
-		super(message, cause);
-	}
-}
-
diff --git a/AMW_commons/src/main/java/ch/puzzle/itc/mobiliar/common/util/NameChecker.java b/AMW_commons/src/main/java/ch/puzzle/itc/mobiliar/common/util/NameChecker.java
index 1fedd2f50..b1b29f295 100644
--- a/AMW_commons/src/main/java/ch/puzzle/itc/mobiliar/common/util/NameChecker.java
+++ b/AMW_commons/src/main/java/ch/puzzle/itc/mobiliar/common/util/NameChecker.java
@@ -23,10 +23,11 @@
 
 public class NameChecker {
 
-	private static final String ERR_MSG_SUFIX = "The name must not contain any other than alphanumerical and \"_\" caracters.";
+	private static final String ERR_MSG_SUFIX = "The name must not contain any other than alphanumerical and \"_\" characters.";
+	private static final String ERR_MSG_INVALID_NAME_CHARACTERS = "The name must not contain any other than alphanumerical and \"_\" / \"-\" characters.";
 
-	private static final String VALID_CHARACTER_REGEXP = "\\S*";
-	
+	private static final String REGEXP_NON_EMPTY_STRING = "\\S*";
+	private static final String REGEXP_ALPHANUMERIC_WITH_UNDERSCORE_HYPHEN = "^[a-zA-Z0-9_-]+$";
 
 	/**
 	 * Ein Resourcename @parm name wird auf seine Gültigkeit geprüft. Der name
@@ -41,12 +42,23 @@ public static boolean isNameValid(String name) {
 		boolean isValid = true;
 
 		if (name != null) {
-			isValid = name.matches(VALID_CHARACTER_REGEXP);
+			isValid = name.matches(REGEXP_NON_EMPTY_STRING);
 		}
 
 		return isValid;
 	}
-	
+
+	/**
+	 * Ein Resourcename @parm name wird auf seine Gültigkeit geprüft.
+	 * Der Name darf keine anderen als alphanumerische Zeichen und "_" und "-" enthalten.
+	 * Null ist gültig!
+	 *
+	 * @param name
+	 * @return
+	 */
+	public static boolean isValidAlphanumericWithUnderscoreHyphenName(String name) {
+		return name == null || name.matches(REGEXP_ALPHANUMERIC_WITH_UNDERSCORE_HYPHEN);
+	}
 
 	/**
 	 * Gibt Fehlermeldung abhängig vom resourcetypen der gegebenen resource
@@ -63,9 +75,17 @@ public static String getErrorText(String type, String name) {
 		return "Invalid " + type + " name \"" + name + "\"! " + ERR_MSG_SUFIX;
 	}
 
+	public static String getErrorTextAlphanumericWithUnderscoreHyphenName(String type, String name) {
+		return "Invalid " + type + " name \"" + name + "\"! " + ERR_MSG_INVALID_NAME_CHARACTERS;
+	}
+
 	public static String getErrorTextForResourceType(String resourceTypeName, String name) {
 		return getErrorText(getResourceTypeScreenName(resourceTypeName), name);
 	}
+
+	public static String getErrorTextForInvalidResourceName(String resourceTypeName, String name) {
+		return getErrorTextAlphanumericWithUnderscoreHyphenName(getResourceTypeScreenName(resourceTypeName), name);
+	}
 	
 	public static String getErrorTextForResourceType(String resourceTypeName) {
 		return getErrorText(getResourceTypeScreenName(resourceTypeName));
diff --git a/AMW_docker/Dockerfile b/AMW_docker/Dockerfile
index c85b77588..7a03e348b 100644
--- a/AMW_docker/Dockerfile
+++ b/AMW_docker/Dockerfile
@@ -13,7 +13,7 @@ COPY --chown=jboss:jboss configuration $JBOSS_HOME/standalone/configuration
 RUN $JBOSS_HOME/bin/jboss-cli.sh --file=$JBOSS_HOME/standalone/configuration/wildfly_base.cli && \
     $JBOSS_HOME/bin/jboss-cli.sh --file=$JBOSS_HOME/standalone/configuration/$DB_CLI_SCRIPT && \
     rm -rf $JBOSS_HOME/standalone/configuration/standalone_xml_history && \
-    mkdir -p $JBOSS_HOME/standalone/data/amw/logs $JBOSS_HOME/standalone/data/amw/generator $JBOSS_HOME/standalone/data/amw/shakedown
+    mkdir -p $JBOSS_HOME/standalone/data/amw/logs $JBOSS_HOME/standalone/data/amw/generator
 
 # add jsf 2.2 for RichFaces
 RUN mkdir -p $JBOSS_HOME/modules/com/sun/jsf-impl/mojarra-2.2 && \
diff --git a/AMW_docker/configuration/props/amw-system.properties b/AMW_docker/configuration/props/amw-system.properties
index 3b066d3f0..63c22df87 100644
--- a/AMW_docker/configuration/props/amw-system.properties
+++ b/AMW_docker/configuration/props/amw-system.properties
@@ -3,7 +3,4 @@ amw.generatorPath=standalone/data/amw/generator
 amw.logoutUrl=http://www.liima.org/
 amw.logsPath=standalone/data/amw/logs
 amw.mailDomain=liima.org
-amw.stmpath=standalone/data/amw/shakedown/stm.jar
-amw.stmrepo=standalone/data/amw/shakedown/stps
-amw.testResultPath=standalone/data/amw/shakedown/results
 org.apache.tomcat.util.http.Parameters.MAX_COUNT=1000
diff --git a/AMW_docker/configuration/props/application-roles.properties b/AMW_docker/configuration/props/application-roles.properties
index 0d1d23db0..4c2e4912a 100644
--- a/AMW_docker/configuration/props/application-roles.properties
+++ b/AMW_docker/configuration/props/application-roles.properties
@@ -21,7 +21,7 @@
 #
 #admin=PowerUser,BillingAdmin,
 #guest=guest
-admin=viewer,config_admin,app_developer,server_admin,admin_deployer,test_deployer,developer_deployer,env_management_deployer,shakedown_admin,shakedown_tester
+admin=viewer,config_admin,app_developer,server_admin,admin_deployer,test_deployer,developer_deployer,env_management_deployer
 viewer=viewer
 dev_dep=developer_deployer,viewer
 app_dev=app_developer,developer_deployer,viewer
diff --git a/AMW_e2e/README.md b/AMW_e2e/README.md
index 7331cf07e..097966074 100644
--- a/AMW_e2e/README.md
+++ b/AMW_e2e/README.md
@@ -10,7 +10,6 @@ Install all dependencies:
 npm install
 ```
 
-
 ## Run the application 
 
 To run the e2e test, you need a running application on http://localhost:8080/AMW_web
@@ -28,7 +27,7 @@ npm start
 npm stop
 ```
 
-Note: there are other ways to start the application. Using docker is the most convenient way if you want to focus on writen end-to-end tests.
+Note: there are other ways to start the application. Using docker is the most convenient way if you want to focus on written end-to-end tests.
 
 ## Using the cypress ui
 
@@ -38,8 +37,8 @@ You can run the cypress ui with the following command:
 npm run test:ui
 ```
 
-This will start the cypress ui that let's you run individual tests and inspect the runs. You have to choose the test type and environment first. 
-Note: onyle e2e tests are setup up for this project, no component testing.
+This will start the cypress ui that lets you run individual tests and inspect the runs. You have to choose the test type and environment first. 
+Note: only e2e tests are setup up for this project, no component testing.
 
 See https://docs.cypress.io/guides/getting-started/opening-the-app for more information.
 
diff --git a/AMW_e2e/cypress/e2e/api/functions-rest.cy.js b/AMW_e2e/cypress/e2e/api/functions-rest.cy.js
new file mode 100644
index 000000000..4165afa7f
--- /dev/null
+++ b/AMW_e2e/cypress/e2e/api/functions-rest.cy.js
@@ -0,0 +1,17 @@
+describe("functions-rest integration test", () => {
+    describe("getting all functions", () => {
+        it("returns a list of functions", () => {
+            cy.request({
+                method: "GET",
+                url: "http://admin:admin@localhost:8080/AMW_rest/resources/settings/functions",
+                body: null,
+                headers: {
+                    "Content-Type": "application/json; charset=utf-8",
+                },
+            }).then((response) => {
+                expect(response.status).eq(200);
+                const functions = response.body;
+            });
+        });
+    });
+});
\ No newline at end of file
diff --git a/AMW_e2e/cypress/e2e/api/property-types-rest.cy.js b/AMW_e2e/cypress/e2e/api/property-types-rest.cy.js
new file mode 100644
index 000000000..8ab8917b1
--- /dev/null
+++ b/AMW_e2e/cypress/e2e/api/property-types-rest.cy.js
@@ -0,0 +1,145 @@
+describe("property-types integration test", () => {
+  describe("creating property types - validation", () => {
+    it("validation fails when body is null", () => {
+      cy.request({
+        method: "POST",
+        url: "http://admin:admin@localhost:8080/AMW_rest/resources/settings/propertyTypes",
+        body: null,
+        headers: {
+          "Content-Type": "application/json; charset=utf-8",
+        },
+        failOnStatusCode: false,
+      }).then((response) => {
+        expect(response.status).eq(400);
+        expect(response.body.message).eq("Property type must not be null.");
+      });
+    });
+
+    it("validation fails when name property is null", () => {
+      cy.request({
+        method: "POST",
+        url: "http://admin:admin@localhost:8080/AMW_rest/resources/settings/propertyTypes",
+        body: { name: null, validationRegex: "string", propertyTags: [] },
+        failOnStatusCode: false,
+      }).then((response) => {
+        expect(response.status).eq(400);
+        expect(response.body.message).contains(
+          "PropertyType name must not be null.",
+        );
+      });
+    });
+
+    it("validation fails when name property is blank", () => {
+      cy.request({
+        method: "POST",
+        url: "http://admin:admin@localhost:8080/AMW_rest/resources/settings/propertyTypes",
+        body: { name: "", validationRegex: "string", propertyTags: [] },
+        failOnStatusCode: false,
+      }).then((response) => {
+        expect(response.status).eq(400);
+        expect(response.body.message).eq(
+          "PropertyType name must not be empty.",
+        );
+      });
+    });
+
+    it("validation fails when tag name property is blank", () => {
+      cy.request({
+        method: "POST",
+        url: "http://admin:admin@localhost:8080/AMW_rest/resources/settings/propertyTypes",
+        body: {
+          name: "name",
+          validationRegex: "string",
+          propertyTags: [{ name: null, type: "LOCAL" }],
+        },
+        failOnStatusCode: false,
+      }).then((response) => {
+        expect(response.status).eq(400);
+        expect(response.body.message).eq(
+          "PropertyTag name must not be null or empty.",
+        );
+      });
+    });
+  });
+
+  describe("deleting propertytype - validation", () => {
+    it("fails if tag is not found", () => {
+      cy.request({
+        method: "DELETE",
+        auth: {
+          username: "admin",
+          password: "admin",
+        },
+        url: "http://admin:admin@localhost:8080/AMW_rest/resources/settings/propertyTypes/-1",
+        failOnStatusCode: false,
+      }).then((response) => {
+        expect(response.status).eq(404);
+      });
+    });
+  });
+
+  describe("working with propertytypes", () => {
+    const name = `test-propertyType${new Date().getMilliseconds()}`;
+
+    it("create a new propertytype, list them, update it and delete it afterwards", () => {
+      cy.request({
+        method: "POST",
+        url: "http://admin:admin@localhost:8080/AMW_rest/resources/settings/propertyTypes",
+        body: {
+          name: name,
+          validationRegex: "string",
+          propertyTags: [{ name: name, type: "LOCAL" }],
+        },
+      }).then((response) => {
+        expect(response.status).eq(201);
+        const location = response.headers.location;
+        cy.request({
+          method: "GET",
+          url: "http://admin:admin@localhost:8080/AMW_rest/resources/settings/propertyTypes",
+        }).then((response) => {
+          expect(response.status).eq(200);
+          const propertyTypes = response.body;
+          expect(
+            propertyTypes.filter((propertyTyp) => propertyTyp.name === name)
+              .length,
+          ).eq(1);
+        });
+        cy.request({
+          method: "PUT",
+          url: location,
+          auth: {
+            username: "admin",
+            password: "admin",
+          },
+          body: {
+            name: name,
+            validationRegex: "string3",
+            encryption: true,
+            propertyTags: [{ name: name, type: "LOCAL" }],
+          },
+        }).then((response) => {
+          expect(response.status).eq(200);
+          cy.request({
+            method: "DELETE",
+            url: location,
+            auth: {
+              username: "admin",
+              password: "admin",
+            },
+          }).then((response) => {
+            expect(response.status).eq(204);
+            cy.request({
+              method: "GET",
+              url: "http://admin:admin@localhost:8080/AMW_rest/resources/settings/propertyTypes",
+            }).then((response) => {
+              expect(
+                response.body.filter((propertyTyp) => propertyTyp.name === name)
+                  .length,
+              ).eq(0);
+            });
+          });
+        });
+      });
+    });
+  });
+});
diff --git a/AMW_e2e/cypress/e2e/apps/create.cy.js b/AMW_e2e/cypress/e2e/apps/create.cy.js
new file mode 100644
index 000000000..9ebbb3c4f
--- /dev/null
+++ b/AMW_e2e/cypress/e2e/apps/create.cy.js
@@ -0,0 +1,15 @@
+describe("Apps -CRUD", () => {
+  it("should create, read apps and appServers", () => {
+    cy.visit("AMW_angular/#/apps", {
+      auth: {
+        username: "admin",
+        password: "admin",
+      },
+    });
+    cy.get('[data-cy="button-add-app"]').click();
+    cy.get("#name").type("test-app");
+    cy.get('[data-cy="button-save"]').should("be.disabled");
+    cy.get("#selectRelease").click({ force: true });
+    cy.get('[data-cy="button-cancel"]').click();
+  });
+});
\ No newline at end of file
diff --git a/AMW_e2e/cypress/e2e/deployments/create.cy.js b/AMW_e2e/cypress/e2e/deployments/create.cy.js
index 920066590..fec0bf3ee 100644
--- a/AMW_e2e/cypress/e2e/deployments/create.cy.js
+++ b/AMW_e2e/cypress/e2e/deployments/create.cy.js
@@ -1,4 +1,4 @@
-// szenario:
+// scenario:
 // create a deployment
 // click on tracking id
 // deployment must be visible in list of deployments
@@ -12,7 +12,7 @@ describe("create a deployment", () => {
       },
     });
     cy.get(".page-title").should("have.text", "Deployments");
-    cy.get('[data-cy="create-button "]').click({ force: true });
+    cy.get('[data-cy="create-button"]').click({ force: true });
     cy.contains("Create new deployment");
     cy.get("#selectApplicationserver").click();
     cy.contains("testapplicationserver").should("be.visible").click();
diff --git a/AMW_e2e/cypress/e2e/login.cy.js b/AMW_e2e/cypress/e2e/login/login.cy.js
similarity index 100%
rename from AMW_e2e/cypress/e2e/login.cy.js
rename to AMW_e2e/cypress/e2e/login/login.cy.js
diff --git a/AMW_e2e/cypress/e2e/resources/resources.cy.js b/AMW_e2e/cypress/e2e/resources/resources.cy.js
new file mode 100644
index 000000000..c0505452c
--- /dev/null
+++ b/AMW_e2e/cypress/e2e/resources/resources.cy.js
@@ -0,0 +1,10 @@
+describe("Resources Page", () => {
+  it("should navigate to the resources page", () => {
+    cy.visit("AMW_angular/#/resources", {
+      username: "admin",
+      password: "admin",
+    });
+
+    cy.get('[data-cy="page-title"]').contains("Resources");
+  });
+});
diff --git a/AMW_e2e/cypress/e2e/servers/servers.cy.js b/AMW_e2e/cypress/e2e/servers/servers.cy.js
new file mode 100644
index 000000000..c726fec7f
--- /dev/null
+++ b/AMW_e2e/cypress/e2e/servers/servers.cy.js
@@ -0,0 +1,12 @@
+describe("Servers Page", () => {
+  it("should navigate to the servers page", () => {
+    cy.visit("AMW_angular/#/servers", {
+      auth: {
+        username: "admin",
+        password: "admin",
+      },
+    });
+
+    cy.get('[data-cy="page-title"]').contains("Servers");
+  });
+});
diff --git a/AMW_e2e/cypress/e2e/settings/functions/crud.cy.js b/AMW_e2e/cypress/e2e/settings/functions/crud.cy.js
new file mode 100644
index 000000000..155759ccf
--- /dev/null
+++ b/AMW_e2e/cypress/e2e/settings/functions/crud.cy.js
@@ -0,0 +1,83 @@
+describe("Functions -CRUD", () => {
+
+  /**
+   * Test scenario:
+   * 1. adding a function without content should not be possible
+   * 2. add a function called test-function
+   * 3. adding a function with same name should not be possible
+   * 4. adding function without name should not be possible
+   * 5. adding a different function should work
+   * 6. delete both functions again
+   */
+
+  it("should create, read and delete a function", () => {
+    cy.visit("AMW_angular/#/settings/functions", {
+      auth: {
+        username: "admin",
+        password: "admin",
+      },
+    });
+
+    cy.get('[data-cy="button-add"]').click();
+    cy.get("#name").type("testFunction");
+    cy.get('[data-cy="button-save"]').should("be.disabled");
+    cy.get('.cm-activeLine').invoke('text', "testContent");
+    cy.get('[data-cy="button-save"]').click();
+    cy.contains("Function saved successfully.");
+    cy.get('[data-cy="button-add"]').click();
+    cy.get("#name").type("testFunction");
+    cy.get('.cm-activeLine').invoke('text', "differentContent");
+    cy.get('[data-cy="button-save"]').click();
+    cy.contains("Function with same name already exists");
+    cy.get('[data-cy="button-add"]').click();
+    cy.get('.cm-activeLine').invoke('text', "testContent");
+    cy.get('[data-cy="button-save"]').should("be.disabled");
+    cy.get("#name").type("differentFunction");
+    cy.get('[data-cy="button-save"]').click({ force: true });
+    cy.get('[data-cy="icon-delete"]').first().click();
+    cy.get('[data-cy="button-delete"]').click();
+    cy.contains("Function deleted");
+    cy.get('[data-cy="icon-delete"]').first().click();
+    cy.get('[data-cy="button-delete"]').click();
+    cy.contains("Function deleted");
+  });
+
+  it("should create, edit, compare and delete a function", () => {
+
+    /**
+     * Test scenario:
+     * 1. adding a function without content should not be possible
+     * 2. add a function called test-function-edit
+     * 3. updating the same function through editing
+     * 4. compare both versions of this function
+     * 5. app-diff-editor component should show up
+     * 6. delete the function
+     */
+
+    cy.visit("AMW_angular/#/settings/functions", {
+      auth: {
+        username: "admin",
+        password: "admin",
+      },
+    });
+
+    cy.get('[data-cy="button-add"]').click();
+    cy.get("#name").type("testFunctionEdit");
+    cy.get('[data-cy="button-save"]').should("be.disabled");
+    cy.get('.cm-activeLine').invoke('text', "testContentBla");
+    cy.get('[data-cy="button-save"]').click();
+    cy.contains("Function saved successfully.");
+    cy.get('[data-cy="button-edit"]').click();
+    cy.get('.cm-activeLine').invoke('text', "{enter}differentContent");
+    cy.get('[data-cy="button-save"]').click({ force: true });
+    cy.contains("Function saved successfully.");
+    cy.get('[data-cy="button-edit"]').click();
+    cy.get('[data-cy="button-dropdown"]').click();
+    cy.get('.dropdown-item').first().click();
+    cy.get('app-diff-editor').should('be.visible');
+    cy.get('[data-cy="button-cancel"]').click({force: true});
+    cy.get('[data-cy="icon-delete"]').first().click();
+    cy.get('[data-cy="button-delete"]').click();
+    cy.contains("Function deleted");
+  });
+});
diff --git a/AMW_e2e/cypress/e2e/settings/property-types/crud.cy.js b/AMW_e2e/cypress/e2e/settings/property-types/crud.cy.js
new file mode 100644
index 000000000..93ad21f18
--- /dev/null
+++ b/AMW_e2e/cypress/e2e/settings/property-types/crud.cy.js
@@ -0,0 +1,41 @@
+/**
+ * Test scenario:
+ * 1. add a propertyType called test-property-type with invalid regex should not be possible
+ * 2. add a propertyType called test-property-type
+ * 3. adding the same propertyType again should not be possible
+ * 4. updating the propertyType
+ * 5. delete propertyType
+ */
+
+describe("PropertyTypes -CRUD", () => {
+  it("should create, read and delete a propertyType", () => {
+    cy.visit("AMW_angular/#/settings/property-types", {
+      auth: {
+        username: "admin",
+        password: "admin",
+      },
+    });
+    cy.get('[data-cy="button-add"]').click();
+    cy.get("#name").type("test-property-type");
+    cy.get("#regex").type("*");
+    cy.get('[data-cy="button-save"]').click();
+    cy.contains("Invalid property type validation pattern.");
+    cy.get('[data-cy="button-add"]').click();
+    cy.get("#name").type("test-property-type");
+    cy.get("#regex").type("sd");
+    cy.get('[data-cy="button-save"]').click();
+    cy.contains("Property type saved.");
+    cy.get('[data-cy="button-add"]').click();
+    cy.get("#name").type("test-property-type");
+    cy.get("#regex").type("sd");
+    cy.get('[data-cy="button-save"]').click();
+    cy.contains("Property type already exists.");
+    cy.get('[data-cy="edit-test-property-type"]').click({ force: true });
+    cy.get("#encrypted").click();
+    cy.get('[data-cy="button-save"]').click();
+    cy.contains("Property type saved.");
+    cy.get('[data-cy="delete-test-property-type"]').click({ force: true });
+    cy.get('[data-cy="button-delete"]').click();
+    cy.contains("Property type deleted.");
+  });
+});
\ No newline at end of file
diff --git a/AMW_e2e/cypress/e2e/tags/crud.cy.js b/AMW_e2e/cypress/e2e/settings/tags/crud.cy.js
similarity index 99%
rename from AMW_e2e/cypress/e2e/tags/crud.cy.js
rename to AMW_e2e/cypress/e2e/settings/tags/crud.cy.js
index 5a5d2c546..a85632850 100644
--- a/AMW_e2e/cypress/e2e/tags/crud.cy.js
+++ b/AMW_e2e/cypress/e2e/settings/tags/crud.cy.js
@@ -30,4 +30,4 @@ describe("Tags -CRUD", () => {
     cy.get('[data-cy="delete-test-tag"]').click();
     cy.contains("Tag deleted");
   });
-});
+});
\ No newline at end of file
diff --git a/AMW_e2e/package-lock.json b/AMW_e2e/package-lock.json
index 05fc6ade2..a551e39e4 100644
--- a/AMW_e2e/package-lock.json
+++ b/AMW_e2e/package-lock.json
@@ -9,7 +9,7 @@
       "version": "1.0.0",
       "license": "ISC",
       "devDependencies": {
-        "cypress": "^13.13.3",
+        "cypress": "^13.15.0",
         "wait-on": "^7.2.0"
       }
     },
@@ -24,9 +24,9 @@
       }
     },
     "node_modules/@cypress/request": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@cypress/request/-/request-3.0.1.tgz",
-      "integrity": "sha512-TWivJlJi8ZDx2wGOw1dbLuHJKUYX7bWySw377nlnGOW3hP9/MUKIsEdXT/YngWxVdgNCHRBmFlBipE+5/2ZZlQ==",
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/@cypress/request/-/request-3.0.5.tgz",
+      "integrity": "sha512-v+XHd9XmWbufxF1/bTaVm2yhbxY+TB4YtWRqF2zaXBlDNMkls34KiATz0AVDLavL3iB6bQk9/7n3oY1EoLSWGA==",
       "dev": true,
       "dependencies": {
         "aws-sign2": "~0.7.0",
@@ -35,14 +35,14 @@
         "combined-stream": "~1.0.6",
         "extend": "~3.0.2",
         "forever-agent": "~0.6.1",
-        "form-data": "~2.3.2",
-        "http-signature": "~1.3.6",
+        "form-data": "~4.0.0",
+        "http-signature": "~1.4.0",
         "is-typedarray": "~1.0.0",
         "isstream": "~0.1.2",
         "json-stringify-safe": "~5.0.1",
         "mime-types": "~2.1.19",
         "performance-now": "^2.1.0",
-        "qs": "6.10.4",
+        "qs": "6.13.0",
         "safe-buffer": "^5.1.2",
         "tough-cookie": "^4.1.3",
         "tunnel-agent": "^0.6.0",
@@ -278,9 +278,9 @@
       }
     },
     "node_modules/aws4": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.13.0.tgz",
-      "integrity": "sha512-3AungXC4I8kKsS9PuS4JH2nc+0bVY/mjgrephHTIi8fpEeGsTHBUJeosp0Wc1myYMElmD0B3Oc4XL/HVJ4PV2g==",
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.13.2.tgz",
+      "integrity": "sha512-lHe62zvbTB5eEABUVi/AwVh0ZKY9rMMDhmm+eeyuuUQbQ3+J+fONVQOZyj+DdrvD4BY33uYniyRJ4UJIaSKAfw==",
       "dev": true
     },
     "node_modules/axios": {
@@ -294,20 +294,6 @@
         "proxy-from-env": "^1.1.0"
       }
     },
-    "node_modules/axios/node_modules/form-data": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
-      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
-      "dev": true,
-      "dependencies": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.8",
-        "mime-types": "^2.1.12"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
     "node_modules/axios/node_modules/proxy-from-env": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
@@ -601,13 +587,13 @@
       }
     },
     "node_modules/cypress": {
-      "version": "13.13.3",
-      "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.13.3.tgz",
-      "integrity": "sha512-hUxPrdbJXhUOTzuML+y9Av7CKoYznbD83pt8g3klgpioEha0emfx4WNIuVRx0C76r0xV2MIwAW9WYiXfVJYFQw==",
+      "version": "13.15.0",
+      "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.15.0.tgz",
+      "integrity": "sha512-53aO7PwOfi604qzOkCSzNlWquCynLlKE/rmmpSPcziRH6LNfaDUAklQT6WJIsD8ywxlIy+uVZsnTMCCQVd2kTw==",
       "dev": true,
       "hasInstallScript": true,
       "dependencies": {
-        "@cypress/request": "^3.0.1",
+        "@cypress/request": "^3.0.4",
         "@cypress/xvfb": "^1.2.4",
         "@types/sinonjs__fake-timers": "8.1.1",
         "@types/sizzle": "^2.3.2",
@@ -916,17 +902,17 @@
       }
     },
     "node_modules/form-data": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
-      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.1.tgz",
+      "integrity": "sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==",
       "dev": true,
       "dependencies": {
         "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.6",
+        "combined-stream": "^1.0.8",
         "mime-types": "^2.1.12"
       },
       "engines": {
-        "node": ">= 0.12"
+        "node": ">= 6"
       }
     },
     "node_modules/fs-extra": {
@@ -1096,14 +1082,14 @@
       }
     },
     "node_modules/http-signature": {
-      "version": "1.3.6",
-      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.3.6.tgz",
-      "integrity": "sha512-3adrsD6zqo4GsTqtO7FyrejHNv+NgiIfAfv68+jVlFmSr9OGy7zrxONceFRLKvnnZA5jbxQBX1u9PpB6Wi32Gw==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.4.0.tgz",
+      "integrity": "sha512-G5akfn7eKbpDN+8nPS/cb57YeA1jLTVxjpCj7tmm3QKPdyDy7T+qSC40e9ptydSWvkwjSXw1VbkpyEm39ukeAg==",
       "dev": true,
       "dependencies": {
         "assert-plus": "^1.0.0",
         "jsprim": "^2.0.2",
-        "sshpk": "^1.14.1"
+        "sshpk": "^1.18.0"
       },
       "engines": {
         "node": ">=0.10"
@@ -1618,12 +1604,12 @@
       }
     },
     "node_modules/qs": {
-      "version": "6.10.4",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.4.tgz",
-      "integrity": "sha512-OQiU+C+Ds5qiH91qh/mg0w+8nwQuLjM4F4M/PbmhDOoYehPh+Fb0bDjtR1sOvy7YKxvj28Y/M0PhP5uVX0kB+g==",
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
+      "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==",
       "dev": true,
       "dependencies": {
-        "side-channel": "^1.0.4"
+        "side-channel": "^1.0.6"
       },
       "engines": {
         "node": ">=0.6"
diff --git a/AMW_e2e/package.json b/AMW_e2e/package.json
index 0ee280af3..4695e7330 100644
--- a/AMW_e2e/package.json
+++ b/AMW_e2e/package.json
@@ -15,7 +15,7 @@
   "author": "",
   "license": "ISC",
   "devDependencies": {
-    "cypress": "^13.13.3",
+    "cypress": "^13.15.0",
     "wait-on": "^7.2.0"
   }
 }
diff --git a/AMW_ear/pom.xml b/AMW_ear/pom.xml
index 6ea6b8730..489250e56 100644
--- a/AMW_ear/pom.xml
+++ b/AMW_ear/pom.xml
@@ -44,13 +44,13 @@
 								</ejbModule>
 								<webModule>
 									<groupId>ch.puzzle.itc.mobiliar</groupId>
-									<artifactId>AMW_web</artifactId>
-									<bundleFileName>AMW_web.war</bundleFileName>
+									<artifactId>AMW_angular</artifactId>
+									<bundleFileName>AMW_angular.war</bundleFileName>
 								</webModule>
 								<webModule>
 									<groupId>ch.puzzle.itc.mobiliar</groupId>
-									<artifactId>AMW_angular</artifactId>
-									<bundleFileName>AMW_angular.war</bundleFileName>
+									<artifactId>AMW_web</artifactId>
+									<bundleFileName>AMW_web.war</bundleFileName>
 								</webModule>
 								<webModule>
 									<groupId>ch.puzzle.itc.mobiliar</groupId>
@@ -76,12 +76,12 @@
 				</dependency>
 				<dependency>
 					<groupId>ch.puzzle.itc.mobiliar</groupId>
-					<artifactId>AMW_web</artifactId>
+					<artifactId>AMW_angular</artifactId>
 					<type>war</type>
 				</dependency>
 				<dependency>
 					<groupId>ch.puzzle.itc.mobiliar</groupId>
-					<artifactId>AMW_angular</artifactId>
+					<artifactId>AMW_web</artifactId>
 					<type>war</type>
 				</dependency>
 				<dependency>
diff --git a/AMW_openshift_deploy/configuration/application-roles.properties b/AMW_openshift_deploy/configuration/application-roles.properties
index dc40dfb4d..f955eba5d 100644
--- a/AMW_openshift_deploy/configuration/application-roles.properties
+++ b/AMW_openshift_deploy/configuration/application-roles.properties
@@ -1,7 +1,7 @@
 # Nur ansehen
 viewer_role=viewer
 # Kann alles
-admin_role=viewer,config_admin,app_developer,server_admin,shakedown_tester,shakedown_admin,overwrite_foreignables,test_deployer,developer_deployer,env_management_deployer,admin_deployer
+admin_role=viewer,config_admin,app_developer,server_admin,overwrite_foreignables,test_deployer,developer_deployer,env_management_deployer,admin_deployer
 # Kann Konfiguration auf Applikations Ressourcen und auf develepment Umgebungen Deployen
 app_developer_role=app_developer,viewer,developer_deployer
 # Kann zusätzlich neue AppServer und Applikationen erstellen
diff --git a/AMW_rest/doc/Beschreibung_Schnittstelle.txt b/AMW_rest/doc/Beschreibung_Schnittstelle.txt
index 63e9c764f..819a1bfb3 100644
--- a/AMW_rest/doc/Beschreibung_Schnittstelle.txt
+++ b/AMW_rest/doc/Beschreibung_Schnittstelle.txt
@@ -9,8 +9,6 @@ curl -v -H "Content-Type: application/json" -X POST --data "@prest.json" -u u112
    "stateToDeploy": 1384804324074, (optional, default now)
    "requestOnly": false, (optional, default false)
    "simulate": false, (optional, default false)
-   "executeShakedownTest": false, (optional, default false)
-   "neighbourhoodTest": false, (optional, default false)
    "sendEmail": false, (optional, default false)
    "appsWithVersion":[ (must contain all applications)
       {
diff --git a/AMW_rest/doc/sample_requests/prest_full.json b/AMW_rest/doc/sample_requests/prest_full.json
index 205e19e42..b351914bd 100644
--- a/AMW_rest/doc/sample_requests/prest_full.json
+++ b/AMW_rest/doc/sample_requests/prest_full.json
@@ -4,9 +4,7 @@
    "deploymentDate":1384804324074,
    "stateToDeploy": 1384804324074, 
    "requestOnly": true, 
-   "simulate": false, 
-   "executeShakedownTest": false, 
-   "neighbourhoodTest": false, 
+   "simulate": false,
    "sendEmail": false, 
    "appsWithVersion":[
       {
@@ -15,4 +13,4 @@
       }
    ],
    "environmentName":"V"
-}
\ No newline at end of file
+}
diff --git a/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/RESTApplication.java b/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/RESTApplication.java
index 6b84b8ad5..0fd601d5c 100644
--- a/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/RESTApplication.java
+++ b/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/RESTApplication.java
@@ -21,16 +21,20 @@
 package ch.mobi.itc.mobiliar.rest;
 
 import ch.mobi.itc.mobiliar.rest.Analyze.TestGenerationRest;
+import ch.mobi.itc.mobiliar.rest.apps.AppsRest;
 import ch.mobi.itc.mobiliar.rest.auditview.AuditViewRest;
 import ch.mobi.itc.mobiliar.rest.deployments.DeploymentDtoCsvBodyWriter;
 import ch.mobi.itc.mobiliar.rest.deployments.DeploymentsLogRest;
 import ch.mobi.itc.mobiliar.rest.deployments.DeploymentsRest;
 import ch.mobi.itc.mobiliar.rest.environments.EnvironmentsRest;
 import ch.mobi.itc.mobiliar.rest.exceptions.*;
+import ch.mobi.itc.mobiliar.rest.functions.FunctionsRest;
 import ch.mobi.itc.mobiliar.rest.health.HealthCheck;
 import ch.mobi.itc.mobiliar.rest.permissions.RestrictionsRest;
+import ch.mobi.itc.mobiliar.rest.properties.PropertyTypesRest;
 import ch.mobi.itc.mobiliar.rest.resources.*;
 import ch.mobi.itc.mobiliar.rest.releases.ReleasesRest;
+import ch.mobi.itc.mobiliar.rest.servers.ServersRest;
 import ch.mobi.itc.mobiliar.rest.settings.SettingsRest;
 import ch.mobi.itc.mobiliar.rest.tags.boundary.TagsRest;
 
@@ -52,6 +56,7 @@ public Set<Class<?>> getClasses() {
     private void addRestResourceClasses(Set<Class<?>> resources) {
 
         // Endpoints
+        resources.add(AppsRest.class);
         resources.add(BatchJobRest.class);
         resources.add(ResourcesRest.class);
         resources.add(ResourceGroupsRest.class);
@@ -71,6 +76,9 @@ private void addRestResourceClasses(Set<Class<?>> resources) {
         resources.add(SettingsRest.class);
         resources.add(TestGenerationRest.class);
         resources.add(TagsRest.class);
+        resources.add(PropertyTypesRest.class);
+        resources.add(FunctionsRest.class);
+        resources.add(ServersRest.class);
 
         // writers
         resources.add(DeploymentDtoCsvBodyWriter.class);
@@ -92,6 +100,7 @@ private void addRestResourceClasses(Set<Class<?>> resources) {
         resources.add(UncaughtExceptionMapper.class);
         resources.add(ConstraintViolationExceptionMapper.class);
         resources.add(ConcurrentModificationExceptionMapper.class);
+        resources.add(ElementAlreadyExistsExceptionMapper.class);
 
         // health
         resources.add(HealthCheck.class);
diff --git a/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/apps/AppsRest.java b/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/apps/AppsRest.java
new file mode 100644
index 000000000..fe38f3f92
--- /dev/null
+++ b/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/apps/AppsRest.java
@@ -0,0 +1,92 @@
+package ch.mobi.itc.mobiliar.rest.apps;
+
+import ch.mobi.itc.mobiliar.rest.dtos.AppAppServerDTO;
+import ch.mobi.itc.mobiliar.rest.dtos.AppDTO;
+import ch.mobi.itc.mobiliar.rest.dtos.AppServerDTO;
+import ch.puzzle.itc.mobiliar.business.apps.boundary.*;
+import ch.puzzle.itc.mobiliar.business.releasing.boundary.ReleaseLocator;
+import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.ResourceWithRelations;
+import ch.puzzle.itc.mobiliar.business.releasing.entity.ReleaseEntity;
+import ch.puzzle.itc.mobiliar.common.exception.NotFoundException;
+import ch.puzzle.itc.mobiliar.common.util.Tuple;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+
+import javax.validation.constraints.NotNull;
+import javax.ws.rs.*;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import java.util.ArrayList;
+import java.util.List;
+
+import static javax.ws.rs.core.Response.Status.*;
+
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
+
+
+@RequestScoped
+@Path("/apps")
+@Api(value = "/apps", description = "Application servers and apps")
+public class AppsRest {
+
+    @Inject
+    private ListAppsUseCase listAppsUseCase;
+
+
+    @Inject
+    private AddAppUseCase addAppUseCase;
+
+    @Inject
+    private AddAppWithServerUseCase addAppWithServerUseCase;
+
+    @Inject
+    private AddAppServerUseCase addAppServerUseCase;
+
+
+    @GET
+    @ApiOperation(value = "Get applicationservers and apps", notes = "Returns all apps")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Response getApps(@QueryParam("start") Integer start,
+                            @QueryParam("limit") Integer limit,
+                            @QueryParam("appServerName") String filter,
+                            @NotNull @QueryParam("releaseId") Integer releaseId) throws NotFoundException {
+        Tuple<List<ResourceWithRelations>, Long> result = listAppsUseCase.appsFor(start, limit, filter, releaseId);
+
+        return Response.status(OK).entity(appServersToResponse(result.getA())).header("X-total-count", result.getB()).build();
+    }
+
+    private List<AppServerDTO> appServersToResponse(List<ResourceWithRelations> apps) {
+        List<AppServerDTO> appServerList = new ArrayList<>(apps.size());
+        for (ResourceWithRelations app : apps) {
+            appServerList.add(new AppServerDTO(app));
+        }
+        return appServerList;
+    }
+
+    @POST
+    @ApiOperation(value = "Add a application")
+    public Response addApp(@NotNull @QueryParam("appName") String appName, @NotNull @QueryParam("releaseId") Integer releaseId) throws NotFoundException, IllegalArgumentException, IllegalStateException {
+        AddAppCommand addAppCommand = new AddAppCommand(appName, releaseId);
+        return Response.status(CREATED).entity(addAppUseCase.add(addAppCommand)).build();
+    }
+
+    @Path("/appServer")
+    @POST
+    @ApiOperation(value = "Add a applicationserver")
+    public Response addAppServer(@NotNull @QueryParam("appServerName") String name, @NotNull @QueryParam("releaseId") Integer releaseId) throws NotFoundException, IllegalArgumentException, IllegalStateException {
+        AppServerCommand appServerCommand = new AppServerCommand(name, releaseId);
+        return Response.status(CREATED).entity(addAppServerUseCase.add(appServerCommand)).build();
+    }
+
+
+    @Path("/appWithServer")
+    @POST
+    @ApiOperation(value = "Add a application with appServer")
+    public Response addAppWithAppServer(@NotNull @ApiParam() AppAppServerDTO app) throws NotFoundException, IllegalArgumentException, IllegalStateException {
+        AddAppWithServerCommand addAppWithServerCommand =
+                new AddAppWithServerCommand(app.getAppName(), app.getAppReleaseId(), app.getAppServerId(), app.getAppServerReleaseId());
+        return Response.status(CREATED).entity(addAppWithServerUseCase.add(addAppWithServerCommand)).build();
+    }
+}
diff --git a/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/deployments/DeploymentsRest.java b/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/deployments/DeploymentsRest.java
index e990c622b..6b7fc9341 100644
--- a/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/deployments/DeploymentsRest.java
+++ b/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/deployments/DeploymentsRest.java
@@ -68,7 +68,6 @@
 import java.net.URI;
 import java.util.*;
 import java.util.logging.Logger;
-import java.util.stream.Collectors;
 
 import static ch.puzzle.itc.mobiliar.business.deploy.entity.DeploymentFilterTypes.*;
 import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
@@ -129,7 +128,7 @@ public Response getDeployments(@ApiParam("Filters") @QueryParam("filters") Strin
         }
         Sort.SortingDirectionType sortingDirectionType = getSortingDirectionType(sortDirection);
         LinkedList<CustomFilter> filters = createCustomFilters(filterDTOs);
-        Tuple<Set<DeploymentEntity>, Integer> filteredDeployments = deploymentBoundary.getFilteredDeployments(offset, maxResults, filters, colToSort, sortingDirectionType, null);
+        Tuple<Set<DeploymentEntity>, Integer> filteredDeployments = deploymentBoundary.getFilteredDeployments(offset, maxResults, filters, colToSort, sortingDirectionType);
         List<DeploymentDTO> deploymentDTOs = createDeploymentDTOs(filteredDeployments);
         return Response.status(Status.OK).header("X-Total-Count", filteredDeployments.getB()).entity(new GenericEntity<List<DeploymentDTO>>(deploymentDTOs) {}).build();
     }
@@ -288,7 +287,7 @@ public Response getDeployments(
         if (deploymentParameterValues != null) {
             createFiltersAndAddToList(DEPLOYMENT_PARAMETER, deploymentParameterValues, filters);
         }
-        Tuple<Set<DeploymentEntity>, Integer> filteredDeployments = deploymentBoundary.getFilteredDeployments(offset, maxResults, filters, null, null, null);
+        Tuple<Set<DeploymentEntity>, Integer> filteredDeployments = deploymentBoundary.getFilteredDeployments(offset, maxResults, filters, null, null);
 
         List<DeploymentDTO> deploymentDTOs = createDeploymentDTOs(filteredDeployments);
 
@@ -500,14 +499,13 @@ public Response addDeployment(@ApiParam("Deployment Request") DeploymentRequestD
 
         trackingId = deploymentBoundary.createDeploymentReturnTrackingId(group.getId(), release.getId(), request.getDeploymentDate(),
                 request.getStateToDeploy(), contexts,
-                applicationsWithVersion, deployParams, request.getSendEmail(), request.getRequestOnly(), request.getSimulate(), request.getExecuteShakedownTest(),
-                request.getNeighbourhoodTest());
+                applicationsWithVersion, deployParams, request.getSendEmail(), request.getRequestOnly(), request.getSimulate());
 
         // get the deployment from the tracking id
         CustomFilter trackingIdFilter = CustomFilter.builder(TRACKING_ID).build();
         trackingIdFilter.setValue(trackingId.toString());
         filters.add(trackingIdFilter);
-        Tuple<Set<DeploymentEntity>, Integer> result = deploymentBoundary.getFilteredDeployments( 0, 1, filters, null, null, null);
+        Tuple<Set<DeploymentEntity>, Integer> result = deploymentBoundary.getFilteredDeployments( 0, 1, filters, null, null);
 
         DeploymentDTO deploymentDto = new DeploymentDTO(result.getA().iterator().next());
 
@@ -557,8 +555,6 @@ public Response confirmDeployment(@ApiParam("deployment Id") @PathParam("id") In
         try{
             deploymentBoundary.confirmDeployment(deploymentId,
                     deploymentDTO.isSendEmailWhenDeployed(),
-                    deploymentDTO.isShakedownTestsWhenDeployed(),
-                    deploymentDTO.isNeighbourhoodTest(),
                     deploymentDTO.isSimulateBeforeDeployment(),
                     deploymentDTO.getDeploymentDate());
             return Response.status(Response.Status.OK).build();
diff --git a/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/dtos/AppAppServerDTO.java b/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/dtos/AppAppServerDTO.java
new file mode 100644
index 000000000..e6cd839ed
--- /dev/null
+++ b/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/dtos/AppAppServerDTO.java
@@ -0,0 +1,30 @@
+package ch.mobi.itc.mobiliar.rest.dtos;
+
+import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.ResourceEntity;
+import io.swagger.models.auth.In;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+
+
+
+@XmlRootElement(name = "appAppServer")
+@XmlAccessorType(XmlAccessType.FIELD)
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class AppAppServerDTO {
+    String appName;
+    Integer appReleaseId;
+    Integer appServerId;
+    Integer appServerReleaseId;
+
+    public AppAppServerDTO(String appName, Integer appReleaseId) {
+        this.appName = appName;
+        this.appServerId = appReleaseId;
+    }
+}
diff --git a/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/dtos/AppDTO.java b/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/dtos/AppDTO.java
new file mode 100644
index 000000000..a293c9181
--- /dev/null
+++ b/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/dtos/AppDTO.java
@@ -0,0 +1,29 @@
+package ch.mobi.itc.mobiliar.rest.dtos;
+
+import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.ResourceEntity;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement(name = "app")
+@XmlAccessorType(XmlAccessType.FIELD)
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class AppDTO {
+    Integer id;
+    String name;
+    ReleaseDTO release;
+
+    public AppDTO(ResourceEntity app) {
+        this.id = app.getId();
+        this.name = app.getName();
+        if (app.getRelease() != null) {
+            this.release = new ReleaseDTO(app.getRelease().getId(), app.getRelease().getName());
+        }
+    }
+}
diff --git a/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/dtos/AppServerDTO.java b/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/dtos/AppServerDTO.java
new file mode 100644
index 000000000..27b2f9cf4
--- /dev/null
+++ b/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/dtos/AppServerDTO.java
@@ -0,0 +1,46 @@
+package ch.mobi.itc.mobiliar.rest.dtos;
+
+import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.ResourceEntity;
+import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.ResourceWithRelations;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.ArrayList;
+import java.util.List;
+
+
+@XmlRootElement(name = "appServer")
+@XmlAccessorType(XmlAccessType.FIELD)
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class AppServerDTO {
+
+    Integer id;
+    String name;
+    Boolean deletable;
+    String runtimeName;
+    ReleaseDTO release;
+    List<AppDTO> apps;
+
+    public AppServerDTO(ResourceWithRelations appServer) {
+        this.id = appServer.getResource().getId();
+        this.name = appServer.getResource().getName();
+        this.deletable = appServer.getResource().isDeletable();
+        this.runtimeName =  appServer.getResource().getRuntime() != null ? appServer.getResource().getRuntime().getName() : "";
+        if (appServer.getResource().getRelease() != null) {
+            this.release = new ReleaseDTO(appServer.getResource().getRelease().getId(), appServer.getResource().getRelease().getName());
+        }
+
+        this.apps = new ArrayList<>();
+        for (ResourceEntity app : appServer.getRelatedResources()) {
+            this.apps.add(new AppDTO(app));
+        }
+
+
+    }
+}
diff --git a/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/dtos/DeploymentDTO.java b/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/dtos/DeploymentDTO.java
index f12a73117..6f1d8ba23 100644
--- a/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/dtos/DeploymentDTO.java
+++ b/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/dtos/DeploymentDTO.java
@@ -74,8 +74,6 @@ public class DeploymentDTO {
 	private boolean executed;
 	private boolean sendEmailWhenDeployed;
 	private boolean simulateBeforeDeployment;
-	private boolean shakedownTestsWhenDeployed;
-	private boolean neighbourhoodTest;
 
 	public DeploymentDTO(DeploymentEntity entity) {
 		setPreservedValues(entity, new PreservedProperties());
@@ -122,8 +120,6 @@ public void setPreservedValues(DeploymentEntity entity, PreservedProperties prop
 		this.setExecuted(entity.isExecuted());
 		this.setSendEmailWhenDeployed(entity.isSendEmail());
 		this.setSimulateBeforeDeployment(entity.isSimulating());
-		this.setShakedownTestsWhenDeployed(entity.isCreateTestAfterDeployment());
-		this.setNeighbourhoodTest(entity.isCreateTestForNeighborhoodAfterDeployment());
 	}
 
 	@Data
diff --git a/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/dtos/DeploymentRequestDTO.java b/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/dtos/DeploymentRequestDTO.java
index 184bcda48..7a88fe3a5 100644
--- a/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/dtos/DeploymentRequestDTO.java
+++ b/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/dtos/DeploymentRequestDTO.java
@@ -43,8 +43,6 @@ public class DeploymentRequestDTO {
 	private List<AppWithVersionDTO> appsWithVersion; // optional
 	private Boolean requestOnly = false; // optional
 	private Boolean simulate = false; // optional
-	private Boolean executeShakedownTest = false; // optional
-	private Boolean neighbourhoodTest = false; // optional
 	private Boolean sendEmail = false; // optional
 	private String releaseName; // optional
 	private List<DeploymentParameterDTO> deploymentParameters; // optional
@@ -67,8 +65,6 @@ public DeploymentRequestDTO(DeploymentRequestDTO deploymentRequestDto) {
 		}
 		requestOnly = deploymentRequestDto.getRequestOnly();
 		simulate = deploymentRequestDto.getSimulate();
-		executeShakedownTest = deploymentRequestDto.getExecuteShakedownTest();
-		neighbourhoodTest = deploymentRequestDto.getNeighbourhoodTest();
 		sendEmail = deploymentRequestDto.getSendEmail();
 		releaseName = deploymentRequestDto.getReleaseName();
 
diff --git a/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/dtos/EnvironmentDTO.java b/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/dtos/EnvironmentDTO.java
index 045b6a9e4..72027d97f 100644
--- a/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/dtos/EnvironmentDTO.java
+++ b/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/dtos/EnvironmentDTO.java
@@ -37,12 +37,14 @@ public class EnvironmentDTO {
     private Integer id;
     private String name;
     private String nameAlias;
-    private String parent;
+    private String parentName;
+    private Integer parentId;
 
     public EnvironmentDTO(ContextEntity context) {
         this.id = context.getId();
         this.name = context.getName();
         this.nameAlias = context.getNameAlias();
-        this.parent = context.getParent().getName();
+        this.parentName = context.getParent() != null ? context.getParent().getName() : null ;
+        this.parentId = context.getParent() != null ? context.getParent().getId() : null ;
     }
 }
diff --git a/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/dtos/PropertyTagDTO.java b/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/dtos/PropertyTagDTO.java
new file mode 100644
index 000000000..b41cb784f
--- /dev/null
+++ b/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/dtos/PropertyTagDTO.java
@@ -0,0 +1,30 @@
+package ch.mobi.itc.mobiliar.rest.dtos;
+
+import ch.puzzle.itc.mobiliar.business.property.entity.PropertyTagEntity;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement(name = "propertyTag")
+@XmlAccessorType(XmlAccessType.FIELD)
+@Data
+@NoArgsConstructor
+public class PropertyTagDTO {
+
+    @NotNull(message = "PropertyTag name must not be null.")
+    @NotEmpty(message = "PropertyTag name must not be empty.")
+    private String name;
+    @NotNull(message = "PropertyTag type must not be null.")
+    @NotEmpty(message = "PropertyTag type must not be empty.")
+    private String type;
+
+    public PropertyTagDTO(PropertyTagEntity propertyTagEntity) {
+        this.name = propertyTagEntity.getName();
+        this.type = String.valueOf(propertyTagEntity.getTagType());
+    }
+}
diff --git a/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/dtos/PropertyTypeDTO.java b/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/dtos/PropertyTypeDTO.java
new file mode 100644
index 000000000..b5f712095
--- /dev/null
+++ b/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/dtos/PropertyTypeDTO.java
@@ -0,0 +1,46 @@
+package ch.mobi.itc.mobiliar.rest.dtos;
+
+
+import ch.puzzle.itc.mobiliar.business.property.entity.PropertyTagEntity;
+import ch.puzzle.itc.mobiliar.business.property.entity.PropertyTypeEntity;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.ArrayList;
+import java.util.List;
+
+@XmlRootElement(name = "propertyType")
+@XmlAccessorType(XmlAccessType.FIELD)
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class PropertyTypeDTO {
+
+    private Integer id;
+    @NotNull(message = "PropertyType name must not be null.")
+    @NotEmpty(message = "PropertyType name must not be empty.")
+    private String name;
+    private boolean encrypted;
+    @NotNull(message = "PropertyType validation regex must not be null.")
+    @NotEmpty(message = "PropertyType validation regex must not be empty.")
+    private String validationRegex;
+    private List<PropertyTagDTO> propertyTags;
+
+    public PropertyTypeDTO(PropertyTypeEntity propertyTypeEntity) {
+        this.id = propertyTypeEntity.getId();
+        this.name = propertyTypeEntity.getPropertyTypeName();
+        this.encrypted = propertyTypeEntity.isEncrypt();
+        this.validationRegex = propertyTypeEntity.getValidationRegex();
+        this.propertyTags = new ArrayList<>();
+        for (PropertyTagEntity propertyTagEntity : propertyTypeEntity.getPropertyTags()) {
+            this.propertyTags.add(new PropertyTagDTO(propertyTagEntity));
+        }
+
+    }
+}
diff --git a/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/dtos/ReleaseDTO.java b/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/dtos/ReleaseDTO.java
new file mode 100644
index 000000000..bd6355931
--- /dev/null
+++ b/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/dtos/ReleaseDTO.java
@@ -0,0 +1,20 @@
+package ch.mobi.itc.mobiliar.rest.dtos;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement(name = "release")
+@XmlAccessorType(XmlAccessType.FIELD)
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class ReleaseDTO {
+    Integer id;
+    String name;
+}
diff --git a/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/dtos/ResourceGroupDTO.java b/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/dtos/ResourceGroupDTO.java
index bdfa0cb31..c118b7601 100644
--- a/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/dtos/ResourceGroupDTO.java
+++ b/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/dtos/ResourceGroupDTO.java
@@ -27,6 +27,7 @@
 import javax.xml.bind.annotation.XmlRootElement;
 
 import ch.puzzle.itc.mobiliar.business.releasing.entity.ReleaseEntity;
+import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.ResourceEntity;
 import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.ResourceGroupEntity;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -41,13 +42,31 @@ public class ResourceGroupDTO {
     private String name;
     private String type;
     private List<ReleaseEntity> releases;
+    private ReleaseDTO defaultRelease;
+    private Integer defaultResourceId;
 
-    public ResourceGroupDTO(ResourceGroupEntity resourceGroup, List<ReleaseEntity> releases){
+    public ResourceGroupDTO(ResourceGroupEntity resourceGroup, List<ReleaseEntity> releases) {
         this.id = resourceGroup.getId();
         this.name = resourceGroup.getName();
-        this.type = resourceGroup.getResourceType() != null ? resourceGroup.getResourceType().getName(): null;
-        if(releases!=null && !releases.isEmpty()){
+        this.type = resourceGroup.getResourceType() != null ? resourceGroup.getResourceType().getName() : null;
+        if (releases != null && !releases.isEmpty()) {
             this.releases = releases;
         }
     }
+
+    public ResourceGroupDTO(ResourceGroupEntity resourceGroup,
+                            ReleaseEntity defaultRelease,
+                            List<ReleaseEntity> releases,
+                            ResourceEntity defaultResource) {
+        this.id = resourceGroup.getId();
+        this.name = resourceGroup.getName();
+        this.type = resourceGroup.getResourceType() != null ? resourceGroup.getResourceType().getName() : null;
+        this.defaultRelease = new ReleaseDTO(defaultRelease.getId(), defaultRelease.getName());
+        if (releases != null && !releases.isEmpty()) {
+            this.releases = releases;
+        }
+        if (defaultResource != null) {
+            this.defaultResourceId = defaultResource.getId();
+        }
+    }
 }
diff --git a/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/dtos/ResourceTypeDTO.java b/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/dtos/ResourceTypeDTO.java
index ffd2da078..2d9b0cc61 100644
--- a/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/dtos/ResourceTypeDTO.java
+++ b/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/dtos/ResourceTypeDTO.java
@@ -21,12 +21,15 @@
 package ch.mobi.itc.mobiliar.rest.dtos;
 
 import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.ResourceTypeEntity;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;
+import java.util.List;
+import java.util.stream.Collectors;
 
 @XmlRootElement(name = "resourceType")
 @XmlAccessorType(XmlAccessType.FIELD)
@@ -36,9 +39,21 @@ public class ResourceTypeDTO {
 
     private Integer id;
     private String name;
+    private boolean hasChildren;
+    private List<ResourceTypeDTO> children;
+    @JsonProperty(value="isApplication")
+    private boolean isApplication;
+    @JsonProperty(value="isDefaultResourceType")
+    private boolean isDefaultResourceType;
 
-    public ResourceTypeDTO(ResourceTypeEntity resourceType){
+    public ResourceTypeDTO(ResourceTypeEntity resourceType) {
         this.id = resourceType.getId();
         this.name = resourceType.getName();
+        this.hasChildren = resourceType.hasChildren();
+        this.children = resourceType.getChildrenResourceTypes().stream()
+                .map(ResourceTypeDTO::new)
+                .collect(Collectors.toList());
+        this.isApplication = resourceType.isApplicationResourceType();
+        this.isDefaultResourceType = resourceType.isDefaultResourceType();
     }
 }
diff --git a/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/dtos/ResourceTypeRequestDTO.java b/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/dtos/ResourceTypeRequestDTO.java
new file mode 100644
index 000000000..cb3d54ed3
--- /dev/null
+++ b/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/dtos/ResourceTypeRequestDTO.java
@@ -0,0 +1,18 @@
+package ch.mobi.itc.mobiliar.rest.dtos;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@ApiModel(description = "Request to add a new resource type")
+public class ResourceTypeRequestDTO {
+    @ApiModelProperty(required = true)
+    private String name;
+
+    @ApiModelProperty(required = false)
+    private Integer parentId;
+}
diff --git a/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/dtos/ServerDTO.java b/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/dtos/ServerDTO.java
new file mode 100644
index 000000000..783fa64af
--- /dev/null
+++ b/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/dtos/ServerDTO.java
@@ -0,0 +1,47 @@
+package ch.mobi.itc.mobiliar.rest.dtos;
+
+
+import ch.puzzle.itc.mobiliar.business.server.entity.ServerTuple;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement(name = "appAppServer")
+@XmlAccessorType(XmlAccessType.FIELD)
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class ServerDTO {
+
+    private String host;
+    private String appServer;
+    private String appServerRelease;
+    private String runtime;
+    private String node;
+    private String nodeRelease;
+    private String environment;
+    private Integer appServerId;
+    private Integer nodeId;
+    private Integer environmentId;
+    private String domain;
+    private boolean definedOnNode;
+
+    public ServerDTO(ServerTuple serverTuple) {
+        this.host = serverTuple.getHost();
+        this.appServer = serverTuple.getAppServer();
+        this.appServerRelease = serverTuple.getAppServerRelease();
+        this.runtime = serverTuple.getRuntime();
+        this.node = serverTuple.getNode();
+        this.nodeRelease = serverTuple.getNodeRelease();
+        this.environment = serverTuple.getEnvironment();
+        this.appServerId = serverTuple.getAppServerId();
+        this.nodeId = serverTuple.getNodeId();
+        this.environmentId = serverTuple.getEnvironmentId();
+        this.domain = serverTuple.getDomain();
+        this.definedOnNode = serverTuple.isDefinedOnNode();
+    }
+}
diff --git a/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/environments/EnvironmentsRest.java b/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/environments/EnvironmentsRest.java
index e369d238f..c8699bf67 100644
--- a/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/environments/EnvironmentsRest.java
+++ b/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/environments/EnvironmentsRest.java
@@ -2,18 +2,25 @@
 
 import ch.mobi.itc.mobiliar.rest.dtos.EnvironmentDTO;
 import ch.puzzle.itc.mobiliar.business.environment.boundary.ContextLocator;
+import ch.puzzle.itc.mobiliar.business.environment.control.EnvironmentsScreenDomainService;
 import ch.puzzle.itc.mobiliar.business.environment.entity.ContextEntity;
+import ch.puzzle.itc.mobiliar.common.exception.AMWException;
+import ch.puzzle.itc.mobiliar.common.exception.ElementAlreadyExistsException;
+import ch.puzzle.itc.mobiliar.common.exception.ResourceNotFoundException;
+import ch.puzzle.itc.mobiliar.common.exception.ValidationException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 
 import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.QueryParam;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Response;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
+
+import static javax.ws.rs.core.Response.Status.NO_CONTENT;
 
 @RequestScoped
 @Path("/environments")
@@ -23,10 +30,12 @@ public class EnvironmentsRest {
     @Inject
     ContextLocator contextLocator;
 
+    @Inject
+    EnvironmentsScreenDomainService environmentsScreenDomainService;
+
     @GET
     @ApiOperation(value = "Get environments", notes = "Returns the available environments")
-    public List<EnvironmentDTO> getEnvironments(@ApiParam("Also returns Environment groups if set to true") @QueryParam("includingGroups")
-                                                            boolean includingGroups) {
+    public List<EnvironmentDTO> getEnvironments(@ApiParam("Also returns Environment groups if set to true") @QueryParam("includingGroups") boolean includingGroups) {
 
         List<EnvironmentDTO> environments = new ArrayList<>();
         List<ContextEntity> contexts = contextLocator.getAllEnvironments();
@@ -42,4 +51,35 @@ public List<EnvironmentDTO> getEnvironments(@ApiParam("Also returns Environment
         return environments;
     }
 
+    @GET
+    @Path("/contexts")
+    @ApiOperation(value = "Get all contexts", notes = "Returns all contexts as environments")
+    public List<EnvironmentDTO> getContexts() {
+        return contextLocator.getAllEnvironments().stream().map(EnvironmentDTO::new).collect(Collectors.toList());
+    }
+
+    @POST
+    @Path("/contexts")
+    @ApiOperation(value = "Add new context")
+    public Response addContext(@ApiParam() EnvironmentDTO request) throws ElementAlreadyExistsException, ResourceNotFoundException, ValidationException {
+        if(request.getName() == null || request.getName().trim().isEmpty()) throw new ValidationException("Context name must not be null or blank");
+        environmentsScreenDomainService.createContextByName(request.getName(), request.getNameAlias(), request.getParentId());
+        return Response.status(Response.Status.OK).build();
+    }
+
+    @PUT
+    @Path("/contexts/{id : \\d+}")
+    @ApiOperation(value = "Update existing context")
+    public Response updateContext(@ApiParam("Environment ID") @PathParam("id") Integer id, EnvironmentDTO request) throws ResourceNotFoundException {
+        environmentsScreenDomainService.saveEnvironment(id, request.getName(), request.getNameAlias());
+        return Response.status(Response.Status.OK).build();
+    }
+
+    @DELETE
+    @Path("contexts/{id : \\d+}")
+    @ApiOperation(value = "Remove a context")
+    public Response deleteContext(@PathParam("id") Integer id) throws AMWException {
+        contextLocator.deleteContext(id);
+        return Response.status(NO_CONTENT).build();
+    }
 }
diff --git a/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/exceptions/ElementAlreadyExistsExceptionMapper.java b/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/exceptions/ElementAlreadyExistsExceptionMapper.java
new file mode 100644
index 000000000..cf62bc9c0
--- /dev/null
+++ b/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/exceptions/ElementAlreadyExistsExceptionMapper.java
@@ -0,0 +1,16 @@
+package ch.mobi.itc.mobiliar.rest.exceptions;
+
+import ch.puzzle.itc.mobiliar.common.exception.ElementAlreadyExistsException;
+
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.ExceptionMapper;
+import javax.ws.rs.ext.Provider;
+
+@Provider
+public class ElementAlreadyExistsExceptionMapper implements ExceptionMapper<ElementAlreadyExistsException> {
+    @Override
+    public Response toResponse(ElementAlreadyExistsException exception) {
+        return Response.status(Response.Status.CONFLICT).entity(new ExceptionDto(exception)).build();
+    }
+}
+
diff --git a/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/exceptions/IllegalStateExceptionMapper.java b/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/exceptions/IllegalStateExceptionMapper.java
index d6c6e8c58..1d3cde012 100644
--- a/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/exceptions/IllegalStateExceptionMapper.java
+++ b/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/exceptions/IllegalStateExceptionMapper.java
@@ -28,6 +28,6 @@
 public class IllegalStateExceptionMapper implements ExceptionMapper<IllegalStateException> {
     @Override
     public Response toResponse(IllegalStateException exception) {
-        return Response.status(Response.Status.FORBIDDEN).entity(new ExceptionDto(exception)).build();
+        return Response.status(Response.Status.CONFLICT).entity(new ExceptionDto(exception)).build();
     }
 }
diff --git a/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/functions/FunctionsRest.java b/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/functions/FunctionsRest.java
new file mode 100644
index 000000000..419e47780
--- /dev/null
+++ b/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/functions/FunctionsRest.java
@@ -0,0 +1,98 @@
+package ch.mobi.itc.mobiliar.rest.functions;
+
+import ch.puzzle.itc.mobiliar.business.globalfunction.boundary.GlobalFunctionsBoundary;
+import ch.puzzle.itc.mobiliar.business.globalfunction.entity.GlobalFunctionEntity;
+import ch.puzzle.itc.mobiliar.business.template.entity.RevisionInformation;
+import ch.puzzle.itc.mobiliar.common.exception.NotFoundException;
+import ch.puzzle.itc.mobiliar.common.exception.ValidationException;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Response;
+import java.util.Collections;
+import java.util.List;
+
+import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
+
+@RequestScoped
+@Path("settings/functions")
+@Api(value = "settings/functions", description = "Functions")
+@Consumes(APPLICATION_JSON)
+@Produces(APPLICATION_JSON)
+public class FunctionsRest {
+
+    @Inject
+    private GlobalFunctionsBoundary globalFunctionsBoundary;
+
+    @GET
+    @ApiOperation(value = "Get all functions")
+    public List<GlobalFunctionEntity> getAllFunctions() {
+        return globalFunctionsBoundary.getAllGlobalFunctions();
+    }
+
+    @GET
+    @Path("/{id}")
+    @ApiOperation(value = "Get a specific function")
+    public Response getFunctionById(@PathParam("id") int id) throws NotFoundException {
+        GlobalFunctionEntity function = globalFunctionsBoundary.getFunctionById(id);
+        return Response.ok(function).build();
+    }
+
+    @POST
+    @ApiOperation(value = "Add new function")
+    public Response addNewFunction(GlobalFunctionEntity request) {
+        try {
+            globalFunctionsBoundary.saveGlobalFunction(request);
+            return Response.status(Response.Status.CREATED).build();
+        } catch (ValidationException e) {
+            return Response.status(Response.Status.BAD_REQUEST).entity(Collections.singletonMap("message", e.getMessage()))
+                    .build();
+        }
+    }
+
+    @PUT
+    @ApiOperation(value = "Modify existing function")
+    public Response modifyFunction(GlobalFunctionEntity request) {
+        if (request.getId() == null || !globalFunctionsBoundary.isExistingId(request.getId())) {
+            return Response.status(Response.Status.BAD_REQUEST).entity(Collections.singletonMap("message", "Only existing functions can be modified"))
+                    .build();
+        }
+        try {
+            globalFunctionsBoundary.saveGlobalFunction(request);
+            return Response.status(Response.Status.OK).build();
+        } catch (ValidationException e) {
+            return Response.status(Response.Status.BAD_REQUEST).entity(Collections.singletonMap("message", e.getMessage()))
+                    .build();
+        }
+    }
+
+    @DELETE
+    @Path("/{id}")
+    @ApiOperation(value = "Remove a function")
+    public Response deleteFunction(@PathParam("id") int id) throws NotFoundException {
+        globalFunctionsBoundary.deleteGlobalFunction(id);
+        return Response.status(Response.Status.NO_CONTENT).build();
+    }
+
+    @GET
+    @Path("/{id}/revisions")
+    @ApiOperation(value = "Get all revisions of a specific function")
+    public Response getFunctionRevisions(@PathParam("id") int id) throws NotFoundException {
+        List<RevisionInformation> revisions = globalFunctionsBoundary.getFunctionRevisions(id);
+        if (revisions.isEmpty()) {
+            throw new NotFoundException("No function revisions found");
+        }
+        return Response.ok(revisions).build();
+    }
+
+    @GET
+    @Path("/{id}/revisions/{revisionId}")
+    @ApiOperation(value = "Get a specific revision of a function")
+    public Response getFunctionByIdAndRevision(@PathParam("id") int id, @PathParam("revisionId") int revisionId) throws NotFoundException {
+        GlobalFunctionEntity function = globalFunctionsBoundary.getFunctionByIdAndRevision(id, revisionId);
+        return Response.ok(function).build();
+    }
+}
diff --git a/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/properties/PropertyTypesRest.java b/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/properties/PropertyTypesRest.java
new file mode 100644
index 000000000..65989cabd
--- /dev/null
+++ b/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/properties/PropertyTypesRest.java
@@ -0,0 +1,139 @@
+package ch.mobi.itc.mobiliar.rest.properties;
+
+import ch.mobi.itc.mobiliar.rest.dtos.PropertyTagDTO;
+import ch.mobi.itc.mobiliar.rest.dtos.PropertyTypeDTO;
+import ch.mobi.itc.mobiliar.rest.exceptions.ExceptionDto;
+import ch.puzzle.itc.mobiliar.business.property.control.PropertyTypeService;
+import ch.puzzle.itc.mobiliar.business.property.entity.PropertyTagEntity;
+import ch.puzzle.itc.mobiliar.business.property.entity.PropertyTagType;
+import ch.puzzle.itc.mobiliar.business.property.entity.PropertyTypeEntity;
+import ch.puzzle.itc.mobiliar.common.exception.*;
+import ch.puzzle.itc.mobiliar.common.exception.NotFoundException;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+
+import javax.ejb.Stateless;
+import javax.inject.Inject;
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Response;
+
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.PatternSyntaxException;
+import java.util.stream.Collectors;
+
+import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
+import static javax.ws.rs.core.Response.Status.*;
+import static javax.ws.rs.core.Response.Status.NO_CONTENT;
+
+@Stateless
+@Path("/settings/propertyTypes")
+@Api(value = "/settings/propertyTypes")
+@Consumes(APPLICATION_JSON)
+@Produces({APPLICATION_JSON})
+public class PropertyTypesRest {
+
+    @Inject
+    private PropertyTypeService propertyTypeService;
+
+    @GET
+    @ApiOperation(value = "Get all property types")
+    public Response getAllPropertyTypes() {
+
+        List<PropertyTypeEntity> propertyTypes = propertyTypeService.loadAll();
+
+        List<PropertyTypeDTO> propertyTypeDTOS = propertyTypes.stream()
+                .map(PropertyTypeDTO::new)
+                .distinct()
+                .collect(Collectors.toList());
+        return Response.status(OK).entity(propertyTypeDTOS).build();
+    }
+
+    @POST
+    @ApiOperation(value = "Add a property type")
+    public Response addPropertyType(@NotNull(message = "Property type must not be null.") @Valid PropertyTypeDTO request) throws ValidationException {
+        if (request.getId() != null) {
+            return Response.status(BAD_REQUEST).entity(new ExceptionDto("Id must be null")).build();
+        }
+        PropertyTypeEntity propertyTypeEntity = mapDto(request);
+
+        PropertyTypeEntity newEntity = propertyTypeService.create(propertyTypeEntity);
+
+        return Response.status(CREATED).entity(newEntity)
+                .location(URI.create("/settings/propertyTypes/" + newEntity.getId()))
+                .build();
+    }
+
+    @PUT
+    @Path("/{id : \\d+}")
+    // support digit only
+    @Produces("application/json")
+    @ApiOperation(value = "Update a property type")
+    public Response updatePropertyType(@ApiParam("Property type ID")
+                                       @PathParam("id") Integer id, PropertyTypeDTO request)
+            throws NotFoundException, ValidationException {
+        if (request == null) {
+            return Response.status(BAD_REQUEST).entity(new ExceptionDto("Property type must not be null.")).build();
+        }
+        PropertyTypeEntity propertyTypeEntity = mapDto(request);
+        propertyTypeEntity.setId(id);
+
+        propertyTypeService.update(id, propertyTypeEntity);
+
+        return Response.status(OK).build();
+    }
+
+    @DELETE
+    @Path("/{id : \\d+}")
+    // support digit only
+    @ApiOperation(value = "Remove a property type")
+    public Response deletePropertyType(@ApiParam("Property type ID") @PathParam("id") Integer id)
+            throws NotFoundException, ValidationException {
+        propertyTypeService.deleteById(id);
+
+        return Response.status(NO_CONTENT).build();
+    }
+
+    private PropertyTypeEntity mapDto(PropertyTypeDTO request) throws ValidationException {
+
+        PropertyTypeEntity propertyTypeEntity = new PropertyTypeEntity();
+        propertyTypeEntity.setPropertyTypeName(request.getName());
+        propertyTypeEntity.setEncrypt(request.isEncrypted());
+        propertyTypeEntity.setValidationRegex(request.getValidationRegex());
+
+            List<PropertyTagEntity> list = new ArrayList<>();
+            for (PropertyTagDTO tagDTO : request.getPropertyTags()) {
+                if (tagDTO.getName() == null || tagDTO.getName().isEmpty()) {
+                    throw new ValidationException("PropertyTag name must not be null or empty.");
+                }
+                if (tagDTO.getType() == null || tagDTO.getType().isEmpty()) {
+                    throw new ValidationException("PropertyTag type must not be null or empty.");
+                }
+
+                PropertyTagEntity apply = new PropertyTagEntity(tagDTO.getName(),
+                        PropertyTagType.valueOf(tagDTO.getType()));
+                list.add(apply);
+            }
+            propertyTypeEntity.setPropertyTags(list
+            );
+
+        if (checkIfRegexpSyntaxError(request.getValidationRegex())) {
+            throw new ValidationException("Invalid property type validation pattern.");
+        }
+        return propertyTypeEntity;
+    }
+
+    private boolean checkIfRegexpSyntaxError(String regexp) {
+        try {
+            "".matches(regexp);
+            return false;
+        } catch (PatternSyntaxException e) {
+            return true;
+        }
+    }
+
+}
diff --git a/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/releases/ReleasesRest.java b/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/releases/ReleasesRest.java
index 296d4972b..2be82155d 100644
--- a/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/releases/ReleasesRest.java
+++ b/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/releases/ReleasesRest.java
@@ -21,8 +21,8 @@
 package ch.mobi.itc.mobiliar.rest.releases;
 
 import ch.mobi.itc.mobiliar.rest.exceptions.ExceptionDto;
+import ch.puzzle.itc.mobiliar.business.generator.control.extracted.ResourceDependencyResolverService;
 import ch.puzzle.itc.mobiliar.business.releasing.boundary.ReleaseLocator;
-import ch.puzzle.itc.mobiliar.business.releasing.control.ReleaseMgmtService;
 import ch.puzzle.itc.mobiliar.business.releasing.entity.ReleaseEntity;
 import ch.puzzle.itc.mobiliar.common.exception.ConcurrentModificationException;
 import ch.puzzle.itc.mobiliar.common.exception.NotFoundException;
@@ -35,7 +35,7 @@
 import javax.ws.rs.*;
 import javax.ws.rs.core.GenericEntity;
 import javax.ws.rs.core.Response;
-import java.util.List;
+import java.util.*;
 
 import static javax.ws.rs.core.Response.Status.*;
 
@@ -44,10 +44,10 @@
 @Api(value = "/releases", description = "Releases")
 public class ReleasesRest {
 
-    @Inject
-    private ReleaseMgmtService releaseMgmtService;
     @Inject
     private ReleaseLocator releaseLocator;
+    @Inject
+    private ResourceDependencyResolverService resourceDependencyResolverService;
 
     @GET
     @ApiOperation(value = "Get releases", notes = "Returns all releases")
@@ -83,6 +83,18 @@ public ReleaseEntity getDefaultRelease() {
         return releaseLocator.getDefaultRelease();
     }
 
+    @GET()
+    @Path("/upcomingRelease")
+    @ApiOperation(value = "Get upcoming release")
+    public ReleaseEntity getUpcomingRelease() throws NotFoundException {
+        List<ReleaseEntity> allReleases = releaseLocator.loadAllReleases(false);
+        if (allReleases.isEmpty())
+            throw new NotFoundException("No releases found");
+        return resourceDependencyResolverService.findMostRelevantRelease(
+                new TreeSet<ReleaseEntity>(allReleases),
+                new Date());
+    }
+
     @POST
     @ApiOperation(value = "Add a release")
     public Response addRelease(@ApiParam() ReleaseEntity request) {
diff --git a/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/resources/ResourceGroupsRest.java b/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/resources/ResourceGroupsRest.java
index 4ba7c90e2..681c2d870 100644
--- a/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/resources/ResourceGroupsRest.java
+++ b/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/resources/ResourceGroupsRest.java
@@ -33,18 +33,15 @@
 import ch.puzzle.itc.mobiliar.business.releasing.entity.ReleaseEntity;
 import ch.puzzle.itc.mobiliar.business.resourcegroup.boundary.*;
 import ch.puzzle.itc.mobiliar.business.resourcegroup.control.CopyResourceResult;
-import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.Resource;
 import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.ResourceEntity;
 import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.ResourceGroupEntity;
 import ch.puzzle.itc.mobiliar.business.resourcerelation.control.ResourceRelationService;
 import ch.puzzle.itc.mobiliar.business.resourcerelation.entity.ConsumedResourceRelationEntity;
 import ch.puzzle.itc.mobiliar.business.resourcerelation.entity.ProvidedResourceRelationEntity;
 import ch.puzzle.itc.mobiliar.business.security.boundary.PermissionBoundary;
-import ch.puzzle.itc.mobiliar.common.exception.AMWException;
-import ch.puzzle.itc.mobiliar.common.exception.ElementAlreadyExistsException;
+import ch.puzzle.itc.mobiliar.common.exception.*;
 import ch.puzzle.itc.mobiliar.common.exception.NotFoundException;
-import ch.puzzle.itc.mobiliar.common.exception.ResourceNotFoundException;
-import ch.puzzle.itc.mobiliar.common.exception.ValidationException;
+import ch.puzzle.itc.mobiliar.common.util.NameChecker;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -55,6 +52,7 @@
 import javax.ws.rs.*;
 import javax.ws.rs.core.Response;
 import java.util.*;
+import java.util.stream.Collectors;
 
 import static javax.ws.rs.core.Response.Status.BAD_REQUEST;
 import static javax.ws.rs.core.Response.Status.CREATED;
@@ -113,10 +111,8 @@ public List<ResourceGroupDTO> getResources(
             @ApiParam(value = "a resource type, the list should be filtered by") @QueryParam("type") String type) {
         List<ResourceGroupDTO> result = new ArrayList<>();
         List<ResourceGroupEntity> resourceGroups;
-        // used by angular
         if (type != null) {
-            // TODO my favorites only
-            resourceGroups = resourceGroupLocator.getGroupsForType(type, Collections.EMPTY_LIST, true, true);
+            resourceGroups = resourceGroupLocator.getGroupsForType(type, true, true);
         } else {
             resourceGroups = resourceGroupLocator.getResourceGroups();
         }
@@ -131,6 +127,37 @@ public List<ResourceGroupDTO> getResources(
         return result;
     }
 
+    @GET
+    @ApiOperation(value = "Get resource groups by resource type id")
+    public List<ResourceGroupDTO> getResourceGroupsByResourceTypeId(
+            @ApiParam(value = "a resource type id, the list should be filtered by") @QueryParam("typeId") Integer typeId) {
+        List<ResourceGroupEntity> resourceGroups;
+        if (typeId != null) {
+            resourceGroups = resourceGroupLocator.getGroupsForType(typeId, true, true);
+        } else {
+            resourceGroups = resourceGroupLocator.getResourceGroups();
+        }
+
+        return resourceGroups.stream().map(resourceGroupEntity -> {
+            List<ReleaseEntity> releases = resourceGroupEntity.getResources().stream().map(ResourceEntity::getRelease).collect(Collectors.toList());
+            SortedSet<ReleaseEntity> sortedReleases = releases.stream()
+                    .sorted(Comparator.comparing(ReleaseEntity::getInstallationInProductionAt))
+                    .collect(Collectors.toCollection(TreeSet::new));
+            ReleaseEntity mostRelevantRelease = this.resourceDependencyResolverService.findMostRelevantRelease(sortedReleases, new Date());
+
+            Map<Integer, ResourceEntity> releaseToResourceMap = new HashMap<>();
+            for (ResourceEntity res : resourceGroupEntity.getResources()) {
+                releaseToResourceMap.put(res.getRelease().getId(), res);
+            }
+
+            var defaultResource = releaseToResourceMap.get(mostRelevantRelease.getId());
+
+            return new ResourceGroupDTO(resourceGroupEntity, mostRelevantRelease, releases, defaultResource);
+
+        }).collect(Collectors.toList());
+    }
+
+
     @Path("/{resourceGroupName}")
     @GET
     @ApiOperation(value = "Get a resource group")
@@ -174,21 +201,26 @@ public ResourceDTO getExactOrClosestPastRelease(@PathParam("resourceGroupName")
      */
     @POST
     @ApiOperation(value = "Add a Resource")
-    public Response addResource(@ApiParam("Add a Resource") ResourceReleaseDTO request) {
-        Resource resource;
-        if (StringUtils.isEmpty(request.getName())) {
-            return Response.status(BAD_REQUEST).entity(new ExceptionDto("Resource name must not be empty")).build();
-        }
-        if (StringUtils.isEmpty(request.getReleaseName())) {
-            return Response.status(BAD_REQUEST).entity(new ExceptionDto("Release name must not be empty")).build();
-        }
+    public Response addResource(@ApiParam("Add a Resource") ResourceReleaseDTO request) throws ValidationException, NotFoundException, ElementAlreadyExistsException {
+        if(StringUtils.isEmpty(request.getName()) || StringUtils.isEmpty(request.getName().trim()))
+            throw new ValidationException("Resource name must not be null or blank");
+
+        if(StringUtils.isEmpty(request.getReleaseName()) || StringUtils.isEmpty(request.getReleaseName().trim()))
+            throw new ValidationException("Release name must not be null or blank");
+
+        if(!NameChecker.isValidAlphanumericWithUnderscoreHyphenName(request.getName()))
+            throw new ValidationException(NameChecker.getErrorTextForInvalidResourceName(
+                    (request.getType() != null) ? request.getType() : null, request.getName()));
+
         try {
-            resource = resourceBoundary.createNewResourceByName(ForeignableOwner.getSystemOwner(), request.getName(),
+            resourceBoundary.createNewResourceByName(ForeignableOwner.getSystemOwner(), request.getName(),
                     request.getType(), request.getReleaseName());
-        } catch (AMWException e) {
-            return Response.status(BAD_REQUEST).entity(new ExceptionDto(e.getMessage())).build();
+        } catch (ResourceTypeNotFoundException e) {
+            throw new NotFoundException("Resource type: " + request.getType() + " not found");
+        } catch (ResourceNotFoundException e) {
+            throw new NotFoundException("Release : " + request.getReleaseName() + " not found");
         }
-        return Response.status(CREATED).header("Location", "/resources/" + resource.getName()).build();
+        return Response.status(Response.Status.OK).build();
     }
 
     /**
@@ -365,15 +397,4 @@ public Response getMostRelevantReleaseForResourceGroup(@PathParam("resourceGroup
         return Response.ok(mostRelevant).build();
     }
 
-    @Path("/resourceGroups/{resourceGroupId}/canCreateShakedownTest")
-    @GET
-    @ApiOperation(value = "Checks is caller is allowed to create/execute ShakedownTests - used by Angular")
-    public Response canCreateShakedownTest(@PathParam("resourceGroupId") Integer resourceGroupId) {
-        if (resourceGroupId == null) {
-            return Response.status(Response.Status.BAD_REQUEST).build();
-        }
-        boolean hasPermission = permissionBoundary.hasPermissionToCreateShakedownTests(resourceGroupId);
-        return Response.ok(hasPermission).build();
-    }
-
 }
diff --git a/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/resources/ResourceRelationTemplatesRest.java b/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/resources/ResourceRelationTemplatesRest.java
index f00c300bd..6b65f4049 100644
--- a/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/resources/ResourceRelationTemplatesRest.java
+++ b/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/resources/ResourceRelationTemplatesRest.java
@@ -111,7 +111,7 @@ private List<TemplateDescriptorEntity> getRelTemplates(String resourceGroupName,
 
         List<TemplateDescriptorEntity> templates = new ArrayList<>();
         for (ConsumedResourceRelationEntity resRel : resRelList) {
-            List<TemplateDescriptorEntity> temp = templateService.getTemplatesForResourceRelation(resRel, false);
+            List<TemplateDescriptorEntity> temp = templateService.getTemplatesForResourceRelation(resRel);
             for (TemplateDescriptorEntity t : temp) {
                 t.setRelatedResourceIdentifier(resRel.getIdentifier());
             }
diff --git a/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/resources/ResourceTemplatesRest.java b/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/resources/ResourceTemplatesRest.java
index e115dacb1..ae53bc1d9 100644
--- a/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/resources/ResourceTemplatesRest.java
+++ b/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/resources/ResourceTemplatesRest.java
@@ -69,7 +69,7 @@ public class ResourceTemplatesRest {;
     public List<TemplateDTO> getResourceTemplates(@PathParam("resourceGroupName") String resourceGroupName,
                                                 @PathParam("releaseName") String releaseName) throws ValidationException {
         List<TemplateDTO> templateDTOs = new ArrayList<>();
-        List<TemplateDescriptorEntity> templates = templateService.getGlobalTemplateDescriptorsForResource(resourceGroupName, releaseName, false);
+        List<TemplateDescriptorEntity> templates = templateService.getGlobalTemplateDescriptorsForResource(resourceGroupName, releaseName);
 
         for (TemplateDescriptorEntity template : templates) {
             TemplateDTO temp = new TemplateDTO(template);
@@ -98,7 +98,7 @@ public Response deleteResourceTemplate(@PathParam("resourceGroupName") String re
                                            @PathParam("releaseName") String releaseName,
                                            @PathParam("templateName") String templateName) throws ValidationException, AMWException {
         try {
-            templateEditor.removeTemplate(resourceGroupName, releaseName, templateName, false);
+            templateEditor.removeTemplate(resourceGroupName, releaseName, templateName);
         } catch (TemplateNotDeletableException e) {
             return Response.status(Response.Status.BAD_REQUEST).build();
         }
@@ -114,7 +114,7 @@ public Response createResourceTemplates(@PathParam("resourceGroupName") String r
         templateDTO.setId(null);
         TemplateDescriptorEntity template = toTemplateDescriptorEntity(templateDTO, null);
 
-        templateEditor.saveTemplateForResource(template, resourceGroupName, releaseName, false);
+        templateEditor.saveTemplateForResource(template, resourceGroupName, releaseName);
         return Response.ok(new TemplateDTO(template)).build();
     }
 
@@ -131,12 +131,12 @@ public Response updateResourceTemplates(@PathParam("resourceGroupName") String r
         }
         template = toTemplateDescriptorEntity(templateDTO, template);
 
-        templateEditor.saveTemplateForResource(template, resourceGroupName, releaseName, false);
+        templateEditor.saveTemplateForResource(template, resourceGroupName, releaseName);
         return Response.ok(new TemplateDTO(template)).build();
     }
 
     private TemplateDescriptorEntity getTemplate(String resourceGroupName, String releaseName, String templateName) throws ValidationException {
-        List<TemplateDescriptorEntity> templates = templateService.getGlobalTemplateDescriptorsForResource(resourceGroupName, releaseName, false);
+        List<TemplateDescriptorEntity> templates = templateService.getGlobalTemplateDescriptorsForResource(resourceGroupName, releaseName);
         for (TemplateDescriptorEntity template : templates) {
             if (templateName.equals(template.getName())) {
                 return template;
@@ -150,7 +150,6 @@ private TemplateDescriptorEntity toTemplateDescriptorEntity(TemplateDTO template
             template = new TemplateDescriptorEntity();
         }
         template.setId(templateDTO.getId());
-        template.setTesting(false);
         template.setFileContent(templateDTO.getFileContent());
         template.setName(templateDTO.getName());
         template.setTargetPath(templateDTO.getTargetPath());
diff --git a/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/resources/ResourceTypesRest.java b/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/resources/ResourceTypesRest.java
index f075461e1..7d6d5b37b 100644
--- a/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/resources/ResourceTypesRest.java
+++ b/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/resources/ResourceTypesRest.java
@@ -20,42 +20,111 @@
 
 package ch.mobi.itc.mobiliar.rest.resources;
 
-import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Response;
+
 
 import ch.mobi.itc.mobiliar.rest.dtos.ResourceTypeDTO;
-import ch.puzzle.itc.mobiliar.business.property.boundary.PropertyEditor;
+import ch.mobi.itc.mobiliar.rest.dtos.ResourceTypeRequestDTO;
 import ch.puzzle.itc.mobiliar.business.resourcegroup.boundary.ResourceTypeLocator;
-import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.ResourceTypeEntity;
+import ch.puzzle.itc.mobiliar.business.resourcegroup.control.ResourceTypeDomainService;
+import ch.puzzle.itc.mobiliar.common.exception.ElementAlreadyExistsException;
+import ch.puzzle.itc.mobiliar.common.exception.ResourceTypeNotFoundException;
 import ch.puzzle.itc.mobiliar.common.exception.ValidationException;
+import ch.puzzle.itc.mobiliar.common.util.NameChecker;
+import ch.puzzle.itc.mobiliar.common.exception.NotAuthorizedException;
+import ch.puzzle.itc.mobiliar.common.exception.NotFoundException;
+import ch.puzzle.itc.mobiliar.common.exception.ResourceNotFoundException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+
+import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
+
+import static javax.ws.rs.core.Response.Status.NO_CONTENT;
 
 @RequestScoped
 @Path("/resources")
 @Api(value = "/resources", description = "ResourceTypes")
+@Consumes(APPLICATION_JSON)
+@Produces(APPLICATION_JSON)
 public class ResourceTypesRest {
 
     @Inject
     private ResourceTypeLocator resourceTypeLocator;
 
     @Inject
-    PropertyEditor propertyEditor;
+    private ResourceTypeDomainService resourceTypeDomainService;
 
     @Path("/resourceTypes")
     @GET
-    @ApiOperation(value = "Get all available ResourceTypes - used by Angular")
-    public List<ResourceTypeDTO> getAllResourceTypes() throws ValidationException {
-        List<ResourceTypeEntity> resourceTypes = resourceTypeLocator.getAllResourceTypes();
-        List<ResourceTypeDTO> resourceTypeDTOs = new ArrayList<>();
-        for (ResourceTypeEntity resourceType : resourceTypes) {
-            resourceTypeDTOs.add(new ResourceTypeDTO(resourceType));
+    @ApiOperation(value = "Get all resource types")
+    public List<ResourceTypeDTO> getAllResourceTypes() {
+        return resourceTypeLocator.getAllResourceTypes().stream()
+                .map(ResourceTypeDTO::new)
+                .collect(Collectors.toList());
+    }
+
+    @Path("/predefinedResourceTypes")
+    @GET
+    @ApiOperation(value = "Get predefined resource types")
+    public List<ResourceTypeDTO> getPredefinedResourceTypes() {
+        return resourceTypeLocator.getPredefinedResourceTypes().stream()
+                .map(ResourceTypeDTO::new)
+                .collect(Collectors.toList());
+    }
+
+    @Path("/rootResourceTypes")
+    @GET
+    @ApiOperation(value = "Get root resource types")
+    public List<ResourceTypeDTO> getRootResourceTypes() {
+        return resourceTypeLocator.getRootResourceTypes().stream()
+                .map(ResourceTypeDTO::new)
+                .collect(Collectors.toList());
+    }
+
+    @Path("/resourceTypes")
+    @POST
+    @ApiOperation(value = "Add a new resource type")
+    @Consumes("application/json")
+    public Response addNewResourceType(ResourceTypeRequestDTO request)
+            throws ElementAlreadyExistsException, ValidationException, NotFoundException {
+
+        if (StringUtils.isEmpty(request.getName()) || StringUtils.isEmpty(request.getName().trim())) {
+            throw new ValidationException("Resource type name must not be null or blank");
+        }
+
+        if (!NameChecker.isValidAlphanumericWithUnderscoreHyphenName(request.getName())) {
+            throw new ValidationException(NameChecker.getErrorTextForResourceType(request.getName()));
+        }
+
+        try {
+            resourceTypeDomainService.addResourceType(request.getName(), request.getParentId());
+        } catch (ResourceTypeNotFoundException e) {
+            throw new NotFoundException(e.getMessage());
+        }
+        return Response.status(Response.Status.CREATED).build();
+    }
+
+
+    @DELETE
+    @Path("/resourceTypes/{id : \\d+}")
+    @ApiOperation(value = "Delete a resource type")
+    public Response deleteResourceType(@PathParam("id") Integer id) throws NotAuthorizedException, NotFoundException {
+        try {
+            if (resourceTypeLocator.getPredefinedResourceTypes().stream()
+                    .anyMatch(resourceType -> resourceType.getId().equals(id))) {
+                throw new NotAuthorizedException("Predefined resource types cannot be deleted.");
+            }
+            resourceTypeDomainService.removeResourceType(id);
+        } catch (ResourceNotFoundException | ResourceTypeNotFoundException e) {
+            throw new NotFoundException(e.getMessage());
         }
-        return resourceTypeDTOs;
+        return Response.status(NO_CONTENT).build();
     }
 }
diff --git a/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/servers/ServersRest.java b/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/servers/ServersRest.java
new file mode 100644
index 000000000..4cf4b13ec
--- /dev/null
+++ b/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/servers/ServersRest.java
@@ -0,0 +1,87 @@
+package ch.mobi.itc.mobiliar.rest.servers;
+
+import ch.mobi.itc.mobiliar.rest.dtos.ResourceGroupDTO;
+import ch.mobi.itc.mobiliar.rest.dtos.ResourceTypeDTO;
+import ch.mobi.itc.mobiliar.rest.dtos.ServerDTO;
+import ch.puzzle.itc.mobiliar.business.resourcegroup.boundary.ResourceGroupLocator;
+import ch.puzzle.itc.mobiliar.business.resourcegroup.control.ResourceGroupPersistenceService;
+import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.ResourceGroupEntity;
+import ch.puzzle.itc.mobiliar.business.server.boundary.GetServersUseCase;
+import ch.puzzle.itc.mobiliar.business.server.boundary.ServerView;
+import ch.puzzle.itc.mobiliar.business.server.entity.ServerTuple;
+import ch.puzzle.itc.mobiliar.common.util.DefaultResourceTypeDefinition;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+import javax.ejb.Stateless;
+import javax.inject.Inject;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Response;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
+import static javax.ws.rs.core.Response.Status.OK;
+
+@Stateless
+@Path("/servers")
+@Api(value = "/servers")
+@Consumes(APPLICATION_JSON)
+@Produces(APPLICATION_JSON)
+public class ServersRest {
+
+    @Inject
+    GetServersUseCase getServersUseCase;
+
+    @Inject
+    ResourceGroupPersistenceService resourceGroupPersistenceService;
+
+    @Inject
+    ResourceGroupLocator resourceGroupLocator;
+
+
+    @Inject
+    ServerView serverView;
+
+    @GET
+    @ApiOperation("Get servers")
+    public Response getServers() {
+        return Response.status(OK).entity(getServersUseCase.all()).build();
+    }
+
+    @GET
+    @Path("/runtimes")
+    @ApiOperation("Get runtimes")
+    public List<ResourceGroupDTO> getRuntimes() {
+        return resourceGroupPersistenceService.loadGroupsForTypeName(DefaultResourceTypeDefinition.RUNTIME.name())
+                .stream()
+                .map(resourceGroupEntity -> new ResourceGroupDTO(resourceGroupEntity, new ArrayList<>()))
+                .collect(Collectors.toList());
+    }
+
+    @GET
+    @Path("/appServersSuggestions")
+    @ApiOperation("Get app servers suggestions")
+    public List<String> getAppServersSuggestions() {
+        return resourceGroupLocator.getGroupsForType(DefaultResourceTypeDefinition.APPLICATIONSERVER.name(), false, true)
+                .stream()
+                .map(ResourceGroupEntity::getName)
+                .collect(Collectors.toList());
+    }
+
+    @GET
+    @Path("/filter")
+    @ApiOperation("Get servers with params")
+    public Response getServers(@QueryParam("environment") String environment,
+                              @QueryParam("runtime") String runtime,
+                              @QueryParam("appServer") String appServer,
+                               @QueryParam("host") String host,
+                              @QueryParam("node") String node) {
+
+        List<ServerDTO> servers =  serverView.getServers(host,appServer,runtime, node, environment,true).stream().map(ServerDTO::new).collect(Collectors.toList());
+
+        return Response.status(OK).entity(servers).build();
+    }
+}
diff --git a/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/tags/boundary/TagsRest.java b/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/tags/boundary/TagsRest.java
index 9a6569819..ecbdba5f4 100644
--- a/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/tags/boundary/TagsRest.java
+++ b/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/tags/boundary/TagsRest.java
@@ -38,7 +38,6 @@ public class TagsRest {
     private RemoveTagUseCase removeTagUseCase;
 
     @GET
-
     @ApiOperation(value = "Gets all tags")
     public Response getAllTags() {
         return Response.status(OK).entity(listTagsUseCase.get()).build();
diff --git a/AMW_rest/src/main/webapp/WEB-INF/web.xml b/AMW_rest/src/main/webapp/WEB-INF/web.xml
index 9878e720e..46aee1d50 100644
--- a/AMW_rest/src/main/webapp/WEB-INF/web.xml
+++ b/AMW_rest/src/main/webapp/WEB-INF/web.xml
@@ -19,8 +19,6 @@
 			<role-name>test_deployer</role-name>
 			<role-name>developer_deployer</role-name>
 			<role-name>env_management_deployer</role-name>
-			<role-name>shakedown_tester</role-name>
-			<role-name>shakedown_admin</role-name>
             <role-name>overwrite_foreignables</role-name>
 			<role-name>admin_developer</role-name>
 		</auth-constraint>
@@ -59,12 +57,6 @@
 	<security-role>
 		<role-name>env_management_deployer</role-name>
 	</security-role>
-	<security-role>
-		<role-name>shakedown_tester</role-name>
-	</security-role>
-	<security-role>
-		<role-name>shakedown_admin</role-name>
-	</security-role>
     <security-role>
         <role-name>overwrite_foreignables</role-name>
     </security-role>
diff --git a/AMW_rest/src/test/java/ch/mobi/itc/mobiliar/rest/deployments/DeploymentTest.java b/AMW_rest/src/test/java/ch/mobi/itc/mobiliar/rest/deployments/DeploymentTest.java
index 5274fa518..1b80677cf 100644
--- a/AMW_rest/src/test/java/ch/mobi/itc/mobiliar/rest/deployments/DeploymentTest.java
+++ b/AMW_rest/src/test/java/ch/mobi/itc/mobiliar/rest/deployments/DeploymentTest.java
@@ -114,7 +114,6 @@ public void configure() {
         deploymentEntity.setDeploymentDate(new Date());
         deploymentEntity.setStateToDeploy(new Date());
         deploymentEntity.setSimulating(false);
-        deploymentEntity.setShakedownTests(null);
         deploymentEntity.setTrackingId(321);
         ResourceEntity targetPlatform = ResourceFactory.createNewResource("test");
         deploymentEntity.setRuntime(targetPlatform);
@@ -147,8 +146,6 @@ public void configure() {
         deploymentRequestDto.setAppsWithVersion(apps);
         deploymentRequestDto.setDeploymentDate(deploymentEntity.getDeploymentDate());
         deploymentRequestDto.setEnvironmentName(deploymentEntity.getContext().getName());
-        deploymentRequestDto.setExecuteShakedownTest(deploymentEntity.isCreateTestAfterDeployment());
-        deploymentRequestDto.setNeighbourhoodTest(deploymentEntity.isCreateTestForNeighborhoodAfterDeployment());
         deploymentRequestDto.setRequestOnly(false);
         deploymentRequestDto.setSendEmail(deploymentEntity.isSendEmail());
         deploymentRequestDto.setSimulate(deploymentEntity.isSimulating());
@@ -200,7 +197,7 @@ public void configure() {
     @SuppressWarnings("unchecked")
     @Test
     public void getDeploymentsBasic() {
-        when(deploymentBoundary.getFilteredDeployments(null, null, new LinkedList<CustomFilter>(), null, null, null)).thenReturn(
+        when(deploymentBoundary.getFilteredDeployments(null, null, new LinkedList<CustomFilter>(), null, null)).thenReturn(
                 new Tuple<Set<DeploymentEntity>, Integer>(new HashSet<DeploymentEntity>(), 0));
 
         Response response = deploymentRestService.getDeployments(null, null, null, null, null, null, null, null, null, null, null, null, false);
@@ -215,37 +212,37 @@ public void getDeploymentsBasic() {
 
     @Test
     public void verifyThatDeploymentServiceIsCalledWithNonEmptyFilterIfDeploymentParametersAreSet() {
-        when(deploymentBoundary.getFilteredDeployments(isNull(), isNull(), anyList(), isNull(), isNull(), isNull())).thenReturn(
+        when(deploymentBoundary.getFilteredDeployments(isNull(), isNull(), anyList(), isNull(), isNull())).thenReturn(
                 new Tuple<Set<DeploymentEntity>, Integer>(new HashSet<DeploymentEntity>(), 0));
         deploymentRestService.getDeployments(null, null, null, null, null, null, null, null, null, null, Collections.singletonList("TEST"), null, false);
 
         @SuppressWarnings("unchecked")
         ArgumentCaptor<List<CustomFilter>> captor = ArgumentCaptor.forClass(List.class);
-        verify(deploymentBoundary, times(1)).getFilteredDeployments(isNull(), isNull(), captor.capture(), isNull(), isNull(), isNull());
+        verify(deploymentBoundary, times(1)).getFilteredDeployments(isNull(), isNull(), captor.capture(), isNull(), isNull());
         assertEquals(1, captor.getValue().size());
     }
 
     @Test
     public void verifyThatDeploymentServiceIsCalledWithNonEmptyFilterIfDeploymentParameterValuesAreSet() {
-        when(deploymentBoundary.getFilteredDeployments(isNull(), isNull(), anyList(), isNull(), isNull(), isNull())).thenReturn(
+        when(deploymentBoundary.getFilteredDeployments(isNull(), isNull(), anyList(), isNull(), isNull())).thenReturn(
                 new Tuple<Set<DeploymentEntity>, Integer>(new HashSet<DeploymentEntity>(), 0));
         deploymentRestService.getDeployments(null, null, null, null, null, null, null, null, null, null, null, Collections.singletonList("TESTVALUE"), false);
 
         @SuppressWarnings("unchecked")
         ArgumentCaptor<List<CustomFilter>> captor = ArgumentCaptor.forClass(List.class);
-        verify(deploymentBoundary, times(1)).getFilteredDeployments(isNull(), isNull(), captor.capture(), isNull(), isNull(), isNull());
+        verify(deploymentBoundary, times(1)).getFilteredDeployments(isNull(), isNull(), captor.capture(), isNull(), isNull());
         assertEquals(1, captor.getValue().size());
     }
 
     @Test
     public void verifyThatDeploymentServiceIsCalledWithNonEmptyFilterIfDeploymentParametersAndDeploymentParameterValuesAreSet() {
-        when(deploymentBoundary.getFilteredDeployments(isNull(), isNull(), anyList(), isNull(), isNull(), isNull())).thenReturn(
+        when(deploymentBoundary.getFilteredDeployments(isNull(), isNull(), anyList(), isNull(), isNull())).thenReturn(
                 new Tuple<Set<DeploymentEntity>, Integer>(new HashSet<DeploymentEntity>(), 0));
         deploymentRestService.getDeployments(null, null, null, null, null, null, null, null, null, null, Collections.singletonList("TEST"), Collections.singletonList("TESTVALUE"), false);
 
         @SuppressWarnings("unchecked")
         ArgumentCaptor<List<CustomFilter>> captor = ArgumentCaptor.forClass(List.class);
-        verify(deploymentBoundary, times(1)).getFilteredDeployments(isNull(), isNull(), captor.capture(), isNull(), isNull(), isNull());
+        verify(deploymentBoundary, times(1)).getFilteredDeployments(isNull(), isNull(), captor.capture(), isNull(), isNull());
         assertEquals(2, captor.getValue().size());
     }
 
@@ -282,12 +279,12 @@ public void addDeployment() {
                 ReleaseEntity release = mockRelease();
                 when(deploymentBoundary.createDeploymentReturnTrackingId(anyInt(), anyInt(), any(Date.class),
                                 any(Date.class), any(LinkedList.class), any(LinkedList.class), any(ArrayList.class),
-                                anyBoolean(), anyBoolean(), anyBoolean(), anyBoolean(), anyBoolean()))
+                                anyBoolean(), anyBoolean(), anyBoolean()))
                                                 .thenReturn(deploymentEntity.getTrackingId());
 
                 when(environmentsService.getContextByName(deploymentEntity.getContext().getName()))
                                 .thenReturn(deploymentEntity.getContext());
-                when(deploymentBoundary.getFilteredDeployments(eq(0), eq(1), any(LinkedList.class), isNull(), isNull(), isNull())).thenReturn(
+                when(deploymentBoundary.getFilteredDeployments(eq(0), eq(1), any(LinkedList.class), isNull(), isNull())).thenReturn(
                                                 new Tuple<Set<DeploymentEntity>, Integer>(entities, entities.size()));
                 when(releaseService.findByName(anyString())).thenReturn(release);
 
@@ -312,11 +309,11 @@ public void addDeploymentWithoutAppsWithVersionShouldObtainAppsWithVersionFromBo
         // given
         ReleaseEntity release = mockRelease();
         when(deploymentBoundary.createDeploymentReturnTrackingId(anyInt(), anyInt(), any(Date.class), any(Date.class), any(LinkedList.class),
-                any(LinkedList.class), any(ArrayList.class), anyBoolean(), anyBoolean(), anyBoolean(), anyBoolean(), anyBoolean()))
+                any(LinkedList.class), any(ArrayList.class), anyBoolean(), anyBoolean(), anyBoolean()))
                 .thenReturn(deploymentEntity.getTrackingId());
 
         when(environmentsService.getContextByName(deploymentEntity.getContext().getName())).thenReturn(deploymentEntity.getContext());
-        when(deploymentBoundary.getFilteredDeployments(eq(0), eq(1), any(LinkedList.class), isNull(), isNull(), isNull())).thenReturn(
+        when(deploymentBoundary.getFilteredDeployments(eq(0), eq(1), any(LinkedList.class), isNull(), isNull())).thenReturn(
                 new Tuple<Set<DeploymentEntity>, Integer>(entities, entities.size()));
         when(releaseService.findByName(anyString())).thenReturn(release);
         when(generatorDomainServiceWithAppServerRelations.hasActiveNodeToDeployOnAtDate(
@@ -343,12 +340,12 @@ public void addDeployment_no_active_node() {
         when(
                 deploymentBoundary.createDeploymentReturnTrackingId(anyInt(), anyInt(), any(Date.class), any(Date.class), any(LinkedList.class),
                         any(LinkedList.class), any(ArrayList.class),
-                        anyBoolean(), anyBoolean(), anyBoolean(), anyBoolean(), anyBoolean())).thenReturn(deploymentEntity.getTrackingId());
+                        anyBoolean(), anyBoolean(), anyBoolean())).thenReturn(deploymentEntity.getTrackingId());
         
         when(environmentsService.getContextByName(deploymentEntity.getContext().getName())).thenReturn(deploymentEntity.getContext());
         when(
                 deploymentBoundary.getFilteredDeployments(anyInt(), anyInt(), any(LinkedList.class), anyString(),
-                        any(Sort.SortingDirectionType.class), any(LinkedList.class))).thenReturn(
+                        any(Sort.SortingDirectionType.class))).thenReturn(
                 new Tuple<Set<DeploymentEntity>, Integer>(entities, entities.size()));
         when(releaseService.findByName(anyString())).thenReturn(release);
 
@@ -365,10 +362,10 @@ public void addDeploymentWithOutRelease() {
         ReleaseEntity release = mockRelease();
         when(
                 deploymentBoundary.createDeploymentReturnTrackingId(anyInt(), anyInt(), any(Date.class), any(Date.class), any(LinkedList.class),
-                        any(LinkedList.class), any(ArrayList.class), anyBoolean(), anyBoolean(), anyBoolean(), anyBoolean(), anyBoolean())).thenReturn(
+                        any(LinkedList.class), any(ArrayList.class), anyBoolean(), anyBoolean(), anyBoolean())).thenReturn(
                 deploymentEntity.getTrackingId());
         when(environmentsService.getContextByName(deploymentEntity.getContext().getName())).thenReturn(deploymentEntity.getContext());
-        when(deploymentBoundary.getFilteredDeployments(eq(0), eq(1), any(LinkedList.class), isNull(), isNull(), isNull())).thenReturn(
+        when(deploymentBoundary.getFilteredDeployments(eq(0), eq(1), any(LinkedList.class), isNull(), isNull())).thenReturn(
                 new Tuple<Set<DeploymentEntity>, Integer>(entities, entities.size()));
         when(releaseService.findByName(null)).thenReturn(null);
         when(releaseService.loadAllReleases(false)).thenReturn(Collections.singletonList(release));
@@ -396,11 +393,11 @@ public void addDeploymentWrongAppName() {
         when(
                 deploymentBoundary.createDeploymentReturnTrackingId(anyInt(), anyInt(), any(Date.class), any(Date.class), any(LinkedList.class),
                         any(LinkedList.class), any(ArrayList.class),
-                        anyBoolean(), anyBoolean(), anyBoolean(), anyBoolean(), anyBoolean())).thenReturn(deploymentEntity.getTrackingId());
+                        anyBoolean(), anyBoolean(), anyBoolean())).thenReturn(deploymentEntity.getTrackingId());
         when(environmentsService.getContextByName(deploymentEntity.getContext().getName())).thenReturn(deploymentEntity.getContext());
         when(
                 deploymentBoundary.getFilteredDeployments(anyInt(), anyInt(), any(LinkedList.class), anyString(),
-                        any(Sort.SortingDirectionType.class), any(LinkedList.class))).thenReturn(
+                        any(Sort.SortingDirectionType.class))).thenReturn(
                 new Tuple<Set<DeploymentEntity>, Integer>(entities, entities.size()));
         when(releaseService.findByName(anyString())).thenReturn(release);
 
@@ -418,11 +415,11 @@ public void addDeploymentNoAppInAs() {
         when(
                 deploymentBoundary.createDeploymentReturnTrackingId(anyInt(), anyInt(), any(Date.class), any(Date.class), any(LinkedList.class),
                         any(LinkedList.class), any(ArrayList.class),
-                        anyBoolean(), anyBoolean(), anyBoolean(), anyBoolean(), anyBoolean())).thenReturn(deploymentEntity.getTrackingId());
+                        anyBoolean(), anyBoolean(), anyBoolean())).thenReturn(deploymentEntity.getTrackingId());
         when(environmentsService.getContextByName(deploymentEntity.getContext().getName())).thenReturn(deploymentEntity.getContext());
         when(
                 deploymentBoundary.getFilteredDeployments(anyInt(), anyInt(), any(LinkedList.class), anyString(),
-                        any(Sort.SortingDirectionType.class), any(LinkedList.class))).thenReturn(
+                        any(Sort.SortingDirectionType.class))).thenReturn(
                 new Tuple<Set<DeploymentEntity>, Integer>(entities, entities.size()));
         //the as has no apps
         when(applicationServer.getAMWApplications()).thenReturn(new LinkedList<Application>());
@@ -448,11 +445,11 @@ public void addDeploymentNotAllAppsInRequest() {
         when(
                 deploymentBoundary.createDeploymentReturnTrackingId(anyInt(), anyInt(), any(Date.class), any(Date.class), any(LinkedList.class),
                         any(LinkedList.class), any(ArrayList.class),
-                        anyBoolean(), anyBoolean(), anyBoolean(), anyBoolean(), anyBoolean())).thenReturn(deploymentEntity.getTrackingId());
+                        anyBoolean(), anyBoolean(), anyBoolean())).thenReturn(deploymentEntity.getTrackingId());
         when(environmentsService.getContextByName(deploymentEntity.getContext().getName())).thenReturn(deploymentEntity.getContext());
         when(
                 deploymentBoundary.getFilteredDeployments(anyInt(), anyInt(), any(LinkedList.class), anyString(),
-                        any(Sort.SortingDirectionType.class), any(LinkedList.class))).thenReturn(
+                        any(Sort.SortingDirectionType.class))).thenReturn(
                 new Tuple<Set<DeploymentEntity>, Integer>(entities, entities.size()));
         when(releaseService.findByName(anyString())).thenReturn(release);
 
@@ -526,7 +523,7 @@ public void getDeploymentsShouldAlsoReturnPreservedOne() {
         deploymentEntity.setExContextId(789);
         when(deploymentBoundary.getDeletedContextName(deploymentEntity)).thenReturn(formerEnvironmentName);
         Tuple<Set<DeploymentEntity>, Integer> resultTuple = new Tuple<Set<DeploymentEntity>, Integer>(new HashSet<>(Collections.singletonList(deploymentEntity)), 1);
-        when(deploymentBoundary.getFilteredDeployments(null, null, new LinkedList<CustomFilter>(), null, null, null)).thenReturn(resultTuple);
+        when(deploymentBoundary.getFilteredDeployments(null, null, new LinkedList<CustomFilter>(), null, null)).thenReturn(resultTuple);
 
         // when
         Response response = deploymentRestService.getDeployments(null, null, null, null, null, null, null, null, null, null, null, null, false);
diff --git a/AMW_rest/src/test/java/ch/mobi/itc/mobiliar/rest/dtos/PropertyDTOTest.java b/AMW_rest/src/test/java/ch/mobi/itc/mobiliar/rest/dtos/PropertyDTOTest.java
index 20e464b25..8cf757593 100644
--- a/AMW_rest/src/test/java/ch/mobi/itc/mobiliar/rest/dtos/PropertyDTOTest.java
+++ b/AMW_rest/src/test/java/ch/mobi/itc/mobiliar/rest/dtos/PropertyDTOTest.java
@@ -20,7 +20,7 @@ public void shouldReturnPropertyValueIfPropertyValueIsNotNull() {
         String context = "Global";
         ResourceEditProperty resourceEditProperty = new ResourceEditProperty("technicalKey", "displayName",
                 propertyValue, "exampleValue", defaultValue, "propertyComment",
-                true, true,false, null, true, "validationLogic",
+                true, true,false, null,  "validationLogic",
                 "mik", null, null, null, "propContName",
                 "typeContName", null, null, null, null,null,
                 null, null, null,null, null, null, null,null);
@@ -39,7 +39,7 @@ public void shouldReturnDefaultValueIfPropertyValueIsNull() {
         String context = "Global";
         ResourceEditProperty resourceEditProperty = new ResourceEditProperty("technicalKey", "displayName",
                 propertyValue, "exampleValue", defaultValue, "propertyComment",
-                true, true,false, null, true, "validationLogic",
+                true, true,false, null,  "validationLogic",
                 "mik", null, null, null, "propContName",
                 "typeContName", null, null, null, null,null,
                 null, null, null,null, null, null, null,null);
@@ -49,4 +49,4 @@ public void shouldReturnDefaultValueIfPropertyValueIsNull() {
         // then
         assertThat(dto.getValue(), is(defaultValue));
     }
-}
\ No newline at end of file
+}
diff --git a/AMW_rest/src/test/java/ch/mobi/itc/mobiliar/rest/resources/ResourceGroupsRestTest.java b/AMW_rest/src/test/java/ch/mobi/itc/mobiliar/rest/resources/ResourceGroupsRestTest.java
index 4f643c2cd..e114557ab 100644
--- a/AMW_rest/src/test/java/ch/mobi/itc/mobiliar/rest/resources/ResourceGroupsRestTest.java
+++ b/AMW_rest/src/test/java/ch/mobi/itc/mobiliar/rest/resources/ResourceGroupsRestTest.java
@@ -27,8 +27,7 @@
 import static javax.ws.rs.core.Response.Status.OK;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
@@ -36,7 +35,6 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 
 import javax.ws.rs.core.Response;
@@ -73,8 +71,6 @@
 import ch.puzzle.itc.mobiliar.common.exception.AMWException;
 import ch.puzzle.itc.mobiliar.common.exception.ElementAlreadyExistsException;
 import ch.puzzle.itc.mobiliar.common.exception.NotFoundException;
-import ch.puzzle.itc.mobiliar.common.exception.ResourceNotFoundException;
-import ch.puzzle.itc.mobiliar.common.exception.ResourceTypeNotFoundException;
 import ch.puzzle.itc.mobiliar.common.exception.ValidationException;
 
 public class ResourceGroupsRestTest {
@@ -178,7 +174,7 @@ public void getResourcesForTypeWhereTypeDoesNotExistsShouldReturnEmptyResult() {
         // given
         String typeName = "type";
 
-        when(resourceGroupLocatorMock.getGroupsForType(typeName, Collections.EMPTY_LIST, true, true)).thenReturn(new ArrayList<ResourceGroupEntity>());
+        when(resourceGroupLocatorMock.getGroupsForType(typeName, true, true)).thenReturn(new ArrayList<ResourceGroupEntity>());
 
         // when
         List<ResourceGroupDTO> resourcesResult = rest.getResources(typeName);
@@ -205,15 +201,17 @@ public void shouldNotAllowCreationOfNewResourcesWithoutRelease() {
         resourceReleaseDTO.setName("Test");
 
         // when
-        Response response = rest.addResource(resourceReleaseDTO);
+        Throwable exception = assertThrows(ValidationException.class, () -> {
+            rest.addResource(resourceReleaseDTO);
+        });
 
         // then
-        assertEquals(BAD_REQUEST.getStatusCode(), response.getStatus());
+        assertEquals(exception.getMessage(), "Release name must not be null or blank");
 
     }
 
     @Test
-    public void shouldReturnExpectedLocationHeaderOnSuccessfullResourceCreation() throws ResourceTypeNotFoundException, ResourceNotFoundException, ElementAlreadyExistsException {
+    public void shouldReturnExpectedLocationHeaderOnSuccessfullResourceCreation() throws ElementAlreadyExistsException, ValidationException, NotFoundException {
         // given
         ResourceTypeEntity resType = new ResourceTypeEntity();
         resType.setName("APP");
@@ -239,8 +237,7 @@ public void shouldReturnExpectedLocationHeaderOnSuccessfullResourceCreation() th
         Response response = rest.addResource(resourceReleaseDTO);
 
         // then
-        assertEquals(CREATED.getStatusCode(), response.getStatus());
-        assertTrue(response.getMetadata().get("Location").contains("/resources/" + resGroup.getName()));
+        assertEquals(OK.getStatusCode(), response.getStatus());
     }
 
     @Test
diff --git a/AMW_rest/src/test/java/ch/mobi/itc/mobiliar/rest/resources/ResourceTemplatesRestTest.java b/AMW_rest/src/test/java/ch/mobi/itc/mobiliar/rest/resources/ResourceTemplatesRestTest.java
index dad9c4e4c..f3a4c87ae 100644
--- a/AMW_rest/src/test/java/ch/mobi/itc/mobiliar/rest/resources/ResourceTemplatesRestTest.java
+++ b/AMW_rest/src/test/java/ch/mobi/itc/mobiliar/rest/resources/ResourceTemplatesRestTest.java
@@ -71,7 +71,7 @@ public void shouldReturnCorrectTemplateOnOnGetResourceTemplate() throws Validati
         template.setName("template2");
         templates.add(template);
 
-        when(templateService.getGlobalTemplateDescriptorsForResource(eq("resourceGroupName"), eq("releaseName"), eq(false))).thenReturn(templates);
+        when(templateService.getGlobalTemplateDescriptorsForResource(eq("resourceGroupName"), eq("releaseName"))).thenReturn(templates);
 
         TemplateDTO templateDTO = resourceTemplatesRest.getResourceTemplate("resourceGroupName", "releaseName", "template2");
     
diff --git a/AMW_shakedown/AMW_stm/.gitignore b/AMW_shakedown/AMW_stm/.gitignore
deleted file mode 100644
index 4dc009173..000000000
--- a/AMW_shakedown/AMW_stm/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/target
-/bin
diff --git a/AMW_shakedown/AMW_stm/pom.xml b/AMW_shakedown/AMW_stm/pom.xml
deleted file mode 100644
index a83051f16..000000000
--- a/AMW_shakedown/AMW_stm/pom.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<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/xsd/maven-4.0.0.xsd">
-
-	<parent>
-		<groupId>ch.puzzle.itc.mobiliar</groupId>
-		<artifactId>AMW_shakedown</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
-		<relativePath>..</relativePath>
-	</parent>
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>AMW_stm</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
-	<properties>
-		<version.dependency.maven.plugin>3.1.1</version.dependency.maven.plugin>
-	</properties>
-
-	<build>
-		<pluginManagement>
-			<plugins>
-				<!-- Ignore/Execute plugin execution -->
-				<plugin>
-					<groupId>org.eclipse.m2e</groupId>
-					<artifactId>lifecycle-mapping</artifactId>
-					<version>1.0.0</version>
-					<configuration>
-						<lifecycleMappingMetadata>
-							<pluginExecutions>
-								<!-- copy-dependency plugin -->
-								<pluginExecution>
-									<pluginExecutionFilter>
-										<groupId>org.apache.maven.plugins</groupId>
-										<artifactId>maven-dependency-plugin</artifactId>
-										<versionRange>[1.0.0,)</versionRange>
-										<goals>
-											<goal>copy-dependencies</goal>
-										</goals>
-
-									</pluginExecutionFilter>
-									<action>
-										<ignore />
-									</action>
-								</pluginExecution>
-							</pluginExecutions>
-						</lifecycleMappingMetadata>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<archive>
-						<manifest>
-							<addClasspath>true</addClasspath>
-							<mainClass>ch.puzzle.itc.mobiliar.stm.AMW_STM</mainClass>
-						</manifest>
-					</archive>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<version>${version.dependency.maven.plugin}</version>
-				<executions>
-					<execution>
-						<id>copy-dependencies</id>
-						<phase>package</phase>
-						<goals>
-							<goal>copy-dependencies</goal>
-						</goals>
-						<configuration>
-							<excludeScope>provided</excludeScope>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-
-		</plugins>
-	</build>
-	<dependencies>
-		<dependency>
-    		<groupId>junit</groupId>
-    		<artifactId>junit</artifactId>
-    		<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.mockito</groupId>
-			<artifactId>mockito-core</artifactId>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
-</project>
\ No newline at end of file
diff --git a/AMW_shakedown/AMW_stm/src/main/java/ch/puzzle/itc/mobiliar/stm/AMW_STM.java b/AMW_shakedown/AMW_stm/src/main/java/ch/puzzle/itc/mobiliar/stm/AMW_STM.java
deleted file mode 100644
index cf17aa732..000000000
--- a/AMW_shakedown/AMW_stm/src/main/java/ch/puzzle/itc/mobiliar/stm/AMW_STM.java
+++ /dev/null
@@ -1,324 +0,0 @@
-package ch.puzzle.itc.mobiliar.stm;
-
-import java.io.*;
-import java.nio.channels.FileChannel;
-import java.util.List;
-import java.util.concurrent.*;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
-
-public class AMW_STM {
-
-    	private final static String SHELL = "sh";
-
-	// arg 0
-	protected String pathToSTPs;
-
-	// arg 1
-	protected boolean dependencyManagement;
-
-	protected int numberOfThreads = 20;
-
-	// arg 2
-	protected long testTimeout = 30000;
-
-	private static final String DEPENDENCY_MANAGEMENT_ARGUMENT_STRING = "dependencyManagement";
-
-	private Housekeeping houseKeeping = new Housekeeping();
-
-	private static AMW_STM stm;
-
-	private STR str;
-
-	private STS sts;
-
-	/**
-	 * @param args : First argument is the path to the STPs, second argument is the number of
-	 *            threads (number of tests that should be executed in parallel), third argument is
-	 *            the timeout of tests if second Argument is dependencyManagement
-	 *            dependencyManagement is enabled The Timeout is only set if dependencyManagement is
-	 *            false
-	 */
-	public static void main(String[] args) {
-		// create STM based on Args
-		stm = createSTMbasedOnArgs(args);
-
-		try {
-			stm.str = stm.getSTR();
-		}
-		catch (IOException e) {
-			System.out.println("No STR found!");
-			System.exit(1);
-		}
-		try {
-			stm.sts = stm.getSTS(stm.str);
-		}
-		catch (IOException e) {
-			System.out.println("No STS found!");
-			System.exit(1);
-		}
-
-		// Clean up structure
-		stm.getHousekeeping().cleanOldSTPsToDelete(stm.str, stm.pathToSTPs);
-
-		if (stm.dependencyManagement) {
-			checkAndLogMissingPackages(stm);
-		}
-		else {
-			stm.processSTPs();
-		}
-	}
-
-	/**
-	 * checks and Logs missing Packages
-	 */
-	private static void checkAndLogMissingPackages(AMW_STM stm) {
-		// Find missing packages
-		List<String> missingPackages = stm.getHousekeeping().getMissingSTPs(stm.sts, stm.pathToSTPs);
-
-		if (missingPackages.size() > 0) {
-			for (String missing : missingPackages) {
-				System.err.println("@{" + missing + "}");
-			}
-			System.exit(1);
-		}
-		else {
-			System.exit(0);
-		}
-	}
-
-	/**
-	 * arg[0] = path to stp <br/>
-	 * arg[1] = DEPENDENCY_MANAGEMENT_ARGUMENT_STRING or numberOfThreads as int<br/>
-	 * arg[2] = testTimeout as int
-	 * 
-	 * @param args
-	 * @return an AMW_STM based on the actual args
-	 */
-	protected static AMW_STM createSTMbasedOnArgs(String[] args) {
-		AMW_STM stm = new AMW_STM();
-		// Read configurations
-		if (args.length > 0) {
-			stm.pathToSTPs = args[0];
-		}
-		if (args.length > 1) {
-			if (DEPENDENCY_MANAGEMENT_ARGUMENT_STRING.equals(args[1])) {
-				stm.dependencyManagement = true;
-			}
-			else {
-				stm.numberOfThreads = Integer.parseInt(args[1]);
-			}
-			// dependencyManagement false and arg[2] is set
-			if (!stm.dependencyManagement && args.length > 2) {
-				stm.testTimeout = Integer.parseInt(args[2]);
-			}
-		}
-		return stm;
-	}
-
-	Housekeeping getHousekeeping() {
-		return houseKeeping;
-	}
-
-	STR getSTR() throws IOException {
-		return new STR(readFile("str.csv"));
-	}
-
-	STS getSTS(STR str) throws IOException {
-		return new STS(readFile("sts.csv"), str, SHELL);
-	}
-
-	String readFile(String file) throws IOException {
-		StringBuilder sb = new StringBuilder();
-		BufferedReader r = new BufferedReader(new InputStreamReader(ClassLoader.getSystemResourceAsStream(file)));
-		String read = r.readLine();
-		while (read != null) {
-			sb.append(read).append('\n');
-			read = r.readLine();
-		}
-		return sb.toString();
-	}
-
-	protected void processSTPs() {
-
-		File stps = new File(pathToSTPs);
-		File resultsDir = new File(stps.getParent() + File.separator + "results" + File.separator + sts.getId());
-		// create ResultDir if it does not exist
-		if (!resultsDir.exists()) {
-			resultsDir.mkdirs();
-		}
-
-		StringBuffer resultLog = new StringBuffer();
-
-		resultLog.append("<testset id=\"");
-		resultLog.append(sts.getId());
-		resultLog.append("\">");
-		ExecutorService executors = Executors.newFixedThreadPool(numberOfThreads);
-		List<Future<TestResult>> futures = null;
-		try {
-			futures = executors.invokeAll(sts.getProcesses(pathToSTPs), testTimeout, TimeUnit.MILLISECONDS);
-			executors.shutdown();
-			executors.awaitTermination(testTimeout, TimeUnit.MILLISECONDS);
-
-			processResults(futures, resultsDir, resultLog);
-
-		}
-		catch (Exception e) {
-			resultLog.append("<failure>");
-			resultLog.append("Exception: " + e.getMessage());
-			resultLog.append("</failure>");
-		}
-		resultLog.append("</testset>");
-
-		try {
-			FileWriter logFile;
-			logFile = new FileWriter(resultsDir.getAbsolutePath() + File.separator + "result.xml");
-			logFile.write(resultLog.toString());
-			logFile.flush();
-			logFile.close();
-		}
-		catch (IOException e1) {
-			System.err.println("Was not able to create file " + resultsDir.getAbsolutePath() + File.separator
-					+ "result.xml:" + e1.getMessage());
-			System.exit(1);
-		}
-
-		// create Zip
-		createZip(resultsDir, sts.getId());
-
-		// remove ResultDir
-		System.out.println("Remove directory " + resultsDir.getAbsolutePath());
-		try {
-			Runtime.getRuntime().exec("rm -rf " + resultsDir.getAbsolutePath());
-		}
-		catch (IOException e) {
-			System.err.println("Was not able to remove resultDir  " + resultsDir.getAbsolutePath() + " "
-					+ e.getMessage());
-			System.exit(1);
-		}
-	}
-
-	protected void createZip(File resultsDir, String stsId) {
-
-		String zipFilename = resultsDir.getParent() + File.separator + stsId + ".zip";
-		ZipOutputStream os;
-		try {
-			os = new ZipOutputStream(new FileOutputStream(zipFilename));
-			compressDirectory(resultsDir.getAbsolutePath(), "", os);
-			os.flush();
-			os.close();
-		}
-		catch (FileNotFoundException e1) {
-			System.err.println("Was not able to create zip File " + zipFilename + " " + e1.getMessage());
-			System.exit(1);
-		}
-		catch (IOException e) {
-			System.err.println("Was not able to create zip File " + zipFilename + " " + e.getMessage());
-			System.exit(1);
-		}
-
-	}
-
-	private void processResults(List<Future<TestResult>> futures, File resultsDir, StringBuffer log)
-			throws InterruptedException, ExecutionException, IOException {
-		System.out.println("*********** RESULTS ************");
-		for (Future<TestResult> future : futures) {
-
-			if (future.isDone() && !future.isCancelled()) {
-				TestResult testResult = future.get();
-
-				String result = testResult.getResult();
-
-				log.append(result);
-				System.out.println(result);
-
-				handleAdditionalResouceInResult(resultsDir, testResult);
-			}
-		}
-	}
-
-	private void handleAdditionalResouceInResult(File resultsDir, TestResult testResult) throws IOException {
-
-		if (testResult != null) {
-			for (String additionalResource : testResult.getAdditionalResources()) {
-				File toCopy = new File(additionalResource);
-				if (toCopy.exists()) {
-					File destination = new File(resultsDir + File.separator + testResult.getStp().getName() + "-"
-							+ testResult.getStp().getVersion() + File.separator);
-					if (!destination.exists()) {
-						destination.mkdirs();
-					}
-					// FIXME: tph 11.7.2013 refactor copy File use io
-					FileChannel source = null;
-					FileChannel dest = null;
-					try {
-						source = new FileInputStream(toCopy).getChannel();
-						dest = new FileOutputStream(destination.getAbsolutePath() + File.separator
-								+ toCopy.getName()).getChannel();
-						dest.transferFrom(source, 0, source.size());
-					}
-					catch (IOException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}finally{
-						if(source != null){
-							source.close();
-						}
-						if(dest != null){
-							dest.close();
-						}
-					}
-					
-					try {
-						dest = new FileOutputStream(destination.getAbsolutePath() + File.separator
-								+ toCopy.getName()).getChannel();
-					}
-					catch (FileNotFoundException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
-					System.out.println("Add resource: " + additionalResource);
-				}
-				else {
-					System.err.println("AdditionalResource File " + additionalResource + " does not exist.");
-				}
-			}
-		}
-	}
-
-	private void compressDirectory(String directory, String path, ZipOutputStream out) throws IOException {
-		byte[] data = new byte[1024];
-		File fileToCompress = new File(directory);
-		// list contents.
-		String[] contents = fileToCompress.list();
-		// iterate through directory and compress files.
-		for (int i = 0; i < contents.length; i++) {
-			File f = new File(directory, contents[i]);
-			System.out.println(f.getPath());
-			// testing type. directories and files have to be treated
-			// separately.
-			if (f.isDirectory()) {
-				// add empty directory
-				out.putNextEntry(new ZipEntry(f.getName() + File.separator));
-				// initiate recursive call
-				compressDirectory(f.getPath(), path + File.separator + f.getName(), out);
-				// continue the iteration
-				continue;
-			}
-			else {
-				// prepare stream to read file.
-				FileInputStream in = new FileInputStream(f);
-				// create ZipEntry and add to outputting stream.
-				out.putNextEntry(new ZipEntry(path + File.separator + f.getName()));
-				// write the data.
-				int len;
-				while ((len = in.read(data)) > 0) {
-					out.write(data, 0, len);
-				}
-				out.flush();
-				out.closeEntry();
-				in.close();
-			}
-		}
-	}
-}
diff --git a/AMW_shakedown/AMW_stm/src/main/java/ch/puzzle/itc/mobiliar/stm/Housekeeping.java b/AMW_shakedown/AMW_stm/src/main/java/ch/puzzle/itc/mobiliar/stm/Housekeeping.java
deleted file mode 100644
index 2f17e316c..000000000
--- a/AMW_shakedown/AMW_stm/src/main/java/ch/puzzle/itc/mobiliar/stm/Housekeeping.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package ch.puzzle.itc.mobiliar.stm;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-public class Housekeeping {
-	
-	List<String> getOldSTPsToDelete(STR repo, String pathToSTPs){
-		List<String> foundSTPs = getListOfSTPs(pathToSTPs);
-		List<String> stprepo = repo.getStpNames();
-		List<String> toDelete = new ArrayList<String>();
-		for(String stp : foundSTPs){
-			if(!stprepo.contains(stp)){
-				toDelete.add(stp);
-			}
-		}		
-		return toDelete;
-	}
-	
-	
-	List<String> getListOfSTPs(String pathToSTPs){
-		File f = new File(pathToSTPs);
-		//If the directory does not exist, create it
-		if(!f.exists()){
-			f.mkdir();
-		}
-		if(f.isDirectory()){
-			return Arrays.asList(f.list());			
-		}
-		else{
-			System.out.println("The defined path to the STPs is not a directory!");
-			System.exit(1);
-			return null;
-		}
-	}
-	
-	public List<String> getMissingSTPs(STS testSuite, String pathToSTPs){
-		List<String> foundSTPs = getListOfSTPs(pathToSTPs);
-		List<String> result = new ArrayList<String>();
-		for(String stp : testSuite.getStpNames()){
-			if(!foundSTPs.contains(stp)){
-				result.add(stp);
-			}
-		}
-		return result;		
-	}
-	
-	
-	public void cleanOldSTPsToDelete(STR repo, String pathToSTPs){
-		for(String s : getOldSTPsToDelete(repo, pathToSTPs)){
-			File f = new File(pathToSTPs+File.separator+s);
-			if(f.exists()) {
-				f.delete();
-			}
-		}
-	}
-}
diff --git a/AMW_shakedown/AMW_stm/src/main/java/ch/puzzle/itc/mobiliar/stm/STP.java b/AMW_shakedown/AMW_stm/src/main/java/ch/puzzle/itc/mobiliar/stm/STP.java
deleted file mode 100644
index 8e9eff267..000000000
--- a/AMW_shakedown/AMW_stm/src/main/java/ch/puzzle/itc/mobiliar/stm/STP.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package ch.puzzle.itc.mobiliar.stm;
-
-public class STP {
-	
-	private static final String NAME_VERSION_DELIMITER = "-";
-
-	private static final String FILENAME_POSTFIX = ".zip";
-	
-	private final String name;
-	private final String version;
-	private String[] params;
-	
-	public STP(String name, String version){
-		this.name = name;
-		this.version = version;
-	}
-	
-	public String getName() {
-		return name;
-	}
-
-	public String getVersion() {
-		return version;
-	}	
-	
-	public String[] getParams(){
-		return params;
-	}
-	
-	public void setParams(String... params){
-		this.params = params;
-	}
-	
-	public String getCombinedFileName(){
-		return name+NAME_VERSION_DELIMITER+version+FILENAME_POSTFIX;
-	}
-	
-}
diff --git a/AMW_shakedown/AMW_stm/src/main/java/ch/puzzle/itc/mobiliar/stm/STR.java b/AMW_shakedown/AMW_stm/src/main/java/ch/puzzle/itc/mobiliar/stm/STR.java
deleted file mode 100644
index 5123f495a..000000000
--- a/AMW_shakedown/AMW_stm/src/main/java/ch/puzzle/itc/mobiliar/stm/STR.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package ch.puzzle.itc.mobiliar.stm;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.StringTokenizer;
-
-public class STR {
-
-	protected static final String STR_CSV_ROW_DELIM = "\t";
-	protected static final String STR_CSV_LINE_DELIM = "\n\r";
-	
-	private final List<STP> stps;
-	
-	private List<String> stpnames;
-	
-	public STR(String stpCsv){
-		if(stpCsv == null){
-			throw new IllegalArgumentException("stpCsv must not be null");
-		}
-		stps = parseSTR(stpCsv);
-	}
-
-	public List<STP> getStps() {
-		return stps;
-	}
-	
-	public STP createSTPByName(String stpName){		
-		for(STP stp : stps){
-			if(stp.getName().equals(stpName)) {
-				return new STP(stp.getName(), stp.getVersion());
-			}
-		}
-		return null;
-	}
-	
-	public STP getSTPByName(String stpName){
-		for(STP stp : stps){
-			if(stp.getName().equals(stpName)) {
-				return stp;
-			}
-		}
-		return null;
-	}
-	
-	protected List<STP> parseSTR(String csv){
-		StringTokenizer t = new StringTokenizer(csv, STR_CSV_LINE_DELIM);
-		List<STP> result = new ArrayList<STP>();
-		while(t.hasMoreTokens()){
-			String row = t.nextToken();
-			String[] cols = row.split(STR_CSV_ROW_DELIM);
-			if(cols.length==2){
-				STP s = new STP(cols[0], cols[1]);
-				result.add(s);
-			}
-		}
-		return Collections.unmodifiableList(result);		
-	}
-	
-
-	
-	public List<String> getStpNames(){
-		if(stpnames==null){
-			stpnames = new ArrayList<String>();
-			for(STP s : stps){
-				stpnames.add(s.getCombinedFileName());
-			}			
-		}
-		return stpnames;
-	}
-	
-}
diff --git a/AMW_shakedown/AMW_stm/src/main/java/ch/puzzle/itc/mobiliar/stm/STS.java b/AMW_shakedown/AMW_stm/src/main/java/ch/puzzle/itc/mobiliar/stm/STS.java
deleted file mode 100644
index 69b657ec6..000000000
--- a/AMW_shakedown/AMW_stm/src/main/java/ch/puzzle/itc/mobiliar/stm/STS.java
+++ /dev/null
@@ -1,227 +0,0 @@
-package ch.puzzle.itc.mobiliar.stm;
-
-import java.io.*;
-import java.nio.file.*;
-import java.nio.file.attribute.BasicFileAttributes;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
-import java.util.concurrent.Callable;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
-
-public class STS {
-
-	private final String shell;
-
-	private String id;
-
-	private final List<STP> stps;
-
-	public STS(String stsCsv, STR str, String shell) {
-		this.stps = parseSTS(stsCsv, str);
-		this.shell = shell;
-	}
-
-	public String getId() {
-		return id;
-	}
-
-	List<STP> parseSTS(String csv, STR str) {
-		String[] rows = csv.split("\n");
-		List<STP> result = new ArrayList<STP>();
-		boolean firstLine = true;
-		for (String row : rows) {
-			if (firstLine) {
-				id = row.trim();
-				firstLine = false;
-			}
-			else {
-				String[] cols = row.split("\t");
-				if (cols.length > 0) {
-					String[] additionalParams = null;
-					if (cols.length > 1) {
-						additionalParams = new String[cols.length - 1];
-						int p = 0;
-						for (int i = 1; i < cols.length; i++) {
-							additionalParams[p++] = cols[i];
-						}
-					}
-					STP stp = str.createSTPByName(cols[0]);
-					if (stp != null) {
-						stp.setParams(additionalParams);
-						result.add(stp);
-					}
-					else {
-						result.add(new STP(cols[0], null));
-					}
-				}
-			}
-		}
-		return Collections.unmodifiableList(result);
-	}
-
-	public List<STP> getStps() {
-		return stps;
-	}
-
-	private List<String> stpnames;
-
-	public List<String> getStpNames() {
-		if (stpnames == null) {
-			stpnames = new ArrayList<String>();
-			for (STP s : stps) {
-				stpnames.add(s.getCombinedFileName());
-			}
-		}
-		return stpnames;
-	}
-
-	File unzip(String filename) throws IOException {
-		byte[] buffer = new byte[1024];
-		File tempDirectory = new File(System.getProperty("java.io.tmpdir") + File.separator + Math.random());
-		if (!tempDirectory.exists()) {
-			tempDirectory.mkdirs();
-		}
-
-		// get the zip file content
-		ZipInputStream zis = new ZipInputStream(new FileInputStream(filename));
-		// get the zipped file list entry
-		ZipEntry ze = zis.getNextEntry();
-
-		while (ze != null) {
-			if (!ze.isDirectory()) {
-				String fileName = ze.getName();
-				File newFile = new File(tempDirectory + File.separator + fileName);
-				new File(newFile.getParent()).mkdirs();
-				System.out.println("file unzip : " + newFile.getAbsoluteFile());
-
-				FileOutputStream fos = new FileOutputStream(newFile);
-
-				int len;
-				while ((len = zis.read(buffer)) > 0) {
-					fos.write(buffer, 0, len);
-				}
-
-				fos.close();
-			}
-			ze = zis.getNextEntry();
-		}
-		zis.closeEntry();
-		zis.close();
-		return tempDirectory;
-	}
-
-	public List<Callable<TestResult>> getProcesses(final String pathToSTPs) {
-		List<Callable<TestResult>> processes = new ArrayList<Callable<TestResult>>();
-		for (STP s : stps) {
-			final STP stp = s;
-			Callable<TestResult> c = new Callable<TestResult>() {
-
-				public TestResult call() throws Exception {
-
-					StringBuilder result = new StringBuilder();
-					List<String> additionalResources = new ArrayList<String>();
-					result.append("<test name=\"").append(stp.getName()).append("\" version=\"")
-							.append(stp.getVersion()).append("\">");
-					// UNZIP THE STP IF IT EXISTS
-					String filePath = pathToSTPs + File.separator + stp.getCombinedFileName();
-					if (new File(filePath).exists()) {
-						File tempDirectory = unzip(filePath);
-
-						// EXECUTE RUNTEST.SH
-						File runscript = new File(tempDirectory + File.separator + "runtest.sh");
-						runscript.setExecutable(true);
-						StringBuilder command = new StringBuilder();
-						command.append(runscript.getAbsolutePath());
-						for (String param : stp.getParams()) {
-							command.append(' ').append(param);
-						}
-						Runtime r = Runtime.getRuntime();
-						result.append('\n').append("<command").append(" executionTime=\"")
-								.append(new Date().getTime()).append("\">")
-								.append(command.toString()).append("</command>\n");
-						Process p = r.exec(new String[] { shell, "-c", command.toString() });
-						InputStream errorin = p.getErrorStream();
-						InputStream in = p.getInputStream();
-						BufferedInputStream buf = new BufferedInputStream(in);
-						BufferedInputStream errbuf = new BufferedInputStream(errorin);
-						InputStreamReader inread = new InputStreamReader(buf);
-						InputStreamReader errinread = new InputStreamReader(errbuf);
-						BufferedReader bufferedreader = new BufferedReader(inread);
-						BufferedReader bufferederrreader = new BufferedReader(errinread);
-						StringBuilder sbError = new StringBuilder();
-						StringBuilder sb = new StringBuilder();
-						String errorline;
-						while ((errorline = bufferederrreader.readLine()) != null) {
-							sbError.append(errorline).append('\n');
-						}
-						result.append("<stderr><![CDATA[\n").append(sbError.toString())
-								.append("\n]]></stderr>");
-						String line;
-						while ((line = bufferedreader.readLine()) != null) {
-							if (line.trim().startsWith("@{") && line.trim().endsWith("}")) {
-								additionalResources.add(line.trim().substring(2,
-										line.trim().length() - 1));
-							}
-							else {
-								sb.append(line).append('\n');
-							}
-						}
-						result.append("\n<stdout><![CDATA[").append(sb.toString())
-								.append("\n]]></stdout>");
-
-						result.append("\n<testStatus>");
-						try {
-							if (p.waitFor() != 0) {
-								result.append("failed");
-							}
-							else {
-								result.append("successful");
-							}
-						}
-						catch (InterruptedException e) {
-							result.append("interrupted");
-						}
-						finally {
-							// Close the InputStream
-							bufferedreader.close();
-							inread.close();
-							buf.close();
-							in.close();
-						}
-						result.append("</testStatus>");
-						System.out.println("Remove directory: " + tempDirectory);
-						deleteDirectoryRecursively(tempDirectory.getAbsolutePath());
-					}
-					else {
-						result.append("<command/><stderr/><stdout/><testStatus>missing</testStatus>");
-					}
-					result.append("\n</test>");
-					return new TestResult(result.toString(), additionalResources, stp);
-				}
-			};
-			processes.add(c);
-		}
-		return processes;
-	}
-
-	public void deleteDirectoryRecursively(String dir) throws IOException {
-		Path directory = Paths.get(dir);
-		Files.walkFileTree(directory, new SimpleFileVisitor<Path>() {
-			@Override
-			public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
-				Files.delete(file);
-				return FileVisitResult.CONTINUE;
-			}
-
-			@Override
-			public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException {
-				Files.delete(dir);
-				return FileVisitResult.CONTINUE;
-			}
-		});
-	}
-
-}
diff --git a/AMW_shakedown/AMW_stm/src/main/java/ch/puzzle/itc/mobiliar/stm/TestResult.java b/AMW_shakedown/AMW_stm/src/main/java/ch/puzzle/itc/mobiliar/stm/TestResult.java
deleted file mode 100644
index 2baf50ad3..000000000
--- a/AMW_shakedown/AMW_stm/src/main/java/ch/puzzle/itc/mobiliar/stm/TestResult.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package ch.puzzle.itc.mobiliar.stm;
-
-import java.util.List;
-
-public class TestResult {
-
-	private final String result;
-	private final List<String> additionalResources;
-	private final STP stp;
-	
-	public TestResult(String result, List<String> additionalResources, STP stp) {
-		super();
-		this.result = result;
-		this.additionalResources = additionalResources;
-		this.stp = stp;
-	}
-
-	public String getResult() {
-		return result;
-	}
-
-	public List<String> getAdditionalResources() {
-		return additionalResources;
-	}
-
-	public STP getStp() {
-		return stp;
-	}
-	
-	
-	
-}
diff --git a/AMW_shakedown/AMW_stm/src/main/resources/.gitkeep b/AMW_shakedown/AMW_stm/src/main/resources/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/AMW_shakedown/AMW_stm/src/test/java/ch/puzzle/itc/mobiliar/stm/AMW_STMTest.java b/AMW_shakedown/AMW_stm/src/test/java/ch/puzzle/itc/mobiliar/stm/AMW_STMTest.java
deleted file mode 100644
index 13ea865bb..000000000
--- a/AMW_shakedown/AMW_stm/src/test/java/ch/puzzle/itc/mobiliar/stm/AMW_STMTest.java
+++ /dev/null
@@ -1,229 +0,0 @@
-package ch.puzzle.itc.mobiliar.stm;
-
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import java.io.*;
-import java.util.List;
-
-import static org.junit.Assert.*;
-
-public class AMW_STMTest {
-
-	AMW_STM stm;
-	
-	
-	@Before
-	public void setUp() throws Exception {
-		stm = new AMW_STM();
-	}
-	
-	@Test
-	public void test_createSTMbasedOnArgs_noArgs(){
-		// given
-		String[] args = {};
-		
-		// when
-		AMW_STM stm = AMW_STM.createSTMbasedOnArgs(args);
-		
-		// then default values are set
-		assertEquals(null, stm.pathToSTPs);
-		assertEquals(20, stm.numberOfThreads);
-		assertFalse(stm.dependencyManagement);
-		assertEquals(30000, stm.testTimeout);
-	}
-	
-	@Test
-	public void test_createSTMbasedOnArgs_only_first_arg(){
-		// given
-		String[] args = {"path/to/"};
-		
-		// when
-		AMW_STM stm = AMW_STM.createSTMbasedOnArgs(args);
-		
-		// then
-		assertEquals("path/to/", stm.pathToSTPs);
-		assertEquals(20, stm.numberOfThreads);
-		assertFalse(stm.dependencyManagement);
-		assertEquals(30000, stm.testTimeout);
-	}
-	
-	@Test
-	public void test_createSTMbasedOnArgs_two_args_NumberOfThreads(){
-		// given
-		String[] args = {"path/to/", "2"};
-		
-		// when
-		AMW_STM stm = AMW_STM.createSTMbasedOnArgs(args);
-		
-		// then
-		assertEquals("path/to/", stm.pathToSTPs);
-		assertEquals(2, stm.numberOfThreads);
-		assertFalse(stm.dependencyManagement);
-		assertEquals(30000, stm.testTimeout);
-	}
-	
-	@Test(expected=NumberFormatException.class)
-	public void test_createSTMbasedOnArgs_two_args_NumberOfThreads_Not_Parsable(){
-		// given
-		String[] args = {"path/to/", "int"};
-		
-		// when
-		AMW_STM.createSTMbasedOnArgs(args);
-		
-		// then
-	}
-	
-	@Test(expected=NumberFormatException.class)
-	public void test_createSTMbasedOnArgs_three_args_timeOutNotParsable(){
-		// given
-		String[] args = {"path/to/", "3", "int"};
-		
-		// when
-		AMW_STM.createSTMbasedOnArgs(args);
-		
-		// then
-	}
-	
-	@Test
-	public void test_createSTMbasedOnArgs_allArgs_dependencyManagement(){
-		// given
-		String[] args = {"path/to/", "dependencyManagement", "1"};
-		
-		// when
-		AMW_STM stm = AMW_STM.createSTMbasedOnArgs(args);
-		
-		// then
-		assertEquals("path/to/", stm.pathToSTPs);
-		assertTrue(stm.dependencyManagement);
-		// is not set if dependencyManagement true
-		assertEquals(30000, stm.testTimeout);
-	}
-	
-	@Test
-	public void test_createSTMbasedOnArgs_allArgs_NumOf_threads(){
-		// given
-		String[] args = {"path/to/", "2", "1"};
-		
-		// when
-		AMW_STM stm = AMW_STM.createSTMbasedOnArgs(args);
-		
-		// then
-		assertEquals("path/to/", stm.pathToSTPs);
-		assertEquals(2, stm.numberOfThreads);
-		assertFalse(stm.dependencyManagement);
-		assertEquals(1, stm.testTimeout);
-	}
-	
-	@Test
-	public void test_createZip(){
-		// given
-		AMW_STM stm = new AMW_STM();
-		File resultsDir = new File("src/test/resources/test_result_dir/result1");
-		// when
-		stm.createZip(resultsDir , "testId");
-		
-		// then
-		File zipFile = new File("src/test/resources/test_result_dir/testId.zip");
-		
-		assertNotNull(zipFile);
-		
-		zipFile.delete();
-	}
-	
-	
-	
-	
-
-	@Test
-	public void getSTR() throws IOException {
-		STR str = stm.getSTR();
-		assertNotNull(str);
-		assertNotNull(str.getStps());
-		assertEquals(4,str.getStps().size());
-		
-	}
-	
-	@Test
-	public void getSTS() throws IOException {
-		STS sts = stm.getSTS(stm.getSTR());
-		assertNotNull(sts);
-		assertNotNull(sts.getStps());
-		assertEquals(3, sts.getStps().size());
-		
-	}
-	
-	@Test
-	public void getListOfSTPs(){
-		List<String> stps = stm.getHousekeeping().getListOfSTPs("test/stps");
-		assertNotNull(stps);
-		for(String stp : stps){
-			System.out.println(stp);
-		}
-	}
-	
-	@Test
-	public void getOldSTPsToDelete() throws IOException{
-		List<String> stps = stm.getHousekeeping().getOldSTPsToDelete(stm.getSTR(), "test/stps");
-		assertNotNull(stps);
-		assertEquals(0,stps.size());
-		File f = new File("test/stps/somefile.zip");
-		f.createNewFile();
-		stps = stm.getHousekeeping().getOldSTPsToDelete(stm.getSTR(), "test/stps");
-		assertNotNull(stps);
-		assertEquals(1,stps.size());
-		f.delete();
-	}
-	
-	@Test
-	public void cleanOldSTPsToDelete() throws IOException{
-		File f = new File("test/stps/somefile.zip");
-		f.createNewFile();
-		List<String> stps = stm.getHousekeeping().getOldSTPsToDelete(stm.getSTR(), "test/stps");
-		assertNotNull(stps);
-		assertEquals(1,stps.size());
-		stm.getHousekeeping().cleanOldSTPsToDelete(stm.getSTR(), "test/stps");
-		assertFalse(f.exists());
-		stps = stm.getHousekeeping().getOldSTPsToDelete(stm.getSTR(), "test/stps");
-		assertNotNull(stps);
-		assertEquals(0,stps.size());
-	}
-	
-	@Test
-	public void getMissingSTPs() throws IOException{
-		List<String> stps = stm.getHousekeeping().getMissingSTPs(stm.getSTS(stm.getSTR()), "test/stps");
-		assertNotNull(stps);
-		assertEquals(1,stps.size());
-		assertTrue(stps.get(0).equals("AnotherSTP-null.zip"));
-		File f = new File("test/stps/AnotherSTP-null.zip");
-		f.createNewFile();
-		stps = stm.getHousekeeping().getMissingSTPs(stm.getSTS(stm.getSTR()), "test/stps");
-		assertNotNull(stps);
-		assertEquals(0,stps.size());
-		f.delete();
-	}
-
-    @Test
-   @Ignore("This test is for experimenting with quotes only and is not thought to be executed otherwise.")
-    public void testProcessSTPs() throws Exception {
-	   Runtime r = Runtime.getRuntime();
-	   Process p = r.exec(new String[]{"sh", "-c", "/home/oschmid/projects/amw/git/amw_projects/AMW_stm/src/test/resources/test.sh simple \"complex argument\""});
-	   InputStream errorin = p.getErrorStream();
-	   InputStream in = p.getInputStream();
-	   BufferedInputStream buf = new BufferedInputStream(in);
-	   BufferedInputStream errbuf = new BufferedInputStream(errorin);
-	   InputStreamReader inread = new InputStreamReader(buf);
-	   InputStreamReader errinread = new InputStreamReader(errbuf);
-	   BufferedReader bufferedreader = new BufferedReader(inread);
-	   BufferedReader bufferederrreader = new BufferedReader(errinread);
-	   String errorline;
-	   while ((errorline = bufferederrreader.readLine()) != null) {
-		  System.err.println(errorline);
-	   }
-	   String line;
-	   while ((line = bufferedreader.readLine()) != null) {
-		 System.out.println(line);
-	   }
-    }
-}
diff --git a/AMW_shakedown/AMW_stm/src/test/java/ch/puzzle/itc/mobiliar/stm/STPTest.java b/AMW_shakedown/AMW_stm/src/test/java/ch/puzzle/itc/mobiliar/stm/STPTest.java
deleted file mode 100644
index 6fffef7e1..000000000
--- a/AMW_shakedown/AMW_stm/src/test/java/ch/puzzle/itc/mobiliar/stm/STPTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package ch.puzzle.itc.mobiliar.stm;
-
-import static org.junit.Assert.*;
-
-import org.junit.Test;
-
-public class STPTest {
-
-	@Test
-	public void test_getCombinedFileName() {
-		// given
-		STP stp = new STP("name", "version");
-		// when
-		String combinedFileName = stp.getCombinedFileName();
-		// then
-		assertEquals("name-version.zip", combinedFileName);
-	}
-	
-	@Test
-	public void test_getCombinedFileName_null() {
-		// given
-		STP stp = new STP(null,null);
-		// when
-		String combinedFileName = stp.getCombinedFileName();
-		// then
-		assertEquals("null-null.zip", combinedFileName);
-	}
-	
-	@Test
-	public void test_getCombinedFileName_empty() {
-		// given
-		STP stp = new STP("", "version");
-		// when
-		String combinedFileName = stp.getCombinedFileName();
-		// then
-		assertEquals("-version.zip", combinedFileName);
-	}
-	
-	@Test
-	public void test_getCombinedFileName_empty_both() {
-		// given
-		STP stp = new STP("", "");
-		// when
-		String combinedFileName = stp.getCombinedFileName();
-		// then
-		assertEquals("-.zip", combinedFileName);
-	}
-
-}
diff --git a/AMW_shakedown/AMW_stm/src/test/java/ch/puzzle/itc/mobiliar/stm/STRTest.java b/AMW_shakedown/AMW_stm/src/test/java/ch/puzzle/itc/mobiliar/stm/STRTest.java
deleted file mode 100644
index 45ee82317..000000000
--- a/AMW_shakedown/AMW_stm/src/test/java/ch/puzzle/itc/mobiliar/stm/STRTest.java
+++ /dev/null
@@ -1,196 +0,0 @@
-package ch.puzzle.itc.mobiliar.stm;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-
-import java.util.List;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-public class STRTest {
-
-
-	
-	@Test
-	public void test_STR_with_empty_str() {
-		// given
-		STR str = new STR("");
-		
-		//when
-		List<STP> stps = str.getStps();
-		List<String> stpNames = str.getStpNames();
-		
-		STP stpByName = str.getSTPByName("name");
-		
-		//then
-		assertEquals(0,stps.size());
-		assertEquals(0,stpNames.size());
-		assertNull(stpByName);
-	}
-	
-	@Test(expected=IllegalArgumentException.class)
-	public void test_STR_with_null() {
-		// given
-		new STR(null);
-	}
-	
-	@Test
-	public void test_STR_Full() {
-		// given
-		String csv = "name" + STR.STR_CSV_ROW_DELIM + "test" + STR.STR_CSV_LINE_DELIM 
-					+ "name2" + STR.STR_CSV_ROW_DELIM + "version2" + STR.STR_CSV_LINE_DELIM ;
-		STR str = new STR(csv);
-		
-		//when
-		List<STP> stps = str.getStps();
-		List<String> stpNames = str.getStpNames();
-		
-		STP stp1 = str.getSTPByName("name");
-		STP stp2 = str.getSTPByName("name2");
-		
-		//then
-		assertEquals(2,stps.size());
-		assertEquals(2,stpNames.size());
-		assertEquals("name-test.zip", stpNames.get(0));
-		assertEquals("name2-version2.zip", stpNames.get(1));
-		
-		assertEquals("name", stp1.getName());
-		assertEquals("test", stp1.getVersion());
-		
-		assertEquals("name2", stp2.getName());
-		assertEquals("version2", stp2.getVersion());
-		// the second time its taken out of the 
-		assertEquals(stpNames, str.getStpNames());
-	}
-	
-	@Test
-	public void test_parseSTR_one_row() {
-		// given
-		String csv = "name" + STR.STR_CSV_ROW_DELIM + "test";
-
-		//when
-		STR str = new STR("");
-		List<STP> parseSTR = str.parseSTR(csv);
-		
-		//then
-		assertNotNull(parseSTR);
-		assertEquals(1,parseSTR.size());
-		assertEquals("name", parseSTR.get(0).getName());
-		assertEquals("test", parseSTR.get(0).getVersion());
-		assertNull(parseSTR.get(0).getParams());
-	}
-	
-	@Test
-	public void test_parseSTR_only_one_col() {
-		// given
-		String csv = "name";
-
-		//when
-		STR str = new STR("");
-		List<STP> parseSTR = str.parseSTR(csv);
-		
-		//then
-		assertNotNull(parseSTR);
-		assertEquals(0,parseSTR.size());
-	}
-	
-	@Test
-	public void test_parseSTR_empty() {
-		// given
-
-		//when
-		STR str = new STR("");
-		List<STP> parseSTR = str.parseSTR("");
-		
-		//then
-		assertNotNull(parseSTR);
-		assertEquals(0,parseSTR.size());
-	}
-	
-	@Test(expected=NullPointerException.class)
-	public void test_parseSTR_null() {
-		// given
-
-		//when
-		STR str = new STR("");
-		str.parseSTR(null);
-		
-	}
-	
-	@Test
-	public void test_parseSTR_only_one_col_inkl_tab() {
-		// given
-		String csv = "name" + STR.STR_CSV_ROW_DELIM;
-
-		//when
-		STR str = new STR("");
-		List<STP> parseSTR = str.parseSTR(csv);
-		
-		//then
-		assertNotNull(parseSTR);
-		assertEquals(0,parseSTR.size());
-	}
-	
-	@Test
-	public void test_parseSTR_two_rows() {
-		// given
-		String csv = "name" + STR.STR_CSV_ROW_DELIM + "test" + STR.STR_CSV_LINE_DELIM 
-					+ "name2" + STR.STR_CSV_ROW_DELIM + "version2" + STR.STR_CSV_LINE_DELIM ;
-
-		//when
-		STR str = new STR("");
-		List<STP> parseSTR = str.parseSTR(csv);
-		
-		//then
-		assertNotNull(parseSTR);
-		assertEquals(2,parseSTR.size());
-		assertEquals("name", parseSTR.get(0).getName());
-		assertEquals("test", parseSTR.get(0).getVersion());
-		assertNull(parseSTR.get(0).getParams());
-		assertEquals("name2", parseSTR.get(1).getName());
-		assertEquals("version2", parseSTR.get(1).getVersion());
-		assertNull(parseSTR.get(1).getParams());
-	}
-	@Test
-	public void test_parseSTR_two_rows_no_DelimLine() {
-		// given
-		String csv = "name" + STR.STR_CSV_ROW_DELIM + "test" + STR.STR_CSV_LINE_DELIM 
-					+ "name2" + STR.STR_CSV_ROW_DELIM + "version2"  ;
-
-		//when
-		STR str = new STR("");
-		List<STP> parseSTR = str.parseSTR(csv);
-		
-		//then
-		assertNotNull(parseSTR);
-		assertEquals(2,parseSTR.size());
-		assertEquals("name", parseSTR.get(0).getName());
-		assertEquals("test", parseSTR.get(0).getVersion());
-		assertNull(parseSTR.get(0).getParams());
-		assertEquals("name2", parseSTR.get(1).getName());
-		assertEquals("version2", parseSTR.get(1).getVersion());
-		assertNull(parseSTR.get(1).getParams());
-	}
-	
-	@Test
-	public void test_check_constants() {
-		// be avare if changing the Constant, all Templates must be changed too
-		assertEquals("\n\r",STR.STR_CSV_LINE_DELIM);
-		assertEquals("\t",STR.STR_CSV_ROW_DELIM);
-		
-	}
-	
-	@Test
-	public void testCreateSTPByName(){
-		STR str = new STR("test"+STR.STR_CSV_ROW_DELIM+"version");
-		STP stp = str.createSTPByName("test");
-		Assert.assertNotNull(stp);
-		Assert.assertEquals("test", stp.getName());
-		Assert.assertEquals("version", stp.getVersion());
-		
-	}
-	
-
-}
diff --git a/AMW_shakedown/AMW_stm/src/test/java/ch/puzzle/itc/mobiliar/stm/STSTest.java b/AMW_shakedown/AMW_stm/src/test/java/ch/puzzle/itc/mobiliar/stm/STSTest.java
deleted file mode 100644
index 672be8b7b..000000000
--- a/AMW_shakedown/AMW_stm/src/test/java/ch/puzzle/itc/mobiliar/stm/STSTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package ch.puzzle.itc.mobiliar.stm;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.Mockito;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.List;
-
-public class STSTest {
-
-	STS sts = new STS("", new STR(""), "sh");
-
-	@Before
-	public void setUp() throws Exception {
-	}
-
-	@Test
-	public void testUnzip() throws IOException {
-		File tempPath = sts.unzip("src/test/resources/zippedSTP.zip");
-		Assert.assertTrue(tempPath.exists());
-		sts.deleteDirectoryRecursively(tempPath.getAbsolutePath());
-	}
-	
-	@Test
-	public void testParseSTS(){
-		STR str = Mockito.mock(STR.class);
-		STP testStp = Mockito.mock(STP.class);
-		STP anotherStp = Mockito.mock(STP.class);
-		Mockito.when(str.getSTPByName("Test_STP")).thenReturn(testStp);
-		Mockito.when(str.getSTPByName("Another_STP")).thenReturn(anotherStp);
-		String stsCSV = "1111"+System.lineSeparator()
-				+ "Test_STP\tsomeargument"+System.lineSeparator()
-				+ "Test_STP\tanotherargument"+System.lineSeparator()
-				+ "Another_STP\tanotherargument dsfsa fasf asd"+System.lineSeparator();
-				
-		List<STP> stps = sts.parseSTS(stsCSV, str);
-		
-		Assert.assertEquals(3, stps.size());
-		Mockito.verify(str, Mockito.times(2)).createSTPByName("Test_STP");
-		Assert.assertEquals("Test_STP", stps.get(0).getName());
-		Assert.assertEquals("Test_STP", stps.get(1).getName());
-		Assert.assertEquals("Another_STP", stps.get(2).getName());
-	}
-	
-
-
-
-}
diff --git a/AMW_shakedown/AMW_stm/src/test/resources/str.csv b/AMW_shakedown/AMW_stm/src/test/resources/str.csv
deleted file mode 100644
index 0f33224fa..000000000
--- a/AMW_shakedown/AMW_stm/src/test/resources/str.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-AMW_stp_ws	0.0.1-SNAPSHOT
-AMW_stp_dummy	0.0.1-SNAPSHOT
-AMW_stp_db	0.0.1-SNAPSHOT
-AMW_stp_tcpping	0.0.1-SNAPSHOT
\ No newline at end of file
diff --git a/AMW_shakedown/AMW_stm/src/test/resources/sts.csv b/AMW_shakedown/AMW_stm/src/test/resources/sts.csv
deleted file mode 100644
index 4a20de3c9..000000000
--- a/AMW_shakedown/AMW_stm/src/test/resources/sts.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-2123
-AMW_stp_ws	AMW_stp_ws-0.0.1-SNAPSHOT.jar http://romai.rz.puzzle.ch:8080/AMW_maia/AmwDataSinkServiceImpl 2000
-AMW_stp_dummy	AMW_stp_dummy-0.0.1-SNAPSHOT.jar
-AnotherSTP
\ No newline at end of file
diff --git a/AMW_shakedown/AMW_stm/src/test/resources/test_result_dir/result1/result.xml b/AMW_shakedown/AMW_stm/src/test/resources/test_result_dir/result1/result.xml
deleted file mode 100644
index b994f5362..000000000
--- a/AMW_shakedown/AMW_stm/src/test/resources/test_result_dir/result1/result.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
\ No newline at end of file
diff --git a/AMW_shakedown/AMW_stm/src/test/resources/test_result_dir/result1/subfolder/textfile.txt b/AMW_shakedown/AMW_stm/src/test/resources/test_result_dir/result1/subfolder/textfile.txt
deleted file mode 100644
index e69de29bb..000000000
diff --git a/AMW_shakedown/AMW_stm/src/test/resources/zippedSTP.zip b/AMW_shakedown/AMW_stm/src/test/resources/zippedSTP.zip
deleted file mode 100644
index dd91a3622..000000000
Binary files a/AMW_shakedown/AMW_stm/src/test/resources/zippedSTP.zip and /dev/null differ
diff --git a/AMW_shakedown/AMW_stm/test/.gitignore b/AMW_shakedown/AMW_stm/test/.gitignore
deleted file mode 100644
index 93ad6f5b7..000000000
--- a/AMW_shakedown/AMW_stm/test/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/results
diff --git a/AMW_shakedown/AMW_stm/test/stps/AMW_stp_db-0.0.1-SNAPSHOT.zip b/AMW_shakedown/AMW_stm/test/stps/AMW_stp_db-0.0.1-SNAPSHOT.zip
deleted file mode 100644
index cb75ac97f..000000000
Binary files a/AMW_shakedown/AMW_stm/test/stps/AMW_stp_db-0.0.1-SNAPSHOT.zip and /dev/null differ
diff --git a/AMW_shakedown/AMW_stm/test/stps/AMW_stp_dummy-0.0.1-SNAPSHOT.zip b/AMW_shakedown/AMW_stm/test/stps/AMW_stp_dummy-0.0.1-SNAPSHOT.zip
deleted file mode 100644
index a5124a3f5..000000000
Binary files a/AMW_shakedown/AMW_stm/test/stps/AMW_stp_dummy-0.0.1-SNAPSHOT.zip and /dev/null differ
diff --git a/AMW_shakedown/AMW_stm/test/stps/AMW_stp_tcpping-0.0.1-SNAPSHOT.zip b/AMW_shakedown/AMW_stm/test/stps/AMW_stp_tcpping-0.0.1-SNAPSHOT.zip
deleted file mode 100644
index 09f2778ba..000000000
Binary files a/AMW_shakedown/AMW_stm/test/stps/AMW_stp_tcpping-0.0.1-SNAPSHOT.zip and /dev/null differ
diff --git a/AMW_shakedown/AMW_stm/test/stps/AMW_stp_ws-0.0.1-SNAPSHOT.zip b/AMW_shakedown/AMW_stm/test/stps/AMW_stp_ws-0.0.1-SNAPSHOT.zip
deleted file mode 100644
index d4ffe8b1b..000000000
Binary files a/AMW_shakedown/AMW_stm/test/stps/AMW_stp_ws-0.0.1-SNAPSHOT.zip and /dev/null differ
diff --git a/AMW_shakedown/AMW_stp_archetype/.gitignore b/AMW_shakedown/AMW_stp_archetype/.gitignore
deleted file mode 100644
index ea8c4bf7f..000000000
--- a/AMW_shakedown/AMW_stp_archetype/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/target
diff --git a/AMW_shakedown/AMW_stp_archetype/pom.xml b/AMW_shakedown/AMW_stp_archetype/pom.xml
deleted file mode 100644
index 51d6b5cde..000000000
--- a/AMW_shakedown/AMW_stp_archetype/pom.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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/xsd/maven-4.0.0.xsd">
-  <parent>
-    <groupId>ch.puzzle.itc.mobiliar</groupId>
-    <artifactId>AMW_shakedown</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <relativePath>..</relativePath>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>ch.puzzle.itc.mobiliar</groupId>
-  <artifactId>AMW_stp_archetype</artifactId>
-  <name>AMW_stp_archetype</name>
-  <version>1.0.0-SNAPSHOT</version>
-  <packaging>maven-archetype</packaging>
-
-  <build>
-    <extensions>
-      <extension>
-        <groupId>org.apache.maven.archetype</groupId>
-        <artifactId>archetype-packaging</artifactId>
-        <version>3.0.1</version>
-      </extension>
-    </extensions>
-
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <artifactId>maven-archetype-plugin</artifactId>
-          <version>3.0.1</version>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-</project>
diff --git a/AMW_shakedown/AMW_stp_archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/AMW_shakedown/AMW_stp_archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
deleted file mode 100644
index 065cc75f4..000000000
--- a/AMW_shakedown/AMW_stp_archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archetype-descriptor xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd" name="AMW_stp_db"
-    xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <requiredProperties>
-  <requiredProperty key="mainclass">
-  </requiredProperty>
-    <requiredProperty key="runScriptCommand">
-    <defaultValue>java $@</defaultValue>
-  </requiredProperty>
-      <requiredProperty key="usageText">
-    <defaultValue>Write some documentation!</defaultValue>
-  </requiredProperty>
-  </requiredProperties>
-  <fileSets>
-    <fileSet filtered="true" packaged="true" encoding="UTF-8">
-      <directory>src/main/java</directory>
-      <includes>
-        <include>**/*.java</include>
-      </includes>
-    </fileSet>
-    <fileSet filtered="true" encoding="UTF-8">
-      <directory>src/main/assembly</directory>
-      <includes>
-        <include>**/*.xml</include>
-      </includes>
-    </fileSet>
-    <fileSet filtered="true" encoding="UTF-8">
-      <directory>bin</directory>
-      <includes>
-        <include>**/*.jar</include>
-        <include>**/*.sh</include>
-      </includes>
-    </fileSet>
-    <fileSet encoding="UTF-8">
-      <directory>.settings</directory>
-      <includes>
-        <include>**/*.prefs</include>
-      </includes>
-    </fileSet>
-    <fileSet filtered="true" encoding="UTF-8">
-      <directory></directory>
-      <includes>
-        <include>*</include>
-      </includes>
-    </fileSet>
-  </fileSets>
-</archetype-descriptor>
diff --git a/AMW_shakedown/AMW_stp_archetype/src/main/resources/archetype-resources/.gitignore b/AMW_shakedown/AMW_stp_archetype/src/main/resources/archetype-resources/.gitignore
deleted file mode 100644
index e26d52600..000000000
--- a/AMW_shakedown/AMW_stp_archetype/src/main/resources/archetype-resources/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/target
-/DB2_STP_success.launch
-/DB2_STP_wrongpwd.launch
diff --git a/AMW_shakedown/AMW_stp_archetype/src/main/resources/archetype-resources/bin/runtest.sh b/AMW_shakedown/AMW_stp_archetype/src/main/resources/archetype-resources/bin/runtest.sh
deleted file mode 100644
index fe5407d0b..000000000
--- a/AMW_shakedown/AMW_stp_archetype/src/main/resources/archetype-resources/bin/runtest.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-#!/bin/bash
-cd `dirname $BASH_SOURCE`
-${runScriptCommand}
diff --git a/AMW_shakedown/AMW_stp_archetype/src/main/resources/archetype-resources/pom.xml b/AMW_shakedown/AMW_stp_archetype/src/main/resources/archetype-resources/pom.xml
deleted file mode 100644
index f584b9f55..000000000
--- a/AMW_shakedown/AMW_stp_archetype/src/main/resources/archetype-resources/pom.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?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/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>AMW_parent</artifactId>
-    <groupId>ch.puzzle.itc.mobiliar</groupId>
-    <version>0.0.1</version>
-		<relativePath>../AMW_parent</relativePath>
-  </parent>
-  <groupId>${groupId}</groupId>
-  <artifactId>${artifactId}</artifactId>
-  <name>${artifactId}</name>  
-	<version>${version}</version>
-  	<build>
-		<pluginManagement>
-			<plugins>
-				<!-- Ignore/Execute plugin execution -->
-				<plugin>
-					<groupId>org.eclipse.m2e</groupId>
-					<artifactId>lifecycle-mapping</artifactId>
-					<version>1.0.0</version>
-					<configuration>
-						<lifecycleMappingMetadata>
-							<pluginExecutions>
-								<!-- copy-dependency plugin -->
-								<pluginExecution>
-									<pluginExecutionFilter>
-										<groupId>org.apache.maven.plugins</groupId>
-										<artifactId>maven-dependency-plugin</artifactId>
-										<versionRange>[1.0.0,)</versionRange>
-										<goals>
-											<goal>copy-dependencies</goal>
-										</goals>
-
-									</pluginExecutionFilter>
-									<action>
-										<ignore />
-									</action>
-								</pluginExecution>
-							</pluginExecutions>
-						</lifecycleMappingMetadata>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<version>2.3.2</version>
-				<configuration>
-					<archive>
-						<manifest>
-							<addClasspath>true</addClasspath>
-							<mainClass>${mainClass}</mainClass>
-						</manifest>
-					</archive>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<version>2.5.1</version>
-				<executions>
-					<execution>
-						<id>copy-dependencies</id>
-						<phase>package</phase>
-						<goals>
-							<goal>copy-dependencies</goal>
-						</goals>
-						<configuration>
-							<excludeScope>provided</excludeScope>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		
-			<plugin>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<version>2.2</version>
-				<configuration>
-					<descriptors>
-						<descriptor>src/main/assembly/zip.xml</descriptor>
-					</descriptors>
-				</configuration>
-				<executions>
-					<execution>
-						<id>make-assembly</id> <!-- this is used for inheritance merges -->
-						<phase>package</phase> <!-- append to the packaging phase. -->
-						<goals>
-							<goal>single</goal> <!-- goals == mojos -->
-						</goals>
-						<configuration>
-							<appendAssemblyId>false</appendAssemblyId>
-						</configuration>
-					</execution>
-
-				</executions>
-			</plugin>
-
-		</plugins>
-	</build>
-	<dependencies>
-		<dependency>
-    		<groupId>junit</groupId>
-    		<artifactId>junit</artifactId>
-    		<version>4.13.1</version>
-    		<scope>provided</scope>
-		</dependency>
-	</dependencies>
-	<properties>
-		<mainClass>${package}.${mainclass}</mainClass>
-	</properties>
-</project>
diff --git a/AMW_shakedown/AMW_stp_archetype/src/main/resources/archetype-resources/src/main/assembly/zip.xml b/AMW_shakedown/AMW_stp_archetype/src/main/resources/archetype-resources/src/main/assembly/zip.xml
deleted file mode 100644
index fd61b82ba..000000000
--- a/AMW_shakedown/AMW_stp_archetype/src/main/resources/archetype-resources/src/main/assembly/zip.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-<assembly
-	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-	<id>bin</id>
-	<baseDirectory>/</baseDirectory>
-	<formats>
-		<format>zip</format>
-	</formats>
-	<fileSets>
-		<fileSet>
-			<directory>bin</directory>
-			<outputDirectory>/</outputDirectory>
-			<fileMode>0777</fileMode>
-			<!-- <excludes> <exclude>stp_ws.zip</exclude> </excludes> -->
-		</fileSet>
-		<fileSet>
-			<directory>${symbol_dollar}{project.build.directory}/dependency</directory>
-			<outputDirectory>/lib</outputDirectory>
-			<!-- <excludes> <exclude>stp_ws.zip</exclude> </excludes> -->
-		</fileSet>
-	</fileSets>
-	<files>
-		<file>
-			<source>${symbol_dollar}{project.build.directory}/${symbol_dollar}{project.artifactId}-${symbol_dollar}{project.version}.jar</source>
-			<outputDirectory>/</outputDirectory>
-			<fileMode>0666</fileMode>
-		</file>
-
-	</files>
-</assembly>
\ No newline at end of file
diff --git a/AMW_shakedown/AMW_stp_archetype/src/main/resources/archetype-resources/src/main/java/__mainclass__.java b/AMW_shakedown/AMW_stp_archetype/src/main/resources/archetype-resources/src/main/java/__mainclass__.java
deleted file mode 100644
index e66ecfafb..000000000
--- a/AMW_shakedown/AMW_stp_archetype/src/main/resources/archetype-resources/src/main/java/__mainclass__.java
+++ /dev/null
@@ -1,11 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-package ${package};
-
-public class ${mainclass} {
-	
-	public static void main(String[] args) {
-	
-	}
-}
diff --git a/AMW_shakedown/AMW_stp_archetype/src/main/resources/archetype-resources/usage.txt b/AMW_shakedown/AMW_stp_archetype/src/main/resources/archetype-resources/usage.txt
deleted file mode 100644
index 468600e45..000000000
--- a/AMW_shakedown/AMW_stp_archetype/src/main/resources/archetype-resources/usage.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-${usageText}
\ No newline at end of file
diff --git a/AMW_shakedown/AMW_stp_archetype/src/test/resources/projects/basic/archetype.properties b/AMW_shakedown/AMW_stp_archetype/src/test/resources/projects/basic/archetype.properties
deleted file mode 100644
index ab79fce2b..000000000
--- a/AMW_shakedown/AMW_stp_archetype/src/test/resources/projects/basic/archetype.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-#Tue Dec 04 09:06:38 CET 2012
-package=ch.puzzle.itc.mobiliar.stp
-artifactId=AMW_stp
-version=0.0.1-SNAPSHOT
-mainclass=test
-groupId=ch.puzzle.itc.mobiliar.stp
-runScriptCommand=java $@
-usageText=blabla
-
diff --git a/AMW_shakedown/AMW_stp_archetype/src/test/resources/projects/basic/goal.txt b/AMW_shakedown/AMW_stp_archetype/src/test/resources/projects/basic/goal.txt
deleted file mode 100644
index e69de29bb..000000000
diff --git a/AMW_shakedown/AMW_stp_check_connection/.gitignore b/AMW_shakedown/AMW_stp_check_connection/.gitignore
deleted file mode 100644
index e26d52600..000000000
--- a/AMW_shakedown/AMW_stp_check_connection/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/target
-/DB2_STP_success.launch
-/DB2_STP_wrongpwd.launch
diff --git a/AMW_shakedown/AMW_stp_check_connection/bin/checkConnection.py b/AMW_shakedown/AMW_stp_check_connection/bin/checkConnection.py
deleted file mode 100644
index 8076431f7..000000000
--- a/AMW_shakedown/AMW_stp_check_connection/bin/checkConnection.py
+++ /dev/null
@@ -1,21 +0,0 @@
-import socket, sys
-
-def checkConnection(hostPorts):
-    for hostPort in hostPorts:
-        host = hostPort.split(":")[0]
-        port = hostPort.split(":")[1]
-        print("Trying to connect to: " + host + " " + port)
-        sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-        result = sock.connect_ex((host, int(port)))
-        if result == 0:
-            print("Connection to " + host + " " + port + " successful!")
-        else:
-            raise Exception("Connection to " + host + " " + port + " failed!")
-
-if __name__ == '__main__':
-    try:
-        sys.argv.pop(0)
-        #example arg: host1:port1 host2:port2
-        checkConnection(sys.argv)
-    except Exception as e:
-        raise
\ No newline at end of file
diff --git a/AMW_shakedown/AMW_stp_check_connection/bin/runtest.sh b/AMW_shakedown/AMW_stp_check_connection/bin/runtest.sh
deleted file mode 100644
index 2498b308a..000000000
--- a/AMW_shakedown/AMW_stp_check_connection/bin/runtest.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-cd `dirname $BASH_SOURCE`
-
-python checkConnection.py $1 $2
\ No newline at end of file
diff --git a/AMW_shakedown/AMW_stp_check_connection/pom.xml b/AMW_shakedown/AMW_stp_check_connection/pom.xml
deleted file mode 100644
index cf25c8fb0..000000000
--- a/AMW_shakedown/AMW_stp_check_connection/pom.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?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/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>ch.puzzle.itc.mobiliar</groupId>
-		<artifactId>AMW_shakedown</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
-		<relativePath>..</relativePath>
-	</parent>
-    <artifactId>AMW_stp_check_connection</artifactId>
-    <name>AMW_stp_check_connection</name>
-	<version>1.0.0-SNAPSHOT</version>
-	<packaging>pom</packaging>
-	<properties>
-		<mainClass>ch.puzzle.itc.mobiliar.stp.tcpping.TCPPing_STP</mainClass>
-		<version.dependency.maven.plugin>3.1.1</version.dependency.maven.plugin>
-		<version.assembly.maven.plugin>3.1.0</version.assembly.maven.plugin>
-	</properties>
-
-  	<build>
-		<pluginManagement>
-			<plugins>
-				<!-- Ignore/Execute plugin execution -->
-				<plugin>
-					<groupId>org.eclipse.m2e</groupId>
-					<artifactId>lifecycle-mapping</artifactId>
-					<version>1.0.0</version>
-					<configuration>
-						<lifecycleMappingMetadata>
-							<pluginExecutions>
-								<!-- copy-dependency plugin -->
-								<pluginExecution>
-									<pluginExecutionFilter>
-										<groupId>org.apache.maven.plugins</groupId>
-										<artifactId>maven-dependency-plugin</artifactId>
-										<versionRange>[1.0.0,)</versionRange>
-										<goals>
-											<goal>copy-dependencies</goal>
-										</goals>
-
-									</pluginExecutionFilter>
-									<action>
-										<ignore />
-									</action>
-								</pluginExecution>
-							</pluginExecutions>
-						</lifecycleMappingMetadata>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<archive>
-						<manifest>
-							<addClasspath>true</addClasspath>
-							<mainClass>${mainClass}</mainClass>
-						</manifest>
-					</archive>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<version>${version.dependency.maven.plugin}</version>
-				<executions>
-					<execution>
-						<id>copy-dependencies</id>
-						<phase>package</phase>
-						<goals>
-							<goal>copy-dependencies</goal>
-						</goals>
-						<configuration>
-							<excludeScope>provided</excludeScope>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		
-			<plugin>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<version>${version.assembly.maven.plugin}</version>
-				<configuration>
-					<descriptors>
-						<descriptor>src/main/assembly/zip.xml</descriptor>
-					</descriptors>
-				</configuration>
-				<executions>
-					<execution>
-						<id>make-assembly</id> <!-- this is used for inheritance merges -->
-						<phase>package</phase> <!-- append to the packaging phase. -->
-						<goals>
-							<goal>single</goal> <!-- goals == mojos -->
-						</goals>
-						<configuration>
-							<appendAssemblyId>false</appendAssemblyId>
-						</configuration>
-					</execution>
-
-				</executions>
-			</plugin>
-
-		</plugins>
-	</build>
-	<dependencies>
-		<dependency>
-    		<groupId>junit</groupId>
-    		<artifactId>junit</artifactId>
-    		<scope>provided</scope>
-		</dependency>
-	</dependencies>
-
-</project>
diff --git a/AMW_shakedown/AMW_stp_check_connection/src/main/assembly/zip.xml b/AMW_shakedown/AMW_stp_check_connection/src/main/assembly/zip.xml
deleted file mode 100644
index 9aaf0afc9..000000000
--- a/AMW_shakedown/AMW_stp_check_connection/src/main/assembly/zip.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<assembly
-	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-	<id>bin</id>
-	<baseDirectory>/</baseDirectory>
-	<formats>
-		<format>zip</format>
-	</formats>
-	<fileSets>
-		<fileSet>
-			<directory>bin</directory>
-			<outputDirectory>/</outputDirectory>
-			<fileMode>0777</fileMode>
-			<!-- <excludes> <exclude>stp_ws.zip</exclude> </excludes> -->
-		</fileSet>
-		<fileSet>
-			<directory>${project.build.directory}/dependency</directory>
-			<outputDirectory>/lib</outputDirectory>
-			<!-- <excludes> <exclude>stp_ws.zip</exclude> </excludes> -->
-		</fileSet>
-	</fileSets>	
-</assembly>
\ No newline at end of file
diff --git a/AMW_shakedown/AMW_stp_dnyws/bin/runtest.sh b/AMW_shakedown/AMW_stp_dnyws/bin/runtest.sh
deleted file mode 100644
index af8b223a5..000000000
--- a/AMW_shakedown/AMW_stp_dnyws/bin/runtest.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-cd `dirname $BASH_SOURCE`
-java "$@"
\ No newline at end of file
diff --git a/AMW_shakedown/AMW_stp_dnyws/pom.xml b/AMW_shakedown/AMW_stp_dnyws/pom.xml
deleted file mode 100644
index 24f8de9bb..000000000
--- a/AMW_shakedown/AMW_stp_dnyws/pom.xml
+++ /dev/null
@@ -1,172 +0,0 @@
-<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/xsd/maven-4.0.0.xsd">
-	<parent>
-		<groupId>ch.puzzle.itc.mobiliar</groupId>
-		<artifactId>AMW_shakedown</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
-		<relativePath>..</relativePath>
-	</parent>
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>AMW_stp_dynws</artifactId>
-	<version>1.0.0</version>
-	<properties>
-		<mainClass>ch.puzzle.itc.mobiliar.stp.dynws.DynWS_STP</mainClass>
-		<cxf.version>3.1.7</cxf.version>
-		<version.dependency.maven.plugin>3.1.1</version.dependency.maven.plugin>
-		<version.assembly.maven.plugin>3.1.0</version.assembly.maven.plugin>
-	</properties>
-
-	<build>
-		<pluginManagement>
-			<plugins>
-				<!-- Ignore/Execute plugin execution -->
-				<plugin>
-					<groupId>org.eclipse.m2e</groupId>
-					<artifactId>lifecycle-mapping</artifactId>
-					<version>1.0.0</version>
-					<configuration>
-						<lifecycleMappingMetadata>
-							<pluginExecutions>
-								<!-- copy-dependency plugin -->
-								<pluginExecution>
-									<pluginExecutionFilter>
-										<groupId>org.apache.maven.plugins</groupId>
-										<artifactId>maven-dependency-plugin</artifactId>
-										<versionRange>[1.0.0,)</versionRange>
-										<goals>
-											<goal>copy-dependencies</goal>
-										</goals>
-									</pluginExecutionFilter>
-									<action>
-										<ignore />
-									</action>
-								</pluginExecution>
-							</pluginExecutions>
-						</lifecycleMappingMetadata>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<archive>
-						<manifest>
-							<addClasspath>true</addClasspath>
-							<mainClass>${mainClass}</mainClass>
-							<classpathPrefix>lib/</classpathPrefix>
-						</manifest>
-					</archive>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<version>${version.dependency.maven.plugin}</version>
-				<executions>
-					<execution>
-						<id>copy-dependencies</id>
-						<phase>package</phase>
-						<goals>
-							<goal>copy-dependencies</goal>
-						</goals>
-						<configuration>
-							<includeScope>compile</includeScope>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-
-			<!-- http://stackoverflow.com/questions/9069138/apache-cxf-client-loads-fine-in-eclipse-but-standalone-jar-throws-nullpointerexc -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-shade-plugin</artifactId>
-				<executions>
-					<execution>
-						<phase>package</phase>
-						<goals>
-							<goal>shade</goal>
-						</goals>
-						<configuration>
-							<transformers>
-								<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
-									<resource>META-INF/spring.handlers</resource>
-								</transformer>
-								<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
-									<resource>META-INF/services/com.sun.tools.xjc.Plugin</resource>
-								</transformer>
-								<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
-									<resource>META-INF/spring.schemas</resource>
-								</transformer>
-								<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
-									<resource>META-INF/cxf/cxf.extension</resource>
-								</transformer>
-								<transformer implementation="org.apache.maven.plugins.shade.resource.XmlAppendingTransformer">
-									<resource>META-INF/extensions.xml</resource>
-								</transformer>
-								<transformer implementation="org.apache.maven.plugins.shade.resource.XmlAppendingTransformer">
-									<resource>META-INF/cxf/extensions.xml</resource>
-								</transformer>
-								<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
-									<resource>META-INF/cxf/bus-extensions.txt</resource>
-								</transformer>
-								<transformer implementation="org.apache.maven.plugins.shade.resource.XmlAppendingTransformer">
-									<resource>META-INF/cxf/bus-extensions.xml</resource>
-								</transformer>
-								<transformer implementation="org.apache.maven.plugins.shade.resource.XmlAppendingTransformer">
-									<resource>META-INF/wsdl.plugin.xml</resource>
-								</transformer>
-								<transformer implementation="org.apache.maven.plugins.shade.resource.XmlAppendingTransformer">
-									<resource>META-INF/tools.service.validator.xml</resource>
-								</transformer>
-								<transformer implementation="org.apache.maven.plugins.shade.resource.XmlAppendingTransformer">
-									<resource>META-INF/cxf/java2wsbeans.xml</resource>
-								</transformer>
-							</transformers>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<version>${version.assembly.maven.plugin}</version>
-				<configuration>
-					<descriptors>
-						<descriptor>src/main/assembly/zip.xml</descriptor>
-					</descriptors>
-				</configuration>
-				<executions>
-					<execution>
-						<id>make-assembly</id> <!-- this is used for inheritance merges -->
-						<phase>package</phase> <!-- append to the packaging phase. -->
-						<goals>
-							<goal>single</goal> <!-- goals == mojos -->
-						</goals>
-						<configuration>
-							<appendAssemblyId>false</appendAssemblyId>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-	<dependencies>
-		<dependency>
-			<groupId>commons-cli</groupId>
-			<artifactId>commons-cli</artifactId>
-			<version>1.2</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.cxf</groupId>
-			<artifactId>cxf-rt-frontend-jaxws</artifactId>
-			<version>${cxf.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.cxf</groupId>
-			<artifactId>cxf-rt-transports-http</artifactId>
-			<version>${cxf.version}</version>
-		</dependency>
-	</dependencies>
-
-</project>
\ No newline at end of file
diff --git a/AMW_shakedown/AMW_stp_dnyws/src/main/assembly/zip.xml b/AMW_shakedown/AMW_stp_dnyws/src/main/assembly/zip.xml
deleted file mode 100644
index f8a56ac64..000000000
--- a/AMW_shakedown/AMW_stp_dnyws/src/main/assembly/zip.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<assembly
-	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-	<id>bin</id>
-	<baseDirectory>/</baseDirectory>
-	<formats>
-		<format>zip</format>
-	</formats>
-	<fileSets>
-		<fileSet>
-			<directory>bin</directory>
-			<outputDirectory>/</outputDirectory>
-			<fileMode>0777</fileMode>
-		</fileSet>
-	</fileSets>
-	<files>
-		<file>
-			<source>${project.build.directory}/${project.artifactId}-${project.version}.jar</source>
-			<outputDirectory>/</outputDirectory>
-			<fileMode>0666</fileMode>
-		</file>
-
-	</files>
-</assembly>
\ No newline at end of file
diff --git a/AMW_shakedown/AMW_stp_dnyws/src/main/java/ch/puzzle/itc/mobiliar/stp/dynws/DynWSAuthHTTPConduitConfigurer.java b/AMW_shakedown/AMW_stp_dnyws/src/main/java/ch/puzzle/itc/mobiliar/stp/dynws/DynWSAuthHTTPConduitConfigurer.java
deleted file mode 100644
index 80fed0ac7..000000000
--- a/AMW_shakedown/AMW_stp_dnyws/src/main/java/ch/puzzle/itc/mobiliar/stp/dynws/DynWSAuthHTTPConduitConfigurer.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package ch.puzzle.itc.mobiliar.stp.dynws;
-
-import java.security.NoSuchAlgorithmException;
-
-import javax.net.ssl.SSLContext;
-
-import org.apache.cxf.configuration.jsse.TLSClientParameters;
-import org.apache.cxf.configuration.security.AuthorizationPolicy;
-import org.apache.cxf.transport.http.HTTPConduit;
-import org.apache.cxf.transport.http.HTTPConduitConfigurer;
-
-/**
- * CXF Configuration for Basic Auth
- * 
- */
-public class DynWSAuthHTTPConduitConfigurer implements HTTPConduitConfigurer {
-   
-    private final String username;
-    private final String password;
-   
-    public DynWSAuthHTTPConduitConfigurer(String username, String password) {
-        this.username = username;
-        this.password = password;
-    }
-   
-    @Override
-    public void configure(String name, String address, HTTPConduit conduit) {
-        if (username != null) {
-	        AuthorizationPolicy ap = new AuthorizationPolicy();
-	        ap.setUserName(username);
-	        ap.setPassword(password);
-	        conduit.setAuthorization(ap);
-        }
-        
-        //override the ssl configuration of cxf and use the default implementation instead
-        //CXF doesn't like pkcs12 keystore for some reason (Default key managers cannot be initialized: Invalid keystore format)
-        TLSClientParameters tls = new TLSClientParameters();
-        try {
-			tls.setSSLSocketFactory(SSLContext.getDefault().getSocketFactory());
-		} catch (NoSuchAlgorithmException e) {
-			e.printStackTrace();
-		}
-        conduit.setTlsClientParameters(tls);
-
-    }
-}
diff --git a/AMW_shakedown/AMW_stp_dnyws/src/main/java/ch/puzzle/itc/mobiliar/stp/dynws/DynWS_STP.java b/AMW_shakedown/AMW_stp_dnyws/src/main/java/ch/puzzle/itc/mobiliar/stp/dynws/DynWS_STP.java
deleted file mode 100644
index 9f4dc0d0a..000000000
--- a/AMW_shakedown/AMW_stp_dnyws/src/main/java/ch/puzzle/itc/mobiliar/stp/dynws/DynWS_STP.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package ch.puzzle.itc.mobiliar.stp.dynws;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.apache.commons.cli.BasicParser;
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.CommandLineParser;
-import org.apache.commons.cli.HelpFormatter;
-import org.apache.commons.cli.OptionBuilder;
-import org.apache.commons.cli.Options;
-import org.apache.commons.cli.ParseException;
-import org.apache.cxf.Bus;
-import org.apache.cxf.bus.CXFBusFactory;
-import org.apache.cxf.endpoint.Client;
-import org.apache.cxf.jaxws.endpoint.dynamic.JaxWsDynamicClientFactory;
-import org.apache.cxf.transport.http.HTTPConduitConfigurer;
-
-public class DynWS_STP {
-
-	private static final String PING_METHOD = "ping";
-	private static final Level CXF_LOG_LEVEL = Level.SEVERE;
-	private String wsdl;
-	private String user;
-	private String password;
-	private Client client;
-
-	public DynWS_STP(String wsdl, String user, String password) {
-		this.wsdl = wsdl;
-		this.user = user;
-		this.password = password;
-	}
-
-	private void initCxf() {
-		// turn down cxf Logging
-		Logger globalLogger = Logger.getLogger("");
-		globalLogger.setLevel(CXF_LOG_LEVEL);
-
-		Bus bus = CXFBusFactory.getThreadDefaultBus();
-
-
-		DynWSAuthHTTPConduitConfigurer conf = new DynWSAuthHTTPConduitConfigurer(user, password);
-		bus.setExtension(conf, HTTPConduitConfigurer.class);
-		JaxWsDynamicClientFactory dcf = JaxWsDynamicClientFactory.newInstance(bus);
-		client = dcf.createClient(wsdl);
-
-	}
-
-	public void callPing() throws Exception {
-		Object[] result = null;
-		result = client.invoke(PING_METHOD);
-
-		if (result.length != 0) {
-			throw new Exception();
-		}
-		// if no exception is throw, everything worked!
-		System.out.println("Successfully called ping");
-	}
-
-	public void run() throws Exception {
-		System.out.println("Trying to called ping of webservice " + wsdl + " with user " + user);
-		initCxf();
-		callPing();
-	}
-
-	@SuppressWarnings("static-access")
-	public static CommandLine parseArgument(String[] args) {
-		CommandLineParser parser = new BasicParser();
-		HelpFormatter lvFormater = new HelpFormatter();
-		CommandLine line = null;
-		Options options = new Options();
-
-		options.addOption(OptionBuilder.withLongOpt("wsdl").withDescription("Wsdl URL of Webservice").hasArg().isRequired().create("w"));
-		options.addOption(OptionBuilder.withLongOpt("user").withDescription("Webservice user").hasArg().create("u"));
-		options.addOption(OptionBuilder.withLongOpt("password").withDescription("Webservice password").hasArg().create("p"));
-
-		try {
-			line = parser.parse(options, args);
-		} catch (ParseException e) {
-			System.out.println(e.getMessage());
-			lvFormater.printHelp("DynWS_STP", options);
-			System.exit(1);
-		}
-
-		if (line.hasOption("u") && !line.hasOption("p") || !line.hasOption("u") && line.hasOption("p")) {
-			System.out.println("User and password have to be set");
-			lvFormater.printHelp("DynWS_STP", options);
-			System.exit(1);
-		}
-
-		return line;
-	}
-	
-	/**
-	 * Example call: --wsdl
-	 * https://jsplb01v.umobi.mobicorp.test/IsdvService_v3_0/IsdvService?wsdl
-	 * --user user --password password;
-	 */
-	public static void main(String[] args) throws Exception {
-		// http://svn.codehaus.org/gmod/groovyws/branches/0.3/src/main/java/groovyx/net/ws/WSClient.java
-		DynWS_STP stp;
-		CommandLine line = parseArgument(args);
-		
-		stp = new DynWS_STP(line.getOptionValue("w"), line.getOptionValue("u"), line.getOptionValue("p"));
-
-		try {
-			stp.run();
-		} catch (Exception e) {
-			System.out.println("Could not call ping on webservice");
-			throw e;
-		}
-
-	}
-
-}
diff --git a/AMW_shakedown/AMW_stp_dummy/.gitignore b/AMW_shakedown/AMW_stp_dummy/.gitignore
deleted file mode 100644
index ea8c4bf7f..000000000
--- a/AMW_shakedown/AMW_stp_dummy/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/target
diff --git a/AMW_shakedown/AMW_stp_dummy/bin/runtest.sh b/AMW_shakedown/AMW_stp_dummy/bin/runtest.sh
deleted file mode 100644
index 946fb656d..000000000
--- a/AMW_shakedown/AMW_stp_dummy/bin/runtest.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-cd `dirname $BASH_SOURCE`
-java -jar $@  
\ No newline at end of file
diff --git a/AMW_shakedown/AMW_stp_dummy/pom.xml b/AMW_shakedown/AMW_stp_dummy/pom.xml
deleted file mode 100644
index bca7fa945..000000000
--- a/AMW_shakedown/AMW_stp_dummy/pom.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<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/xsd/maven-4.0.0.xsd">
-	<parent>
-		<groupId>ch.puzzle.itc.mobiliar</groupId>
-		<artifactId>AMW_shakedown</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
-		<relativePath>..</relativePath>
-	</parent>
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>AMW_stp_dummy</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
-	<properties>
-		<mainClass>ch.puzzle.itc.mobiliar.stp.dummy.Dummy</mainClass>
-		<version.dependency.maven.plugin>3.1.1</version.dependency.maven.plugin>
-		<version.assembly.maven.plugin>3.1.0</version.assembly.maven.plugin>
-	</properties>
-
-	<build>
-		<pluginManagement>
-			<plugins>
-				<!-- Ignore/Execute plugin execution -->
-				<plugin>
-					<groupId>org.eclipse.m2e</groupId>
-					<artifactId>lifecycle-mapping</artifactId>
-					<version>1.0.0</version>
-					<configuration>
-						<lifecycleMappingMetadata>
-							<pluginExecutions>
-								<!-- copy-dependency plugin -->
-								<pluginExecution>
-									<pluginExecutionFilter>
-										<groupId>org.apache.maven.plugins</groupId>
-										<artifactId>maven-dependency-plugin</artifactId>
-										<versionRange>[1.0.0,)</versionRange>
-										<goals>
-											<goal>copy-dependencies</goal>
-										</goals>
-
-									</pluginExecutionFilter>
-									<action>
-										<ignore />
-									</action>
-								</pluginExecution>
-							</pluginExecutions>
-						</lifecycleMappingMetadata>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<archive>
-						<manifest>
-							<addClasspath>true</addClasspath>
-							<mainClass>${mainClass}</mainClass>
-						</manifest>
-					</archive>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<version>${version.dependency.maven.plugin}</version>
-				<executions>
-					<execution>
-						<id>copy-dependencies</id>
-						<phase>package</phase>
-						<goals>
-							<goal>copy-dependencies</goal>
-						</goals>
-						<configuration>
-							<excludeScope>provided</excludeScope>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		
-			<plugin>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<version>${version.assembly.maven.plugin}</version>
-				<configuration>
-					<descriptors>
-						<descriptor>src/main/assembly/zip.xml</descriptor>
-					</descriptors>
-				</configuration>
-				<executions>
-					<execution>
-						<id>make-assembly</id> <!-- this is used for inheritance merges -->
-						<phase>package</phase> <!-- append to the packaging phase. -->
-						<goals>
-							<goal>single</goal> <!-- goals == mojos -->
-						</goals>
-						<configuration>
-							<appendAssemblyId>false</appendAssemblyId>
-						</configuration>
-					</execution>
-
-				</executions>
-			</plugin>
-
-		</plugins>
-	</build>
-	<dependencies>
-		<dependency>
-    		<groupId>junit</groupId>
-    		<artifactId>junit</artifactId>
-    		<scope>test</scope>
-		</dependency>
-	</dependencies>
-
-</project>
\ No newline at end of file
diff --git a/AMW_shakedown/AMW_stp_dummy/src/main/assembly/zip.xml b/AMW_shakedown/AMW_stp_dummy/src/main/assembly/zip.xml
deleted file mode 100644
index dbccba1ba..000000000
--- a/AMW_shakedown/AMW_stp_dummy/src/main/assembly/zip.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<assembly
-	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-	<id>bin</id>
-	<baseDirectory>/</baseDirectory>
-	<formats>
-		<format>zip</format>
-	</formats>
-	<fileSets>
-		<fileSet>
-			<directory>bin</directory>
-			<outputDirectory>/</outputDirectory>
-			<fileMode>0777</fileMode>
-			<!-- <excludes> <exclude>stp_ws.zip</exclude> </excludes> -->
-		</fileSet>
-		<fileSet>
-			<directory>${project.build.directory}/dependency</directory>
-			<outputDirectory>/lib</outputDirectory>
-			<!-- <excludes> <exclude>stp_ws.zip</exclude> </excludes> -->
-		</fileSet>
-	</fileSets>
-	<files>
-		<file>
-			<source>${project.build.directory}/${project.artifactId}-${project.version}.jar</source>
-			<outputDirectory>/</outputDirectory>
-			<fileMode>0666</fileMode>
-		</file>
-
-	</files>
-</assembly>
\ No newline at end of file
diff --git a/AMW_shakedown/AMW_stp_dummy/src/main/java/ch/puzzle/itc/mobiliar/stp/dummy/Dummy.java b/AMW_shakedown/AMW_stp_dummy/src/main/java/ch/puzzle/itc/mobiliar/stp/dummy/Dummy.java
deleted file mode 100644
index f6b348ec0..000000000
--- a/AMW_shakedown/AMW_stp_dummy/src/main/java/ch/puzzle/itc/mobiliar/stp/dummy/Dummy.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package ch.puzzle.itc.mobiliar.stp.dummy;
-
-public class Dummy {
-
-	/**
-	 * @param args
-	 */
-	public static void main(String[] args) {
-		if(args.length>1 && Boolean.parseBoolean(args[1])==false){
-			System.err.println("FAILURE");
-			System.exit(1);
-		}
-		else{
-			System.out.println("SUCCESS");
-			if(args.length>1) {
-				System.out.println("@{"+args[1]+"}");
-			}
-			System.exit(0);
-		}
-	}
-
-}
diff --git a/AMW_shakedown/AMW_stp_jdbc/.gitignore b/AMW_shakedown/AMW_stp_jdbc/.gitignore
deleted file mode 100644
index e26d52600..000000000
--- a/AMW_shakedown/AMW_stp_jdbc/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/target
-/DB2_STP_success.launch
-/DB2_STP_wrongpwd.launch
diff --git a/AMW_shakedown/AMW_stp_jdbc/bin/runtest.sh b/AMW_shakedown/AMW_stp_jdbc/bin/runtest.sh
deleted file mode 100644
index 6229e79d8..000000000
--- a/AMW_shakedown/AMW_stp_jdbc/bin/runtest.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-cd `dirname $BASH_SOURCE`
-java "$@"
diff --git a/AMW_shakedown/AMW_stp_jdbc/pom.xml b/AMW_shakedown/AMW_stp_jdbc/pom.xml
deleted file mode 100644
index dafdced6a..000000000
--- a/AMW_shakedown/AMW_stp_jdbc/pom.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<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/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>ch.puzzle.itc.mobiliar</groupId>
-		<artifactId>AMW_shakedown</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
-		<relativePath>..</relativePath>
-	</parent>
-    <artifactId>AMW_stp_jdbc</artifactId>
-    <name>AMW_stp_jdbc</name>
-	<version>1.0.0-SNAPSHOT</version>
-	<properties>
-		<mainClass>ch.puzzle.itc.mobiliar.stp.db.DB_STP</mainClass>
-		<version.dependency.maven.plugin>3.1.1</version.dependency.maven.plugin>
-		<version.assembly.maven.plugin>3.1.0</version.assembly.maven.plugin>
-	</properties>
-
-  	<build>
-		<pluginManagement>
-			<plugins>
-				<!-- Ignore/Execute plugin execution -->
-				<plugin>
-					<groupId>org.eclipse.m2e</groupId>
-					<artifactId>lifecycle-mapping</artifactId>
-					<version>1.0.0</version>
-					<configuration>
-						<lifecycleMappingMetadata>
-							<pluginExecutions>
-								<!-- copy-dependency plugin -->
-								<pluginExecution>
-									<pluginExecutionFilter>
-										<groupId>org.apache.maven.plugins</groupId>
-										<artifactId>maven-dependency-plugin</artifactId>
-										<versionRange>[1.0.0,)</versionRange>
-										<goals>
-											<goal>copy-dependencies</goal>
-										</goals>
-
-									</pluginExecutionFilter>
-									<action>
-										<ignore />
-									</action>
-								</pluginExecution>
-							</pluginExecutions>
-						</lifecycleMappingMetadata>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<archive>
-						<manifest>
-							<addClasspath>true</addClasspath>
-							<mainClass>${mainClass}</mainClass>
-						</manifest>
-					</archive>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<version>${version.dependency.maven.plugin}</version>
-				<executions>
-					<execution>
-						<id>copy-dependencies</id>
-						<phase>package</phase>
-						<goals>
-							<goal>copy-dependencies</goal>
-						</goals>
-						<configuration>
-							<excludeScope>provided</excludeScope>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		
-			<plugin>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<version>${version.assembly.maven.plugin}</version>
-				<configuration>
-					<descriptors>
-						<descriptor>src/main/assembly/zip.xml</descriptor>
-					</descriptors>
-				</configuration>
-				<executions>
-					<execution>
-						<id>make-assembly</id> <!-- this is used for inheritance merges -->
-						<phase>package</phase> <!-- append to the packaging phase. -->
-						<goals>
-							<goal>single</goal> <!-- goals == mojos -->
-						</goals>
-						<configuration>
-							<appendAssemblyId>false</appendAssemblyId>
-						</configuration>
-					</execution>
-
-				</executions>
-			</plugin>
-
-		</plugins>
-	</build>
-
-</project>
\ No newline at end of file
diff --git a/AMW_shakedown/AMW_stp_jdbc/src/main/assembly/zip.xml b/AMW_shakedown/AMW_stp_jdbc/src/main/assembly/zip.xml
deleted file mode 100644
index dbccba1ba..000000000
--- a/AMW_shakedown/AMW_stp_jdbc/src/main/assembly/zip.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<assembly
-	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-	<id>bin</id>
-	<baseDirectory>/</baseDirectory>
-	<formats>
-		<format>zip</format>
-	</formats>
-	<fileSets>
-		<fileSet>
-			<directory>bin</directory>
-			<outputDirectory>/</outputDirectory>
-			<fileMode>0777</fileMode>
-			<!-- <excludes> <exclude>stp_ws.zip</exclude> </excludes> -->
-		</fileSet>
-		<fileSet>
-			<directory>${project.build.directory}/dependency</directory>
-			<outputDirectory>/lib</outputDirectory>
-			<!-- <excludes> <exclude>stp_ws.zip</exclude> </excludes> -->
-		</fileSet>
-	</fileSets>
-	<files>
-		<file>
-			<source>${project.build.directory}/${project.artifactId}-${project.version}.jar</source>
-			<outputDirectory>/</outputDirectory>
-			<fileMode>0666</fileMode>
-		</file>
-
-	</files>
-</assembly>
\ No newline at end of file
diff --git a/AMW_shakedown/AMW_stp_jdbc/src/main/java/ch/puzzle/itc/mobiliar/stp/db/DB_STP.java b/AMW_shakedown/AMW_stp_jdbc/src/main/java/ch/puzzle/itc/mobiliar/stp/db/DB_STP.java
deleted file mode 100644
index 2dfff63f0..000000000
--- a/AMW_shakedown/AMW_stp_jdbc/src/main/java/ch/puzzle/itc/mobiliar/stp/db/DB_STP.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package ch.puzzle.itc.mobiliar.stp.db;
-
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.SQLException;
-
-public class DB_STP {
-	/**
-	 * @param args
-	 *            takes two arguments: The jdbc connection string, the user name
-	 *            and the password, additionally requires the jdbc driver in its
-	 *            classpath
-	 */
-	public static void main(String[] args) {
-		if (args.length > 2) {
-			String jdbcConnectionString = args[0];
-			String userName = args[1];
-			String password = args[2];
-			Connection conn;
-			try {
-				conn = DriverManager.getConnection(jdbcConnectionString, userName, password);
-				conn.close();
-				System.out.println("Successfully connected to database ("+jdbcConnectionString+" with user "+userName+")!");
-				System.exit(0);
-			} catch (SQLException e) {
-				System.err.println("Was not able to connect to database ("+jdbcConnectionString+" with user "+userName+")!" + e.getMessage());
-				System.exit(1);
-			}
-		} else {
-			System.out.println("Missing parameters! The jdbc connection string, the username and the password is needed to be passed as arguments!");
-			System.exit(1);
-		}
-	}
-}
diff --git a/AMW_shakedown/AMW_stp_jdbc/usage.txt b/AMW_shakedown/AMW_stp_jdbc/usage.txt
deleted file mode 100644
index 01a1ec11a..000000000
--- a/AMW_shakedown/AMW_stp_jdbc/usage.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Exemplary test template:
--cp /opt/jboss-as-7.1.1.Final/modules/com/ibm/db2/main/db2jcc4.jar:./AMW_stp_db-0.0.1-SNAPSHOT.jar ch.puzzle.itc.mobiliar.stp.db.DB_STP jdbc:db2://romai.rz.puzzle.ch:50000/amw db2inst1 pwDB2.inst1
\ No newline at end of file
diff --git a/AMW_shakedown/AMW_stp_serveralive/.gitignore b/AMW_shakedown/AMW_stp_serveralive/.gitignore
deleted file mode 100644
index e26d52600..000000000
--- a/AMW_shakedown/AMW_stp_serveralive/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/target
-/DB2_STP_success.launch
-/DB2_STP_wrongpwd.launch
diff --git a/AMW_shakedown/AMW_stp_serveralive/bin/runtest.sh b/AMW_shakedown/AMW_stp_serveralive/bin/runtest.sh
deleted file mode 100755
index 5ee6ad028..000000000
--- a/AMW_shakedown/AMW_stp_serveralive/bin/runtest.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-cat /opt/jboss-as-7.1.1.Final/standalone/log/server.log | grep "Undeployed"
-
diff --git a/AMW_shakedown/AMW_stp_serveralive/pom.xml b/AMW_shakedown/AMW_stp_serveralive/pom.xml
deleted file mode 100644
index e0fc91f02..000000000
--- a/AMW_shakedown/AMW_stp_serveralive/pom.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?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/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>ch.puzzle.itc.mobiliar</groupId>
-		<artifactId>AMW_shakedown</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
-		<relativePath>..</relativePath>
-	</parent>
-    <artifactId>AMW_stp_serveralive</artifactId>
-    <name>AMW_stp_serveralive</name>
-	<version>1.0.0-SNAPSHOT</version>
-	<properties>
-		<mainClass>ch.puzzle.itc.mobiliar.stp.serveralive.ServerAlive_STP</mainClass>
-		<version.dependency.maven.plugin>3.1.1</version.dependency.maven.plugin>
-		<version.assembly.maven.plugin>3.1.0</version.assembly.maven.plugin>
-	</properties>
-
-  	<build>
-		<pluginManagement>
-			<plugins>
-				<!-- Ignore/Execute plugin execution -->
-				<plugin>
-					<groupId>org.eclipse.m2e</groupId>
-					<artifactId>lifecycle-mapping</artifactId>
-					<version>1.0.0</version>
-					<configuration>
-						<lifecycleMappingMetadata>
-							<pluginExecutions>
-								<!-- copy-dependency plugin -->
-								<pluginExecution>
-									<pluginExecutionFilter>
-										<groupId>org.apache.maven.plugins</groupId>
-										<artifactId>maven-dependency-plugin</artifactId>
-										<versionRange>[1.0.0,)</versionRange>
-										<goals>
-											<goal>copy-dependencies</goal>
-										</goals>
-
-									</pluginExecutionFilter>
-									<action>
-										<ignore />
-									</action>
-								</pluginExecution>
-							</pluginExecutions>
-						</lifecycleMappingMetadata>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<archive>
-						<manifest>
-							<addClasspath>true</addClasspath>
-							<mainClass>${mainClass}</mainClass>
-						</manifest>
-					</archive>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<version>${version.dependency.maven.plugin}</version>
-				<executions>
-					<execution>
-						<id>copy-dependencies</id>
-						<phase>package</phase>
-						<goals>
-							<goal>copy-dependencies</goal>
-						</goals>
-						<configuration>
-							<excludeScope>provided</excludeScope>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		
-			<plugin>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<version>${version.assembly.maven.plugin}</version>
-				<configuration>
-					<descriptors>
-						<descriptor>src/main/assembly/zip.xml</descriptor>
-					</descriptors>
-				</configuration>
-				<executions>
-					<execution>
-						<id>make-assembly</id> <!-- this is used for inheritance merges -->
-						<phase>package</phase> <!-- append to the packaging phase. -->
-						<goals>
-							<goal>single</goal> <!-- goals == mojos -->
-						</goals>
-						<configuration>
-							<appendAssemblyId>false</appendAssemblyId>
-						</configuration>
-					</execution>
-
-				</executions>
-			</plugin>
-
-		</plugins>
-	</build>
-	<dependencies>
-		<dependency>
-    		<groupId>junit</groupId>
-    		<artifactId>junit</artifactId>
-    		<scope>provided</scope>
-		</dependency>
-	</dependencies>
-
-</project>
diff --git a/AMW_shakedown/AMW_stp_serveralive/src/main/assembly/zip.xml b/AMW_shakedown/AMW_stp_serveralive/src/main/assembly/zip.xml
deleted file mode 100644
index 7bca3591a..000000000
--- a/AMW_shakedown/AMW_stp_serveralive/src/main/assembly/zip.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<assembly
-	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-	<id>bin</id>
-	<baseDirectory>/</baseDirectory>
-	<formats>
-		<format>zip</format>
-	</formats>
-	<fileSets>
-		<fileSet>
-			<directory>bin</directory>
-			<outputDirectory>/</outputDirectory>
-			<fileMode>0777</fileMode>
-		</fileSet>
-		<fileSet>
-			<directory>${project.build.directory}/dependency</directory>
-			<outputDirectory>/lib</outputDirectory>
-		</fileSet>
-	</fileSets>
-</assembly>
\ No newline at end of file
diff --git a/AMW_shakedown/AMW_stp_serveralive/usage.txt b/AMW_shakedown/AMW_stp_serveralive/usage.txt
deleted file mode 100644
index 96f491ff1..000000000
--- a/AMW_shakedown/AMW_stp_serveralive/usage.txt
+++ /dev/null
@@ -1 +0,0 @@
-Write some documentation!
\ No newline at end of file
diff --git a/AMW_shakedown/AMW_stp_tcpping/.gitignore b/AMW_shakedown/AMW_stp_tcpping/.gitignore
deleted file mode 100644
index e26d52600..000000000
--- a/AMW_shakedown/AMW_stp_tcpping/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/target
-/DB2_STP_success.launch
-/DB2_STP_wrongpwd.launch
diff --git a/AMW_shakedown/AMW_stp_tcpping/bin/runtest.sh b/AMW_shakedown/AMW_stp_tcpping/bin/runtest.sh
deleted file mode 100755
index 2e4018931..000000000
--- a/AMW_shakedown/AMW_stp_tcpping/bin/runtest.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-cd `dirname $BASH_SOURCE`
-TEST=`ping $@ 2>&1`
-SUCCESS=`echo "$TEST" | grep '0% packet loss' | wc -l`
-if [ "$SUCCESS" == "1" ] ; then
-	echo "SUCCESS: $TEST";
-	exit 0;
-else
-	echo "FAILURE: $TEST" >&2;
-	exit 1;
-fi
\ No newline at end of file
diff --git a/AMW_shakedown/AMW_stp_tcpping/pom.xml b/AMW_shakedown/AMW_stp_tcpping/pom.xml
deleted file mode 100644
index a53607946..000000000
--- a/AMW_shakedown/AMW_stp_tcpping/pom.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?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/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>ch.puzzle.itc.mobiliar</groupId>
-		<artifactId>AMW_shakedown</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
-		<relativePath>..</relativePath>
-	</parent>
-    <artifactId>AMW_stp_tcpping</artifactId>
-    <name>AMW_stp_tcpping</name>
-	<version>1.0.0-SNAPSHOT</version>
-	<packaging>pom</packaging>
-	<properties>
-		<mainClass>ch.puzzle.itc.mobiliar.stp.tcpping.TCPPing_STP</mainClass>
-		<version.dependency.maven.plugin>3.1.1</version.dependency.maven.plugin>
-		<version.assembly.maven.plugin>3.1.0</version.assembly.maven.plugin>
-	</properties>
-
-  	<build>
-		<pluginManagement>
-			<plugins>
-				<!-- Ignore/Execute plugin execution -->
-				<plugin>
-					<groupId>org.eclipse.m2e</groupId>
-					<artifactId>lifecycle-mapping</artifactId>
-					<version>1.0.0</version>
-					<configuration>
-						<lifecycleMappingMetadata>
-							<pluginExecutions>
-								<!-- copy-dependency plugin -->
-								<pluginExecution>
-									<pluginExecutionFilter>
-										<groupId>org.apache.maven.plugins</groupId>
-										<artifactId>maven-dependency-plugin</artifactId>
-										<versionRange>[1.0.0,)</versionRange>
-										<goals>
-											<goal>copy-dependencies</goal>
-										</goals>
-
-									</pluginExecutionFilter>
-									<action>
-										<ignore />
-									</action>
-								</pluginExecution>
-							</pluginExecutions>
-						</lifecycleMappingMetadata>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<archive>
-						<manifest>
-							<addClasspath>true</addClasspath>
-							<mainClass>${mainClass}</mainClass>
-						</manifest>
-					</archive>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<version>${version.dependency.maven.plugin}</version>
-				<executions>
-					<execution>
-						<id>copy-dependencies</id>
-						<phase>package</phase>
-						<goals>
-							<goal>copy-dependencies</goal>
-						</goals>
-						<configuration>
-							<excludeScope>provided</excludeScope>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		
-			<plugin>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<version>${version.assembly.maven.plugin}</version>
-				<configuration>
-					<descriptors>
-						<descriptor>src/main/assembly/zip.xml</descriptor>
-					</descriptors>
-				</configuration>
-				<executions>
-					<execution>
-						<id>make-assembly</id> <!-- this is used for inheritance merges -->
-						<phase>package</phase> <!-- append to the packaging phase. -->
-						<goals>
-							<goal>single</goal> <!-- goals == mojos -->
-						</goals>
-						<configuration>
-							<appendAssemblyId>false</appendAssemblyId>
-						</configuration>
-					</execution>
-
-				</executions>
-			</plugin>
-
-		</plugins>
-	</build>
-	<dependencies>
-		<dependency>
-    		<groupId>junit</groupId>
-    		<artifactId>junit</artifactId>
-    		<scope>provided</scope>
-		</dependency>
-	</dependencies>
-
-</project>
diff --git a/AMW_shakedown/AMW_stp_tcpping/src/main/assembly/zip.xml b/AMW_shakedown/AMW_stp_tcpping/src/main/assembly/zip.xml
deleted file mode 100644
index 9aaf0afc9..000000000
--- a/AMW_shakedown/AMW_stp_tcpping/src/main/assembly/zip.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<assembly
-	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-	<id>bin</id>
-	<baseDirectory>/</baseDirectory>
-	<formats>
-		<format>zip</format>
-	</formats>
-	<fileSets>
-		<fileSet>
-			<directory>bin</directory>
-			<outputDirectory>/</outputDirectory>
-			<fileMode>0777</fileMode>
-			<!-- <excludes> <exclude>stp_ws.zip</exclude> </excludes> -->
-		</fileSet>
-		<fileSet>
-			<directory>${project.build.directory}/dependency</directory>
-			<outputDirectory>/lib</outputDirectory>
-			<!-- <excludes> <exclude>stp_ws.zip</exclude> </excludes> -->
-		</fileSet>
-	</fileSets>	
-</assembly>
\ No newline at end of file
diff --git a/AMW_shakedown/AMW_stp_tcpping/usage.txt b/AMW_shakedown/AMW_stp_tcpping/usage.txt
deleted file mode 100644
index 96f491ff1..000000000
--- a/AMW_shakedown/AMW_stp_tcpping/usage.txt
+++ /dev/null
@@ -1 +0,0 @@
-Write some documentation!
\ No newline at end of file
diff --git a/AMW_shakedown/AMW_stp_ws/.gitignore b/AMW_shakedown/AMW_stp_ws/.gitignore
deleted file mode 100644
index ea8c4bf7f..000000000
--- a/AMW_shakedown/AMW_stp_ws/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/target
diff --git a/AMW_shakedown/AMW_stp_ws/bin/runtest.sh b/AMW_shakedown/AMW_stp_ws/bin/runtest.sh
deleted file mode 100644
index af8b223a5..000000000
--- a/AMW_shakedown/AMW_stp_ws/bin/runtest.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-cd `dirname $BASH_SOURCE`
-java "$@"
\ No newline at end of file
diff --git a/AMW_shakedown/AMW_stp_ws/pom.xml b/AMW_shakedown/AMW_stp_ws/pom.xml
deleted file mode 100644
index 54448fd36..000000000
--- a/AMW_shakedown/AMW_stp_ws/pom.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<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/xsd/maven-4.0.0.xsd">
-	<parent>
-		<groupId>ch.puzzle.itc.mobiliar</groupId>
-		<artifactId>AMW_shakedown</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
-		<relativePath>..</relativePath>
-	</parent>
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>AMW_stp_ws</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
-	<properties>
-		<mainClass>ch.puzzle.itc.mobiliar.stp.ws.WS_STP</mainClass>
-		<version.dependency.maven.plugin>3.1.1</version.dependency.maven.plugin>
-		<version.assembly.maven.plugin>3.1.0</version.assembly.maven.plugin>
-	</properties>
-
-	<build>
-		<pluginManagement>
-			<plugins>
-				<!-- Ignore/Execute plugin execution -->
-				<plugin>
-					<groupId>org.eclipse.m2e</groupId>
-					<artifactId>lifecycle-mapping</artifactId>
-					<version>1.0.0</version>
-					<configuration>
-						<lifecycleMappingMetadata>
-							<pluginExecutions>
-								<!-- copy-dependency plugin -->
-								<pluginExecution>
-									<pluginExecutionFilter>
-										<groupId>org.apache.maven.plugins</groupId>
-										<artifactId>maven-dependency-plugin</artifactId>
-										<versionRange>[1.0.0,)</versionRange>
-										<goals>
-											<goal>copy-dependencies</goal>
-										</goals>
-
-									</pluginExecutionFilter>
-									<action>
-										<ignore />
-									</action>
-								</pluginExecution>
-							</pluginExecutions>
-						</lifecycleMappingMetadata>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<archive>
-						<manifest>
-							<addClasspath>true</addClasspath>
-							<mainClass>${mainClass}</mainClass>
-							<classpathPrefix>lib/</classpathPrefix>
-						</manifest>
-					</archive>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<version>${version.dependency.maven.plugin}</version>
-				<executions>
-					<execution>
-						<id>copy-dependencies</id>
-						<phase>package</phase>
-						<goals>
-							<goal>copy-dependencies</goal>
-						</goals>
-						<configuration>
-							<includeScope>compile</includeScope>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-
-			<plugin>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<version>${version.assembly.maven.plugin}</version>
-				<configuration>
-					<descriptors>
-						<descriptor>src/main/assembly/zip.xml</descriptor>
-					</descriptors>
-				</configuration>
-				<executions>
-					<execution>
-						<id>make-assembly</id> <!-- this is used for inheritance merges -->
-						<phase>package</phase> <!-- append to the packaging phase. -->
-						<goals>
-							<goal>single</goal> <!-- goals == mojos -->
-						</goals>
-						<configuration>
-							<appendAssemblyId>false</appendAssemblyId>
-						</configuration>
-					</execution>
-
-				</executions>
-			</plugin>
-
-		</plugins>
-	</build>
-	<dependencies>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>commons-codec</groupId>
-			<artifactId>commons-codec</artifactId>
-			<version>1.9</version>
-		</dependency>
-		<dependency>
-			<groupId>org.mockito</groupId>
-			<artifactId>mockito-core</artifactId>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
-
-</project>
\ No newline at end of file
diff --git a/AMW_shakedown/AMW_stp_ws/src/main/assembly/zip.xml b/AMW_shakedown/AMW_stp_ws/src/main/assembly/zip.xml
deleted file mode 100644
index dbccba1ba..000000000
--- a/AMW_shakedown/AMW_stp_ws/src/main/assembly/zip.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<assembly
-	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-	<id>bin</id>
-	<baseDirectory>/</baseDirectory>
-	<formats>
-		<format>zip</format>
-	</formats>
-	<fileSets>
-		<fileSet>
-			<directory>bin</directory>
-			<outputDirectory>/</outputDirectory>
-			<fileMode>0777</fileMode>
-			<!-- <excludes> <exclude>stp_ws.zip</exclude> </excludes> -->
-		</fileSet>
-		<fileSet>
-			<directory>${project.build.directory}/dependency</directory>
-			<outputDirectory>/lib</outputDirectory>
-			<!-- <excludes> <exclude>stp_ws.zip</exclude> </excludes> -->
-		</fileSet>
-	</fileSets>
-	<files>
-		<file>
-			<source>${project.build.directory}/${project.artifactId}-${project.version}.jar</source>
-			<outputDirectory>/</outputDirectory>
-			<fileMode>0666</fileMode>
-		</file>
-
-	</files>
-</assembly>
\ No newline at end of file
diff --git a/AMW_shakedown/AMW_stp_ws/src/main/java/ch/puzzle/itc/mobiliar/stp/ws/WS_STP.java b/AMW_shakedown/AMW_stp_ws/src/main/java/ch/puzzle/itc/mobiliar/stp/ws/WS_STP.java
deleted file mode 100644
index b75586e22..000000000
--- a/AMW_shakedown/AMW_stp_ws/src/main/java/ch/puzzle/itc/mobiliar/stp/ws/WS_STP.java
+++ /dev/null
@@ -1,200 +0,0 @@
-package ch.puzzle.itc.mobiliar.stp.ws;
-
-import ch.puzzle.itc.mobiliar.stp.ws.exceptions.WSSTPException;
-import ch.puzzle.itc.mobiliar.stp.ws.urlprovider.BasicAuthUrlProvider;
-import ch.puzzle.itc.mobiliar.stp.ws.urlprovider.NoAuthUrlProvider;
-import ch.puzzle.itc.mobiliar.stp.ws.urlprovider.UrlConnectionProvider;
-
-import java.io.*;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.Arrays;
-import java.util.Date;
-
-/**
- * This shakedown test calls the ping method of a web service endpoint. It supports the following
- * authentication methods: - NONE (to access an unprotected web service) - CLIENT-CERT (to access a web
- * service protected through certificates)
- */
-public class WS_STP {
-
-	/**
-	 * @param args
-	 *             - the first argument defines which authentication method shall be used. The following
-	 *             parameters are authentication specific. for optional parameters, use "default"
-	 */
-	public static void main(String[] args) {
-	     WS_STP wsStp = null;
-	     try {
-			wsStp = new WS_STP(args);
-			wsStp.execute();
-		}
-		catch (WSSTPException e) {
-		     handleWSSTPException(wsStp, e);
-			System.exit(1);
-		}
-	}
-
-     static void handleWSSTPException(WS_STP wsStp, WSSTPException e){
-	    System.out.println(e.getMessage());
-	    e.printStackTrace();
-	    if(wsStp!=null) {
-		   System.out.println("Webservice requested with the following parameters: " + wsStp
-				   .constructDebugMessage());
-	    }
-	}
-
-     String constructDebugMessage(){
-	    StringBuilder sb = new StringBuilder();
-	    if(url!=null) {
-		   sb.append("Requested URL: ").append(url).append(", ");
-	    }
-	    sb.append("Ping-Namespace: ").append(pingNamespace).append(", ");
-	    sb.append("Timeout: ").append(timeout).append(", ");
-	    if(provider!=null){
-		   sb.append("Authentification parameters: ").append(provider.getDebugInformation());
-	    }
-	    return sb.toString();
-	}
-
-	final URL url;
-	final UrlConnectionProvider provider;
-	final int timeout;
-	final String pingNamespace;
-
-	WS_STP(String... args) {
-		if (args.length < 4) {
-			throw new WSSTPException(
-					"Missing parameters! You have to give at least the follwing parameters: ENDPOINTURL, AUTHENTICATION, TIMEOUT, PINGNAMESPACE!");
-		}
-		else {
-			url = parseUrl(args[0]);
-			String[] remainingArguments = args.length == 4 ? new String[0] : Arrays.copyOfRange(args, 4,
-					args.length);
-			provider = getUrlConnectionProvider(args[1], remainingArguments);
-			timeout = parseTimeout(args[2]);
-			pingNamespace = args[3];
-		}
-	}
-
-	void execute() {
-		try {
-			long start = new Date().getTime();
-			String s = requestWebservice(createWSDLMessage());
-			long end = new Date().getTime();
-		    	System.out.println(constructDebugMessage());
-			if (validateWebService(s)) {
-				System.out.println("Duration: " + (end - start) + "ms");
-			}
-			else {
-				throw new WSSTPException("Ping request failed with the response " + s);
-			}
-		}
-		catch (IOException e) {
-			throw new WSSTPException("Webservice not reachable", e);
-		}
-	}
-
-	UrlConnectionProvider getUrlConnectionProviderWithoutAuthentication(String... remainingArguments) {
-		return new NoAuthUrlProvider();
-	}
-	
-	/**
-	 * @param remainingArguments - requires the following additional arguments: USERNAME, PASSWORD
-	 * @return
-	 */
-	UrlConnectionProvider getUrlConnectionProviderWithBasicAuthentication(String... remainingArguments) {
-		if(remainingArguments.length<2){
-			throw new WSSTPException("Missing arguments! For basic authentication, the following additional parameters are required: USERNAME, PASSWORD");
-		}
-		return new BasicAuthUrlProvider(remainingArguments[0], remainingArguments[1]);
-	}
-
-	UrlConnectionProvider getUrlConnectionProvider(String authenticationMethod, String... remainingArguments) {
-		UrlConnectionProvider provider;
-		switch (authenticationMethod) {
-		case "NONE":
-			provider = getUrlConnectionProviderWithoutAuthentication(remainingArguments);
-			break;
-		case "BASIC":
-			provider = getUrlConnectionProviderWithBasicAuthentication(remainingArguments);
-			break;
-		default:
-			throw new WSSTPException(
-					"Wrong parameter! The second parameter should define which authentication method should be used.");
-		}
-		return provider;
-	}
-
-	URL parseUrl(String url) {
-		try {
-			return new URL(url);
-		}
-		catch (MalformedURLException e) {
-			throw new WSSTPException("The first parameter should be a valid URL!", e);
-		}
-	}
-
-	int parseTimeout(String timeout) {
-		try {
-			return Integer.parseInt(timeout);
-		}
-		catch (NumberFormatException e) {
-			throw new WSSTPException(
-					"Wrong parameter! The third parameter should be a numeric value for the timeout in ms");
-		}
-	}
-
-	String requestWebservice(String request) throws IOException {
-
-		StringBuilder sb = new StringBuilder();
-		URLConnection con = provider.openURLConnection(url);
-		con.setConnectTimeout(timeout);
-		con.setDoOutput(true);
-		con.setDoInput(true);
-		try (BufferedWriter out = new BufferedWriter(new OutputStreamWriter(con.getOutputStream()))) {
-			out.append(request);			
-		}
-		try(BufferedReader in = new BufferedReader(new InputStreamReader(con.getInputStream()))){		
-			String inputLine;
-			while ((inputLine = in.readLine()) != null) {
-				sb.append(inputLine);
-			}		
-		}		
-		return sb.toString();
-	}
-
-	boolean validateWebService(String response) throws IOException {
-		String respMatcher = readExpectedResponse();
-		return response.matches(respMatcher);
-	}
-
-	String createWSDLMessage() throws IOException {
-		return String.format(readFile("pingRequest.txt"), pingNamespace);
-	}
-
-	String readExpectedResponse() throws IOException {
-		return readFile("pingResponse.txt");
-	}
-
-	String readFile(String file) throws IOException {
-		StringBuilder sb = new StringBuilder();
-		BufferedReader r = null;
-		try {
-			r = new BufferedReader(new InputStreamReader(ClassLoader.getSystemResourceAsStream(file)));
-			String read = r.readLine();
-			while (read != null) {
-				sb.append(read);
-				read = r.readLine();
-			}
-		}
-		finally {
-			if (r != null) {
-				r.close();
-			}
-		}
-		return sb.toString();
-	}
-
-}
diff --git a/AMW_shakedown/AMW_stp_ws/src/main/java/ch/puzzle/itc/mobiliar/stp/ws/exceptions/WSSTPException.java b/AMW_shakedown/AMW_stp_ws/src/main/java/ch/puzzle/itc/mobiliar/stp/ws/exceptions/WSSTPException.java
deleted file mode 100644
index 7fd94a749..000000000
--- a/AMW_shakedown/AMW_stp_ws/src/main/java/ch/puzzle/itc/mobiliar/stp/ws/exceptions/WSSTPException.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package ch.puzzle.itc.mobiliar.stp.ws.exceptions;
-
-public class WSSTPException extends RuntimeException {
-
-	public WSSTPException(String message, Throwable cause) {
-		super(message, cause);
-	}
-
-	public WSSTPException(String message) {
-		super(message);
-	}
-
-
-}
diff --git a/AMW_shakedown/AMW_stp_ws/src/main/java/ch/puzzle/itc/mobiliar/stp/ws/urlprovider/BasicAuthUrlProvider.java b/AMW_shakedown/AMW_stp_ws/src/main/java/ch/puzzle/itc/mobiliar/stp/ws/urlprovider/BasicAuthUrlProvider.java
deleted file mode 100644
index 60b4d6b4d..000000000
--- a/AMW_shakedown/AMW_stp_ws/src/main/java/ch/puzzle/itc/mobiliar/stp/ws/urlprovider/BasicAuthUrlProvider.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package ch.puzzle.itc.mobiliar.stp.ws.urlprovider;
-
-import org.apache.commons.codec.binary.Base64;
-
-import java.io.IOException;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.net.URLConnection;
-import java.nio.charset.StandardCharsets;
-
-public class BasicAuthUrlProvider implements UrlConnectionProvider {
-
-	private final String userName;
-	private final String password;	
-	
-	public BasicAuthUrlProvider(String userName, String password) {
-		super();
-		this.userName = userName;
-		this.password = password;
-	}
-
-	@Override
-	public URLConnection openURLConnection(URL targetUrl) throws IOException {
-		HttpURLConnection con = (HttpURLConnection) targetUrl.openConnection();
-		String basicAuth = userName + ":" + password;
-		basicAuth = "Basic " + Base64.encodeBase64String(basicAuth.getBytes(StandardCharsets.UTF_8));
-		con.setRequestProperty("Authorization", basicAuth);
-		return con;
-	}
-
-    @Override
-    public String getDebugInformation() {
-	   return "Username: "+userName;
-    }
-
-}
diff --git a/AMW_shakedown/AMW_stp_ws/src/main/java/ch/puzzle/itc/mobiliar/stp/ws/urlprovider/NoAuthUrlProvider.java b/AMW_shakedown/AMW_stp_ws/src/main/java/ch/puzzle/itc/mobiliar/stp/ws/urlprovider/NoAuthUrlProvider.java
deleted file mode 100644
index dd7e72595..000000000
--- a/AMW_shakedown/AMW_stp_ws/src/main/java/ch/puzzle/itc/mobiliar/stp/ws/urlprovider/NoAuthUrlProvider.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package ch.puzzle.itc.mobiliar.stp.ws.urlprovider;
-
-import java.io.IOException;
-import java.net.URL;
-import java.net.URLConnection;
-
-public class NoAuthUrlProvider implements UrlConnectionProvider {
-
-	@Override
-	public URLConnection openURLConnection(URL targetUrl) throws IOException {
-		return targetUrl.openConnection();
-	}
-
-    @Override public String getDebugInformation() {
-	   return "no authorization";
-    }
-
-}
diff --git a/AMW_shakedown/AMW_stp_ws/src/main/java/ch/puzzle/itc/mobiliar/stp/ws/urlprovider/UrlConnectionProvider.java b/AMW_shakedown/AMW_stp_ws/src/main/java/ch/puzzle/itc/mobiliar/stp/ws/urlprovider/UrlConnectionProvider.java
deleted file mode 100644
index eb342cd8b..000000000
--- a/AMW_shakedown/AMW_stp_ws/src/main/java/ch/puzzle/itc/mobiliar/stp/ws/urlprovider/UrlConnectionProvider.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package ch.puzzle.itc.mobiliar.stp.ws.urlprovider;
-
-import java.io.IOException;
-import java.net.URL;
-import java.net.URLConnection;
-
-public interface UrlConnectionProvider {
-
-	/**
-	 * Opens a URL connection for the given targetUrl. 
-	 *  
-	 * @param targetUrl
-	 * @return
-	 * @throws IOException
-	 */
-	URLConnection openURLConnection(URL targetUrl) throws IOException;
-
-    /**
-	*
-	* @return additional (connection provider dependent) debug information which is provided to the AMW instance
-	*/
-     String getDebugInformation();
-}
diff --git a/AMW_shakedown/AMW_stp_ws/src/main/resources/pingRequest.txt b/AMW_shakedown/AMW_stp_ws/src/main/resources/pingRequest.txt
deleted file mode 100644
index 63484339f..000000000
--- a/AMW_shakedown/AMW_stp_ws/src/main/resources/pingRequest.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:web="%s">
-   <soapenv:Header/>
-   <soapenv:Body>
-      <web:ping/>
-   </soapenv:Body>
-</soapenv:Envelope>
\ No newline at end of file
diff --git a/AMW_shakedown/AMW_stp_ws/src/main/resources/pingResponse.txt b/AMW_shakedown/AMW_stp_ws/src/main/resources/pingResponse.txt
deleted file mode 100644
index 9c719ae72..000000000
--- a/AMW_shakedown/AMW_stp_ws/src/main/resources/pingResponse.txt
+++ /dev/null
@@ -1 +0,0 @@
-.*Body.*pingResponse.*Body.*
\ No newline at end of file
diff --git a/AMW_shakedown/AMW_stp_ws/src/test/java/ch/puzzle/itc/mobiliar/stp/ws/KeyStoreTest.java b/AMW_shakedown/AMW_stp_ws/src/test/java/ch/puzzle/itc/mobiliar/stp/ws/KeyStoreTest.java
deleted file mode 100644
index c15d48e92..000000000
--- a/AMW_shakedown/AMW_stp_ws/src/test/java/ch/puzzle/itc/mobiliar/stp/ws/KeyStoreTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package ch.puzzle.itc.mobiliar.stp.ws;
-
-import java.io.BufferedReader;
-import java.io.FileInputStream;
-import java.io.InputStreamReader;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.security.KeyStore;
-
-import javax.net.ssl.HttpsURLConnection;
-import javax.net.ssl.KeyManagerFactory;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.TrustManagerFactory;
-
-import org.junit.Ignore;
-import org.junit.Test;
-
-public class KeyStoreTest {
-
-	@Test
-	@Ignore("Dependency on the environment. Thought to be executed manually")
-	public void testLoadKeyStore() throws Exception {	
-		FileInputStream trustfis = new FileInputStream("./src/test/resources/cacerts.jks");
-		KeyStore trustStore = KeyStore.getInstance(KeyStore.getDefaultType());
-		trustStore.load(trustfis, "changeit".toCharArray());
-		trustfis.close();
-		TrustManagerFactory tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
-		tmf.init(trustStore);
-		KeyStore ks = KeyStore.getInstance("PKCS12");
-		FileInputStream fis = new FileInputStream("./src/test/resources/client.p12");
-		ks.load(fis, "helloWorld".toCharArray());
-		KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509");
-		kmf.init(ks, "helloWorld".toCharArray());
-		SSLContext sc = SSLContext.getInstance("TLS");
-		sc.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null);		
-		URL url = new URL("https://romai.rz.puzzle.ch:8443/AMW_maia?wsdl");
-		HttpURLConnection con = (HttpURLConnection) url.openConnection();
-		if (con instanceof HttpsURLConnection) {
-			((HttpsURLConnection) con).setSSLSocketFactory(sc.getSocketFactory());
-				BufferedReader in = null;
-			StringBuilder sb = new StringBuilder();
-			try {				
-				con.setDoInput(true);				
-				String inputLine;
-				in = new BufferedReader(new InputStreamReader(con.getInputStream()));
-				while ((inputLine = in.readLine()) != null) {
-					sb.append(inputLine);
-				}
-			} finally {
-				if (in != null) {
-					in.close();
-				}
-			}
-			System.out.println(sb.toString());		
-		}
-	}
-
-}
diff --git a/AMW_shakedown/AMW_stp_ws/src/test/java/ch/puzzle/itc/mobiliar/stp/ws/WSBasicAuthTest.java b/AMW_shakedown/AMW_stp_ws/src/test/java/ch/puzzle/itc/mobiliar/stp/ws/WSBasicAuthTest.java
deleted file mode 100644
index 8f9ec88ae..000000000
--- a/AMW_shakedown/AMW_stp_ws/src/test/java/ch/puzzle/itc/mobiliar/stp/ws/WSBasicAuthTest.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package ch.puzzle.itc.mobiliar.stp.ws;
-
-import java.io.IOException;
-import java.util.Arrays;
-
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import ch.puzzle.itc.mobiliar.stp.ws.exceptions.WSSTPException;
-
-@Ignore("Dependency on the environment. Thought to be executed manually")
-public class WSBasicAuthTest {
-
-	WS_STP stp;
-
-	String[] validParameters = new String[] { "http://romai.rz.puzzle.ch:8080/AMW_wsauth_test/TestService", "BASIC", "2000", "http://webservice.mobiliar.itc.puzzle.ch/", "mobi", "mobi"};
-
-	@Test
-	public void testRomaiWithBasicAuth() {
-		WS_STP stp = new WS_STP(validParameters);
-		stp.execute();
-	}
-	
-	@Test(expected = IOException.class)
-	public void testRequestWebserviceNOK() throws IOException {
-		WS_STP stp = new WS_STP(validParameters);
-		stp.requestWebservice("invalidRequest");
-	}
-
-	@Test
-	public void testRequestWebservice() throws IOException {
-		WS_STP stp = new WS_STP(validParameters);
-		String response = stp.requestWebservice(stp.createWSDLMessage());
-		Assert.assertNotNull(response);
-		Assert.assertTrue(stp.validateWebService(response));
-	}
-
-	@Ignore
-	@Test(expected=WSSTPException.class)
-	public void testWithLowTimeout() {
-		String[] lowTimeout = Arrays.copyOf(validParameters, validParameters.length);
-		// We can't take 0 (because this means infinite timeout) but probability that the server responds
-		// within one millisecond is rather low.
-		lowTimeout[2] = "1";
-		WS_STP stp = new WS_STP(lowTimeout);
-		stp.execute();
-	}
-	
-	@Test(expected=WSSTPException.class)
-	public void testRomaiWithWrongUrl() {
-		String[] wrongUrl = Arrays.copyOf(validParameters, validParameters.length);
-		wrongUrl[0] = "http://somewhereelse/";
-		WS_STP stp = new WS_STP(wrongUrl);
-		stp.execute();
-	}
-	
-	
-	@Test(expected=WSSTPException.class)
-	public void testRomaiWithInvalidCertPassword() {
-		String[] wrongUrl = Arrays.copyOf(validParameters, validParameters.length);
-		wrongUrl[5] = "invalidPassword";
-		WS_STP stp = new WS_STP(wrongUrl);
-		stp.execute();
-	}
-
-}
diff --git a/AMW_shakedown/AMW_stp_ws/src/test/java/ch/puzzle/itc/mobiliar/stp/ws/WSTest.java b/AMW_shakedown/AMW_stp_ws/src/test/java/ch/puzzle/itc/mobiliar/stp/ws/WSTest.java
deleted file mode 100644
index 67a8c680b..000000000
--- a/AMW_shakedown/AMW_stp_ws/src/test/java/ch/puzzle/itc/mobiliar/stp/ws/WSTest.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package ch.puzzle.itc.mobiliar.stp.ws;
-
-import ch.puzzle.itc.mobiliar.stp.ws.exceptions.WSSTPException;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.mockito.Mockito;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.PrintStream;
-
-public class WSTest {
-
-	WS_STP stp;
-	String[] validParams = new String[]{"http://romai.rz.puzzle.ch:8080/AMW_maia/AmwDataSinkServiceImpl", "NONE", "2000", "http://xml.mobi.ch/service/amw/AmwDataSinkService/datatype/v1"};
-
-
-	@Before
-	public void setup(){
-		stp = new WS_STP(validParams);
-	}
-
-
-	@Test(expected=WSSTPException.class)
-	public void testWSStpMissingArguments(){
-		stp = new WS_STP();
-	}
-
-
-	@Test
-	public void testCreateWSDLRequestFromFile() throws IOException {
-		String wsdl = stp.createWSDLMessage();
-		Assert.assertNotNull(wsdl);
-		Assert.assertTrue(wsdl.startsWith("<"));
-	}
-
-	@Test
-	public void testReadExpectedResponseFromFile() throws IOException {
-		String response = stp.readExpectedResponse();
-		Assert.assertNotNull(response);
-	}
-
-	@Ignore("Dependency on the environment. Thought to be executed manually")
-	@Test
-	public void testSendPingRequest() throws IOException {
-		String response = stp.requestWebservice(stp.createWSDLMessage());
-		Assert.assertNotNull(response);
-	}
-
-	@Test(expected=WSSTPException.class)
-	public void testSendPingRequestNOK() throws IOException {
-		stp = new WS_STP("http://nonexistingwebservice", "NONE", "2000");
-	}
-
-
-	@Test
-	public void testValidateResponse() throws IOException {
-		String response = "<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\"><soap:Body><ns3:pingResponse xmlns:ns4=\"http://xml.mobi.ch/datatype/common/Commons/v3\" xmlns:ns3=\"http://xml.mobi.ch/service/amw/AmwDataSinkService/datatype/v1\" xmlns:ns2=\"http://xml.mobi.ch/datatype/amw/AmwDataSink/v1\"/></soap:Body></soap:Envelope>";
-		Assert.assertTrue(stp.validateWebService(response));
-	}
-
-
-	@Test
-	public void testValidateResponseNOK() throws IOException {
-		String wrongResponse = "sdfjdklsjflksjlfkjsdlj";
-		Assert.assertFalse(stp.validateWebService(wrongResponse));
-	}
-
-    @Test
-    public void testConstructDebugMessage() throws Exception {
-	  	stp = new WS_STP(validParams);
-	   	String s = stp.constructDebugMessage();
-    		Assert.assertTrue("The debug message should contain the endpoint of the webservice but it does not.", s.contains("http://romai.rz.puzzle.ch:8080/AMW_maia/AmwDataSinkServiceImpl"));
-    }
-
-    @Test
-    public void testConstructDebugMessageInExecute() throws Exception {
-	   PrintStream originalStream = System.out;
-	   try {
-		  ByteArrayOutputStream outContent = new ByteArrayOutputStream();
-		  PrintStream instrumentalizedStream = new PrintStream(outContent);
-		  System.setOut(instrumentalizedStream);
-		  WS_STP stp = Mockito.spy(new WS_STP(validParams));
-		  Mockito.doReturn("foo").when(stp).requestWebservice(Mockito.anyString());
-		  Mockito.doReturn(true).when(stp).validateWebService(Mockito.anyString());
-		  stp.execute();
-		  String sysout = outContent.toString();
-		  Assert.assertTrue("The debug message should contain the endpoint of the webservice but it does not.", sysout.contains(validParams[0]));
-	   }
-	   finally {
-		  //Restore the original output stream
-		  System.setOut(originalStream);
-	   }
-    }
-
-    @Test
-    public void testHandleWSSTPException() throws Exception {
-	   PrintStream originalStream = System.out;
-	   try {
-		  ByteArrayOutputStream outContent = new ByteArrayOutputStream();
-		  PrintStream instrumentalizedStream = new PrintStream(outContent);
-		  System.setOut(instrumentalizedStream);
-
-		  WSSTPException exception = new WSSTPException("Someerror");
-		  WS_STP stp = new WS_STP(validParams);
-		  WS_STP.handleWSSTPException(stp, exception);
-
-		  String sysout = outContent.toString();
-		  Assert.assertTrue("The debug message should contain the error of the exception but it does not.", sysout.contains("Someerror"));
-
-		  Assert.assertTrue("The debug message should contain the endpoint of the webservice but it does not.", sysout.contains(validParams[0]));
-	   }
-	   finally {
-		  //Restore the original output stream
-		  System.setOut(originalStream);
-	   }
-    }
-}
diff --git a/AMW_shakedown/AMW_stp_ws/src/test/resources/cacerts.jks b/AMW_shakedown/AMW_stp_ws/src/test/resources/cacerts.jks
deleted file mode 100644
index a008e9d0a..000000000
Binary files a/AMW_shakedown/AMW_stp_ws/src/test/resources/cacerts.jks and /dev/null differ
diff --git a/AMW_shakedown/AMW_stp_ws/src/test/resources/client.p12 b/AMW_shakedown/AMW_stp_ws/src/test/resources/client.p12
deleted file mode 100644
index de14a1816..000000000
Binary files a/AMW_shakedown/AMW_stp_ws/src/test/resources/client.p12 and /dev/null differ
diff --git a/AMW_shakedown/README b/AMW_shakedown/README
deleted file mode 100644
index 358fcb915..000000000
--- a/AMW_shakedown/README
+++ /dev/null
@@ -1,19 +0,0 @@
-AMW
--------------------------
-Version Updates are done with the maven release plugin. If you experience any issues, please see the instructions in https://twiki.puzzle.ch/bin/view/Puzzle/MavenArtifactory
-
-mvn release:prepare
-
-- choose the version number of the new release as well as the following version number when asked. Please make sure, that the following version number is postfixed with "SNAPSHOT". 
-IMPORTANT: Since this project lives in the same repository as the AMW main application, please make sure, that you indicate "shakedown" in your tag names. This makes it easier to separate and thee release plugin will fail if you use the same tag twice...
-
-mvn release:perform
-
-- this checks out the new version, builds it and copies the deployables to the artifactory
-
-
-You also can rollback your release-step with
-
-mvn release:rollback
-
-
diff --git a/AMW_shakedown/pom.xml b/AMW_shakedown/pom.xml
deleted file mode 100644
index 2951e91d0..000000000
--- a/AMW_shakedown/pom.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-<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/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>ch.puzzle.itc.mobiliar</groupId>
-    <artifactId>AMW_shakedown</artifactId>
-    <name>AMW_shakedown</name>
-    <version>1.0.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <build.timestamp>${maven.build.timestamp}</build.timestamp>
-        <maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
-        <!-- **************** -->
-        <!-- Plugins versions -->
-        <!-- **************** -->
-        <version.compiler.plugin>3.8.0</version.compiler.plugin>
-        <version.jar.plugin>3.1.1</version.jar.plugin>
-        <version.war.plugin>3.2.0</version.war.plugin>
-        <version.release.maven.plugin>2.5.3</version.release.maven.plugin>
-        <version.deploy.maven.plugin>3.0.0-M1</version.deploy.maven.plugin>
-        <version.source.maven.plugin>3.0.1</version.source.maven.plugin>
-        <version.javadoc.maven.plugin>3.0.1</version.javadoc.maven.plugin>
-    </properties>
-    <modules>
-        <module>AMW_stm</module>
-        <module>AMW_stp_ws</module>
-        <module>AMW_stp_dnyws</module>
-        <module>AMW_stp_dummy</module>
-        <module>AMW_stp_serveralive</module>
-        <module>AMW_stp_tcpping</module>
-        <module>AMW_stp_jdbc</module>
-        <module>AMW_stp_check_connection</module>
-    </modules>
-
-    <repositories>
-        <repository>
-            <id>central</id>
-            <name>Maven Central Repository</name>
-            <url>https://repo1.maven.org/maven2/</url>
-            <layout>default</layout>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>jboss-public-repository</id>
-            <name>JBoss Repository</name>
-            <url>http://repository.jboss.org/nexus/content/groups/public</url>
-            <!-- These optional flags are designed to speed up your builds by reducing
-                remote server calls -->
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
-
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <version>${version.compiler.plugin}</version>
-                    <configuration>
-                        <source>1.8</source>
-                        <target>1.8</target>
-                        <encoding>UTF-8</encoding>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-jar-plugin</artifactId>
-                    <version>${version.jar.plugin}</version>
-                    <configuration>
-                        <archive>
-                            <index>true</index>
-                            <manifest>
-                                <addDefaultSpecificationEntries>
-                                    true
-                                </addDefaultSpecificationEntries>
-                                <addDefaultImplementationEntries>
-                                    true
-                                </addDefaultImplementationEntries>
-                            </manifest>
-                            <manifestEntries>
-                                <Java-Version>${java.version}</Java-Version>
-                                <Java-Vendor>${java.vendor}</Java-Vendor>
-                                <Os-Name>${os.name}</Os-Name>
-                                <Os-Arch>${os.arch}</Os-Arch>
-                                <Os-Version>${os.version}</Os-Version>
-                                <Build-Timestamp>${build.timestamp}</Build-Timestamp>
-                            </manifestEntries>
-                        </archive>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-release-plugin</artifactId>
-                    <version>${version.maven.release.plugin}</version>
-                    <configuration>
-                        <preparationGoals>clean install</preparationGoals>
-                        <autoVersionSubmodules>true</autoVersionSubmodules>
-                    </configuration>
-                </plugin>
-                <!-- the following plugins are used by maven-release-plugin -->
-                <plugin>
-                    <artifactId>maven-deploy-plugin</artifactId>
-                    <version>${version.deploy.maven.plugin}</version>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-source-plugin</artifactId>
-                    <version>${version.source.maven.plugin}</version>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>${version.javadoc.maven.plugin}</version>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-
-    <scm>
-        <developerConnection>scm:git:https://git-amw.puzzle.ch/mobi_amw/amw_projects.git</developerConnection>
-        <tag>HEAD</tag>
-    </scm>
-
-    <dependencyManagement>
-        <dependencies>
-            <!-- Test dependencies -->
-            <dependency>
-                <groupId>junit</groupId>
-                <artifactId>junit</artifactId>
-                <version>4.13.1</version>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.mockito</groupId>
-                <artifactId>mockito-core</artifactId>
-                <version>3.4.6</version>
-                <scope>test</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-</project>
diff --git a/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/applist/ApplistFilter.java b/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/applist/ApplistFilter.java
deleted file mode 100644
index b567a8871..000000000
--- a/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/applist/ApplistFilter.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * AMW - Automated Middleware allows you to manage the configurations of
- * your Java EE applications on an unlimited number of different environments
- * with various versions, including the automated deployment of those apps.
- * Copyright (C) 2013-2016 by Puzzle ITC
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package ch.puzzle.itc.mobiliar.presentation.applist;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import javax.enterprise.context.SessionScoped;
-import javax.inject.Named;
-import java.io.Serializable;
-
-/**
- * Holds the filter criteria for the applist screen in the session
- */
-@Named
-@SessionScoped
-public class ApplistFilter implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @Getter
-    @Setter
-    private String filter = " ";
-
-    @Getter
-    @Setter
-    private Integer releaseId = null;
-
-    @Getter
-    @Setter
-    private Integer maxResults = 20;
-
-}
diff --git a/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/applist/ApplistView.java b/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/applist/ApplistView.java
deleted file mode 100644
index e72f50276..000000000
--- a/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/applist/ApplistView.java
+++ /dev/null
@@ -1,313 +0,0 @@
-/*
- * AMW - Automated Middleware allows you to manage the configurations of
- * your Java EE applications on an unlimited number of different environments
- * with various versions, including the automated deployment of those apps.
- * Copyright (C) 2013-2016 by Puzzle ITC
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package ch.puzzle.itc.mobiliar.presentation.applist;
-
-import java.io.Serializable;
-import java.util.List;
-
-import javax.annotation.PostConstruct;
-import javax.ejb.EJBException;
-import javax.inject.Inject;
-
-import ch.puzzle.itc.mobiliar.business.foreignable.entity.ForeignableAttributesDTO;
-import ch.puzzle.itc.mobiliar.business.resourcegroup.boundary.ResourceBoundary;
-import ch.puzzle.itc.mobiliar.business.security.boundary.PermissionBoundary;
-import ch.puzzle.itc.mobiliar.business.security.entity.Action;
-import lombok.Getter;
-import lombok.Setter;
-
-import org.apache.commons.lang3.StringUtils;
-
-import ch.puzzle.itc.mobiliar.business.foreignable.boundary.ForeignableBoundary;
-import ch.puzzle.itc.mobiliar.business.foreignable.entity.ForeignableOwner;
-import ch.puzzle.itc.mobiliar.business.foreignable.entity.ForeignableOwnerViolationException;
-import ch.puzzle.itc.mobiliar.business.generator.control.extracted.ResourceDependencyResolverService;
-import ch.puzzle.itc.mobiliar.business.releasing.entity.ReleaseEntity;
-import ch.puzzle.itc.mobiliar.business.resourcegroup.boundary.ResourceRelations;
-import ch.puzzle.itc.mobiliar.business.resourcegroup.control.ResourceTypeProvider;
-import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.ResourceEntity;
-import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.ResourceWithRelations;
-import ch.puzzle.itc.mobiliar.business.security.entity.Permission;
-import ch.puzzle.itc.mobiliar.common.exception.NotAuthorizedException;
-import ch.puzzle.itc.mobiliar.common.exception.ResourceNotFoundException;
-import ch.puzzle.itc.mobiliar.common.util.DefaultResourceTypeDefinition;
-import ch.puzzle.itc.mobiliar.presentation.ViewBackingBean;
-import ch.puzzle.itc.mobiliar.presentation.common.ApplicationCreatorDataProvider;
-import ch.puzzle.itc.mobiliar.presentation.common.ReleaseSelectionDataProvider;
-import ch.puzzle.itc.mobiliar.presentation.common.ReleaseSelector;
-import ch.puzzle.itc.mobiliar.presentation.resourcesedit.CreateResourceController;
-import ch.puzzle.itc.mobiliar.presentation.util.GlobalMessageAppender;
-import ch.puzzle.itc.mobiliar.presentation.util.NavigationUtils;
-
-@ViewBackingBean
-public class ApplistView implements Serializable, ApplicationCreatorDataProvider {
-
-	private static final long serialVersionUID = 8800041104451876453L;
-
-	@Inject @Getter
-	private ReleaseSelectionDataProvider releaseDataProvider;
-	@Inject
-	CreateResourceController createResourceController;
-	@Inject
-	ResourceTypeProvider resourceTypeProvider;
-	@Inject
-	ResourceDependencyResolverService resourceDependencyResolver;
-	@Inject
-	ResourceRelations resourceRelations;
-	@Inject
-	ApplistFilter applistFilter;
-	@Inject
-	ResourceBoundary resourceBoundary;
-
-	@Getter @Setter
-	private String filter;
-	@Getter @Setter
-	private Integer selection;
-	@Getter @Setter
-	private Integer selectionApp;
-	@Getter @Setter
-	private String appServerName;
-	@Getter @Setter
-	private List<ResourceWithRelations> appServerList;
-	@Getter @Setter
-	private boolean relation;
-	@Setter
-	private Integer maxResults;
-	@Getter
-	private ReleaseSelector asReleaseSelector;
-	@Getter
-	private ReleaseSelector filterReleaseSelector;
-
-    @Inject
-    private PermissionBoundary permissionBoundary;
-
-    @Inject
-    private ForeignableBoundary foreignableBoundary;
-
-	@PostConstruct
-	public void init() {
-		if (filterReleaseSelector == null) {
-			filterReleaseSelector = new ReleaseSelector(null, releaseDataProvider.getReleaseMap());
-		}
-		if (asReleaseSelector == null) {
-			asReleaseSelector = new ReleaseSelector(releaseDataProvider.getUpcomingReleaseId(),
-					releaseDataProvider.getReleaseMap());
-		}
-		releaseDataProvider.reset();
-
-		if (StringUtils.isEmpty(filter)) {
-			this.filter = applistFilter.getFilter();
-		}
-		if (maxResults == null) {
-			this.maxResults = applistFilter.getMaxResults();
-		}
-		if (filterReleaseSelector.getSelectedReleaseId() == null) {
-			if (applistFilter.getReleaseId() != null) {
-				this.filterReleaseSelector.setSelectedReleaseId(applistFilter.getReleaseId());
-			}
-			else {
-				this.filterReleaseSelector.setSelectedReleaseId(releaseDataProvider
-						.getUpcomingReleaseId());
-			}
-		}
-		loadAppServerList();
-	}
-
-
-
-	/**
-	 * Applikation entfernen
-	 */
-	public void removeApp() {
-		if (removeApp(selectionApp)) {
-			clearPopupFields();
-			loadAppServerList();
-		}
-	}
-
-	/**
-	 * Entfernen einer Applikationsgruppe.
-	 */
-	public void removeAppServer() {
-		if (removeAppServer(selection)) {
-			clearPopupFields();
-			loadAppServerList();
-		}
-	}
-
-	public void createAppServer() {
-		if (createResourceController.createResource(appServerName, resourceTypeProvider
-						.getOrCreateDefaultResourceType(DefaultResourceTypeDefinition.APPLICATIONSERVER),
-				asReleaseSelector.getSelectedRelease())) {
-			clearPopupFields();
-			loadAppServerList();
-		}
-		clearPopupFields();
-	}
-
-	public void loadAppServerList() {
-		appServerList = loadAppServers(filter, getMaxResults() == 0 ? null : getMaxResults(),
-				filterReleaseSelector.getSelectedRelease());
-	}
-
-	public String doFilter() {
-		StringBuilder query = new StringBuilder();
-
-		query.append("release=").append(filterReleaseSelector.getSelectedReleaseId());
-		applistFilter.setReleaseId(filterReleaseSelector.getSelectedReleaseId());
-
-		query.append("&maxResults=");
-		if (maxResults != null) {
-			query.append(maxResults);
-			applistFilter.setMaxResults(maxResults);
-		}
-		else {
-			query.append('0');
-			applistFilter.setMaxResults(0);
-		}
-
-		query.append("&filter=");
-		if (filter != null && !filter.trim().isEmpty()) {
-			query.append(filter.trim());
-			applistFilter.setFilter(filter.trim());
-		}
-		else {
-			query.append(' ');
-			applistFilter.setFilter(" ");
-		}
-		return NavigationUtils.getRefreshOutcomeWithAdditionalParam(query.toString());
-	}
-	public void setRelease(Integer releaseId) {
-		this.filterReleaseSelector.setSelectedReleaseId(releaseId);
-	}
-
-	private void clearPopupFields() {
-		appServerName = null;
-	}
-
-	public Integer getMaxResults() {
-		return maxResults == null ? 0 : maxResults;
-	}
-
-	@Override
-	public void afterAddingAppOrAs() {
-		loadAppServerList();
-		clearPopupFields();
-	}
-
-	/**
-	 * Applikation entfernen
-	 */
-	private boolean removeApp(Integer applicationId) {
-		boolean isSuccessful = false;
-		try {
-			if (applicationId == null) {
-				String errorMessage = "No application selected.";
-				GlobalMessageAppender.addErrorMessage(errorMessage);
-			} else {
-				try{
-					resourceBoundary.removeResource(ForeignableOwner.getSystemOwner(), applicationId);
-					String message = "Application successfully deleted";
-					GlobalMessageAppender.addSuccessMessage(message);
-					isSuccessful = true;
-				} catch(EJBException e) {
-					if (e.getCause() instanceof NotAuthorizedException) {
-						GlobalMessageAppender.addErrorMessage(e.getCause().getMessage());
-					} else {
-						throw e;
-					}
-				}
-			}
-		} catch (ResourceNotFoundException e) {
-			String errorMessage = "Could not load selected application for deletation.";
-			GlobalMessageAppender.addErrorMessage(errorMessage);
-		} catch (ForeignableOwnerViolationException e){
-            GlobalMessageAppender.addErrorMessage("Application with id "+applicationId+" can not be deleted by owner "+e.getViolatingOwner());
-        } catch (Exception e) {
-			String errorMessage = "Could not delete selected application.";
-			GlobalMessageAppender.addErrorMessage(errorMessage);
-		}
-		return isSuccessful;
-	}
-
-	/**
-	 * Entfernen einer Applikationsgruppe.
-	 */
-	private boolean removeAppServer(Integer selectedAppServerId) {
-
-		boolean isSuccessful = false;
-		try {
-			if (selectedAppServerId == null) {
-				String errorMessage = "No application server selected.";
-				GlobalMessageAppender.addErrorMessage(errorMessage);
-			} else {
-				try{
-					resourceBoundary.deleteApplicationServerById(selectedAppServerId);
-					String message = "Applicationserver successfully deleted";
-					GlobalMessageAppender.addSuccessMessage(message);
-					isSuccessful = true;
-				} catch(EJBException e) {
-					if (e.getCause() instanceof NotAuthorizedException) {
-						GlobalMessageAppender.addErrorMessage(e.getCause().getMessage());
-					} else {
-						throw e;
-					}
-				}
-			}
-		} catch (ResourceNotFoundException e) {
-			String errorMessage = "Could not load selected server for deletion.";
-			GlobalMessageAppender.addErrorMessage(errorMessage);
-		} catch (Exception e) {
-			String errorMessage = "Could not delete selected application server.";
-			GlobalMessageAppender.addErrorMessage(errorMessage);
-		}
-		return isSuccessful;
-	}
-
-	private List<ResourceWithRelations> loadAppServers(String filter, Integer maxResults, ReleaseEntity release) {
-		if(maxResults!=null && maxResults==0) {
-			maxResults = null;
-		}
-		return resourceRelations.getAppServersWithApplications(filter, maxResults, release);
-	}
-
-	public boolean canCreateApplicationServerInstance(){
-		return permissionBoundary.canCreateResourceInstance(DefaultResourceTypeDefinition.APPLICATIONSERVER);
-	}
-
-	public boolean canCreateApplicationInstance(){
-		return permissionBoundary.canCreateResourceInstance(DefaultResourceTypeDefinition.APPLICATION);
-	}
-
-    public boolean canShowDeleteApp(ResourceEntity app){
-        return permissionBoundary.hasPermission(Permission.RESOURCE, null, Action.DELETE, app, null) && foreignableBoundary.isModifiableByOwner(ForeignableOwner.getSystemOwner(), app);
-    }
-
-    public boolean canShowDeleteAppServer(ResourceWithRelations appServer){
-        ResourceEntity appserverResource = appServer.getResource();
-        return appserverResource.isDeletable() && permissionBoundary.hasPermission(Permission.RESOURCE, null, Action.DELETE, appserverResource, null) && foreignableBoundary.isModifiableByOwner(ForeignableOwner.getSystemOwner(), appserverResource);
-    }
-
-    public ForeignableAttributesDTO getForeignableAttributes(ResourceEntity app){
-        return new ForeignableAttributesDTO(app.getOwner(), app.getExternalKey(), app.getExternalLink());
-    }
-
-}
diff --git a/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/applist/CreateApplicationForAsPopup.java b/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/applist/CreateApplicationForAsPopup.java
deleted file mode 100644
index 8b3280aa2..000000000
--- a/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/applist/CreateApplicationForAsPopup.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * AMW - Automated Middleware allows you to manage the configurations of
- * your Java EE applications on an unlimited number of different environments
- * with various versions, including the automated deployment of those apps.
- * Copyright (C) 2013-2016 by Puzzle ITC
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package ch.puzzle.itc.mobiliar.presentation.applist;
-
-import ch.puzzle.itc.mobiliar.business.releasing.entity.ReleaseEntity;
-import ch.puzzle.itc.mobiliar.business.resourcegroup.control.ResourceGroupPersistenceService;
-import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.ResourceGroup;
-import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.ResourceGroupEntity;
-import ch.puzzle.itc.mobiliar.common.util.ApplicationServerContainer;
-import ch.puzzle.itc.mobiliar.common.util.DefaultResourceTypeDefinition;
-import ch.puzzle.itc.mobiliar.presentation.CompositeBackingBean;
-import ch.puzzle.itc.mobiliar.presentation.common.ApplicationCreatorDataProvider;
-import ch.puzzle.itc.mobiliar.presentation.common.ReleaseSelectionDataProvider;
-import ch.puzzle.itc.mobiliar.presentation.common.ReleaseSelector;
-import ch.puzzle.itc.mobiliar.presentation.common.UnsuccessfulActionException;
-import ch.puzzle.itc.mobiliar.presentation.resourcesedit.CreateResourceController;
-import lombok.Getter;
-import lombok.Setter;
-
-import javax.inject.Inject;
-import java.io.Serializable;
-import java.util.*;
-
-@CompositeBackingBean
-public class CreateApplicationForAsPopup implements Serializable {
-	private static final long serialVersionUID = 1L;
-
-	@Inject
-	@Getter
-	private ReleaseSelectionDataProvider releaseDataProvider;
-
-	@Inject
-	CreateResourceController createResourceController;
-
-	@Inject
-	ResourceGroupPersistenceService resourceGroupService;
-
-	private List<ResourceGroup> asGroupsForSelectBox;
-	private Map<Integer, ResourceGroup> asGroupsForSelectBoxMap;
-	@Getter
-	private ReleaseSelector appReleaseSelector;
-
-	@Getter
-	@Setter
-	private String appName;
-	@Getter
-	private Integer appServerGroupId;
-
-	private Integer asReleaseId;
-	
-	public void setAsReleaseId(Integer releaseId){
-		this.asReleaseId=releaseId;
-	}
-	
-	public Integer getAsReleaseId(){
-		return this.asReleaseId;
-	}
-	
-	@Getter
-	boolean loadList = false;
-
-	public void init() {
-		// workaround while other dataproviders are still session scoped
-		appReleaseSelector = new ReleaseSelector(releaseDataProvider.getUpcomingReleaseId(), releaseDataProvider.getReleaseMap());
-		asGroupsForSelectBox = null;
-		appName = null;
-		appServerGroupId = null;
-		asReleaseId = null;
-		loadList = true;
-	}
-
-	public List<ResourceGroup> getAsGroupsForSelectBox() {
-		if (loadList) {
-			asGroupsForSelectBox = new ArrayList<ResourceGroup>(getApplicationServerGroupsForSelectBox());
-			asGroupsForSelectBoxMap = new HashMap<Integer, ResourceGroup>();
-			for (ResourceGroup g : asGroupsForSelectBox) {
-				asGroupsForSelectBoxMap.put(g.getId(), g);
-			}
-		}
-		return asGroupsForSelectBox;
-	}
-
-	public List<ReleaseEntity> getReleasesForAs() {
-		if (appServerGroupId != null && asGroupsForSelectBoxMap.containsKey(appServerGroupId)) {
-			return asGroupsForSelectBoxMap.get(appServerGroupId).getReleases();
-		}
-		asReleaseId = null;
-		return null;
-	}
-
-	public void createAppAndAppServer(ApplicationCreatorDataProvider parentDataProvider)
-			throws UnsuccessfulActionException {
-		if(createResourceController.createAppAndAppServer(appName, appServerGroupId, appReleaseSelector.getSelectedRelease(), asReleaseId)&&parentDataProvider!=null){
-			parentDataProvider.afterAddingAppOrAs();
-		}
-	     init();
-
-	}
-
-	public void setAppServerGroupId(Integer appServerGroupId) {
-		// jsf returns 0 for null, therefore we better use -1 to indicate nothing selected
-		if (appServerGroupId != null && appServerGroupId >= 0) {
-			this.appServerGroupId = appServerGroupId;
-		}
-		else {
-			this.appServerGroupId = null;
-		}
-	}
-
-	private Set<ResourceGroup> getApplicationServerGroupsForSelectBox(){
-		SortedSet<ResourceGroup> groups = new TreeSet<>();
-		List<ResourceGroupEntity> result;
-			result = resourceGroupService.loadGroupsForTypeName(DefaultResourceTypeDefinition.APPLICATIONSERVER.name(), null);
-			for (ResourceGroupEntity g : result) {
-				if (!ApplicationServerContainer.APPSERVERCONTAINER.getDisplayName().equals(g.getName())) {
-					groups.add(ResourceGroup.createByResource(g));
-				}
-			}
-		return groups;
-	}
-
-}
diff --git a/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/environments/EnvironmentsController.java b/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/environments/EnvironmentsController.java
deleted file mode 100644
index 787dc9b26..000000000
--- a/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/environments/EnvironmentsController.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * AMW - Automated Middleware allows you to manage the configurations of
- * your Java EE applications on an unlimited number of different environments
- * with various versions, including the automated deployment of those apps.
- * Copyright (C) 2013-2016 by Puzzle ITC
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package ch.puzzle.itc.mobiliar.presentation.environments;
-
-import java.io.Serializable;
-
-import javax.ejb.EJBException;
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
-
-import ch.puzzle.itc.mobiliar.business.environment.boundary.ContextLocator;
-import ch.puzzle.itc.mobiliar.business.environment.control.EnvironmentsScreenDomainService;
-import ch.puzzle.itc.mobiliar.business.environment.entity.ContextEntity;
-import ch.puzzle.itc.mobiliar.common.exception.AMWException;
-import ch.puzzle.itc.mobiliar.common.exception.ElementAlreadyExistsException;
-import ch.puzzle.itc.mobiliar.common.exception.NotAuthorizedException;
-import ch.puzzle.itc.mobiliar.common.exception.ResourceNotFoundException;
-import ch.puzzle.itc.mobiliar.common.util.NameChecker;
-import ch.puzzle.itc.mobiliar.presentation.util.GlobalMessageAppender;
-
-@Named
-@RequestScoped
-public class EnvironmentsController implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @Inject
-    EnvironmentsScreenDomainService envScreenService;
-
-    @Inject
-    ContextLocator contextLocator;
-
-    public ContextEntity loadContextWithType(Integer contextId) {
-        ContextEntity result = null;
-        try {
-            if (contextId == null) {
-                String message = "No context selected.";
-                GlobalMessageAppender.addErrorMessage(message);
-            } else {
-                result = envScreenService.getContextWithType(contextId);
-            }
-        } catch (ResourceNotFoundException e) {
-            String message = "The selected context can not be found.";
-            GlobalMessageAppender.addErrorMessage(message);
-        }
-        return result;
-    }
-
-    public boolean doSave(Integer contextId, String contextName, String contextNameAlias) {
-        try {
-            if (contextId == null) {
-                String message = "No context selected.";
-                GlobalMessageAppender.addErrorMessage(message);
-            } else if (contextName == null) {
-                String message = "No context name selected.";
-                GlobalMessageAppender.addErrorMessage(message);
-            } else if (!NameChecker.isNameValid(contextName)) {
-                GlobalMessageAppender.addErrorMessage(NameChecker.getErrorText("environment", contextName));
-            } else {
-                try {
-                    envScreenService.saveEnvironment(contextId, contextName, contextNameAlias);
-                    String message = "Changes successfully saved.";
-                    GlobalMessageAppender.addSuccessMessage(message);
-                    return true;
-                } catch (EJBException e) {
-                    if (e.getCause() instanceof NotAuthorizedException) {
-                        GlobalMessageAppender.addErrorMessage(e.getCause().getMessage());
-                    } else {
-                        throw e;
-                    }
-                }
-            }
-        } catch (ResourceNotFoundException e) {
-            String message = "The selected context can not be found.";
-            GlobalMessageAppender.addErrorMessage(message);
-        }
-        return false;
-    }
-
-
-    public boolean doCreateContext(String newContextName, Integer superContextId) {
-        try {
-            if (newContextName == null) {
-                String message = "Could not read name for new context.";
-                GlobalMessageAppender.addErrorMessage(message);
-            } else if (newContextName.isEmpty()) {
-                String message = "The name for the context must not be empty.";
-                GlobalMessageAppender.addErrorMessage(message);
-            } else if (!NameChecker.isNameValid(newContextName)) {
-                GlobalMessageAppender.addErrorMessage(
-                        NameChecker.getErrorText("environment", newContextName));
-            } else if (superContextId == null) {
-                String message = "No parent context selected.";
-                GlobalMessageAppender.addErrorMessage(message);
-            } else {
-                try {
-                    envScreenService.createContextByName(newContextName, superContextId);
-                    return true;
-                } catch (EJBException e) {
-                    if (e.getCause() instanceof NotAuthorizedException) {
-                        GlobalMessageAppender.addErrorMessage(e.getCause().getMessage());
-                    } else {
-                        throw e;
-                    }
-                }
-            }
-        } catch (ResourceNotFoundException e) {
-            String message = "The selected context can not be found.";
-            GlobalMessageAppender.addErrorMessage(message);
-        } catch (ElementAlreadyExistsException e) {
-            String errorMessage = null;
-            if (e.getExistingObjectClass() == ContextEntity.class) {
-                errorMessage = " Context with the name " + e.getExistingObjectName() + " already exists";
-            }
-            GlobalMessageAppender.addErrorMessage(errorMessage);
-        }
-        return false;
-    }
-
-    public boolean doRemoveContext(Integer contextId) {
-        try {
-            if (contextId == null) {
-                String message = "No context selected.";
-                GlobalMessageAppender.addErrorMessage(message);
-            } else {
-                try {
-
-                    String deletedContextName = contextLocator.deleteContext(contextId);
-                    String message = "Context and Permission: " + deletedContextName + " successfully removed";
-                    GlobalMessageAppender.addSuccessMessage(message);
-                    return true;
-                } catch (EJBException e) {
-                    if (e.getCause() instanceof NotAuthorizedException) {
-                        GlobalMessageAppender.addErrorMessage(e.getCause().getMessage());
-                    } else {
-                        throw e;
-                    }
-                }
-            }
-        } catch (AMWException e) {
-            String message = "Could not remove context.";
-            GlobalMessageAppender.addErrorMessage(message);
-        }
-        return false;
-    }
-
-}
diff --git a/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/environments/EnvironmentsDataProvider.java b/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/environments/EnvironmentsDataProvider.java
deleted file mode 100644
index 108c5de63..000000000
--- a/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/environments/EnvironmentsDataProvider.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * AMW - Automated Middleware allows you to manage the configurations of
- * your Java EE applications on an unlimited number of different environments
- * with various versions, including the automated deployment of those apps.
- * Copyright (C) 2013-2016 by Puzzle ITC
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package ch.puzzle.itc.mobiliar.presentation.environments;
-
-import ch.puzzle.itc.mobiliar.business.environment.entity.ContextEntity;
-import ch.puzzle.itc.mobiliar.common.util.ContextNames;
-import ch.puzzle.itc.mobiliar.presentation.CompositeBackingBean;
-import ch.puzzle.itc.mobiliar.presentation.common.ContextDataProvider;
-import lombok.Getter;
-import lombok.Setter;
-
-import javax.faces.context.FacesContext;
-import javax.inject.Inject;
-import java.io.Serializable;
-import java.util.Map;
-import java.util.TreeMap;
-
-@CompositeBackingBean
-public class EnvironmentsDataProvider implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-
-	@Getter
-	@Setter
-	private String newName;
-
-	@Getter
-	@Setter
-	private ContextEntity currentContext;
-	
-	@Inject
-	private EnvironmentsController controller;
-
-	@Inject
-	private ContextDataProvider context;
-
-	private Map<Integer, String> currentContextTypeNames;
-
-	public void loadContext() {
-		String ctxString = FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap().get("ctx");
-		Integer contextId = ctxString == null ? null : Integer.valueOf(ctxString);
-		context.setContextId(contextId);
-		currentContext = controller.loadContextWithType(context.getContextId());
-	}
-
-
-	private String getCurrentContextTypeName() {
-		String contextTypeName;
-		if (currentContextTypeNames == null) {
-			currentContextTypeNames = new TreeMap<>();
-		}
-		if (!currentContextTypeNames.containsKey(context.getContextId())) {
-			currentContext = controller.loadContextWithType(context.getContextId());
-			contextTypeName = currentContext.getContextType().getName();
-			currentContextTypeNames.put(context.getContextId(), contextTypeName);
-		} else {
-			contextTypeName = currentContextTypeNames.get(context.getContextId());
-		}
-		return contextTypeName;
-	}
-
-	public boolean getIsEnv() {
-		ContextNames contextNames = ContextNames.valueOf(getCurrentContextTypeName());
-		return contextNames.name().equals(ContextNames.ENV.name());
-	}
-
-	public String getNameOfChildContext() {
-		if (context.getContextDisplayName() != null) {
-			ContextNames c = ContextNames.valueOf(getCurrentContextTypeName());
-			if (c.getChildContext() != null) {
-				return c.getChildContext().getDisplayName();
-			}
-		}
-		return "sub context";
-	}
-
-	public String getContextTypeName() {
-		ContextNames contextNames = ContextNames.valueOf(getCurrentContextTypeName());
-		return contextNames.name();
-	}
-
-	public void save() {
-		if (controller.doSave(context.getContextId(), context.getContextDisplayName(), context.getContextNameAlias())) {
-			context.loadContexts();
-		}
-	}
-
-	public void createContext() {
-		if (controller.doCreateContext(newName, context.getContextId())) {
-			context.loadContexts();
-		}
-		resetPopupFields();
-	}
-
-
-	public void removeContext() {
-	
-		if (controller.doRemoveContext(context.getContextId())) {			
-			if (currentContextTypeNames!=null && currentContextTypeNames.containsKey(context.getContextId())) {
-				currentContextTypeNames.remove(context.getContextId());
-			}
-			context.loadContexts();
-			setToGlobal();				
-		}
-		resetPopupFields();
-	}
-
-	private void setToGlobal() {
-		context.setContextId(context.getGlobalContextId());
-	}
-
-	private void resetPopupFields(){
-		newName = null;
-	}
-
-}
diff --git a/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/globalFunctions/EditGlobalFunctionView.java b/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/globalFunctions/EditGlobalFunctionView.java
deleted file mode 100644
index d47e87c5e..000000000
--- a/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/globalFunctions/EditGlobalFunctionView.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * AMW - Automated Middleware allows you to manage the configurations of
- * your Java EE applications on an unlimited number of different environments
- * with various versions, including the automated deployment of those apps.
- * Copyright (C) 2013-2016 by Puzzle ITC
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package ch.puzzle.itc.mobiliar.presentation.globalFunctions;
-
-import java.io.Serializable;
-import java.util.List;
-
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-
-import ch.puzzle.itc.mobiliar.business.globalfunction.boundary.GlobalFunctionsBoundary;
-import ch.puzzle.itc.mobiliar.business.globalfunction.entity.GlobalFunctionEntity;
-import ch.puzzle.itc.mobiliar.business.security.boundary.PermissionBoundary;
-import ch.puzzle.itc.mobiliar.business.security.entity.Permission;
-import ch.puzzle.itc.mobiliar.business.template.entity.RevisionInformation;
-import ch.puzzle.itc.mobiliar.common.exception.AMWException;
-import com.google.common.collect.Lists;
-import lombok.Getter;
-import lombok.Setter;
-import ch.puzzle.itc.mobiliar.presentation.ViewBackingBean;
-import ch.puzzle.itc.mobiliar.presentation.util.GlobalMessageAppender;
-
-
-@ViewBackingBean
-public class EditGlobalFunctionView implements Serializable{
-
-    @Inject
-    GlobalFunctionsBoundary functionsBoundary;
-
-    @Inject
-    PermissionBoundary permissionBoundary;
-
-    @Getter
-    private Integer functionIdViewParam;
-
-    @Getter
-    @Setter
-    private GlobalFunctionEntity globalFunction;
-
-    @Getter
-    private GlobalFunctionEntity compareGlobalFunction;
-
-    @Getter
-    private List<RevisionInformation> revisionInformations;
-
-    @Getter
-    private RevisionInformation compareRevision;
-
-
-    @PostConstruct
-    public void init() {
-        if (functionIdViewParam == null) {
-            this.globalFunction = new GlobalFunctionEntity();
-        }
-    }
-
-    /**
-     * This is a viewParameter and is called by JSF!
-     */
-    public void setFunctionIdViewParam(Integer param) {
-        if (param != null){
-            this.functionIdViewParam = param;
-            this.globalFunction = functionsBoundary.getFunctionById(functionIdViewParam);
-            refreshRevisionInformation(functionIdViewParam);
-        }
-    }
-
-    private void refreshRevisionInformation(Integer funId){
-        revisionInformations = Lists.reverse(functionsBoundary.getFunctionRevisions(funId));
-    }
-
-    /**
-     * Returns the id of the function to which we want compare the actual function
-     */
-    public Integer getCompareGlobalFunctionId() {
-        return compareGlobalFunction != null ? compareGlobalFunction.getId() : null;
-    }
-
-    /**
-     * Whether or not we are comparing two revisions of a function
-     */
-    public boolean isCompareMode() {
-        return compareGlobalFunction != null;
-    }
-
-    /**
-     * Returns the id of the revision to which we want compare the actual function
-     */
-    public Integer getCompareRevisionId() {
-        return compareRevision != null ? compareRevision.getRevision().intValue() : null;
-    }
-
-    /**
-     * Sets the revision id to which we want compare the actual function
-     */
-    public void setCompareRevisionId(Integer compareRevisionId) {
-        if (compareRevisionId != null && compareRevisionId > 0) {
-            for (RevisionInformation r : revisionInformations) {
-                if (r.getRevision().intValue() == compareRevisionId) {
-                    compareRevision = r;
-                    compareGlobalFunction = functionsBoundary.getFunctionByIdAndRevision(functionIdViewParam, compareRevisionId);
-                    return;
-                }
-            }
-        }
-        compareGlobalFunction = null;
-        compareRevision = null;
-    }
-
-    /**
-     * Returns true if the current global function has not been persisted yet
-     */
-    public boolean isNewFunction() {
-        return globalFunction == null || globalFunction.getId() == null;
-    }
-
-    /**
-     * Defines if the current user has the rights to manage global functions
-     */
-    public boolean canManage() {
-        return permissionBoundary.hasPermission(Permission.MANAGE_GLOBAL_FUNCTIONS);
-    }
-
-    /**
-     * Save function
-     */
-	public void saveFunction() {
-
-		try {
-
-			if (functionsBoundary.saveGlobalFunction(globalFunction)) {
-				GlobalMessageAppender.addSuccessMessage("Function " + globalFunction.getName()
-						+ " successfully saved");
-				refreshRevisionInformation(globalFunction.getId());
-			}
-			else {
-				GlobalMessageAppender.addErrorMessage("A function with the same name "
-						+ globalFunction.getName() + " already exists");
-			}
-		}
-		catch (AMWException e) {
-			GlobalMessageAppender.addErrorMessage(e.getMessage());
-		}
-	}
-
-}
diff --git a/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/globalFunctions/ListGlobalFunctions.java b/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/globalFunctions/ListGlobalFunctions.java
deleted file mode 100644
index 4f7c2c356..000000000
--- a/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/globalFunctions/ListGlobalFunctions.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * AMW - Automated Middleware allows you to manage the configurations of
- * your Java EE applications on an unlimited number of different environments
- * with various versions, including the automated deployment of those apps.
- * Copyright (C) 2013-2016 by Puzzle ITC
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package ch.puzzle.itc.mobiliar.presentation.globalFunctions;
-
-import ch.puzzle.itc.mobiliar.business.globalfunction.boundary.GlobalFunctionsBoundary;
-import ch.puzzle.itc.mobiliar.business.globalfunction.entity.GlobalFunctionEntity;
-import ch.puzzle.itc.mobiliar.business.security.boundary.PermissionBoundary;
-import ch.puzzle.itc.mobiliar.business.security.entity.Permission;
-import ch.puzzle.itc.mobiliar.presentation.CompositeBackingBean;
-import ch.puzzle.itc.mobiliar.presentation.util.GlobalMessageAppender;
-import lombok.Getter;
-
-import javax.inject.Inject;
-import java.io.Serializable;
-import java.util.List;
-
-@CompositeBackingBean
-public class ListGlobalFunctions implements Serializable {
-
-    @Inject
-    GlobalFunctionsBoundary functionsBoundary;
-
-    @Inject
-    PermissionBoundary permissionBoundary;
-
-    private List<GlobalFunctionEntity> allGlobalFunctions;
-
-    @Getter
-    private Integer selectedFunctionIdToBeRemoved;
-
-    public List<GlobalFunctionEntity> getAllGlobalFunctions() {
-        if (this.allGlobalFunctions == null) {
-            refreshList();
-        }
-        return this.allGlobalFunctions;
-    }
-
-    public void setSelectedFunctionIdToBeRemoved(Integer functionId){
-          this.selectedFunctionIdToBeRemoved = functionId;
-    }
-
-    public List<GlobalFunctionEntity> loadAllFunctions() {
-        return functionsBoundary.getAllGlobalFunctions();
-    }
-
-    /**
-     * Defines if the current user has the rights to manage global functions
-     */
-    public boolean canManage() {
-        return permissionBoundary.hasPermission(Permission.MANAGE_GLOBAL_FUNCTIONS);
-    }
-    
-    public boolean canView() {
-    	return permissionBoundary.hasPermission(Permission.VIEW_GLOBAL_FUNCTIONS);
-    }
-
-    public void deleteFunction() {
-        if (selectedFunctionIdToBeRemoved != null) {
-            functionsBoundary.deleteGlobalFunction(selectedFunctionIdToBeRemoved);
-            selectedFunctionIdToBeRemoved = null;
-            refreshList();
-            GlobalMessageAppender.addSuccessMessage("Successfully deleted function");
-        } else {
-            GlobalMessageAppender.addErrorMessage("No function selected to be removed");
-        }
-    }
-
-    private void refreshList() {
-        this.allGlobalFunctions = loadAllFunctions();
-    }
-
-}
diff --git a/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/propertyEdit/EditPropertiesTable.java b/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/propertyEdit/EditPropertiesTable.java
index 205fd6c28..1bfa334ec 100644
--- a/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/propertyEdit/EditPropertiesTable.java
+++ b/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/propertyEdit/EditPropertiesTable.java
@@ -32,7 +32,6 @@
 import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.ResourceTypeEntity;
 import ch.puzzle.itc.mobiliar.presentation.CompositeBackingBean;
 import ch.puzzle.itc.mobiliar.presentation.resourceRelation.events.ChangeSelectedRelationEvent;
-import ch.puzzle.itc.mobiliar.presentation.util.TestingMode;
 
 @CompositeBackingBean
 public class EditPropertiesTable implements Serializable {
@@ -42,14 +41,6 @@ public class EditPropertiesTable implements Serializable {
 	@Getter
 	private Integer relationId;
 
-	@Inject
-	@TestingMode
-	private Boolean testing;
-
-	@TestingMode
-	public void onChangedTestingMode(@Observes Boolean isTesting) {
-		this.testing = isTesting;
-	}
 
 	/**
 	 * Observes if currently editing resource instance
@@ -99,22 +90,9 @@ public boolean isEditable(ResourceEditProperty property) {
 			break;
 		}
 
-		// if testing mode only return properties which are in current focus and are defined only for
-		// testing
-		if (isTesting()) {
-			return property.isTesting() && isEditable;
-		}
-
 		return isEditable;
 	}
 
-	/**
-	 * @return true if testing is tue and initialized, otherwise false
-	 */
-	public boolean isTesting() {
-		return testing != null && testing;
-	}
-
 	/**
 	 * @return true if current focus is of {@link ResourceTypeEntity}; If not yet set then return false as
 	 *         default
diff --git a/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/propertyEdit/EditPropertyView.java b/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/propertyEdit/EditPropertyView.java
index 1cfe7bc0e..b0f87cba5 100644
--- a/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/propertyEdit/EditPropertyView.java
+++ b/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/propertyEdit/EditPropertyView.java
@@ -34,13 +34,11 @@
 import ch.puzzle.itc.mobiliar.common.exception.PropertyDescriptorNotDeletableException;
 import ch.puzzle.itc.mobiliar.presentation.ViewBackingBean;
 import ch.puzzle.itc.mobiliar.presentation.util.GlobalMessageAppender;
-import ch.puzzle.itc.mobiliar.presentation.util.TestingMode;
 import lombok.Getter;
 import lombok.Setter;
 import org.apache.commons.lang3.StringUtils;
 
 import javax.annotation.PostConstruct;
-import javax.enterprise.event.Observes;
 import javax.inject.Inject;
 import java.io.Serializable;
 import java.util.LinkedHashSet;
@@ -96,18 +94,9 @@ public class EditPropertyView implements Serializable {
 	@Setter
 	private String propertyTagsString;
 
-	@Inject
-	@TestingMode
-	private Boolean testing;
-
 	@Getter
 	private boolean showForce;
 
-	@TestingMode
-	public void onChangedTestingMode(@Observes Boolean isTesting) {
-		this.testing = isTesting;
-	}
-
 	@PostConstruct
 	public void init() {
 		customPropertyType = new PropertyTypeEntity();
@@ -122,8 +111,7 @@ public void setResourceTypeIdFromParam(Integer resourceTypeIdFromParam) {
 		this.resourceTypeIdFromParam = resourceTypeIdFromParam;
 		this.resourceIdFromParam = null;
 		// no context - check already done by PropertyEditDataProvider (onContext/ResourceChanged) => editableProperties
-		canEditProperties = permissionBoundary.hasPermissionToEditPropertiesByResourceType(resourceTypeIdFromParam,
-				isTesting());
+		canEditProperties = permissionBoundary.hasPermissionToEditPropertiesByResourceType(resourceTypeIdFromParam);
 		canDecryptProperties = permissionBoundary.canToggleDecryptionOfResourceType(resourceTypeIdFromParam);
 
 	}
@@ -132,8 +120,7 @@ public void setResourceIdFromParam(Integer resourceIdFromParam) {
 		this.resourceIdFromParam = resourceIdFromParam;
 		this.resourceTypeIdFromParam = null;
 		// no context - check already done by PropertyEditDataProvider (onContext/ResourceChanged) => editableProperties
-		canEditProperties = permissionBoundary.hasPermissionToEditPropertiesByResource(resourceIdFromParam,
-				isTesting());
+		canEditProperties = permissionBoundary.hasPermissionToEditPropertiesByResource(resourceIdFromParam);
 		canDecryptProperties = permissionBoundary.canToggleDecryptionOfResource(resourceIdFromParam);
 	}
 
@@ -173,8 +160,6 @@ public PropertyDescriptorEntity getPropertyDescriptor() {
 		if (propertyDescriptor == null) {
 			// create a new one
 			propertyDescriptor = new PropertyDescriptorEntity();
-			// set if testing property or not
-			propertyDescriptor.setTesting(isTesting());
 
             propertyDescriptorHashBeforeModification = propertyDescriptor.foreignableFieldHashCode();
 		}
@@ -248,11 +233,7 @@ public void assignPropertyTypeId() {
 	public void save() {
 		try {
 
-            if (isTesting()){
-                saveTestingPropertyDescriptor();
-            } else {
-                savePropertyDescriptor();
-            }
+			savePropertyDescriptor();
 
 			propertyDescriptorId = propertyDescriptor.getId();
 
@@ -266,16 +247,6 @@ public void save() {
 			GlobalMessageAppender.addErrorMessage(buildErrorMessage(e, "edit", propertyDescriptor.getPropertyDescriptorDisplayName()));
 		}
 	}
-
-	private void saveTestingPropertyDescriptor() throws AMWException, ForeignableOwnerViolationException {
-		if (isEditResource()) {
-			propertyDescriptor = propertyEditor.saveTestingPropertyDescriptorForResource(
-					resourceIdFromParam, propertyDescriptor, propertyDescriptorHashBeforeModification, propertyTagsString);
-		} else {
-			propertyDescriptor = propertyEditor.saveTestingPropertyDescriptorForResourceType(
-					resourceTypeIdFromParam, propertyDescriptor, propertyDescriptorHashBeforeModification, propertyTagsString);
-		}
-	}
     
     private String buildErrorMessage(ForeignableOwnerViolationException exception, String action, String name){
        return "Owner "+exception.getViolatingOwner()+" not allowed to "+action+ " " +name;
@@ -345,13 +316,6 @@ private void loadPropertyDescriptor() {
 		}
 	}
 
-	/**
-	 * @return true if testing is tue and initialized, otherwise false
-	 */
-	public boolean isTesting() {
-		return testing != null && testing;
-	}
-
 	public boolean isSameEncrypted(){
 		if(propertyDescriptor.getPropertyTypeEntity() != null){
 			return propertyDescriptor.isEncrypt() == propertyDescriptor.getPropertyTypeEntity().isEncrypt();
diff --git a/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/propertyEdit/PropertyEditDataProvider.java b/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/propertyEdit/PropertyEditDataProvider.java
index efb829666..322c2ba3c 100644
--- a/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/propertyEdit/PropertyEditDataProvider.java
+++ b/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/propertyEdit/PropertyEditDataProvider.java
@@ -47,7 +47,6 @@
 import ch.puzzle.itc.mobiliar.presentation.resourceRelation.events.ChangeSelectedRelationEvent;
 import ch.puzzle.itc.mobiliar.presentation.resourcesedit.DataProviderHelper;
 import ch.puzzle.itc.mobiliar.presentation.resourcesedit.EditResourceView;
-import ch.puzzle.itc.mobiliar.presentation.util.TestingMode;
 import ch.puzzle.itc.mobiliar.presentation.util.UserSettings;
 import lombok.Getter;
 import lombok.Setter;
@@ -123,15 +122,6 @@ public class PropertyEditDataProvider implements Serializable {
     @Getter
     private ResourceGroup group;
 
-    @Inject
-    @TestingMode
-    private Boolean testing;
-
-    @TestingMode
-    public void onChangedTestingMode(@Observes Boolean isTesting) {
-        this.testing = isTesting;
-    }
-
     @Getter
     @Setter
     String typeRelationIdentifier;
@@ -146,13 +136,6 @@ public void onChangedTestingMode(@Observes Boolean isTesting) {
 
     private ResourceEditRelation currentRelation;
 
-    /**
-     * @return true if testing is tue and initialized, otherwise false
-     */
-    public boolean isTesting() {
-        return testing != null && testing;
-    }
-
     public boolean isGlobalContext() {
         return currentContext.isGlobal();
     }
@@ -221,15 +204,14 @@ public boolean hasOverwrittenProperty(ResourceEditProperty property) {
 
     private void loadResourceRelationEditProperties() {
         filteredRelationProperties = new ArrayList<>();
-
+        currentRelationProperties = new ArrayList<>();
         if (currentRelation != null) {
             if (currentRelation.isResourceTypeRelation()) {
-                List<ResourceEditProperty> properties = editor.getPropertiesForRelatedResourceType(currentRelation, getContextId());
-                currentRelationProperties = userSettings.filterTestingProperties(properties);
+                currentRelationProperties = editor.getPropertiesForRelatedResourceType(currentRelation, getContextId());
                 typeRelationIdentifier = currentRelation.getDisplayName();
             } else {
-                currentRelationProperties = userSettings.filterTestingProperties(editor
-                        .getPropertiesForRelatedResource(getResourceId(), currentRelation, getContextId()));
+                currentRelationProperties = editor
+                        .getPropertiesForRelatedResource(getResourceId(), currentRelation, getContextId());
                 filterHostNameAndActiveFromRelatedNode(currentRelation);
                 relationIdentifier = currentRelation.getIdentifier();
             }
@@ -416,11 +398,10 @@ public void reloadResourceEditProperties() {
 
     private List<ResourceEditProperty> reloadResourceEditProperties(ResourceEntity resourceEntity) {
         filteredResourceProperties = new ArrayList<>();
-        List<ResourceEditProperty> propertiesForResource = editor.getPropertiesForResource(resourceEntity.getId(), getContextId());
-        resourceEditProperties = userSettings.filterTestingProperties(propertiesForResource);
+        resourceEditProperties = editor.getPropertiesForResource(resourceEntity.getId(), getContextId());
         filterHostNameAndActiveFromNode();
         editableProperties = permissionBoundary.hasPermissionToEditPropertiesByResourceAndContext(resourceEntity.getId(),
-                currentContext, userSettings.isTestingMode());
+                currentContext);
         canChangeRuntime = permissionBoundary.hasPermission(Permission.RESOURCE, currentContext, Action.UPDATE,
                 resourceEntity, null);
         canDecryptProperties = permissionBoundary.hasPermission(Permission.RESOURCE_PROPERTY_DECRYPT, currentContext, Action.ALL,
@@ -435,8 +416,8 @@ private List<ResourceEditProperty> reloadResourceEditProperties(ResourceEntity r
 
     private List<ResourceEditProperty> reloadResourceTypeEditProperties(ResourceTypeEntity resourceTypeEntity) {
         filteredResourceProperties = new ArrayList<>();
-        resourceEditProperties = userSettings.filterTestingProperties(editor.getPropertiesForResourceType(
-                resourceTypeEntity.getId(), getContextId()));
+        resourceEditProperties = editor.getPropertiesForResourceType(
+                resourceTypeEntity.getId(), getContextId());
         editableProperties = permissionBoundary.hasPermission(Permission.RESOURCETYPE, currentContext, Action.UPDATE,
                 null, resourceTypeEntity);
         canDecryptProperties = permissionBoundary.hasPermission(Permission.RESOURCETYPE_PROPERTY_DECRYPT, currentContext, Action.ALL,
diff --git a/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/propertyEdit/RelationDataProvider.java b/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/propertyEdit/RelationDataProvider.java
index 875edbaec..69665a0f6 100644
--- a/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/propertyEdit/RelationDataProvider.java
+++ b/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/propertyEdit/RelationDataProvider.java
@@ -252,7 +252,7 @@ private List<ResourceGroup> loadResourceGroupsByResourceTypeId(Integer id, List<
             GlobalMessageAppender.addErrorMessage(message);
         } else {
             // #4361 don't use the user settings for adding resources
-            for (ResourceGroupEntity resourceGroupEntity : resourceGroupLocator.getGroupsForType(id, null, true)) {
+            for (ResourceGroupEntity resourceGroupEntity : resourceGroupLocator.getGroupsForType(id,  true)) {
                 resourcesByResourceType.add(ResourceGroup.createByResource(resourceGroupEntity));
             }
         }
@@ -296,7 +296,7 @@ public void loadResourceGroupsForRuntime() {
     public List<NamedIdentifiable> loadAllRuntimeEnvironments() {
         List<NamedIdentifiable> result = new ArrayList<>();
         result.addAll(resourceGroupPersistenceService.loadGroupsForTypeName(
-                DefaultResourceTypeDefinition.RUNTIME.name(), null));
+                DefaultResourceTypeDefinition.RUNTIME.name()));
         Collections.sort(result, nameComparator);
 
         return result;
diff --git a/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/propertytype/PropertyTypeController.java b/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/propertytype/PropertyTypeController.java
deleted file mode 100644
index 20361d5df..000000000
--- a/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/propertytype/PropertyTypeController.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * AMW - Automated Middleware allows you to manage the configurations of
- * your Java EE applications on an unlimited number of different environments
- * with various versions, including the automated deployment of those apps.
- * Copyright (C) 2013-2016 by Puzzle ITC
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package ch.puzzle.itc.mobiliar.presentation.propertytype;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.PatternSyntaxException;
-
-import javax.ejb.EJBException;
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
-
-import ch.puzzle.itc.mobiliar.business.property.control.PropertyTypeScreenDomainService;
-import ch.puzzle.itc.mobiliar.business.property.control.PropertyTypeService;
-import ch.puzzle.itc.mobiliar.business.property.entity.PropertyTypeEntity;
-import ch.puzzle.itc.mobiliar.common.exception.ElementAlreadyExistsException;
-import ch.puzzle.itc.mobiliar.common.exception.NotAuthorizedException;
-import ch.puzzle.itc.mobiliar.common.exception.PropertyTypeNotDeletableException;
-import ch.puzzle.itc.mobiliar.common.exception.PropertyTypeNotFoundException;
-import ch.puzzle.itc.mobiliar.common.exception.RenameException;
-import ch.puzzle.itc.mobiliar.presentation.util.GlobalMessageAppender;
-
-
-@Named
-@RequestScoped
-public class PropertyTypeController implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-
-	@Inject
-	PropertyTypeScreenDomainService propertyTypeScreenService;
-
-	@Inject
-	PropertyTypeService propertyTypeService;
-
-	public List<PropertyTypeEntity> loadPropertyTypes() {
-
-		List<PropertyTypeEntity> propertyTypes = propertyTypeService.getPropertyTypes();
-		List<PropertyTypeEntity> uniquePropertyTypes = new ArrayList<>(propertyTypes.size());
-		for (PropertyTypeEntity pType : propertyTypes) {
-			int pos = uniquePropertyTypes.indexOf(pType);
-			if (pos > -1){
-				uniquePropertyTypes.get(pos).addPropertyTag(pType.getPropertyTags().get(0));
-			}
-			else {
-				uniquePropertyTypes.add(pType);
-			}
-		}
-		return uniquePropertyTypes;
-	}
-
-	public boolean doRemovePropertyType(PropertyTypeEntity propertyType) {
-		boolean isSuccessful = false;
-		try {
-			if (propertyType == null) {
-				String message = "No property type selected.";
-				GlobalMessageAppender.addErrorMessage(message);
-			} else {
-				try{
-					propertyTypeScreenService.deletePropertyTypeById(propertyType.getId());
-					String message = "Property type: " + propertyType.getPropertyTypeName() + " successfully deleted.";
-					GlobalMessageAppender.addSuccessMessage(message);
-					isSuccessful = true;
-				}catch(EJBException e){
-					if(e.getCause() instanceof NotAuthorizedException) {
-						GlobalMessageAppender.addErrorMessage(e.getCause().getMessage());
-					} else {
-						throw e;
-					}
-				}
-			}
-		} catch (PropertyTypeNotFoundException e) {
-			GlobalMessageAppender.addErrorMessage("Property type has not been found.");
-		} catch (PropertyTypeNotDeletableException e) {
-			GlobalMessageAppender.addErrorMessage("Could not delete Property type because it is used by properties.");
-		}
-
-		return isSuccessful;
-	}
-
-	public boolean doSave(Integer prtTypeId, String prtTypeName, String prtTypeValidation, boolean encrypted, String prtTypeTagsString) {
-		boolean isSuccessful = false;
-
-		try {
-			if (prtTypeId == null) {
-				String message = "No property type id selected.";
-				GlobalMessageAppender.addErrorMessage(message);
-			} else if (prtTypeName == null) {
-				String message = "No property type name selected.";
-				GlobalMessageAppender.addErrorMessage(message);
-			} else if (prtTypeValidation == null) {
-				String message = "Property type validation must not be empty.";
-				GlobalMessageAppender.addErrorMessage(message);
-			} else if (checkIfRegexpSyntaxError(prtTypeValidation)) {
-				String message = "Invalid property type validation pattern.";
-				GlobalMessageAppender.addErrorMessage(message);
-			} else {
-				try{
-					propertyTypeScreenService.updatePropertyType(prtTypeId, prtTypeName, prtTypeValidation, encrypted, prtTypeTagsString);
-					String message = "The Property Type: " + prtTypeName + " successfully saved.";
-					GlobalMessageAppender.addSuccessMessage(message);
-					isSuccessful = true;
-				}catch(EJBException e){
-					if(e.getCause() instanceof NotAuthorizedException) {
-						GlobalMessageAppender.addErrorMessage(e.getCause().getMessage());
-					} else {
-						throw e;
-					}
-				}
-			}
-		} catch (PropertyTypeNotFoundException e) {
-			GlobalMessageAppender.addErrorMessage("The property type has not been found.");
-		} catch (RenameException e) {
-			GlobalMessageAppender.addErrorMessage("Was not able to rename the property type.");
-		} catch (ElementAlreadyExistsException e) {
-			GlobalMessageAppender.addErrorMessage("Was not able to save the property type.");
-		}
-
-		return isSuccessful;
-	}
-
-	public boolean doCreateByPropertyType(String prtTypeName, String prtTypeValidation, boolean encrypted, String propertyTypeTags) {
-		boolean isSuccessful = false;
-
-		try {
-			if (prtTypeName == null) {
-				String message = "Could not read name for new propertytype.";
-				GlobalMessageAppender.addErrorMessage(message);
-			} else if (prtTypeName == null || prtTypeName.isEmpty()) {
-				String message = "The name for the propertytype must not be empty.";
-				GlobalMessageAppender.addErrorMessage(message);
-			}else if (prtTypeValidation==null || prtTypeValidation.isEmpty()) {
-				String message = "The validation for the propertytype must not be empty.";
-				GlobalMessageAppender.addErrorMessage(message);
-			}else if (checkIfRegexpSyntaxError(prtTypeValidation)) {
-				String message = "Invalid property type validation pattern.";
-				GlobalMessageAppender.addErrorMessage(message);
-			} else {
-				try{
-					propertyTypeScreenService.createPropertyTypeByNameAndVal(prtTypeName, prtTypeValidation, encrypted, propertyTypeTags);
-					String message = "Property type " + prtTypeName + " succesfully created.";
-					GlobalMessageAppender.addSuccessMessage(message);
-					isSuccessful = true;
-				}catch(EJBException e){
-					if(e.getCause() instanceof NotAuthorizedException) {
-						GlobalMessageAppender.addErrorMessage(e.getCause().getMessage());
-					} else {
-						throw e;
-					}
-				}
-			}
-		} catch (ElementAlreadyExistsException e) {
-			GlobalMessageAppender.addErrorMessage("Property type already exists.");
-		}
-
-		return isSuccessful;
-	}
-	
-	private boolean checkIfRegexpSyntaxError(String regexp){
-		boolean result = false;
-		try{
-			"".matches(regexp);
-			} catch (PatternSyntaxException e){
-				result = true;
-			}
-		return result;
-	}
-
-}
diff --git a/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/propertytype/PropertyTypeDataProvider.java b/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/propertytype/PropertyTypeDataProvider.java
deleted file mode 100644
index b71b4e3f6..000000000
--- a/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/propertytype/PropertyTypeDataProvider.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * AMW - Automated Middleware allows you to manage the configurations of
- * your Java EE applications on an unlimited number of different environments
- * with various versions, including the automated deployment of those apps.
- * Copyright (C) 2013-2016 by Puzzle ITC
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package ch.puzzle.itc.mobiliar.presentation.propertytype;
-
-import ch.puzzle.itc.mobiliar.business.property.boundary.PropertyTagEditor;
-import ch.puzzle.itc.mobiliar.business.property.entity.PropertyTagEntity;
-import ch.puzzle.itc.mobiliar.business.property.entity.PropertyTypeEntity;
-import ch.puzzle.itc.mobiliar.presentation.CompositeBackingBean;
-import ch.puzzle.itc.mobiliar.presentation.settings.SettingsDataProvider;
-import lombok.Getter;
-import lombok.Setter;
-
-import javax.annotation.PostConstruct;
-import javax.faces.context.FacesContext;
-import javax.inject.Inject;
-import java.io.Serializable;
-import java.util.List;
-
-@SuppressWarnings("serial")
-@CompositeBackingBean
-public class PropertyTypeDataProvider implements Serializable {
-
-    @PostConstruct
-    public void initView() {
-        reloadPropertyTypes();
-    }
-
-    @Inject
-    private PropertyTypeController controller;
-
-    @Inject
-    PropertyTagEditor propertyTagEditor;
-
-    @Inject
-    SettingsDataProvider settingsDataProviderProvider;
-    
-    private List<PropertyTypeEntity> propertyTypes;
-    
-    private PropertyTypeEntity selectedPropertyType;
-
-    // edit propType
-    @Getter
-    private Integer selectedPropertyTypeId;
-    @Getter
-    @Setter
-    private String selectedPropertyTypeName;
-    @Getter
-    @Setter
-    private String selectedPropertyTypeRegex;
-    @Getter
-    @Setter
-    private boolean selectedEncrypted;
-    @Setter
-    private String selectedPropTypeTagsString;
-
-    // add PropType
-    @Getter
-    @Setter
-    private String newPropertyTypeName;
-    @Getter
-    @Setter
-    private String newValidationRegex;
-    @Getter
-    @Setter
-    private boolean newEncrypted;
-    @Setter
-    @Getter
-    private String newPropTypeTagsString;
-
-    private List<PropertyTagEntity> globalPropertyTags;
-
-    public PropertyTypeEntity getSelectedPropertyType() {
-        return selectedPropertyType;
-    }
-
-    public void setSelectedPropertyType(PropertyTypeEntity propertyType) {
-        this.selectedPropertyType = propertyType;
-        setSelectedPropertyTypeName(propertyType.getPropertyTypeName());
-        setSelectedPropertyTypeRegex(propertyType.getValidationRegex());
-        setSelectedEncrypted(propertyType.isEncrypt());
-    }
-    
-    public List<PropertyTypeEntity> getAllPropertyTypes() {
-        return propertyTypes;
-    }
-
-
-    /**
-     * @return the global Tags as comma separated String
-     */
-    public String getGlobalTagsString(){
-        return propertyTagEditor.getTagsAsList(globalPropertyTags);
-    }
-
-    /**
-     * @return the PropertyTags as comma seprated list
-     */
-    public String getSelectedPropTypeTagsString() {
-        return propertyTagEditor.getTagsAsCommaSeparatedString(selectedPropertyType.getPropertyTags());
-    }
-
-    public void createByPropertyTypeEntity() {
-        if (controller.doCreateByPropertyType(getNewPropertyTypeName(), getNewValidationRegex(), isNewEncrypted(), getNewPropTypeTagsString())) {
-            reloadPropertyTypes();
-            selectPropertyTypeByName(getNewPropertyTypeName());
-            clearCreatePropertyTypePopup();
-        }
-    }
-
-    public void save() {
-        if (controller.doSave(getSelectedPropertyType().getId(), getSelectedPropertyTypeName(), getSelectedPropertyTypeRegex(), isSelectedEncrypted(), selectedPropTypeTagsString)) {
-            reloadPropertyTypes();
-        } else {
-            setSelectedPropertyTypeName(getSelectedPropertyType().getPropertyTypeName());
-            setSelectedPropertyTypeRegex(getSelectedPropertyType().getValidationRegex());
-        }
-    }
-
-    public void remove() {
-        if (controller.doRemovePropertyType(getSelectedPropertyType())) {
-            this.selectedPropertyTypeId = null;
-            reloadPropertyTypes();
-            clearCreatePropertyTypePopup();
-        }
-    }
-
-    public void clearCreatePropertyTypePopup() {
-        newPropertyTypeName = null;
-        newValidationRegex = null;
-        newEncrypted = false;
-        newPropTypeTagsString = null;
-    }
-
-    private void reloadPropertyTypes() {
-        propertyTypes = controller.loadPropertyTypes();
-        if(selectedPropertyTypeId != null) {
-            setSelectedPropertyTypeId(selectedPropertyTypeId);
-        } else {
-            String propId = FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap().get("propId");
-            if (propId != null) {
-                setSelectedPropertyTypeId(Integer.valueOf(propId));
-            } else {
-                selectFirstPropertytype();
-            }
-        }
-        globalPropertyTags = propertyTagEditor.getAllGlobalPropertyTags();
-    }
-
-    private void selectPropertyTypeByName(String propertyName) {
-        if (!getAllPropertyTypes().isEmpty() && propertyName != null) {
-            for (PropertyTypeEntity propertyType : getAllPropertyTypes()) {
-                if (propertyName.equals(propertyType.getPropertyTypeName())) {
-                    setSelectedPropertyTypeId(propertyType.getId());
-                    return;
-                }
-            }
-        }
-        // falls name null ist, so soll erstes element selektiert werden
-        selectFirstPropertytype();
-    }
-
-    private void selectFirstPropertytype() {
-        if (!getAllPropertyTypes().isEmpty()) {
-            PropertyTypeEntity propertyType = getAllPropertyTypes().get(0);
-            setSelectedPropertyTypeId(propertyType.getId());
-        }
-    }
-
-    public void setSelectedPropertyTypeId(Integer selectedPropertyTypeId) {
-        this.selectedPropertyTypeId = selectedPropertyTypeId;
-        setSelectedPropertyType(getPropertyTypeById(selectedPropertyTypeId));
-    }
-    
-    private PropertyTypeEntity getPropertyTypeById(Integer propertyType){
-        for(PropertyTypeEntity t : propertyTypes){
-            if(t.getId().equals(propertyType)) {
-                return t;
-            }
-        }
-        return null;
-    }
-}
diff --git a/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/resourcelist/ResourceListController.java b/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/resourcelist/ResourceListController.java
index fd5fba73f..983f2f6ee 100644
--- a/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/resourcelist/ResourceListController.java
+++ b/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/resourcelist/ResourceListController.java
@@ -69,7 +69,7 @@ public class ResourceListController {
 	 */
 	public SortedSet<ResourceGroup> loadResourceGroupsForResourceType(ResourceType resourceType) {
 		SortedSet<ResourceGroup> groups = new TreeSet<ResourceGroup>();
-		List<ResourceGroupEntity> result = resourceGroupLocator.getGroupsForType(resourceType.getId(), userSettings.getMyAMWFilter(), true);
+		List<ResourceGroupEntity> result = resourceGroupLocator.getGroupsForType(resourceType.getId(), true);
 		for (ResourceGroupEntity g : result) {
 			groups.add(ResourceGroup.createByResource(g, dependencyResolver));
 		}
diff --git a/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/resourcelist/ResourceListDataProvider.java b/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/resourcelist/ResourceListDataProvider.java
index 963776c6d..d033b21db 100644
--- a/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/resourcelist/ResourceListDataProvider.java
+++ b/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/resourcelist/ResourceListDataProvider.java
@@ -101,10 +101,8 @@ public void initView() {
 	 * @return list with resourceGroups
 	 */
 	public List<ResourceGroup> getResourceGroupsForSelectedResourceType() {
-		if (resourceGroups == null || !getSelectedResourceType().getId().equals(this.selectedType.getId())
-				|| hasAmwFilterChanged()) {
+		if (resourceGroups == null || !getSelectedResourceType().getId().equals(this.selectedType.getId())) {
 			selectedType = getSelectedResourceType();
-			amwFilter = userSettings.getMyAMWFilter();
 			resourceGroups = new ArrayList<ResourceGroup>(
 					resourcesController.loadResourceGroupsForResourceType(selectedType));
 		}
@@ -132,13 +130,6 @@ public ForeignableAttributesDTO getForeignableAttribute(ResourceGroup resourceGr
         return new ForeignableAttributesDTO();
     }
 
-
-	private boolean hasAmwFilterChanged() {
-		List<Integer> newAmwFilter = userSettings.getMyAMWFilter();
-		return (newAmwFilter != null && !newAmwFilter.equals(amwFilter))
-				|| (amwFilter != null && !amwFilter.equals(newAmwFilter));
-	}
-
 	public ResourceGroup getSelectedResourceGroup() {
 	    return selectedResourceGroup;
 	}
diff --git a/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/resourcesedit/CreateResourceController.java b/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/resourcesedit/CreateResourceController.java
index 63b6bec05..bac657108 100644
--- a/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/resourcesedit/CreateResourceController.java
+++ b/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/resourcesedit/CreateResourceController.java
@@ -29,7 +29,6 @@
 import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.ResourceTypeEntity;
 import ch.puzzle.itc.mobiliar.business.security.boundary.PermissionBoundary;
 import ch.puzzle.itc.mobiliar.common.exception.*;
-import ch.puzzle.itc.mobiliar.common.util.DefaultResourceTypeDefinition;
 import ch.puzzle.itc.mobiliar.common.util.NameChecker;
 import ch.puzzle.itc.mobiliar.presentation.util.GlobalMessageAppender;
 import ch.puzzle.itc.mobiliar.presentation.util.UserSettings;
@@ -86,7 +85,6 @@ public boolean createResource(String newResourceName, ResourceTypeEntity resourc
                     Resource r = resourceBoundary.createNewResourceByName(ForeignableOwner.getSystemOwner(), newResourceName,
                                 resourceType.getId(), release.getId());
                     if (r != null) {
-                        userSettings.addFavoriteResource(r.getEntity().getResourceGroup().getId(), r.getName(), resourceType.getName());
                         String message = "Resource " + newResourceName + " successfully created";
                         GlobalMessageAppender.addSuccessMessage(message);
                         try {
@@ -101,8 +99,6 @@ public boolean createResource(String newResourceName, ResourceTypeEntity resourc
                 }
             }
 
-        } catch (ResourceNotFoundException e) {
-            errorMessage = "The selected resource can not be found.";
         } catch (ResourceTypeNotFoundException e) {
             errorMessage = "Could not find resourcetype.";
         } catch (ElementAlreadyExistsException e) {
@@ -169,12 +165,6 @@ public boolean createAppAndAppServer(String appName, Integer appServerGroup, Rel
                 }
 
                 if (app != null) {
-                    try {
-                        userSettings.addFavoriteResource(app.getEntity().getResourceGroup().getId(), app.getName(), DefaultResourceTypeDefinition.APPLICATION.name());
-                    } catch (ResourceNotFoundException e) {
-                        message = "Could not add Application " + appName + " to favorites.";
-                        GlobalMessageAppender.addSuccessMessage(message);
-                    }
                     try {
                         permissionBoundary.createAutoAssignedRestrictions(app.getEntity());
                     } catch (AMWException e) {
diff --git a/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/resourcesedit/EditResourceView.java b/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/resourcesedit/EditResourceView.java
index e96060561..2f7f41edc 100644
--- a/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/resourcesedit/EditResourceView.java
+++ b/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/resourcesedit/EditResourceView.java
@@ -283,31 +283,17 @@ public boolean canSaveChanges() {
                     Action.UPDATE, null, getResourceType());
     }
 
-    /**
-     * Set testing mode in session scoped bean
-     */
-    public void setTesting(boolean isTesting) {
-        userSettingsSessionScoped.setTestingMode(isTesting);
-    }
-
-    /**
-     * Get testing mode from session scoped bean
-     */
-    public boolean isTesting() {
-        return userSettingsSessionScoped.isTestingMode();
-    }
-
     public boolean hasAddPropertyPermission() {
         if (isEditResource()) {
             if (contextIdViewParam == null) {
-                return permissionBoundary.hasPermissionToEditPropertiesByResourceAndContext(resourceIdFromParam, isTesting(), sessionContext.getCurrentContext().getId());
+                return permissionBoundary.hasPermissionToEditPropertiesByResourceAndContext(resourceIdFromParam, sessionContext.getCurrentContext().getId());
             }
-            return permissionBoundary.hasPermissionToEditPropertiesByResourceAndContext(resourceIdFromParam, isTesting(), contextIdViewParam);
+            return permissionBoundary.hasPermissionToEditPropertiesByResourceAndContext(resourceIdFromParam, contextIdViewParam);
         } else {
             if (contextIdViewParam == null) {
-                return permissionBoundary.hasPermissionToEditPropertiesByResourceTypeAndContext(resourceTypeIdFromParam, sessionContext.getCurrentContext().getId(), isTesting());
+                return permissionBoundary.hasPermissionToEditPropertiesByResourceTypeAndContext(resourceTypeIdFromParam, sessionContext.getCurrentContext().getId());
             }
-            return permissionBoundary.hasPermissionToEditPropertiesByResourceTypeAndContext(resourceTypeIdFromParam, contextIdViewParam, isTesting());
+            return permissionBoundary.hasPermissionToEditPropertiesByResourceTypeAndContext(resourceTypeIdFromParam, contextIdViewParam);
         }
     }
 
@@ -315,10 +301,6 @@ public boolean canGoBackToResourceList() {
         return permissionBoundary.hasPermission(Permission.BACK_TO_RES_LIST);
     }
 
-    public boolean hasShakedownTestPermission() {
-        return permissionBoundary.hasPermission(Permission.SHAKEDOWN_TEST_MODE);
-    }
-
     public ContextEntity getCurrentContext() {
         return sessionContext.getCurrentContext();
     }
diff --git a/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/security/SecurityDataProvider.java b/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/security/SecurityDataProvider.java
index 7173532af..05570cba4 100644
--- a/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/security/SecurityDataProvider.java
+++ b/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/security/SecurityDataProvider.java
@@ -119,15 +119,6 @@ public boolean hasPermissionToExportDeployments() {
 		return permissionBoundary.hasPermission(Permission.DEPLOYMENT, Action.READ);
 	}
 
-	public boolean hasPermissionToCreateShakedownTests(List<Integer> resourceGroupIds) {
-		for (Integer resourceGroupId : resourceGroupIds) {
-			if (!permissionBoundary.hasPermissionToCreateShakedownTests(resourceGroupId)) {
-				return false;
-			}
-		}
-		return true;
-	}
-
 	public String getUserName() {
 		return permissionBoundary.getUserName();
 	}
diff --git a/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/server/ServerListFilter.java b/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/server/ServerListFilter.java
deleted file mode 100644
index 49fd67cef..000000000
--- a/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/server/ServerListFilter.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * AMW - Automated Middleware allows you to manage the configurations of
- * your Java EE applications on an unlimited number of different environments
- * with various versions, including the automated deployment of those apps.
- * Copyright (C) 2013-2016 by Puzzle ITC
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package ch.puzzle.itc.mobiliar.presentation.server;
-
-import java.io.Serializable;
-
-import javax.enterprise.context.SessionScoped;
-
-import org.apache.commons.lang3.StringUtils;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * Holds the filter criteria for the severList screen in the session
- */
-@Getter
-@Setter
-@SessionScoped
-public class ServerListFilter implements Serializable {
-    private static final long serialVersionUID = 1L;
-    
-	private String host;
-	private String appServer;
-	private String runtime;
-	private String node;
-	private String environment;
-	boolean emptySearch = false;
-			
-	public void reset() {
-		host = null;
-		appServer = null;
-		runtime = null;
-		node = null;
-		environment = null;
-	}
-	
-	public boolean isEmpty() {
-		return StringUtils.isEmpty(host) && StringUtils.isEmpty(appServer) && StringUtils.isEmpty(runtime) && StringUtils.isEmpty(node)
-				&& StringUtils.isEmpty(environment);
-	}
-}
diff --git a/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/server/ServerListView.java b/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/server/ServerListView.java
deleted file mode 100644
index 107733dfe..000000000
--- a/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/server/ServerListView.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * AMW - Automated Middleware allows you to manage the configurations of
- * your Java EE applications on an unlimited number of different environments
- * with various versions, including the automated deployment of those apps.
- * Copyright (C) 2013-2016 by Puzzle ITC
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package ch.puzzle.itc.mobiliar.presentation.server;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.faces.context.FacesContext;
-import javax.inject.Inject;
-import javax.inject.Named;
-
-import ch.puzzle.itc.mobiliar.business.domain.commons.CommonDomainService;
-import ch.puzzle.itc.mobiliar.business.resourcegroup.boundary.ResourceGroupLocator;
-import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.ResourceGroupEntity;
-import ch.puzzle.itc.mobiliar.business.server.boundary.ServerView;
-import ch.puzzle.itc.mobiliar.business.server.entity.ServerTuple;
-import ch.puzzle.itc.mobiliar.business.utils.JpaWildcardConverter;
-import ch.puzzle.itc.mobiliar.common.util.ConfigurationService;
-import ch.puzzle.itc.mobiliar.common.util.DefaultResourceTypeDefinition;
-import ch.puzzle.itc.mobiliar.common.util.ConfigKey;
-import ch.puzzle.itc.mobiliar.presentation.ViewBackingBean;
-import ch.puzzle.itc.mobiliar.presentation.security.SecurityDataProvider;
-import ch.puzzle.itc.mobiliar.presentation.util.NavigationUtils;
-import lombok.Getter;
-import lombok.Setter;
-
-@Named
-@ViewBackingBean
-public class ServerListView implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-	private static final String FILTER_TOOLTIP = "Use "+JpaWildcardConverter.WILDCARD_CHARACTER+" as wildcard";
-
-	@Inject
-	private ServerView serverView;
-	@Inject
-	private ResourceGroupLocator resourceGroupLocator;
-	@Inject
-	private CommonDomainService commonServcie;
-	@Inject
-	private SecurityDataProvider securityDataProvider;
-	
-	@Inject
-	@Getter
-	private ServerListFilter serverListFilter;
-	
-	@Setter
-	@Getter
-	private List<ServerTuple> servers;
-	@Setter
-	@Getter
-	private List<ResourceGroupEntity> runtimes;
-	private List<String> appServers = null;
-	
-	@Getter
-	private String vmDetailUrl = ConfigurationService.getProperty(ConfigKey.VM_DETAIL_URL);
-	@Getter
-	private String vmUrlParam = ConfigurationService.getProperty(ConfigKey.VM_URL_PARAM);
-
-	@Getter
-	private boolean appServerReadPermission;
-	@Getter
-	private boolean resourceReadPermission;
-
-	// called by preRenderView event
-	public void init() {
-		//cache permissions in view
-		this.appServerReadPermission = securityDataProvider.hasPermissionForResourceType("RESOURCE", "READ", "APPLICATIONSERVER");
-		this.resourceReadPermission = securityDataProvider.hasPermission("RESOURCE", "READ");
-		if(!FacesContext.getCurrentInstance().isPostback()) {
-			if(!serverListFilter.isEmpty() || serverListFilter.isEmptySearch()) {
-				servers = serverView.getServers(serverListFilter.getHost(), serverListFilter.getAppServer(), serverListFilter.getRuntime(),
-						serverListFilter.getNode(), serverListFilter.getEnvironment(), true);
-			}
-			loadRuntimes();
-		}
-	}
-	
-	// must be an non static method or else JSF wont find it
-	public String getFILTER_TOOLTIP() {
-		return FILTER_TOOLTIP;
-	}
-
-	public void loadRuntimes() {
-		runtimes = commonServcie.getRuntimeResourceGroups();
-	}
-	
-	public List<String> getAppServersSuggestions(String prefix){
-		if(appServers == null) {
-			appServers = new ArrayList<>();
-			List<ResourceGroupEntity> appServerGroups = resourceGroupLocator.getGroupsForType(
-					DefaultResourceTypeDefinition.APPLICATIONSERVER.name(), 
-					null, false, true);
-			for(ResourceGroupEntity appServer : appServerGroups) {
-				appServers.add(appServer.getName());
-			}
-		}
-		return appServers;
-	}
-	
-	//only used to redirect to new url -> leads to init call
-	public String searchServers() {
-		if(serverListFilter.isEmpty()) {
-			serverListFilter.setEmptySearch(true);
-		}
-		else {
-			serverListFilter.setEmptySearch(false);
-		}
-		return NavigationUtils.getRefreshOutcomeWithAdditionalParam("includeViewParams=true");
-	}
-
-}
diff --git a/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/settings/SettingsDataProvider.java b/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/settings/SettingsDataProvider.java
deleted file mode 100644
index e3dcadabb..000000000
--- a/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/settings/SettingsDataProvider.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * AMW - Automated Middleware allows you to manage the configurations of
- * your Java EE applications on an unlimited number of different environments
- * with various versions, including the automated deployment of those apps.
- * Copyright (C) 2013-2016 by Puzzle ITC
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package ch.puzzle.itc.mobiliar.presentation.settings;
-
-import ch.puzzle.itc.mobiliar.presentation.CompositeBackingBean;
-import lombok.Data;
-
-import javax.faces.context.FacesContext;
-import java.io.Serializable;
-
-@Data
-@SuppressWarnings("serial")
-@CompositeBackingBean
-public class SettingsDataProvider implements Serializable {
-
-	public static String PARAM_MODE = "mode";
-	private static String MODE_ENV = "env";
-
-    String mode;
-
-    public void init() {
-        if (mode == null) {
-            String modeParam = FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap().get(PARAM_MODE);
-            if (modeParam == null) {
-                this.mode = MODE_ENV;
-            } else {
-                this.mode = modeParam;
-            }
-
-        }
-    }
-}
diff --git a/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/shakedownstp/ShakedownStpDataProvider.java b/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/shakedownstp/ShakedownStpDataProvider.java
deleted file mode 100644
index f2607044d..000000000
--- a/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/shakedownstp/ShakedownStpDataProvider.java
+++ /dev/null
@@ -1,375 +0,0 @@
-/*
- * AMW - Automated Middleware allows you to manage the configurations of
- * your Java EE applications on an unlimited number of different environments
- * with various versions, including the automated deployment of those apps.
- * Copyright (C) 2013-2016 by Puzzle ITC
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package ch.puzzle.itc.mobiliar.presentation.shakedownstp;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.annotation.PostConstruct;
-import javax.ejb.EJBException;
-import javax.inject.Inject;
-
-import org.richfaces.component.SequenceIterationStatus;
-
-import ch.puzzle.itc.mobiliar.business.shakedown.control.ShakedownStpService;
-import ch.puzzle.itc.mobiliar.business.shakedown.entity.ShakedownStpEntity;
-import ch.puzzle.itc.mobiliar.common.exception.ElementAlreadyExistsException;
-import ch.puzzle.itc.mobiliar.common.exception.NotAuthorizedException;
-import ch.puzzle.itc.mobiliar.common.exception.StpNotFoundException;
-import ch.puzzle.itc.mobiliar.common.exception.TemplateNotDeletableException;
-import ch.puzzle.itc.mobiliar.common.util.ConfigurationService;
-import ch.puzzle.itc.mobiliar.common.util.ConfigKey;
-import ch.puzzle.itc.mobiliar.presentation.CompositeBackingBean;
-import ch.puzzle.itc.mobiliar.presentation.util.GlobalMessageAppender;
-
-@CompositeBackingBean
-public class ShakedownStpDataProvider implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-
-	@Inject
-	ShakedownStpService shakedownStpService;
-
-	private List<ShakedownStpEntity> stp;
-	private String newSTPName;
-	private String newSTPVersion;
-	private Integer selectedSTPId;
-	private ShakedownStpEntity selectedSTP;
-	private String oldSelectedSTPName;
-	private String fileName;
-	private List<String> str;
-
-	@PostConstruct
-	protected void initView() {
-		loadStps();
-	}
-
-	private void loadStps() {
-		stp = getSTPList();
-		setDefaultCurrentSTPEntity();
-	}
-
-	public void clearArguments(){
-		if(args!=null) {
-			args.clear();
-		}
-		if(stpArguments!=null) {
-			stpArguments.clear();
-		}
-	}
-
-	private void setDefaultCurrentSTPEntity() {
-		for (ShakedownStpEntity s : getStp()) {
-			setSelectedSTP(s);
-			break;
-		}
-	}
-
-	// STP list in template popupPanel testing mode
-	public List<String> getSTR() {
-		return str;
-	}
-
-	private void clearInput() {
-		newSTPName = null;
-		newSTPVersion = null;
-	}
-
-	public void createNewSTP() {
-		addArgumentsToSTP();
-		if(stpArguments==null) {
-			stpArguments = new ArrayList<String>();
-		}
-		stpArguments.clear();
-		for(STPArgument arg: args){
-			if(arg!=null) {
-				stpArguments.add(arg.argumentValue);
-			}
-		}
-		createNewSTP(newSTPName, newSTPVersion, stpArguments);
-		clearInput();
-		loadStps();
-		args.clear();
-		stpArguments.clear();
-	}
-
-	private List<STPArgument> args;
-	private List<String> stpArguments;
-
-	public void addArgumentsToSTP() {
-		if (args == null) {
-			args = new ArrayList<STPArgument>();
-		}
-		STPArgument arg = new STPArgument();
-		args.add(arg);
-		if (stpArguments == null) {
-			stpArguments = new ArrayList<String>();
-		}
-		for (STPArgument a : args) {
-			if (a.getArgumentValue() != null) {
-				stpArguments.add(a.getArgumentValue());
-			}
-		}
-	}
-
-	public void removeSelectedArguments(SequenceIterationStatus argumentId) {
-		int index = argumentId.getIndex();
-		args.remove(index);
-	}
-
-	public class STPArgument {
-		private String argumentValue;
-
-		public String getArgumentValue() {
-			return argumentValue;
-		}
-
-		public void setArgumentValue(String argumentValue) {
-			this.argumentValue = argumentValue;
-		}
-	}
-
-	public List<ShakedownStpEntity> getStp() {
-		if (stp == null) {
-			stp = new ArrayList<ShakedownStpEntity>();
-		}
-		return stp;
-	}
-
-	public void deleteSTP() throws TemplateNotDeletableException {
-		deleteSTP(currentSTPSelected().getId());
-		loadStps();
-	}
-
-	public ShakedownStpEntity currentSTPSelected() {
-		for (ShakedownStpEntity s : getStp()) {
-			if (s.getId().equals(selectedSTPId)) {
-				setSelectedSTP(s);
-				return s;
-			}
-		}
-		return null;
-	}
-
-	public void editSTP() {
-		if(stpArguments==null) {
-			stpArguments = new ArrayList<String>();
-		}
-		stpArguments.clear();
-		for(STPArgument arg: args){
-			if(arg!=null) {
-				stpArguments.add(arg.argumentValue);
-			}
-		}
-		boolean success = editSTP(selectedSTP, stpArguments);
-		if (success && oldSelectedSTPName != null && !oldSelectedSTPName.equals(selectedSTP.getStpName())) {
-			String stpRepo = ConfigurationService.getProperty(ConfigKey.STM_REPO);
-			GlobalMessageAppender.addSuccessMessage("Please change " + oldSelectedSTPName + ".zip at " + stpRepo + " to "
-					+ selectedSTP.getStpName() + ".zip !");
-		}
-		loadStps();
-	}
-
-	public Integer getSelectedSTPId() {
-		return selectedSTPId;
-	}
-
-	public void setSelectedSTPId(Integer selectedSTPId) {
-		this.selectedSTPId = selectedSTPId;
-	}
-
-	public String getNewSTPName() {
-		return newSTPName;
-	}
-
-	public void setNewSTPName(String newSTPName) {
-		this.newSTPName = newSTPName;
-	}
-
-	public String getNewSTPVersion() {
-		return newSTPVersion;
-	}
-
-	public void setNewSTPVersion(String newSTPVersion) {
-		this.newSTPVersion = newSTPVersion;
-	}
-
-	public ShakedownStpEntity getSelectedSTP() {
-		return selectedSTP;
-	}
-
-	public void setSelectedSTP(ShakedownStpEntity selectedSTP) {
-		this.selectedSTP = selectedSTP;
-		this.oldSelectedSTPName = selectedSTP.getStpName();
-	}
-
-	public String getFileName() {
-		return fileName;
-	}
-
-	public void setFileName(String fileName) {
-		this.fileName = fileName;
-	}
-
-	public List<STPArgument> getArgs() {
-		return args;
-	}
-
-	public void setArgs(List<STPArgument> args) {
-		this.args = args;
-	}
-
-	public List<String> getStpArguments() {
-		return stpArguments;
-	}
-
-	public void setStpArguments(List<String> stpArguments) {
-		this.stpArguments = stpArguments;
-	}
-
-	public List<STPArgument> createTempArgumentToEditPopupPanel() {
-		if (stpArguments == null) {
-			stpArguments = new ArrayList<String>();
-		} else {
-			stpArguments.clear();
-		}
-		if(args == null) {
-			args = new ArrayList<STPArgument>();
-		} else {
-			args.clear();
-		}
-		ShakedownStpEntity selectedSTP = currentSTPSelected();
-		if(selectedSTP!=null){
-			if (selectedSTP.getComaSeperatedParameters() != null) {
-				String[] splits = selectedSTP.getComaSeperatedParameters().split(",");
-				for (String s : splits) {
-					stpArguments.add(s);
-					STPArgument a = new STPArgument();
-					a.setArgumentValue(s);
-					args.add(a);
-				}
-				return args;
-			}
-		}
-		args.clear();
-		return args;
-	}
-
-	private List<ShakedownStpEntity> getSTPList(){
-		return shakedownStpService.getSTPsWithoutSTS();
-	}
-
-	private boolean createNewSTP(String newSTPName, String newSTPVersion, List<String> args) {
-		boolean isSucessfully = false;
-		String message;
-		try {
-			if(newSTPName == null || newSTPName.isEmpty()){
-				message = "The name of STP must not be empty";
-				GlobalMessageAppender.addErrorMessage(message);
-			}else if(newSTPVersion== null || newSTPVersion.isEmpty()){
-				message = "The version of STP must not be empty";
-				GlobalMessageAppender.addErrorMessage(message);
-			}else{
-				try{
-					shakedownStpService.createNewSTP(newSTPName,newSTPVersion,args);
-					message = "STP " + newSTPName + " sucessfully created";
-					GlobalMessageAppender.addSuccessMessage(message);
-					isSucessfully = true;
-				}catch(EJBException e){
-					if(e.getCause() instanceof NotAuthorizedException) {
-						GlobalMessageAppender.addErrorMessage(e.getCause().getMessage());
-					} else {
-						throw e;
-					}
-				}
-			}
-		} catch (ElementAlreadyExistsException e) {
-			ElementAlreadyExistsException ex = e;
-			String errorMessage = "";
-			if(ex.getExistingObjectClass() == ShakedownStpEntity.class){
-				errorMessage = "An STP with the name " + e.getExistingObjectName() + " already exists.";
-			}
-			GlobalMessageAppender.addErrorMessage(errorMessage);
-		}
-		return isSucessfully;
-	}
-
-	private boolean deleteSTP(Integer stpId) throws TemplateNotDeletableException {
-		boolean isSucessfully = false;
-		try {
-			if(stpId == null){
-				String errorMessage = "No STP selected";
-				GlobalMessageAppender.addErrorMessage(errorMessage);
-			}else{
-				try{
-					shakedownStpService.deleteSTPEntity(stpId);
-					String message = "STP succesfully deleted";
-					GlobalMessageAppender.addSuccessMessage(message);
-					isSucessfully = true;
-				}catch(EJBException e){
-					if(e.getCause() instanceof NotAuthorizedException) {
-						GlobalMessageAppender.addErrorMessage(e.getCause().getMessage());
-					} else {
-						throw e;
-					}
-				}
-			}
-		} catch (StpNotFoundException stpe) {
-			String errorMessage = "Could not load selected STP for deleted";
-			GlobalMessageAppender.addErrorMessage(errorMessage);
-		}
-		return isSucessfully;
-	}
-
-	private boolean editSTP(ShakedownStpEntity stpEntity,List<String> args){
-		boolean isSucessfully = false;
-		String message;
-		if(stpEntity == null ){
-			message = "No STP selected";
-			GlobalMessageAppender.addErrorMessage(message);
-		}else{
-			try{
-				List<String> notAddedArgs = shakedownStpService.editSTPEntity(stpEntity, args);
-				if (notAddedArgs != null) {
-					message = "STP " + stpEntity.getStpName() + " sucessfully updated";
-					GlobalMessageAppender.addSuccessMessage(message);
-					isSucessfully = true;
-					if (!notAddedArgs.isEmpty()) {
-						String warning = "The following arguments were not added because they already exist: " + notAddedArgs.toString();
-						GlobalMessageAppender.addSuccessMessage(warning);
-					}
-				} else {
-					String errorMessage = "STP " + stpEntity.getStpName() + " could not be saved";
-					GlobalMessageAppender.addErrorMessage(errorMessage);
-				}
-			}catch(EJBException e){
-				if(e.getCause() instanceof NotAuthorizedException) {
-					GlobalMessageAppender.addErrorMessage(e.getCause().getMessage());
-				} else {
-					throw e;
-				}
-			}
-		}
-		return isSucessfully;
-	}
-
-}
diff --git a/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/shakedowntest/ShakedownTestScreenController.java b/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/shakedowntest/ShakedownTestScreenController.java
deleted file mode 100644
index bf333afd9..000000000
--- a/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/shakedowntest/ShakedownTestScreenController.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * AMW - Automated Middleware allows you to manage the configurations of
- * your Java EE applications on an unlimited number of different environments
- * with various versions, including the automated deployment of those apps.
- * Copyright (C) 2013-2016 by Puzzle ITC
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package ch.puzzle.itc.mobiliar.presentation.shakedowntest;
-
-import ch.puzzle.itc.mobiliar.business.deploy.boundary.DeploymentBoundary;
-import ch.puzzle.itc.mobiliar.business.deploy.entity.CustomFilter;
-import ch.puzzle.itc.mobiliar.business.deploy.entity.DeploymentEntity;
-import ch.puzzle.itc.mobiliar.business.domain.commons.Sort.SortingDirectionType;
-import ch.puzzle.itc.mobiliar.business.resourcegroup.control.ResourceGroupPersistenceService;
-import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.ResourceGroupEntity;
-import ch.puzzle.itc.mobiliar.business.shakedown.control.ShakedownTestService;
-import ch.puzzle.itc.mobiliar.business.shakedown.entity.ShakedownTestEntity;
-import ch.puzzle.itc.mobiliar.business.shakedown.entity.ShakedownTestEntity.shakedownTest_state;
-import ch.puzzle.itc.mobiliar.business.shakedown.entity.ShakedownTestFilterTypes;
-import ch.puzzle.itc.mobiliar.business.shakedown.entity.ShakedownTestOrder;
-import ch.puzzle.itc.mobiliar.business.shakedown.event.ShakedownTestEvent;
-import ch.puzzle.itc.mobiliar.business.shakedown.event.ShakedownTestEvent.ShakedownTestEventType;
-import ch.puzzle.itc.mobiliar.common.util.DefaultResourceTypeDefinition;
-import ch.puzzle.itc.mobiliar.common.util.Tuple;
-import ch.puzzle.itc.mobiliar.presentation.shakedowntest.ShakedownTestScreenDataProvider.shakedownTestScreenColDescriptor;
-import ch.puzzle.itc.mobiliar.presentation.util.GlobalMessageAppender;
-import ch.puzzle.itc.mobiliar.presentation.util.UserSettings;
-
-import javax.enterprise.context.RequestScoped;
-import javax.enterprise.event.Event;
-import javax.inject.Inject;
-import javax.inject.Named;
-import java.util.List;
-import java.util.Set;
-
-@Named
-@RequestScoped
-public class ShakedownTestScreenController{
-
-	@Inject
-	private ShakedownTestService shakedownTestService;
-
-	@Inject
-	private UserSettings userSettings;
-
-	@Inject
-	private DeploymentBoundary deploymentBoundary;
-
-	@Inject
-	private ResourceGroupPersistenceService resourceGroupService;
-
-	@Inject
-	private Event<ShakedownTestEvent> shakedownTestEvent;
-
-
-
-	public Tuple<Set<ShakedownTestEntity>, Integer> loadPendingShakedownTests(boolean count, Integer startIndex, Integer maxResults, List<CustomFilter> filter,
-			shakedownTestScreenColDescriptor sortingColumn, SortingDirectionType sortingDirection) {
-		// TODO remove executed
-
-		if (maxResults != null && maxResults == 0) {
-			maxResults = null;
-		}
-
-		String colToSort = null;
-		if (sortingColumn != null) {
-
-			// TODO implementieren
-			// Mapping zwischen anzeige col und in db zu filternde col
-			switch (sortingColumn) {
-			case ID:
-				colToSort = ShakedownTestFilterTypes.ID.getFilterTabColumnName();
-				break;
-			case TRACKING_ID:
-				colToSort = ShakedownTestFilterTypes.TRACKING_ID.getFilterTabColumnName();
-				break;
-			case STATE:
-				colToSort = ShakedownTestFilterTypes.TEST_STATE.getFilterTabColumnName();
-				break;
-			case APPSERVER_NAME:
-				colToSort = ShakedownTestFilterTypes.APPSERVER_NAME.getFilterTabColumnName();
-				break;
-			case RELEASE:
-				colToSort = ShakedownTestFilterTypes.APPSERVER_RELEASE.getFilterTabColumnName();
-				break;
-			case ENV:
-				colToSort = ShakedownTestFilterTypes.ENVIRONMENT_NAME.getFilterTabColumnName();
-				break;
-			case TESTDATE:
-				colToSort = ShakedownTestFilterTypes.TEST_DATE.getFilterTabColumnName();
-				break;
-			default:
-				break;
-			}
-		}
-
-		return shakedownTestService.getFilteredShakedownTests(count, startIndex, maxResults, filter, colToSort, sortingDirection, userSettings.getMyAMWFilter());
-	}
-
-	public List<ResourceGroupEntity> loadAppServers() {
-		return resourceGroupService.loadGroupsForTypeName(DefaultResourceTypeDefinition.APPLICATIONSERVER.name(), userSettings.getMyAMWFilter());
-	}
-	
-	public List<ResourceGroupEntity> loadAllApplications(){
-		return shakedownTestService.getAllApplications();
-	}
-	
-	
-
-	public Integer createShakedownTestOrder(List<ShakedownTestOrder> shakedownTestOrder) {
-		Integer trackingId = null;
-		if (shakedownTestOrder != null && !shakedownTestOrder.isEmpty()) {
-			trackingId = shakedownTestService.createShakedownTestOrderReturnsTrackingId(shakedownTestOrder);
-
-			if (trackingId == null) {
-				GlobalMessageAppender.addErrorMessage("Could not create shakedown test order.");
-			} else {
-				GlobalMessageAppender.addSuccessMessage("Shakedown test order successfully created.");
-				// fire the Event to execute the Shakedowntests
-				shakedownTestEvent.fire(new ShakedownTestEvent(ShakedownTestEventType.NEW, shakedownTest_state.scheduled));
-			}
-		}
-
-		return trackingId;
-	}
-
-	public List<DeploymentEntity> getAllLastSucessfullDeployments() {
-		return deploymentBoundary.getListOfLastDeploymentsForAppServerAndContext(true);
-	}
-
-}
\ No newline at end of file
diff --git a/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/shakedowntest/ShakedownTestScreenDataProvider.java b/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/shakedowntest/ShakedownTestScreenDataProvider.java
deleted file mode 100644
index 8f15207d9..000000000
--- a/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/shakedowntest/ShakedownTestScreenDataProvider.java
+++ /dev/null
@@ -1,765 +0,0 @@
-/*
- * AMW - Automated Middleware allows you to manage the configurations of
- * your Java EE applications on an unlimited number of different environments
- * with various versions, including the automated deployment of those apps.
- * Copyright (C) 2013-2016 by Puzzle ITC
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package ch.puzzle.itc.mobiliar.presentation.shakedowntest;
-
-import ch.puzzle.itc.mobiliar.business.deploy.entity.CustomFilter;
-import ch.puzzle.itc.mobiliar.business.deploy.entity.DeploymentEntity;
-import ch.puzzle.itc.mobiliar.business.deploy.entity.DeploymentFilterTypes;
-import ch.puzzle.itc.mobiliar.business.domain.commons.Sort.SortingDirectionType;
-import ch.puzzle.itc.mobiliar.business.environment.entity.ContextEntity;
-import ch.puzzle.itc.mobiliar.business.generator.control.extracted.ResourceDependencyResolverService;
-import ch.puzzle.itc.mobiliar.business.releasing.control.ReleaseMgmtService;
-import ch.puzzle.itc.mobiliar.business.releasing.entity.ReleaseEntity;
-import ch.puzzle.itc.mobiliar.business.resourcegroup.control.ResourceTypeProvider;
-import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.ResourceGroupEntity;
-import ch.puzzle.itc.mobiliar.business.shakedown.entity.ShakedownTestEntity;
-import ch.puzzle.itc.mobiliar.business.shakedown.entity.ShakedownTestEntity.shakedownTest_state;
-import ch.puzzle.itc.mobiliar.business.shakedown.entity.ShakedownTestFilterTypes;
-import ch.puzzle.itc.mobiliar.business.shakedown.entity.ShakedownTestOrder;
-import ch.puzzle.itc.mobiliar.common.exception.NotAuthorizedException;
-import ch.puzzle.itc.mobiliar.common.util.Tuple;
-import ch.puzzle.itc.mobiliar.presentation.common.ContextDataProvider;
-import ch.puzzle.itc.mobiliar.presentation.components.impl.CustomFilterComp;
-import ch.puzzle.itc.mobiliar.presentation.util.GlobalMessageAppender;
-import lombok.Getter;
-import lombok.Setter;
-
-import javax.ejb.EJBException;
-import javax.enterprise.context.SessionScoped;
-import javax.faces.context.FacesContext;
-import javax.inject.Inject;
-import javax.inject.Named;
-import java.io.Serializable;
-import java.text.Format;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-@Named
-@SessionScoped // TODO: Migrate to new concept Be careful state of filter not kept in viewScoped
-public class ShakedownTestScreenDataProvider implements Serializable {
-	private static final long serialVersionUID = 1L;
-	private static final String EMPTY_STRING = "";
-
-	private enum PresetViewOptions {
-		SHAKEDOWN_TEST("Shakedown tests");
-		private String displayName;
-
-		private PresetViewOptions(String displayName) {
-			this.displayName = displayName;
-		}
-
-		public String getDisplayName() {
-			return this.displayName;
-		}
-	}
-
-	/**
-	 * Falls enum angepasst oder refactored wird, so muss dies zwingend im shakedowntest.xhtml nachgetragen
-	 * werden!
-	 */
-	public enum shakedownTestScreenColDescriptor {
-		ID, TRACKING_ID, STATE, APPSERVER_NAME, RELEASE, ENV, TESTDATE
-	}
-
-	@Inject
-	ReleaseMgmtService releaseMgmtService;
-
-	@Inject
-	ResourceDependencyResolverService dependencyResolverService;
-
-	@Inject
-	ShakedownTestScreenController controller;
-
-	@Inject
-	ContextDataProvider contextDataProvider;
-
-	@Inject
-	ResourceTypeProvider resourceTypeProvider;
-
-	private List<ShakedownTestEntity> shakedownTests;
-	private List<String> shakedowntestPresetViewsOptions;
-	private String selectedShakedownTestPresetView = PresetViewOptions.SHAKEDOWN_TEST.getDisplayName();
-	@Getter
-	@Setter
-	private Integer selectedShakedownTestId;
-	private int countAllShakedownTests;
-	private ArrayList<String> allAppDisplayNames;
-	private Map<Integer, ResourceGroupEntity> asGroups;
-	private Map<Integer, List<ResourceGroupEntity>> contextIdMapWithSuccessfullLastDeployedAppServer;
-	@Getter
-	@Setter
-	private Integer selectedOrderEnvironmentId;
-	@Getter
-	@Setter
-	private Integer selectedOrderAppServerGroupId;
-	private List<ShakedownTestOrder> shakedownTestOrder;
-	@Getter
-	@Setter
-	private Integer trackingIdFromLastCreatedOrder;
-	@Getter
-	@Setter
-	private boolean showOnlyDeployedAppServers;
-	private Map<Integer, DeploymentEntity> groupToDeploymentMap;
-
-	// paging, sorting
-	@Getter
-	private int currentPage;
-	private int itemsPerPage;
-	private SortingDirectionType sortingDirection = null;
-	private shakedownTestScreenColDescriptor sortingColumn = null;
-
-	// Releasing
-	@Getter
-	private ReleaseEntity selectedRelease;
-	@Getter
-	private List<ReleaseEntity> allReleases;
-	private Map<Integer, ReleaseEntity> allReleasesMap;
-
-	@Getter
-	private boolean renderCreateOrderDialog;
-
-	private ShakedownTestFilterTypes selectedFilter;
-
-	@Getter
-	private CustomFilterComp customFilterComp = new CustomFilterCompImpl();
-
-
-	public void initView() {
-	    if (!FacesContext.getCurrentInstance().isPostback()) {
-		   reloadShakedownTests(true);
-		   initDefaultSelection();
-		   loadAllReleases();
-		   loadApplicationServerGroups();
-		   showOnlyDeployedAppServers = false;
-		   selectedOrderAppServerGroupId = null;
-		   selectedRelease = null;
-	    }
-	}
-
-	private class CustomFilterCompImpl extends CustomFilterComp {
-
-
-		@Override
-		public void addSelectedFilter() {
-
-			selectedFilter = getSelectedEnumType(getSelectedFilterItemEnumName());
-
-			if (selectedFilter != null) {
-				CustomFilter filter = CustomFilter.builder(selectedFilter).build();
-				filter.setComparatorSelection(filter.getTypedComparatorSelectionList().isEmpty() ? null : filter.getTypedComparatorSelectionList().get(0));
-				if (selectedFilter.equals(DeploymentFilterTypes.LASTDEPLOYJOBFORASENV) && hasAlreadySpecialTypeFilter(getSelectedFilterList())) {
-					GlobalMessageAppender.addErrorMessage("This filter is already set.");
-				} else {
-					filter = setFilterDropDownOptions(filter);
-
-					getSelectedFilterList().add(filter);
-
-				}
-			}
-			selectedFilter = null;
-
-		}
-
-		private ShakedownTestFilterTypes getSelectedEnumType(String selectedFilter) {
-			ShakedownTestFilterTypes result = null;
-			for (ShakedownTestFilterTypes filterType : ShakedownTestFilterTypes.values()) {
-				if (filterType.name().equals(selectedFilter)) {
-					result = filterType;
-					break;
-				}
-			}
-
-			return result;
-		}
-
-		@Override
-		protected void loadFilterList() {
-			List<FilterSelectionItem> filterSelectionItemList = new ArrayList<CustomFilterComp.FilterSelectionItem>();
-			for (ShakedownTestFilterTypes filterType : ShakedownTestFilterTypes.values()) {
-				filterSelectionItemList.add(new FilterSelectionItem(filterType.name(), filterType
-						.getFilterDisplayName()));
-			}
-			setFilterSelectionList(filterSelectionItemList);
-		}
-
-		@Override
-		protected CustomFilter setFilterDropDownOptions(CustomFilter filter) {
-
-			if (filter.getFilterDisplayName().equals(
-					ShakedownTestFilterTypes.APPSERVER_NAME.getFilterDisplayName())) {
-				filter.setDropDownItems(getAllAppServerNames());
-			}
-
-			if (filter.getFilterDisplayName().equals(
-					ShakedownTestFilterTypes.ENVIRONMENT_NAME.getFilterDisplayName())) {
-				filter.setDropDownItems(getAllEnvNames());
-			}
-
-			if (filter.getFilterDisplayName().equals(
-					ShakedownTestFilterTypes.APPLICATION_NAME.getFilterDisplayName())) {
-				filter.setDropDownItems(getAllAppDisplayNames());
-			}
-
-			if (filter.getFilterDisplayName().equals(
-					ShakedownTestFilterTypes.TEST_STATE.getFilterDisplayName())) {
-				filter.setDropDownItems(getAllStates());
-			}
-			if (filter.getFilterDisplayName().equals(
-					ShakedownTestFilterTypes.APPSERVER_RELEASE.getFilterDisplayName())) {
-				Map<String, String> releaseMap = new LinkedHashMap<>();
-				for (ReleaseEntity r : allReleases) {
-					releaseMap.put(r.getName(),
-							CustomFilter.convertDateToString(r.getInstallationInProductionAt()));
-				}
-				filter.setDropDownItemsMap(releaseMap);
-			}
-			return filter;
-		}
-
-	}
-
-	public void addShakedownTestOrder() {
-		boolean valid = true;
-		if (selectedOrderEnvironmentId == null || selectedOrderEnvironmentId == 0) {
-			GlobalMessageAppender.addErrorMessage("No environment selected");
-			valid = false;
-		}
-		if (selectedOrderAppServerGroupId == null || selectedOrderAppServerGroupId == 0) {
-			GlobalMessageAppender.addErrorMessage("No application server selected");
-			valid = false;
-		}
-		if (selectedRelease == null && !showOnlyDeployedAppServers) {
-			GlobalMessageAppender.addErrorMessage("No release selected");
-			valid = false;
-		}
-
-		if (valid) {
-			List<ResourceGroupEntity> selectedAppServerGroups = null;
-            ContextEntity context = getContextForId(selectedOrderEnvironmentId);
-
-			if (selectedOrderAppServerGroupId > 0) {
-				selectedAppServerGroups = Collections.singletonList(asGroups
-						.get(selectedOrderAppServerGroupId));
-			}
-			else if (showOnlyDeployedAppServers) {
-				// deployed appServers
-				selectedAppServerGroups = new ArrayList<>(getDeployedAppServerGroups());
-			}
-			else {
-				// all appServers
-				selectedAppServerGroups = new ArrayList<>(asGroups.values());
-			}
-
-			ShakedownTestOrder shakedownTestOrder = new ShakedownTestOrder(context, selectedRelease, selectedAppServerGroups);
-			getShakedownTestOrder().add(shakedownTestOrder);
-		}
-	}
-
-
-	
-	private ContextEntity getContextForId(Integer id) {
-		for (ContextEntity context : contextDataProvider.getEnvironments()) {
-			if (context.getId().equals(id)) {
-				return context;
-			}
-		}
-		return null;
-	}
-
-	public List<ResourceGroupEntity> getAppServerGroups() {
-		if (showOnlyDeployedAppServers) {
-			return getDeployedAppServerGroups();
-		}
-		List<ResourceGroupEntity> result = new ArrayList<>(asGroups.values());
-		Collections.sort(result);
-		return result;
-	}
-
-	private List<ResourceGroupEntity> getDeployedAppServerGroups() {
-		if (selectedOrderEnvironmentId != null && selectedOrderEnvironmentId != null) {
-			List<ResourceGroupEntity> asList = contextIdMapWithSuccessfullLastDeployedAppServer
-					.get(selectedOrderEnvironmentId);
-			if (asList != null) {
-				Collections.sort(asList);
-				return asList;
-			}
-		}
-		return Collections.emptyList();
-	}
-
-	public void createShakedownTest() {
-		try {
-
-			trackingIdFromLastCreatedOrder = controller.createShakedownTestOrder(getShakedownTestOrder());
-
-			if (trackingIdFromLastCreatedOrder != null) {
-
-				setFilterForLastShakedownTestOrder();
-				getShakedownTestOrder().clear();
-				reloadShakedownTests(true);
-			}
-		}
-		catch (EJBException e) {
-			if (e.getCause() instanceof NotAuthorizedException) {
-				GlobalMessageAppender.addErrorMessage(e.getCause().getMessage());
-			}
-			else {
-				throw e;
-			}
-		}
-	}
-
-	public void removeSelectedShakedownTestFromOrder(ShakedownTestOrder test) {
-		if (getShakedownTestOrder().contains(test)) {
-			getShakedownTestOrder().remove(test);
-		}
-	}
-
-	public List<ShakedownTestOrder> getShakedownTestOrder() {
-		if (shakedownTestOrder == null) {
-			shakedownTestOrder = new ArrayList<>();
-		}
-		return shakedownTestOrder;
-	}
-
-	private void setFilterForLastShakedownTestOrder() {
-
-		if (trackingIdFromLastCreatedOrder != null) {
-
-			getCustomFilterComp().removeAllFilter();
-			CustomFilter filter = CustomFilter.builder(ShakedownTestFilterTypes.TRACKING_ID).build();
-			filter.setValue(trackingIdFromLastCreatedOrder.toString());
-
-			getCustomFilterComp().getSelectedFilterList().add(filter);
-
-			sortingDirection = SortingDirectionType.ASC;
-			sortingColumn = shakedownTestScreenColDescriptor.ID;
-		}
-
-	}
-
-	public void goToScreen(Integer screen) {
-		currentPage = Math.min(Math.max(0, screen), maxScreens() - 1);
-		reloadShakedownTests(false);
-	}
-
-	public void nextScreen() {
-		currentPage = Math.min(++currentPage, maxScreens() - 1);
-		reloadShakedownTests(false);
-	}
-
-	public void lastScreen() {
-		currentPage = maxScreens() - 1;
-		reloadShakedownTests(false);
-	}
-
-	public void changeSortOrderForSelectedColumn(String enumName) {
-		shakedownTestScreenColDescriptor col = getEnumValueForString(enumName);
-		if (col != null) {
-			if (sortingColumn.equals(col)) {
-				if (sortingDirection == null) {
-					// set to asc
-					sortingDirection = SortingDirectionType.ASC;
-				}
-				else {
-					switch (sortingDirection) {
-					case ASC:
-						// set to desc
-						sortingDirection = SortingDirectionType.DESC;
-						break;
-					case DESC:
-						// set to asc
-						sortingDirection = SortingDirectionType.ASC;
-						break;
-					}
-				}
-			}
-			else {
-				// auswahl einer neuen spalte beginnt immer mit asc sortierung
-				sortingColumn = col;
-				sortingDirection = SortingDirectionType.ASC;
-			}
-		}
-		// do sorting
-		reloadShakedownTests(false);
-	}
-
-	public void shakedownTestPresetViewChangeListener(String selectedShakedownTestPresetView) {
-		if (!this.selectedShakedownTestPresetView.equals(selectedShakedownTestPresetView)) {
-			this.selectedShakedownTestPresetView = selectedShakedownTestPresetView;
-			reloadShakedownTests(false);
-		}
-	}
-
-	public void firstScreen() {
-		currentPage = 0;
-		reloadShakedownTests(false);
-	};
-
-	public void previousScreen() {
-		currentPage = Math.max(0, --currentPage);
-		reloadShakedownTests(false);
-	}
-
-	public void setItemsPerPage(int itemsPerPage) {
-		if (itemsPerPage < 0) {
-			itemsPerPage = 0;
-		}
-		if (itemsPerPage != this.itemsPerPage) {
-			this.itemsPerPage = itemsPerPage;
-			this.currentPage = 0;
-			reloadShakedownTests(false);
-		}
-	}
-
-
-
-	public void reloadShakedownTests(boolean countAgain) {
-		if (countAgain) {
-			currentPage = 0;
-		}
-		Tuple<Set<ShakedownTestEntity>, Integer> result = controller.loadPendingShakedownTests(countAgain,
-				currentStartIndex(), getItemsPerPage(), getAppliedFilterList(), sortingColumn,
-				sortingDirection);
-		if (result.getB() != null) {
-			countAllShakedownTests = result.getB();
-		}
-
-		shakedownTests = new ArrayList<>(result.getA());
-	}
-
-	public List<CustomFilter> getAppliedFilterList() {
-
-		List<CustomFilter> appliedFilter = new ArrayList<>();
-
-		if (isShakedownTestViewSelected()) {
-
-			for (CustomFilter filter : getCustomFilterComp().getSelectedFilterList()) {
-				if (filter.isSelected()) {
-					appliedFilter.add(filter);
-				}
-			}
-		}
-
-		return appliedFilter;
-	}
-
-	private int currentStartIndex() {
-		return currentPage * getItemsPerPage();
-	}
-
-	public List<Integer> availablePages() {
-		List<Integer> list = new ArrayList<>();
-		list.add(0);
-		for (int i = 1; i < maxScreens(); i++) {
-			list.add(i);
-		}
-		return list;
-	}
-
-	public boolean isLastPage() {
-		return currentPage >= maxScreens() - 1;
-	}
-
-	private int maxScreens() {
-		return (int) Math.ceil(((double) countAllShakedownTests / (double) Math.max(itemsPerPage,
-				getItemsPerPage())));
-	}
-
-	public int getItemsPerPage() {
-		return itemsPerPage < 1 ? 10 : itemsPerPage;
-	}
-
-	public boolean isShakedownTestViewSelected() {
-		return selectedShakedownTestPresetView.equals(PresetViewOptions.SHAKEDOWN_TEST.getDisplayName());
-	}
-
-	public String getSortingIconForCol(String enumName) {
-		String result = "icon icon-sortnone";
-		shakedownTestScreenColDescriptor col = getEnumValueForString(enumName);
-
-		if (col != null) {
-			if (sortingDirection != null && sortingColumn != null && sortingColumn.equals(col)) {
-				if (sortingDirection.equals(SortingDirectionType.ASC)) {
-					result = "icon icon-sortasc";
-				}
-				else {
-					result = "icon icon-sortdesc";
-				}
-			}
-		}
-		return result;
-	}
-
-	private shakedownTestScreenColDescriptor getEnumValueForString(String enumName) {
-		shakedownTestScreenColDescriptor col = null;
-		try {
-			col = shakedownTestScreenColDescriptor.valueOf(enumName);
-		}
-		catch (IllegalArgumentException ie) {
-			// no special treatment
-		}
-		catch (NullPointerException npe) {
-			// no special treatment
-		}
-		return col;
-	}
-
-	public List<String> getShakedownTestPresetViewsOptions() {
-		if (shakedowntestPresetViewsOptions == null) {
-			shakedowntestPresetViewsOptions = new ArrayList<>();
-			initShakedownTestPresetViewsOptions();
-		}
-
-		return shakedowntestPresetViewsOptions;
-	}
-
-	private void initShakedownTestPresetViewsOptions() {
-		for (PresetViewOptions viewOption : PresetViewOptions.values()) {
-			shakedowntestPresetViewsOptions.add(viewOption.getDisplayName());
-		}
-	}
-
-	public void setCurrentPage(int currentPage) {
-		if (currentPage != 0 && currentPage != this.currentPage) {
-			this.currentPage = currentPage;
-			// loadApplicationServerGroups();
-		}
-	}
-
-	public void initCreateTestPopupPanel() {
-		renderCreateOrderDialog = true;
-		loadApplicationServerGroups();
-		// FIXME: loads way to much...
-		loadSuccessfulDeployments();
-		selectedOrderAppServerGroupId = null;
-		selectedOrderEnvironmentId = null;
-	}
-
-	private void loadSuccessfulDeployments() {
-		contextIdMapWithSuccessfullLastDeployedAppServer = new HashMap();
-		groupToDeploymentMap = new HashMap();
-
-		List<DeploymentEntity> deployments = controller.getAllLastSucessfullDeployments();
-
-		for (DeploymentEntity deploymentEntity : deployments) {
-			if (deploymentEntity.isPreserved()) {
-				continue;
-			}
-			Integer contextId = deploymentEntity.getContext().getId();
-			ResourceGroupEntity group = deploymentEntity.getResourceGroup();
-			if (contextIdMapWithSuccessfullLastDeployedAppServer.containsKey(contextId)) {
-				contextIdMapWithSuccessfullLastDeployedAppServer.get(contextId).add(group);
-			}
-			else {
-				List<ResourceGroupEntity> asList = new ArrayList<>();
-				asList.add(group);
-				contextIdMapWithSuccessfullLastDeployedAppServer.put(contextId, asList);
-			}
-			groupToDeploymentMap.put(group.getId(), deploymentEntity);
-		}
-	}
-
-	public void loadApplicationServerGroups() {
-		asGroups = new HashMap();
-		List<ResourceGroupEntity> asList = controller.loadAppServers();
-		// filter group
-		for (ResourceGroupEntity g : asList) {
-			if (g != null) {
-				if (!g.isAppServerContainer() && !asGroups.containsKey(g.getId())) {
-					asGroups.put(g.getId(), g);
-				}
-			}
-		}
-	}
-
-
-
-	private List<String> getAllAppDisplayNames() {
-		if (allAppDisplayNames == null) {
-			allAppDisplayNames = new ArrayList<>();
-			for(ResourceGroupEntity group : controller.loadAllApplications()){
-				allAppDisplayNames.add(group.getName());
-			}
-		}
-		Collections.sort(allAppDisplayNames);
-		return allAppDisplayNames;
-	}
-
-	public ShakedownTestEntity getSelectedShakedownTest() {
-		if (selectedShakedownTestId != null) {
-			for (ShakedownTestEntity sdTest : getShakedownTests()) {
-				if (sdTest.getId().equals(selectedShakedownTestId)) {
-					return sdTest;
-				}
-			}
-		}
-
-		return null;
-	}
-
-	public List<ShakedownTestEntity> getShakedownTests() {
-		if (shakedownTests == null) {
-			shakedownTests = new ArrayList<>();
-		}
-		return shakedownTests;
-	}
-
-	public List<String> getAllAppServerNames() {
-		List<String> result = new ArrayList<>();
-		if (asGroups != null) {
-			for(ResourceGroupEntity r : asGroups.values()){
-				result.add(r.getName());
-			}
-			Collections.sort(result);
-		}
-		return result;
-	}
-
-	public String getSelectedShakedownTestPresetView() {
-		return selectedShakedownTestPresetView;
-	}
-
-	public void setShakedownTests(List<ShakedownTestEntity> shakedownTests) {
-		this.shakedownTests = shakedownTests;
-	}
-
-	public String getShakedownTestStateText(ShakedownTestEntity shakedownTest) {
-		return shakedownTest.getShakedownTestState().getDisplayName();
-	}
-
-	public String getShakedownTestStateFrameCssClass(ShakedownTestEntity sdTest) {
-		String result = EMPTY_STRING;
-
-		switch (sdTest.getShakedownTestState()) {
-		case success:
-			result = "state success";
-			break;
-		case failed:
-			result = "state failed";
-			break;
-		case warning:
-			result = "state warning";
-			break;
-		case scheduled:
-			result = "state scheduled";
-			break;
-		case inprogress:
-			result = "state inprogress";
-			break;
-		}
-
-		return result;
-	}
-
-	public List<String> getAllEnvNames() {
-		List<String> result = new ArrayList<>();
-		for (ContextEntity ctx : contextDataProvider.getEnvironments()) {
-			result.add(ctx.getName());
-		}
-		Collections.sort(result);
-		return result;
-
-	}
-
-	public void setShakedownTestOrder(List<ShakedownTestOrder> shakedownTestOrder) {
-		this.shakedownTestOrder = shakedownTestOrder;
-	}
-
-	public String getAllAppserverSelectedText() {
-		return ShakedownTestOrder.allAppServerSelectedText;
-	}
-
-	private void initDefaultSelection() {
-		sortingDirection = SortingDirectionType.DESC;
-		sortingColumn = shakedownTestScreenColDescriptor.ID;
-	}
-
-	private List<String> getAllStates() {
-		List<String> statesDisplayNames = new ArrayList<>();
-		for (shakedownTest_state state : shakedownTest_state.values()) {
-			statesDisplayNames.add(state.getDisplayName());
-		}
-
-		Collections.sort(statesDisplayNames);
-
-		return statesDisplayNames;
-	}
-
-	public String getLastSuccessfulDeploymentDate() {
-		String result = "Not yet sucessfully deployed (by AMW)";
-		ShakedownTestEntity test = getSelectedShakedownTest();
-		if (test != null && test.getDeployment() != null
-				&& test.getDeployment().getDeploymentDate() != null) {
-			result = new SimpleDateFormat("yyyy-MM-dd HH:mm").format(test.getDeployment()
-					.getDeploymentDate());
-		}
-		return result;
-	}
-
-	private void loadAllReleases() {
-		allReleases = releaseMgmtService.loadAllReleases(false);
-		allReleasesMap = new HashMap();
-		for (ReleaseEntity rel : allReleases) {
-			allReleasesMap.put(rel.getId(), rel);
-		}
-	}
-
-	/**
-	 * loads a subSet of releases greater or equal to the first release in the selected group or an empty
-	 * list if no group is selected
-	 */
-	public List<ReleaseEntity> getReleasesForAs() {
-		List<ReleaseEntity> releasesForAs = null;
-		setSelectedReleaseId(null);
-		if (!showOnlyDeployedAppServers && selectedOrderAppServerGroupId != null
-				&& asGroups.containsKey(selectedOrderAppServerGroupId)) {
-			releasesForAs = releaseMgmtService.getDeployableReleasesForResourceGroup(asGroups
-					.get(selectedOrderAppServerGroupId));
-		}
-		else if (!showOnlyDeployedAppServers && selectedOrderAppServerGroupId != null
-				&& selectedOrderAppServerGroupId < 0) {
-			// add all releases
-			releasesForAs = new ArrayList<>(allReleases);
-		}
-		return releasesForAs;
-	}
-
-	public void setSelectedReleaseId(Integer selectedReleaseId) {
-		if (selectedReleaseId != null && allReleasesMap.containsKey(selectedReleaseId)) {
-			this.selectedRelease = allReleasesMap.get(selectedReleaseId);
-		}
-		else {
-			this.selectedRelease = null;
-		}
-	}
-
-	public Integer getSelectedReleaseId() {
-		return selectedRelease != null ? selectedRelease.getId() : null;
-	}
-
-	public String formatDate(Date date) {
-		Format formatter;
-		formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm");
-		return date != null ? formatter.format(date) : EMPTY_STRING;
-	}
-
-}
\ No newline at end of file
diff --git a/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/templateEdit/EditTemplateView.java b/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/templateEdit/EditTemplateView.java
index 10732600a..0136a6d98 100644
--- a/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/templateEdit/EditTemplateView.java
+++ b/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/templateEdit/EditTemplateView.java
@@ -24,8 +24,6 @@
 import ch.puzzle.itc.mobiliar.business.security.boundary.PermissionBoundary;
 import ch.puzzle.itc.mobiliar.business.security.control.PermissionService;
 import ch.puzzle.itc.mobiliar.business.security.entity.Action;
-import ch.puzzle.itc.mobiliar.business.shakedown.control.ShakedownStpService;
-import ch.puzzle.itc.mobiliar.business.shakedown.entity.ShakedownStpEntity;
 import ch.puzzle.itc.mobiliar.business.template.boundary.TemplateEditor;
 import ch.puzzle.itc.mobiliar.business.template.entity.RevisionInformation;
 import ch.puzzle.itc.mobiliar.business.template.entity.TemplateDescriptorEntity;
@@ -35,15 +33,11 @@
 import ch.puzzle.itc.mobiliar.presentation.ViewBackingBean;
 import ch.puzzle.itc.mobiliar.presentation.common.context.SessionContext;
 import ch.puzzle.itc.mobiliar.presentation.util.GlobalMessageAppender;
-import ch.puzzle.itc.mobiliar.presentation.util.TestingMode;
 import ch.puzzle.itc.mobiliar.presentation.util.UserSettings;
 import com.google.common.collect.Lists;
 import lombok.Getter;
 import lombok.Setter;
-import org.apache.commons.lang3.StringUtils;
 
-import javax.annotation.PostConstruct;
-import javax.enterprise.event.Observes;
 import javax.inject.Inject;
 import java.io.Serializable;
 import java.util.*;
@@ -65,9 +59,6 @@ public class EditTemplateView implements Serializable {
     @Inject
     PermissionBoundary permissionBoundary;
 
-    @Inject
-    ShakedownStpService stpService;
-
     @Inject
     @Getter
     private SessionContext sessionContext;
@@ -84,12 +75,6 @@ public class EditTemplateView implements Serializable {
     @Getter
     RevisionInformation compareRevision;
 
-    @Getter
-    List<ShakedownStpEntity> stpList;
-
-    @Getter
-    ShakedownStpEntity selectedStp;
-
     @Getter
     @Setter
     Integer relationIdForTemplate;
@@ -114,62 +99,6 @@ public void setContextIdViewParam(Integer contextIdViewParam) {
         sessionContext.setContextId(contextIdViewParam);
     }
 
-    @Inject
-    @TestingMode
-    private Boolean testing;
-
-    @TestingMode
-    public void onChangedTestingMode(@Observes Boolean isTesting) {
-        this.testing = isTesting;
-    }
-
-    /**
-     * @return true if testing is true and initialized, otherwise false
-     */
-    public boolean isTesting() {
-        return testing != null && testing;
-    }
-
-    @PostConstruct
-    public void init() {
-        if (settings.isTestingMode()) {
-            loadStpList();
-        }
-    }
-
-    private void loadStpList() {
-        if (stpList == null) {
-            stpList = stpService.getSTPs();
-        }
-        findSelectedStp();
-    }
-
-    private void findSelectedStp() {
-        if (stpList != null && !StringUtils.isBlank(template.getName())) {
-            for (ShakedownStpEntity stp : stpList) {
-                if (stp.getStpName().equals(template.getName())) {
-                    selectedStp = stp;
-                    break;
-                }
-            }
-        }
-    }
-
-    public Integer getSelectedStpId() {
-        return selectedStp != null ? selectedStp.getId() : null;
-    }
-
-    public void setSelectedStpId(Integer selectedStpId) {
-        if (stpList != null) {
-            for (ShakedownStpEntity entity : stpList) {
-                if (entity.getId().equals(selectedStpId)) {
-                    selectedStp = entity;
-                    return;
-                }
-            }
-        }
-        selectedStp = null;
-    }
 
     public Integer getTemplateId() {
         return template != null ? template.getId() : null;
@@ -204,7 +133,6 @@ public void setCompareRevisionId(Integer compareRevisionId) {
     public void setTemplateId(Integer templateId) {
         template = templateEditor.getTemplateById(templateId);
         revisionInformations = Lists.reverse(templateEditor.getTemplateRevisions(templateId));
-        findSelectedStp();
     }
 
     public boolean isNewTemplate() {
@@ -257,7 +185,6 @@ public void save() {
         boolean success = true;
         String errorMessage = "Was not able to save the template: ";
         try {
-            setTemplateName();
             saveTemplate();
         } catch (ResourceNotFoundException | ResourceTypeNotFoundException e) {
             success = fail(errorMessage + e.getMessage());
@@ -269,31 +196,20 @@ public void save() {
         }
     }
 
-    private void setTemplateName() throws AMWException {
-        template.setTesting(settings.isTestingMode());
-        if (template.isTesting()) {
-            if (selectedStp != null) {
-                template.setName(selectedStp.getStpName());
-            } else {
-                throwError("No STP-name selected!");
-            }
-        }
-    }
-
     private void saveTemplate() throws AMWException {
         if (relationIdForTemplate != null) {
             templateEditor.saveTemplateForRelation(template, relationIdForTemplate, resourceId != null);
             return;
         }
         if (resourceId == null) {
-            templateEditor.saveTemplateForResourceType(template, resourceTypeId, settings.isTestingMode());
+            templateEditor.saveTemplateForResourceType(template, resourceTypeId);
             return;
         }
-        templateEditor.saveTemplateForResource(template, resourceId, settings.isTestingMode());
+        templateEditor.saveTemplateForResource(template, resourceId);
     }
 
     public boolean canModifyTemplates() {
-        return permissionBoundary.canModifyTemplateOfResourceOrResourceType(resourceId, resourceTypeId, Action.UPDATE, settings.isTestingMode());
+        return permissionBoundary.canModifyTemplateOfResourceOrResourceType(resourceId, resourceTypeId, Action.UPDATE);
     }
 
     public boolean isRelation() {
diff --git a/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/templateEdit/TemplateEditDataProvider.java b/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/templateEdit/TemplateEditDataProvider.java
index 55ea5d77d..9634f3445 100644
--- a/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/templateEdit/TemplateEditDataProvider.java
+++ b/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/templateEdit/TemplateEditDataProvider.java
@@ -37,7 +37,6 @@
 import ch.puzzle.itc.mobiliar.presentation.CompositeBackingBean;
 import ch.puzzle.itc.mobiliar.presentation.common.context.SessionContext;
 import ch.puzzle.itc.mobiliar.presentation.resourceRelation.events.ChangeSelectedRelationEvent;
-import ch.puzzle.itc.mobiliar.presentation.util.TestingMode;
 import ch.puzzle.itc.mobiliar.presentation.util.UserSettings;
 import lombok.Getter;
 import lombok.Setter;
@@ -109,26 +108,10 @@ public List<TemplateDescriptorEntity> getTypeTemplates(boolean relation) {
 	@Getter
 	boolean canListResTypeTemplates;
 
-	@Inject
-	@TestingMode
-	private Boolean testing;
-
-	@TestingMode
-	public void onChangedTestingMode(@Observes Boolean isTesting) {
-		this.testing = isTesting;
-	}
-
 	ResourceEditRelation relation;
 
 	private Identifiable resourceOrType;
 
-    /**
-     * @return true if testing is tue and initialized, otherwise false
-     */
-    public boolean isTesting() {
-        return testing != null && testing;
-    }
-
 	@PostConstruct
 	public void init() {
 		canListInstanceTemplates = permission.hasPermission(Permission.RESOURCE_TEMPLATE, Action.READ);
@@ -180,10 +163,10 @@ public void loadResourceRelation(ResourceEditRelation relation) throws ResourceN
 		if (this.relation != null) {
 			if (canListInstanceTemplates && !this.relation.isResourceTypeRelation()) {
 				relationInstanceTemplates = templatesService.getGlobalTemplatesForResourceRelation(
-						this.relation, userSettings.isTestingMode());
+						this.relation);
 			}
 			relationTypeTemplates = templatesService.getGlobalTemplatesForResourceRelationType(
-					this.relation, userSettings.isTestingMode());
+					this.relation);
 		}
 		Collections.sort(relationInstanceTemplates, new TemplateComparator());
 		Collections.sort(relationTypeTemplates, new TemplateComparator());
@@ -208,26 +191,25 @@ private void loadTemplates() throws ResourceNotFoundException, ResourceTypeNotFo
 		if (resourceOrType != null) {
 			if (isEditResource() && canListInstanceTemplates) {
 				instanceTemplates = templatesService.getGlobalTemplateDescriptorsForResource(
-						getResource(), userSettings.isTestingMode());
+						getResource());
 				Collections.sort(instanceTemplates, new TemplateComparator());
 			}
 
 			resourceTypeTemplates = canListResTypeTemplates ? templatesService
-					.getGlobalTemplateDescriptorsForResourceType(getResourceType(),
-							userSettings.isTestingMode()) : new ArrayList<TemplateDescriptorEntity>();
+					.getGlobalTemplateDescriptorsForResourceType(getResourceType()) : new ArrayList<TemplateDescriptorEntity>();
 			Collections.sort(resourceTypeTemplates, new TemplateComparator());
 		}
 	}
 
 	private boolean canAdd() {
 		return context.getIsGlobal()
-				&& permission.hasPermissionToAddTemplate(resourceOrType, userSettings.isTestingMode());
+				&& permission.hasPermissionToAddTemplate(resourceOrType);
 	}
 
 	private boolean canDelete(ResourceTypeEntity resourceType) {
 		// context has to be global
 		return context.getIsGlobal()
-				&& (canAddEditOrDeleteShakedownTest() || (isEditResource() ? permission
+				&& ( (isEditResource() ? permission
 						.hasPermission(Permission.RESOURCE_TEMPLATE, null, Action.DELETE,
 								(ResourceEntity) resourceOrType, null) : permission
 						.hasPermission(Permission.RESOURCETYPE_TEMPLATE, null, Action.DELETE,
@@ -236,13 +218,9 @@ private boolean canDelete(ResourceTypeEntity resourceType) {
 
 	private boolean canRead() {
 		// context has to be global
-		return context.getIsGlobal() && (canAddEditOrDeleteShakedownTest() || (isEditResource() ?
+		return context.getIsGlobal() && (isEditResource() ?
 				permission.hasPermission(Permission.RESOURCE_TEMPLATE, null, Action.READ, (ResourceEntity) resourceOrType, null) :
-				permission.hasPermission(Permission.RESOURCETYPE_TEMPLATE, null, Action.READ, null, (ResourceTypeEntity) resourceOrType)));
-	}
-
-	private boolean canAddEditOrDeleteShakedownTest() {
-		return (userSettings.isTestingMode() && permission.hasPermission(Permission.SHAKEDOWN_TEST_MODE));
+				permission.hasPermission(Permission.RESOURCETYPE_TEMPLATE, null, Action.READ, null, (ResourceTypeEntity) resourceOrType));
 	}
 
 
diff --git a/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/util/TestingMode.java b/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/util/TestingMode.java
deleted file mode 100644
index d0a456e84..000000000
--- a/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/util/TestingMode.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * AMW - Automated Middleware allows you to manage the configurations of
- * your Java EE applications on an unlimited number of different environments
- * with various versions, including the automated deployment of those apps.
- * Copyright (C) 2013-2016 by Puzzle ITC
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package ch.puzzle.itc.mobiliar.presentation.util;
-
-import static java.lang.annotation.ElementType.*;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import javax.enterprise.inject.Stereotype;
-
-
-@Stereotype
-@Target({TYPE, METHOD, FIELD})
-@Retention(RUNTIME)
-public @interface TestingMode {}
diff --git a/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/util/UserSettings.java b/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/util/UserSettings.java
index eb4d54f65..6629d1307 100644
--- a/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/util/UserSettings.java
+++ b/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/util/UserSettings.java
@@ -20,29 +20,15 @@
 
 package ch.puzzle.itc.mobiliar.presentation.util;
 
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import ch.puzzle.itc.mobiliar.business.security.control.PermissionService;
+import ch.puzzle.itc.mobiliar.business.usersettings.control.UserSettingsService;
+import ch.puzzle.itc.mobiliar.business.usersettings.entity.UserSettingsEntity;
 
 import javax.annotation.PostConstruct;
 import javax.enterprise.context.SessionScoped;
-import javax.enterprise.event.Event;
-import javax.enterprise.inject.Produces;
 import javax.inject.Inject;
 import javax.inject.Named;
-
-import org.apache.commons.lang3.StringUtils;
-
-import ch.puzzle.itc.mobiliar.business.usersettings.entity.MyAMWObject;
-import ch.puzzle.itc.mobiliar.business.security.control.PermissionService;
-import ch.puzzle.itc.mobiliar.business.usersettings.control.UserSettingsService;
-import ch.puzzle.itc.mobiliar.business.property.entity.PropertyDescriptorEntity;
-import ch.puzzle.itc.mobiliar.business.property.entity.ResourceEditProperty;
-import ch.puzzle.itc.mobiliar.business.usersettings.entity.UserSettingsEntity;
-import ch.puzzle.itc.mobiliar.common.exception.ResourceNotFoundException;
+import java.io.Serializable;
 
 @Named
 @SessionScoped
@@ -54,203 +40,18 @@ public class UserSettings implements Serializable {
 
 	@Inject
 	PermissionService permissionService;
-
-	@Inject
-	@TestingMode
-	Event<Boolean> testingModeEvent;
-
 	/**
 	 * Loaded at initialization time
 	 */
 	private UserSettingsEntity userSetting;
 
-	/**
-	 * Loaded lazily on first access
-	 */
-	private Map<Integer, MyAMWObject> favoriteResources;
-
-	private boolean testingMode;
-
 	@PostConstruct
 	public void init() {
 		userSetting = service.getUserSettings(getUserName());
 	}
 
-	public List<Integer> getMyAMWFilter() {
-		if (isMyAMWMode()) {
-			List<Integer> result = getFavoriteResources();
-			if (result == null || result.isEmpty()) {
-				// Hibernate doesn't like to filter with an empty list.
-				// therefore set -1 as an id which will never match.
-				return Arrays.asList(-1);
-			}
-			else {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	public boolean isMyAMWMode() {
-		return userSetting != null ? userSetting.isMyAmwEnabled() : false;
-	}
-
-	public void setMyAMWMode(boolean myAMWMode) {
-		if (myAMWMode != isMyAMWMode()) {
-			userSetting = service.getUserSettings(getUserName());
-			userSetting.setMyAmwEnabled(myAMWMode);
-			userSetting = service.saveUserSettings(userSetting);
-		}
-	}
-
-	/**
-	 * @param groupId
-	 * @return
-	 */
-	public boolean getFavorite(Integer groupId) {
-		return getFavoriteResources().contains(groupId);
-	}
-
-	/**
-	 * @param groupId
-	 * @param name
-	 * @param resourceType
-	 * @throws ResourceNotFoundException
-	 */
-	public void setFavorite(Integer groupId, String name, String resourceType)
-			throws ResourceNotFoundException {
-		if (groupId != null && StringUtils.isNotBlank(name)) {
-			if (!getFavoriteResources().contains(groupId)) {
-				try {
-					addFavoriteResource(groupId, name, resourceType);
-					GlobalMessageAppender.addSuccessMessage("Resource " + name + " added to favorites.");
-				}
-				catch (ResourceNotFoundException e) {
-					GlobalMessageAppender
-							.addErrorMessage("Resource not found - was not able to add resource to favorites");
-				}
-			}
-			else {
-				removeFavoriteResource(groupId);
-				GlobalMessageAppender.addSuccessMessage("Resource " + name + " removed from favorites.");
-			}
-		}
-	}
-
 	public String getUserName() {
 		return permissionService.getCurrentUserName();
 	}
 
-	public List<Integer> getFavoriteResources() {
-		if (favoriteResources == null) {
-			favoriteResources = service.loadFavoriteResources(getUserName());
-		}
-		return new ArrayList<Integer>(favoriteResources.keySet());
-	}
-
-	/**
-	 * @param groupId
-	 * @param name
-	 * @param resourceType
-	 * @throws ResourceNotFoundException
-	 */
-	public void addFavoriteResource(Integer groupId, String name, String resourceType)
-			throws ResourceNotFoundException {
-		userSetting = service.addFavoriteResource(groupId, getUserName());
-		favoriteResources = service.loadFavoriteResources(getUserName());
-	}
-
-	/**
-	 * @param groupId
-	 */
-	public void removeFavoriteResource(Integer groupId) {
-		userSetting = service.removeFavoriteResource(groupId, getUserName());
-		favoriteResources = service.loadFavoriteResources(getUserName());
-	}
-
-	public List<MyAMWObject> getMyAMWObjects() {
-		favoriteResources = service.loadFavoriteResources(getUserName());
-		return new ArrayList<MyAMWObject>(favoriteResources.values());
-	}
-
-	public List<MyAMWObject> getMyAMWASandApps() {
-		List<MyAMWObject> result = new ArrayList<MyAMWObject>();
-		if (favoriteResources != null) {
-			for (MyAMWObject o : favoriteResources.values()) {
-				if (o.isAsOrApp()) {
-					result.add(o);
-				}
-			}
-		}
-		return result;
-	}
-
-    /**
-     * Switches the email notification setting for the given MyAMWObject
-     * @param object
-     */
-    public void switchEmailNotification(MyAMWObject object) {
-		try {
-			userSetting = service.setEmail(object.getGroupId(), getUserName(), !object.isEmail());
-			GlobalMessageAppender.addSuccessMessage("eMail settings for " + object.getName()
-					+ " successfully saved");
-		}
-		catch (Exception e) {
-			GlobalMessageAppender.addErrorMessage("eMail settings were not saved: " + e.getMessage());
-		}
-	}
-
-	@Produces
-	@TestingMode
-	public boolean isTestingMode() {
-		return testingMode;
-	}
-
-    /**
-     * Publishes testing mode change when mode changed
-     */
-	public void setTestingMode(boolean testingMode) {
-		if (testingMode != this.testingMode) {
-			this.testingMode = testingMode;
-			testingModeEvent.fire(testingMode);
-		}
-	}
-
-	/**
-	 * Filters the testing properties if the current session is not in testing mode
-	 * 
-	 * @param listWithTestingProperties
-	 */
-	public List<ResourceEditProperty> filterTestingProperties(
-			List<ResourceEditProperty> listWithTestingProperties) {
-		if (!isTestingMode()) {
-			Iterator<ResourceEditProperty> iterator = listWithTestingProperties.iterator();
-			while (iterator.hasNext()) {
-				ResourceEditProperty p = iterator.next();
-				if (p.isTesting()) {
-					iterator.remove();
-				}
-			}
-		}
-		return listWithTestingProperties;
-	}
-
-	/**
-	 * Filters the testing properties if the current session is not in testing mode
-	 * 
-	 * @param listWithTestingProperties
-	 */
-	public List<PropertyDescriptorEntity> filterTestingPropertyDescriptors(
-			List<PropertyDescriptorEntity> listWithTestingProperties) {
-		if (!isTestingMode()) {
-			Iterator<PropertyDescriptorEntity> iterator = listWithTestingProperties.iterator();
-			while (iterator.hasNext()) {
-				PropertyDescriptorEntity p = iterator.next();
-				if (p.isTesting()) {
-					iterator.remove();
-				}
-			}
-		}
-		return listWithTestingProperties;
-	}
 }
diff --git a/AMW_web/src/main/webapp/WEB-INF/web.xml b/AMW_web/src/main/webapp/WEB-INF/web.xml
index c73db6fe0..61049055c 100644
--- a/AMW_web/src/main/webapp/WEB-INF/web.xml
+++ b/AMW_web/src/main/webapp/WEB-INF/web.xml
@@ -73,9 +73,6 @@
 		<extension>ecss</extension>
 		<mime-type>text/css</mime-type>
 	</mime-mapping>
-	<welcome-file-list>
-		<welcome-file>index.html</welcome-file>
-	</welcome-file-list>
 	<error-page>
 		<exception-type>java.lang.Exception</exception-type>
 		<location>/pages/error.xhtml</location>
@@ -97,8 +94,6 @@
 			<role-name>test_deployer</role-name>
 			<role-name>developer_deployer</role-name>
 			<role-name>env_management_deployer</role-name>
-			<role-name>shakedown_tester</role-name>
-			<role-name>shakedown_admin</role-name>
             <role-name>overwrite_foreignables</role-name>
             <role-name>admin_developer</role-name>
 		</auth-constraint>
@@ -128,12 +123,6 @@
 	<security-role>
 		<role-name>env_management_deployer</role-name>
 	</security-role>
-	<security-role>
-		<role-name>shakedown_tester</role-name>
-	</security-role>
-	<security-role>
-		<role-name>shakedown_admin</role-name>
-	</security-role>
     <security-role>
         <role-name>overwrite_foreignables</role-name>
     </security-role>
diff --git a/AMW_web/src/main/webapp/index.html b/AMW_web/src/main/webapp/index.html
index 6b2607871..9f2226185 100644
--- a/AMW_web/src/main/webapp/index.html
+++ b/AMW_web/src/main/webapp/index.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <meta http-equiv="refresh" content="0; url=pages/applist.xhtml" />
+    <meta http-equiv="refresh" content="0; url=pages/serverListView.xhtml" />
     <title>Automation Middleware</title>
   </head>
 
diff --git a/AMW_web/src/main/webapp/pages/applist.xhtml b/AMW_web/src/main/webapp/pages/applist.xhtml
deleted file mode 100644
index 59bd65354..000000000
--- a/AMW_web/src/main/webapp/pages/applist.xhtml
+++ /dev/null
@@ -1,260 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:ui="http://java.sun.com/jsf/facelets"
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:a4j="http://richfaces.org/a4j"
-	xmlns:mobi="http://java.sun.com/jsf/composite/mobi"
-	xmlns:rich="http://richfaces.org/rich">
-
-<ui:composition template="templates/template.xhtml">
-	<f:metadata>
-		<f:viewParam name="filter" value="#{applistView.filter}"/>
-		<f:viewParam name="release" value="#{applistView.filterReleaseSelector.selectedReleaseId}"/>
-		<f:viewParam name="maxResults" value="#{applistView.maxResults}"/>
-	</f:metadata>
-	<ui:param name="screen" value="newApplist" />
-	<ui:define name="title">Apps</ui:define>
-	<ui:define name="pagetitle">
-		<h:outputText id="pageheader" value="Apps" />
-	</ui:define>
-	<ui:define name="body">
-		<h:panelGroup layout="block" id="navig">
-			<aside> <nav>
-			<ul>
-				<li class="current"><h:link
-						rendered="#{securityDataProvider.hasPermission('APP_TAB')}"
-						value="Applications">
-						<f:param name="mode" value="apps" />
-					</h:link></li>
-			</ul>
-			</nav> </aside>
-
-
-		</h:panelGroup>
-		<section id="content">
-		<div class="container">
-			<h:panelGroup
-				style="display:block;">
-				<div class="well" style="min-height: 320px">
-
-					<h3>Filter</h3>
-					<div class="control-group">
-						<label class="control-label">Application/AS name</label>
-						<div class="controls">
-							<h:inputText value="#{applistView.filter}"/>
-						</div>
-					</div>
-					<div class="control-group">
-						<label class="control-label">Release</label>
-						<div class="controls">
-							<h:selectOneMenu styleClass="switchRelease"
-								value="${applistView.filterReleaseSelector.selectedReleaseId}">
-								<f:selectItems
-									value="${applistView.releaseDataProvider.allReleases}"
-									var="filterRelease" itemLabel="${filterRelease.name}"
-									itemValue="${filterRelease.id}" />
-							</h:selectOneMenu>
-							<h:commandButton value="Search" type="submit"
-								styleClass="btn light right" execute="@form"
-								action="${applistView.doFilter()}"
-								render="applicationServers" onclick="showLoader();"
-								oncomplete="hideLoader();" />
-						</div>
-					</div>
-					<hr />
-					<h:dataTable id="applicationServers" var="appServer"
-								 styleClass="well caption-top"
-								 rowClasses="odd-row,even-row"
-								 value="#{applistView.appServerList}"
-								 style="width:100%; margin-top:10px;"
-								 columnClasses=" ,release,last,last">
-						<f:facet name="caption">
-							<h2>
-								<h:outputText value="Application servers and applications"/>
-							</h2>
-							<nav class="actionbar">
-								<ul>
-									<li>
-										<div class="control-group">
-											<label class="control-label">Max results</label>
-											<div class="controls">
-												<h:selectOneRadio value="#{applistView.maxResults}"
-																  styleClass="radioButtonList">
-													<f:selectItem itemLabel="20" itemValue="20"/>
-													<f:selectItem itemLabel="100" itemValue="100"/>
-													<f:selectItem itemLabel="All" itemValue="0"/>
-													<a4j:ajax render="applicationServers"/>
-												</h:selectOneRadio>
-											</div>
-										</div>
-									</li>
-									<li>
-										<a4j:commandLink styleClass="btn light mb-1 mb-l-0"
-														 rendered="#{securityDataProvider.hasPermissionForResourceType('RESOURCE', 'CREATE', 'APPLICATIONSERVER')}"
-														 onclick="#{rich:component('addAppServerPopupPanel')}.show();">
-											<i class="icon icon-add"></i>
-											<h:outputText value="New Application Server"/>
-										</a4j:commandLink>
-									</li>
-									<li>
-										<h:commandLink id="createAppButton" type="button"
-													   styleClass="btn light right"
-													   rendered="#{securityDataProvider.hasPermissionForResourceType('RESOURCE', 'CREATE', 'APPLICATION')}"
-													   onclick="showLoader();">
-											<i class="icon icon-add"/> New Application
-											<a4j:ajax render="createApplicationForAsPopup"
-													  oncomplete="hideLoader();#{rich:component('createApplicationForAsPopup')}.show();"/>
-										</h:commandLink>
-									</li>
-								</ul>
-							</nav>
-						</f:facet>
-
-						<h:column index="index" id="column#{index}"
-							rendered="#{securityDataProvider.hasPermission('APP_AND_APPSERVER_LIST')}"
-							styleClass="topBorder width50">
-							<f:facet name="header">
-								<h:panelGroup>
-									<h:outputText value="App Name" />
-								</h:panelGroup>
-							</f:facet>
-
-							<h:panelGroup rendered="#{appServer.resource.deletable}">
-								<mobi:editResourceLink resId="#{appServer.resource.id}" linkLabel="#{appServer.resource.name}" editPermission="RESOURCE" resourceType="APPLICATIONSERVER"/>
-                                <h:outputText value="[ #{appServer.resource.runtime.name} ]" styleClass="marginLeft5" />
-                            </h:panelGroup>
-                            <h:panelGroup rendered="#{!appServer.resource.deletable}">
-                                <h:outputText value="#{appServer.resource.name}" styleClass="grey" />
-                            </h:panelGroup>
-                            <ui:repeat var="app" value="${appServer.relatedResources}">
-                                <h:panelGroup styleClass="paddingLeft20" layout="block">
-                                    <mobi:editResourceLink resId="#{app.id}" linkLabel="#{app.name}" editPermission="RESOURCE" resourceType="APPLICATION"/>
-                                    <mobi:foreignableOwnerTooltip foreignableAttributes="#{applistView.getForeignableAttributes(app)}"/>
-                                </h:panelGroup>
-                            </ui:repeat>
-
-						</h:column>
-
-						<h:column>
-							<f:facet name="header">
-								<h:outputText value="Release" />
-							</f:facet>
-							<mobi:editResourceLink resId="#{appServer.resource.id}" linkLabel="#{appServer.resource.release.name}" editPermission="RESOURCE" resourceType="APPLICATIONSERVER"/>
-							<ui:repeat var="app"
-								value="${appServer.relatedResources}">
-								<h:panelGroup style="padding-left: 20px; white-space: nowrap" layout="block">
-									<mobi:editResourceLink resId="#{app.id}" linkLabel="${app.release.name}" editPermission="RESOURCE" resourceType="APPLICATION"/>
-								</h:panelGroup>
-							</ui:repeat>
-						</h:column>
-					</h:dataTable>
-				</div>
-			</h:panelGroup>
-
-			<rich:popupPanel id="confirmAppDeletePopupPanel" autosized="true"
-				domElementAttachment="form">
-				<f:facet name="header">
-					<h2>
-						<h:outputText value="Delete Application" />
-					</h2>
-				</f:facet>
-				<f:facet name="controls">
-					<h:outputLink value="#"
-						styleClass="close icon icon-close icon-replace"
-						onclick="#{rich:component('confirmAppDeletePopupPanel')}.hide(); return false;">
-					x
-					</h:outputLink>
-				</f:facet>
-
-				<h:form prependId="false">
-					<h:inputHidden id="removeSelectedAppId"
-						value="#{applistView.selectionApp}" />
-					<h:panelGrid styleClass="marginBottom10">Are you sure you want to delete the application release?</h:panelGrid>
-					<h:panelGrid id="appDeleteRelationOverview"><mobi:resourceRelations enableEdit="false"/></h:panelGrid>
-					<a4j:commandLink styleClass="btn primary right" type="button"
-						value="Delete" render="applicationServers"
-						action="#{applistView.removeApp()}"
-						onclick="showLoader();"
-						oncomplete="#{rich:component('confirmAppDeletePopupPanel')}.hide(); hideLoader(); return false;" />
-				</h:form>
-			</rich:popupPanel>
-
-			<rich:popupPanel id="confirmAppServerDeletePopupPanel"
-				autosized="true">
-				<f:facet name="header">
-					<h2>
-						<h:outputText value="Delete Application Server" />
-					</h2>
-				</f:facet>
-				<f:facet name="controls">
-					<h:outputLink value="#"
-						styleClass="close icon icon-close icon-replace"
-						onclick="#{rich:component('confirmAppServerDeletePopupPanel')}.hide(); return false;">
-					x
-					</h:outputLink>
-				</f:facet>
-
-				<h:form prependId="false">
-					<h:inputHidden id="removeSelectedAppServerId"
-						value="#{applistView.selection}" />
-					<h:panelGrid styleClass="marginBottom10">Are you sure you want to delete the application server release?</h:panelGrid>
-					<h:panelGrid id="appServerDeleteRelationOverview"><mobi:resourceRelations enableEdit="false"/></h:panelGrid>
-					<a4j:commandLink styleClass="btn primary right" type="button"
-						value="Delete" render="applicationServers"
-						action="#{applistView.removeAppServer()}"
-						onclick="showLoader();"
-						oncomplete="#{rich:component('confirmAppServerDeletePopupPanel')}.hide(); hideLoader(); return false;" />
-				</h:form>
-			</rich:popupPanel>
-
-		</div>
-		</section>
-
-	</ui:define>
-	<ui:define name="component_popups">
-
-		<rich:popupPanel id="addAppServerPopupPanel" autosized="true"
-						 movable="true" onshow="#{rich:element('appServerName1')}.focus();">
-			<f:facet name="header">
-				<h2>
-					<h:outputText value="Create application server" />
-				</h2>
-			</f:facet>
-			<f:facet name="controls">
-				<h:outputLink value="#"
-							  styleClass="close icon icon-close icon-replace"
-							  onclick="#{rich:component('addAppServerPopupPanel')}.hide(); $('#globalMessageBox').hide();">
-					x
-				</h:outputLink>
-			</f:facet>
-			<h:form>
-				<h:panelGroup id="addAppServerPopupPanelGroup">
-					<h:panelGrid columns="2" styleClass="formGrid">
-						<h:outputLabel value="Applicationserver" />
-						<h:inputText id="appServerName1"
-									 value="${applistView.appServerName}" />
-						<h:outputLabel value="Release" />
-						<h:selectOneMenu id="addResourceRelease" style="width:auto;"
-										 value="${applistView.asReleaseSelector.selectedReleaseId}">
-							<f:selectItems value="${applistView.releaseDataProvider.allReleases}"
-										   var="asRelease" itemLabel="${asRelease.name}"
-										   itemValue="${asRelease.id}" />
-						</h:selectOneMenu>
-					</h:panelGrid>
-					<a4j:commandLink execute="@form" styleClass="btn primary right"
-									 value="OK" actionListener="#{applistView.createAppServer()}"
-									 onclick="showLoader();"
-									 render="addAppServerPopupPanelGroup applicationServers"
-									 oncomplete="if(!hasErrorMessage()){#{rich:component('addAppServerPopupPanel')}.hide();};hideLoader();" />
-				</h:panelGroup>
-			</h:form>
-		</rich:popupPanel>
-		<mobi:createApplicationForAsPopup
-			parentDataProvider="#{applistView}"
-			renderList="applicationServers" />
-	</ui:define>
-</ui:composition>
-
-
-</html>
\ No newline at end of file
diff --git a/AMW_web/src/main/webapp/pages/components/propertyTypesComp.xhtml b/AMW_web/src/main/webapp/pages/components/propertyTypesComp.xhtml
deleted file mode 100644
index 18e3d4644..000000000
--- a/AMW_web/src/main/webapp/pages/components/propertyTypesComp.xhtml
+++ /dev/null
@@ -1,106 +0,0 @@
-<ui:composition xmlns="http://www.w3.org/1999/xhtml"
-                xmlns:ui="http://java.sun.com/jsf/facelets"
-                xmlns:h="http://java.sun.com/jsf/html"
-                xmlns:f="http://java.sun.com/jsf/core"
-                xmlns:rich="http://richfaces.org/rich">
-
-<h:panelGroup id="propertyTypes" layout="block"
-              styleClass="well withHeight">
-    <nav class="actionbar">
-        <ul>
-            <li><h:commandLink id="createPropTypeButton"
-                               styleClass="btn light"
-                               onclick="#{rich:component('createPropertyTypePopup')}.show(); return false;"
-                               rendered="#{securityDataProvider.hasPermission('ADD_PROPTYPE')}">
-                    <i class="icon icon-add"/>Add
-                </h:commandLink>
-            </li>
-            <li>
-                <h:commandLink id="deletePropTypeButton"
-                               styleClass="btn light"
-                               render="deletePropertyTypePopup"
-                               onclick="#{rich:component('deletePropertyTypePopup')}.show(); return false;"
-                               rendered="#{securityDataProvider.hasPermission('DELETE_PROPTYPE')}">
-                    <i class="icon icon-delete"/>Remove
-                </h:commandLink>
-            </li>
-        </ul>
-    </nav>
-    <h2>
-        <h:outputText value="PropertyTypes"/>
-    </h2>
-    <hr/>
-    <table class="width100">
-        <tr>
-            <td>
-                <aside class="marginLeft10">
-                    <nav>
-                        <ul>
-                            <ui:repeat var="propType"
-                                       value="${propertyTypeDataProvider.allPropertyTypes}">
-                                <li class="${propertyTypeDataProvider.selectedPropertyTypeId==propType.id ? 'current' : ''}">
-                                    <h:link value="${propType.propertyTypeName}"
-                                            outcome="settings">
-                                        <f:param name="mode" value="#{settingsDataProvider.mode}" />
-                                        <f:param name="propId" value="#{propType.id}" />
-                                    </h:link>
-                                </li>
-                            </ui:repeat>
-                        </ul>
-                    </nav>
-                </aside>
-            </td>
-            <td width="100%">
-                <article>
-                    <h:panelGroup id="proptype"
-                                  rendered="#{securityDataProvider.hasPermission('PROP_TYPE_NAME_VALUE')}">
-                        <div class="control-group">
-                            <label class="control-label">
-                                <h:outputLabel value="Name"/>
-                            </label>
-
-                            <div class="controls">
-                                <h:inputText id="propertyTypeNameInputText"
-                                             value="#{propertyTypeDataProvider.selectedPropertyTypeName}"
-                                             disabled="${propertyTypeDataProvider.selectedPropertyTypeId == null or securityDataProvider.hasPermission('EDIT_PROP_TYPE_NAME')==false }"/>
-                            </div>
-
-                            <label class="control-label">
-                                <h:outputLabel value="Encrypted"/>
-                            </label>
-
-                            <div class="controls" style="line-height: 28px">
-                                <h:selectBooleanCheckbox
-                                        value="#{propertyTypeDataProvider.selectedEncrypted}"
-                                        disabled="${propertyTypeDataProvider.selectedPropertyTypeId == null or securityDataProvider.hasPermission('SAVE_SETTINGS_PROPTYPE')==false }">
-                                </h:selectBooleanCheckbox>
-                            </div>
-                            <label class="control-label">
-                                <h:outputLabel value="Validation"/>
-                            </label>
-
-                            <div class="controls">
-                                <h:inputText id="propertyTypeValidationInputText"
-                                             value="#{propertyTypeDataProvider.selectedPropertyTypeRegex}"
-                                             disabled="${propertyTypeDataProvider.selectedPropertyTypeId == null or securityDataProvider.hasPermission('EDIT_PROP_TYPE_VALIDATION')==false}"/>
-                            </div>
-                            <label class="control-label"><h:outputText value="Tags"/></label>
-
-                            <div class="controls">
-                                <h:inputText styleClass="tokenfield propertyInputField form-control"
-                                             disabled="${propertyTypeDataProvider.selectedPropertyTypeId == null or securityDataProvider.hasPermission('SAVE_SETTINGS_PROPTYPE')==false }"
-                                             value="#{propertyTypeDataProvider.selectedPropTypeTagsString}"
-                                             id="tokenfield" placeholder="Type something and hit enter"/>
-                                <!-- placeholder does not work with jsf in our actual version -->
-                                <script>
-                                    globalTags = [#{propertyTypeDataProvider.globalTagsString}];
-                                </script>
-                            </div>
-                        </div>
-                    </h:panelGroup>
-                </article>
-            </td>
-        </tr>
-    </table>
-</h:panelGroup>
-</ui:composition>
diff --git a/AMW_web/src/main/webapp/pages/components/resourceInstanceListComp.xhtml b/AMW_web/src/main/webapp/pages/components/resourceInstanceListComp.xhtml
index b8f228ef7..10de412f9 100644
--- a/AMW_web/src/main/webapp/pages/components/resourceInstanceListComp.xhtml
+++ b/AMW_web/src/main/webapp/pages/components/resourceInstanceListComp.xhtml
@@ -65,15 +65,6 @@
 				</f:facet>
 				<mobi:editResourceLink resId="#{group.selectedResourceId}" linkLabel="#{group.selectedResource.release.name}" editPermission="RESOURCE" resourceType="#{resourceInstanceListImpl.selectedResourceType.name}"/>
 			</h:column>
-			<h:column rendered="#{securityDataProvider.hasPermission('RESOURCE_LIST')}">
-				<f:facet name="header">
-					<h:outputText value="Favorite" />
-				</f:facet>
-				<h:selectBooleanCheckbox readonly="true" value="${userSettings.getFavorite(group.id)}" id="selectFavoriteCheckbox">
-					<a4j:ajax execute="#{userSettings.setFavorite(group.id, group.name, resourceInstanceListImpl.selectedResourceType.name)}">						
-					</a4j:ajax>
-				</h:selectBooleanCheckbox>
-			</h:column>
 		</h:dataTable>
 	</h:panelGroup>
 </h:body>
diff --git a/AMW_web/src/main/webapp/pages/createDeploymentView.xhtml b/AMW_web/src/main/webapp/pages/createDeploymentView.xhtml
deleted file mode 100644
index da1cd20f6..000000000
--- a/AMW_web/src/main/webapp/pages/createDeploymentView.xhtml
+++ /dev/null
@@ -1,455 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:ui="http://java.sun.com/jsf/facelets"
-      xmlns:h="http://java.sun.com/jsf/html"
-      xmlns:rich="http://richfaces.org/rich"
-      xmlns:f="http://java.sun.com/jsf/core"
-      xmlns:a4j="http://richfaces.org/a4j"
->
-
-<ui:composition template="templates/template.xhtml">
-    <ui:param name="screen" value="createDeploymentView"/>
-    <ui:define name="title">#{createDeploymentView.getTitle()}</ui:define>
-
-    <!--  HEADER -->
-    <ui:define name="backlink">
-        <h:link outcome="deploy" value="Back deploy" styleClass="btn back" onclick="showLoader();"
-                includeViewParams="true"/>
-    </ui:define>
-
-    <ui:define name="pagetitle">#{createDeploymentView.getTitle()}
-    </ui:define>
-
-
-    <ui:define name="body">
-        <h:panelGroup layout="block" id="navig">
-            <aside>
-                <nav>
-                    <ul>
-                        <li class="current"><h:link value="Deployments"/></li>
-                    </ul>
-                </nav>
-            </aside>
-        </h:panelGroup>
-        <section id="content">
-            <div class="container ">
-                <article>
-                    <div class="well">
-
-                        <h:panelGroup id="createDeploymentPanelGroup" styleClass="createDeploymentForm">
-                            <h2>#{createDeploymentView.getTitle()}</h2>
-                            <hr/>
-                            <br class="clear"/>
-                            <div class="maxWidth1024px">
-
-
-                                <!-- APPSERVER selection-->
-
-                                <div class="control-group">
-                                    <label class="control-label">
-                                        <h:outputText value="Applicationserver:"/>
-                                    </label>
-                                    <div class="controls">
-
-                                        <h:panelGroup rendered="#{!createDeploymentView.isRedeployment()}">
-                                            <h:selectOneMenu
-                                                    value="#{createDeploymentView.selectedApplicationServerGroup}">
-                                                <f:selectItem itemLabel="None" itemValue="${null}"/>
-                                                <f:selectItems
-                                                        value="${createDeploymentView.applicationServerGroups}"
-                                                        var="appServerGroup" itemLabel="${appServerGroup.name}"
-                                                        itemValue="${appServerGroup.id}"/>
-                                                <a4j:ajax render="createDeploymentPanelGroup"
-                                                          onbegin="showLoader();"
-                                                          oncomplete="updateElements(); hideLoader();"
-                                                          onerror="hideLoader();"/>
-                                            </h:selectOneMenu>
-                                        </h:panelGroup>
-                                        <h:panelGroup rendered="#{createDeploymentView.isRedeployment()}">
-
-                                            <h:panelGroup
-                                                    rendered="#{createDeploymentView.hasOnlyOneDeploymentSelected()}">
-                                                <ul>
-                                                    <ui:repeat var="selecteddeployment"
-                                                               value="${createDeploymentView.selectedDeploymentsForRedeployment}">
-                                                        <li>
-                                                            <h:panelGroup layout="block">
-                                                                <h:outputText styleClass="boldFont"
-                                                                              value="#{selecteddeployment.resourceGroup.name} (#{selecteddeployment.release.name})"/>
-                                                                <ui:repeat var="appToShow"
-                                                                           value="${selecteddeployment.applicationsWithVersion}">
-                                                                    <h:panelGroup styleClass="paddingLeft20 smallFont"
-                                                                                  layout="block">
-
-                                                                        <h:outputText
-                                                                                value="${appToShow.applicationName}"/>
-                                                                        <h:outputText
-                                                                                rendered="${appToShow.version != ''}"
-                                                                                value=" (${appToShow.version})"
-                                                                                styleClass="grey marginLeft10"/>
-                                                                    </h:panelGroup>
-                                                                </ui:repeat>
-                                                            </h:panelGroup>
-                                                        </li>
-                                                        <div style="height: 5px; clear: both;"></div>
-                                                    </ui:repeat>
-                                                </ul>
-                                            </h:panelGroup>
-                                            <h:panelGroup
-                                                    rendered="#{!createDeploymentView.hasOnlyOneDeploymentSelected()}">
-                                                <a4j:commandLink styleClass="smallFont"
-                                                                 render="appserverListPopupPanelGroup"
-                                                                 onclick="showLoader();"
-                                                                 oncomplete="#{rich:component('appserverListPopupPanel')}.show(); hideLoader();"
-                                                                 value="Show all selected application server with applications and releases">
-                                                </a4j:commandLink>
-                                            </h:panelGroup>
-
-                                        </h:panelGroup>
-                                    </div>
-                                </div>
-
-                                <!-- RELEASE selection-->
-
-                                <h:panelGroup rendered="#{!createDeploymentView.isRedeployment()}">
-                                    <div class="control-group">
-                                        <label class="control-label">
-                                            <h:outputText value="Release:"/>
-                                        </label>
-                                        <div class="controls">
-                                            <h:selectOneMenu
-                                                    disabled="#{!createDeploymentView.isApplicationserverSelected()}"
-                                                    value="#{createDeploymentView.selectedReleaseId}">
-                                                <f:selectItems
-                                                        value="${createDeploymentView.releasesForAs}"
-                                                        var="release" itemLabel="${release.name}"
-                                                        itemValue="${release.id}"/>
-                                                <a4j:ajax render="createDeploymentPanelGroup"
-                                                          onbegin="showLoader();"
-                                                          oncomplete="updateElements(); hideLoader();"
-                                                          onerror="hideLoader();"/>
-                                            </h:selectOneMenu>
-                                        </div>
-                                    </div>
-                                </h:panelGroup>
-
-                                <!-- ENVIRONMENT selection-->
-
-                                <div class="control-group">
-                                    <label class="control-label">
-                                        <h:outputText value="Environments:"/>
-                                    </label>
-                                    <div class="controls">
-                                        <ui:repeat value="${createDeploymentView.domains}" var="dom">
-                                            <label>${dom.name.toUpperCase()}</label>
-                                            <h:selectManyCheckbox layout="lineDirection"
-                                                                  disabled="${!createDeploymentView.isContextSelectionEnabled()}"
-                                                                  styleClass="checkboxList changeAware"
-                                                                  value="#{dom.selectedContextIds}">
-                                                <f:selectItems
-                                                        value="#{createDeploymentView.getContextsForDomain(dom.name)}"
-                                                        var="env"
-                                                        itemValue="#{env.id}" itemLabel="#{env.name}"/>
-                                                <a4j:ajax render="createDeploymentPanelGroup" immediate="true"
-                                                          onbegin="showLoader();"
-                                                          oncomplete="updateElements(); hideLoader();"
-                                                          onerror="hideLoader();"/>
-                                            </h:selectManyCheckbox>
-                                            <br/>
-                                        </ui:repeat>
-                                    </div>
-                                </div>
-
-                                <!-- APPLICATIONS -->
-                                <h:panelGroup rendered="#{!createDeploymentView.isRedeployment()}">
-                                    <div class="control-group">
-                                        <label class="control-label">
-                                            <h:outputText value="Applications:"/>
-                                        </label>
-                                        <div class="controls">
-                                            <h:dataTable id="appWithVersionTable" var="appWithVersion"
-                                                         value="#{createDeploymentView.appsWithVersion}"
-                                                         rendered="#{createDeploymentView.hasAppsToShow()}"
-                                                         columnClasses=" ,versionInput"
-                                                         rowClasses="odd-row,even-row">
-                                                <h:column>
-                                                    <h:outputLabel class="inlineBlock ellipsisLeft marginTop5"
-                                                                   value="#{appWithVersion.applicationName}"/>
-                                                </h:column>
-                                                <h:column>
-                                                    <h:inputText value="#{appWithVersion.version}"
-                                                                 disabled="#{!createDeploymentView.isContextSelected()}">
-                                                        <a4j:ajax onbegin="showLoader();"
-                                                                  oncomplete="hideLoader();" onerror="hideLoader();"/>
-                                                    </h:inputText>
-                                                </h:column>
-                                            </h:dataTable>
-                                        </div>
-                                    </div>
-
-                                    <!-- RUNTIME -->
-                                    <div class="control-group">
-                                        <label class="control-label">
-                                            <h:outputText value="Runtime:"/>
-                                        </label>
-                                        <label class="controls">
-                                            <h:outputText
-                                                    value="#{createDeploymentView.getRuntimeOfCurrentAppserver()}"/>
-                                        </label>
-                                    </div>
-
-                                    <!-- STATE selection -->
-                                    <div class="control-group">
-                                        <label class="control-label">
-                                            <h:outputText value="State:"/>
-                                        </label>
-                                        <div class="controls">
-                                            <h:selectOneMenu value="#{createDeploymentView.selectedStateDate}"
-                                                             disabled="#{!createDeploymentView.isServerAndContextSelected()}">
-                                                <f:selectItem itemLabel="HEAD" itemValue="0"/>
-                                                <f:selectItems value="#{createDeploymentView.getTags()}"/>
-                                                <a4j:ajax render="createDeploymentPanelGroup"
-                                                          onbegin="showLoader();"
-                                                          oncomplete="updateElements(); hideLoader();"
-                                                          onerror="hideLoader();"/>
-                                            </h:selectOneMenu>
-                                        </div>
-                                    </div>
-                                </h:panelGroup>
-
-                                <!-- DEPLOY TIME selection -->
-                                <div class="control-group">
-                                    <label class="control-label">
-                                        <h:outputText value="Deploy at:"/>
-                                    </label>
-                                    <div class="controls">
-                                        <rich:calendar buttonIcon="/AMW_web/images/calendarIcon.png"
-                                                       buttonDisabledIcon="/AMW_web/images/calendarIcon.png"
-                                                       value="#{createDeploymentView.deploymentDate}"
-                                                       disabled="#{!createDeploymentView.isServerAndContextSelected()}"
-                                                       enableManualInput="true" showApplyButton="true"
-                                                       datePattern="dd.MM.yyyy HH:mm">
-                                            <a4j:ajax render="createDeploymentPanelGroup"
-                                                      onbegin="showLoader();"
-                                                      oncomplete="updateElements(); hideLoader();"
-                                                      onerror="hideLoader();"/>
-                                        </rich:calendar>
-                                    </div>
-                                </div>
-
-                                <!-- DEPLOY PARAMETER selection -->
-                                <div class="control-group">
-                                    <label class="control-label">
-                                        <h:outputText value="Deployment parameter:"/>
-                                    </label>
-                                    <div class="controls">
-                                        <h:panelGroup class="deploy-param-controls">
-                                            <div class="left">
-                                                <a4j:outputPanel id="deployParamSelection">
-                                                    <rich:autocomplete
-                                                            disabled="#{!createDeploymentView.isServerAndContextSelected()}"
-                                                            autofill="false" mode="lazyClient"
-                                                            value="#{createDeploymentView.selectedKeyName}"
-                                                            autocompleteMethod="#{createDeploymentView.getAvailableKeys}"/>
-                                                </a4j:outputPanel>
-                                            </div>
-                                            <a4j:outputPanel id="deployParams" ajaxRendered="true">
-                                                <div class="width_500px">
-                                                    <ul>
-                                                        <li>
-                                                            <h:inputText styleClass="width_240px"
-                                                                         id="newDeployParamName"
-                                                                         disabled="#{!createDeploymentView.isServerAndContextSelected()}"
-                                                                         value="#{createDeploymentView.deployParameterValue}"/>
-                                                        </li>
-                                                        <li>
-                                                            <h:commandLink styleClass="btn disable" disabled="true"
-                                                                           rendered="#{!createDeploymentView.isServerAndContextSelected()}"
-                                                                           value="Add">
-                                                                <i class="icon icon-add"/>
-                                                            </h:commandLink>
-                                                            <a4j:commandLink styleClass="btn light"
-                                                                             rendered="#{createDeploymentView.isServerAndContextSelected()}"
-                                                                             action="#{createDeploymentView.createNewParameter()}"
-                                                                             value="Add" render="deployParamSelection">
-                                                                <i class="icon icon-add"/>
-                                                            </a4j:commandLink>
-                                                        </li>
-                                                    </ul>
-                                                </div>
-                                            </a4j:outputPanel>
-                                        </h:panelGroup>
-
-                                        <a4j:outputPanel id="deployParamPanel" ajaxRendered="true">
-                                            <h:dataTable id="deployParamTable" styleClass="well" var="deployParam"
-                                                         rendered="#{createDeploymentView.allSelectedDeploymentParameters.size() gt 0 }"
-                                                         value="#{createDeploymentView.allSelectedDeploymentParameters}"
-                                                         columnClasses=" , ,width_20" rowClasses="odd-row,even-row">
-
-                                                <h:column>
-                                                    <h:outputText value="${deployParam.key}"/>
-                                                </h:column>
-
-                                                <h:column>
-                                                    <h:outputText value="${deployParam.value}"/>
-                                                </h:column>
-
-                                                <h:column>
-                                                    <a4j:commandLink
-                                                            action="#{createDeploymentView.removeParameter(deployParam)}"
-                                                            render="deployParamTable">
-                                                        <i class="icon icon-delete"/>
-                                                    </a4j:commandLink>
-                                                </h:column>
-
-                                            </h:dataTable>
-                                        </a4j:outputPanel>
-                                    </div>
-                                </div>
-
-                                <!-- DETAILS -->
-                                <div class="control-group">
-                                    <label class="control-label">
-                                        <h:outputText value="Details:"/>
-                                    </label>
-                                    <div class="controls">
-                                        <div class="CodeMirror-merge-2pane">
-                                            <div class="CodeMirror-merge-pane">
-                                                <h:panelGroup>
-                                                    <h:panelGroup
-                                                            rendered="#{createDeploymentView.deploymentDate!=null}">
-                                                        <label class="inlineBlock">
-                                                            <h:selectBooleanCheckbox
-                                                                    value="#{createDeploymentView.simulateGeneration}"/>simulate before deployment</label>
-                                                    </h:panelGroup>
-                                                    <div>
-                                                        <label class="inlineBlock">
-                                                            <h:selectBooleanCheckbox
-                                                                    value="#{createDeploymentView.sendEmail}"/>send an email when deployed</label>
-                                                    </div>
-                                                    <div>
-                                                        <h:panelGroup
-                                                                rendered="#{securityDataProvider.hasPermissionToCreateShakedownTests(createDeploymentView.selectedApplicationServerGroupForRedeployment)}">
-
-                                                            <label class="inlineBlock">
-                                                                <h:selectBooleanCheckbox
-                                                                        value="#{createDeploymentView.executeShakedownTest}">
-                                                                    <a4j:ajax render="testNeighbourhoodButtonId"/>
-                                                                </h:selectBooleanCheckbox>execute shakedown tests when deployed</label>
-                                                        </h:panelGroup>
-                                                    </div>
-
-                                                    <div class="paddingLeft20">
-                                                        <h:panelGroup
-                                                                rendered="#{securityDataProvider.hasPermissionToCreateShakedownTests(createDeploymentView.selectedApplicationServerGroupForRedeployment)}">
-                                                            <label class="inlineBlock">
-                                                                <h:selectBooleanCheckbox id="testNeighbourhoodButtonId"
-                                                                                         disabled="#{createDeploymentView.executeShakedownTest==false}"
-                                                                                         value="#{createDeploymentView.neighbourhoodTest}"/>test neighbourhood</label>
-                                                        </h:panelGroup>
-                                                    </div>
-                                                </h:panelGroup>
-                                            </div>
-                                            <div style="height: 0; clear: both;"></div>
-                                        </div>
-                                    </div>
-                                </div>
-
-                            </div>
-
-                            <hr/>
-                            <br class="clear"/>
-
-                            <div class="control-group">
-
-                                <h:commandLink value="Deploy"
-                                               rendered="#{!createDeploymentView.isServerAndContextSelected()}"
-                                               disabled="true"
-                                               styleClass="btn right disable marginLeft20">
-                                </h:commandLink>
-                                <h:commandLink action="#{createDeploymentView.createNewDeployment()}" value="Deploy"
-                                               rendered="#{createDeploymentView.isServerAndContextSelected()}"
-                                               styleClass="btn primary right marginLeft20" onclick="showLoader();"
-                                               includeViewParams="true">
-                                </h:commandLink>
-
-                                <h:commandLink value="Request deployment"
-                                               rendered="#{!createDeploymentView.isServerAndContextSelected()}"
-                                               disabled="true"
-                                               styleClass="btn right disable marginLeft20" onclick="showLoader();"
-                                               includeViewParams="true">
-                                </h:commandLink>
-                                <h:commandLink action="#{createDeploymentView.createDeploymentRequest}"
-                                               value="Request deployment"
-                                               rendered="#{createDeploymentView.isServerAndContextSelected()}"
-                                               styleClass="btn primary right marginLeft20" onclick="showLoader();"
-                                               includeViewParams="true">
-                                </h:commandLink>
-                            </div>
-                        </h:panelGroup>
-                    </div>
-                </article>
-
-            </div>
-        </section>
-
-    </ui:define>
-
-    <ui:define name="headerButtons">
-
-    </ui:define>
-
-    <ui:define name="component_popups">
-
-        <h:form prependId="false">
-            <rich:popupPanel id="appserverListPopupPanel" moveable="true"
-                             autosized="true" domElementAttachment="form">
-                <f:facet name="header">
-                    <h2>
-                        <h:outputText value="Selected application server with applications and releases"/>
-                    </h2>
-                </f:facet>
-                <f:facet name="controls">
-                    <h:outputLink value="#"
-                                  styleClass="close icon icon-close icon-replace"
-                                  onclick="#{rich:component('appserverListPopupPanel')}.hide(); return false;">
-                        x
-                    </h:outputLink>
-                </f:facet>
-                <h:panelGroup id="appserverListPopupPanelGroup">
-                    <h:panelGroup>
-                        <div style="overflow-x: auto;height: 500px;">
-                            <div class="CodeMirror-merge-pane">
-                                <ul>
-                                    <ui:repeat var="selecteddeployment"
-                                               value="${createDeploymentView.selectedDeploymentsForRedeployment}">
-                                        <li>
-                                            <h:panelGroup layout="block">
-                                                <h:outputText styleClass="boldFont"
-                                                              value="#{selecteddeployment.resourceGroup.name} (#{selecteddeployment.release.name})"/>
-                                                <ui:repeat var="appToShow"
-                                                           value="${selecteddeployment.applicationsWithVersion}">
-                                                    <h:panelGroup styleClass="paddingLeft20 smallFont" layout="block">
-
-                                                        <h:outputText value="${appToShow.applicationName}"/>
-                                                        <h:outputText rendered="${appToShow.version != ''}"
-                                                                      value=" (${appToShow.version})"
-                                                                      styleClass="grey marginLeft10"/>
-                                                    </h:panelGroup>
-                                                </ui:repeat>
-                                            </h:panelGroup>
-                                        </li>
-                                        <div style="height: 5px; clear: both;"></div>
-                                    </ui:repeat>
-                                </ul>
-                            </div>
-                            <div style="height: 30px; clear: both;"></div>
-                        </div>
-                    </h:panelGroup>
-                </h:panelGroup>
-            </rich:popupPanel>
-        </h:form>
-    </ui:define>
-
-</ui:composition>
-</html>
diff --git a/AMW_web/src/main/webapp/pages/deploy.xhtml b/AMW_web/src/main/webapp/pages/deploy.xhtml
deleted file mode 100644
index d23e2ffc4..000000000
--- a/AMW_web/src/main/webapp/pages/deploy.xhtml
+++ /dev/null
@@ -1,836 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:ui="http://java.sun.com/jsf/facelets"
-      xmlns:h="http://java.sun.com/jsf/html"
-      xmlns:f="http://java.sun.com/jsf/core"
-      xmlns:a4j="http://richfaces.org/a4j"
-      xmlns:rich="http://richfaces.org/rich"
-      xmlns:mobi="http://java.sun.com/jsf/composite/mobi">
-
-<ui:composition template="templates/template.xhtml">
-    <f:metadata>
-        <f:event type="preRenderView" listener="#{deployScreenDataProvider.initView}"></f:event>
-        <f:viewParam name="application_name" value="#{deployScreenDataProvider.filterApplicationNameViewParam}"/>
-        <f:viewParam name="appserver_name" value="#{deployScreenDataProvider.filterAppServerNameViewParam}"/>
-        <f:viewParam name="environment_name" value="#{deployScreenDataProvider.filterEnvironmentNameParam}"/>
-        <f:viewParam name="tracking_id" value="#{deployScreenDataProvider.filterTrackingIdParam}"/>
-    </f:metadata>
-    <ui:param name="screen" value="newDeploy"/>
-    <ui:define name="title">Deploy</ui:define>
-    <ui:define name="pagetitle">
-        <h:outputText id="pageheader" value="Deploy"/>
-    </ui:define>
-
-    <ui:define name="body">
-        <h:panelGroup layout="block" id="navig">
-            <aside>
-                <nav>
-                    <ul>
-                        <li class="current">
-                            <h:commandLink value="Deployments" execute="@none"/>
-                        </li>
-                    </ul>
-                </nav>
-            </aside>
-        </h:panelGroup>
-        <section id="content">
-            <div class="container">
-                <h:panelGroup id="contentPanelGroup"
-                              rendered="#{securityDataProvider.hasPermissionOnAllContext('DEPLOYMENT', 'READ')}">
-                    <article>
-                        <div class="well withHeight autoOverflow">
-                            <ui:include src="components/customFilterComp.xhtml">
-                                <ui:param name="customFilterImpl" value="#{deployScreenDataProvider.customFilterComp}"/>
-                            </ui:include>
-
-                            <h:panelGroup id="deployments">
-                                <h:dataTable id="deploymentsTable"
-                                             var="deployment"
-                                             value="#{deployScreenDataProvider.pendingDeployments}"
-                                             styleClass="deployTable well caption-top" rowClasses="odd-row,even-row">
-                                    <f:facet name="caption">
-                                        <nav class="actionbar">
-                                            <ul>
-                                                <li>
-                                                    <h:commandLink type="submit" styleClass="btn light"
-                                                                   onclick="showLoader();"
-                                                                   oncomplete="hideLoader();"
-                                                                   actionListener="#{deployScreenDataProvider.reloadDeployments(true)}">
-                                                        <i class="icon icon-reload"/>
-                                                        <h:outputText value="Apply filter / Refresh"/>
-
-                                                        <f:param name="application_name"
-                                                                 value="${deployScreenDataProvider.filterApplicationNameViewParam}"/>
-                                                        <f:param name="appserver_name"
-                                                                 value="${deployScreenDataProvider.filterAppServerNameViewParam}"/>
-                                                        <f:param name="environment_name"
-                                                                 value="${deployScreenDataProvider.filterEnvironmentNameParam}"/>
-                                                    </h:commandLink>
-                                                </li>
-                                                <li><h:outputLink styleClass="btn light" target="_blank"
-                                                                  rendered="#{securityDataProvider.hasPermissionToExportDeployments()}"
-                                                                  value="../deploymentCsvExport">
-                                                    <i class="icon icon-csv"/>
-                                                    <h:outputText value="Export"/>
-                                                </h:outputLink>
-                                                </li>
-                                                <li>
-                                                    <h:commandLink styleClass="btn disable"
-                                                                   value="Edit"
-                                                                   disabled="true"
-                                                                   rendered="#{!deployScreenDataProvider.canEditDeployments()}">
-                                                        <i class="icon icon-edit"/>
-                                                    </h:commandLink>
-                                                    <a4j:commandLink styleClass="btn light"
-                                                                     value="Edit"
-                                                                     rendered="#{deployScreenDataProvider.canEditDeployments()}"
-                                                                     render="bulkEditPopupPanelGroup"
-                                                                     actionListener="#{deployScreenDataProvider.clearEditDeploymentValues()}"
-                                                                     oncomplete="#{rich:component('bulkEditPopupPanel')}.show();">
-                                                        <i class="icon icon-edit"/>
-                                                    </a4j:commandLink>
-                                                </li>
-                                                <li>
-                                                    <h:link outcome="redeploy"
-                                                            rendered="#{deployScreenDataProvider.canRedeploy()}"
-                                                            styleClass="btn light">
-                                                        <i class="icon icon-redeploy">Redeploy</i>
-                                                        <f:param name="deploymentIdArray"
-                                                                 value="#{deployScreenDataProvider.getSelectedDeploymentIdsAsCommaseparatedList()}"/>
-                                                    </h:link>
-                                                </li>
-                                                <li>
-                                                    <h:link outcome="createDeploymentView" value="Add deployment"
-                                                            rendered="#{securityDataProvider.hasPermissionToCreateDeployment() and !deployScreenDataProvider.isAngularEnabled()}"
-                                                            styleClass="btn light"
-                                                            onclick="showLoader();confirmLeave(event);">
-                                                        <i class="icon icon-add"/>
-                                                    </h:link>
-                                                    <h:outputLink value="/AMW_angular/#/deployment"
-                                                            rendered="#{securityDataProvider.hasPermissionToCreateDeployment() and deployScreenDataProvider.isAngularEnabled()}"
-                                                            styleClass="btn light"
-                                                            onclick="showLoader();confirmLeave(event);">
-                                                        <i class="icon icon-add"/>
-                                                        <h:outputText value="Add deployment" />
-                                                    </h:outputLink>
-                                                </li>
-                                            </ul>
-                                        </nav>
-                                        <h2>
-                                            <h:outputText value="Deployments"/>
-                                        </h2>
-                                    </f:facet>
-
-                                    <f:facet name="footer">
-                                        <h:panelGroup>
-                                            <a4j:commandLink value="&lt;&lt;"
-                                                             render="deployments"
-                                                             onclick="showLoader();"
-                                                             oncomplete="hideLoader();"
-                                                             action="${deployScreenDataProvider.firstScreen()}"
-                                                             rendered="${deployScreenDataProvider.currentPage!=0}"/>
-                                            <a4j:commandLink value="&lt;"
-                                                             render="deployments"
-                                                             onclick="showLoader();" oncomplete="hideLoader();"
-                                                             action="${deployScreenDataProvider.previousScreen()}"
-                                                             rendered="${deployScreenDataProvider.currentPage!=0}"
-                                                             styleClass="marginLeft10"/>
-                                            <ui:repeat
-                                                    value="${deployScreenDataProvider.availablePages().subList(
-									 deployScreenDataProvider.currentPage-2 > 0 ? deployScreenDataProvider.currentPage-2 : 0,
-									 deployScreenDataProvider.availablePages().size() >= deployScreenDataProvider.currentPage+3 ? deployScreenDataProvider.currentPage + 3 : deployScreenDataProvider.availablePages().size())
-									 }" var="page">
-                                                <a4j:commandLink
-                                                        rendered="${page!=deployScreenDataProvider.currentPage}"
-                                                        value="${page+1}" styleClass="marginLeft10"
-                                                        onclick="showLoader();" oncomplete="hideLoader();"
-                                                        render="deployments"
-                                                        action="${deployScreenDataProvider.goToScreen(page)}"/>
-                                                <h:outputText
-                                                        rendered="${page==deployScreenDataProvider.currentPage}"
-                                                        value="${page+1}" styleClass="marginLeft10 boldFont"/>
-                                            </ui:repeat>
-
-                                            <a4j:commandLink value="&gt;" styleClass="marginLeft10"
-                                                             action="${deployScreenDataProvider.nextScreen()}"
-                                                             onclick="showLoader();" oncomplete="hideLoader();"
-                                                             render="deployments"
-                                                             rendered="${!deployScreenDataProvider.lastPage}"/>
-                                            <a4j:commandLink value="&gt;&gt;" styleClass="marginLeft10"
-                                                             onclick="showLoader();" oncomplete="hideLoader();"
-                                                             action="${deployScreenDataProvider.lastScreen()}"
-                                                             render="deployments"
-                                                             rendered="${!deployScreenDataProvider.lastPage}"/>
-                                            <div class="control-group right">
-                                                <label class="control-label">Results per page:</label>
-                                                <div class="controls">
-                                                    <h:selectOneMenu value="#{deployScreenDataProvider.itemsPerPage}">
-                                                        <f:selectItem itemLabel="10" itemValue="10"/>
-                                                        <f:selectItem itemLabel="20" itemValue="20"/>
-                                                        <f:selectItem itemLabel="50" itemValue="50"/>
-                                                        <f:selectItem itemLabel="100" itemValue="100"/>
-                                                        <a4j:ajax render="deployments"/>
-                                                    </h:selectOneMenu>
-                                                </div>
-                                            </div>
-                                        </h:panelGroup>
-                                    </f:facet>
-
-                                    <h:column index="index" headerClass="width_20 nowrap">
-                                        <f:facet name="header">
-                                            <h:selectBooleanCheckbox class="deploy-checkbox"
-                                                                     value="#{deployScreenDataProvider.toggleDeploymentsSelection}">
-                                                <a4j:ajax render="deployments"
-                                                          onbegin="showLoader()"
-                                                          oncomplete="hideLoader()"/>
-                                            </h:selectBooleanCheckbox>
-                                            <a4j:commandLink render="deployments" onclick="showLoader();"
-                                                             oncomplete="hideLoader();"
-                                                             action="#{deployScreenDataProvider.changeSortOrderForSelectedColumn('TRACKING_ID')}">
-                                                <i class="${deployScreenDataProvider.getSortingIconForCol('TRACKING_ID')} inlineBlockMiddle"></i>
-                                            </a4j:commandLink>
-                                        </f:facet>
-                                        <h:panelGroup class="nowrap">
-                                            <h:selectBooleanCheckbox class="deploy-checkbox"
-                                                                     value="#{deployScreenDataProvider.checkedDeployments[deployment.id]}"
-                                                                     disabled="#{!deployScreenDataProvider.isRedeployPossible(deployment)}">
-                                                <a4j:ajax render="deployments"/>
-                                            </h:selectBooleanCheckbox>
-                                            <h:outputText value="#{deployment.trackingId}"/>
-                                        </h:panelGroup>
-                                    </h:column>
-
-                                    <h:column index="index" headerClass="width_200 nowrap">
-                                        <f:facet name="header">
-                                            <h:outputText value="State"/>
-                                            <a4j:commandLink render="deployments"
-                                                             onclick="showLoader();"
-                                                             oncomplete="hideLoader();"
-                                                             action="#{deployScreenDataProvider.changeSortOrderForSelectedColumn('STATE')}">
-                                                <i class="${deployScreenDataProvider.getSortingIconForCol('STATE')} inlineBlockMiddle"></i>
-                                            </a4j:commandLink>
-                                        </f:facet>
-                                        <div class="deploymentInfo nowrap">
-                                            <h:outputText rendered="${deployment.reason == null}"
-                                                    value="#{deployScreenDataProvider.getDeploymentStateText(deployment)}"
-                                                    styleClass="#{deployScreenDataProvider.getDeploymentStateFrame(deployment)} inlineBlock"/>
-                                            <h:outputText rendered="${deployment.reason != null}"
-                                                          value="#{deployment.reason.displayName}"
-                                                          styleClass="#{deployScreenDataProvider.getDeploymentStateFrame(deployment)} inlineBlock reason"/>
-                                            <a4j:commandLink
-                                                    oncomplete="#{rich:component('deploymentDetailPopup')}.show(); return false;"
-                                                    render="deploymentDetailPopupFacet, deploymentDetailPopupPanelGroup"
-                                                    title="Show details about this deployment"
-                                                    styleClass="simpleInfo">
-                                                <i class="icon icon-info inlineBlockMiddle marginLeft10 height16"></i>
-                                                <a4j:param assignTo="#{deployScreenDataProvider.selectedDeploymentId}"
-                                                        value="${deployment.id}"></a4j:param>
-                                            </a4j:commandLink>
-                                            <a4j:commandLink
-                                                    rendered="#{deployScreenDataProvider.showBuildFailed(deployment)}"
-                                                    oncomplete="#{rich:component('deploymentDetailPopup')}.show(); return false;"
-                                                    styleClass="icon icon-build-failed inlineBlockMiddleheight16 width16"
-                                                    title="Simulation failed"
-                                                    render="deploymentDetailPopupFacet, deploymentDetailPopupPanelGroup">
-                                                <a4j:param assignTo="#{deployScreenDataProvider.selectedDeploymentId}"
-                                                        value="${deployment.id}"></a4j:param>
-                                            </a4j:commandLink>
-                                        </div>
-                                    </h:column>
-
-                                    <h:column index="index" headerClass="nowrap">
-                                        <f:facet name="header">
-                                            <h:outputText value="App Server"/>
-                                            <a4j:commandLink render="deployments"
-                                                             onclick="showLoader();"
-                                                             oncomplete="hideLoader();"
-                                                             action="#{deployScreenDataProvider.changeSortOrderForSelectedColumn('APPSERVER_NAME')}">
-                                                <i class="${deployScreenDataProvider.getSortingIconForCol('APPSERVER_NAME')} inlineBlockMiddle"></i>
-                                            </a4j:commandLink>
-                                        </f:facet>
-
-                                        <mobi:editResourceLink rendered="#{deployment.resourceGroup != null and deployment.resource != null}" resId="#{deployment.resource.id}"
-                                                               linkLabel="#{deployment.resourceGroup.name}"
-                                                               editPermission="RESOURCE" resourceType="APPLICATIONSERVER"/>
-                                        <h:outputText rendered="#{deployment.resourceGroup == null}"
-                                                      value="#{deployScreenDataProvider.getResourceGroupName(deployment)}" />
-                                        <h:outputText rendered="#{deployment.resource == null}"
-                                                      value="#{deployScreenDataProvider.getResourceName(deployment)}" />
-
-                                        <ui:repeat var="appToShow"
-                                                   value="${deployment.applicationsWithVersion}">
-                                            <h:panelGroup styleClass="paddingLeft20" layout="block">
-                                                <mobi:editResourceLink resId="#{appToShow.applicationId}"
-                                                                       linkLabel="#{appToShow.applicationName}"
-                                                                       editPermission="RESOURCE" resourceType="APPLICATION"/>
-                                                <h:outputText rendered="${appToShow.version != ''}"
-                                                              value=" (${appToShow.version})"
-                                                              styleClass="grey marginLeft10"/>
-                                            </h:panelGroup>
-                                        </ui:repeat>
-                                    </h:column>
-
-                                    <h:column index="index" headerClass="width_80 nowrap">
-                                        <f:facet name="header">
-                                            <h:outputText value="Release"/>
-                                            <a4j:commandLink render="deployments"
-                                                             onclick="showLoader();"
-                                                             oncomplete="hideLoader();"
-                                                             action="#{deployScreenDataProvider.changeSortOrderForSelectedColumn('RELEASE')}">
-                                                <i class="${deployScreenDataProvider.getSortingIconForCol('RELEASE')} inlineBlockMiddle"></i>
-                                            </a4j:commandLink>
-                                        </f:facet>
-                                        <h:outputText rendered="#{deployment.release != null}" value="#{deployment.release.name}"/>
-                                        <h:outputText rendered="#{deployment.release == null}" value="#{deployScreenDataProvider.getReleaseName(deployment)}"/>
-                                    </h:column>
-
-                                    <h:column index="index" headerClass="width_20 nowrap">
-                                        <f:facet name="header">
-                                            <h:outputText value="Env"/>
-                                            <a4j:commandLink render="deployments" onclick="showLoader();"
-                                                             oncomplete="hideLoader();"
-                                                             action="#{deployScreenDataProvider.changeSortOrderForSelectedColumn('ENV')}">
-                                                <i class="${deployScreenDataProvider.getSortingIconForCol('ENV')} inlineBlockMiddle"></i>
-                                            </a4j:commandLink>
-                                        </f:facet>
-
-                                        <h:outputText rendered="#{deployment.context != null}"
-                                                      value="#{deployment.context.name}"
-                                                      styleClass="boldFont"/>
-                                        <h:outputText rendered="#{deployment.context == null}"
-                                                      value="#{deployScreenDataProvider.getContextName(deployment)}"
-                                                      styleClass="boldFont"/>
-                                    </h:column>
-
-                                    <h:column index="index" headerClass="width_160 nowrap">
-                                        <f:facet name="header">
-                                            <h:outputText value="deployment date"/>
-                                            <a4j:commandLink render="deployments"
-                                                             onclick="showLoader();"
-                                                             oncomplete="hideLoader();"
-                                                             action="#{deployScreenDataProvider.changeSortOrderForSelectedColumn('DEPLOY_TIME')}">
-                                                <i class="${deployScreenDataProvider.getSortingIconForCol('DEPLOY_TIME')} inlineBlockMiddle"></i>
-                                            </a4j:commandLink>
-                                        </f:facet>
-
-                                        <div>
-                                            <h:outputText
-                                                    rendered="#{!deployScreenDataProvider.isChangeDeploymentDatePossible(deployment)}"
-                                                    value="#{deployScreenDataProvider.formatDate(deployment.deploymentDate)}"
-                                                    styleClass="#{deployScreenDataProvider.getDeploymentDelayedClass(deployment)} inlineBlock"/>
-                                            <a4j:commandLink
-                                                    rendered="${deployScreenDataProvider.isChangeDeploymentDatePossible(deployment)}"
-                                                    oncomplete="#{rich:component('changeDeploymentDatePopupPanel')}.show(); return false;"
-                                                    render="changeDeploymentDatePopupPanelFacet, changeDeploymentDatePopupPanelGroup"
-                                                    title="change the deployment date">
-                                                <h:outputText
-                                                        value="#{deployScreenDataProvider.formatDate(deployment.deploymentDate)}"
-                                                        styleClass="#{deployScreenDataProvider.getDeploymentDelayedClass(deployment)} inlineBlock"/>
-                                                <a4j:param assignTo="#{deployScreenDataProvider.selectedDeploymentId}"
-                                                        value="${deployment.id}"></a4j:param>
-                                            </a4j:commandLink>
-                                        </div>
-                                    </h:column>
-
-                                    <h:column index="index">
-                                        <f:facet name="header">
-                                            <h:outputText value="actions"/>
-                                        </f:facet>
-
-                                        <a4j:commandLink
-                                                rendered="${deployScreenDataProvider.isConfirmPossible(deployment)}"
-                                                oncomplete="#{rich:component('confirmDeployment')}.show(); return false;"
-                                                render="confirmDeploymentPopupPanelFacet, confirmDeploymentPopupPanelGroup"
-                                                styleClass="green deployment-action">
-                                            <i class="icon icon-success inlineBlockMiddle height20">confirm</i>
-                                            <a4j:param assignTo="#{deployScreenDataProvider.selectedDeploymentId}"
-                                                    value="${deployment.id}"></a4j:param>
-                                        </a4j:commandLink>
-
-                                        <a4j:commandLink
-                                                rendered="${deployScreenDataProvider.isRejectPossible(deployment)}"
-                                                oncomplete="#{rich:component('rejectDeployment')}.show(); return false;"
-                                                render="rejectDeploymentPopupPanelFacet, rejectDeploymentPopupPanelGroup"
-                                                styleClass="red deployment-action">
-                                            <i class="icon icon-failed height20 inlineBlockMiddle">reject</i>
-                                            <a4j:param assignTo="#{deployScreenDataProvider.selectedDeploymentId}"
-                                                    value="${deployment.id}"></a4j:param>
-                                        </a4j:commandLink>
-
-                                        <a4j:commandLink
-                                                rendered="${deployScreenDataProvider.isCancelPossible(deployment)}"
-                                                oncomplete="#{rich:component('cancelDeployment')}.show(); return false;"
-                                                render="cancelDeploymentPopupPanelFacet, cancelDeploymentPopupPanelGroup"
-                                                styleClass="black deployment-action">
-                                            <i class="icon icon-canceled height20 inlineBlockMiddle">cancel</i>
-                                            <a4j:param assignTo="#{deployScreenDataProvider.selectedDeploymentId}"
-                                                       value="${deployment.id}"></a4j:param>
-                                        </a4j:commandLink>
-
-                                        <h:link outcome="redeploy"
-                                                rendered="#{deployScreenDataProvider.isRedeployPossible(deployment)
-                                                and !deployScreenDataProvider.isAngularEnabled()}"
-                                                styleClass="black deployment-action">
-                                            <i class="icon icon-redeploy height20 inlineBlockMiddle">Redeploy</i>
-                                            <f:param name="deploymentIdArray" value="#{deployment.id}"/>
-                                        </h:link>
-                                        <h:outputLink value="/AMW_angular/#/deployment/#{deployment.id}"
-                                                      rendered="#{deployScreenDataProvider.isRedeployPossible(deployment)
-                                                      and deployScreenDataProvider.isAngularEnabled()}"
-                                                      styleClass="black deployment-action">
-                                            <i class="icon icon-redeploy height20 inlineBlockMiddle">Redeploy</i>
-                                        </h:outputLink>
-
-                                        <h:link rendered="${deployScreenDataProvider.hasLogFiles(deployment.id)}"
-                                                styleClass="deployment-action"
-                                                outcome="logView">
-                                            <i class="icon icon-open_logfile height20 inlineBlockMiddle">logs</i>
-                                            <f:param name="deploymentId" value="${deployment.id}"/>
-                                        </h:link>
-
-                                    </h:column>
-                                </h:dataTable>
-                            </h:panelGroup>
-                        </div>
-                    </article>
-                </h:panelGroup>
-            </div>
-        </section>
-    </ui:define>
-
-    <ui:define name="component_popups">
-        <h:form>
-            <rich:popupPanel id="confirmDeployment" moveable="true" autosized="true" domElementAttachment="form">
-                <f:facet name="header">
-                    <h2>
-                        <h:outputText id="confirmDeploymentPopupPanelFacet"
-                                      value="Confirm deployment ${deployScreenDataProvider.selectedDeployment.id} for appserver ${deployScreenDataProvider.selectedDeployment.resourceGroup.name}"/>
-                    </h2>
-                </f:facet>
-                <f:facet name="controls">
-                    <h:outputLink value="#"
-                                  styleClass="close icon icon-close icon-replace"
-                                  onclick="#{rich:component('confirmDeployment')}.hide(); return false;">
-                        x
-                    </h:outputLink>
-                </f:facet>
-                <h:panelGroup id="confirmDeploymentPopupPanelGroup">
-                    <div>
-                        <label class="inlineBlock">
-                            <h:selectBooleanCheckbox value="#{deployScreenDataProvider.selectedDeployment.sendEmailConfirmation}"/>
-                            send an email when deployed
-                        </label>
-                    </div>
-
-                    <div>
-                        <label class="inlineBlock">
-                            <h:selectBooleanCheckbox value="#{deployScreenDataProvider.selectedDeployment.simulating}"/>
-                            simulate before deployment
-                        </label>
-                    </div>
-
-                    <div>
-                        <h:panelGroup rendered="#{securityDataProvider.hasPermission('SHAKEDOWNTEST', 'CREATE')}">
-                            <label class="inlineBlock">
-                                <h:selectBooleanCheckbox value="#{deployScreenDataProvider.selectedDeployment.createTestAfterDeployment}">
-                                <a4j:ajax render="testNeighbourhoodButtonId"/>
-                            </h:selectBooleanCheckbox>execute shakedown tests when deployed</label>
-                        </h:panelGroup>
-                    </div>
-
-                    <div class="paddingLeft20">
-                        <h:panelGroup
-                                rendered="#{securityDataProvider.hasPermission('SHAKEDOWNTEST', 'CREATE')}">
-                            <label class="inlineBlock">
-                                <h:selectBooleanCheckbox id="testNeighbourhoodButtonId"
-                                    disabled="#{deployScreenDataProvider.selectedDeployment.createTestAfterDeployment==false}"
-                                    value="#{deployScreenDataProvider.selectedDeployment.createTestForNeighborhoodAfterDeployment}"/>
-                                test neighbourhood
-                            </label>
-                        </h:panelGroup>
-                    </div>
-
-                    <a4j:commandLink render="deployments" value="Confirm"
-                                     action="${deployScreenDataProvider.doConfirmAction(deployScreenDataProvider.selectedDeployment)}"
-                                     styleClass="btn primary right marginLeft20"
-                                     type="button"
-                                     onclick="showLoader();#{rich:component('confirmDeployment')}.hide();"
-                                     oncomplete="hideLoader();return false;"/>
-
-                </h:panelGroup>
-            </rich:popupPanel>
-            <rich:popupPanel id="rejectDeployment" moveable="true"
-                             autosized="true" domElementAttachment="form">
-                <f:facet name="header">
-                    <h2>
-                        <h:outputText
-                                value="Reject deployment ${deployScreenDataProvider.selectedDeployment.id} for appserver ${deployScreenDataProvider.selectedDeployment.resourceGroup.name}"
-                                id="rejectDeploymentPopupPanelFacet"/>
-                    </h2>
-                </f:facet>
-                <f:facet name="controls">
-                    <h:outputLink value="#"
-                                  styleClass="close icon icon-close icon-replace"
-                                  onclick="#{rich:component('rejectDeployment')}.hide(); return false;">
-                        x
-                    </h:outputLink>
-                </f:facet>
-                <h:panelGroup id="rejectDeploymentPopupPanelGroup">
-                    Are you sure that you want to reject this deployment?
-                    <a4j:commandLink render="deployments"
-                                     styleClass="btn primary right  marginLeft20" value="Confirm"
-                                     type="button"
-                                     action="${deployScreenDataProvider.doRejectAction(deployScreenDataProvider.selectedDeployment)}"
-                                     onclick="showLoader();#{rich:component('rejectDeployment')}.hide();"
-                                     oncomplete="hideLoader();return false;"/>
-                </h:panelGroup>
-            </rich:popupPanel>
-            <rich:popupPanel id="cancelDeployment" moveable="true"
-                             autosized="true" domElementAttachment="form">
-                <f:facet name="header">
-                    <h2>
-                        <h:outputText
-                                value="Cancel deployment ${deployScreenDataProvider.selectedDeployment.id} for appserver ${deployScreenDataProvider.selectedDeployment.resourceGroup.name}"
-                                id="cancelDeploymentPopupPanelFacet"/>
-                    </h2>
-                </f:facet>
-                <f:facet name="controls">
-                    <h:outputLink value="#"
-                                  styleClass="close icon icon-close icon-replace"
-                                  onclick="#{rich:component('cancelDeployment')}.hide(); return false;">
-                        x
-                    </h:outputLink>
-                </f:facet>
-                <h:panelGroup id="cancelDeploymentPopupPanelGroup">
-                    Are you sure that you want to cancel this deployment?
-                    <a4j:commandLink render="deployments"
-                                     styleClass="btn primary right  marginLeft20" value="Confirm"
-                                     type="button"
-                                     action="${deployScreenDataProvider.cancelDeployment(deployScreenDataProvider.selectedDeployment)}"
-                                     onclick="showLoader();#{rich:component('cancelDeployment')}.hide();"
-                                     oncomplete="hideLoader();return false;"/>
-                </h:panelGroup>
-            </rich:popupPanel>
-
-        </h:form>
-
-        <h:form prependId="false">
-            <rich:popupPanel id="confirmDeployment" moveable="true"
-                             autosized="true" domElementAttachment="form">
-                <f:facet name="header">
-                    <h2>
-                        <h:outputText
-                                value="Confirm deployment ${deployScreenDataProvider.selectedDeployment.id} for appserver ${deployScreenDataProvider.selectedDeployment.resourceGroup.name}"
-                                id="confirmDeploymentPopupPanelFacet"/>
-                    </h2>
-                </f:facet>
-                <f:facet name="controls">
-                    <h:outputLink value="#"
-                                  styleClass="close icon icon-close icon-replace"
-                                  onclick="#{rich:component('confirmDeployment')}.hide(); return false;">
-                        x
-                    </h:outputLink>
-                </f:facet>
-                <h:panelGroup id="confirmDeploymentPopupPanelGroup">
-                    Do you want to receive an email when deployed?
-                    <br/>
-                    <h:commandLink render="deployments" value="No"
-                                   action="${deployScreenDataProvider.doConfirmAction(deployScreenDataProvider.selectedDeployment, false)}"
-                                   styleClass="btn primary right marginLeft20" type="button"/>
-                    <h:commandLink render="deployments" value="Yes"
-                                   action="${deployScreenDataProvider.doConfirmAction(deployScreenDataProvider.selectedDeployment, true)}"
-                                   styleClass="btn primary right marginLeft20" type="button"/>
-                </h:panelGroup>
-            </rich:popupPanel>
-        </h:form>
-
-        <h:form prependId="false">
-
-            <rich:popupPanel id="cancelDeployment" moveable="true"
-                             autosized="true" domElementAttachment="form">
-                <f:facet name="header">
-                    <h2>
-                        <h:outputText
-                                value="Cancel deployment ${deployScreenDataProvider.selectedDeployment.id} for appserver ${deployScreenDataProvider.selectedDeployment.resourceGroup.name}"
-                                id="cancelDeploymentPopupPanelFacet"/>
-                    </h2>
-                </f:facet>
-                <f:facet name="controls">
-                    <h:outputLink value="#"
-                                  styleClass="close icon icon-close icon-replace"
-                                  onclick="#{rich:component('cancelDeployment')}.hide(); return false;">
-                        x
-                    </h:outputLink>
-                </f:facet>
-                <h:panelGroup id="cancelDeploymentPopupPanelGroup">
-                    Are you sure that you want to cancel this deployment?
-                    <h:commandLink styleClass="btn primary right marginLeft20"
-                                   value="Confirm" type="button"
-                                   action="${deployScreenDataProvider.cancelDeployment()}"
-                                   render="deployments"/>
-                </h:panelGroup>
-            </rich:popupPanel>
-        </h:form>
-
-
-        <h:form prependId="false">
-
-            <rich:popupPanel id="bulkEditPopupPanel"
-                             moveable="true"
-                             autosized="true"
-                             minWidth="400"
-                             domElementAttachment="form">
-                <f:facet name="header">
-                    <h2><h:outputText id="bulkEditPopupPanelFacet" value="Edit deployments"/></h2>
-                </f:facet>
-                <f:facet name="controls">
-                    <h:outputLink value="#"
-                                  styleClass="close icon icon-close icon-replace"
-                                  onclick="#{rich:component('bulkEditPopupPanel')}.hide(); return false;">
-                        x
-                    </h:outputLink>
-                </f:facet>
-                <h:panelGroup id="bulkEditPopupPanelGroup">
-                    <h:panelGrid columns="2" styleClass="formGrid">
-                        <h:outputLabel value="Action"/>
-                        <h:selectOneMenu id="bulkAction"
-                                         value="#{deployScreenDataProvider.bulkAction}">
-                            <f:selectItems
-                                    value="#{deployScreenDataProvider.deploymentActions}"
-                                    var="action"
-                                    itemLabel="#{action.label}"
-                                    itemValue="#{action}"/>
-                            <a4j:ajax render="bulkEditPopupPanelGroup"/>
-                        </h:selectOneMenu>
-                        <h:outputLabel value="Date"
-                                       rendered="#{deployScreenDataProvider.bulkAction == 'CONFIRM' or deployScreenDataProvider.bulkAction == 'CHANGE_DATE'}"/>
-                        <rich:calendar
-                                buttonIcon="/AMW_web/images/calendarIcon.png"
-                                buttonDisabledIcon="/AMW_web/images/calendarIcon.png"
-                                rendered="#{deployScreenDataProvider.bulkAction == 'CONFIRM' or deployScreenDataProvider.bulkAction == 'CHANGE_DATE'}"
-                                value="#{deployScreenDataProvider.deploymentDate}"
-                                enableManualInput="true"
-                                showApplyButton="true"
-                                datePattern="dd.MM.yyyy HH:mm">
-                            <a4j:ajax/>
-                        </rich:calendar>
-                    </h:panelGrid>
-                    <h:panelGroup id="bulkOptions" rendered="#{deployScreenDataProvider.bulkAction == 'CONFIRM'}">
-                        <div>
-                            <label class="inlineBlock">
-                                <h:selectBooleanCheckbox
-                                        value="#{deployScreenDataProvider.simulateGeneration}"/>
-                                simulate before deployment
-                            </label>
-                        </div>
-                        <div>
-                            <label class="inlineBlock">
-                                <h:selectBooleanCheckbox
-                                        value="#{deployScreenDataProvider.sendEmailConfirmation}"/>send an email when deployed</label>
-                        </div>
-                        <h:panelGroup layout="block"
-                                      rendered="#{securityDataProvider.hasPermission('SHAKEDOWNTEST', 'CREATE')}">
-                            <label class="inlineBlock">
-                                <h:selectBooleanCheckbox value="#{deployScreenDataProvider.executeShakedownTest}">
-                                    <a4j:ajax render="bulkTestNeighbourhoodButtonId"/>
-                                </h:selectBooleanCheckbox>execute shakedown tests when deployed</label>
-                        </h:panelGroup>
-
-                        <h:panelGroup layout="block" class="paddingLeft20"
-                                      rendered="#{securityDataProvider.hasPermission('SHAKEDOWNTEST', 'CREATE')}">
-                            <label class="inlineBlock">
-                                <h:selectBooleanCheckbox
-                                    id="bulkTestNeighbourhoodButtonId"
-                                    disabled="#{deployScreenDataProvider.executeShakedownTest==false}"
-                                    value="#{deployScreenDataProvider.neighbourhoodTest}"/>test neighbourhood
-                            </label>
-                        </h:panelGroup>
-                    </h:panelGroup>
-
-                    <a4j:commandLink styleClass="btn primary right marginLeft20"
-                                     value="Edit"
-                                     type="button"
-                                     action="${deployScreenDataProvider.bulkUpdateDeployments}"
-                                     render="deployments"
-                                     onclick="showLoader();#{rich:component('bulkEditPopupPanel')}.hide();"
-                                     oncomplete="hideLoader();return false;"
-                    />
-                </h:panelGroup>
-            </rich:popupPanel>
-        </h:form>
-
-        <h:form prependId="false">
-            <rich:popupPanel id="changeDeploymentDatePopupPanel" moveable="true"
-                             autosized="true" domElementAttachment="form">
-                <f:facet name="header">
-                    <h2>
-                        <h:outputText value="Change deployment date"
-                                      id="changeDeploymentDatePopupPanelFacet"/>
-                    </h2>
-                </f:facet>
-                <f:facet name="controls">
-                    <h:outputLink value="#"
-                                  styleClass="close icon icon-close icon-replace"
-                                  onclick="#{rich:component('changeDeploymentDatePopupPanel')}.hide(); return false;">
-                        x
-                    </h:outputLink>
-                </f:facet>
-                <h:panelGroup id="changeDeploymentDatePopupPanelGroup">
-
-                    <table class="well">
-                        <caption>
-                            <h2>Deployment date</h2>
-                        </caption>
-                        <tbody>
-                        <tr>
-                            <td><rich:calendar
-                                    buttonIcon="/AMW_web/images/calendarIcon.png"
-                                    buttonDisabledIcon="/AMW_web/images/calendarIcon.png"
-                                    value="#{deployScreenDataProvider.selectedDeployment.deploymentDate}"
-                                    enableManualInput="true" showApplyButton="true"
-                                    datePattern="dd.MM.yyyy HH:mm">
-                                <a4j:ajax render="changeDeploymentDatePopupPanelGroup"/>
-                            </rich:calendar></td>
-                        </tr>
-                        </tbody>
-                    </table>
-
-
-                    <a4j:commandLink styleClass="btn primary right marginLeft20" value="Save"
-                                     type="submit"
-                                     action="#{deployScreenDataProvider.changeDeploymentTime(deployScreenDataProvider.selectedDeployment)}"
-                                     onclick="showLoader();#{rich:component('changeDeploymentDatePopupPanel')}.hide();"
-                                     oncomplete="hideLoader();return false;" render="deployments"/>
-                </h:panelGroup>
-            </rich:popupPanel>
-        </h:form>
-
-        <h:form prependId="false">
-            <rich:popupPanel id="deploymentDetailPopup" moveable="true"
-                             autosized="true">
-                <f:facet name="header">
-                    <h2>
-                        <h:outputText
-                                value="Details for deployment #${deployScreenDataProvider.selectedDeployment.id} [trackingid: ${deployScreenDataProvider.selectedDeployment.trackingId}] application server: ${deployScreenDataProvider.selectedDeployment.resourceGroup.name}"
-                                id="deploymentDetailPopupFacet"/>
-                    </h2>
-                </f:facet>
-                <f:facet name="controls">
-                    <h:outputLink value="#"
-                                  styleClass="close icon icon-close icon-replace"
-                                  onclick="#{rich:component('deploymentDetailPopup')}.hide(); return false;">
-                        x
-                    </h:outputLink>
-                </f:facet>
-                <h:panelGroup id="deploymentDetailPopupPanelGroup">
-
-                    <ul>
-                        <li><h:outputText
-                                value="requested by: ${deployScreenDataProvider.selectedDeployment.deploymentRequestUser}"
-                                styleClass="marginLeft10"/></li>
-                        <li><h:outputText
-                                value="created at: ${deployScreenDataProvider.formatDate(deployScreenDataProvider.selectedDeployment.deploymentJobCreationDate)}"
-                                styleClass="marginLeft10"/></li>
-                    </ul>
-                    <h:panelGroup
-                            rendered="${deployScreenDataProvider.selectedDeployment.deploymentConfirmed != null}">
-                        <br/>
-                        <ul>
-                            <li><h:outputText
-                                    value="${deployScreenDataProvider.selectedDeployment.deploymentConfirmed ? 'confirmed' : 'rejected'} by: ${deployScreenDataProvider.selectedDeployment.deploymentConfirmationUser}"
-                                    styleClass="marginLeft10"/></li>
-                            <li><h:outputText
-                                    value="${deployScreenDataProvider.selectedDeployment.deploymentConfirmed ? 'confirmed' : 'rejected'} at: ${deployScreenDataProvider.formatDate(deployScreenDataProvider.selectedDeployment.deploymentConfirmationDate)}"
-                                    styleClass="marginLeft10"/></li>
-                        </ul>
-                    </h:panelGroup>
-                    <h:panelGroup
-                            rendered="${deployScreenDataProvider.isDeploymentDelayed(deployScreenDataProvider.selectedDeployment)}">
-                        <br/>
-                        <h3>
-                            <h:outputText value="deployment job delayed"/>
-                        </h3>
-                        <ul>
-                            <li><h:outputText
-                                    value="planed deployment date: ${deployScreenDataProvider.formatDate(deployScreenDataProvider.selectedDeployment.deploymentDate)}"
-                                    styleClass="marginLeft10"/></li>
-                        </ul>
-                    </h:panelGroup>
-                    <h:panelGroup
-                            rendered="${deployScreenDataProvider.isDeploymentCanceled(deployScreenDataProvider.selectedDeployment)}">
-                        <br/>
-                        <h3>
-                            <h:outputText value="deployment job canceled"/>
-                        </h3>
-                        <ul>
-                            <li><h:outputText
-                                    value="canceled by: ${deployScreenDataProvider.selectedDeployment.deploymentCancelUser}"
-                                    styleClass="marginLeft10"/></li>
-                            <li><h:outputText
-                                    value="canceled at: ${deployScreenDataProvider.formatDate(deployScreenDataProvider.selectedDeployment.deploymentCancelDate)}"
-                                    styleClass="marginLeft10"/></li>
-                        </ul>
-
-                    </h:panelGroup>
-
-                    <h:panelGroup rendered="${deployScreenDataProvider.hasDeploymentParameter()}">
-                        <br/>
-                        <h:dataTable var="deployParam" id="deploymentParameterTable"
-                                     value="#{deployScreenDataProvider.selectedDeployment.deploymentParameters}"
-                                     styleClass="well" style="border-radius: 6px">
-                            <f:facet name="header">
-                                <h2>
-                                    <h:outputText value="Deployment parameter"/>
-                                </h2>
-                            </f:facet>
-
-                            <h:column index="index" headerClass="width_20 nowrap">
-
-                                <h:outputText value="#{deployParam.key}"/>
-                            </h:column>
-                            <h:column index="index" headerClass="width_20 nowrap">
-                                <h:outputText value="#{deployParam.value}"/>
-                            </h:column>
-
-                        </h:dataTable>
-                    </h:panelGroup>
-
-                    <h:panelGroup styleClass="well" layout="block"
-                                  rendered="${deployScreenDataProvider.selectedDeployment.reason != null}">
-                        <h2>
-                            <h:outputText value="Failure reason"/>
-                        </h2>
-                        <hr/>
-                        <div class="maxHeight500px width700px">
-                            <h:outputText value="${deployScreenDataProvider.selectedDeployment.reason.displayName}"/>
-                        </div>
-                    </h:panelGroup>
-
-                    <br/>
-                    <h:panelGroup styleClass="well" layout="block"
-                                  rendered="${deployScreenDataProvider.selectedDeployment.stateMessageAsHtml != ''}">
-                        <h2>
-                            <h:outputText value="State message"/>
-                        </h2>
-                        <hr/>
-                        <div class="autoOverflow maxHeight500px width700px stateMessage">
-                            <h:outputText
-                                    value="${deployScreenDataProvider.selectedDeployment.stateMessageAsHtml}"
-                                    escape="false"/>
-                        </div>
-                    </h:panelGroup>
-
-                </h:panelGroup>
-            </rich:popupPanel>
-        </h:form>
-
-        <a4j:region>
-            <h:form id="pollform">
-                <a4j:poll id="poll" interval="15000" enabled="false"
-                          render="deployments"
-                          action="#{deployScreenDataProvider.reloadDeployments(false)}"/>
-            </h:form>
-        </a4j:region>
-    </ui:define>
-</ui:composition>
-</html>
\ No newline at end of file
diff --git a/AMW_web/src/main/webapp/pages/editGlobalFunctionView.xhtml b/AMW_web/src/main/webapp/pages/editGlobalFunctionView.xhtml
deleted file mode 100644
index 823b77412..000000000
--- a/AMW_web/src/main/webapp/pages/editGlobalFunctionView.xhtml
+++ /dev/null
@@ -1,225 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:ui="http://java.sun.com/jsf/facelets"
-      xmlns:h="http://java.sun.com/jsf/html"
-      xmlns:f="http://java.sun.com/jsf/core"
-      xmlns:mobi="http://java.sun.com/jsf/composite/mobi">
-
-<ui:composition template="templates/template.xhtml">
-    <f:metadata>
-        <f:viewParam name="functionId" value="#{editGlobalFunctionView.functionIdViewParam}"/>
-        <f:viewParam name="cmpRev" value="#{editGlobalFunctionView.compareRevisionId}" />
-    </f:metadata>
-
-    <ui:param name="screen" value="editFunction"/>
-    <ui:define name="title">Function</ui:define>
-
-    <!--  HEADER -->
-    <ui:define name="backlink">
-        <h:link outcome="settings" value="Back to Functions"
-                styleClass="btn back" onclick="showLoader();" includeViewParams="true">
-            <f:param name="mode" value="functions"/>
-        </h:link>
-    </ui:define>
-
-    <ui:define name="pagetitle">Function
-        <h:outputScript name="bower/google-diff-match-patch-js/diff_match_patch.js"
-                        target="head" rendered="#{editGlobalFunctionView.compareMode}"/>
-        <h:outputScript name="bower/codemirror/lib/codemirror.js" target="head"/>
-        <h:outputScript name="bower/codemirror/addon/display/fullscreen.js" target="head"/>
-        <h:outputScript name="bower/codemirror/addon/dialog/dialog.js" target="head"/>
-        <h:outputScript name="bower/codemirror/addon/search/searchcursor.js" target="head"/>
-        <h:outputScript name="bower/codemirror/addon/search/search.js" target="head"/>
-        <h:outputScript name="bower/codemirror/addon/merge/merge.js" target="head"
-                        rendered="#{editGlobalFunctionView.compareMode}"/>
-        <h:outputScript name="bower/cm-show-invisibles/lib/show-invisibles.js" target="head" />
-        <h:outputStylesheet name="bower/codemirror/lib/codemirror.css"/>
-        <h:outputStylesheet name="bower/codemirror/addon/merge/merge.css"/>
-        <h:outputStylesheet name="bower/codemirror/addon/dialog/dialog.css"/>
-        <h:outputStylesheet name="bower/codemirror/addon/display/fullscreen.css"/>
-        <h:outputStylesheet name="css/codemirror_custom.css"/>
-        <mobi:warnOnChange/>
-    </ui:define>
-
-    <ui:define name="headerButtons">
-        <h:panelGroup id="saveButtons">
-            <h:commandLink styleClass="btn primary right"
-                           onclick="disableChangeCheck();#{editGlobalFunctionView.compareMode ? 'saveMerge();' : ''}showLoader();"
-                           rendered="#{editGlobalFunctionView.canManage()}"
-                           action="#{editGlobalFunctionView.saveFunction()}">
-                <h:outputText value="#{editGlobalFunctionView.newFunction ? 'Create Function' : 'Save changes'}" />
-            </h:commandLink>
-        </h:panelGroup>
-    </ui:define>
-
-    <ui:define name="body">
-        <h:panelGroup layout="block" id="navig">
-            <aside>
-                <nav>
-                    <ul>
-                        <li class="current"><h:link value="Function"/></li>
-                    </ul>
-                </nav>
-            </aside>
-        </h:panelGroup>
-        <section id="content">
-            <div class="container ">
-                <script type="text/javascript">
-                    function hasContentChanged(){
-                        if(originalValue===getEditorValue()){
-                            return false;
-                        }
-                        else{
-                            return true;
-                        }
-                    }
-
-                    function loadRevision(rev){
-                        var url = window.location.href;
-                        window.location.href = url.substring(0,url.indexOf("?"))+'?functionId=#{editGlobalFunctionView.globalFunction.getId()}&amp;cmpRev='+rev;
-                    }
-                </script>
-                <article>
-                    <div class="well">
-                        <h2><h:outputText value="#{editGlobalFunctionView.newFunction ? 'New' : 'Edit'}" /></h2>
-                        <div class="controls right" style="">
-                            <label class="control-label">Compare with history:</label>
-                            <h:selectOneMenu
-                                    value="#{editGlobalFunctionView.compareRevisionId}"
-                                    onchange="loadRevision(this.options[this.selectedIndex].value);">
-                                <f:selectItem itemLabel="Don't compare" itemValue="#{null}"/>
-                                <f:selectItems
-                                        value="#{editGlobalFunctionView.revisionInformations}"
-                                        itemLabel="#{rev.displayName}" itemValue="#{rev.revision}"
-                                        var="rev" />
-                            </h:selectOneMenu>
-                        </div>
-                        <hr/>
-                        <h:panelGroup layout="block" styleClass="compareTag control-label"
-                                      rendered="#{editGlobalFunctionView.compareMode}">Current</h:panelGroup>
-                        <h:panelGroup layout="block" styleClass="controls"
-                                      rendered="#{editGlobalFunctionView.compareMode}">
-                            <div class="CodeMirror-merge-2pane">
-                                <div class="CodeMirror-merge-pane" />
-                                <div class="CodeMirror-merge-gap" />
-                                <div class="CodeMirror-merge-pane"
-                                     style="margin-left: -70px; position: absolute;">
-                                    <div class="compareTag">#{editGlobalFunctionView.compareRevision.displayName}</div>
-                                </div>
-                            </div>
-                        </h:panelGroup>
-                        <br class="clear"/>
-
-                        <div class="maxWidth1024px">
-                            <div class="control-group">
-                                <label class="control-label"><h:outputText value="Function"/></label>
-
-                                <div class="controls">
-                                    <h:inputText styleClass="propertyInputField changeAware"
-                                    			 disabled="#{!editGlobalFunctionView.canManage()}"
-                                                 value="#{editGlobalFunctionView.globalFunction.name}"
-                                                 required="true">
-                                    </h:inputText>
-                                </div>
-                            </div>
-                        </div>
-
-                        <br class="clear"/>
-                        
-                        <h:panelGroup class="codeMirrorEditor">
-                        <h:inputTextarea id="codeMirrorReference"
-                                         disabled="#{!editGlobalFunctionView.canManage()}"
-                                         value="#{editGlobalFunctionView.globalFunction.content}"
-                                         label="content" required="true" styleClass="changeAware">
-                        </h:inputTextarea>
-                        <h:inputTextarea id="diffOriginal" style="display:none;"
-                                         disabled="true"
-                                         value="#{editGlobalFunctionView.compareGlobalFunction.content}"
-                                         rendered="#{editGlobalFunctionView.compareMode}" />
-                        <!-- codemirror -->
-                        <script type="text/javascript">
-
-                            var codeEditor = document.getElementById("codeMirrorReference");
-                            var originalValue = codeEditor.value;
-                            var code = codeEditor.value;
-                            var readonlyEditor = (document.getElementById("codeMirrorReference").disabled == true);
-
-                            #{editGlobalFunctionView.compareMode ? 'showMerge()' : 'showStdEditor()'};
-
-                            var myCodeMirror;
-
-                            function showStdEditor() {
-                                myCodeMirror = CodeMirror.fromTextArea(codeEditor, {
-                                    value: code,
-                                    smartIndent: false,
-                                    lineNumbers: true,
-                                    showInvisibles: true,
-                                    readOnly: readonlyEditor,
-                                    extraKeys: {
-                                        //key binding for toggle full screen on/off
-                                        "F11": function (cm) {
-                                            cm.setOption("fullScreen", !cm.getOption("fullScreen"));
-                                        },
-                                        //key binding for switch full screen off
-                                        "Esc": function (cm) {
-                                            if (cm.getOption("fullScreen")) cm.setOption("fullScreen", false);
-                                        }
-                                    }
-                                });
-                            }
-
-                            var codemirrorDiff;
-
-                            function showMerge(){
-                                codeEditor.style.display='none';
-                                codemirrorDiff = CodeMirror.MergeView(codeEditor.parentNode, {
-                                    value: code,
-                                    smartIndent: false,
-                                    showInvisibles: true,
-                                    orig: document.getElementById('diffOriginal').value,
-                                    lineNumbers: true,
-                                    readOnly: readonlyEditor,
-                                    highlightDifferences: true,
-                                    extraKeys: {
-                                        //key binding for toggle full screen on/off
-                                        "F11": function(cm) {
-                                            cm.setOption("fullScreen", !cm.getOption("fullScreen"));
-                                        },
-
-                                        //key binding for switch full screen off
-                                        "Esc": function(cm) {
-                                            if (cm.getOption("fullScreen")) cm.setOption("fullScreen", false);
-                                        }
-                                    }
-                                } );
-                            }
-
-                            function getEditorValue(){
-                                if(codemirrorDiff!==undefined){
-                                    return codemirrorDiff.edit.doc.getValue();
-                                }
-                                else{
-                                    return myCodeMirror.getDoc().getValue();
-                                }
-                            }
-
-                            function saveMerge(){
-                                codeEditor.value = codemirrorDiff.edit.doc.getValue();
-                            }
-
-                        </script>
-                        </h:panelGroup>
-                        <p>
-						<span class="meta">Enter fullscreen: F11, leave fullscreen:
-						ESC, Start searching: Ctrl-F, Find next: Ctrl-G, Find previous:
-						Shift-Ctrl-G, Replace: Shift-Ctrl-F, Replace all: Shift-Ctrl-R</span>
-                        </p>
-
-                    </div>
-                </article>
-            </div>
-        </section>
-
-    </ui:define>
-</ui:composition>
-</html>
diff --git a/AMW_web/src/main/webapp/pages/editPropertyView.xhtml b/AMW_web/src/main/webapp/pages/editPropertyView.xhtml
index 46cd7fbc0..973179603 100644
--- a/AMW_web/src/main/webapp/pages/editPropertyView.xhtml
+++ b/AMW_web/src/main/webapp/pages/editPropertyView.xhtml
@@ -64,8 +64,8 @@
         <section id="content">
             <div class="container">
                 <article>
-                        <div class="well ${editPropertyView.testing ? 'testing' : ''}">
-                            <h2>${editPropertyView.newDescriptorMode ? 'New' : 'Edit'} ${editPropertyView.testing ? 'testing' : ''} Property Descriptor</h2>
+                        <div class="well">
+                            <h2>${editPropertyView.newDescriptorMode ? 'New' : 'Edit'} Property Descriptor</h2>
                             <mobi:foreignableOwnerTooltip foreignableAttributes="#{editPropertyView.getForeignableToEdit()}"/>
                             <hr/>
                             <br class="clear"/>
diff --git a/AMW_web/src/main/webapp/pages/editResourceView.xhtml b/AMW_web/src/main/webapp/pages/editResourceView.xhtml
index 572ae0234..6bd168c81 100644
--- a/AMW_web/src/main/webapp/pages/editResourceView.xhtml
+++ b/AMW_web/src/main/webapp/pages/editResourceView.xhtml
@@ -90,22 +90,6 @@
                                           oncomplete="hideLoader();#{rich:component('copyFromPredecessorPopup')}.show();"/>
                             </h:commandLink>
                         </li>
-                        <li>
-                            <h:panelGroup id="testingModeButton"
-                                          styleClass="control-group  ${editResourceView.testing ? 'testing' : ''}"
-                                          rendered="#{editResourceView.hasShakedownTestPermission()}">
-
-                                <label class="btn light dropdown-item">
-                                    <h:selectBooleanCheckbox
-                                            onclick="return confirmLeave(event);"
-                                            value="#{editResourceView.testing}">
-                                        <a4j:ajax oncomplete="window.location.reload();"
-                                                  onbegin="showLoader();" onerror="hideLoader();"/>
-                                    </h:selectBooleanCheckbox>
-                                    Testing mode
-                                </label>
-                            </h:panelGroup>
-                        </li>
                     </ul>
                 </li>
                 </h:panelGroup>
@@ -263,9 +247,9 @@
                                         <h:link outcome="editPropertyView"
                                                 includeViewParams="false"
                                                 rendered="#{editResourceView.hasAddPropertyPermission()}"
-                                                styleClass="btn light ${editResourceView.testing ? 'testing' : ''}">
-                                            <i class="icon ${editResourceView.testing ? 'icon-addWhite' :  'icon-add'}"/>
-                                            <h:outputText value="Add new ${editResourceView.editResource ? 'instance' : 'resource type'} ${editResourceView.testing ? 'testing ' : ''}Property"/>
+                                                styleClass="btn light">
+                                            <i class="icon icon-add"/>
+                                            <h:outputText value="Add new ${editResourceView.editResource ? 'instance' : 'resource type'} Property"/>
                                             <f:param name="id" value="#{editResourceView.resourceIdFromParam}"/>
                                             <f:param name="resTypId" value="#{editResourceView.resourceTypeIdFromParam}"/>
                                             <f:param name="ctx" value="#{editResourceView.contextIdViewParam}" />
@@ -290,7 +274,7 @@
 
                                                     <div class="controls">
                                                         <h:inputText styleClass="propertyInputField changeAware"
-                                                                     disabled="#{!propertyEditDataProvider.editableProperties and !propertyEditDataProvider.testing}"
+                                                                     disabled="#{!propertyEditDataProvider.editableProperties}"
                                                                      value="#{editResourceView.asNamedIdentifiable.name}"/>
                                                     </div>
                                                 </div>
diff --git a/AMW_web/src/main/webapp/pages/editTemplateView.xhtml b/AMW_web/src/main/webapp/pages/editTemplateView.xhtml
index b6b6355d3..7e09e6368 100644
--- a/AMW_web/src/main/webapp/pages/editTemplateView.xhtml
+++ b/AMW_web/src/main/webapp/pages/editTemplateView.xhtml
@@ -143,32 +143,17 @@
 				<div style="height: 0px; clear: both;"></div>
 
 				<label class="control-label"> <h:outputText
-						value="${editTemplateView.testing ? 'Test ' : ''}Template name:" />
+						value="Template name:" />
 				</label>
 				<div class="controls">
 					<div class="CodeMirror-merge-2pane">
 						<div class="CodeMirror-merge-pane">
-							<h:inputText rendered="${!editTemplateView.testing}"
+							<h:inputText
 								value="#{editTemplateView.template.name}"
 										 disabled="#{!editTemplateView.canModifyTemplates()}"
 								label="Name" styleClass="changeAware">
 							</h:inputText>
-							<h:selectOneMenu
-								value="#{editTemplateView.selectedStpId}"
-								rendered="${editTemplateView.testing}"
-								disabled="#{!editTemplateView.canModifyTemplates()}"
-								required="true" label="STP" styleClass="changeAware">
-								<f:selectItems value="#{editTemplateView.stpList}"
-									var="stp" itemLabel="#{stp.stpName}" itemValue="#{stp.id}" />
-								<a4j:ajax render="infoStpArguments" />
-							</h:selectOneMenu>
-							<a4j:commandLink id="infoStpCommandLink"
-								rendered="#{editTemplateView.testing}" execute="@form"
-								oncomplete="#{rich:component('infoStpArguments')}.show();"
-								render="infoStpArguments" title="Show details about this STP"
-								styleClass="simpleInfo">
-								<i class="icon icon-info inlineBlockMiddle height16" />
-							</a4j:commandLink>
+
 						</div>
 						<h:panelGroup layout="block" styleClass="CodeMirror-merge-gap"
 							rendered="${editTemplateView.compareMode}" />
@@ -180,13 +165,13 @@
 					</div>
 				</div>
 				<label class="control-label"> <h:outputText
-						value="Path/filename:" rendered="${!editTemplateView.testing}"
+						value="Path/filename:"
 						disabled="#{!editTemplateView.canModifyTemplates()}"/>
 				</label>
 				<div class="controls">
 					<div class="CodeMirror-merge-2pane">
 						<div class="CodeMirror-merge-pane">
-							<h:inputText rendered="${!editTemplateView.testing}"
+							<h:inputText
 								value="#{editTemplateView.template.targetPath}"
 								required="false" label="Path_Filename" id="templateFileName"
 										 disabled="#{!editTemplateView.canModifyTemplates()}" styleClass="changeAware">
@@ -250,7 +235,7 @@
 			    	var codeEditor = document.getElementById("codeMirrorReference");
 					var originalValue = codeEditor.value;
 			    	var code = codeEditor.value;
-					var templateName = document.getElementById("templateFileName") == null ? "stp" : document.getElementById("templateFileName").value;
+					var templateName = document.getElementById("templateFileName").value;
 					var mode = "velocity";
 					var file = templateName.split(".");
 					var readonlyEditor = (document.getElementById("codeMirrorReference").disabled == true);
@@ -373,62 +358,6 @@
 		</div>
 		</section>
 
-		<rich:popupPanel id="infoStpArguments" autosized="true"
-			moveable="true" headerClass="testing"
-			rendered="${editTemplateView.testing}">
-			<f:facet name="header">
-				<h2>
-					<h:outputText value="Info Shakedown Test Package" />
-				</h2>
-			</f:facet>
-			<f:facet name="controls">
-				<h:outputLink value="#" class="icon icon-closeGrey icon-replace"
-					onclick="#{rich:component('infoStpArguments')}.hide(); return false;">x	</h:outputLink>
-			</f:facet>
-			<h:panelGroup
-				rendered="#{editTemplateView.selectedStp!=null}">
-				<div class="well textLeft">
-					<div class="control-group">
-						<h:outputText value="Name: " />
-						<h:outputText
-							value="#{editTemplateView.selectedStp.stpName}" />
-					</div>
-					<hr align="center" />
-					<div class="control-group">
-						<h:outputText value="Version: " />
-						<h:outputText
-							value="#{editTemplateView.selectedStp.version}" />
-					</div>
-					<hr align="center" />
-					<div class="control-group">
-						<h:outputText value="Arguments: " />
-						<h:outputText
-							value="#{editTemplateView.selectedStp.comaSeperatedParameters}" />
-					</div>
-				</div>
-			</h:panelGroup>
-			<h:panelGroup
-				rendered="#{editTemplateView.selectedStp==null}">
-				<div class="well textLeft">
-					<div class="control-group">
-						<h2>
-							<h:outputText value="STP has been deleted or not found!" />
-						</h2>
-					</div>
-				</div>
-			</h:panelGroup>
-			<h:panelGroup
-				rendered="#{editTemplateView.selectedStp==null}">
-				<div class="well textCenter">
-					<div class="control-group">
-						<h2>
-							<h:outputText value="Shakedown Test Suite" />
-						</h2>
-					</div>
-				</div>
-			</h:panelGroup>
-		</rich:popupPanel>
-
 	</ui:define>
 </ui:composition>
 </html>
diff --git a/AMW_web/src/main/webapp/pages/redeploy.xhtml b/AMW_web/src/main/webapp/pages/redeploy.xhtml
deleted file mode 100644
index 991556929..000000000
--- a/AMW_web/src/main/webapp/pages/redeploy.xhtml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:ui="http://java.sun.com/jsf/facelets">
-<ui:composition template="createDeploymentView.xhtml"></ui:composition>
-</html>
\ No newline at end of file
diff --git a/AMW_web/src/main/webapp/pages/resourceList.xhtml b/AMW_web/src/main/webapp/pages/resourceList.xhtml
deleted file mode 100644
index 67849f5fe..000000000
--- a/AMW_web/src/main/webapp/pages/resourceList.xhtml
+++ /dev/null
@@ -1,52 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:ui="http://java.sun.com/jsf/facelets"
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:mobi="http://java.sun.com/jsf/composite/mobi">
-
-<ui:composition template="templates/template.xhtml">
-	<f:metadata>
-		<f:event type="preRenderView"
-			listener="#{resourceListDataProvider.initView}"/>
-	</f:metadata>
-	<ui:param name="screen" value="newResourceList" />
-	<ui:define name="title">Resources</ui:define>
-	<ui:define name="pagetitle">
-		<h:outputText id="pageheader" value="Resources" />
-	</ui:define>
-	<ui:define name="body">
-		<ui:include src="components/selectEditResourceTypeComp.xhtml">
-			<ui:param name="renderItemsList" value="resourceInstanceListComp" />
-			<ui:param name="selectEditResourceTypeImpl"
-				value="#{resourceListDataProvider.selectEditResourceTypeComp}" />
-			<ui:param name="showCreateResourceType" value="${true}" />
-		</ui:include>
-		<section id="content">
-		<div class="container">
-
-			<ui:include src="components/resourceInstanceListComp.xhtml">
-				<ui:param name="resourceInstanceListImpl"
-					value="#{resourceListDataProvider}" />
-				<ui:param name="renderItemsList" value="selectEditResourceTypeComp" />
-			</ui:include>
-
-		</div>
-
-		</section>
-	</ui:define>
-
-	<ui:define name="component_popups">
-		<ui:include src="components/resourceInstanceListPopupsComp.xhtml">
-			<ui:param name="resourceInstanceListImpl"
-				value="#{resourceListDataProvider}" />
-			<ui:param name="renderItemsList" value="selectEditResourceTypeComp" />
-		</ui:include>
-		<mobi:createApplicationForAsPopup
-			parentDataProvider="#{resourceListDataProvider}"
-			renderList="resourceInstanceListComp" id="createApplicationForAsPopupComp"/>
-	</ui:define>
-
-</ui:composition>
-
-</html>
\ No newline at end of file
diff --git a/AMW_web/src/main/webapp/pages/serverListView.xhtml b/AMW_web/src/main/webapp/pages/serverListView.xhtml
deleted file mode 100644
index 521082a19..000000000
--- a/AMW_web/src/main/webapp/pages/serverListView.xhtml
+++ /dev/null
@@ -1,195 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:ui="http://java.sun.com/jsf/facelets"
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:a4j="http://richfaces.org/a4j"
-	xmlns:rich="http://richfaces.org/rich"
-	xmlns:mobi="http://java.sun.com/jsf/composite/mobi">
-
-<ui:composition template="templates/template.xhtml">
-	<f:metadata>
-		<f:viewParam name="appServer"
-			value="#{serverListView.serverListFilter.appServer}" />
-		<f:viewParam name="runtime"
-			value="#{serverListView.serverListFilter.runtime}" />
-		<f:viewParam name="env"
-			value="#{serverListView.serverListFilter.environment}" />
-		<f:viewParam name="host"
-			value="#{serverListView.serverListFilter.host}" />
-		<f:viewParam name="node"
-			value="#{serverListView.serverListFilter.node}" />
-		<f:event type="preRenderView" listener="#{serverListView.init}"/>
-	</f:metadata>
-
-	<ui:param name="screen" value="server" />
-	<ui:define name="title">Servers</ui:define>
-
-	<ui:define name="pagetitle">
-		<h:outputText id="pageheader" value="Servers" />
-	</ui:define>
-
-	<ui:define name="body">
-		<h:panelGroup layout="block" id="navig">
-			<aside>
-				<nav>
-					<ul>
-						<li class="current"><h:commandLink value="Servers"
-								execute="@none" /></li>
-					</ul>
-				</nav>
-			</aside>
-		</h:panelGroup>
-
-		<section id="content">
-			<div class="container">
-				<div class="well" style="min-height: 320px">
-					<h:panelGroup id="filter">
-						<h3>Filter</h3>
-						<div class="control-group">
-							<label class="control-label">AppServer</label>
-							<div class="controls">
-								<rich:autocomplete value="#{serverListView.serverListFilter.appServer}" autofill="false" mode="lazyClient" 
-								autocompleteMethod="#{serverListView.getAppServersSuggestions}" />
-							</div>
-						</div>
-						<div class="control-group">
-							<label class="control-label">Runtime</label>
-							<div class="controls">
-								<h:selectOneMenu
-									value="#{serverListView.serverListFilter.runtime}">
-									<f:selectItem itemLabel="All" itemValue="" />
-									<f:selectItems value="#{serverListView.runtimes}" var="runtime"
-										itemLabel="#{runtime.name}" itemValue="${runtime.name}" />
-								</h:selectOneMenu>
-							</div>
-						</div>
-						<div class="control-group">
-							<label class="control-label">Env</label>
-							<div class="controls">
-								<h:selectOneMenu class="width80px"
-									value="#{serverListView.serverListFilter.environment}">
-									<f:selectItem itemLabel="All" itemValue="" />
-									<f:selectItems value="${contextDataProvider.environments}"
-										var="env" itemLabel="${env.name}" itemValue="${env.name}" />
-								</h:selectOneMenu>
-							</div>
-						</div>
-						<div class="control-group">
-							<label class="control-label">Host</label>
-							<div class="controls">
-								<h:inputText title="#{serverListView.FILTER_TOOLTIP}"
-								value="#{serverListView.serverListFilter.host}" />
-							</div>
-						</div>
-						<div class="control-group">
-							<label class="control-label">Node</label>
-							<div class="controls">
-								<h:inputText title="#{serverListView.FILTER_TOOLTIP}"
-								 value="#{serverListView.serverListFilter.node}" />
-							</div>
-						</div>
-						<div class="controls">
-							<nav class="actionbar">
-								<ul>
-									<li><a4j:commandLink id="resetButton" value="Reset" type="reset"
-											render="filter" onclick="showLoader()" oncomplete="hideLoader()"
-											actionListener="#{serverListView.serverListFilter.reset}"
-											styleClass="btn light right">
-										</a4j:commandLink></li>
-									<li><h:commandButton id="searchButton" value="Search"
-												onclick="showLoader()" oncomplete="hideLoader()"
-												type="submit" action="#{serverListView.searchServers}"
-												styleClass="btn light right" />
-									</li>
-								</ul>
-							</nav>
-						</div>
-					</h:panelGroup>
-
-					<h:panelGroup layout="block" class="table-placeholder" rendered="#{empty serverListView.servers}" >
-						<h:outputText rendered="#{serverListView.serverListFilter['empty']}" value="Search for something!"/>
-						<h:outputText rendered="#{!serverListView.serverListFilter['empty']}" value="No result!"/>
-					</h:panelGroup>
-
-					<h:dataTable id="servers" var="server" rendered="#{not empty serverListView.servers}"
-						value="#{serverListView.servers}" styleClass="deployTable well"
-						rowClasses="odd-row,even-row">
-
-						<h:column index="index">
-							<f:facet name="header">
-								<h:outputText style="white-space: nowrap" value="Host" />
-							</f:facet>
-							<h:outputLink value="#{serverListView.vmDetailUrl}">
-								<h:outputText value="#{server.host}" />
-								<f:param name="#{serverListView.vmUrlParam}"
-									value="#{server.host}" />
-							</h:outputLink>
-						</h:column>
-						
-						<h:column index="index">
-							<f:facet name="header">
-								<h:outputText style="white-space: nowrap" value="Env" />
-							</f:facet>
-							<h:outputText value="#{server.environment}" />
-						</h:column>
-						
-						<h:column index="index">
-							<f:facet name="header">
-								<h:outputText style="white-space: nowrap" value="AppServer" />
-							</f:facet>
-							<h:link value="#{server.appServer}" outcome="editResourceView"
-								rendered="${serverListView.appServerReadPermission}">
-								<f:param name="id" value="#{server.appServerId}" />
-								<f:param name="ctx" value="#{server.environmentId}" />
-							</h:link>
-							<h:outputText
-								rendered="${!serverListView.appServerReadPermission}"
-								value="#{server.appServer}" />
-						</h:column>
-
-						<h:column index="index">
-							<f:facet name="header">
-								<h:outputText style="white-space: nowrap"
-									value="AppServer Release" />
-							</f:facet>
-							<h:outputText value="#{server.appServerRelease}" />
-						</h:column>
-
-						<h:column index="index">
-							<f:facet name="header">
-								<h:outputText style="white-space: nowrap" value="Runtime" />
-							</f:facet>
-							<h:outputText value="#{server.runtime}" />
-						</h:column>
-
-						<h:column index="index">
-							<f:facet name="header">
-								<h:outputText style="white-space: nowrap" value="Node" />
-							</f:facet>
-							<h:link value="#{server.node}" outcome="editResourceView"
-								rendered="${serverListView.resourceReadPermission}">
-								<f:param name="id" value="#{server.nodeId}" />
-								<f:param name="ctx" value="#{server.environmentId}" />
-							</h:link>
-							<h:outputText
-								rendered="${!serverListView.resourceReadPermission}"
-								value="#{server.node}" />
-						</h:column>
-
-						<h:column index="index">
-							<f:facet name="header">
-
-								<h:outputText style="white-space: nowrap" value="Node Release" />
-							</f:facet>
-							<h:outputText value="#{server.nodeRelease}" />
-						</h:column>
-
-					</h:dataTable>
-				</div>
-			</div>
-		</section>
-	</ui:define>
-
-</ui:composition>
-</html>
\ No newline at end of file
diff --git a/AMW_web/src/main/webapp/pages/settings.xhtml b/AMW_web/src/main/webapp/pages/settings.xhtml
deleted file mode 100644
index 2668317d5..000000000
--- a/AMW_web/src/main/webapp/pages/settings.xhtml
+++ /dev/null
@@ -1,551 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:ui="http://java.sun.com/jsf/facelets"
-      xmlns:h="http://java.sun.com/jsf/html"
-      xmlns:f="http://java.sun.com/jsf/core"
-      xmlns:a4j="http://richfaces.org/a4j"
-      xmlns:rich="http://richfaces.org/rich"
-      xmlns:mobi="http://java.sun.com/jsf/composite/mobi">
-
-<ui:composition template="templates/template.xhtml">
-    <f:metadata>
-        <f:event type="preRenderView" listener="#{settingsDataProvider.init}"/>
-        <f:event type="preRenderView" listener="#{environmentsDataProvider.loadContext}"/>
-    </f:metadata>
-
-    <ui:param name="screen" value="newSettings" />
-    <ui:define name="title">Settings</ui:define>
-    <ui:define name="pagetitle">
-        <h:outputText id="pageheader" value="Settings" />
-    </ui:define>
-    <ui:define name="headerButtons">
-        <a4j:commandLink value="Save" styleClass="btn primary right"
-            rendered="#{securityDataProvider.hasPermission('SAVE_SETTINGS_ENV')}"
-            action="#{environmentsDataProvider.save()}" render="environments"
-            style="display: ${(param['mode']!='props' and param['mode']!='rolPerm' and param['mode']!='tags' and param['mode']!='functions' and param['mode']!='myAmw' and param['mode']!='STP' and param['mode']!='releases' and param['mode']!='appVersion') ? 'block' : 'none'}" />
-        <a4j:commandLink styleClass="btn primary right"
-            rendered="#{securityDataProvider.hasPermission('SAVE_SETTINGS_PROPTYPE')}"
-            style="display: ${param['mode']=='props' ? 'block' : 'none'}"
-            render="@all, propertyTypes" action="#{propertyTypeDataProvider.save()}"
-            value="Save" />
-    </ui:define>
-    <ui:define name="body">
-        <h:panelGroup layout="block" id="navig"
-            rendered="#{securityDataProvider.hasPermission('SETTING_PANEL_LIST')}">
-            <aside> <nav>
-            <ul>
-                <li
-                    class="${settingsDataProvider.mode!='props' and settingsDataProvider.mode!='rolPerm' and settingsDataProvider.mode!='tags' and settingsDataProvider.mode!='functions' and settingsDataProvider.mode!='deployparam' and settingsDataProvider.mode!='myAmw'
-                    and settingsDataProvider.mode!='STP' and
-                    settingsDataProvider.mode!='releases' and settingsDataProvider.mode!='appVersion' ? 'current' : ''}">
-                    <h:link value="Environments">
-                        <f:param name="mode" value="envs" />
-                    </h:link>
-                </li>
-                <li class="${settingsDataProvider.mode=='props' ? 'current' : ''}">
-                    <h:link value="Property Types">
-                        <f:param name="mode" value="props" />
-                    </h:link>
-                </li>
-                <li class="${settingsDataProvider.mode=='tags' ? 'current' : ''}">
-                    <h:outputLink value="/AMW_angular/#/settings/tags"
-                                  rendered="#{securityDataProvider.hasPermission('ROLES_AND_PERMISSIONS_TAB')}">
-                       Tags
-                    </h:outputLink>
-                </li>
-                <li class="${settingsDataProvider.mode=='functions' ? 'current' : ''}">
-                    <h:link value="Functions">
-                        <f:param name="mode" value="functions" />
-                    </h:link>
-                </li>
-                <li class="${settingsDataProvider.mode=='deployparam' ? 'current' : ''}">
-                    <h:outputLink value="/AMW_angular/#/settings/deployment-parameter">
-                        Deployment Parameter
-                    </h:outputLink>
-                </li>
-                <li class="${settingsDataProvider.mode=='myAmw' ? 'current' : ''}">
-                    <h:link value="My favorites">
-                        <f:param name="mode" value="myAmw" />
-                    </h:link>
-                </li>
-                <li class="${settingsDataProvider.mode== 'STP' ? 'current' : ''}">
-                    <h:link value="STP Management" rendered="#{securityDataProvider.hasPermission('SHAKEDOWNTEST')}">
-                        <f:param name="mode" value="STP" />
-                    </h:link>
-                </li>
-                <li class="${settingsDataProvider.mode== 'releases' ? 'current' : ''}">
-                    <h:outputLink value="/AMW_angular/#/settings/releases"
-                                  rendered="#{securityDataProvider.hasPermission('RELEASE')}">
-                        Releases
-                    </h:outputLink>
-                </li>
-                <li class="${settingsDataProvider.mode=='rolePerm' ? 'current': ''}">
-                    <h:outputLink value="/AMW_angular/#/settings/permission/role"
-                                  rendered="#{securityDataProvider.hasPermission('ROLES_AND_PERMISSIONS_TAB')}">
-                        Roles and Permissions
-                    </h:outputLink>
-                </li>
-                <li class="${settingsDataProvider.mode=='appVersion' ? 'current': ''}">
-                    <h:outputLink value="/AMW_angular/#/settings/application-info"
-                                  rendered="#{securityDataProvider.hasPermission('RELEASE','READ')}">
-                        Application Info
-                    </h:outputLink>
-                </li>
-            </ul>
-            </nav>
-            </aside>
-        </h:panelGroup>
-        <section id="content">
-        <div class="container">
-            <h:form>
-                <h:panelGroup
-                    rendered="${settingsDataProvider.mode!='props' and settingsDataProvider.mode!='rolPerm' and settingsDataProvider.mode!='tags' and settingsDataProvider.mode!='functions' and settingsDataProvider.mode!='deployparam' and
-                    settingsDataProvider.mode!='myAmw' and settingsDataProvider.mode!='STP' and
-                     settingsDataProvider.mode!='releases' and settingsDataProvider.mode!='appVersion'}">
-
-                    <h:panelGroup id="environments">
-                        <div class="well">
-                            <h2>Environments</h2>
-                            <hr />
-                            <table class="width100">
-                                <tr>
-                                    <td class="width120px vtop valignTop">
-                                        <div class="marginLeft50">
-                                            <ui:include src="components/contextTreeComp.xhtml" />
-                                        </div>
-                                    </td>
-                                    <td valign="top" width="100%"><h:panelGroup id="content">
-                                            <f:facet name="header">
-                                                <h:outputText id="contentPanelHeader"
-                                                    value="Selected context: #{contextDataProvider.contextDisplayName}" />
-                                            </f:facet>
-                                            <span class="right displayBlock">
-                                                <h:commandLink id="addDomainOrEnvBtn"
-                                                               styleClass="btn light" type="button"
-                                                               rendered="#{!environmentsDataProvider.isEnv and securityDataProvider.hasPermission('ADD_NEW_ENV_OR_DOM')}"
-                                                               value="Add new #{environmentsDataProvider.nameOfChildContext}"
-                                                               onclick="#{rich:component('addContextPopupPanel')}.show();">
-                                                </h:commandLink>
-                                                <h:commandLink id="removeDomainOrEnvBtn"
-                                                               styleClass="btn light"
-                                                               rendered="#{!contextDataProvider.isGlobal and securityDataProvider.hasPermission('REMOVE_ENV_OR_DOM')}"
-                                                               value="Remove #{environmentsDataProvider.contextTypeName} #{contextDataProvider.contextDisplayName}"
-                                                               onclick="#{rich:component('confirmContextDeletePopupPanel')}.show();">
-                                                </h:commandLink>
-                                            </span>
-
-                                            <div class="control-group">
-                                                <label class="control-label">
-                                                    <h:outputText value="#{environmentsDataProvider.contextTypeName} name" />
-                                                </label>
-                                                <div class="controls">
-                                                    <h:inputText id="envOrDomainNameInput"
-                                                        disabled="${contextDataProvider.isGlobal or securityDataProvider.hasPermission('EDIT_ENV_OR_DOM_NAME')==false}"
-                                                        value="#{contextDataProvider.contextDisplayName}" />
-                                                </div>
-
-                                                <h:panelGroup rendered="${!contextDataProvider.isGlobal}">
-                                                <label class="control-label">
-                                                    <h:outputText value="#{environmentsDataProvider.contextTypeName} alias" />
-                                                </label>
-                                                <div class="controls">
-                                                    <h:inputText id="envOrDomainNameAliasInput"
-                                                         disabled="${contextDataProvider.isGlobal or securityDataProvider.hasPermission('EDIT_ENV_OR_DOM_NAME')==false}"
-                                                         value="#{contextDataProvider.contextNameAlias}" />
-                                                </div>
-                                                </h:panelGroup>
-                                            </div>
-                                        </h:panelGroup></td>
-                                </tr>
-                            </table>
-                        </div>
-                    </h:panelGroup>
-                </h:panelGroup>
-            </h:form>
-
-            <!-- Property Types -->
-            <h:panelGroup rendered="${settingsDataProvider.mode=='props'}">
-                <ui:include  src="components/propertyTypesComp.xhtml" />
-            </h:panelGroup>
-
-            <!-- Functions -->
-            <h:panelGroup rendered="${settingsDataProvider.mode=='functions'}">
-                <mobi:listGlobalFunctions/>
-            </h:panelGroup>
-
-            <h:panelGroup rendered="${settingsDataProvider.mode=='myAmw'}">
-                <h:panelGroup id="myAmw" layout="block">
-                    <h:dataTable var="favorit" value="${userSettings.myAMWObjects}"
-                                 styleClass="well width100 caption-top" rowClasses="odd-row,even-row"
-                                 id="amwlist">
-                        <f:facet name="caption">
-                            <h2>My favorites</h2>
-                        </f:facet>
-                        <h:column>
-                            <f:facet name="header">
-                                <h:panelGroup>
-                                    <h:outputText value="Resource Name"/>
-                                    <br/>
-                                </h:panelGroup>
-                            </f:facet>
-                            <div>
-                                <h:outputText value="${favorit.name}" />
-                            </div>
-                        </h:column>
-                        <h:column>
-                            <f:facet name="header">
-                                <h:panelGroup>
-                                    <h:outputText value="Send email when deploying" />
-                                    <br />
-                                </h:panelGroup>
-                            </f:facet>
-                            <div>
-                                <h:selectBooleanCheckbox value="#{favorit.email}"
-                                    rendered="${favorit.asOrApp}">
-                                    <a4j:ajax listener="${userSettings.switchEmailNotification(favorit)}" />
-                                </h:selectBooleanCheckbox>
-                            </div>
-                        </h:column>
-                        <h:column>
-                            <f:facet name="header">
-                                <h:panelGroup>
-                                    <h:outputText value="Remove from favorites" />
-                                    <br />
-                                </h:panelGroup>
-                            </f:facet>
-                            <div>
-                                <a4j:commandLink
-                                    action="${userSettings.removeFavoriteResource(favorit.groupId)}"
-                                    render="myAmw">Remove from favorites</a4j:commandLink>
-                            </div>
-                        </h:column>
-                    </h:dataTable>
-                </h:panelGroup>
-
-            </h:panelGroup>
-
-            <!-- STP MANAGEMENT -->
-            <h:form id="stpPanelForm">
-                <h:panelGroup rendered="${settingsDataProvider.mode=='STP'}">
-                    <h:panelGroup id="STP_panel" layout="block">
-                        <h:dataTable id="stpDataTable"
-                                     value="#{shakedownStpDataProvider.stp}" var="s" styleClass="well caption-top"
-                                     rowClasses="odd-row,even-row">
-                            <f:facet name="caption">
-                                <nav class="actionbar">
-                                    <h:commandLink
-                                            styleClass="btn light right"
-                                            onclick="#{rich:component('addNewSTPPopupPanel')}.show(); return false;"
-                                            rendered="#{securityDataProvider.hasPermission('SHAKEDOWNTEST', 'CREATE')}">
-                                        <!--action="#{shakedownStpDataProvider.clearArguments()}"-->
-                                        <i class="icon icon-add"/> Add new STP
-                                    </h:commandLink>
-                                </nav>
-                                <h2>STP Management</h2>
-                            </f:facet>
-                            <h:column>
-                                <f:facet name="header">
-                                    <h:panelGroup>
-                                        <h:outputText value="Name" />
-                                    </h:panelGroup>
-                                </f:facet>
-                                <div>
-                                    <h:outputText value="#{s.stpName}" />
-                                </div>
-                            </h:column>
-                            <h:column>
-                                <f:facet name="header">
-                                    <h:panelGroup>
-                                        <h:outputText value="Version" />
-                                    </h:panelGroup>
-                                </f:facet>
-                                <div>
-                                    <h:outputText value="#{s.version}" />
-                                </div>
-                            </h:column>
-                            <h:column>
-                                <f:facet name="header">
-                                    <h:panelGroup>
-                                        <h:outputText value="Arguments" />
-                                    </h:panelGroup>
-                                </f:facet>
-                                <div>
-                                    <h:outputText value="#{s.comaSeperatedParameters}" />
-                                </div>
-                            </h:column>
-                            <h:column>
-                                <f:facet name="header">
-                                    <h:panelGroup>
-                                        <h:outputText value="Edit" />
-                                    </h:panelGroup>
-                                </f:facet>
-                                <div>
-                                    <a4j:commandLink id="editCommandLink" value="Edit"
-                                        oncomplete="#{rich:component('editSTPPopupPanel')}.show(); return false;"
-                                        title="Edit current STP"
-                                        render="editSTPPopupPanel, argumentsTabelEdit"
-                                        rendered="#{securityDataProvider.hasPermission('SHAKEDOWNTEST', 'UPDATE')}"
-                                        action="#{shakedownStpDataProvider.createTempArgumentToEditPopupPanel()}">
-                                        <a4j:param
-                                            assignTo="#{shakedownStpDataProvider.selectedSTPId}"
-                                            value="${s.id}" />
-                                    </a4j:commandLink>
-                                </div>
-                            </h:column>
-                            <h:column>
-                                <f:facet name="header">
-                                    <h:panelGroup>
-                                        <h:outputText value="Delete" />
-                                    </h:panelGroup>
-                                </f:facet>
-                                <div>
-                                    <a4j:commandLink id="cancelCommandLink" value="Delete"
-                                        oncomplete="#{rich:component('cancelSTPConfirmationPopup')}.show(); return false;"
-                                        title="Cancel current STP" render="cancelSTPConfirmationPopup"
-                                        rendered="#{securityDataProvider.hasPermission('SHAKEDOWNTEST', 'DELETE')}">
-                                        <a4j:param
-                                            assignTo="#{shakedownStpDataProvider.selectedSTPId}"
-                                            value="${s.id}" />
-                                    </a4j:commandLink>
-                                </div>
-                            </h:column>
-                        </h:dataTable>
-                    </h:panelGroup>
-                </h:panelGroup>
-            </h:form>
-        </div>
-        </section>
-    </ui:define>
-
-    <ui:define name="component_popups">
-        <rich:popupPanel id="addContextPopupPanel" autosized="true"
-            movable="true" onshow="#{rich:element('contextName')}.focus();">
-            <f:facet name="header">
-                <h2>
-                    <h:outputText
-                        value="Create new #{environmentsDataProvider.nameOfChildContext} for #{contextDataProvider.contextDisplayName}"
-                        id="addContextPopupPanelHeader" />
-                </h2>
-            </f:facet>
-            <f:facet name="controls">
-                <h:outputLink value="#"
-                    styleClass="close icon icon-close icon-replace"
-                    onclick="#{rich:component('addContextPopupPanel')}.hide(); return false;">
-                    x
-                    </h:outputLink>
-            </f:facet>
-            <h:form>
-                <h:panelGroup id="addContextPopupPanelGroup">
-                    <div class="control-group">
-                        <label class="control-label"> <h:outputLabel value="Name" /></label>
-                        <div class="controls">
-                            <h:inputText id="contextName"
-                                value="#{environmentsDataProvider.newName}" />
-                        </div>
-                        <a4j:commandLink id="createCtxButton"
-                            value="OK"
-                            styleClass="btn primary right"
-                            render="environments"
-                            action="#{environmentsDataProvider.createContext()}"
-                            oncomplete="#{rich:component('addContextPopupPanel')}.hide(); return false;" />
-                    </div>
-                </h:panelGroup>
-
-            </h:form>
-        </rich:popupPanel>
-
-        <rich:popupPanel id="confirmContextDeletePopupPanel" autosized="true">
-            <f:facet name="header">
-                <h2>
-                    <h:outputText value="Remove context" />
-                </h2>
-            </f:facet>
-            <f:facet name="controls">
-                <h:outputLink value="#"
-                    styleClass="close icon icon-close icon-replace"
-                    onclick="#{rich:component('confirmContextDeletePopupPanel')}.hide(); return false;">
-                    x
-                    </h:outputLink>
-            </f:facet>
-            <h:panelGrid styleClass="marginBottom10">Are you sure you want to delete this context? <br />If you continue, all defined property values for any application, resource or relation between them as well as any sub context will be lost.</h:panelGrid>
-            <h:form>
-                <a4j:commandLink value="Delete" styleClass="btn primary right"
-                    render="environments"
-                    action="#{environmentsDataProvider.removeContext()}"
-                    oncomplete="#{rich:component('confirmContextDeletePopupPanel')}.hide(); return false;" />
-
-            </h:form>
-        </rich:popupPanel>
-
-        <h:form id="createPropertyTypeForm">
-            <mobi:createPropertyTypePopup/>
-        </h:form>
-
-        <h:form id="deletePropertyTypeForm">
-            <mobi:deletePropertyTypePopup/>
-        </h:form>
-
-        <!-- STP EDIT POPUPPANEL -->
-        <h:form>
-            <rich:popupPanel id="editSTPPopupPanel" autosized="true"
-                moveable="true" domElementAttachment="form">
-                <f:facet name="header">
-                    <h2>
-                        <h:outputText
-                            value="Edit #{shakedownStpDataProvider.currentSTPSelected().stpName}" />
-                    </h2>
-                </f:facet>
-                <f:facet name="controls">
-                    <h:outputLink value="#"
-                        styleClass="close icon icon-close icon-replace"
-                        onclick="#{rich:component('editSTPPopupPanel')}.hide(); return false;">x</h:outputLink>
-                </f:facet>
-                <h:panelGroup>
-                    <div class="control-group textCenter">
-                        <label class="control-label"><h:outputLabel
-                                value="STP Name" /></label>
-                        <div class="controls">
-                            <h:inputText id="newStpName" disabled="false" styleClass="minWidth400"
-                                value="#{shakedownStpDataProvider.selectedSTP.stpName}" />
-                        </div>
-                        <label class="control-label"><h:outputLabel
-                                value="Version" /></label>
-                        <div class="controls">
-                            <h:inputText id="stpVersion" styleClass="minWidth400"
-                                value="#{shakedownStpDataProvider.selectedSTP.version}" />
-                        </div>
-                    </div>
-                </h:panelGroup>
-                <h:panelGroup layout="block" styleClass="autoHeight width100 right">
-                    <rich:dataTable id="argumentsTabelEdit" iterationStatusVar="i"
-                        value="#{shakedownStpDataProvider.args}" var="arg"
-                        styleClass="well" rowClasses="odd-row,even-row">
-                        <f:facet name="header">
-                            <h2>Arguments</h2>
-                        </f:facet>
-                        <h:column>
-                            <h:panelGroup>
-                                <h:outputText value="Value ${i.count} " />
-                                <h:inputText value="#{arg.argumentValue}" styleClass="minWidth350px">
-                                    <a4j:ajax />
-                                </h:inputText>
-                            </h:panelGroup>
-                        </h:column>
-                        <h:column>
-                            <a4j:commandLink execute="@this" render="argumentsTabelEdit"
-                                value="Delete"
-                                action="#{shakedownStpDataProvider.removeSelectedArguments(i)}" />
-                        </h:column>
-                    </rich:dataTable>
-                    <a4j:commandLink styleClass="btn light left"
-                            action="#{shakedownStpDataProvider.addArgumentsToSTP()}"
-                            title="Add new argument" execute="@this"
-                            render="argumentsTabelEdit">
-                            <i class="icon icon-add" />
-                                    Add argument</a4j:commandLink>
-                </h:panelGroup>
-                <a4j:commandLink styleClass="btn primary right" value="Save"
-                    execute="@form" action="#{shakedownStpDataProvider.editSTP()}"
-                    oncomplete="#{rich:component('editSTPPopupPanel')}.hide(); return false;"
-                    render="STP_panel,stpDataTable" />
-            </rich:popupPanel>
-        </h:form>
-
-        <!-- ADD NEW STP POPUPPANEL -->
-        <h:form id="newStpPopupPanelForm">
-            <rich:popupPanel id="addNewSTPPopupPanel"
-                             autosized="true"
-                             moveable="true"
-                             domElementAttachment="form"
-                             styleClass="minWidth400px">
-                <f:facet name="header">
-                    <h2>
-                        <h:outputText value="Add new STP" />
-                    </h2>
-                </f:facet>
-                <f:facet name="controls">
-                    <h:outputLink value="#"
-                        styleClass="close icon icon-close icon-replace"
-                        onclick="#{rich:component('addNewSTPPopupPanel')}.hide(); return false;">x    </h:outputLink>
-                </f:facet>
-                <h:panelGroup id="inputsPanel">
-                    <div class="header">
-                        <label class="control-label"><h:outputLabel
-                                value="STP Name" /></label>
-                        <div class="controls">
-                            <h:inputText id="newStpName" styleClass="minWidth400px"
-                                value="#{shakedownStpDataProvider.newSTPName}" />
-                        </div>
-                        <label class="control-label"><h:outputLabel
-                                value="Version" /></label>
-                        <div class="controls">
-                            <h:inputText id="newStpVersion" styleClass="minWidth400px"
-                                value="#{shakedownStpDataProvider.newSTPVersion}" />
-                        </div>
-                        <h:panelGroup layout="block"
-                            styleClass="height220px autoOverflow width600px">
-                            <rich:dataTable id="argumentsTabel" iterationStatusVar="index"
-                                value="#{shakedownStpDataProvider.args}" var="arg"
-                                styleClass="well" rowClasses="odd-row,even-row">
-                                <f:facet name="header">
-                                    <h2>Arguments</h2>
-                                </f:facet>
-                                <h:column>
-                                    <h:panelGroup>
-                                        <h:outputText value="Value  ${index.count} " />
-                                        <h:inputText value="#{arg.argumentValue}"
-                                            styleClass="minWidth350px">
-                                            <a4j:ajax />
-                                        </h:inputText>
-                                    </h:panelGroup>
-                                </h:column>
-                                <h:column>
-                                    <a4j:commandLink execute="@this" render="argumentsTabel"
-                                        value="Delete"
-                                        action="#{shakedownStpDataProvider.removeSelectedArguments(index)}" />
-                                </h:column>
-                            </rich:dataTable>
-                            <a4j:commandLink styleClass="btn light left"
-                                action="#{shakedownStpDataProvider.addArgumentsToSTP()}"
-                                title="Add new argument" execute="@this" render="argumentsTabel">
-                                <i class="icon icon-add" />
-                                    Add argument</a4j:commandLink>
-                        </h:panelGroup>
-
-                    </div>
-                </h:panelGroup>
-                <a4j:commandLink styleClass="btn primary right" value="Confirm"
-                    execute="@form" action="#{shakedownStpDataProvider.createNewSTP()}"
-                    onclick="showLoader();"
-                    oncomplete="#{rich:component('addNewSTPPopupPanel')}.hide(); hideLoader(); return false;"
-                    render="STP_panel,stpDataTable,inputsPanel" />
-            </rich:popupPanel>
-        </h:form>
-
-        <!-- STP delete popup confirm -->
-        <h:form id="cancelSTPConfirmation">
-            <rich:popupPanel id="cancelSTPConfirmationPopup" autosized="true"
-                moveable="true" domElementAttachment="form">
-                <f:facet name="header">
-                    <h2>
-                        <h:outputText
-                            value="Delete STP #{shakedownStpDataProvider.currentSTPSelected().stpName}" />
-                    </h2>
-                </f:facet>
-                <f:facet name="controls">
-                    <h:outputLink value="#"
-                        styleClass="close icon icon-close icon-replace"
-                        onclick="#{rich:component('cancelSTPConfirmationPopup')}.hide(); return false;">x</h:outputLink>
-                </f:facet>
-                <h:panelGrid styleClass="marginBottom10">Are you sure you want to delete this Shakedown Test Package? <br />
-                            If you continue, all defined testing-template, with this Shakedown Test Package, for any application, resource or relation will be lost.</h:panelGrid>
-                <h:commandLink styleClass="btn primary right"
-                               value="Delete"
-                               action="${shakedownStpDataProvider.deleteSTP()}"/>
-
-            </rich:popupPanel>
-        </h:form>
-    </ui:define>
-</ui:composition>
-
-</html>
diff --git a/AMW_web/src/main/webapp/pages/shakedownTest.xhtml b/AMW_web/src/main/webapp/pages/shakedownTest.xhtml
deleted file mode 100644
index 1b4ec634a..000000000
--- a/AMW_web/src/main/webapp/pages/shakedownTest.xhtml
+++ /dev/null
@@ -1,457 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:ui="http://java.sun.com/jsf/facelets"
-      xmlns:h="http://java.sun.com/jsf/html"
-      xmlns:f="http://java.sun.com/jsf/core"
-      xmlns:a4j="http://richfaces.org/a4j"
-      xmlns:rich="http://richfaces.org/rich"
->
-
-<ui:composition template="templates/template.xhtml">
-    <f:metadata>
-        <f:event type="preRenderView" listener="#{shakedownTestScreenDataProvider.initView}"></f:event>
-    </f:metadata>
-    <ui:param name="screen" value="shakedownTest"/>
-    <ui:define name="title">Shakedown Test</ui:define>
-    <ui:define name="pagetitle">
-        <h:outputText id="pageheader" value="Shakedown test"/>
-    </ui:define>
-
-    <ui:define name="body">
-        <h:panelGroup layout="block" id="navig">
-            <aside>
-                <nav>
-                    <ul>
-                        <ui:repeat var="shakedownPresetViews"
-                                   value="${shakedownTestScreenDataProvider.shakedownTestPresetViewsOptions}">
-                            <li
-                                    class="${shakedownPresetViews == shakedownTestScreenDataProvider.selectedShakedownTestPresetView ? 'current' : ''}">
-                                <a4j:commandLink value="#{shakedownPresetViews}"
-                                                 actionListener="#{shakedownTestScreenDataProvider.shakedownTestPresetViewChangeListener(shakedownPresetViews)}"
-                                                 execute="@this" render="navig, contentPanelGroup, pollform"/>
-                            </li>
-                        </ui:repeat>
-                    </ul>
-
-                </nav>
-            </aside>
-        </h:panelGroup>
-
-        <section id="content">
-            <div class="container">
-
-                <h:panelGroup id="contentPanelGroup">
-
-                    <article>
-
-                        <div class="well withHeight autoOverflow">
-
-                            <ui:include src="components/customFilterComp.xhtml">
-                                <ui:param name="customFilterImpl"
-                                          value="#{shakedownTestScreenDataProvider.customFilterComp}"/>
-                            </ui:include>
-
-
-                            <h:panelGroup id="shakedowntest">
-                                <h:dataTable var="sdtest"
-                                             value="#{shakedownTestScreenDataProvider.shakedownTests}"
-                                             styleClass="well caption-top" rowClasses="odd-row,even-row">
-
-                                    <f:facet name="caption">
-                                        <nav class="actionbar">
-                                            <ul>
-                                                <li>
-                                                    <h:commandLink type="submit" styleClass="btn light"
-                                                                   onclick="showLoader();"
-                                                                   actionListener="#{shakedownTestScreenDataProvider.reloadShakedownTests(true)}">
-                                                        <i class="icon icon-reload"></i>
-                                                        <h:outputText value="Apply filter / Refresh"/>
-                                                    </h:commandLink>
-                                                </li>
-
-                                                <li><a4j:commandLink styleClass="btn light"
-                                                                     rendered="#{securityDataProvider.hasPermission('SHAKEDOWNTEST', 'CREATE') and shakedownTestScreenDataProvider.shakedownTestViewSelected}"
-                                                                     render="createTestPopupPanelGroup"
-                                                                     onclick="showLoader();"
-                                                                     action="${shakedownTestScreenDataProvider.initCreateTestPopupPanel()}"
-                                                                     oncomplete="hideLoader(); #{rich:component('createTestPopupPanel')}.show();">
-                                                    <i class="icon icon-add"></i>
-                                                    <h:outputText value="Add shakedown test"/>
-                                                </a4j:commandLink></li>
-                                            </ul>
-                                        </nav>
-                                        <h2>
-                                            <h:outputText value="Shakedown tests"/>
-                                        </h2>
-                                    </f:facet>
-
-                                    <f:facet name="footer">
-                                        <h:panelGroup>
-                                            <a4j:commandLink value="&lt;&lt;" render="shakedowntest"
-                                                             onclick="showLoader();" oncomplete="hideLoader();"
-                                                             action="${shakedownTestScreenDataProvider.firstScreen()}"
-                                                             rendered="${shakedownTestScreenDataProvider.currentPage!=0}"/>
-                                            <a4j:commandLink value="&lt;" render="shakedowntest"
-                                                             onclick="showLoader();" oncomplete="hideLoader();"
-                                                             action="${shakedownTestScreenDataProvider.previousScreen()}"
-                                                             rendered="${shakedownTestScreenDataProvider.currentPage!=0}"
-                                                             styleClass="marginLeft10"/>
-                                            <ui:repeat
-                                                    value="${shakedownTestScreenDataProvider.availablePages().subList(
-									 shakedownTestScreenDataProvider.currentPage-2 > 0 ? shakedownTestScreenDataProvider.currentPage-2 : 0,
-									 shakedownTestScreenDataProvider.availablePages().size() >= shakedownTestScreenDataProvider.currentPage+3 ? shakedownTestScreenDataProvider.currentPage + 3 : shakedownTestScreenDataProvider.availablePages().size())
-									 }"
-                                                    var="page">
-                                                <a4j:commandLink
-                                                        rendered="${page!=shakedownTestScreenDataProvider.currentPage}"
-                                                        value="${page+1}" styleClass="marginLeft10"
-                                                        onclick="showLoader();" oncomplete="hideLoader();"
-                                                        render="shakedowntest"
-                                                        action="${shakedownTestScreenDataProvider.goToScreen(page)}"/>
-                                                <h:outputText
-                                                        rendered="${page==shakedownTestScreenDataProvider.currentPage}"
-                                                        styleClass="marginLeft10 boldFont" value="${page+1}"/>
-                                            </ui:repeat>
-
-                                            <a4j:commandLink value="&gt;" styleClass="marginLeft10"
-                                                             action="${shakedownTestScreenDataProvider.nextScreen()}"
-                                                             onclick="showLoader();" oncomplete="hideLoader();"
-                                                             render="shakedowntest"
-                                                             rendered="${!shakedownTestScreenDataProvider.lastPage}"/>
-                                            <a4j:commandLink value="&gt;&gt;" styleClass="marginLeft10"
-                                                             onclick="showLoader();" oncomplete="hideLoader();"
-                                                             action="${shakedownTestScreenDataProvider.lastScreen()}"
-                                                             render="shakedowntest"
-                                                             rendered="${!shakedownTestScreenDataProvider.lastPage}"/>
-                                            <div class="control-group right">
-                                                <label class="control-label">Results per page:</label>
-                                                <div class="controls">
-                                                    <h:selectOneMenu
-                                                            value="#{shakedownTestScreenDataProvider.itemsPerPage}">
-                                                        <f:selectItem itemLabel="10" itemValue="10"/>
-                                                        <f:selectItem itemLabel="20" itemValue="20"/>
-                                                        <f:selectItem itemLabel="50" itemValue="50"/>
-                                                        <f:selectItem itemLabel="100" itemValue="100"/>
-                                                        <a4j:ajax render="shakedowntest"/>
-                                                    </h:selectOneMenu>
-                                                </div>
-                                            </div>
-
-                                        </h:panelGroup>
-
-                                    </f:facet>
-
-                                    <h:column index="index" headerClass="width_200 nowrap">
-                                        <f:facet name="header">
-                                            <h:panelGroup styleClass="nowrap">
-                                                <h:outputText value="State"/>
-                                                <a4j:commandLink render="shakedowntest"
-                                                                 onclick="showLoader();" oncomplete="hideLoader();"
-                                                                 action="#{shakedownTestScreenDataProvider.changeSortOrderForSelectedColumn('STATE')}">
-                                                    <i class="${shakedownTestScreenDataProvider.getSortingIconForCol('STATE')} inlineBlockMiddle"></i>
-                                                </a4j:commandLink>
-                                            </h:panelGroup>
-                                        </f:facet>
-                                        <div>
-                                            <h:outputText
-                                                    value="#{shakedownTestScreenDataProvider.getShakedownTestStateText(sdtest)}"
-                                                    styleClass="#{shakedownTestScreenDataProvider.getShakedownTestStateFrameCssClass(sdtest)} inlineBlock"/>
-                                            <a4j:commandLink
-                                                    oncomplete="#{rich:component('shakedownTestDetailPopup')}.show(); return false;"
-                                                    render="shakedownTestDetailPopupFacet, shakedownTestDetailPopupPanelGroup"
-                                                    title="Show details about this shakedown test"
-                                                    styleClass="simpleInfo">
-                                                <i class="icon icon-info inlineBlock heght16 marginLeft10 valignMiddle"></i>
-                                                <a4j:param assignTo="#{shakedownTestScreenDataProvider.selectedShakedownTestId}"
-                                                        value="${sdtest.id}"></a4j:param>
-                                            </a4j:commandLink>
-                                        </div>
-                                    </h:column>
-
-                                    <h:column index="index">
-                                        <f:facet name="header">
-                                            <h:panelGroup styleClass="nowrap">
-                                                <h:outputText value="App Server"/>
-                                                <a4j:commandLink render="shakedowntest"
-                                                                 onclick="showLoader();" oncomplete="hideLoader();"
-                                                                 action="#{shakedownTestScreenDataProvider.changeSortOrderForSelectedColumn('APPSERVER_NAME')}">
-                                                    <i class="${shakedownTestScreenDataProvider.getSortingIconForCol('APPSERVER_NAME')} inlineBlockMiddle"></i>
-                                                </a4j:commandLink>
-                                            </h:panelGroup>
-                                        </f:facet>
-
-                                        <h:link value="#{sdtest.resourceGroup.name}"
-                                                outcome="editResourceView"
-                                                rendered="${securityDataProvider.hasPermissionForResourceType('RESOURCE','UPDATE','APPLICATIONSERVER',contextDataProvider.globalContextId)}"
-                                                styleClass="boldFont">
-                                            <f:param name="id" value="#{sdtest.applicationServer.id}"/>
-                                            <f:param name="ctx"
-                                                     value="#{contextDataProvider.globalContextId}"/>
-                                        </h:link>
-                                        <h:outputText style="font-weight: bold;"
-                                                      rendered="${!securityDataProvider.hasPermissionForResourceType('RESOURCE','UPDATE','APPLICATIONSERVER',contextDataProvider.globalContextId)}"
-                                                      value="#{sdtest.resourceGroup.name}"/>
-
-                                        <ui:repeat var="appToShow"
-                                                   value="${sdtest.applicationsFromApplicationServer}">
-                                            <h:panelGroup styleClass="paddingLeft20" layout="block">
-                                                <h:link value="${appToShow.applicationName}"
-                                                        outcome="editResourceView"
-                                                        rendered="${securityDataProvider.hasPermissionForResourceType('RESOURCE','UPDATE','APPLICATION',contextDataProvider.globalContextId)}">
-                                                    <f:param name="id" value="${appToShow.applicationId}"/>
-                                                    <f:param name="ctx"
-                                                             value="#{contextDataProvider.globalContextId}"/>
-                                                </h:link>
-                                                <h:outputText
-                                                        rendered="${!securityDataProvider.hasPermissionForResourceType('RESOURCE','UPDATE','APPLICATION',contextDataProvider.globalContextId)}"
-                                                        value="${appToShow.applicationName}"/>
-                                            </h:panelGroup>
-                                        </ui:repeat>
-                                    </h:column>
-
-                                    <h:column index="index" headerClass="width_80">
-                                        <f:facet name="header">
-                                            <h:panelGroup styleClass="nowrap">
-                                                <h:outputText value="Release"/>
-                                                <a4j:commandLink render="shakedowntest"
-                                                                 onclick="showLoader();" oncomplete="hideLoader();"
-                                                                 action="#{shakedownTestScreenDataProvider.changeSortOrderForSelectedColumn('RELEASE')}">
-                                                    <i class="${shakedownTestScreenDataProvider.getSortingIconForCol('RELEASE')} inlineBlockMiddle"></i>
-                                                </a4j:commandLink>
-                                            </h:panelGroup>
-                                        </f:facet>
-
-                                        <h:outputText rendered="#{sdtest.release != null}"
-                                                      value="#{sdtest.release.name}"/>
-                                    </h:column>
-                                    <h:column index="index" headerClass="width_20">
-                                        <f:facet name="header">
-                                            <h:panelGroup styleClass="nowrap">
-                                                <h:outputText value="Env"/>
-                                                <a4j:commandLink render="shakedowntest"
-                                                                 onclick="showLoader();" oncomplete="hideLoader();"
-                                                                 action="#{shakedownTestScreenDataProvider.changeSortOrderForSelectedColumn('ENV')}">
-                                                    <i class="${shakedownTestScreenDataProvider.getSortingIconForCol('ENV')} inlineBlockMiddle"></i>
-                                                </a4j:commandLink>
-                                            </h:panelGroup>
-                                        </f:facet>
-
-                                        <h:outputText value="#{sdtest.context.name}" styleClass="boldFont"/>
-                                    </h:column>
-
-
-                                    <h:column index="index" headerClass="width_160">
-                                        <f:facet name="header">
-                                            <h:panelGroup styleClass="nowrap">
-                                                <h:outputText value="Test date"/>
-                                                <a4j:commandLink render="shakedowntest"
-                                                                 onclick="showLoader();" oncomplete="hideLoader();"
-                                                                 action="#{shakedownTestScreenDataProvider.changeSortOrderForSelectedColumn('TESTDATE')}">
-                                                    <i class="${shakedownTestScreenDataProvider.getSortingIconForCol('TESTDATE')} inlineBlockMiddle"></i>
-                                                </a4j:commandLink>
-                                            </h:panelGroup>
-                                        </f:facet>
-
-                                        <h:outputText
-                                                value="#{shakedownTestScreenDataProvider.formatDate(sdtest.testDate)}"/>
-                                    </h:column>
-
-                                </h:dataTable>
-                            </h:panelGroup>
-
-
-                        </div>
-                    </article>
-
-                </h:panelGroup>
-            </div>
-        </section>
-    </ui:define>
-
-    <!-- ADD SHAKEDOWNTEST ORDER POPUP -->
-    <ui:define name="component_popups">
-        <h:form>
-            <rich:popupPanel id="shakedownTestDetailPopup" moveable="true"
-                             autosized="true">
-                <f:facet name="header">
-                    <h2>
-                        <h:outputText
-                                value="Results for shakedown test #${shakedownTestScreenDataProvider.selectedShakedownTest.id} (${shakedownTestScreenDataProvider.selectedShakedownTest.applicationServer.name})"
-                                id="shakedownTestDetailPopupFacet"/>
-                    </h2>
-                </f:facet>
-                <f:facet name="controls">
-                    <h:outputLink value="#"
-                                  styleClass="close icon icon-close icon-replace"
-                                  onclick="#{rich:component('shakedownTestDetailPopup')}.hide(); return false;">
-                        x
-                    </h:outputLink>
-                </f:facet>
-                <h:panelGroup id="shakedownTestDetailPopupPanelGroup">
-                    <h:panelGroup>
-                        <h:outputText
-                                value="Last successful deployment of application server: ${shakedownTestScreenDataProvider.lastSuccessfulDeploymentDate}"/>
-                        <br/>
-                        <h:outputText
-                                value="Effectively used release: ${shakedownTestScreenDataProvider.selectedShakedownTest.applicationServer.release.name}"/>
-                        <br/>
-                        <h:outputText
-                                value="created at: ${shakedownTestScreenDataProvider.formatDate(shakedownTestScreenDataProvider.selectedShakedownTest.testDate)}"/>
-                        <br/>
-                    </h:panelGroup>
-                    <br/>
-                    <h:panelGroup styleClass="well" layout="block">
-                        <h2>
-                            <h:outputText value="Result details"/>
-                        </h2>
-                        <hr/>
-                        <h:outputText styleClass="width700px maxHeight500px autoOverflow"
-                                      value="${shakedownTestScreenDataProvider.selectedShakedownTest.testResult}"
-                                      escape="false"/>
-                    </h:panelGroup>
-                </h:panelGroup>
-            </rich:popupPanel>
-        </h:form>
-
-        <h:form prependId="false">
-            <rich:popupPanel id="createTestPopupPanel" moveable="true"
-                             autosized="true" domElementAttachment="form">
-                <f:facet name="header">
-                    <h2>
-                        <h:outputText value="Create shakedown test order"
-                                      id="createTestPopupPanelFacet"/>
-                    </h2>
-                </f:facet>
-                <f:facet name="controls">
-                    <h:outputLink value="#"
-                                  styleClass="close icon icon-close icon-replace"
-                                  onclick="#{rich:component('createTestPopupPanel')}.hide(); return false;">
-                        x
-                    </h:outputLink>
-                </f:facet>
-
-                <h:panelGroup id="createTestPopupPanelGroup">
-
-                    <h:dataTable var="sdtestOrder"
-                                 value="#{shakedownTestScreenDataProvider.shakedownTestOrder}"
-                                 rowClasses="odd-row,even-row"
-                                 class="well caption-top width_1100"
-                                 rendered="#{shakedownTestScreenDataProvider.renderCreateOrderDialog}">
-
-                        <f:facet name="caption">
-                            <nav class="actionbar">
-                                <ul>
-                                    <li><h:selectOneMenu styleClass="autoWidth"
-                                                         value="#{shakedownTestScreenDataProvider.selectedOrderEnvironmentId}">
-                                        <f:selectItem itemLabel="Select environment"
-                                                      itemValue="${null}"/>
-                                        <f:selectItems value="${contextDataProvider.environments}"
-                                                       var="env" itemLabel="${env.name}" itemValue="${env.id}"/>
-                                        <a4j:ajax render="asSelection releaseSelection"
-                                                  onbegin="showLoader();" oncomplete="hideLoader();"
-                                                  onerror="hideLoader();"/>
-                                    </h:selectOneMenu></li>
-
-                                    <li>
-                                        <h:outputLabel styleClass="control-label autoWidth" value="Only deployed">
-                                            <h:selectBooleanCheckbox
-                                                    value="#{shakedownTestScreenDataProvider.showOnlyDeployedAppServers}"
-                                                    title="Show only deployed application server">
-                                                <f:ajax render="asSelection releaseSelection"/>
-                                            </h:selectBooleanCheckbox>
-                                        </h:outputLabel>
-
-                                        <h:selectOneMenu id="asSelection" styleClass="width_240px"
-                                                         value="#{shakedownTestScreenDataProvider.selectedOrderAppServerGroupId}">
-                                            <f:selectItem
-                                                    itemLabel="Select ${shakedownTestScreenDataProvider.showOnlyDeployedAppServers ? 'deployed' : 'any'} application server"
-                                                    itemValue="${null}"/>
-                                            <f:selectItem
-                                                    itemLabel="${shakedownTestScreenDataProvider.allAppserverSelectedText}"
-                                                    itemValue="-1"/>
-                                            <f:selectItems
-                                                    value="${shakedownTestScreenDataProvider.appServerGroups}"
-                                                    var="asGroup" itemLabel="${asGroup.name}"
-                                                    itemValue="${asGroup.id}"/>
-                                            <a4j:ajax render="releaseSelection"
-                                                      onbegin="showLoader();" oncomplete="hideLoader();"
-                                                      onerror="hideLoader();"/>
-                                        </h:selectOneMenu></li>
-
-                                    <li><h:selectOneMenu id="releaseSelection" styleClass="switchRelease"
-                                                         disabled="#{shakedownTestScreenDataProvider.releasesForAs == null or shakedownTestScreenDataProvider.selectedOrderAppServerGroupId == null}"
-                                                         value="#{shakedownTestScreenDataProvider.selectedReleaseId}">
-                                        <f:selectItems
-                                                value="${shakedownTestScreenDataProvider.releasesForAs}"
-                                                var="release" itemLabel="${release.name}" itemValue="${release.id}"/>
-                                    </h:selectOneMenu></li>
-
-                                    <li><a4j:commandLink styleClass="btn light"
-                                                         render="createTestPopupPanelGroup"
-                                                         action="${shakedownTestScreenDataProvider.addShakedownTestOrder()}">
-                                        <i class="icon icon-add"></i>
-                                        <h:outputText value="Add to order"/>
-                                    </a4j:commandLink></li>
-                                </ul>
-                            </nav>
-
-                        </f:facet>
-
-                        <h:column index="index" headerClass="width_500">
-                            <f:facet name="header">
-                                <h:outputText styleClass="nowrap" value="Application server"/>
-                            </f:facet>
-                            <h:outputText value="#{sdtestOrder.applicationServerName}"/>
-                        </h:column>
-
-                        <h:column index="index" headerClass="width_500">
-                            <f:facet name="header">
-                                <h:outputText value="Release"/>
-                            </f:facet>
-                            <h:outputText value="#{sdtestOrder.releaseName}"/>
-                        </h:column>
-
-                        <h:column index="index" headerClass="width_240px">
-                            <f:facet name="header">
-                                <h:outputText value="Environment"/>
-                            </f:facet>
-                            <h:outputText value="#{sdtestOrder.environmentName}"/>
-                        </h:column>
-
-                        <h:column index="index">
-                            <f:facet name="header">
-                                <h:outputText styleClass="nowrap" value="test neighbourhood"/>
-                            </f:facet>
-                            <h:selectBooleanCheckbox
-                                    value="#{sdtestOrder.createTestForNeighbourhood}">
-                            </h:selectBooleanCheckbox>
-                        </h:column>
-
-                        <h:column index="index">
-                            <f:facet name="header">
-                                <h:outputText value="Action"/>
-                            </f:facet>
-                            <a4j:commandLink
-                                    action="${shakedownTestScreenDataProvider.removeSelectedShakedownTestFromOrder(sdtestOrder)}"
-                                    render="createTestPopupPanelGroup" value="remove">
-                            </a4j:commandLink>
-                        </h:column>
-                    </h:dataTable>
-
-                    <a4j:commandLink styleClass="btn primary right marginLeft20"
-                                     rendered="#{securityDataProvider.hasPermission('SHAKEDOWNTEST', 'CREATE')}"
-                                     value="Execute shakedown test order" type="button"
-                                     action="${shakedownTestScreenDataProvider.createShakedownTest()}"
-                                     onclick="showLoader();"
-                                     oncomplete="hideLoader();#{rich:component('createTestPopupPanel')}.hide(); return false;"
-                                     render="shakedowntest, selectedFilter"/>
-
-                </h:panelGroup>
-            </rich:popupPanel>
-
-
-        </h:form>
-
-    </ui:define>
-</ui:composition>
-</html>
\ No newline at end of file
diff --git a/AMW_web/src/main/webapp/pages/templates/template.xhtml b/AMW_web/src/main/webapp/pages/templates/template.xhtml
index b9f6cd98e..b4074fe56 100644
--- a/AMW_web/src/main/webapp/pages/templates/template.xhtml
+++ b/AMW_web/src/main/webapp/pages/templates/template.xhtml
@@ -130,23 +130,26 @@
             <img class="liimaLogo" src="../resources/images/misc/Liima.svg" alt="Liima" />
             <nav>
             <ul>
-                <li>
-                    <label class="inlineBlock myfavorites">
-                        <h:selectBooleanCheckbox value="#{userSettings.myAMWMode}" onclick="if(window.confirmLeave){return confirmLeave(event)};">
-                            <a4j:ajax render="fullBody"
-                                      oncomplete="window.location.reload();"
-                                      onbegin="showLoaderImmediate();" onerror="hideLoader();" />
-                        </h:selectBooleanCheckbox> Favorites only
-                    </label>
+                <ui:fragment>
+                <li class="#{screen eq 'newApplist' ? 'current' : ''}">
+                    <h:outputLink value="/AMW_angular/#/apps"
+                                  onclick="showLoader();confirmLeave(event);">
+                        <h:outputText value="Apps" />
+                    </h:outputLink>
+                </li>
+                </ui:fragment>
+                <li class="#{screen eq 'server' ? 'current' : ''}">
+                    <h:outputLink value="/AMW_angular/#/servers"
+                                  onclick="showLoader();confirmLeave(event);">
+                        <h:outputText value="Servers" />
+                    </h:outputLink>
+                </li>
+                <li class="#{screen eq 'newResourceList' or screen eq 'newEditResType' or screen eq 'newEditNode' or screen eq 'newEditResType' ? 'current' : ''}">
+                    <h:outputLink value="/AMW_angular/#/resources"
+                                  onclick="showLoader();confirmLeave(event);">
+                        <h:outputText value="Resources" />
+                    </h:outputLink>
                 </li>
-                <li class="#{screen eq 'newApplist' ? 'current' : ''}"><h:link
-                        outcome="applist" value="Apps" onclick="showLoader();" /></li>
-                <li class="#{screen eq 'server' ? 'current' : ''}"><h:link
-						outcome="serverListView" value="Servers" onclick="showLoader();" /></li>
-                <li
-                    class="#{screen eq 'newResourceList' or screen eq 'newEditRes' or screen eq 'newEditApp' or screen eq 'newEditNode' or screen eq 'newEditResType' ? 'current' : ''}"><h:link
-                        outcome="resourceList" value="Resources" onclick="showLoader();" /></li>
-
                 <ui:fragment rendered="#{securityDataProvider.hasPermissionOnAllContext('DEPLOYMENT', 'READ')}">
                 <li class="#{screen eq 'newDeploy' ? 'current' : ''}">
                         <h:outputLink value="/AMW_angular/#/deployments"
@@ -156,14 +159,12 @@
                 </li>
                 </ui:fragment>
 
-
-                <li class="#{screen eq 'shakedownTest' ? 'current' : ''}"><h:link
-                        outcome="shakedownTest" value="Shakedown Test"
-                        onclick="showLoader();"
-                        rendered="#{securityDataProvider.hasPermission('SHAKEDOWN_TEST_PAGE')}" /></li>
-
-                <li class="#{screen eq 'newSettings' ? ' current' : ''}"><h:link
-                        outcome="settings" onclick="showLoader();">Settings</h:link></li>
+                <li class="#{screen eq 'newSettings' ? ' current' : ''}">
+                    <h:outputLink value="/AMW_angular/#/settings"
+                                  onclick="showLoader();confirmLeave(event);">
+                        <h:outputText value="Settings" />
+                    </h:outputLink>
+                </li>
                 <li>
                 <h:commandLink action="#{securityDataProvider.logout()}"
                     value="Logout #{securityDataProvider.userName}" /></li>
diff --git a/AMW_web/src/main/webapp/resources/mobi/editPropertiesTable.xhtml b/AMW_web/src/main/webapp/resources/mobi/editPropertiesTable.xhtml
index 06fc0935f..3668fe364 100644
--- a/AMW_web/src/main/webapp/resources/mobi/editPropertiesTable.xhtml
+++ b/AMW_web/src/main/webapp/resources/mobi/editPropertiesTable.xhtml
@@ -15,7 +15,7 @@
 	<h:dataTable value="#{cc.attrs.editProperties}" var="prop"
 		styleClass="propertyTable" rendered="#{securityDataProvider.hasPermission('RESOURCE','READ')}">
 		<h:column >
-		<h:panelGroup layout="block" styleClass="control-group ${prop.testing and editPropertiesTable.testing ? 'testing' : ''}" rendered="#{editPropertiesTable.isPropertyDisplayable(prop)}">
+		<h:panelGroup layout="block" styleClass="control-group" rendered="#{editPropertiesTable.isPropertyDisplayable(prop)}">
 				<label class="control-label ellipsisRight" title="${prop.propertyDisplayName}" >
 					<h:link rendered="${cc.attrs.isDefinedOnInstanceOrType and editPropertiesTable.isEditable(prop)}" outcome="editPropertyView" includeViewParams="true">
 						${prop.propertyDisplayName}
@@ -32,4 +32,4 @@
 	</h:dataTable>  
     </composite:implementation>
  
-</html>
\ No newline at end of file
+</html>
diff --git a/AMW_web/src/main/webapp/resources/mobi/editTemplate.xhtml b/AMW_web/src/main/webapp/resources/mobi/editTemplate.xhtml
index bde9e6b42..c7d2ba76d 100644
--- a/AMW_web/src/main/webapp/resources/mobi/editTemplate.xhtml
+++ b/AMW_web/src/main/webapp/resources/mobi/editTemplate.xhtml
@@ -20,13 +20,13 @@
                 <li>
                     <div style="display: inline-block; float: right;">
                         <h:link rendered="#{(!templateEditDataProvider.editResource or !cc.attrs.isRelation or resourceRelationModel.consumedRelation) and templateEditDataProvider.canAdd}"
-                            outcome="editTemplateView" type="button" styleClass="btn light right ${templateEditDataProvider.testing ? 'testing' :  ''}" includeViewParams="false">
+                            outcome="editTemplateView" type="button" styleClass="btn light right" includeViewParams="false">
                             <f:param name="rel" value="#{!cc.attrs.isRelation ? null : resourceRelationModel.currentRelationUniqueIdentifier}" />
                             <f:param name="templ" value="${instanceTemplate.id}" />
                             <f:param name="id" value="#{editResourceView.resourceIdFromParam}" />
                             <f:param name="resTypId" value="#{editResourceView.resourceTypeIdFromParam}" />
-                            <i class="icon ${templateEditDataProvider.testing ? 'icon-addGrey' :  'icon-add'}" />
-                            New  <h:outputText value="Test-" rendered="${templateEditDataProvider.testing}" />Template
+                            <i class="icon icon-add" />
+                            New Template
                         </h:link>
                     </div>
                 </li>
@@ -35,7 +35,7 @@
 
             <h2>
                 <h:outputText
-                    value="${cc.attrs.isRelation ? (templateEditDataProvider.testing ? 'Relationship Test Templates' : 'Relationship Templates') : (templateEditDataProvider.testing ? 'Testing Templates' : 'Templates')}" />
+                    value="${cc.attrs.isRelation ? 'Relationship Templates' : 'Templates'}" />
             </h2>
             <hr />
             <div id="template_${cc.attrs.isRelation}_list" class="max_70vh ajaxScroll">
@@ -43,9 +43,7 @@
                     <h:panelGroup
                         rendered="${!templateEditDataProvider.getInstanceTemplates(cc.attrs.isRelation).isEmpty() and templateEditDataProvider.canListInstanceTemplates}">
                         <h3>
-                            Instance
-                            <h:outputText value="test-" rendered="${templateEditDataProvider.testing}" />
-                            templates
+                            Instance templates
                         </h3>
                         <h:dataTable var="instanceTemplate"
                             value="${templateEditDataProvider.getInstanceTemplates(cc.attrs.isRelation)}"
@@ -76,7 +74,7 @@
                     rendered="#{!templateEditDataProvider.getTypeTemplates(cc.attrs.isRelation).isEmpty() and templateEditDataProvider.canListResTypeTemplates}">
                     <h3>
                         <h:outputText
-                            value="${cc.attrs.isRelation ? (templateEditDataProvider.testing ? 'Resource Type Relationship Test Template' : 'Resource Type Relationship Templates') : (templateEditDataProvider.testing ? 'Resource Type Test Template' : 'Resource Type Templates')}" />
+                            value="${cc.attrs.isRelation ? 'Resource Type Relationship Templates' : 'Resource Type Templates'}" />
                     </h3>
                     <h:dataTable var="resTypeTemplate"
                         value="${templateEditDataProvider.getTypeTemplates(cc.attrs.isRelation)}"
@@ -119,7 +117,7 @@
 
     <rich:popupPanel id="removeTemplatePopup_${cc.attrs.isRelation}"
         moveable="true" width="800" autosized="true"
-        headerClass="${templateEditDataProvider.testing ? 'testing' : ''}">
+        >
         <f:facet name="header">
             <h2>
                 <h:outputText value="Remove Template" />
@@ -143,4 +141,4 @@
     </rich:popupPanel>
 
 </composite:implementation>
-</html>
\ No newline at end of file
+</html>
diff --git a/AMW_web/src/main/webapp/resources/mobi/listGlobalFunctions.xhtml b/AMW_web/src/main/webapp/resources/mobi/listGlobalFunctions.xhtml
deleted file mode 100644
index d90f0feee..000000000
--- a/AMW_web/src/main/webapp/resources/mobi/listGlobalFunctions.xhtml
+++ /dev/null
@@ -1,105 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:h="http://java.sun.com/jsf/html"
-      xmlns:f="http://java.sun.com/jsf/core"
-      xmlns:composite="http://java.sun.com/jsf/composite"
-      xmlns:a4j="http://richfaces.org/a4j"
-      xmlns:rich="http://richfaces.org/rich">
-
-<composite:interface>
-</composite:interface>
-
-<composite:implementation>
-
-    <a4j:outputPanel id="funPanel" ajaxRendered="true">
-        <h:dataTable id="funTable" styleClass="well caption-top" var="fun"
-                     value="${listGlobalFunctions.allGlobalFunctions}"
-                     columnClasses=",last,last" rowClasses="odd-row,even-row">
-
-            <f:facet name="caption">
-                <nav class="actionbar">
-                    <ul>
-                        <li>
-                            <h:link styleClass="btn light" outcome="editGlobalFunctionView"
-                                    rendered="#{listGlobalFunctions.canManage()}">
-                                <i class="icon icon-add"/>
-                                <h:outputText value="Add"/>
-                            </h:link></li>
-                    </ul>
-                </nav>
-                <h2>
-                    <h:outputText value="Functions"/>
-                </h2>
-            </f:facet>
-
-            <h:column>
-                <f:facet name="header">
-                    <h:panelGroup>
-                        <h:outputText value="Name"/>
-                        <br/>
-                    </h:panelGroup>
-                </f:facet>
-                <h:outputText value="${fun.name}"/>
-            </h:column>
-
-            <h:column>
-                <f:facet name="header">
-                    <h:outputText value="Edit"/>
-                </f:facet>
-                <h:link value="Edit"
-                        outcome="editGlobalFunctionView"
-                        rendered="#{listGlobalFunctions.canView()}"
-                        includeViewParams="true">
-                    <f:param name="functionId" value="#{fun.id}"/>
-                </h:link>
-            </h:column>
-
-            <h:column>
-                <f:facet name="header">
-                    <h:outputText value="Delete"/>
-                </f:facet>
-                <a4j:commandLink value="Delete"
-                                 action="#{listGlobalFunctions.setSelectedFunctionIdToBeRemoved(fun.id)}"
-                                 rendered="#{listGlobalFunctions.canManage()}"
-                                 render="funPanel"
-                                 oncomplete="hideLoader();#{rich:component('removeFunctionPopup')}.show();">
-                </a4j:commandLink>
-            </h:column>
-
-        </h:dataTable>
-    </a4j:outputPanel>
-
-    <a4j:jsFunction name="deleteFunction"
-                    execute="@this"
-                    oncomplete="${rich:component('removeFunctionPopup')}.show();"
-                    render="removeFunctionPopup">
-        <a4j:param name="currentId" assignTo="#{listGlobalFunctions.selectedFunctionIdToBeRemoved}"/>
-
-    </a4j:jsFunction>
-
-    <rich:popupPanel id="removeFunctionPopup"
-                     moveable="true" width="800" autosized="true">
-        <f:facet name="header">
-            <h2>
-                <h:outputText value="Delete Function"/>
-            </h2>
-        </f:facet>
-        <f:facet name="controls">
-            <h:outputLink value="#"
-                          styleClass="close icon icon-close icon-replace"
-                          onclick="#{rich:component('removeFunctionPopup')}.hide(); return false;">
-                x
-            </h:outputLink>
-        </f:facet>
-        <h:panelGrid style="margin-bottom:10px;">Are you sure you want to delete the selected function?</h:panelGrid>
-        <h:commandLink styleClass="btn primary right" value="Delete"
-                       onclick="showLoader();">
-            <a4j:ajax listener="#{listGlobalFunctions.deleteFunction()}"
-                      execute="@this"
-                      oncomplete="#{rich:component('removeFunctionPopup')}.hide(); hideLoader();"
-                      render="funPanel"/>
-        </h:commandLink>
-    </rich:popupPanel>
-
-</composite:implementation>
-</html>
\ No newline at end of file
diff --git a/AMW_web/src/main/webapp/resources/mobi/propertyTooltip.xhtml b/AMW_web/src/main/webapp/resources/mobi/propertyTooltip.xhtml
index 4722f4d7f..3562c0dcc 100644
--- a/AMW_web/src/main/webapp/resources/mobi/propertyTooltip.xhtml
+++ b/AMW_web/src/main/webapp/resources/mobi/propertyTooltip.xhtml
@@ -12,7 +12,7 @@
 <composite:implementation>
     <a class="help-inline info"
        onmouseover="var el = this.parentNode.getElementsByTagName('div')[0].getElementsByTagName('p')[0];if(this.parentNode.parentNode.querySelectorAll('textarea,input')[0].className.indexOf('ValidationError')!=-1){el.style.display='block';}else{el.style.display='none';}">
-        <i class="icon ${isTesting ? 'icon-infoWhite' : 'icon-info' }"/>
+        <i class="icon icon-info"/>
     </a>
 
     <div class="--property--info-box">
@@ -74,4 +74,4 @@
 </composite:implementation>
 
 
-</html>
\ No newline at end of file
+</html>
diff --git a/AMW_web/src/main/webapp/stylesheets/fixed.css b/AMW_web/src/main/webapp/stylesheets/fixed.css
index 963883812..38d591c57 100644
--- a/AMW_web/src/main/webapp/stylesheets/fixed.css
+++ b/AMW_web/src/main/webapp/stylesheets/fixed.css
@@ -1,8 +1,3 @@
-.myfavorites{
-    line-height: 36px;
-    color: #d6d6d6;
-}
-
 #subheader{
     overflow:visible;
 }
diff --git a/AMW_web/src/test/java/ch/puzzle/itc/mobiliar/presentation/propertyEdit/EditPropertiesTableTest.java b/AMW_web/src/test/java/ch/puzzle/itc/mobiliar/presentation/propertyEdit/EditPropertiesTableTest.java
index 08f22df5e..c299f914c 100644
--- a/AMW_web/src/test/java/ch/puzzle/itc/mobiliar/presentation/propertyEdit/EditPropertiesTableTest.java
+++ b/AMW_web/src/test/java/ch/puzzle/itc/mobiliar/presentation/propertyEdit/EditPropertiesTableTest.java
@@ -43,19 +43,6 @@ public void setUp() {
 		editPropertiesTable = new EditPropertiesTable();
 	}
 
-	@Test
-	public void onChangedTestingModeEventShouldSetNotYetInitializedTestingFlag() {
-		// given
-		boolean isTesting = true;
-		assertFalse(editPropertiesTable.isTesting());
-
-		// when
-		editPropertiesTable.onChangedTestingMode(isTesting);
-
-		// then
-		assertTrue(editPropertiesTable.isTesting());
-	}
-
 	@Test
 	public void onChangedResourceTypeEventShouldSetCurrentSelectedResourceType() {
 		// given
@@ -312,198 +299,6 @@ public void isEditableWhenTypeRelationAndFocusOnResourceTypeShouldReturnFalse()
 
 	}
 
-	// public boolean isEditable(ResourceEditProperty property) {
-	// boolean isEditable = false;
-	// ResourceEditProperty.Origin propertyDescriptorOrigin = property.getPropertyDescriptorOrigin();
-	//
-	// switch (propertyDescriptorOrigin) {
-	// case INSTANCE:
-	// isEditable = isCurrentFocusOnResource();
-	// break;
-	// case TYPE:
-	// isEditable = isCurrentFocusOnResourceType();
-	// break;
-	// }
-	//
-	// // if testing mode only return properties which are in current focus and are defined only for testing
-	// if(isTesting()){
-	// return property.isTesting() && isEditable;
-	// }
-	//
-	// return isEditable;
-	// }
-
-	@Test
-	public void isEditableWhenInstanceAndFocusOnResourceTypeWhenInTestingModeShouldReturnFalse() {
-		// given
-		ResourceEditProperty.Origin propertyDescriptorOrigin = ResourceEditProperty.Origin.INSTANCE;
-
-		ResourceEditProperty propertyMock = mock(ResourceEditProperty.class);
-		when(propertyMock.getPropertyDescriptorOrigin()).thenReturn(propertyDescriptorOrigin);
-
-		// set focus on Resource type
-		editPropertiesTable.onChangedResourceType(createResourceTypeWithId(1));
-		// set testingmode true
-		editPropertiesTable.onChangedTestingMode(true);
-
-		// when
-		boolean isEditable = editPropertiesTable.isEditable(propertyMock);
-
-		// then
-		assertFalse(isEditable);
-
-	}
-
-	@Test
-	public void isEditableWhenTypeAndFocusOnResourceTypeWhenInTestingModeShouldReturnFalse() {
-		// given
-		ResourceEditProperty.Origin propertyDescriptorOrigin = ResourceEditProperty.Origin.TYPE;
-
-		ResourceEditProperty propertyMock = mock(ResourceEditProperty.class);
-		when(propertyMock.getPropertyDescriptorOrigin()).thenReturn(propertyDescriptorOrigin);
-
-		// set focus on Resource type
-		editPropertiesTable.onChangedResourceType(createResourceTypeWithId(1));
-		// set testingmode true
-		editPropertiesTable.onChangedTestingMode(true);
-
-		// when
-		boolean isEditable = editPropertiesTable.isEditable(propertyMock);
-
-		// then
-		assertFalse(isEditable);
-
-	}
-
-	@Test
-	public void isEditableWhenInstanceAndFocusOnResourceWhenInTestingModeShouldReturnFalse() {
-		// given
-		ResourceEditProperty.Origin propertyDescriptorOrigin = ResourceEditProperty.Origin.INSTANCE;
-
-		ResourceEditProperty propertyMock = mock(ResourceEditProperty.class);
-		when(propertyMock.getPropertyDescriptorOrigin()).thenReturn(propertyDescriptorOrigin);
-
-		// set focus on Resource
-		editPropertiesTable.onChangedResource(createResourceWithId(1));
-		// set testingmode true
-		editPropertiesTable.onChangedTestingMode(true);
-
-		// when
-		boolean isEditable = editPropertiesTable.isEditable(propertyMock);
-
-		// then
-		assertFalse(isEditable);
-
-	}
-
-	@Test
-	public void isEditableWhenTypeAndFocusOnResourceWhenInTestingModeShouldReturnFalse() {
-		// given
-		ResourceEditProperty.Origin propertyDescriptorOrigin = ResourceEditProperty.Origin.TYPE;
-
-		ResourceEditProperty propertyMock = mock(ResourceEditProperty.class);
-		when(propertyMock.getPropertyDescriptorOrigin()).thenReturn(propertyDescriptorOrigin);
-
-		// set focus on Resource
-		editPropertiesTable.onChangedResource(createResourceWithId(1));
-		// set testingmode true
-		editPropertiesTable.onChangedTestingMode(true);
-
-		// when
-		boolean isEditable = editPropertiesTable.isEditable(propertyMock);
-
-		// then
-		assertFalse(isEditable);
-
-	}
-
-	@Test
-	public void isEditableWhenInstanceAndFocusOnResourceTypeAndTestingWhenInTestingModeShouldReturnFalse() {
-		// given
-		ResourceEditProperty.Origin propertyDescriptorOrigin = ResourceEditProperty.Origin.INSTANCE;
-
-		ResourceEditProperty propertyMock = mock(ResourceEditProperty.class);
-		when(propertyMock.getPropertyDescriptorOrigin()).thenReturn(propertyDescriptorOrigin);
-		when(propertyMock.isTesting()).thenReturn(true);
-
-		// set focus on Resource type
-		editPropertiesTable.onChangedResourceType(createResourceTypeWithId(1));
-		// set testingmode true
-		editPropertiesTable.onChangedTestingMode(true);
-
-		// when
-		boolean isEditable = editPropertiesTable.isEditable(propertyMock);
-
-		// then
-		assertFalse(isEditable);
-
-	}
-
-	@Test
-	public void isEditableWhenTypeAndFocusOnResourceTypeAndTestingWhenInTestingModeShouldReturnTrue() {
-		// given
-		ResourceEditProperty.Origin propertyDescriptorOrigin = ResourceEditProperty.Origin.TYPE;
-
-		ResourceEditProperty propertyMock = mock(ResourceEditProperty.class);
-		when(propertyMock.getPropertyDescriptorOrigin()).thenReturn(propertyDescriptorOrigin);
-		when(propertyMock.isTesting()).thenReturn(true);
-
-		// set focus on Resource type
-		editPropertiesTable.onChangedResourceType(createResourceTypeWithId(1));
-		// set testingmode true
-		editPropertiesTable.onChangedTestingMode(true);
-
-		// when
-		boolean isEditable = editPropertiesTable.isEditable(propertyMock);
-
-		// then
-		assertTrue(isEditable);
-
-	}
-
-	@Test
-	public void isEditableWhenInstanceAndFocusOnResourceAndTestingWhenInTestingModeShouldReturnTrue() {
-		// given
-		ResourceEditProperty.Origin propertyDescriptorOrigin = ResourceEditProperty.Origin.INSTANCE;
-
-		ResourceEditProperty propertyMock = mock(ResourceEditProperty.class);
-		when(propertyMock.getPropertyDescriptorOrigin()).thenReturn(propertyDescriptorOrigin);
-		when(propertyMock.isTesting()).thenReturn(true);
-
-		// set focus on Resource
-		editPropertiesTable.onChangedResource(createResourceWithId(1));
-		// set testingmode true
-		editPropertiesTable.onChangedTestingMode(true);
-
-		// when
-		boolean isEditable = editPropertiesTable.isEditable(propertyMock);
-
-		// then
-		assertTrue(isEditable);
-
-	}
-
-	@Test
-	public void isEditableWhenTypeAndFocusOnResourceAndTestingWhenInTestingModeShouldReturnFalse() {
-		// given
-		ResourceEditProperty.Origin propertyDescriptorOrigin = ResourceEditProperty.Origin.TYPE;
-
-		ResourceEditProperty propertyMock = mock(ResourceEditProperty.class);
-		when(propertyMock.getPropertyDescriptorOrigin()).thenReturn(propertyDescriptorOrigin);
-		when(propertyMock.isTesting()).thenReturn(true);
-
-		// set focus on Resource
-		editPropertiesTable.onChangedResource(createResourceWithId(1));
-		// set testingmode true
-		editPropertiesTable.onChangedTestingMode(true);
-
-		// when
-		boolean isEditable = editPropertiesTable.isEditable(propertyMock);
-
-		// then
-		assertFalse(isEditable);
-	}
-
 	@Test
 	public void onChangedRelationEventWhenResRelationIdShouldSetRelationId() {
 		// given
@@ -550,4 +345,4 @@ public void onChangedRelationEventWhenResRelationTypeIdShouldSetRelationId() {
 		assertEquals(resRelTypeId, editPropertiesTable.getRelationId());
 	}
 
-}
\ No newline at end of file
+}
diff --git a/AMW_web/src/test/java/ch/puzzle/itc/mobiliar/presentation/templateEdit/EditTemplateViewTest.java b/AMW_web/src/test/java/ch/puzzle/itc/mobiliar/presentation/templateEdit/EditTemplateViewTest.java
index 219220ecc..1253ce5ad 100644
--- a/AMW_web/src/test/java/ch/puzzle/itc/mobiliar/presentation/templateEdit/EditTemplateViewTest.java
+++ b/AMW_web/src/test/java/ch/puzzle/itc/mobiliar/presentation/templateEdit/EditTemplateViewTest.java
@@ -1,6 +1,5 @@
 package ch.puzzle.itc.mobiliar.presentation.templateEdit;
 
-import ch.puzzle.itc.mobiliar.business.shakedown.entity.ShakedownStpEntity;
 import ch.puzzle.itc.mobiliar.business.template.boundary.TemplateEditor;
 import ch.puzzle.itc.mobiliar.business.template.entity.TemplateDescriptorEntity;
 import ch.puzzle.itc.mobiliar.common.exception.AMWException;
@@ -24,9 +23,6 @@ public class EditTemplateViewTest {
     @Spy
     TemplateEditor templateEditor;
 
-    @Mock
-    ShakedownStpEntity selectedStp;
-
     @Spy
     @InjectMocks
     EditTemplateView editTemplateView;
@@ -36,45 +32,13 @@ public class EditTemplateViewTest {
 
     @Before
     public void setUp() {
-        doReturn(false).when(settings).isTestingMode();
-        doReturn(false).when(editTemplateView).fail(any(AMWException.class));
+//        doReturn(false).when(editTemplateView).fail(any(AMWException.class));
         doNothing().when(editTemplateView).succeed();
 
         template = editTemplateView.getTemplate();
         template.setId(1);
     }
 
-    @Test
-    public void shouldRejectTemplateInTestingModeWihtoutSelectedSTP() throws AMWException {
-        // given
-        doReturn(true).when(settings).isTestingMode();
-        editTemplateView.setSelectedStpId(9999); // clear selectedStp in the view
-
-        // when
-        editTemplateView.save();
-
-        // then
-        verify(editTemplateView).throwError("No STP-name selected!");
-        verify(editTemplateView, never()).succeed();
-    }
-
-    @Test
-    public void shouldSetTemplateNameFromSelectedStp() throws AMWException {
-        // given
-        doReturn(true).when(settings).isTestingMode();
-        doReturn("name-of-selected-stp").when(selectedStp).getStpName();
-
-        editTemplateView.setResourceTypeId(10);
-        doNothing().when(templateEditor).saveTemplateForResourceType(template, 10, true);
-
-        // when
-        editTemplateView.save();
-
-        // then
-        verify(template).setName("name-of-selected-stp");
-        verify(editTemplateView).succeed();
-    }
-
     @Test
     public void shouldSaveTemplateForRelationWithResourceIdNull() throws AMWException {
         // given
@@ -111,13 +75,13 @@ public void shouldSaveTemplateForResourceType() throws AMWException {
         editTemplateView.setRelationIdForTemplate(null);
         editTemplateView.setResourceId(null);
         editTemplateView.setResourceTypeId(99);
-        doNothing().when(templateEditor).saveTemplateForResourceType(template, 99, false);
+        doNothing().when(templateEditor).saveTemplateForResourceType(template, 99);
 
         // when
         editTemplateView.save();
 
         // then
-        verify(templateEditor).saveTemplateForResourceType(template, 99, settings.isTestingMode());
+        verify(templateEditor).saveTemplateForResourceType(template, 99);
         verify(editTemplateView).succeed();
     }
 
@@ -127,13 +91,13 @@ public void shouldSaveTemplateForResource() throws AMWException {
         editTemplateView.setResourceTypeId(null);
         editTemplateView.setRelationIdForTemplate(null);
         editTemplateView.setResourceId(10);
-        doNothing().when(templateEditor).saveTemplateForResource(template, 10, false);
+        doNothing().when(templateEditor).saveTemplateForResource(template, 10);
 
         // when
         editTemplateView.save();
 
         // then
-        verify(templateEditor).saveTemplateForResource(template, 10, settings.isTestingMode());
+        verify(templateEditor).saveTemplateForResource(template, 10);
         verify(editTemplateView).succeed();
     }
 }
diff --git a/README.md b/README.md
index 11f886690..520fcbc67 100644
--- a/README.md
+++ b/README.md
@@ -101,5 +101,9 @@ Please have a look at the [contribution guide](CONTRIBUTING.md)
 
 The contributors who are working on Liima or did contribute to Liima are listed in the [AUTHORS file](AUTHORS)
 
+## Declaration
+
+Contributions to the codebase have been made with the support of Codeium. Codeium is AI-powered code completion tool, that is trained exclusively on natural language and source code data with [permissive licenses](https://codeium.com/blog/copilot-trains-on-gpl-codeium-does-not ). 
+
 
 
diff --git a/pom.xml b/pom.xml
index c65a39eda..3b38b6324 100644
--- a/pom.xml
+++ b/pom.xml
@@ -386,7 +386,7 @@
             <dependency>
                 <groupId>org.mockito</groupId>
                 <artifactId>mockito-core</artifactId>
-                <version>3.4.6</version>
+                <version>4.11.0</version>
                 <scope>test</scope>
             </dependency>
             <dependency>