[1/2] brooklyn-server git commit: Fix noConsoleSecurity option

2016-03-31 Thread sjcorbett 
Repository: brooklyn-server
Updated Branches:
  refs/heads/master e79353ce1 -> 36a29180d


Fix noConsoleSecurity option

Also skip security by default for BrooklynRestApiLauncher.


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

Branch: refs/heads/master
Commit: e0244a90e41a3f038ed35d517852abb58e1aecef
Parents: e79353c
Author: Svetoslav Neykov 
Authored: Thu Mar 31 12:45:20 2016 +0300
Committer: Svetoslav Neykov 
Committed: Thu Mar 31 16:48:38 2016 +0300

--
 .../brooklyn/launcher/BrooklynWebServer.java|  3 +-
 .../brooklyn/launcher/NopSecurityHandler.java   | 34 
 .../jsgui/BrooklynJavascriptGuiLauncher.java|  4 +++
 .../rest/BrooklynRestApiLauncherTest.java   |  6 ++--
 .../brooklynnode/DeployBlueprintTest.java   |  2 +-
 .../brooklyn/rest/NopSecurityHandler.java   | 34 
 .../brooklyn/rest/BrooklynRestApiLauncher.java  | 20 ++--
 7 files changed, 55 insertions(+), 48 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e0244a90/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynWebServer.java
--
diff --git 
a/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynWebServer.java 
b/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynWebServer.java
index 29085c1..7dbcc96 100644
--- a/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynWebServer.java
+++ b/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynWebServer.java
@@ -36,6 +36,7 @@ import java.util.Map;
 import javax.annotation.Nullable;
 import javax.security.auth.spi.LoginModule;
 
+import org.apache.brooklyn.rest.NopSecurityHandler;
 import org.apache.brooklyn.api.location.PortRange;
 import org.apache.brooklyn.api.mgmt.ManagementContext;
 import org.apache.brooklyn.config.ConfigKey;
@@ -649,7 +650,7 @@ public class BrooklynWebServer {
 // to have security pre-configured and ignore it if 
noConsoleSecurity used.
 //
 // Ignore security config in web.xml.
-context.setDefaultSecurityHandlerClass(NopSecurityHandler.class);
+context.setSecurityHandler(new NopSecurityHandler());
 } else {
 // Cover for downstream projects which don't have the changes.
 
context.addOverrideDescriptor(getClass().getResource("/web-security.xml").toExternalForm());

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e0244a90/launcher/src/main/java/org/apache/brooklyn/launcher/NopSecurityHandler.java
--
diff --git 
a/launcher/src/main/java/org/apache/brooklyn/launcher/NopSecurityHandler.java 
b/launcher/src/main/java/org/apache/brooklyn/launcher/NopSecurityHandler.java
deleted file mode 100644
index 88b2a27..000
--- 
a/launcher/src/main/java/org/apache/brooklyn/launcher/NopSecurityHandler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.brooklyn.launcher;
-
-import org.eclipse.jetty.security.ConstraintMapping;
-import org.eclipse.jetty.security.ConstraintSecurityHandler;
-
-/**
- * Ignores  elements from web.xml, so
- * we can skip configuration even if requested by web app.
- */
-public class NopSecurityHandler extends ConstraintSecurityHandler {
-
-@Override
-public void addConstraintMapping(ConstraintMapping mapping) {
-}
-
-}

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e0244a90/launcher/src/test/java/org/apache/brooklyn/rest/jsgui/BrooklynJavascriptGuiLauncher.java
--
diff --git

[2/2] brooklyn-server git commit: This closes #94

2016-03-31 Thread sjcorbett 
This closes #94

Fix noConsoleSecurity option


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/36a29180
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/36a29180
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/36a29180

Branch: refs/heads/master
Commit: 36a29180def4b504fdd3da97f215f27eab3e226d
Parents: e79353c e0244a9
Author: Sam Corbett 
Authored: Thu Mar 31 16:46:58 2016 +0100
Committer: Sam Corbett 
Committed: Thu Mar 31 16:46:58 2016 +0100

--
 .../brooklyn/launcher/BrooklynWebServer.java|  3 +-
 .../brooklyn/launcher/NopSecurityHandler.java   | 34 
 .../jsgui/BrooklynJavascriptGuiLauncher.java|  4 +++
 .../rest/BrooklynRestApiLauncherTest.java   |  6 ++--
 .../brooklynnode/DeployBlueprintTest.java   |  2 +-
 .../brooklyn/rest/NopSecurityHandler.java   | 34 
 .../brooklyn/rest/BrooklynRestApiLauncher.java  | 20 ++--
 7 files changed, 55 insertions(+), 48 deletions(-)
--

svn commit: r12945 - /dev/brooklyn/apache-brooklyn-0.9.0-rc1/

2016-03-31 Thread richard 
Author: richard
Date: Thu Mar 31 12:48:52 2016
New Revision: 12945

Log:
Add apache-brooklyn-0.9.0-rc1 to dist/dev/brooklyn

Added:
dev/brooklyn/apache-brooklyn-0.9.0-rc1/

dev/brooklyn/apache-brooklyn-0.9.0-rc1/apache-brooklyn-0.9.0-rc1-1.noarch.rpm   
(with props)

dev/brooklyn/apache-brooklyn-0.9.0-rc1/apache-brooklyn-0.9.0-rc1-1.noarch.rpm.asc

dev/brooklyn/apache-brooklyn-0.9.0-rc1/apache-brooklyn-0.9.0-rc1-1.noarch.rpm.md5

dev/brooklyn/apache-brooklyn-0.9.0-rc1/apache-brooklyn-0.9.0-rc1-1.noarch.rpm.sha1

dev/brooklyn/apache-brooklyn-0.9.0-rc1/apache-brooklyn-0.9.0-rc1-1.noarch.rpm.sha256
dev/brooklyn/apache-brooklyn-0.9.0-rc1/apache-brooklyn-0.9.0-rc1-bin.tar.gz 
  (with props)

dev/brooklyn/apache-brooklyn-0.9.0-rc1/apache-brooklyn-0.9.0-rc1-bin.tar.gz.asc

dev/brooklyn/apache-brooklyn-0.9.0-rc1/apache-brooklyn-0.9.0-rc1-bin.tar.gz.md5

dev/brooklyn/apache-brooklyn-0.9.0-rc1/apache-brooklyn-0.9.0-rc1-bin.tar.gz.sha1

dev/brooklyn/apache-brooklyn-0.9.0-rc1/apache-brooklyn-0.9.0-rc1-bin.tar.gz.sha256
dev/brooklyn/apache-brooklyn-0.9.0-rc1/apache-brooklyn-0.9.0-rc1-bin.zip   
(with props)
dev/brooklyn/apache-brooklyn-0.9.0-rc1/apache-brooklyn-0.9.0-rc1-bin.zip.asc
dev/brooklyn/apache-brooklyn-0.9.0-rc1/apache-brooklyn-0.9.0-rc1-bin.zip.md5

dev/brooklyn/apache-brooklyn-0.9.0-rc1/apache-brooklyn-0.9.0-rc1-bin.zip.sha1

dev/brooklyn/apache-brooklyn-0.9.0-rc1/apache-brooklyn-0.9.0-rc1-bin.zip.sha256
dev/brooklyn/apache-brooklyn-0.9.0-rc1/apache-brooklyn-0.9.0-rc1-src.tar.gz 
  (with props)

dev/brooklyn/apache-brooklyn-0.9.0-rc1/apache-brooklyn-0.9.0-rc1-src.tar.gz.asc

dev/brooklyn/apache-brooklyn-0.9.0-rc1/apache-brooklyn-0.9.0-rc1-src.tar.gz.md5

dev/brooklyn/apache-brooklyn-0.9.0-rc1/apache-brooklyn-0.9.0-rc1-src.tar.gz.sha1

dev/brooklyn/apache-brooklyn-0.9.0-rc1/apache-brooklyn-0.9.0-rc1-src.tar.gz.sha256
dev/brooklyn/apache-brooklyn-0.9.0-rc1/apache-brooklyn-0.9.0-rc1-src.zip   
(with props)
dev/brooklyn/apache-brooklyn-0.9.0-rc1/apache-brooklyn-0.9.0-rc1-src.zip.asc
dev/brooklyn/apache-brooklyn-0.9.0-rc1/apache-brooklyn-0.9.0-rc1-src.zip.md5

dev/brooklyn/apache-brooklyn-0.9.0-rc1/apache-brooklyn-0.9.0-rc1-src.zip.sha1

dev/brooklyn/apache-brooklyn-0.9.0-rc1/apache-brooklyn-0.9.0-rc1-src.zip.sha256

dev/brooklyn/apache-brooklyn-0.9.0-rc1/apache-brooklyn-0.9.0-rc1-vagrant.tar.gz 
  (with props)

dev/brooklyn/apache-brooklyn-0.9.0-rc1/apache-brooklyn-0.9.0-rc1-vagrant.tar.gz.asc

dev/brooklyn/apache-brooklyn-0.9.0-rc1/apache-brooklyn-0.9.0-rc1-vagrant.tar.gz.md5

dev/brooklyn/apache-brooklyn-0.9.0-rc1/apache-brooklyn-0.9.0-rc1-vagrant.tar.gz.sha1

dev/brooklyn/apache-brooklyn-0.9.0-rc1/apache-brooklyn-0.9.0-rc1-vagrant.tar.gz.sha256

dev/brooklyn/apache-brooklyn-0.9.0-rc1/apache-brooklyn-0.9.0-rc1-vagrant.zip   
(with props)

dev/brooklyn/apache-brooklyn-0.9.0-rc1/apache-brooklyn-0.9.0-rc1-vagrant.zip.asc

dev/brooklyn/apache-brooklyn-0.9.0-rc1/apache-brooklyn-0.9.0-rc1-vagrant.zip.md5

dev/brooklyn/apache-brooklyn-0.9.0-rc1/apache-brooklyn-0.9.0-rc1-vagrant.zip.sha1

dev/brooklyn/apache-brooklyn-0.9.0-rc1/apache-brooklyn-0.9.0-rc1-vagrant.zip.sha256

Added: 
dev/brooklyn/apache-brooklyn-0.9.0-rc1/apache-brooklyn-0.9.0-rc1-1.noarch.rpm
==
Binary file - no diff available.

Propchange: 
dev/brooklyn/apache-brooklyn-0.9.0-rc1/apache-brooklyn-0.9.0-rc1-1.noarch.rpm
--
svn:mime-type = application/octet-stream

Added: 
dev/brooklyn/apache-brooklyn-0.9.0-rc1/apache-brooklyn-0.9.0-rc1-1.noarch.rpm.asc
==
--- 
dev/brooklyn/apache-brooklyn-0.9.0-rc1/apache-brooklyn-0.9.0-rc1-1.noarch.rpm.asc
 (added)
+++ 
dev/brooklyn/apache-brooklyn-0.9.0-rc1/apache-brooklyn-0.9.0-rc1-1.noarch.rpm.asc
 Thu Mar 31 12:48:52 2016
@@ -0,0 +1,11 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQEcBAABAgAGBQJW/PhdAAoJEBROKfAYASCMg+IH/jqROXkBsskQsLqu9sQhlzQn
+P0cd2yuFcGR0ar8a4sHnISzPJr3aPx4W7nqPz0mKfZnQBzo5uX0BrlrzvCDPx8C6
+kMmw1uu1W4w7duYTn/HjOaaGrwEfx9brn8CfW74YGzxsKX3XPiVL7jJ9zRQbiwiu
+vlD96o7gG7m+64Vt+7Ln+j6ATGa2FGCEHG5QamNvfDsrbLqO5wtfDxPJj3gWPqOP
+PFi1RdfIJVctXTeYgUpA62tjvd6TVNBINRojFfRmE9WKAW+kbt52nDPIlqQ2oGZz
+6BSfOGaZVU31UK8N0UBca8iG7hW+wXhUnIMxIYPycRYiLRAOjraePNOJLGegI3g=
+=toR3
+-END PGP SIGNATURE-

Added: 
dev/brooklyn/apache-brooklyn-0.9.0-rc1/apache-brooklyn-0.9.0-rc1-1.noarch.rpm.md5
==
--- 
dev/brooklyn/apache-brooklyn-0.9.0-rc1/apache-brooklyn-0.9.0-rc1-1.noarch.rpm.md5
 (added)
+++ 
dev/brooklyn/apache-brooklyn-0.9.0-rc1/apache-brooklyn-0.9.0-rc1-1.noarch.rpm.md5
 Thu Mar 31 12:48:52 2016
@@ -0,0 +1 @@
+59d4f01fe9493a1cd58ffe1d1cb9bdf0

[brooklyn] Git Push Summary

2016-03-31 Thread richard 
Repository: brooklyn
Updated Tags:  refs/tags/apache-brooklyn-0.9.0-rc1 [created] 7fe9c1eaf

[brooklyn-dist] Git Push Summary

2016-03-31 Thread richard 
Repository: brooklyn-dist
Updated Tags:  refs/tags/apache-brooklyn-0.9.0-rc1 [created] f45cb3936

[brooklyn-client] Git Push Summary

2016-03-31 Thread richard 
Repository: brooklyn-client
Updated Tags:  refs/tags/apache-brooklyn-0.9.0-rc1 [created] 65c2f90bb

[brooklyn-library] Git Push Summary

2016-03-31 Thread richard 
Repository: brooklyn-library
Updated Tags:  refs/tags/apache-brooklyn-0.9.0-rc1 [created] e28334645

[brooklyn-server] Git Push Summary

2016-03-31 Thread richard 
Repository: brooklyn-server
Updated Tags:  refs/tags/apache-brooklyn-0.9.0-rc1 [created] 5ed2ed3a9

[brooklyn-ui] Git Push Summary

2016-03-31 Thread richard 
Repository: brooklyn-ui
Updated Tags:  refs/tags/apache-brooklyn-0.9.0-rc1 [created] 92353c7d5