From 9a776d462d4c510df9ef1b15fde142f81cf2ccd6 Mon Sep 17 00:00:00 2001
From: Robert von Burg <eitch@eitchnet.ch>
Date: Sat, 23 Aug 2014 20:50:32 +0200
Subject: [PATCH] [New] Implemented opt-in audit trail in Strolch The audit
 trail has its own map on the Realm and a trail is written by realm at the end
 of the transaction.

You can write your own audit trail using tx.getAuditTrail().

Enable the audit trail by setting the realm configuration value
'enableAuditTrail'.
---
 .../runtime/config/PrivilegeModel.xml         | 21 ++++++++++++++-----
 .../runtime/config/StrolchConfiguration.xml   | 17 ++++++++-------
 src/runtime/config/PrivilegeModel.xml         | 21 ++++++++++++++-----
 src/runtime/config/StrolchConfiguration.xml   | 17 ++++++++-------
 4 files changed, 50 insertions(+), 26 deletions(-)

diff --git a/src/main/resources/runtime/config/PrivilegeModel.xml b/src/main/resources/runtime/config/PrivilegeModel.xml
index 848bbe71d..59dc7507f 100644
--- a/src/main/resources/runtime/config/PrivilegeModel.xml
+++ b/src/main/resources/runtime/config/PrivilegeModel.xml
@@ -2,10 +2,15 @@
 <UsersAndRoles>
 
 	<Users>
-
+		<User userId="0" username="agent">
+			<State>SYSTEM</State>
+			<Roles>
+				<Role>agent</Role>
+			</Roles>
+		</User>
 		<User userId="1" username="admin" password="8c6976e5b5410415bde908bd4dee15dfb167a9c873fc4bb8a81f6f2ab448a918">
 			<Firstname>Application</Firstname>
-			<Surname>Administrator</Surname>
+			<Lastname>Administrator</Lastname>
 			<State>ENABLED</State>
 			<Locale>en_GB</Locale>
 			<Roles>
@@ -20,7 +25,7 @@
 
 		<User userId="2" username="bob" password="81b637d8fcd2c6da6359e6963113a1170de795e4b725b84d1e0b4cfd9ec58ce9">
 			<Firstname>Bob</Firstname>
-			<Surname>Bernstein</Surname>
+			<Lastname>Bernstein</Lastname>
 			<State>ENABLED</State>
 			<Locale>en_GB</Locale>
 			<Roles>
@@ -30,7 +35,7 @@
 		</User>
 		<User userId="3" username="jill" password="8cf37351b60f00084392043ce2e6256b96cea92949f90c7abce464cf164fbfa6">
 			<Firstname>Jill</Firstname>
-			<Surname>Johnson</Surname>
+			<Lastname>Johnson</Lastname>
 			<State>ENABLED</State>
 			<Locale>en_GB</Locale>
 			<Roles>
@@ -40,7 +45,7 @@
 		</User>
 		<User userId="4" username="sysAdmin" password="8cffb494ef5ff3f74a571206e141d4fb84f833e431b98c8b3be43727c4cbddc1">
 			<Firstname>System User</Firstname>
-			<Surname>Administrator</Surname>
+			<Lastname>Administrator</Lastname>
 			<State>SYSTEM</State>
 			<Locale>en_GB</Locale>
 			<Roles>
@@ -55,6 +60,12 @@
 
 		<Role name="PrivilegeAdmin" />
 
+		<Role name="agent">
+			<Privilege name="li.strolch.agent.impl.StartRealms" policy="DefaultPrivilege">
+				<AllAllowed>true</AllAllowed>
+			</Privilege>
+		</Role>
+
 		<Role name="AppUser">
 			<Privilege name="li.strolch.service.api.Service" policy="DefaultPrivilege">
 				<AllAllowed>true</AllAllowed>
diff --git a/src/main/resources/runtime/config/StrolchConfiguration.xml b/src/main/resources/runtime/config/StrolchConfiguration.xml
index 7e67e0222..199e015ce 100644
--- a/src/main/resources/runtime/config/StrolchConfiguration.xml
+++ b/src/main/resources/runtime/config/StrolchConfiguration.xml
@@ -7,10 +7,19 @@
 				<verbose>true</verbose>
 			</Properties>
 		</Runtime>
+		<Component>
+			<name>PrivilegeHandler</name>
+			<api>li.strolch.runtime.privilege.PrivilegeHandler</api>
+			<impl>li.strolch.runtime.privilege.DefaultStrolchPrivilegeHandler</impl>
+			<Properties>
+				<privilegeConfigFile>PrivilegeConfig.xml</privilegeConfigFile>
+			</Properties>
+		</Component>
 		<Component>
 			<name>RealmHandler</name>
 			<api>li.strolch.agent.api.RealmHandler</api>
 			<impl>li.strolch.agent.impl.DefaultRealmHandler</impl>
+			<depends>PrivilegeHandler</depends>
 			<depends>PersistenceHandler</depends>
 			<Properties>
 				<dataStoreMode>TRANSIENT</dataStoreMode>
@@ -27,14 +36,6 @@
 				<verbose>true</verbose>
 			</Properties>
 		</Component>
-		<Component>
-			<name>PrivilegeHandler</name>
-			<api>li.strolch.runtime.privilege.StrolchPrivilegeHandler</api>
-			<impl>li.strolch.runtime.privilege.DefaultStrolchPrivilegeHandler</impl>
-			<Properties>
-				<privilegeConfigFile>PrivilegeConfig.xml</privilegeConfigFile>
-			</Properties>
-		</Component>
 		<Component>
 			<name>PostInitializer</name>
 			<api>li.strolch.agent.api.PostInitializer</api>
diff --git a/src/runtime/config/PrivilegeModel.xml b/src/runtime/config/PrivilegeModel.xml
index 848bbe71d..59dc7507f 100644
--- a/src/runtime/config/PrivilegeModel.xml
+++ b/src/runtime/config/PrivilegeModel.xml
@@ -2,10 +2,15 @@
 <UsersAndRoles>
 
 	<Users>
-
+		<User userId="0" username="agent">
+			<State>SYSTEM</State>
+			<Roles>
+				<Role>agent</Role>
+			</Roles>
+		</User>
 		<User userId="1" username="admin" password="8c6976e5b5410415bde908bd4dee15dfb167a9c873fc4bb8a81f6f2ab448a918">
 			<Firstname>Application</Firstname>
-			<Surname>Administrator</Surname>
+			<Lastname>Administrator</Lastname>
 			<State>ENABLED</State>
 			<Locale>en_GB</Locale>
 			<Roles>
@@ -20,7 +25,7 @@
 
 		<User userId="2" username="bob" password="81b637d8fcd2c6da6359e6963113a1170de795e4b725b84d1e0b4cfd9ec58ce9">
 			<Firstname>Bob</Firstname>
-			<Surname>Bernstein</Surname>
+			<Lastname>Bernstein</Lastname>
 			<State>ENABLED</State>
 			<Locale>en_GB</Locale>
 			<Roles>
@@ -30,7 +35,7 @@
 		</User>
 		<User userId="3" username="jill" password="8cf37351b60f00084392043ce2e6256b96cea92949f90c7abce464cf164fbfa6">
 			<Firstname>Jill</Firstname>
-			<Surname>Johnson</Surname>
+			<Lastname>Johnson</Lastname>
 			<State>ENABLED</State>
 			<Locale>en_GB</Locale>
 			<Roles>
@@ -40,7 +45,7 @@
 		</User>
 		<User userId="4" username="sysAdmin" password="8cffb494ef5ff3f74a571206e141d4fb84f833e431b98c8b3be43727c4cbddc1">
 			<Firstname>System User</Firstname>
-			<Surname>Administrator</Surname>
+			<Lastname>Administrator</Lastname>
 			<State>SYSTEM</State>
 			<Locale>en_GB</Locale>
 			<Roles>
@@ -55,6 +60,12 @@
 
 		<Role name="PrivilegeAdmin" />
 
+		<Role name="agent">
+			<Privilege name="li.strolch.agent.impl.StartRealms" policy="DefaultPrivilege">
+				<AllAllowed>true</AllAllowed>
+			</Privilege>
+		</Role>
+
 		<Role name="AppUser">
 			<Privilege name="li.strolch.service.api.Service" policy="DefaultPrivilege">
 				<AllAllowed>true</AllAllowed>
diff --git a/src/runtime/config/StrolchConfiguration.xml b/src/runtime/config/StrolchConfiguration.xml
index 9cecca2fd..e19aaeac7 100644
--- a/src/runtime/config/StrolchConfiguration.xml
+++ b/src/runtime/config/StrolchConfiguration.xml
@@ -7,10 +7,19 @@
 				<verbose>true</verbose>
 			</Properties>
 		</Runtime>
+		<Component>
+			<name>PrivilegeHandler</name>
+			<api>li.strolch.runtime.privilege.PrivilegeHandler</api>
+			<impl>li.strolch.runtime.privilege.DefaultStrolchPrivilegeHandler</impl>
+			<Properties>
+				<privilegeConfigFile>PrivilegeConfig.xml</privilegeConfigFile>
+			</Properties>
+		</Component>
 		<Component>
 			<name>RealmHandler</name>
 			<api>li.strolch.agent.api.RealmHandler</api>
 			<impl>li.strolch.agent.impl.DefaultRealmHandler</impl>
+			<depends>PrivilegeHandler</depends>
 			<depends>PersistenceHandler</depends>
 			<Properties>
 				<dataStoreMode>TRANSIENT</dataStoreMode>
@@ -25,14 +34,6 @@
 				<verbose>true</verbose>
 			</Properties>
 		</Component>
-		<Component>
-			<name>PrivilegeHandler</name>
-			<api>li.strolch.runtime.privilege.StrolchPrivilegeHandler</api>
-			<impl>li.strolch.runtime.privilege.DefaultStrolchPrivilegeHandler</impl>
-			<Properties>
-				<privilegeConfigFile>PrivilegeConfig.xml</privilegeConfigFile>
-			</Properties>
-		</Component>
 		<Component>
 			<name>PostInitializer</name>
 			<api>li.strolch.agent.api.PostInitializer</api>