From 8d37337936b5b7f56b3c1f3716ebd694bd5c99d8 Mon Sep 17 00:00:00 2001
From: Robert von Burg <eitch@eitchnet.ch>
Date: Wed, 13 Aug 2014 16:07:13 +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
---
 .../runtime/config/StrolchConfiguration.xml   | 126 +++++++++---------
 src/runtime/config/StrolchConfiguration.xml   |  98 +++++++-------
 2 files changed, 114 insertions(+), 110 deletions(-)

diff --git a/src/main/resources/runtime/config/StrolchConfiguration.xml b/src/main/resources/runtime/config/StrolchConfiguration.xml
index b32c1c170..7e67e0222 100644
--- a/src/main/resources/runtime/config/StrolchConfiguration.xml
+++ b/src/main/resources/runtime/config/StrolchConfiguration.xml
@@ -1,65 +1,67 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <StrolchConfiguration>
-	<Runtime>
-		<applicationName>StrolchTutorialApp</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>
-		<depends>PersistenceHandler</depends>
-		<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>
-		<depends>RealmHandler</depends>
-		<depends>PrivilegeHandler</depends>
-		<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>PostInitializer</name>
-		<api>li.strolch.agent.api.PostInitializer</api>
-		<impl>li.strolch.tutorialapp.postinitializer.PostInitializer</impl>
-		<depends>ServiceHandler</depends>
-		<Properties>
-		</Properties>
-	</Component>
-	<Component>
-		<name>PersistenceHandler</name>
-		<api>li.strolch.persistence.api.PersistenceHandler</api>
-		<impl>li.strolch.persistence.xml.XmlPersistenceHandler</impl>
-		<Properties>
-			<verbose>true</verbose>
-		</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>
-			<salutations>Resource/Enumeration/salutations</salutations>
-			<sex>Resource/Enumeration/sex</sex>
-			<religions>Resource/Enumeration/religions</religions>
-		</Properties>
-	</Component>
+	<env id="dev">
+		<Runtime>
+			<applicationName>StrolchTutorialApp</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>
+			<depends>PersistenceHandler</depends>
+			<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>
+			<depends>RealmHandler</depends>
+			<depends>PrivilegeHandler</depends>
+			<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>PostInitializer</name>
+			<api>li.strolch.agent.api.PostInitializer</api>
+			<impl>li.strolch.tutorialapp.postinitializer.PostInitializer</impl>
+			<depends>ServiceHandler</depends>
+			<Properties>
+			</Properties>
+		</Component>
+		<Component>
+			<name>PersistenceHandler</name>
+			<api>li.strolch.persistence.api.PersistenceHandler</api>
+			<impl>li.strolch.persistence.xml.XmlPersistenceHandler</impl>
+			<Properties>
+				<verbose>true</verbose>
+			</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>
+				<salutations>Resource/Enumeration/salutations</salutations>
+				<sex>Resource/Enumeration/sex</sex>
+				<religions>Resource/Enumeration/religions</religions>
+			</Properties>
+		</Component>
+	</env>
 </StrolchConfiguration>
diff --git a/src/runtime/config/StrolchConfiguration.xml b/src/runtime/config/StrolchConfiguration.xml
index 7b3535608..9cecca2fd 100644
--- a/src/runtime/config/StrolchConfiguration.xml
+++ b/src/runtime/config/StrolchConfiguration.xml
@@ -1,51 +1,53 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <StrolchConfiguration>
-	<Runtime>
-		<applicationName>StrolchTutorialApp</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>
-		<depends>PersistenceHandler</depends>
-		<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>PostInitializer</name>
-		<api>li.strolch.agent.api.PostInitializer</api>
-		<impl>li.strolch.tutorialapp.postinitializer.PostInitializer</impl>
-		<depends>ServiceHandler</depends>
-		<Properties>
-		</Properties>
-	</Component>
-	<Component>
-		<name>PersistenceHandler</name>
-		<api>li.strolch.persistence.api.PersistenceHandler</api>
-		<impl>li.strolch.persistence.xml.XmlPersistenceHandler</impl>
-		<Properties>
-			<verbose>true</verbose>
-		</Properties>
-	</Component>
+	<env id="dev">
+		<Runtime>
+			<applicationName>StrolchTutorialApp</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>
+			<depends>PersistenceHandler</depends>
+			<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>PostInitializer</name>
+			<api>li.strolch.agent.api.PostInitializer</api>
+			<impl>li.strolch.tutorialapp.postinitializer.PostInitializer</impl>
+			<depends>ServiceHandler</depends>
+			<Properties>
+			</Properties>
+		</Component>
+		<Component>
+			<name>PersistenceHandler</name>
+			<api>li.strolch.persistence.api.PersistenceHandler</api>
+			<impl>li.strolch.persistence.xml.XmlPersistenceHandler</impl>
+			<Properties>
+				<verbose>true</verbose>
+			</Properties>
+		</Component>
+	</env>
 </StrolchConfiguration>