Quote jdbc string format templates Ampersand (&) in format wasn't being parsed properly.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/845339d8 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/845339d8 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/845339d8 Branch: refs/heads/master Commit: 845339d8cd4398aaa0f8463c52a1835071899c03 Parents: e8274fd Author: Paul Campbell <paul.campb...@cloudsoft.io> Authored: Fri Aug 24 12:55:59 2018 +0100 Committer: Paul Campbell <paul.campb...@cloudsoft.io> Committed: Fri Aug 24 12:55:59 2018 +0100 ---------------------------------------------------------------------- guide/blueprints/example_yaml/appserver-clustered-w-db.yaml | 2 +- guide/blueprints/example_yaml/appserver-w-db-other-flavor.yaml | 2 +- guide/blueprints/example_yaml/appserver-w-db.yaml | 2 +- guide/blueprints/example_yaml/appserver-w-policy.yaml | 2 +- guide/ops/externalized-configuration.md | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/845339d8/guide/blueprints/example_yaml/appserver-clustered-w-db.yaml ---------------------------------------------------------------------- diff --git a/guide/blueprints/example_yaml/appserver-clustered-w-db.yaml b/guide/blueprints/example_yaml/appserver-clustered-w-db.yaml index 46d55d6..8064a81 100644 --- a/guide/blueprints/example_yaml/appserver-clustered-w-db.yaml +++ b/guide/blueprints/example_yaml/appserver-clustered-w-db.yaml @@ -12,7 +12,7 @@ services: java.sysprops: brooklyn.example.db.url: $brooklyn:formatString: - - jdbc:%s%s?user=%s\\&password=%s + - "jdbc:%s%s?user=%s&password=%s" - $brooklyn:component("db").attributeWhenReady("datastore.url") - visitors - brooklyn http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/845339d8/guide/blueprints/example_yaml/appserver-w-db-other-flavor.yaml ---------------------------------------------------------------------- diff --git a/guide/blueprints/example_yaml/appserver-w-db-other-flavor.yaml b/guide/blueprints/example_yaml/appserver-w-db-other-flavor.yaml index 2132a7e..1538683 100644 --- a/guide/blueprints/example_yaml/appserver-w-db-other-flavor.yaml +++ b/guide/blueprints/example_yaml/appserver-w-db-other-flavor.yaml @@ -8,7 +8,7 @@ services: java.sysprops: brooklyn.example.db.url: $brooklyn:formatString: - - jdbc:%s%s?user=%s\\&password=%s + - "jdbc:%s%s?user=%s&password=%s" - $brooklyn:component("db").attributeWhenReady("datastore.url") - visitors - brooklyn http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/845339d8/guide/blueprints/example_yaml/appserver-w-db.yaml ---------------------------------------------------------------------- diff --git a/guide/blueprints/example_yaml/appserver-w-db.yaml b/guide/blueprints/example_yaml/appserver-w-db.yaml index 3555fcd..a54d88c 100644 --- a/guide/blueprints/example_yaml/appserver-w-db.yaml +++ b/guide/blueprints/example_yaml/appserver-w-db.yaml @@ -8,7 +8,7 @@ services: java.sysprops: brooklyn.example.db.url: $brooklyn:formatString: - - jdbc:%s%s?user=%s\\&password=%s + - "jdbc:%s%s?user=%s&password=%s" - $brooklyn:component("db").attributeWhenReady("datastore.url") - visitors - brooklyn http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/845339d8/guide/blueprints/example_yaml/appserver-w-policy.yaml ---------------------------------------------------------------------- diff --git a/guide/blueprints/example_yaml/appserver-w-policy.yaml b/guide/blueprints/example_yaml/appserver-w-policy.yaml index 7c5315f..5106d9a 100644 --- a/guide/blueprints/example_yaml/appserver-w-policy.yaml +++ b/guide/blueprints/example_yaml/appserver-w-policy.yaml @@ -12,7 +12,7 @@ services: java.sysprops: brooklyn.example.db.url: $brooklyn:formatString: - - jdbc:%s%s?user=%s\\&password=%s + - "jdbc:%s%s?user=%s&password=%s" - $brooklyn:component("db").attributeWhenReady("datastore.url") - visitors - brooklyn http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/845339d8/guide/ops/externalized-configuration.md ---------------------------------------------------------------------- diff --git a/guide/ops/externalized-configuration.md b/guide/ops/externalized-configuration.md index 948c300..044b5ad 100644 --- a/guide/ops/externalized-configuration.md +++ b/guide/ops/externalized-configuration.md @@ -31,7 +31,7 @@ services: java.sysprops: brooklyn.example.db.url: $brooklyn:formatString: - - jdbc:postgresql://%s/myappdb?user=%s\\&password=%s + - "jdbc:postgresql://%s/myappdb?user=%s&password=%s" - $brooklyn:external("servers", "postgresql") - $brooklyn:external("credentials", "postgresql-user") - $brooklyn:external("credentials", "postgresql-password")
