From 2033c6b942991605f172263e8023575c1e533f3b Mon Sep 17 00:00:00 2001
From: Robert von Burg <eitch@eitchnet.ch>
Date: Wed, 13 Aug 2014 16:06:23 +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
---
 .../svctest/config/StrolchConfiguration.xml   | 98 ++++++++++---------
 .../config/StrolchConfiguration.xml           | 52 +++++-----
 .../config/StrolchConfiguration.xml           | 64 ++++++------
 .../config/StrolchConfiguration.xml           | 46 ++++-----
 4 files changed, 134 insertions(+), 126 deletions(-)

diff --git a/src/test/resources/svctest/config/StrolchConfiguration.xml b/src/test/resources/svctest/config/StrolchConfiguration.xml
index 85ca1805d..32aa61182 100644
--- a/src/test/resources/svctest/config/StrolchConfiguration.xml
+++ b/src/test/resources/svctest/config/StrolchConfiguration.xml
@@ -1,59 +1,61 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <StrolchConfiguration>
-	<Runtime>
-		<applicationName>StrolchRuntimeTest</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>svcTransient, svcCached, svcTransactional</realms>
+	<env id="dev">
+		<Runtime>
+			<applicationName>StrolchRuntimeTest</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>svcTransient, svcCached, svcTransactional</realms>
 
-			<tryLockTimeUnit.svcTransient>SECONDS</tryLockTimeUnit.svcTransient>
-			<tryLockTime.svcTransient>1</tryLockTime.svcTransient>
-			<dataStoreMode.svcTransient>TRANSIENT</dataStoreMode.svcTransient>
-			<dataStoreFile.svcTransient>StrolchModel.xml</dataStoreFile.svcTransient>
+				<tryLockTimeUnit.svcTransient>SECONDS</tryLockTimeUnit.svcTransient>
+				<tryLockTime.svcTransient>1</tryLockTime.svcTransient>
+				<dataStoreMode.svcTransient>TRANSIENT</dataStoreMode.svcTransient>
+				<dataStoreFile.svcTransient>StrolchModel.xml</dataStoreFile.svcTransient>
 
-			<tryLockTimeUnit.svcCached>SECONDS</tryLockTimeUnit.svcCached>
-			<tryLockTime.svcCached>1</tryLockTime.svcCached>
-			<dataStoreMode.svcCached>CACHED</dataStoreMode.svcCached>
+				<tryLockTimeUnit.svcCached>SECONDS</tryLockTimeUnit.svcCached>
+				<tryLockTime.svcCached>1</tryLockTime.svcCached>
+				<dataStoreMode.svcCached>CACHED</dataStoreMode.svcCached>
 
-			<tryLockTimeUnit.svcTransactional>SECONDS</tryLockTimeUnit.svcTransactional>
-			<tryLockTime.svcTransactional>1</tryLockTime.svcTransactional>
-			<dataStoreMode.svcTransactional>TRANSACTIONAL</dataStoreMode.svcTransactional>
-		</Properties>
-	</Component>
+				<tryLockTimeUnit.svcTransactional>SECONDS</tryLockTimeUnit.svcTransactional>
+				<tryLockTime.svcTransactional>1</tryLockTime.svcTransactional>
+				<dataStoreMode.svcTransactional>TRANSACTIONAL</dataStoreMode.svcTransactional>
+			</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>
+		<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.svcCached>jdbc:postgresql://localhost/cacheduserdb</db.url.svcCached>
-			<db.username.svcCached>cacheduser</db.username.svcCached>
-			<db.password.svcCached>test</db.password.svcCached>
+				<db.url.svcCached>jdbc:postgresql://localhost/cacheduserdb</db.url.svcCached>
+				<db.username.svcCached>cacheduser</db.username.svcCached>
+				<db.password.svcCached>test</db.password.svcCached>
 
-			<db.url.svcTransactional>jdbc:postgresql://localhost/transactionaluserdb</db.url.svcTransactional>
-			<db.username.svcTransactional>transactionaluser</db.username.svcTransactional>
-			<db.password.svcTransactional>test</db.password.svcTransactional>
+				<db.url.svcTransactional>jdbc:postgresql://localhost/transactionaluserdb</db.url.svcTransactional>
+				<db.username.svcTransactional>transactionaluser</db.username.svcTransactional>
+				<db.password.svcTransactional>test</db.password.svcTransactional>
 
-		</Properties>
-	</Component>
+			</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>ServiceHandler</name>
+			<api>li.strolch.service.api.ServiceHandler</api>
+			<impl>li.strolch.service.api.DefaultServiceHandler</impl>
+			<Properties>
+				<verbose>true</verbose>
+			</Properties>
+		</Component>
+	</env>
 </StrolchConfiguration>
\ No newline at end of file
diff --git a/src/test/resources/transienttest/config/StrolchConfiguration.xml b/src/test/resources/transienttest/config/StrolchConfiguration.xml
index a4f856d75..86118942a 100644
--- a/src/test/resources/transienttest/config/StrolchConfiguration.xml
+++ b/src/test/resources/transienttest/config/StrolchConfiguration.xml
@@ -1,28 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <StrolchConfiguration>
-	<Runtime>
-		<applicationName>StrolchRuntimeTest</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>
-			<tryLockTimeUnit>SECONDS</tryLockTimeUnit>
-			<tryLockTime>1</tryLockTime>
-			<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>
+	<env id="dev">
+		<Runtime>
+			<applicationName>StrolchRuntimeTest</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>
+				<tryLockTimeUnit>SECONDS</tryLockTimeUnit>
+				<tryLockTime>1</tryLockTime>
+				<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>
+	</env>
 </StrolchConfiguration>
\ No newline at end of file
diff --git a/src/test/resources/withPrivilegeRuntime/config/StrolchConfiguration.xml b/src/test/resources/withPrivilegeRuntime/config/StrolchConfiguration.xml
index 03c9d0070..f9d6bfb1a 100644
--- a/src/test/resources/withPrivilegeRuntime/config/StrolchConfiguration.xml
+++ b/src/test/resources/withPrivilegeRuntime/config/StrolchConfiguration.xml
@@ -1,34 +1,36 @@
 <?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>EMPTY</dataStoreMode>
-		</Properties>
-	</Component>
-	<Component>
-		<name>ServiceHandler</name>
-		<api>li.strolch.service.api.ServiceHandler</api>
-		<impl>li.strolch.service.api.DefaultServiceHandler</impl>
-		<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>
+	<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>
+			<Properties>
+				<dataStoreMode>EMPTY</dataStoreMode>
+			</Properties>
+		</Component>
+		<Component>
+			<name>ServiceHandler</name>
+			<api>li.strolch.service.api.ServiceHandler</api>
+			<impl>li.strolch.service.api.DefaultServiceHandler</impl>
+			<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>
+	</env>
 </StrolchConfiguration>
\ No newline at end of file
diff --git a/src/test/resources/withoutPrivilegeRuntime/config/StrolchConfiguration.xml b/src/test/resources/withoutPrivilegeRuntime/config/StrolchConfiguration.xml
index 4ba1722ff..9248f6f3e 100644
--- a/src/test/resources/withoutPrivilegeRuntime/config/StrolchConfiguration.xml
+++ b/src/test/resources/withoutPrivilegeRuntime/config/StrolchConfiguration.xml
@@ -1,25 +1,27 @@
 <?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>EMPTY</dataStoreMode>
-		</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>
+	<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>
+			<Properties>
+				<dataStoreMode>EMPTY</dataStoreMode>
+			</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>
+	</env>
 </StrolchConfiguration>
\ No newline at end of file