From 0b68acc80308e11fa71eeeb4c3826fec0d5ca058 Mon Sep 17 00:00:00 2001
From: Robert von Burg <eitch@eitchnet.ch>
Date: Wed, 13 Aug 2014 16:06:09 +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           | 66 ++++++++--------
 .../realmtest/config/StrolchConfiguration.xml | 76 ++++++++++---------
 .../config/StrolchConfiguration.xml           | 66 ++++++++--------
 3 files changed, 107 insertions(+), 101 deletions(-)

diff --git a/src/test/resources/cachedruntime/config/StrolchConfiguration.xml b/src/test/resources/cachedruntime/config/StrolchConfiguration.xml
index f234cea30..b030e7899 100644
--- a/src/test/resources/cachedruntime/config/StrolchConfiguration.xml
+++ b/src/test/resources/cachedruntime/config/StrolchConfiguration.xml
@@ -1,35 +1,37 @@
 <?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>
-		<depends>PersistenceHandler</depends>
-		<Properties>
-			<dataStoreMode>TRANSACTIONAL</dataStoreMode>
-		</Properties>
-	</Component>
-	<Component>
-		<name>PersistenceHandler</name>
-		<api>li.strolch.persistence.api.PersistenceHandler</api>
-		<impl>li.strolch.persistence.postgresql.PostgreSqlPersistenceHandler</impl>
-		<Properties>
-			<allowSchemaCreation>true</allowSchemaCreation>
-			<allowSchemaDrop>true</allowSchemaDrop>
-			<db.url>jdbc:postgresql://localhost/testdb</db.url>
-			<db.username>testuser</db.username>
-			<db.password>test</db.password>
-		</Properties>
-	</Component>
-	<Component>
-		<name>ObserverHandler</name>
-		<api>li.strolch.runtime.observer.ObserverHandler</api>
-		<impl>li.strolch.runtime.observer.DefaultObserverHandler</impl>
-	</Component>
+	<env id="dev">
+		<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>
+			<depends>PersistenceHandler</depends>
+			<Properties>
+				<dataStoreMode>TRANSACTIONAL</dataStoreMode>
+			</Properties>
+		</Component>
+		<Component>
+			<name>PersistenceHandler</name>
+			<api>li.strolch.persistence.api.PersistenceHandler</api>
+			<impl>li.strolch.persistence.postgresql.PostgreSqlPersistenceHandler</impl>
+			<Properties>
+				<allowSchemaCreation>true</allowSchemaCreation>
+				<allowSchemaDrop>true</allowSchemaDrop>
+				<db.url>jdbc:postgresql://localhost/testdb</db.url>
+				<db.username>testuser</db.username>
+				<db.password>test</db.password>
+			</Properties>
+		</Component>
+		<Component>
+			<name>ObserverHandler</name>
+			<api>li.strolch.runtime.observer.ObserverHandler</api>
+			<impl>li.strolch.runtime.observer.DefaultObserverHandler</impl>
+		</Component>
+	</env>
 </StrolchConfiguration>
\ No newline at end of file
diff --git a/src/test/resources/realmtest/config/StrolchConfiguration.xml b/src/test/resources/realmtest/config/StrolchConfiguration.xml
index 617535181..6367afe64 100644
--- a/src/test/resources/realmtest/config/StrolchConfiguration.xml
+++ b/src/test/resources/realmtest/config/StrolchConfiguration.xml
@@ -1,42 +1,44 @@
 <?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>
-		<depends>PersistenceHandler</depends>
-		<Properties>
-			<realms>first, second</realms>
-			<dataStoreMode.first>TRANSACTIONAL</dataStoreMode.first>
-			<dataStoreMode.second>TRANSACTIONAL</dataStoreMode.second>
-		</Properties>
-	</Component>
-	<Component>
-		<name>PersistenceHandler</name>
-		<api>li.strolch.persistence.api.PersistenceHandler</api>
-		<impl>li.strolch.persistence.postgresql.PostgreSqlPersistenceHandler</impl>
-		<Properties>
-			<allowSchemaCreation>true</allowSchemaCreation>
-			<allowSchemaDrop>true</allowSchemaDrop>
+	<env id="dev">
+		<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>
+			<depends>PersistenceHandler</depends>
+			<Properties>
+				<realms>first, second</realms>
+				<dataStoreMode.first>TRANSACTIONAL</dataStoreMode.first>
+				<dataStoreMode.second>TRANSACTIONAL</dataStoreMode.second>
+			</Properties>
+		</Component>
+		<Component>
+			<name>PersistenceHandler</name>
+			<api>li.strolch.persistence.api.PersistenceHandler</api>
+			<impl>li.strolch.persistence.postgresql.PostgreSqlPersistenceHandler</impl>
+			<Properties>
+				<allowSchemaCreation>true</allowSchemaCreation>
+				<allowSchemaDrop>true</allowSchemaDrop>
 
-			<db.url.first>jdbc:postgresql://localhost/testdb1</db.url.first>
-			<db.username.first>testuser1</db.username.first>
-			<db.password.first>test</db.password.first>
+				<db.url.first>jdbc:postgresql://localhost/testdb1</db.url.first>
+				<db.username.first>testuser1</db.username.first>
+				<db.password.first>test</db.password.first>
 
-			<db.url.second>jdbc:postgresql://localhost/testdb2</db.url.second>
-			<db.username.second>testuser2</db.username.second>
-			<db.password.second>test</db.password.second>
-		</Properties>
-	</Component>
-	<Component>
-		<name>ObserverHandler</name>
-		<api>li.strolch.runtime.observer.ObserverHandler</api>
-		<impl>li.strolch.runtime.observer.DefaultObserverHandler</impl>
-	</Component>
+				<db.url.second>jdbc:postgresql://localhost/testdb2</db.url.second>
+				<db.username.second>testuser2</db.username.second>
+				<db.password.second>test</db.password.second>
+			</Properties>
+		</Component>
+		<Component>
+			<name>ObserverHandler</name>
+			<api>li.strolch.runtime.observer.ObserverHandler</api>
+			<impl>li.strolch.runtime.observer.DefaultObserverHandler</impl>
+		</Component>
+	</env>
 </StrolchConfiguration>
\ No newline at end of file
diff --git a/src/test/resources/transactionalruntime/config/StrolchConfiguration.xml b/src/test/resources/transactionalruntime/config/StrolchConfiguration.xml
index f234cea30..b030e7899 100644
--- a/src/test/resources/transactionalruntime/config/StrolchConfiguration.xml
+++ b/src/test/resources/transactionalruntime/config/StrolchConfiguration.xml
@@ -1,35 +1,37 @@
 <?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>
-		<depends>PersistenceHandler</depends>
-		<Properties>
-			<dataStoreMode>TRANSACTIONAL</dataStoreMode>
-		</Properties>
-	</Component>
-	<Component>
-		<name>PersistenceHandler</name>
-		<api>li.strolch.persistence.api.PersistenceHandler</api>
-		<impl>li.strolch.persistence.postgresql.PostgreSqlPersistenceHandler</impl>
-		<Properties>
-			<allowSchemaCreation>true</allowSchemaCreation>
-			<allowSchemaDrop>true</allowSchemaDrop>
-			<db.url>jdbc:postgresql://localhost/testdb</db.url>
-			<db.username>testuser</db.username>
-			<db.password>test</db.password>
-		</Properties>
-	</Component>
-	<Component>
-		<name>ObserverHandler</name>
-		<api>li.strolch.runtime.observer.ObserverHandler</api>
-		<impl>li.strolch.runtime.observer.DefaultObserverHandler</impl>
-	</Component>
+	<env id="dev">
+		<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>
+			<depends>PersistenceHandler</depends>
+			<Properties>
+				<dataStoreMode>TRANSACTIONAL</dataStoreMode>
+			</Properties>
+		</Component>
+		<Component>
+			<name>PersistenceHandler</name>
+			<api>li.strolch.persistence.api.PersistenceHandler</api>
+			<impl>li.strolch.persistence.postgresql.PostgreSqlPersistenceHandler</impl>
+			<Properties>
+				<allowSchemaCreation>true</allowSchemaCreation>
+				<allowSchemaDrop>true</allowSchemaDrop>
+				<db.url>jdbc:postgresql://localhost/testdb</db.url>
+				<db.username>testuser</db.username>
+				<db.password>test</db.password>
+			</Properties>
+		</Component>
+		<Component>
+			<name>ObserverHandler</name>
+			<api>li.strolch.runtime.observer.ObserverHandler</api>
+			<impl>li.strolch.runtime.observer.DefaultObserverHandler</impl>
+		</Component>
+	</env>
 </StrolchConfiguration>
\ No newline at end of file