Quote jdbc string format templates

Ampersand (&) in format wasn't being parsed properly.
apache · Aug 24, 2018 · 845339d · 845339d
1 parent e8274fd
commit 845339d
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git 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

diff --git 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

diff --git 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

diff --git 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

diff --git 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")