commit 9f40f2da8bef287f79f928fd5c04882394dfd5b4
author Thomas Bouron <thomas.bouron@cloudsoftcorp.com> Thu Jul 26 12:58:57 2018 +0100
committer Thomas Bouron <thomas.bouron@cloudsoftcorp.com> Thu Jul 26 12:58:57 2018 +0100
tree 2708806bcb8ffe631f22cbb81ca59ee62a2f19aa
parent ec09b04fa7e1316bc0203e8ba0593fc42705222f

Update Brooklyn codebase to build the newly donated UI

examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/SingleWebServerExample.java

diff --git a/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/SingleWebServerExample.java b/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/SingleWebServerExample.java
index cec7a7e..268cb98 100644
--- a/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/SingleWebServerExample.java
+++ b/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/SingleWebServerExample.java
@@ -57,7 +57,7 @@
 
         BrooklynLauncher launcher = BrooklynLauncher.newInstance()
                 .application(EntitySpec.create(StartableApplication.class, SingleWebServerExample.class).displayName("Brooklyn WebApp example"))
-                .webconsolePort(port)
+                .restServerPort(port)
                 .location(location)
                 .start();
          

examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExample.java

diff --git a/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExample.java b/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExample.java
index 601537a..f44a95b 100644
--- a/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExample.java
+++ b/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExample.java
@@ -113,7 +113,7 @@
 
         BrooklynLauncher launcher = BrooklynLauncher.newInstance()
                 .application(EntitySpec.create(StartableApplication.class, WebClusterDatabaseExample.class).displayName("Brooklyn WebApp Cluster with Database example"))
-                .webconsolePort(port)
+                .restServerPort(port)
                 .location(location)
                 .start();
          

examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExampleApp.java

diff --git a/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExampleApp.java b/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExampleApp.java
index 5c58fee..9996964 100644
--- a/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExampleApp.java
+++ b/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExampleApp.java
@@ -165,7 +165,7 @@
         BrooklynLauncher launcher = BrooklynLauncher.newInstance()
                  .application(EntitySpec.create(StartableApplication.class, WebClusterDatabaseExampleApp.class)
                          .displayName("Brooklyn WebApp Cluster with Database example"))
-                 .webconsolePort(port)
+                 .restServerPort(port)
                  .location(location)
                  .start();
              

examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterExample.java

diff --git a/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterExample.java b/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterExample.java
index e5a1ae2..680ea87 100644
--- a/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterExample.java
+++ b/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterExample.java
@@ -86,7 +86,7 @@
         // TODO Want to parse, to handle multiple locations
         BrooklynLauncher launcher = BrooklynLauncher.newInstance()
                 .application(EntitySpec.create(WebClusterExample.class).displayName("Brooklyn WebApp Cluster example"))
-                .webconsolePort(port)
+                .restServerPort(port)
                 .location(location)
                 .start();
          

qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedTheeTierApp.java

diff --git a/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedTheeTierApp.java b/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedTheeTierApp.java
index 5e2e566..0afaa9b 100644
--- a/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedTheeTierApp.java
+++ b/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedTheeTierApp.java
@@ -133,7 +133,7 @@
         BrooklynLauncher launcher = BrooklynLauncher.newInstance()
                  .application(EntitySpec.create(StartableApplication.class, SimulatedTheeTierApp.class)
                          .displayName("Brooklyn WebApp Cluster with Database example"))
-                 .webconsolePort(port)
+                 .restServerPort(port)
                  .location(location)
                  .start();
              

qa/src/test/java/org/apache/brooklyn/qa/longevity/webcluster/WebClusterApp.java

diff --git a/qa/src/test/java/org/apache/brooklyn/qa/longevity/webcluster/WebClusterApp.java b/qa/src/test/java/org/apache/brooklyn/qa/longevity/webcluster/WebClusterApp.java
index 3b25212..1c21405 100644
--- a/qa/src/test/java/org/apache/brooklyn/qa/longevity/webcluster/WebClusterApp.java
+++ b/qa/src/test/java/org/apache/brooklyn/qa/longevity/webcluster/WebClusterApp.java
@@ -92,7 +92,7 @@
 
         BrooklynLauncher launcher = BrooklynLauncher.newInstance()
                 .application(EntitySpec.create(StartableApplication.class, WebClusterApp.class).displayName("Brooklyn WebApp Cluster example"))
-                .webconsolePort(port)
+                .restServerPort(port)
                 .location(location)
                 .start();