From 8287a4a59db7ed8ac747c53e29e4b41b85c9b02d Mon Sep 17 00:00:00 2001
From: Robert von Burg <eitch@eitchnet.ch>
Date: Wed, 13 Aug 2014 16:06:18 +0200
Subject: [PATCH] [Major] Refactored StrolchConfiguration.xml to use
 environments

Now the agent requires an environment parameter to start, and the
configuration of that environment is used to load different sections of
the configuration file
---
 .../config/StrolchConfiguration.xml           | 114 +++++++++---------
 1 file changed, 58 insertions(+), 56 deletions(-)

diff --git a/src/test/resources/withPrivilegeRuntime/config/StrolchConfiguration.xml b/src/test/resources/withPrivilegeRuntime/config/StrolchConfiguration.xml
index 43e810db5..9f67f4571 100644
--- a/src/test/resources/withPrivilegeRuntime/config/StrolchConfiguration.xml
+++ b/src/test/resources/withPrivilegeRuntime/config/StrolchConfiguration.xml
@@ -1,60 +1,62 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <StrolchConfiguration>
-	<Runtime>
-		<applicationName>StrolchPersistenceTest</applicationName>
-		<Properties>
-			<verbose>true</verbose>
-		</Properties>
-	</Runtime>
-	<Component>
-		<name>RealmHandler</name>
-		<api>li.strolch.agent.api.RealmHandler</api>
-		<impl>li.strolch.agent.impl.DefaultRealmHandler</impl>
-		<Properties>
-			<dataStoreMode>TRANSIENT</dataStoreMode>
-			<dataStoreFile>StrolchModel.xml</dataStoreFile>
-		</Properties>
-	</Component>
-	<Component>
-		<name>ServiceHandler</name>
-		<api>li.strolch.service.api.ServiceHandler</api>
-		<impl>li.strolch.service.api.DefaultServiceHandler</impl>
-		<Properties>
-			<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>RestfulHandler</name>
-		<api>li.strolch.rest.RestfulStrolchComponent</api>
-		<impl>li.strolch.rest.RestfulStrolchComponent</impl>
-		<Properties>
-		</Properties>
-	</Component>
-	<Component>
-		<name>SessionHandler</name>
-		<api>li.strolch.rest.StrolchSessionHandler</api>
-		<impl>li.strolch.rest.DefaultStrolchSessionHandler</impl>
-		<Properties>
-			<rememberUser>true</rememberUser>
-		</Properties>
-	</Component>
+	<env id="dev">
+		<Runtime>
+			<applicationName>StrolchPersistenceTest</applicationName>
+			<Properties>
+				<verbose>true</verbose>
+			</Properties>
+		</Runtime>
 		<Component>
-		<name>EnumHandler</name>
-		<api>li.strolch.runtime.query.enums.EnumHandler</api>
-		<impl>li.strolch.runtime.query.enums.DefaultEnumHandler</impl>
-		<depends>RealmHandler</depends>
-		<Properties>
-			<realm>defaultRealm</realm>
-			<salutation>Resource/Enumeration/salutation</salutation>
-			<sex>Resource/Enumeration/sex</sex>
-		</Properties>
-	</Component>
+			<name>RealmHandler</name>
+			<api>li.strolch.agent.api.RealmHandler</api>
+			<impl>li.strolch.agent.impl.DefaultRealmHandler</impl>
+			<Properties>
+				<dataStoreMode>TRANSIENT</dataStoreMode>
+				<dataStoreFile>StrolchModel.xml</dataStoreFile>
+			</Properties>
+		</Component>
+		<Component>
+			<name>ServiceHandler</name>
+			<api>li.strolch.service.api.ServiceHandler</api>
+			<impl>li.strolch.service.api.DefaultServiceHandler</impl>
+			<Properties>
+				<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>RestfulHandler</name>
+			<api>li.strolch.rest.RestfulStrolchComponent</api>
+			<impl>li.strolch.rest.RestfulStrolchComponent</impl>
+			<Properties>
+			</Properties>
+		</Component>
+		<Component>
+			<name>SessionHandler</name>
+			<api>li.strolch.rest.StrolchSessionHandler</api>
+			<impl>li.strolch.rest.DefaultStrolchSessionHandler</impl>
+			<Properties>
+				<rememberUser>true</rememberUser>
+			</Properties>
+		</Component>
+		<Component>
+			<name>EnumHandler</name>
+			<api>li.strolch.runtime.query.enums.EnumHandler</api>
+			<impl>li.strolch.runtime.query.enums.DefaultEnumHandler</impl>
+			<depends>RealmHandler</depends>
+			<Properties>
+				<realm>defaultRealm</realm>
+				<salutation>Resource/Enumeration/salutation</salutation>
+				<sex>Resource/Enumeration/sex</sex>
+			</Properties>
+		</Component>
+	</env>
 </StrolchConfiguration>
\ No newline at end of file