Return-Path: 
 <commits-return-12320-apmail-brooklyn-commits-archive=brooklyn.apache.org@brooklyn.apache.org>
X-Original-To: apmail-brooklyn-commits-archive@minotaur.apache.org
Delivered-To: apmail-brooklyn-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id B4B2F184A4
	for <apmail-brooklyn-commits-archive@minotaur.apache.org>;
 Mon,  1 Feb 2016 17:51:37 +0000 (UTC)
Received: (qmail 76026 invoked by uid 500); 1 Feb 2016 17:51:34 -0000
Delivered-To: apmail-brooklyn-commits-archive@brooklyn.apache.org
Received: (qmail 75962 invoked by uid 500); 1 Feb 2016 17:51:34 -0000
Mailing-List: contact commits-help@brooklyn.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@brooklyn.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@brooklyn.apache.org>
List-Post: <mailto:commits@brooklyn.apache.org>
List-Id: <commits.brooklyn.apache.org>
Reply-To: dev@brooklyn.apache.org
Delivered-To: mailing list commits@brooklyn.apache.org
Received: (qmail 75738 invoked by uid 99); 1 Feb 2016 17:51:34 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org)
 (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Feb 2016 17:51:34 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id 53EAFE0994; Mon,  1 Feb 2016 17:51:34 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: heneveld@apache.org
To: commits@brooklyn.apache.org
Date: Mon, 01 Feb 2016 17:51:38 -0000
Message-Id: <6718dcee57b041c9991e4c8bc9e288ea@git.apache.org>
In-Reply-To: <1dad2bbd4d194752bb1de2f0ee414cf4@git.apache.org>
References: <1dad2bbd4d194752bb1de2f0ee414cf4@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [05/50] [abbrv] brooklyn-ui git commit: 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.

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 <alex.heneveld@cloudsoftcorp.com>
Authored: Sat Nov 17 22:32:08 2012 +0000
Committer: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
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");
     }