brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aleds...@apache.org
Subject [3/4] brooklyn-library git commit: Fix JavaWebAppsMatchingTest
Date Tue, 07 Jun 2016 14:09:10 GMT
Fix JavaWebAppsMatchingTest


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/91e88107
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/91e88107
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/91e88107

Branch: refs/heads/master
Commit: 91e881076f095c88f88311d97639de549fe8146b
Parents: fe213fb
Author: Ivana Yovcheva <ivana.yovcheva@gmail.com>
Authored: Tue Jun 7 12:31:21 2016 +0300
Committer: Ivana Yovcheva <ivana.yovcheva@gmail.com>
Committed: Tue Jun 7 16:50:40 2016 +0300

----------------------------------------------------------------------
 .../resources/java-web-app-and-db-with-function.yaml   | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/91e88107/qa/src/test/resources/java-web-app-and-db-with-function.yaml
----------------------------------------------------------------------
diff --git a/qa/src/test/resources/java-web-app-and-db-with-function.yaml b/qa/src/test/resources/java-web-app-and-db-with-function.yaml
index 1d07f9b..5f4f643 100644
--- a/qa/src/test/resources/java-web-app-and-db-with-function.yaml
+++ b/qa/src/test/resources/java-web-app-and-db-with-function.yaml
@@ -21,12 +21,13 @@ location: localhost
 services:
 - type: org.apache.brooklyn.entity.webapp.ControlledDynamicWebAppCluster
   name: My Web
-  wars.root: http://repo1.maven.org/maven2/org/apache/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.9.0/brooklyn-example-hello-world-sql-webapp-0.9.0.war
-  http.port: 9280+
-  proxy.http.port: 9210+
-  java.sysprops: 
-    brooklyn.example.db.url: $brooklyn:formatString("jdbc:%s%s?user=%s&password=%s",
-       component("db").attributeWhenReady("datastore.url"), "visitors", "brooklyn", "br00k11n")
+  brooklyn.config:
+    wars.root: http://repo1.maven.org/maven2/org/apache/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.9.0/brooklyn-example-hello-world-sql-webapp-0.9.0.war
+    http.port: 9280+
+    proxy.http.port: 9210+
+    java.sysprops:
+      brooklyn.example.db.url: $brooklyn:formatString("jdbc:%s%s?user=%s&password=%s",
+         component("db").attributeWhenReady("datastore.url"), "visitors", "brooklyn", "br00k11n")
 
 - type: org.apache.brooklyn.entity.database.mysql.MySqlNode
   id: db


Mime
View raw message