Skip to content
Browse files

Merge pull request #890 from rsvato/master

[DOC-XXX][fix] - DB templates: changed properties to genesis.system prefix
  • Loading branch information...
2 parents ee416b1 + af6dc1c commit 5c83d281e77866d48c452f6c61194abf8fe2db23 ddurnev committed Mar 20, 2013
View
4 backend/src/main/resources/defaults-system.json
@@ -26,5 +26,7 @@
"genesis.system.metrics": {"default": "true","description": "Gathering of system metrics: on if true, off otherwise",
"restartRequired": true,
"validation": {"Must be true or false": "true|false"}
- }
+ },
+ "genesis.system.databag.template.repository.path" : {"default" : "templates", "description" : "Filesystem path to databag templates folder", "restartRequired": true},
+ "genesis.system.databag.template.repository.wildcard": {"default": "*.dbtemplate", "description": "Extension for databag templates files", "restartRequired": true}
}
View
4 ...main/scala/com/griddynamics/genesis/configuration/DatabagTemplateServiceContextImpl.scala
@@ -9,8 +9,8 @@ import com.griddynamics.genesis.repository.impl.DatabagTemplateRepositoryImpl
@Configuration
class DatabagTemplateServiceContextImpl extends DatabagTemplateServiceContext {
- @Value("${genesis.databag.template.repository.path:templates}") var templatePath: String = _
- @Value("${genesis.databag.template.repository.wildcard:*.dbtemplate}") var wildCard: String = _
+ @Value("${genesis.system.databag.template.repository.path:templates}") var templatePath: String = _
+ @Value("${genesis.system.databag.template.repository.wildcard:*.dbtemplate}") var wildCard: String = _
@Bean
def databagTemplateRepository: DatabagTemplateRepository = new DatabagTemplateRepositoryImpl(templatePath, wildCard)
View
4 test-automation/cucumber/sample.properties.erb
@@ -10,5 +10,5 @@ genesis.template.repository.fs.path=<%= Dir.pwd %>/templates
genesis.web.admin.sha.password=<%= hash %>
genesis.web.admin.username=<%= user %>
genesis.system.security.environment.restriction.enabled=true
-genesis.databag.template.repository.path=<%= Dir.pwd %>/templates
-genesis.databag.template.repository.wildcard=*.dbtemplate
+genesis.system.databag.template.repository.path=<%= Dir.pwd %>/templates
+genesis.system.databag.template.repository.wildcard=*.dbtemplate

0 comments on commit 5c83d28

Please sign in to comment.
Something went wrong with that request. Please try again.