reinstate the authentication mechanisms supported in old brooklyn console, including properties-based, and LDAP. use ConfigKeys instead of (String)SystemProperties. tests work by installing AnyoneSecurityProvider. also added logout button (in help page).
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/375df6b0 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/375df6b0 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/375df6b0 Branch: refs/heads/0.5.0 Commit: 375df6b0bd6fd622b5df6ca6d075b6f857eefb8a Parents: 77d8a0e Author: Alex Heneveld <[email protected]> Authored: Sat Nov 17 22:32:08 2012 +0000 Committer: Alex Heneveld <[email protected]> Committed: Sat Nov 17 23:52:47 2012 +0000 ---------------------------------------------------------------------- usage/jsgui/src/main/webapp/assets/tpl/help/page.html | 4 +++- .../brooklyn/rest/jsgui/BrooklynJavascriptGuiLauncherTest.java | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/375df6b0/usage/jsgui/src/main/webapp/assets/tpl/help/page.html ---------------------------------------------------------------------- diff --git a/usage/jsgui/src/main/webapp/assets/tpl/help/page.html b/usage/jsgui/src/main/webapp/assets/tpl/help/page.html index d87cce0..99e342a 100644 --- a/usage/jsgui/src/main/webapp/assets/tpl/help/page.html +++ b/usage/jsgui/src/main/webapp/assets/tpl/help/page.html @@ -7,14 +7,16 @@ This is the Brooklyn JavaScript web client for the REST API. Brooklyn is an Apache-licensed open-source project for deployment and management. <p> + <hr/> Some useful references include: <ul> <li><a href="http://brooklyn.io";>Brooklyn Project web page</a></li> <li><a href="http://github.com/brooklyncentral/brooklyn";>Code at Github</a></li> - <li><a href="/v1/api/docs/">REST API docs (local swagger)</a></li> </ul> <p> Note you can observe the REST requests made by the Javascript GUI through the developers console in many browsers. + <hr/> + If needed you can <a href="/logout">log out now</a>. </div> </div> http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/375df6b0/usage/jsgui/src/test/java/brooklyn/rest/jsgui/BrooklynJavascriptGuiLauncherTest.java ---------------------------------------------------------------------- diff --git a/usage/jsgui/src/test/java/brooklyn/rest/jsgui/BrooklynJavascriptGuiLauncherTest.java b/usage/jsgui/src/test/java/brooklyn/rest/jsgui/BrooklynJavascriptGuiLauncherTest.java index cc8f7c6..5b59110 100644 --- a/usage/jsgui/src/test/java/brooklyn/rest/jsgui/BrooklynJavascriptGuiLauncherTest.java +++ b/usage/jsgui/src/test/java/brooklyn/rest/jsgui/BrooklynJavascriptGuiLauncherTest.java @@ -4,6 +4,7 @@ import org.eclipse.jetty.server.Server; import org.testng.annotations.AfterTest; import org.testng.annotations.Test; +import brooklyn.rest.BrooklynRestApiLauncherTest; import brooklyn.test.HttpTestUtils; /** Convenience and demo for launching programmatically. */ @@ -28,6 +29,7 @@ public class BrooklynJavascriptGuiLauncherTest { @Test public void testJavascriptWithRest() throws Exception { server = BrooklynJavascriptGuiLauncher.startJavascriptAndRest(); + BrooklynRestApiLauncherTest.enableAnyoneLogin(server); checkUrlContains("/index.html", "Brooklyn"); checkUrlContains("/v1/catalog/entities", "Tomcat"); }
