Strolch
/
strolch
mirror of https://github.com/strolch-li/strolch.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[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
This commit is contained in:
Robert von Burg 2014-08-13 16:06:23 +02:00
parent 66276b5ced
commit 2033c6b942
4 changed files with 134 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
src/test/resources/svctest/config/StrolchConfiguration.xml
View File

@ -1,59 +1,61 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<StrolchConfiguration> <StrolchConfiguration>
<Runtime> <env id="dev">
<applicationName>StrolchRuntimeTest</applicationName> <Runtime>
<Properties> <applicationName>StrolchRuntimeTest</applicationName>
<verbose>true</verbose> <Properties>
</Properties> <verbose>true</verbose>
</Runtime> </Properties>
<Component> </Runtime>
<name>RealmHandler</name> <Component>
<api>li.strolch.agent.api.RealmHandler</api> <name>RealmHandler</name>
<impl>li.strolch.agent.impl.DefaultRealmHandler</impl> <api>li.strolch.agent.api.RealmHandler</api>
<depends>PersistenceHandler</depends> <impl>li.strolch.agent.impl.DefaultRealmHandler</impl>
<Properties> <depends>PersistenceHandler</depends>
<realms>svcTransient, svcCached, svcTransactional</realms> <Properties>
<realms>svcTransient, svcCached, svcTransactional</realms>
<tryLockTimeUnit.svcTransient>SECONDS</tryLockTimeUnit.svcTransient> <tryLockTimeUnit.svcTransient>SECONDS</tryLockTimeUnit.svcTransient>
<tryLockTime.svcTransient>1</tryLockTime.svcTransient> <tryLockTime.svcTransient>1</tryLockTime.svcTransient>
<dataStoreMode.svcTransient>TRANSIENT</dataStoreMode.svcTransient> <dataStoreMode.svcTransient>TRANSIENT</dataStoreMode.svcTransient>
<dataStoreFile.svcTransient>StrolchModel.xml</dataStoreFile.svcTransient> <dataStoreFile.svcTransient>StrolchModel.xml</dataStoreFile.svcTransient>
<tryLockTimeUnit.svcCached>SECONDS</tryLockTimeUnit.svcCached> <tryLockTimeUnit.svcCached>SECONDS</tryLockTimeUnit.svcCached>
<tryLockTime.svcCached>1</tryLockTime.svcCached> <tryLockTime.svcCached>1</tryLockTime.svcCached>
<dataStoreMode.svcCached>CACHED</dataStoreMode.svcCached> <dataStoreMode.svcCached>CACHED</dataStoreMode.svcCached>
<tryLockTimeUnit.svcTransactional>SECONDS</tryLockTimeUnit.svcTransactional> <tryLockTimeUnit.svcTransactional>SECONDS</tryLockTimeUnit.svcTransactional>
<tryLockTime.svcTransactional>1</tryLockTime.svcTransactional> <tryLockTime.svcTransactional>1</tryLockTime.svcTransactional>
<dataStoreMode.svcTransactional>TRANSACTIONAL</dataStoreMode.svcTransactional> <dataStoreMode.svcTransactional>TRANSACTIONAL</dataStoreMode.svcTransactional>
</Properties> </Properties>
</Component> </Component>
<Component> <Component>
<name>PersistenceHandler</name> <name>PersistenceHandler</name>
<api>li.strolch.persistence.api.PersistenceHandler</api> <api>li.strolch.persistence.api.PersistenceHandler</api>
<impl>li.strolch.persistence.postgresql.PostgreSqlPersistenceHandler</impl> <impl>li.strolch.persistence.postgresql.PostgreSqlPersistenceHandler</impl>
<Properties> <Properties>
<allowSchemaCreation>true</allowSchemaCreation> <allowSchemaCreation>true</allowSchemaCreation>
<allowSchemaDrop>true</allowSchemaDrop> <allowSchemaDrop>true</allowSchemaDrop>
<db.url.svcCached>jdbc:postgresql://localhost/cacheduserdb</db.url.svcCached> <db.url.svcCached>jdbc:postgresql://localhost/cacheduserdb</db.url.svcCached>
<db.username.svcCached>cacheduser</db.username.svcCached> <db.username.svcCached>cacheduser</db.username.svcCached>
<db.password.svcCached>test</db.password.svcCached> <db.password.svcCached>test</db.password.svcCached>
<db.url.svcTransactional>jdbc:postgresql://localhost/transactionaluserdb</db.url.svcTransactional> <db.url.svcTransactional>jdbc:postgresql://localhost/transactionaluserdb</db.url.svcTransactional>
<db.username.svcTransactional>transactionaluser</db.username.svcTransactional> <db.username.svcTransactional>transactionaluser</db.username.svcTransactional>
<db.password.svcTransactional>test</db.password.svcTransactional> <db.password.svcTransactional>test</db.password.svcTransactional>
</Properties> </Properties>
</Component> </Component>
<Component> <Component>
<name>ServiceHandler</name> <name>ServiceHandler</name>
<api>li.strolch.service.api.ServiceHandler</api> <api>li.strolch.service.api.ServiceHandler</api>
<impl>li.strolch.service.api.DefaultServiceHandler</impl> <impl>li.strolch.service.api.DefaultServiceHandler</impl>
<Properties> <Properties>
<verbose>true</verbose> <verbose>true</verbose>
</Properties> </Properties>
</Component> </Component>
</env>
</StrolchConfiguration> </StrolchConfiguration>

52
src/test/resources/transienttest/config/StrolchConfiguration.xml
View File

@ -1,28 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<StrolchConfiguration> <StrolchConfiguration>
<Runtime> <env id="dev">
<applicationName>StrolchRuntimeTest</applicationName> <Runtime>
<Properties> <applicationName>StrolchRuntimeTest</applicationName>
<verbose>true</verbose> <Properties>
</Properties> <verbose>true</verbose>
</Runtime> </Properties>
<Component> </Runtime>
<name>RealmHandler</name> <Component>
<api>li.strolch.agent.api.RealmHandler</api> <name>RealmHandler</name>
<impl>li.strolch.agent.impl.DefaultRealmHandler</impl> <api>li.strolch.agent.api.RealmHandler</api>
<Properties> <impl>li.strolch.agent.impl.DefaultRealmHandler</impl>
<tryLockTimeUnit>SECONDS</tryLockTimeUnit> <Properties>
<tryLockTime>1</tryLockTime> <tryLockTimeUnit>SECONDS</tryLockTimeUnit>
<dataStoreMode>TRANSIENT</dataStoreMode> <tryLockTime>1</tryLockTime>
<dataStoreFile>StrolchModel.xml</dataStoreFile> <dataStoreMode>TRANSIENT</dataStoreMode>
</Properties> <dataStoreFile>StrolchModel.xml</dataStoreFile>
</Component> </Properties>
<Component> </Component>
<name>ServiceHandler</name> <Component>
<api>li.strolch.service.api.ServiceHandler</api> <name>ServiceHandler</name>
<impl>li.strolch.service.api.DefaultServiceHandler</impl> <api>li.strolch.service.api.ServiceHandler</api>
<Properties> <impl>li.strolch.service.api.DefaultServiceHandler</impl>
<verbose>true</verbose> <Properties>
</Properties> <verbose>true</verbose>
</Component> </Properties>
</Component>
</env>
</StrolchConfiguration> </StrolchConfiguration>

64
src/test/resources/withPrivilegeRuntime/config/StrolchConfiguration.xml
View File

@ -1,34 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<StrolchConfiguration> <StrolchConfiguration>
<Runtime> <env id="dev">
<applicationName>StrolchPersistenceTest</applicationName> <Runtime>
<Properties> <applicationName>StrolchPersistenceTest</applicationName>
<verbose>true</verbose> <Properties>
</Properties> <verbose>true</verbose>
</Runtime> </Properties>
<Component> </Runtime>
<name>RealmHandler</name> <Component>
<api>li.strolch.agent.api.RealmHandler</api> <name>RealmHandler</name>
<impl>li.strolch.agent.impl.DefaultRealmHandler</impl> <api>li.strolch.agent.api.RealmHandler</api>
<Properties> <impl>li.strolch.agent.impl.DefaultRealmHandler</impl>
<dataStoreMode>EMPTY</dataStoreMode> <Properties>
</Properties> <dataStoreMode>EMPTY</dataStoreMode>
</Component> </Properties>
<Component> </Component>
<name>ServiceHandler</name> <Component>
<api>li.strolch.service.api.ServiceHandler</api> <name>ServiceHandler</name>
<impl>li.strolch.service.api.DefaultServiceHandler</impl> <api>li.strolch.service.api.ServiceHandler</api>
<depends>PrivilegeHandler</depends> <impl>li.strolch.service.api.DefaultServiceHandler</impl>
<Properties> <depends>PrivilegeHandler</depends>
<verbose>true</verbose> <Properties>
</Properties> <verbose>true</verbose>
</Component> </Properties>
<Component> </Component>
<name>PrivilegeHandler</name> <Component>
<api>li.strolch.runtime.privilege.StrolchPrivilegeHandler</api> <name>PrivilegeHandler</name>
<impl>li.strolch.runtime.privilege.DefaultStrolchPrivilegeHandler</impl> <api>li.strolch.runtime.privilege.StrolchPrivilegeHandler</api>
<Properties> <impl>li.strolch.runtime.privilege.DefaultStrolchPrivilegeHandler</impl>
<privilegeConfigFile>PrivilegeConfig.xml</privilegeConfigFile> <Properties>
</Properties> <privilegeConfigFile>PrivilegeConfig.xml</privilegeConfigFile>
</Component> </Properties>
</Component>
</env>
</StrolchConfiguration> </StrolchConfiguration>

46
src/test/resources/withoutPrivilegeRuntime/config/StrolchConfiguration.xml
View File

@ -1,25 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<StrolchConfiguration> <StrolchConfiguration>
<Runtime> <env id="dev">
<applicationName>StrolchPersistenceTest</applicationName> <Runtime>
<Properties> <applicationName>StrolchPersistenceTest</applicationName>
<verbose>true</verbose> <Properties>
</Properties> <verbose>true</verbose>
</Runtime> </Properties>
<Component> </Runtime>
<name>RealmHandler</name> <Component>
<api>li.strolch.agent.api.RealmHandler</api> <name>RealmHandler</name>
<impl>li.strolch.agent.impl.DefaultRealmHandler</impl> <api>li.strolch.agent.api.RealmHandler</api>
<Properties> <impl>li.strolch.agent.impl.DefaultRealmHandler</impl>
<dataStoreMode>EMPTY</dataStoreMode> <Properties>
</Properties> <dataStoreMode>EMPTY</dataStoreMode>
</Component> </Properties>
<Component> </Component>
<name>ServiceHandler</name> <Component>
<api>li.strolch.service.api.ServiceHandler</api> <name>ServiceHandler</name>
<impl>li.strolch.service.api.DefaultServiceHandler</impl> <api>li.strolch.service.api.ServiceHandler</api>
<Properties> <impl>li.strolch.service.api.DefaultServiceHandler</impl>
<verbose>true</verbose> <Properties>
</Properties> <verbose>true</verbose>
</Component> </Properties>
</Component>
</env>
</StrolchConfiguration> </StrolchConfiguration>