From e498238e3e4031e5b816837dd3c9add02665e4f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20M=C3=BCller?= <matthias.mueller@appng.org>
Date: Tue, 30 Jul 2019 16:04:04 +0200
Subject: [PATCH] MGR-66 removed IDs from datasources and action, fixed sorting
 (#12)

---
 .../conf/datasources/ds-applications.xml      |  45 ++---
 .../conf/datasources/ds-connections.xml       |  11 +-
 application-home/conf/datasources/ds-jars.xml |   4 +-
 .../conf/datasources/ds-permissions.xml       |  12 +-
 .../conf/datasources/ds-repositories.xml      |  20 +--
 .../conf/datasources/ds-resources.xml         |  16 +-
 .../conf/datasources/ds-roles.xml             |  12 +-
 .../conf/datasources/ds-sites.xml             |  12 +-
 .../conf/datasources/ds-subjects.xml          |  10 +-
 .../conf/datasources/ds-templates.xml         |   6 +-
 .../manager/service/ManagerService.java       |   1 -
 .../manager/business/RepositoriesTest.java    |   4 +-
 .../DataBaseConnectionsTest-testOverview.xml  |  10 +-
 .../xml/GroupsTest-testCreateGroup-action.xml |   3 +-
 .../GroupsTest-testCreateGroupNameExists.xml  |   6 +-
 .../xml/GroupsTest-testShowGroups.xml         |   6 +-
 .../GroupsTest-testShowGroupsFilterName.xml   | 158 +++++++++---------
 ...GroupsTest-testUpdateAdminGroup-action.xml |   3 +-
 .../xml/GroupsTest-testUpdateGroup-action.xml |   3 +-
 .../xml/PermissionsTest-testCreate-action.xml |   6 +-
 .../PermissionsTest-testCreateNameExists.xml  |   6 +-
 .../PermissionsTest-testShowPermission.xml    |   6 -
 .../PermissionsTest-testShowPermissions.xml   |  31 ++--
 .../xml/PermissionsTest-testUpdate-action.xml |  12 +-
 .../PlatformPropertiesTest-testShowAll.xml    |   3 +-
 ...iesTest-testCreateRepositoryNameExists.xml |   3 +-
 .../RepositoriesTest-testShowRepositories.xml |  25 ++-
 .../RepositoriesTest-testShowRepository.xml   |   8 +-
 ...toriesTest-testUpdateRepository-action.xml |   8 +-
 .../xml/RoleTest-testCreate-action.xml        |   3 +-
 .../xml/RoleTest-testCreateNameExists.xml     |   6 +-
 .../resources/xml/RoleTest-testShowAll.xml    |  16 +-
 .../resources/xml/RoleTest-testShowOne.xml    |   6 -
 .../xml/RoleTest-testUpdate-action.xml        |   9 +-
 .../xml/SitesTest-testCreateSite-action.xml   |   3 +-
 ...SitesTest-testCreateSiteValidationFail.xml |   3 +-
 .../resources/xml/SitesTest-testShowSite.xml  |   6 -
 .../resources/xml/SitesTest-testShowSites.xml |  18 +-
 .../xml/SubjectsTest-testCreateNameExists.xml |   3 +-
 .../SubjectsTest-testCreateValidationFail.xml |   3 +-
 .../xml/SubjectsTest-testShowAll.xml          |  10 +-
 .../xml/SubjectsTest-testShowOne.xml          |   6 -
 .../xml/SubjectsTest-testUpdate-action.xml    |   6 -
 43 files changed, 202 insertions(+), 346 deletions(-)

diff --git a/application-home/conf/datasources/ds-applications.xml b/application-home/conf/datasources/ds-applications.xml
index 85640e7..b74cb8a 100644
--- a/application-home/conf/datasources/ds-applications.xml
+++ b/application-home/conf/datasources/ds-applications.xml
@@ -10,18 +10,15 @@
 			</permissions>
 			<params />
 			<meta-data bindClass="org.appng.api.model.Application">
-				<field name="id" type="int" readonly="true">
-					<label>id</label>
-				</field>
 				<field name="name" type="text">
-					<sort />
+					<sort prio="0" order="asc" ignore-case="true"/>
 					<label>name</label>
 				</field>
 				<field name="displayName" type="text">
 					<sort />
 					<label>displayName</label>
 				</field>
-				<field name="packageVersion" type="text">
+				<field name="applicationVersion" type="text">
 					<sort />
 					<label>version</label>
 				</field>
@@ -38,14 +35,14 @@
 				</field>
 			</meta-data>
 			<linkpanel id="actions" location="inline">
-				<link mode="intern" target="/applications/update/#{id}" default="true">
+				<link mode="intern" target="/applications/update/${current.id}" default="true">
 					<label>edit</label>
 					<icon>edit</icon>
 					<permissions>
 						<permission ref="application.edit" mode="set" />
 					</permissions>
 				</link>
-				<link mode="intern" target="/applications&#63;form_action=delete&#38;appid=#{id}">
+				<link mode="intern" target="/applications&#63;form_action=delete&#38;appid=${current.id}">
 					<label>delete</label>
 					<icon>delete</icon>
 					<confirmation id="application.delete.confirm" params="#{name}"></confirmation>
@@ -66,9 +63,6 @@
 				<param name="appid" />
 			</params>
 			<meta-data bindClass="org.appng.core.domain.ApplicationImpl">
-				<field name="id" type="int" readonly="true">
-					<label>id</label>
-				</field>
 				<field name="name" type="text" readonly="true">
 					<label>name</label>
 				</field>
@@ -117,20 +111,23 @@
 				<param name="defaultlinkanchor" />
 				<param name="mode" />
 			</params>
-			<meta-data bindClass="org.appng.core.domain.SiteApplication" binding="application" result-selector="${current.application.id eq appid}">
-				<field name="id" type="int" readonly="true">
-					<label>id</label>
-				</field>
-				<field name="name" type="text">
+			<meta-data bindClass="org.appng.core.domain.SiteApplication" result-selector="${current.application.id eq appid}">
+				<field name="application.name" type="text">
+					<sort prio="0" order="asc" ignore-case="true" />
 					<label>name</label>
 				</field>
-				<field name="displayName" type="text">
+				<field name="application.displayName" type="text">
+					<sort />
 					<label>displayName</label>
 				</field>
-				<field name="privileged" type="checkbox">
+				<field name="application.applicationVersion" type="text">
+					<sort />
+					<label>version</label>
+				</field>
+				<field name="application.privileged" type="checkbox">
 					<label>privileged</label>
 				</field>
-				<field name="fileBased" type="checkbox">
+				<field name="application.fileBased" type="checkbox">
 					<label>filebased</label>
 				</field>
 				<field name="actions" type="linkpanel">
@@ -138,7 +135,8 @@
 				</field>
 			</meta-data>
 			<linkpanel id="actions" location="inline">
-				<link mode="intern" target="${defaultlink}?selectedappid=${current.application.id}${defaultlinkanchor}" default="true">
+				<link mode="intern" target="${defaultlink}?selectedappid=${current.application.id}${defaultlinkanchor}"
+					default="true">
 					<label>select</label>
 					<icon>edit</icon>
 					<permissions>
@@ -162,13 +160,16 @@
 				<param name="siteid" />
 			</params>
 			<meta-data bindClass="org.appng.core.domain.SiteApplication">
-				<field name="application.id" type="int">
-					<label>id</label>
-				</field>
 				<field name="application.name" type="text">
+					<sort prio="0" order="asc" name="name" ignore-case="true"/>
 					<label>name</label>
 				</field>
+				<field name="application.displayName" type="text">
+					<sort name="displayName"/>
+					<label>displayName</label>
+				</field>
 				<field name="application.applicationVersion" type="text">
+					<sort name="applicationVersion"/>
 					<label>version</label>
 				</field>
 				<field name="active" type="image">
diff --git a/application-home/conf/datasources/ds-connections.xml b/application-home/conf/datasources/ds-connections.xml
index ba7bfc7..d29805d 100644
--- a/application-home/conf/datasources/ds-connections.xml
+++ b/application-home/conf/datasources/ds-connections.xml
@@ -16,9 +16,6 @@
 				<param name="editTab" />
 			</params>
 			<meta-data bindClass="org.appng.core.domain.DatabaseConnection">
-				<field name="id" type="int" hidden="true">
-					<label>id</label>
-				</field>
 				<field name="type" type="text">
 					<label>type</label>
 				</field>
@@ -52,21 +49,21 @@
 			</linkpanel>
 
 			<linkpanel id="actions" location="inline">
-				<link mode="intern" target="${editLink}#{id}${editTab}" default="true">
+				<link mode="intern" target="${editLink}${current.id}${editTab}" default="true">
 					<label>edit</label>
 					<icon>edit</icon>
 				</link>
-				<link mode="intern" target="${deleteLink}#{id}">
+				<link mode="intern" target="${deleteLink}${current.id}">
 					<label>delete</label>
 					<icon>delete</icon>
 					<condition expression="${not empty deleteLink}" />
 					<confirmation id="connection.delete.confirm" params="#{name}" />
 				</link>
-				<link mode="intern" target="${testLink}#{id}${linkTab}">
+				<link mode="intern" target="${testLink}${current.id}${linkTab}">
 					<label>test</label>
 					<icon>start</icon>
 				</link>
-				<link mode="intern" target="${resetLink}#{id}">
+				<link mode="intern" target="${resetLink}${current.id}">
 					<label>reset</label>
 					<icon>reload</icon>
 					<condition expression="${not empty resetLink}" />
diff --git a/application-home/conf/datasources/ds-jars.xml b/application-home/conf/datasources/ds-jars.xml
index 0889aac..15c82b5 100644
--- a/application-home/conf/datasources/ds-jars.xml
+++ b/application-home/conf/datasources/ds-jars.xml
@@ -18,7 +18,7 @@
 					<condition expression="${siteId ne null}" />
 				</field>
 				<field name="fileName" type="text">
-					<sort />
+					<sort prio="0" order="asc" ignore-case="true"/>
 					<label>name</label>
 				</field>
 				<field name="version" type="date" format="yyyy-MM-dd HH:mm:ss">
@@ -52,7 +52,7 @@
 			</permissions>
 			<meta-data bindClass="org.appng.core.model.JarInfo">
 				<field name="fileName" type="text">
-					<sort />
+					<sort prio="0" order="asc" ignore-case="true"/>
 					<label id="name" />
 				</field>
 				<field name="version" type="date" format="yyyy-MM-dd HH:mm:ss">
diff --git a/application-home/conf/datasources/ds-permissions.xml b/application-home/conf/datasources/ds-permissions.xml
index 138769b..eb42769 100644
--- a/application-home/conf/datasources/ds-permissions.xml
+++ b/application-home/conf/datasources/ds-permissions.xml
@@ -12,11 +12,8 @@
 				<param name="appid" />
 			</params>
 			<meta-data bindClass="org.appng.core.domain.PermissionImpl">
-				<field name="id" type="int">
-					<label>id</label>
-				</field>
 				<field name="name" type="text">
-					<sort />
+					<sort prio="0" order="asc" ignore-case="true"/>
 					<label>name</label>
 				</field>
 				<field name="description" type="text">
@@ -39,7 +36,7 @@
 				</link>
 			</linkpanel>
 			<linkpanel id="actions" location="inline">
-				<link mode="intern" target="/applications/update/${appid}/permission/update/#{id}#tab_permissions" default="true">
+				<link mode="intern" target="/applications/update/${appid}/permission/update/${current.id}#tab_permissions" default="true">
 					<label>edit</label>
 					<icon>edit</icon>
 					<permissions>
@@ -47,7 +44,7 @@
 					</permissions>
 				</link>
 				<link mode="intern"
-					target="/applications/update/${appid}&#63;form_action=delete-permission&#38;permissionid=#{id}#tab_permissions">
+					target="/applications/update/${appid}&#63;form_action=delete-permission&#38;permissionid=${current.id}#tab_permissions">
 					<label>delete</label>
 					<icon>delete</icon>
 					<confirmation id="permission.delete.confirm" params="#{name}"/>
@@ -69,9 +66,6 @@
 				<param name="permissionid" />
 			</params>
 			<meta-data bindClass="org.appng.core.domain.PermissionImpl">
-				<field name="id" type="int" readonly="true">
-					<label>id</label>
-				</field>
 				<field name="name" type="text">
 					<label>name</label>
 				</field>
diff --git a/application-home/conf/datasources/ds-repositories.xml b/application-home/conf/datasources/ds-repositories.xml
index 855f25d..1fbf5fb 100644
--- a/application-home/conf/datasources/ds-repositories.xml
+++ b/application-home/conf/datasources/ds-repositories.xml
@@ -27,27 +27,30 @@
 			</permissions>
 			<params />
 			<meta-data bindClass="org.appng.core.domain.RepositoryImpl">
-				<field name="id" type="text" readonly="true">
-					<label>id</label>
-				</field>
 				<field name="name" type="text">
+					<sort prio="0" order="asc" ignore-case="true"/>
 					<label>name</label>
 				</field>
 				<field name="repositoryType" type="text">
+					<sort />
 					<label>type</label>
 				</field>
 				<field name="repositoryMode" type="text">
+					<sort />
 					<label>mode</label>
 				</field>
 				<field name="published" type="image">
+					<sort />
 					<label>published</label>
 					<icon condition="${current.published}">led_orange</icon>
 					<icon condition="${not current.published}"></icon>
 				</field>
 				<field name="uri" type="text" displayLength="60">
+					<sort />
 					<label>uri</label>
 				</field>
 				<field name="active" type="image">
+					<sort />
 					<label>active</label>
 					<icon condition="${current.active}">led_green</icon>
 					<icon condition="${not current.active}">led_red</icon>
@@ -66,14 +69,14 @@
 				</link>
 			</linkpanel>
 			<linkpanel id="actions" location="inline">
-				<link mode="intern" target="/repositories/update/#{id}#tab_update">
+				<link mode="intern" target="/repositories/update/${current.id}#tab_update">
 					<label>edit</label>
 					<icon>edit</icon>
 					<permissions>
 						<permission ref="repository.edit" mode="set" />
 					</permissions>
 				</link>
-				<link mode="intern" target="/repositories&#63;form_action=delete-repository&#38;repositoryid=#{id}">
+				<link mode="intern" target="/repositories&#63;form_action=delete-repository&#38;repositoryid=${current.id}">
 					<label>delete</label>
 					<icon>delete</icon>
 					<confirmation id="repository.delete.confirm" params="#{name}" />
@@ -81,7 +84,7 @@
 						<permission ref="repository.delete" mode="set" />
 					</permissions>
 				</link>
-				<link target="/repositories/installation/#{id}&#63;form_action=reload" mode="intern">
+				<link target="/repositories/installation/${current.id}&#63;form_action=reload" mode="intern">
 					<label>reload</label>
 					<icon>reload</icon>
 					<confirmation id="repository.reload.confirm" params="#{name}" />
@@ -90,7 +93,7 @@
 						<permission ref="repository.reload" mode="set" />
 					</permissions>
 				</link>
-				<link mode="intern" target="/repositories/installation/#{id}#tab_packages" default="true">
+				<link mode="intern" target="/repositories/installation/${current.id}#tab_packages" default="true">
 					<label>installation</label>
 					<icon>deploy</icon>
 					<condition expression="${current.active}" />
@@ -112,9 +115,6 @@
 				<param name="repositoryid" />
 			</params>
 			<meta-data bindClass="org.appng.application.manager.form.RepositoryForm" binding="repository">
-				<field name="id" type="text" readonly="true">
-					<label>id</label>
-				</field>
 				<field name="name" type="text">
 					<label>name</label>
 				</field>
diff --git a/application-home/conf/datasources/ds-resources.xml b/application-home/conf/datasources/ds-resources.xml
index efee39e..2f075b6 100644
--- a/application-home/conf/datasources/ds-resources.xml
+++ b/application-home/conf/datasources/ds-resources.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<datasources xmlns="http://www.appng.org/schema/platform"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<datasources xmlns="http://www.appng.org/schema/platform" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.appng.org/schema/platform http://www.appng.org/schema/platform/appng-platform.xsd">
 
 	<datasource id="resources">
@@ -15,16 +14,19 @@
 			</params>
 			<meta-data bindClass="org.appng.api.model.Resource">
 				<field name="name" type="text" readonly="true">
+					<sort />
 					<label>name</label>
 				</field>
 				<field name="resourceType" type="text" readonly="true">
+					<sort />
 					<label>type</label>
 				</field>
 				<field name="size" type="int" readonly="true">
+					<sort />
 					<label>size</label>
 				</field>
-				<field name="version" type="date" readonly="true"
-					format="yyyy-MM-dd HH:mm:ss">
+				<field name="version" type="date" readonly="true" format="yyyy-MM-dd HH:mm:ss">
+					<sort />
 					<label>version</label>
 				</field>
 				<field type="linkpanel" name="actions">
@@ -32,15 +34,13 @@
 				</field>
 			</meta-data>
 			<linkpanel location="top" id="others">
-				<link target="/applications/update/${appid}/resource/upload#tab_resources"
-					mode="intern">
+				<link target="/applications/update/${appid}/resource/upload#tab_resources" mode="intern">
 					<label>upload</label>
 					<icon>upload</icon>
 				</link>
 			</linkpanel>
 			<linkpanel id="actions" location="inline">
-				<link mode="intern"
-					target="/applications/update/${appid}/resource/update/${current.id}#tab_resources">
+				<link mode="intern" target="/applications/update/${appid}/resource/update/${current.id}#tab_resources">
 					<label>view</label>
 					<icon>edit</icon>
 					<condition expression="${'JAR' ne current.resourceType.name()}" />
diff --git a/application-home/conf/datasources/ds-roles.xml b/application-home/conf/datasources/ds-roles.xml
index 39a4bc8..b2668b2 100644
--- a/application-home/conf/datasources/ds-roles.xml
+++ b/application-home/conf/datasources/ds-roles.xml
@@ -13,11 +13,8 @@
 				<param name="roleid" />
 			</params>
 			<meta-data bindClass="org.appng.api.model.Role" result-selector="${current.id eq roleid}">
-				<field name="id" type="int" readonly="true">
-					<label>id</label>
-				</field>
 				<field name="name" type="text">
-					<sort />
+					<sort prio="0" order="asc" ignore-case="true"/>
 					<label>name</label>
 				</field>
 				<field name="description" type="text">
@@ -40,7 +37,7 @@
 				</link>
 			</linkpanel>
 			<linkpanel id="actions" location="inline">
-				<link mode="intern" target="/applications/update/${appid}/role/update/#{id}#tab_roles" default="true">
+				<link mode="intern" target="/applications/update/${appid}/role/update/${current.id}#tab_roles" default="true">
 					<label>edit</label>
 					<icon>edit</icon>
 					<permissions>
@@ -48,7 +45,7 @@
 					</permissions>
 				</link>
 				<link mode="intern"
-					target="/applications/update/${appid}&#63;form_action=delete-role&#38;roleid=#{id}#tab_roles">
+					target="/applications/update/${appid}&#63;form_action=delete-role&#38;roleid=${current.id}#tab_roles">
 					<label>delete</label>
 					<icon>delete</icon>
 					<confirmation id="role.delete.confirm" params="#{name}"/>
@@ -70,9 +67,6 @@
 				<param name="id" />
 			</params>
 			<meta-data binding="role" bindClass="org.appng.application.manager.form.RoleForm">
-				<field name="id" type="int" readonly="true">
-					<label>id</label>
-				</field>
 				<field name="name" type="text">
 					<label>name</label>
 				</field>
diff --git a/application-home/conf/datasources/ds-sites.xml b/application-home/conf/datasources/ds-sites.xml
index cd8cc89..1e42951 100644
--- a/application-home/conf/datasources/ds-sites.xml
+++ b/application-home/conf/datasources/ds-sites.xml
@@ -10,9 +10,6 @@
 			</permissions>
 			<params />
 			<meta-data bindClass="org.appng.api.model.Site">
-				<field name="id" type="int" hidden="true">
-					<label>id</label>
-				</field>
 				<field name="name" type="text">
 					<sort prio="0" order="asc" ignore-case="true" />
 					<label>name</label>
@@ -56,14 +53,14 @@
 				</link>
 			</linkpanel>
 			<linkpanel id="actions" location="inline">
-				<link mode="intern" target="/sites/update/#{id}" default="true">
+				<link mode="intern" target="/sites/update/${current.id}" default="true">
 					<label>edit</label>
 					<icon>edit</icon>
 					<permissions>
 						<permission ref="site.edit" mode="set" />
 					</permissions>
 				</link>
-				<link mode="intern" target="/sites&#63;form_action=delete&#38;siteid=#{id}">
+				<link mode="intern" target="/sites&#63;form_action=delete&#38;siteid=${current.id}">
 					<label>delete</label>
 					<icon>delete</icon>
 					<confirmation id="site.delete.confirm" params="#{name}" />
@@ -71,7 +68,7 @@
 						<permission ref="site.delete" mode="set" />
 					</permissions>
 				</link>
-				<link mode="intern" target="/sites&#63;form_action=reload&#38;siteid=#{id}">
+				<link mode="intern" target="/sites&#63;form_action=reload&#38;siteid=${current.id}">
 					<label>reload</label>
 					<icon>reload</icon>
 					<permissions>
@@ -91,9 +88,6 @@
 				<param name="siteid" />
 			</params>
 			<meta-data binding="site" bindClass="org.appng.application.manager.form.SiteForm">
-				<field name="id" type="int" readonly="true">
-					<label>id</label>
-				</field>
 				<field name="name" type="text" readonly="true">
 					<label>name</label>
 				</field>
diff --git a/application-home/conf/datasources/ds-subjects.xml b/application-home/conf/datasources/ds-subjects.xml
index 9225b9e..b3fe70e 100644
--- a/application-home/conf/datasources/ds-subjects.xml
+++ b/application-home/conf/datasources/ds-subjects.xml
@@ -12,9 +12,6 @@
 				<param name="userid" />
 			</params>
 			<meta-data bindClass="org.appng.api.model.Subject" result-selector="${current.id eq userid}">
-				<field name="id" type="int">
-					<label>id</label>
-				</field>
 				<field name="name" type="text">
 					<sort prio="0" order="asc" ignore-case="true" />
 					<label>name</label>
@@ -46,14 +43,14 @@
 				</link>
 			</linkpanel>
 			<linkpanel id="actions" location="inline">
-				<link mode="intern" target="/users/user/update/#{id}" default="true">
+				<link mode="intern" target="/users/user/update/${current.id}" default="true">
 					<label>edit</label>
 					<icon>edit</icon>
 					<permissions>
 						<permission ref="subject.edit" mode="set" />
 					</permissions>
 				</link>
-				<link mode="intern" target="/users&#63;form_action=delete&#38;userid=#{id}">
+				<link mode="intern" target="/users&#63;form_action=delete&#38;userid=${current.id}">
 					<label>delete</label>
 					<icon>delete</icon>
 					<confirmation id="subject.delete.confirm" params="#{name}" />
@@ -74,9 +71,6 @@
 				<param name="userid" />
 			</params>
 			<meta-data binding="subject" bindClass="org.appng.application.manager.form.SubjectForm">
-				<field name="id" type="int" readonly="true">
-					<label>id</label>
-				</field>
 				<field name="name" type="text" readonly="true">
 					<label>name</label>
 				</field>
diff --git a/application-home/conf/datasources/ds-templates.xml b/application-home/conf/datasources/ds-templates.xml
index 8260121..81327b9 100644
--- a/application-home/conf/datasources/ds-templates.xml
+++ b/application-home/conf/datasources/ds-templates.xml
@@ -10,12 +10,8 @@
 			</permissions>
 			<params />
 			<meta-data bindClass="org.appng.api.model.Identifier">
-				<field name="id" type="int">
-					<sort />
-					<label>id</label>
-				</field>
 				<field name="name" type="text">
-					<sort />
+					<sort prio="0" order="asc" ignore-case="true"/>
 					<label>name</label>
 				</field>
 				<field name="description" type="text">
diff --git a/src/main/java/org/appng/application/manager/service/ManagerService.java b/src/main/java/org/appng/application/manager/service/ManagerService.java
index afa1f6e..0c893ff 100644
--- a/src/main/java/org/appng/application/manager/service/ManagerService.java
+++ b/src/main/java/org/appng/application/manager/service/ManagerService.java
@@ -797,7 +797,6 @@ public DataContainer searchApplications(FieldProcessor fp, Integer siteId, Integ
 				Page<SiteApplication> applications = siteApplicationRepository.search(searchQuery, pageable);
 				data.setPage(applications);
 			} else {
-				// page uses wrong property path application.x
 				Page<ApplicationImpl> allApplications = applicationRepository.search(pageable);
 				List<SiteApplication> applications = new ArrayList<SiteApplication>();
 				Site site = siteRepository.findOne(siteId);
diff --git a/src/test/java/org/appng/application/manager/business/RepositoriesTest.java b/src/test/java/org/appng/application/manager/business/RepositoriesTest.java
index 57e74da..66b5b63 100644
--- a/src/test/java/org/appng/application/manager/business/RepositoriesTest.java
+++ b/src/test/java/org/appng/application/manager/business/RepositoriesTest.java
@@ -80,8 +80,8 @@ public void testShowRepository() throws Exception {
 		siteDatasource.perform("test");
 		
 		XPathDifferenceHandler differenceListener = new XPathDifferenceHandler(false);
+		differenceListener.ignoreDifference("/datasource[1]/data[1]/result[1]/field[3]/value[1]/text()[1]");
 		differenceListener.ignoreDifference("/datasource[1]/data[1]/result[1]/field[4]/value[1]/text()[1]");
-		differenceListener.ignoreDifference("/datasource[1]/data[1]/result[1]/field[5]/value[1]/text()[1]");
 		validate(siteDatasource.getDatasource(), differenceListener);
 	}
 
@@ -109,8 +109,8 @@ public void testUpdateRepository() throws Exception {
 				.withParam(FORM_ACTION, "update").getCallableAction(repoForm);
 		
 		XPathDifferenceHandler differenceListener = new XPathDifferenceHandler(false);
+		differenceListener.ignoreDifference("/action[1]/data[1]/result[1]/field[3]/value[1]/text()[1]");
 		differenceListener.ignoreDifference("/action[1]/data[1]/result[1]/field[4]/value[1]/text()[1]");
-		differenceListener.ignoreDifference("/action[1]/data[1]/result[1]/field[5]/value[1]/text()[1]");
 
 		FieldProcessor fieldProcessor = callableAction.perform();
 		validate(callableAction.getAction(), "-action", differenceListener);
diff --git a/src/test/resources/xml/DataBaseConnectionsTest-testOverview.xml b/src/test/resources/xml/DataBaseConnectionsTest-testOverview.xml
index cf29f4f..8b74f49 100644
--- a/src/test/resources/xml/DataBaseConnectionsTest-testOverview.xml
+++ b/src/test/resources/xml/DataBaseConnectionsTest-testOverview.xml
@@ -13,9 +13,6 @@
 			<param name="editTab" />
 		</params>
 		<meta-data bindClass="org.appng.core.domain.DatabaseConnection">
-			<field name="id" type="int" format="#" hidden="true" binding="id">
-				<label id="id">ID</label>
-			</field>
 			<field name="type" type="text" binding="type">
 				<label id="type">Type</label>
 			</field>
@@ -42,11 +39,11 @@
 		</meta-data>
 		<linkpanel id="create" location="both" />
 		<linkpanel id="actions" location="inline">
-			<link id="actions[1]" mode="intern" target="#{id}" default="true">
+			<link id="actions[1]" mode="intern" target="${current.id}" default="true">
 				<label id="edit">Edit</label>
 				<icon>edit</icon>
 			</link>
-			<link id="actions[3]" mode="intern" target="#{id}">
+			<link id="actions[3]" mode="intern" target="${current.id}">
 				<label id="test">Test</label>
 				<icon>start</icon>
 			</link>
@@ -56,9 +53,6 @@
 		<resultset chunk="0" chunkname="databaseConnections" chunksize="10" nextchunk="0" previouschunk="0"
 			firstchunk="0" lastchunk="0" hits="1">
 			<result>
-				<field name="id" type="int">
-					<value>1</value>
-				</field>
 				<field name="type" type="text">
 					<value>HSQL</value>
 				</field>
diff --git a/src/test/resources/xml/GroupsTest-testCreateGroup-action.xml b/src/test/resources/xml/GroupsTest-testCreateGroup-action.xml
index bc554b2..cffde54 100644
--- a/src/test/resources/xml/GroupsTest-testCreateGroup-action.xml
+++ b/src/test/resources/xml/GroupsTest-testCreateGroup-action.xml
@@ -19,8 +19,7 @@
 						<message ref="group.name" class="ERROR" code="{validation.string.max}">Enter at most 64 characters</message>
 					</size>
 					<pattern regexp="([a-zA-Z0-9_\.-]{3,}[ ]*)+([a-zA-Z0-9_\.-][ ]*)+">
-						<message ref="group.name" class="ERROR" code="{validation.name}">Please enter a valid name, which may only consist of
-							letters,
+						<message ref="group.name" class="ERROR" code="{validation.name}">Please enter a valid name, which may only consist of letters,
 							numbers, spaces, dots, underscores and hyphens</message>
 					</pattern>
 				</validation>
diff --git a/src/test/resources/xml/GroupsTest-testCreateGroupNameExists.xml b/src/test/resources/xml/GroupsTest-testCreateGroupNameExists.xml
index b57d7a0..9e1cb9a 100644
--- a/src/test/resources/xml/GroupsTest-testCreateGroupNameExists.xml
+++ b/src/test/resources/xml/GroupsTest-testCreateGroupNameExists.xml
@@ -19,14 +19,12 @@
 						<message ref="group.name" class="ERROR" code="{validation.string.max}">Enter at most 64 characters</message>
 					</size>
 					<pattern regexp="([a-zA-Z0-9_\.-]{3,}[ ]*)+([a-zA-Z0-9_\.-][ ]*)+">
-						<message ref="group.name" class="ERROR" code="{validation.name}">Please enter a valid name, which may only consist of
-							letters,
+						<message ref="group.name" class="ERROR" code="{validation.name}">Please enter a valid name, which may only consist of letters,
 							numbers, spaces, dots, underscores and hyphens</message>
 					</pattern>
 				</validation>
 				<messages ref="name">
-					<message ref="name" class="ERROR">A group with that name already
-						exists!</message>
+					<message ref="name" class="ERROR">A group with that name already exists!</message>
 				</messages>
 			</field>
 			<field name="description" type="text" binding="group.description">
diff --git a/src/test/resources/xml/GroupsTest-testShowGroups.xml b/src/test/resources/xml/GroupsTest-testShowGroups.xml
index e1497b6..734659c 100644
--- a/src/test/resources/xml/GroupsTest-testShowGroups.xml
+++ b/src/test/resources/xml/GroupsTest-testShowGroups.xml
@@ -74,8 +74,7 @@
 					<link id="actions[2]" mode="intern" target="/users?form_action=deleteGroup&amp;groupid=3">
 						<label id="delete">Delete</label>
 						<icon>delete</icon>
-						<confirmation id="group.delete.confirm" params="${current.name}">Do you really want to delete the group "users"?
-						</confirmation>
+						<confirmation id="group.delete.confirm" params="${current.name}">Do you really want to delete the group "users"?</confirmation>
 					</link>
 				</linkpanel>
 			</result>
@@ -94,8 +93,7 @@
 					<link id="actions[2]" mode="intern" target="/users?form_action=deleteGroup&amp;groupid=1">
 						<label id="delete">Delete</label>
 						<icon>delete</icon>
-						<confirmation id="group.delete.confirm" params="${current.name}">Do you really want to delete the group "admin"?
-						</confirmation>
+						<confirmation id="group.delete.confirm" params="${current.name}">Do you really want to delete the group "admin"?</confirmation>
 					</link>
 				</linkpanel>
 			</result>
diff --git a/src/test/resources/xml/GroupsTest-testShowGroupsFilterName.xml b/src/test/resources/xml/GroupsTest-testShowGroupsFilterName.xml
index 5bc8f17..2a2d189 100644
--- a/src/test/resources/xml/GroupsTest-testShowGroupsFilterName.xml
+++ b/src/test/resources/xml/GroupsTest-testShowGroupsFilterName.xml
@@ -1,81 +1,83 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <datasource xmlns="http://www.appng.org/schema/platform" id="groups">
-    <config>
-        <title id="groups">Groups</title>
-        <permissions>
-            <permission ref="group.list" mode="set"></permission>
-        </permissions>
-        <params>
-            <param name="groupid"/>
-            <param name="groupName">admin</param>
-        </params>
-        <meta-data bindClass="org.appng.api.model.Group" result-selector="${current.id eq groupid}">
-            <field name="name" type="text" binding="name">
-                <sort order="desc" prio="0"/>
-                <label id="name">Name</label>
-            </field>
-            <field name="description" type="text" binding="description">
-                <label id="description">Description</label>
-            </field>
-            <field name="actions" type="linkpanel" binding="actions">
-                <label id="actions">Actions</label>
-            </field>
-        </meta-data>
-        <linkpanel id="other" location="both">
-            <link id="other[1]" mode="intern" target="/users/group/create#tab_groups">
-                <permissions>
-                    <permission ref="group.create" mode="set"></permission>
-                </permissions>
-                <label id="group.create">Create group</label>
-                <icon>new</icon>
-            </link>
-        </linkpanel>
-        <linkpanel id="actions" location="inline">
-            <link id="actions[1]" mode="intern" target="/users/group/update/${current.id}#tab_groups" default="true">
-                <permissions>
-                    <permission ref="group.edit" mode="set"></permission>
-                </permissions>
-                <label id="edit">Edit</label>
-                <icon>edit</icon>
-            </link>
-            <link id="actions[2]" mode="intern" target="/users?form_action=deleteGroup&amp;groupid=${current.id}">
-                <condition expression="${not current.defaultAdmin}"/>
-                <permissions>
-                    <permission ref="group.delete" mode="set"></permission>
-                </permissions>
-                <label id="delete">Delete</label>
-                <icon>delete</icon>
-                <confirmation id="group.delete.confirm" params="${current.name}">Do you really want to delete the group "${current.name}"?</confirmation>
-            </link>
-        </linkpanel>
-    </config>
-    <data>
-        <selectionGroup>
-            <selection id="f_gn" type="text">
-                <title id="name">Name</title>
-                <option value="admin" name="f_gn"/>
-            </selection>
-        </selectionGroup>
-        <resultset chunk="0" chunkname="groups" chunksize="10" nextchunk="0" previouschunk="0" firstchunk="0" lastchunk="0" hits="1">
-            <result>
-                <field name="name" type="text">
-                    <value>admin</value>
-                </field>
-                <field name="description" type="text">
-                    <value>admins</value>
-                </field>
-                <linkpanel id="actions" location="inline">
-                    <link id="actions[1]" mode="intern" target="/users/group/update/1#tab_groups" default="true">
-                        <label id="edit">Edit</label>
-                        <icon>edit</icon>
-                    </link>
-                    <link id="actions[2]" mode="intern" target="/users?form_action=deleteGroup&amp;groupid=1">
-                        <label id="delete">Delete</label>
-                        <icon>delete</icon>
-                        <confirmation id="group.delete.confirm" params="${current.name}">Do you really want to delete the group "admin"?</confirmation>
-                    </link>
-                </linkpanel>
-            </result>
-        </resultset>
-    </data>
+	<config>
+		<title id="groups">Groups</title>
+		<permissions>
+			<permission ref="group.list" mode="set"></permission>
+		</permissions>
+		<params>
+			<param name="groupid" />
+			<param name="groupName">admin</param>
+		</params>
+		<meta-data bindClass="org.appng.api.model.Group" result-selector="${current.id eq groupid}">
+			<field name="name" type="text" binding="name">
+				<sort order="desc" prio="0" />
+				<label id="name">Name</label>
+			</field>
+			<field name="description" type="text" binding="description">
+				<label id="description">Description</label>
+			</field>
+			<field name="actions" type="linkpanel" binding="actions">
+				<label id="actions">Actions</label>
+			</field>
+		</meta-data>
+		<linkpanel id="other" location="both">
+			<link id="other[1]" mode="intern" target="/users/group/create#tab_groups">
+				<permissions>
+					<permission ref="group.create" mode="set"></permission>
+				</permissions>
+				<label id="group.create">Create group</label>
+				<icon>new</icon>
+			</link>
+		</linkpanel>
+		<linkpanel id="actions" location="inline">
+			<link id="actions[1]" mode="intern" target="/users/group/update/${current.id}#tab_groups" default="true">
+				<permissions>
+					<permission ref="group.edit" mode="set"></permission>
+				</permissions>
+				<label id="edit">Edit</label>
+				<icon>edit</icon>
+			</link>
+			<link id="actions[2]" mode="intern" target="/users?form_action=deleteGroup&amp;groupid=${current.id}">
+				<condition expression="${not current.defaultAdmin}" />
+				<permissions>
+					<permission ref="group.delete" mode="set"></permission>
+				</permissions>
+				<label id="delete">Delete</label>
+				<icon>delete</icon>
+				<confirmation id="group.delete.confirm" params="${current.name}">Do you really want to delete the group
+					"${current.name}"?</confirmation>
+			</link>
+		</linkpanel>
+	</config>
+	<data>
+		<selectionGroup>
+			<selection id="f_gn" type="text">
+				<title id="name">Name</title>
+				<option value="admin" name="f_gn" />
+			</selection>
+		</selectionGroup>
+		<resultset chunk="0" chunkname="groups" chunksize="10" nextchunk="0" previouschunk="0" firstchunk="0"
+			lastchunk="0" hits="1">
+			<result>
+				<field name="name" type="text">
+					<value>admin</value>
+				</field>
+				<field name="description" type="text">
+					<value>admins</value>
+				</field>
+				<linkpanel id="actions" location="inline">
+					<link id="actions[1]" mode="intern" target="/users/group/update/1#tab_groups" default="true">
+						<label id="edit">Edit</label>
+						<icon>edit</icon>
+					</link>
+					<link id="actions[2]" mode="intern" target="/users?form_action=deleteGroup&amp;groupid=1">
+						<label id="delete">Delete</label>
+						<icon>delete</icon>
+						<confirmation id="group.delete.confirm" params="${current.name}">Do you really want to delete the group "admin"?</confirmation>
+					</link>
+				</linkpanel>
+			</result>
+		</resultset>
+	</data>
 </datasource>
diff --git a/src/test/resources/xml/GroupsTest-testUpdateAdminGroup-action.xml b/src/test/resources/xml/GroupsTest-testUpdateAdminGroup-action.xml
index 83324e2..67e81b2 100644
--- a/src/test/resources/xml/GroupsTest-testUpdateAdminGroup-action.xml
+++ b/src/test/resources/xml/GroupsTest-testUpdateAdminGroup-action.xml
@@ -20,8 +20,7 @@
 						<message ref="group.name" class="ERROR" code="{validation.string.max}">Enter at most 64 characters</message>
 					</size>
 					<pattern regexp="([a-zA-Z0-9_\.-]{3,}[ ]*)+([a-zA-Z0-9_\.-][ ]*)+">
-						<message ref="group.name" class="ERROR" code="{validation.name}">Please enter a valid name, which may only consist of
-							letters,
+						<message ref="group.name" class="ERROR" code="{validation.name}">Please enter a valid name, which may only consist of letters,
 							numbers, spaces, dots, underscores and hyphens</message>
 					</pattern>
 				</validation>
diff --git a/src/test/resources/xml/GroupsTest-testUpdateGroup-action.xml b/src/test/resources/xml/GroupsTest-testUpdateGroup-action.xml
index 7774873..1978657 100644
--- a/src/test/resources/xml/GroupsTest-testUpdateGroup-action.xml
+++ b/src/test/resources/xml/GroupsTest-testUpdateGroup-action.xml
@@ -20,8 +20,7 @@
 						<message ref="group.name" class="ERROR" code="{validation.string.max}">Enter at most 64 characters</message>
 					</size>
 					<pattern regexp="([a-zA-Z0-9_\.-]{3,}[ ]*)+([a-zA-Z0-9_\.-][ ]*)+">
-						<message ref="group.name" class="ERROR" code="{validation.name}">Please enter a valid name, which may only consist of
-							letters,
+						<message ref="group.name" class="ERROR" code="{validation.name}">Please enter a valid name, which may only consist of letters,
 							numbers, spaces, dots, underscores and hyphens</message>
 					</pattern>
 				</validation>
diff --git a/src/test/resources/xml/PermissionsTest-testCreate-action.xml b/src/test/resources/xml/PermissionsTest-testCreate-action.xml
index fde66f3..ac4c402 100644
--- a/src/test/resources/xml/PermissionsTest-testCreate-action.xml
+++ b/src/test/resources/xml/PermissionsTest-testCreate-action.xml
@@ -18,8 +18,7 @@
 						<message ref="name" class="ERROR" code="{validation.notNull}">Field must not be empty</message>
 					</notNull>
 					<pattern regexp="[a-zA-Z0-9\-\.]{3,}">
-						<message ref="name" class="ERROR" code="{validation.permission}">Please enter a valid name, which may only consist of
-							letters,
+						<message ref="name" class="ERROR" code="{validation.permission}">Please enter a valid name, which may only consist of letters,
 							numbers, dots and hyphens</message>
 					</pattern>
 				</validation>
@@ -36,8 +35,7 @@
 	</config>
 	<condition expression="${form_action eq 'create-permission' and not empty appid}" />
 	<messages>
-		<message ref="create-permission" class="OK">Permission has been
-			created.</message>
+		<message ref="create-permission" class="OK">Permission has been created.</message>
 	</messages>
 	<datasource id="new-permission" />
 	<data>
diff --git a/src/test/resources/xml/PermissionsTest-testCreateNameExists.xml b/src/test/resources/xml/PermissionsTest-testCreateNameExists.xml
index 15e0be3..881da7e 100644
--- a/src/test/resources/xml/PermissionsTest-testCreateNameExists.xml
+++ b/src/test/resources/xml/PermissionsTest-testCreateNameExists.xml
@@ -18,14 +18,12 @@
 						<message ref="name" class="ERROR" code="{validation.notNull}">Field must not be empty</message>
 					</notNull>
 					<pattern regexp="[a-zA-Z0-9\-\.]{3,}">
-						<message ref="name" class="ERROR" code="{validation.permission}">Please enter a valid name, which may only consist of
-							letters,
+						<message ref="name" class="ERROR" code="{validation.permission}">Please enter a valid name, which may only consist of letters,
 							numbers, dots and hyphens</message>
 					</pattern>
 				</validation>
 				<messages ref="name">
-					<message ref="name" class="ERROR">A permission with this name
-						already exists!</message>
+					<message ref="name" class="ERROR">A permission with this name already exists!</message>
 				</messages>
 			</field>
 			<field name="description" type="text" binding="description">
diff --git a/src/test/resources/xml/PermissionsTest-testShowPermission.xml b/src/test/resources/xml/PermissionsTest-testShowPermission.xml
index 8eabf2b..076cceb 100644
--- a/src/test/resources/xml/PermissionsTest-testShowPermission.xml
+++ b/src/test/resources/xml/PermissionsTest-testShowPermission.xml
@@ -6,9 +6,6 @@
 			<param name="permissionid">1</param>
 		</params>
 		<meta-data bindClass="org.appng.core.domain.PermissionImpl">
-			<field name="id" type="int" format="#" readonly="true" binding="id">
-				<label id="id">ID</label>
-			</field>
 			<field name="name" type="text" binding="name">
 				<label id="name">Name</label>
 			</field>
@@ -19,9 +16,6 @@
 	</config>
 	<data>
 		<result>
-			<field name="id" type="int">
-				<value>1</value>
-			</field>
 			<field name="name" type="text">
 				<value>do.this</value>
 			</field>
diff --git a/src/test/resources/xml/PermissionsTest-testShowPermissions.xml b/src/test/resources/xml/PermissionsTest-testShowPermissions.xml
index 3e65b29..b9cfa9b 100644
--- a/src/test/resources/xml/PermissionsTest-testShowPermissions.xml
+++ b/src/test/resources/xml/PermissionsTest-testShowPermissions.xml
@@ -9,9 +9,6 @@
 			<param name="appid">1</param>
 		</params>
 		<meta-data bindClass="org.appng.core.domain.PermissionImpl">
-			<field name="id" type="int" format="#" binding="id">
-				<label id="id">ID</label>
-			</field>
 			<field name="name" type="text" binding="name">
 				<sort />
 				<label id="name">Name</label>
@@ -36,8 +33,8 @@
 			</link>
 		</linkpanel>
 		<linkpanel id="actions" location="inline">
-			<link id="actions[1]" mode="intern" target="/applications/update/1/permission/update/#{id}#tab_permissions"
-				default="true">
+			<link id="actions[1]" mode="intern"
+				target="/applications/update/1/permission/update/${current.id}#tab_permissions" default="true">
 				<permissions>
 					<permission ref="permission.edit" mode="set"></permission>
 				</permissions>
@@ -45,7 +42,7 @@
 				<icon>edit</icon>
 			</link>
 			<link id="actions[2]" mode="intern"
-				target="/applications/update/1?form_action=delete-permission&amp;permissionid=#{id}#tab_permissions">
+				target="/applications/update/1?form_action=delete-permission&amp;permissionid=${current.id}#tab_permissions">
 				<permissions>
 					<permission ref="permission.delete" mode="set"></permission>
 				</permissions>
@@ -60,11 +57,8 @@
 		<resultset chunk="0" chunkname="permissions" chunksize="10" nextchunk="0" previouschunk="0" firstchunk="0"
 			lastchunk="0" hits="2">
 			<result>
-				<field name="id" type="int">
-					<value>1</value>
-				</field>
 				<field name="name" type="text">
-					<value>do.this</value>
+					<value>do.that</value>
 				</field>
 				<field name="description" type="text">
 					<value>description</value>
@@ -73,26 +67,23 @@
 					<value>application</value>
 				</field>
 				<linkpanel id="actions" location="inline">
-					<link id="actions[1]" mode="intern" target="/applications/update/1/permission/update/1#tab_permissions"
+					<link id="actions[1]" mode="intern" target="/applications/update/1/permission/update/2#tab_permissions"
 						default="true">
 						<label id="edit">Edit</label>
 						<icon>edit</icon>
 					</link>
 					<link id="actions[2]" mode="intern"
-						target="/applications/update/1?form_action=delete-permission&amp;permissionid=1#tab_permissions">
+						target="/applications/update/1?form_action=delete-permission&amp;permissionid=2#tab_permissions">
 						<label id="delete">Delete</label>
 						<icon>delete</icon>
 						<confirmation id="permission.delete.confirm" params="#{name}">Do you really want to delete the permission
-							"do.this"?</confirmation>
+							"do.that"?</confirmation>
 					</link>
 				</linkpanel>
 			</result>
 			<result>
-				<field name="id" type="int">
-					<value>2</value>
-				</field>
 				<field name="name" type="text">
-					<value>do.that</value>
+					<value>do.this</value>
 				</field>
 				<field name="description" type="text">
 					<value>description</value>
@@ -101,17 +92,17 @@
 					<value>application</value>
 				</field>
 				<linkpanel id="actions" location="inline">
-					<link id="actions[1]" mode="intern" target="/applications/update/1/permission/update/2#tab_permissions"
+					<link id="actions[1]" mode="intern" target="/applications/update/1/permission/update/1#tab_permissions"
 						default="true">
 						<label id="edit">Edit</label>
 						<icon>edit</icon>
 					</link>
 					<link id="actions[2]" mode="intern"
-						target="/applications/update/1?form_action=delete-permission&amp;permissionid=2#tab_permissions">
+						target="/applications/update/1?form_action=delete-permission&amp;permissionid=1#tab_permissions">
 						<label id="delete">Delete</label>
 						<icon>delete</icon>
 						<confirmation id="permission.delete.confirm" params="#{name}">Do you really want to delete the permission
-							"do.that"?</confirmation>
+							"do.this"?</confirmation>
 					</link>
 				</linkpanel>
 			</result>
diff --git a/src/test/resources/xml/PermissionsTest-testUpdate-action.xml b/src/test/resources/xml/PermissionsTest-testUpdate-action.xml
index 3bfb1ab..cb6df44 100644
--- a/src/test/resources/xml/PermissionsTest-testUpdate-action.xml
+++ b/src/test/resources/xml/PermissionsTest-testUpdate-action.xml
@@ -12,9 +12,6 @@
 			<param name="permissionid">1</param>
 		</params>
 		<meta-data bindClass="org.appng.core.domain.PermissionImpl">
-			<field name="id" type="int" format="#" readonly="true" binding="id">
-				<label id="id">ID</label>
-			</field>
 			<field name="name" type="text" binding="name">
 				<label id="name">Name</label>
 				<validation>
@@ -22,8 +19,7 @@
 						<message ref="name" class="ERROR" code="{validation.notNull}">Field must not be empty</message>
 					</notNull>
 					<pattern regexp="[a-zA-Z0-9\-\.]{3,}">
-						<message ref="name" class="ERROR" code="{validation.permission}">Please enter a valid name, which may only consist of
-							letters,
+						<message ref="name" class="ERROR" code="{validation.permission}">Please enter a valid name, which may only consist of letters,
 							numbers, dots and hyphens</message>
 					</pattern>
 				</validation>
@@ -40,8 +36,7 @@
 	</config>
 	<condition expression="${form_action eq 'update-permission' and not empty appid and not empty permissionid}" />
 	<messages>
-		<message ref="update-permission" class="OK">Permission has been
-			updated.</message>
+		<message ref="update-permission" class="OK">Permission has been updated.</message>
 	</messages>
 	<datasource id="permission">
 		<params>
@@ -50,9 +45,6 @@
 	</datasource>
 	<data>
 		<result>
-			<field name="id" type="int">
-				<value>1</value>
-			</field>
 			<field name="name" type="text">
 				<value>do.somethingelse</value>
 			</field>
diff --git a/src/test/resources/xml/PlatformPropertiesTest-testShowAll.xml b/src/test/resources/xml/PlatformPropertiesTest-testShowAll.xml
index 1ed9832..8caad00 100644
--- a/src/test/resources/xml/PlatformPropertiesTest-testShowAll.xml
+++ b/src/test/resources/xml/PlatformPropertiesTest-testShowAll.xml
@@ -42,8 +42,7 @@
 				</permissions>
 				<label id="platform.reload">Reload platform</label>
 				<icon>reload</icon>
-				<confirmation id="platform.reload.confirm">Do you really want to reload the
-					platform?</confirmation>
+				<confirmation id="platform.reload.confirm">Do you really want to reload the platform?</confirmation>
 			</link>
 		</linkpanel>
 		<linkpanel id="actions" location="inline">
diff --git a/src/test/resources/xml/RepositoriesTest-testCreateRepositoryNameExists.xml b/src/test/resources/xml/RepositoriesTest-testCreateRepositoryNameExists.xml
index 7d2f336..0f299ed 100644
--- a/src/test/resources/xml/RepositoriesTest-testCreateRepositoryNameExists.xml
+++ b/src/test/resources/xml/RepositoriesTest-testCreateRepositoryNameExists.xml
@@ -20,8 +20,7 @@
 					</size>
 				</validation>
 				<messages ref="name">
-					<message ref="name" class="ERROR">A repository with this name
-						already exists!</message>
+					<message ref="name" class="ERROR">A repository with this name already exists!</message>
 				</messages>
 			</field>
 			<field name="description" type="text" binding="repository.description">
diff --git a/src/test/resources/xml/RepositoriesTest-testShowRepositories.xml b/src/test/resources/xml/RepositoriesTest-testShowRepositories.xml
index 57a3c84..3f7360e 100644
--- a/src/test/resources/xml/RepositoriesTest-testShowRepositories.xml
+++ b/src/test/resources/xml/RepositoriesTest-testShowRepositories.xml
@@ -7,27 +7,30 @@
 		</permissions>
 		<params />
 		<meta-data bindClass="org.appng.core.domain.RepositoryImpl">
-			<field name="id" type="text" readonly="true" binding="id">
-				<label id="id">ID</label>
-			</field>
 			<field name="name" type="text" binding="name">
+				<sort order="desc" prio="0" ignore-case="true" />
 				<label id="name">Name</label>
 			</field>
 			<field name="repositoryType" type="text" binding="repositoryType">
+				<sort />
 				<label id="type">Type</label>
 			</field>
 			<field name="repositoryMode" type="text" binding="repositoryMode">
+				<sort />
 				<label id="mode">Mode</label>
 			</field>
 			<field name="published" type="image" binding="published">
+				<sort />
 				<label id="published">Published</label>
 				<icon condition="${current.published}">led_orange</icon>
 				<icon condition="${not current.published}"></icon>
 			</field>
 			<field name="uri" type="text" displayLength="60" binding="uri">
+				<sort />
 				<label id="uri">URI</label>
 			</field>
 			<field name="active" type="image" binding="active">
+				<sort />
 				<label id="active">Active</label>
 				<icon condition="${current.active}">led_green</icon>
 				<icon condition="${not current.active}">led_red</icon>
@@ -46,14 +49,15 @@
 			</link>
 		</linkpanel>
 		<linkpanel id="actions" location="inline">
-			<link id="actions[1]" mode="intern" target="/repositories/update/#{id}#tab_update">
+			<link id="actions[1]" mode="intern" target="/repositories/update/${current.id}#tab_update">
 				<permissions>
 					<permission ref="repository.edit" mode="set"></permission>
 				</permissions>
 				<label id="edit">Edit</label>
 				<icon>edit</icon>
 			</link>
-			<link id="actions[2]" mode="intern" target="/repositories?form_action=delete-repository&amp;repositoryid=#{id}">
+			<link id="actions[2]" mode="intern"
+				target="/repositories?form_action=delete-repository&amp;repositoryid=${current.id}">
 				<permissions>
 					<permission ref="repository.delete" mode="set"></permission>
 				</permissions>
@@ -62,7 +66,7 @@
 				<confirmation id="repository.delete.confirm" params="#{name}">Do you really want to delete the repository
 					"#{name}"?</confirmation>
 			</link>
-			<link id="actions[3]" mode="intern" target="/repositories/installation/#{id}?form_action=reload">
+			<link id="actions[3]" mode="intern" target="/repositories/installation/${current.id}?form_action=reload">
 				<condition expression="${current.active}" />
 				<permissions>
 					<permission ref="repository.reload" mode="set"></permission>
@@ -72,7 +76,8 @@
 				<confirmation id="repository.reload.confirm" params="#{name}">Do you really want to reload the repository
 					"#{name}"?</confirmation>
 			</link>
-			<link id="actions[4]" mode="intern" target="/repositories/installation/#{id}#tab_packages" default="true">
+			<link id="actions[4]" mode="intern" target="/repositories/installation/${current.id}#tab_packages"
+				default="true">
 				<condition expression="${current.active}" />
 				<permissions>
 					<permission ref="repository.installation" mode="set"></permission>
@@ -86,9 +91,6 @@
 		<resultset chunk="0" chunkname="repositories" chunksize="10" nextchunk="0" previouschunk="0" firstchunk="0"
 			lastchunk="0" hits="2">
 			<result>
-				<field name="id" type="text">
-					<value>1</value>
-				</field>
 				<field name="name" type="text">
 					<value>Local</value>
 				</field>
@@ -123,9 +125,6 @@
 				</linkpanel>
 			</result>
 			<result>
-				<field name="id" type="text">
-					<value>3</value>
-				</field>
 				<field name="name" type="text">
 					<value>Delete me</value>
 				</field>
diff --git a/src/test/resources/xml/RepositoriesTest-testShowRepository.xml b/src/test/resources/xml/RepositoriesTest-testShowRepository.xml
index a291657..8fc7632 100644
--- a/src/test/resources/xml/RepositoriesTest-testShowRepository.xml
+++ b/src/test/resources/xml/RepositoriesTest-testShowRepository.xml
@@ -6,9 +6,6 @@
 			<param name="repositoryid">1</param>
 		</params>
 		<meta-data binding="repository" bindClass="org.appng.application.manager.form.RepositoryForm">
-			<field name="id" type="text" readonly="true" binding="repository.id">
-				<label id="id">ID</label>
-			</field>
 			<field name="name" type="text" binding="repository.name">
 				<label id="name">Name</label>
 			</field>
@@ -54,9 +51,6 @@
 			<option value="SNAPSHOT" name="Only Snapshot-Applications" selected="false" />
 		</selection>
 		<result>
-			<field name="id" type="text">
-				<value>1</value>
-			</field>
 			<field name="name" type="text">
 				<value>Local</value>
 			</field>
@@ -64,7 +58,7 @@
 				<value>local repo</value>
 			</field>
 			<field name="version" type="date">
-				<value>2019-05-15 10:10:44</value>
+				<value>2019-07-30 15:14:44</value>
 			</field>
 			<field name="uri" type="text">
 				<value>file:///home/mm/workspace/appng/appng-manager/target/</value>
diff --git a/src/test/resources/xml/RepositoriesTest-testUpdateRepository-action.xml b/src/test/resources/xml/RepositoriesTest-testUpdateRepository-action.xml
index 3936a95..885e343 100644
--- a/src/test/resources/xml/RepositoriesTest-testUpdateRepository-action.xml
+++ b/src/test/resources/xml/RepositoriesTest-testUpdateRepository-action.xml
@@ -10,9 +10,6 @@
 			<param name="form_action">update</param>
 		</params>
 		<meta-data binding="repository" bindClass="org.appng.application.manager.form.RepositoryForm">
-			<field name="id" type="text" readonly="true" binding="repository.id">
-				<label id="id">ID</label>
-			</field>
 			<field name="name" type="text" binding="repository.name">
 				<label id="name">Name</label>
 				<validation>
@@ -76,9 +73,6 @@
 			<option value="SNAPSHOT" name="Only Snapshot-Applications" selected="false" />
 		</selection>
 		<result>
-			<field name="id" type="text">
-				<value>1</value>
-			</field>
 			<field name="name" type="text">
 				<value>Local</value>
 			</field>
@@ -86,7 +80,7 @@
 				<value>local repo</value>
 			</field>
 			<field name="version" type="date">
-				<value>2019-05-15 10:10:44</value>
+				<value>2019-07-30 15:14:44</value>
 			</field>
 			<field name="uri" type="text">
 				<value>file:///home/mm/workspace/appng/appng-manager/target/</value>
diff --git a/src/test/resources/xml/RoleTest-testCreate-action.xml b/src/test/resources/xml/RoleTest-testCreate-action.xml
index 4cebdf6..3e58321 100644
--- a/src/test/resources/xml/RoleTest-testCreate-action.xml
+++ b/src/test/resources/xml/RoleTest-testCreate-action.xml
@@ -20,8 +20,7 @@
 						<message ref="role.name" class="ERROR" code="{validation.string.max}">Enter at most 64 characters</message>
 					</size>
 					<pattern regexp="([a-zA-Z0-9_\.-]{3,}[ ]*)+([a-zA-Z0-9_\.-][ ]*)+">
-						<message ref="role.name" class="ERROR" code="{validation.name}">Please enter a valid name, which may only consist of
-							letters,
+						<message ref="role.name" class="ERROR" code="{validation.name}">Please enter a valid name, which may only consist of letters,
 							numbers, spaces, dots, underscores and hyphens</message>
 					</pattern>
 				</validation>
diff --git a/src/test/resources/xml/RoleTest-testCreateNameExists.xml b/src/test/resources/xml/RoleTest-testCreateNameExists.xml
index 08a1886..0948bb7 100644
--- a/src/test/resources/xml/RoleTest-testCreateNameExists.xml
+++ b/src/test/resources/xml/RoleTest-testCreateNameExists.xml
@@ -20,14 +20,12 @@
 						<message ref="role.name" class="ERROR" code="{validation.string.max}">Enter at most 64 characters</message>
 					</size>
 					<pattern regexp="([a-zA-Z0-9_\.-]{3,}[ ]*)+([a-zA-Z0-9_\.-][ ]*)+">
-						<message ref="role.name" class="ERROR" code="{validation.name}">Please enter a valid name, which may only consist of
-							letters,
+						<message ref="role.name" class="ERROR" code="{validation.name}">Please enter a valid name, which may only consist of letters,
 							numbers, spaces, dots, underscores and hyphens</message>
 					</pattern>
 				</validation>
 				<messages ref="name">
-					<message ref="name" class="ERROR">A Role with this name already
-						exists.</message>
+					<message ref="name" class="ERROR">A Role with this name already exists.</message>
 				</messages>
 			</field>
 			<field name="description" type="text" binding="role.description">
diff --git a/src/test/resources/xml/RoleTest-testShowAll.xml b/src/test/resources/xml/RoleTest-testShowAll.xml
index e4ae538..08f0da6 100644
--- a/src/test/resources/xml/RoleTest-testShowAll.xml
+++ b/src/test/resources/xml/RoleTest-testShowAll.xml
@@ -10,11 +10,8 @@
 			<param name="roleid" />
 		</params>
 		<meta-data bindClass="org.appng.api.model.Role" result-selector="${current.id eq roleid}">
-			<field name="id" type="int" format="#" readonly="true" binding="id">
-				<label id="id">ID</label>
-			</field>
 			<field name="name" type="text" binding="name">
-				<sort order="asc" prio="0" />
+				<sort order="asc" prio="0" ignore-case="true" />
 				<label id="name">Name</label>
 			</field>
 			<field name="description" type="text" binding="description">
@@ -37,7 +34,8 @@
 			</link>
 		</linkpanel>
 		<linkpanel id="actions" location="inline">
-			<link id="actions[1]" mode="intern" target="/applications/update/1/role/update/#{id}#tab_roles" default="true">
+			<link id="actions[1]" mode="intern" target="/applications/update/1/role/update/${current.id}#tab_roles"
+				default="true">
 				<permissions>
 					<permission ref="role.edit" mode="set"></permission>
 				</permissions>
@@ -45,14 +43,13 @@
 				<icon>edit</icon>
 			</link>
 			<link id="actions[2]" mode="intern"
-				target="/applications/update/1?form_action=delete-role&amp;roleid=#{id}#tab_roles">
+				target="/applications/update/1?form_action=delete-role&amp;roleid=${current.id}#tab_roles">
 				<permissions>
 					<permission ref="role.delete" mode="set"></permission>
 				</permissions>
 				<label id="delete">Delete</label>
 				<icon>delete</icon>
-				<confirmation id="role.delete.confirm" params="#{name}">Do you
-					really want to delete the role "#{name}"?</confirmation>
+				<confirmation id="role.delete.confirm" params="#{name}">Do you really want to delete the role "#{name}"?</confirmation>
 			</link>
 		</linkpanel>
 	</config>
@@ -60,9 +57,6 @@
 		<resultset chunk="0" chunkname="roles" chunksize="10" nextchunk="0" previouschunk="0" firstchunk="0"
 			lastchunk="0" hits="1">
 			<result>
-				<field name="id" type="int">
-					<value>1</value>
-				</field>
 				<field name="name" type="text">
 					<value>role1</value>
 				</field>
diff --git a/src/test/resources/xml/RoleTest-testShowOne.xml b/src/test/resources/xml/RoleTest-testShowOne.xml
index 37db281..4e454c1 100644
--- a/src/test/resources/xml/RoleTest-testShowOne.xml
+++ b/src/test/resources/xml/RoleTest-testShowOne.xml
@@ -6,9 +6,6 @@
 			<param name="id">1</param>
 		</params>
 		<meta-data binding="role" bindClass="org.appng.application.manager.form.RoleForm">
-			<field name="id" type="int" format="#" readonly="true" binding="role.id">
-				<label id="id">ID</label>
-			</field>
 			<field name="name" type="text" binding="role.name">
 				<label id="name">Name</label>
 			</field>
@@ -30,9 +27,6 @@
 			</optionGroup>
 		</selection>
 		<result>
-			<field name="id" type="int">
-				<value>1</value>
-			</field>
 			<field name="name" type="text">
 				<value>role1</value>
 			</field>
diff --git a/src/test/resources/xml/RoleTest-testUpdate-action.xml b/src/test/resources/xml/RoleTest-testUpdate-action.xml
index f48f88d..c3f5c03 100644
--- a/src/test/resources/xml/RoleTest-testUpdate-action.xml
+++ b/src/test/resources/xml/RoleTest-testUpdate-action.xml
@@ -11,9 +11,6 @@
 			<param name="roleid">1</param>
 		</params>
 		<meta-data binding="role" bindClass="org.appng.application.manager.form.RoleForm">
-			<field name="id" type="int" format="#" readonly="true" binding="role.id">
-				<label id="id">ID</label>
-			</field>
 			<field name="name" type="text" binding="role.name">
 				<label id="name">Name</label>
 				<validation>
@@ -24,8 +21,7 @@
 						<message ref="role.name" class="ERROR" code="{validation.string.max}">Enter at most 64 characters</message>
 					</size>
 					<pattern regexp="([a-zA-Z0-9_\.-]{3,}[ ]*)+([a-zA-Z0-9_\.-][ ]*)+">
-						<message ref="role.name" class="ERROR" code="{validation.name}">Please enter a valid name, which may only consist of
-							letters,
+						<message ref="role.name" class="ERROR" code="{validation.name}">Please enter a valid name, which may only consist of letters,
 							numbers, spaces, dots, underscores and hyphens</message>
 					</pattern>
 				</validation>
@@ -62,9 +58,6 @@
 			</optionGroup>
 		</selection>
 		<result>
-			<field name="id" type="int">
-				<value>1</value>
-			</field>
 			<field name="name" type="text">
 				<value>role.updated</value>
 			</field>
diff --git a/src/test/resources/xml/SitesTest-testCreateSite-action.xml b/src/test/resources/xml/SitesTest-testCreateSite-action.xml
index 77a33bf..07a1e65 100644
--- a/src/test/resources/xml/SitesTest-testCreateSite-action.xml
+++ b/src/test/resources/xml/SitesTest-testCreateSite-action.xml
@@ -19,8 +19,7 @@
 						<message ref="site.name" class="ERROR" code="{validation.string.max}">Enter at most 64 characters</message>
 					</size>
 					<pattern regexp="[a-zA-Z0-9\-]{3,}">
-						<message ref="site.name" class="ERROR" code="{validation.nameStrict}">Please enter a valid name, which may only consist of
-							letters,
+						<message ref="site.name" class="ERROR" code="{validation.nameStrict}">Please enter a valid name, which may only consist of letters,
 							numbers and hyphens</message>
 					</pattern>
 				</validation>
diff --git a/src/test/resources/xml/SitesTest-testCreateSiteValidationFail.xml b/src/test/resources/xml/SitesTest-testCreateSiteValidationFail.xml
index 298d83c..fce1a4e 100644
--- a/src/test/resources/xml/SitesTest-testCreateSiteValidationFail.xml
+++ b/src/test/resources/xml/SitesTest-testCreateSiteValidationFail.xml
@@ -19,8 +19,7 @@
 						<message ref="site.name" class="ERROR" code="{validation.string.max}">Enter at most 64 characters</message>
 					</size>
 					<pattern regexp="[a-zA-Z0-9\-]{3,}">
-						<message ref="site.name" class="ERROR" code="{validation.nameStrict}">Please enter a valid name, which may only consist of
-							letters,
+						<message ref="site.name" class="ERROR" code="{validation.nameStrict}">Please enter a valid name, which may only consist of letters,
 							numbers and hyphens</message>
 					</pattern>
 				</validation>
diff --git a/src/test/resources/xml/SitesTest-testShowSite.xml b/src/test/resources/xml/SitesTest-testShowSite.xml
index 7770508..5e6a7ab 100644
--- a/src/test/resources/xml/SitesTest-testShowSite.xml
+++ b/src/test/resources/xml/SitesTest-testShowSite.xml
@@ -6,9 +6,6 @@
 			<param name="siteid">1</param>
 		</params>
 		<meta-data binding="site" bindClass="org.appng.application.manager.form.SiteForm">
-			<field name="id" type="int" format="#" readonly="true" binding="site.id">
-				<label id="id">ID</label>
-			</field>
 			<field name="name" type="text" readonly="true" binding="site.name">
 				<label id="name">Name</label>
 			</field>
@@ -34,9 +31,6 @@
 			<title id="template">Template</title>
 		</selection>
 		<result>
-			<field name="id" type="int">
-				<value>1</value>
-			</field>
 			<field name="name" type="text">
 				<value>localhost</value>
 			</field>
diff --git a/src/test/resources/xml/SitesTest-testShowSites.xml b/src/test/resources/xml/SitesTest-testShowSites.xml
index f72e1ce..64aea76 100644
--- a/src/test/resources/xml/SitesTest-testShowSites.xml
+++ b/src/test/resources/xml/SitesTest-testShowSites.xml
@@ -7,9 +7,6 @@
 		</permissions>
 		<params />
 		<meta-data bindClass="org.appng.api.model.Site">
-			<field name="id" type="int" format="#" hidden="true" binding="id">
-				<label id="id">ID</label>
-			</field>
 			<field name="name" type="text" binding="name">
 				<sort />
 				<label id="name">Name</label>
@@ -53,23 +50,22 @@
 			</link>
 		</linkpanel>
 		<linkpanel id="actions" location="inline">
-			<link id="actions[1]" mode="intern" target="/sites/update/#{id}" default="true">
+			<link id="actions[1]" mode="intern" target="/sites/update/${current.id}" default="true">
 				<permissions>
 					<permission ref="site.edit" mode="set"></permission>
 				</permissions>
 				<label id="edit">Edit</label>
 				<icon>edit</icon>
 			</link>
-			<link id="actions[2]" mode="intern" target="/sites?form_action=delete&amp;siteid=#{id}">
+			<link id="actions[2]" mode="intern" target="/sites?form_action=delete&amp;siteid=${current.id}">
 				<permissions>
 					<permission ref="site.delete" mode="set"></permission>
 				</permissions>
 				<label id="delete">Delete</label>
 				<icon>delete</icon>
-				<confirmation id="site.delete.confirm" params="#{name}">Do you
-					really want to delete the site "#{name}"?</confirmation>
+				<confirmation id="site.delete.confirm" params="#{name}">Do you really want to delete the site "#{name}"?</confirmation>
 			</link>
-			<link id="actions[3]" mode="intern" target="/sites?form_action=reload&amp;siteid=#{id}">
+			<link id="actions[3]" mode="intern" target="/sites?form_action=reload&amp;siteid=${current.id}">
 				<permissions>
 					<permission ref="site.reload" mode="set"></permission>
 				</permissions>
@@ -82,9 +78,6 @@
 		<resultset chunk="0" chunkname="sites" chunksize="10" nextchunk="0" previouschunk="0" firstchunk="0"
 			lastchunk="0" hits="2">
 			<result>
-				<field name="id" type="int">
-					<value>1</value>
-				</field>
 				<field name="name" type="text">
 					<value>localhost</value>
 				</field>
@@ -125,9 +118,6 @@
 				</linkpanel>
 			</result>
 			<result>
-				<field name="id" type="int">
-					<value>3</value>
-				</field>
 				<field name="name" type="text">
 					<value>site2</value>
 				</field>
diff --git a/src/test/resources/xml/SubjectsTest-testCreateNameExists.xml b/src/test/resources/xml/SubjectsTest-testCreateNameExists.xml
index b3610c1..161da9b 100644
--- a/src/test/resources/xml/SubjectsTest-testCreateNameExists.xml
+++ b/src/test/resources/xml/SubjectsTest-testCreateNameExists.xml
@@ -24,8 +24,7 @@
 					</pattern>
 				</validation>
 				<messages ref="name">
-					<message ref="name" class="ERROR">Another user with this username
-						already exists.</message>
+					<message ref="name" class="ERROR">Another user with this username already exists.</message>
 				</messages>
 			</field>
 			<field name="realname" type="text" binding="subject.realname">
diff --git a/src/test/resources/xml/SubjectsTest-testCreateValidationFail.xml b/src/test/resources/xml/SubjectsTest-testCreateValidationFail.xml
index e319f7d..49f1130 100644
--- a/src/test/resources/xml/SubjectsTest-testCreateValidationFail.xml
+++ b/src/test/resources/xml/SubjectsTest-testCreateValidationFail.xml
@@ -89,8 +89,7 @@
 			<field name="passwordConfirmation" type="password" binding="passwordConfirmation">
 				<label id="password.confirmation">Password confirmation</label>
 				<messages ref="passwordConfirmation">
-					<message ref="passwordConfirmation" class="ERROR">Please confirm
-						the password.</message>
+					<message ref="passwordConfirmation" class="ERROR">Please confirm the password.</message>
 				</messages>
 			</field>
 			<field name="groups" type="list:checkbox" binding="groupIds">
diff --git a/src/test/resources/xml/SubjectsTest-testShowAll.xml b/src/test/resources/xml/SubjectsTest-testShowAll.xml
index e6d58cc..dd1c8d8 100644
--- a/src/test/resources/xml/SubjectsTest-testShowAll.xml
+++ b/src/test/resources/xml/SubjectsTest-testShowAll.xml
@@ -9,9 +9,6 @@
 			<param name="userid" />
 		</params>
 		<meta-data bindClass="org.appng.api.model.Subject" result-selector="${current.id eq userid}">
-			<field name="id" type="int" format="#" binding="id">
-				<label id="id">ID</label>
-			</field>
 			<field name="name" type="text" binding="name">
 				<sort />
 				<label id="name">Name</label>
@@ -43,14 +40,14 @@
 			</link>
 		</linkpanel>
 		<linkpanel id="actions" location="inline">
-			<link id="actions[1]" mode="intern" target="/users/user/update/#{id}" default="true">
+			<link id="actions[1]" mode="intern" target="/users/user/update/${current.id}" default="true">
 				<permissions>
 					<permission ref="subject.edit" mode="set"></permission>
 				</permissions>
 				<label id="edit">Edit</label>
 				<icon>edit</icon>
 			</link>
-			<link id="actions[2]" mode="intern" target="/users?form_action=delete&amp;userid=#{id}">
+			<link id="actions[2]" mode="intern" target="/users?form_action=delete&amp;userid=${current.id}">
 				<permissions>
 					<permission ref="subject.delete" mode="set"></permission>
 				</permissions>
@@ -77,9 +74,6 @@
 		<resultset chunk="0" chunkname="users" chunksize="10" nextchunk="0" previouschunk="0" firstchunk="0"
 			lastchunk="0" hits="1">
 			<result>
-				<field name="id" type="int">
-					<value>1</value>
-				</field>
 				<field name="name" type="text">
 					<value>admin</value>
 				</field>
diff --git a/src/test/resources/xml/SubjectsTest-testShowOne.xml b/src/test/resources/xml/SubjectsTest-testShowOne.xml
index a4a6441..c176fcd 100644
--- a/src/test/resources/xml/SubjectsTest-testShowOne.xml
+++ b/src/test/resources/xml/SubjectsTest-testShowOne.xml
@@ -6,9 +6,6 @@
 			<param name="userid">1</param>
 		</params>
 		<meta-data binding="subject" bindClass="org.appng.application.manager.form.SubjectForm">
-			<field name="id" type="int" format="#" readonly="true" binding="subject.id">
-				<label id="id">ID</label>
-			</field>
 			<field name="name" type="text" readonly="true" binding="subject.name">
 				<label id="name">Name</label>
 			</field>
@@ -571,9 +568,6 @@
 			</optionGroup>
 		</selection>
 		<result>
-			<field name="id" type="int">
-				<value>1</value>
-			</field>
 			<field name="name" type="text">
 				<value>admin</value>
 			</field>
diff --git a/src/test/resources/xml/SubjectsTest-testUpdate-action.xml b/src/test/resources/xml/SubjectsTest-testUpdate-action.xml
index c888486..7c31df0 100644
--- a/src/test/resources/xml/SubjectsTest-testUpdate-action.xml
+++ b/src/test/resources/xml/SubjectsTest-testUpdate-action.xml
@@ -10,9 +10,6 @@
 			<param name="userid">1</param>
 		</params>
 		<meta-data binding="subject" bindClass="org.appng.application.manager.form.SubjectForm">
-			<field name="id" type="int" format="#" readonly="true" binding="subject.id">
-				<label id="id">ID</label>
-			</field>
 			<field name="name" type="text" readonly="true" binding="subject.name">
 				<label id="name">Name</label>
 			</field>
@@ -610,9 +607,6 @@
 			</optionGroup>
 		</selection>
 		<result>
-			<field name="id" type="int">
-				<value>1</value>
-			</field>
 			<field name="name" type="text">
 				<value>admin</value>
 			</field>