brooklyn-server git commit: fix karaf/init/pom.xml path to parent project

2016-03-14 Thread heneveld 
Repository: brooklyn-server
Updated Branches:
  refs/heads/master 379cd5cf2 -> 1465b040b


fix karaf/init/pom.xml path to parent project


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

Branch: refs/heads/master
Commit: 1465b040bd9fcce4a95ea4fc927a8584de18dc05
Parents: 379cd5c
Author: Alex Heneveld 
Authored: Mon Mar 14 19:09:42 2016 +
Committer: Alex Heneveld 
Committed: Mon Mar 14 19:09:42 2016 +

--
 karaf/init/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/1465b040/karaf/init/pom.xml
--
diff --git a/karaf/init/pom.xml b/karaf/init/pom.xml
index 7ca1c69..6f2ac86 100644
--- a/karaf/init/pom.xml
+++ b/karaf/init/pom.xml
@@ -30,7 +30,7 @@
 org.apache.brooklyn
 brooklyn-parent
 0.9.0-SNAPSHOT  
-../parent/pom.xml
+../../parent/pom.xml

[2/2] brooklyn-client git commit: Closes #8

2016-03-14 Thread svet 
Closes #8

Inherit parent pom as do other brooklyn-* modules

This is to address

[ERROR] No Repository settings defined in the job configuration or 
distributionManagement of the module.

upon Apache build.


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

Branch: refs/heads/master
Commit: bf696e55b7f41b7db62c9975e90c3990b2595f9c
Parents: c21cf0f 83fcac9
Author: Svetoslav Neykov 
Authored: Mon Mar 14 17:28:44 2016 +0200
Committer: Svetoslav Neykov 
Committed: Mon Mar 14 17:28:44 2016 +0200

--
 pom.xml | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)
--

[1/2] brooklyn-client git commit: Inherit parent pom as do other brooklyn-* modules

2016-03-14 Thread svet 
Repository: brooklyn-client
Updated Branches:
  refs/heads/master c21cf0f95 -> bf696e55b


Inherit parent pom as do other brooklyn-* modules


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

Branch: refs/heads/master
Commit: 83fcac954c2250ea2f89e7159722e216cbf08e15
Parents: db787fd
Author: Geoff Macartney 
Authored: Mon Mar 14 15:17:48 2016 +
Committer: Geoff Macartney 
Committed: Mon Mar 14 15:17:48 2016 +

--
 pom.xml | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/83fcac95/pom.xml
--
diff --git a/pom.xml b/pom.xml
index f7391c9..33a1cbe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,11 +23,16 @@
 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
 
 4.0.0
+
+org.apache.brooklyn
+brooklyn-parent
+0.9.0-SNAPSHOT  
+../brooklyn-server/parent/
+
+
 pom
 
-org.apache.brooklyn
 brooklyn-client-cli
-0.9.0-SNAPSHOT  
 Brooklyn Client Command Line Interface
 
 A command line client for Apache Brooklyn

[7/7] brooklyn-server git commit: This closes #58

2016-03-14 Thread heneveld 
This closes #58


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

Branch: refs/heads/master
Commit: 379cd5cf26618e4233ba5e50a3d1195220ef98da
Parents: bd08aea 42e9af1
Author: Alex Heneveld 
Authored: Mon Mar 14 14:53:36 2016 +
Committer: Alex Heneveld 
Committed: Mon Mar 14 14:53:36 2016 +

--
 .../base/SoftwareProcessPersisterInMemorySizeIntegrationTest.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

[6/7] brooklyn-server git commit: Merge remote-tracking branch 'upstream/master'

2016-03-14 Thread heneveld 
Merge remote-tracking branch 'upstream/master'


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

Branch: refs/heads/master
Commit: bd08aea6f4b131fed1e57f54c039c47cea6ffcde
Parents: e9c52d7 f8476be
Author: Alex Heneveld 
Authored: Mon Mar 14 14:53:33 2016 +
Committer: Alex Heneveld 
Committed: Mon Mar 14 14:53:33 2016 +

--
 parent/pom.xml| 3 +--
 utils/jmx/jmxmp-ssl-agent/pom.xml | 5 -
 2 files changed, 1 insertion(+), 7 deletions(-)
--

[1/7] brooklyn-server git commit: [BROOKLYN-183] Load brooklyn.properties on OSGi init

2016-03-14 Thread heneveld 
Repository: brooklyn-server
Updated Branches:
  refs/heads/master f8476be1b -> 379cd5cf2


[BROOKLYN-183] Load brooklyn.properties on OSGi init


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

Branch: refs/heads/master
Commit: e6b3ad900228d206f671f6e8b0350e95441e8ed1
Parents: ec56f2a
Author: Svetoslav Neykov 
Authored: Tue Mar 8 11:56:10 2016 +0200
Committer: Svetoslav Neykov 
Committed: Tue Mar 8 12:29:13 2016 +0200

--
 .../org/apache/brooklyn/core/OsgiLauncher.java  |   1 +
 .../resources/OSGI-INF/blueprint/blueprint.xml  |  64 -
 karaf/apache-brooklyn/pom.xml   |   1 +
 .../etc/org.apache.brooklyn.osgilauncher.cfg|   6 +
 karaf/features/src/main/feature/feature.xml |   6 +
 karaf/init/pom.xml  |  69 ++
 .../resources/OSGI-INF/blueprint/blueprint.xml  |  79 +++
 karaf/pom.xml   |   1 +
 launcher-common/pom.xml |  82 +++
 .../common/BrooklynPropertiesFactoryHelper.java | 117 
 .../BrooklynPropertiesFactoryHelperTest.java| 138 +++
 launcher/pom.xml|  29 ++--
 .../org/apache/brooklyn/launcher/Activator.java |  41 --
 .../brooklyn/launcher/BrooklynLauncher.java |  77 +--
 .../launcher/config/BrooklynGlobalConfig.java   |   3 +
 .../brooklyn/launcher/BrooklynLauncherTest.java | 130 ++---
 pom.xml |   1 +
 17 files changed, 533 insertions(+), 312 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e6b3ad90/core/src/main/java/org/apache/brooklyn/core/OsgiLauncher.java
--
diff --git a/core/src/main/java/org/apache/brooklyn/core/OsgiLauncher.java 
b/core/src/main/java/org/apache/brooklyn/core/OsgiLauncher.java
index b7f5bea..c652bda 100644
--- a/core/src/main/java/org/apache/brooklyn/core/OsgiLauncher.java
+++ b/core/src/main/java/org/apache/brooklyn/core/OsgiLauncher.java
@@ -72,6 +72,7 @@ import org.slf4j.LoggerFactory;
  *
  * Temporarily here; should be totally contained in blueprint beans' 
init-methods.
  */
+// TODO move to brooklyn-karaf-init
 public class OsgiLauncher {
 
 private static final Logger log = 
LoggerFactory.getLogger(OsgiLauncher.class);

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e6b3ad90/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
--
diff --git a/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml 
b/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
deleted file mode 100644
index bd0c7eb..000
--- a/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-
-
-
-http://www.osgi.org/xmlns/blueprint/v1.0.0;
-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
-   
xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.2.0;
-   xsi:schemaLocation="
- http://www.osgi.org/xmlns/blueprint/v1.0.0 
http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd
- 
http://aries.apache.org/schemas/blueprint-cm/blueprint-cm-1.1.0.xsd
- ">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-org.apache.brooklyn.api.mgmt.ManagementContext
-
org.apache.brooklyn.core.mgmt.internal.ManagementContextInternal
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e6b3ad90/karaf/apache-brooklyn/pom.xml
--
diff --git a/karaf/apache-brooklyn/pom.xml b/karaf/apache-brooklyn/pom.xml
index 6ccd8f9..1d01a4a 100755
--- a/karaf/apache-brooklyn/pom.xml
+++ b/karaf/apache-brooklyn/pom.xml
@@ -115,6 +115,7 @@
 system
 wrap
 
+brooklyn-osgi-launcher
 brooklyn-jsgui
 brooklyn-rest-resources
   

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e6b3ad90/karaf/apache-brooklyn/src/main/resources/etc/org.apache.brooklyn.osgilauncher.cfg
--
diff --git

[4/7] brooklyn-server git commit: This closes #52

2016-03-14 Thread heneveld 
This closes #52


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

Branch: refs/heads/master
Commit: e9c52d7c3ec0032c55f327f890ddfd3f403fb6ee
Parents: f20bf0e 090b16c
Author: Alex Heneveld 
Authored: Thu Mar 10 16:39:21 2016 +
Committer: Alex Heneveld 
Committed: Thu Mar 10 16:39:21 2016 +

--
 .../apache/brooklyn/core/BrooklynVersion.java   |  45 +-
 .../brooklyn/core/BrooklynVersionService.java   |  39 +
 .../org/apache/brooklyn/core/OsgiLauncher.java  | 557 -
 .../resources/OSGI-INF/blueprint/blueprint.xml  |  41 +-
 karaf/apache-brooklyn/pom.xml   |   1 +
 .../etc/org.apache.brooklyn.osgilauncher.cfg|   6 +
 karaf/features/src/main/feature/feature.xml |   7 +
 karaf/init/pom.xml  |  70 ++
 .../brooklyn/launcher/osgi/OsgiLauncher.java| 106 +++
 .../resources/OSGI-INF/blueprint/blueprint.xml  |  90 +++
 .../java/org/apache/brooklyn/AssemblyTest.java  |   4 +-
 karaf/pom.xml   |   1 +
 launcher-common/pom.xml |  92 +++
 .../brooklyn/launcher/common/BasicLauncher.java | 766 ++
 .../common/BrooklynPropertiesFactoryHelper.java | 138 
 .../BrooklynPropertiesFactoryHelperTest.java| 138 
 launcher/pom.xml|  29 +-
 .../org/apache/brooklyn/launcher/Activator.java |  41 -
 .../brooklyn/launcher/BrooklynLauncher.java | 797 ++-
 .../launcher/config/BrooklynGlobalConfig.java   |   3 +
 .../brooklyn/launcher/BrooklynLauncherTest.java | 130 +--
 pom.xml |   1 +
 .../resources/OSGI-INF/blueprint/service.xml|   3 -
 23 files changed, 1587 insertions(+), 1518 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e9c52d7c/pom.xml
--

[2/7] brooklyn-server git commit: [BROOKLYN-183] Reuse classic init code, loading CAMP platform

2016-03-14 Thread heneveld 
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/090b16cd/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynLauncher.java
--
diff --git 
a/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynLauncher.java 
b/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynLauncher.java
index 54f5c21..476c897 100644
--- a/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynLauncher.java
+++ b/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynLauncher.java
@@ -18,88 +18,50 @@
  */
 package org.apache.brooklyn.launcher;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 import java.io.Closeable;
-import java.io.File;
 import java.net.InetAddress;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeoutException;
 
-import javax.annotation.Nullable;
-
 import org.apache.brooklyn.api.entity.Application;
 import org.apache.brooklyn.api.entity.EntitySpec;
 import org.apache.brooklyn.api.location.Location;
-import org.apache.brooklyn.api.location.LocationSpec;
 import org.apache.brooklyn.api.location.PortRange;
 import org.apache.brooklyn.api.mgmt.ManagementContext;
-import org.apache.brooklyn.api.mgmt.ha.HighAvailabilityManager;
-import org.apache.brooklyn.api.mgmt.ha.HighAvailabilityMode;
-import org.apache.brooklyn.api.mgmt.ha.ManagementNodeState;
-import org.apache.brooklyn.api.mgmt.ha.ManagementPlaneSyncRecord;
-import org.apache.brooklyn.api.mgmt.ha.ManagementPlaneSyncRecordPersister;
-import org.apache.brooklyn.api.mgmt.rebind.PersistenceExceptionHandler;
-import org.apache.brooklyn.api.mgmt.rebind.RebindManager;
-import org.apache.brooklyn.api.mgmt.rebind.mementos.BrooklynMementoRawData;
-import org.apache.brooklyn.camp.CampPlatform;
-import org.apache.brooklyn.camp.brooklyn.BrooklynCampPlatformLauncherNoServer;
-import org.apache.brooklyn.config.ConfigKey;
-import org.apache.brooklyn.core.catalog.internal.CatalogInitialization;
 import org.apache.brooklyn.core.config.ConfigPredicates;
-import org.apache.brooklyn.core.entity.Entities;
-import org.apache.brooklyn.core.entity.StartableApplication;
 import org.apache.brooklyn.core.entity.trait.Startable;
 import org.apache.brooklyn.core.internal.BrooklynProperties;
 import org.apache.brooklyn.core.location.PortRanges;
-import org.apache.brooklyn.core.mgmt.EntityManagementUtils;
-import org.apache.brooklyn.core.mgmt.ha.HighAvailabilityManagerImpl;
-import 
org.apache.brooklyn.core.mgmt.ha.ManagementPlaneSyncRecordPersisterToObjectStore;
 import org.apache.brooklyn.core.mgmt.internal.BrooklynShutdownHooks;
-import org.apache.brooklyn.core.mgmt.internal.LocalManagementContext;
 import org.apache.brooklyn.core.mgmt.internal.ManagementContextInternal;
-import 
org.apache.brooklyn.core.mgmt.persist.BrooklynMementoPersisterToObjectStore;
-import org.apache.brooklyn.core.mgmt.persist.BrooklynPersistenceUtils;
 import org.apache.brooklyn.core.mgmt.persist.PersistMode;
-import org.apache.brooklyn.core.mgmt.persist.PersistenceObjectStore;
-import org.apache.brooklyn.core.mgmt.rebind.PersistenceExceptionHandlerImpl;
-import org.apache.brooklyn.core.mgmt.rebind.RebindManagerImpl;
-import org.apache.brooklyn.core.mgmt.rebind.transformer.CompoundTransformer;
-import org.apache.brooklyn.core.server.BrooklynServerConfig;
-import org.apache.brooklyn.core.server.BrooklynServerPaths;
 import org.apache.brooklyn.entity.brooklynnode.BrooklynNode;
 import org.apache.brooklyn.entity.brooklynnode.LocalBrooklynNode;
 import org.apache.brooklyn.entity.software.base.SoftwareProcess;
+import org.apache.brooklyn.launcher.common.BasicLauncher;
 import org.apache.brooklyn.launcher.common.BrooklynPropertiesFactoryHelper;
 import org.apache.brooklyn.launcher.config.StopWhichAppsOnShutdown;
-import 
org.apache.brooklyn.location.localhost.LocalhostMachineProvisioningLocation.LocalhostMachine;
 import org.apache.brooklyn.rest.BrooklynWebConfig;
 import org.apache.brooklyn.rest.filter.BrooklynPropertiesSecurityFilter;
 import 
org.apache.brooklyn.rest.security.provider.BrooklynUserWithRandomPasswordSecurityProvider;
 import org.apache.brooklyn.rest.util.ShutdownHandler;
 import org.apache.brooklyn.util.exceptions.Exceptions;
-import org.apache.brooklyn.util.exceptions.FatalConfigurationRuntimeException;
 import org.apache.brooklyn.util.exceptions.FatalRuntimeException;
 import org.apache.brooklyn.util.exceptions.RuntimeInterruptedException;
 import org.apache.brooklyn.util.net.Networking;
 import org.apache.brooklyn.util.os.Os;
 import org.apache.brooklyn.util.stream.Streams;
-import org.apache.brooklyn.util.text.Strings;
 import org.apache.brooklyn.util.time.Duration;
 import org.apache.brooklyn.util.time.Time;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.annotations.Beta;
 import com.google.common.base.Function;

[3/7] brooklyn-server git commit: [BROOKLYN-183] Reuse classic init code, loading CAMP platform

2016-03-14 Thread heneveld 
[BROOKLYN-183] Reuse classic init code, loading CAMP platform


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

Branch: refs/heads/master
Commit: 090b16cd8b58072c45204bd642f54124d67bccb7
Parents: e6b3ad9
Author: Svetoslav Neykov 
Authored: Tue Mar 8 12:06:01 2016 +0200
Committer: Svetoslav Neykov 
Committed: Wed Mar 9 18:27:48 2016 +0200

--
 .../apache/brooklyn/core/BrooklynVersion.java   |  45 +-
 .../brooklyn/core/BrooklynVersionService.java   |  39 +
 .../org/apache/brooklyn/core/OsgiLauncher.java  | 558 --
 .../resources/OSGI-INF/blueprint/blueprint.xml  |  33 +
 karaf/features/src/main/feature/feature.xml |   1 +
 karaf/init/pom.xml  |   1 +
 .../brooklyn/launcher/osgi/OsgiLauncher.java| 106 +++
 .../resources/OSGI-INF/blueprint/blueprint.xml  |  47 +-
 .../java/org/apache/brooklyn/AssemblyTest.java  |   4 +-
 launcher-common/pom.xml |  10 +
 .../brooklyn/launcher/common/BasicLauncher.java | 766 +++
 .../common/BrooklynPropertiesFactoryHelper.java |  69 +-
 .../brooklyn/launcher/BrooklynLauncher.java | 726 ++
 .../resources/OSGI-INF/blueprint/service.xml|   3 -
 14 files changed, 1128 insertions(+), 1280 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/090b16cd/core/src/main/java/org/apache/brooklyn/core/BrooklynVersion.java
--
diff --git a/core/src/main/java/org/apache/brooklyn/core/BrooklynVersion.java 
b/core/src/main/java/org/apache/brooklyn/core/BrooklynVersion.java
index f18e707..12d6889 100644
--- a/core/src/main/java/org/apache/brooklyn/core/BrooklynVersion.java
+++ b/core/src/main/java/org/apache/brooklyn/core/BrooklynVersion.java
@@ -23,7 +23,11 @@ import static 
com.google.common.base.Preconditions.checkNotNull;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
+import java.util.Arrays;
+import java.util.Dictionary;
 import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 import java.util.concurrent.atomic.AtomicReference;
@@ -31,43 +35,37 @@ import java.util.jar.Attributes;
 
 import javax.annotation.Nullable;
 
-import org.osgi.framework.Constants;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Optional;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Maps;
-import java.util.Arrays;
-import java.util.Dictionary;
-import java.util.Hashtable;
-import java.util.List;
-
 import org.apache.brooklyn.api.catalog.CatalogItem;
 import org.apache.brooklyn.api.mgmt.ManagementContext;
 import 
org.apache.brooklyn.core.mgmt.classloading.OsgiBrooklynClassLoadingContext;
 import org.apache.brooklyn.core.mgmt.ha.OsgiManager;
 import org.apache.brooklyn.core.mgmt.internal.ManagementContextInternal;
-import org.apache.brooklyn.util.core.ResourceUtils;
 import org.apache.brooklyn.rt.felix.ManifestHelper;
-import org.apache.brooklyn.util.core.osgi.Osgis;
+import org.apache.brooklyn.util.core.ResourceUtils;
 import org.apache.brooklyn.util.exceptions.Exceptions;
 import org.apache.brooklyn.util.guava.Maybe;
 import org.apache.brooklyn.util.osgi.OsgiUtil;
 import org.apache.brooklyn.util.stream.Streams;
 import org.apache.brooklyn.util.text.Strings;
 import org.osgi.framework.Bundle;
+import org.osgi.framework.Constants;
 import org.osgi.framework.FrameworkUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.base.Objects;
+import com.google.common.base.Optional;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Maps;
 
 /**
  * Wraps the version of Brooklyn.
  * 
  * Also retrieves the SHA-1 from any OSGi bundle, and checks that the maven 
and osgi versions match.
  */
-public class BrooklynVersion {
+public class BrooklynVersion implements BrooklynVersionService {
 
 private static final Logger log = 
LoggerFactory.getLogger(BrooklynVersion.class);
 
@@ -101,6 +99,7 @@ public class BrooklynVersion {
 checkVersions();
 }
 
+@Override
 public void checkVersions() {
 String mvnVersion = getVersionFromMavenProperties();
 if (mvnVersion !=

[3/4] brooklyn-client git commit: Add recursive listing

2016-03-14 Thread svet 
Add recursive listing


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

Branch: refs/heads/master
Commit: a0b58de5fa4e7477463b8cd6d785996f2109a21f
Parents: a8fa7fb
Author: Geoff Macartney 
Authored: Mon Mar 14 11:44:19 2016 +
Committer: Geoff Macartney 
Committed: Mon Mar 14 11:44:19 2016 +

--
 release/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/a0b58de5/release/build.sh
--
diff --git a/release/build.sh b/release/build.sh
index 3ceab7c..b04f6fb 100755
--- a/release/build.sh
+++ b/release/build.sh
@@ -247,7 +247,7 @@ fi
 echo
 echo Successfully built the following binaries:
 echo
-ls -al ${GOPATH}/bin/
+ls -alR ${GOPATH}/bin/
 echo
 
 END_TIME=$(date +%s)

[1/4] brooklyn-client git commit: Ensure explicit use of bash

2016-03-14 Thread svet 
Repository: brooklyn-client
Updated Branches:
  refs/heads/master 02b1fc6ad -> ad86b5851


Ensure explicit use of bash


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

Branch: refs/heads/master
Commit: f26f35bf70c01d8d3f3b1bbfa25c473284400912
Parents: 02b1fc6
Author: Geoff Macartney 
Authored: Mon Mar 14 11:10:45 2016 +
Committer: Geoff Macartney 
Committed: Mon Mar 14 11:10:45 2016 +

--
 release/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/f26f35bf/release/build.sh
--
diff --git a/release/build.sh b/release/build.sh
index b82dfbd..e33f0ed 100755
--- a/release/build.sh
+++ b/release/build.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 # 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

[2/4] brooklyn-client git commit: Fix typo

2016-03-14 Thread svet 
Fix typo


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

Branch: refs/heads/master
Commit: a8fa7fb3b112ccfde9d7c402918bca395f096aa7
Parents: f26f35b
Author: Geoff Macartney 
Authored: Mon Mar 14 11:32:50 2016 +
Committer: Geoff Macartney 
Committed: Mon Mar 14 11:32:50 2016 +

--
 release/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/a8fa7fb3/release/build.sh
--
diff --git a/release/build.sh b/release/build.sh
index e33f0ed..3ceab7c 100755
--- a/release/build.sh
+++ b/release/build.sh
@@ -247,7 +247,7 @@ fi
 echo
 echo Successfully built the following binaries:
 echo
-ls -al ${GO_PATH}/bin/
+ls -al ${GOPATH}/bin/
 echo
 
 END_TIME=$(date +%s)

[2/3] brooklyn-library git commit: Update NonProvisioningController

2016-03-14 Thread aledsage 
Update NonProvisioningController

- Bring the code more inline with how AbstractController is written.
- Tested it with the downstream project:
  https://github.com/cloudsoft/brooklyn-aws-elb/


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

Branch: refs/heads/master
Commit: 7e695d19ef599d2d67ab81822106781db6bbfe33
Parents: 3bdd17e
Author: Aled Sage 
Authored: Fri Feb 19 19:37:06 2016 +
Committer: Aled Sage 
Committed: Fri Mar 11 22:28:25 2016 +

--
 .../entity/proxy/AbstractControllerImpl.java|   2 +-
 .../proxy/AbstractNonProvisionedController.java |   4 +
 .../AbstractNonProvisionedControllerImpl.java   | 321 ---
 3 files changed, 219 insertions(+), 108 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/7e695d19/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/AbstractControllerImpl.java
--
diff --git 
a/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/AbstractControllerImpl.java
 
b/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/AbstractControllerImpl.java
index 47ef7a9..257882d 100644
--- 
a/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/AbstractControllerImpl.java
+++ 
b/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/AbstractControllerImpl.java
@@ -499,7 +499,7 @@ public abstract class AbstractControllerImpl extends 
SoftwareProcessImpl impleme
 }
 
 // Utilities for modifying an AttributeSensor of type map
-private static class MapAttribute {
+static class MapAttribute {
 public static  V put(Entity entity, AttributeSensor> 
attribute, K key, V value) {
 Map oldMap = entity.getAttribute(attribute);
 Map newMap = MutableMap.copyOf(oldMap);

http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/7e695d19/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/AbstractNonProvisionedController.java
--
diff --git 
a/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/AbstractNonProvisionedController.java
 
b/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/AbstractNonProvisionedController.java
index 70df171..cbcfe65 100644
--- 
a/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/AbstractNonProvisionedController.java
+++ 
b/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/AbstractNonProvisionedController.java
@@ -18,6 +18,8 @@
  */
 package org.apache.brooklyn.entity.proxy;
 
+import java.util.Set;
+
 import org.apache.brooklyn.api.entity.Entity;
 import org.apache.brooklyn.api.entity.ImplementedBy;
 
@@ -25,4 +27,6 @@ import org.apache.brooklyn.api.entity.ImplementedBy;
 public interface AbstractNonProvisionedController extends LoadBalancer, Entity 
{
 
 public boolean isActive();
+
+Set getServerPoolAddresses();
 }

http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/7e695d19/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/AbstractNonProvisionedControllerImpl.java
--
diff --git 
a/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/AbstractNonProvisionedControllerImpl.java
 
b/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/AbstractNonProvisionedControllerImpl.java
index 137be36..c26235a 100644
--- 
a/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/AbstractNonProvisionedControllerImpl.java
+++ 
b/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/AbstractNonProvisionedControllerImpl.java
@@ -18,9 +18,9 @@
  */
 package org.apache.brooklyn.entity.proxy;
 
-import static com.google.common.base.Preconditions.checkState;
 import static org.apache.brooklyn.util.JavaGroovyEquivalents.groovyTruth;
 
+import java.net.URI;
 import java.util.Collection;
 import java.util.Map;
 import java.util.Set;
@@ -28,20 +28,28 @@ import java.util.Set;
 import org.apache.brooklyn.api.entity.Entity;
 import org.apache.brooklyn.api.entity.Group;
 import org.apache.brooklyn.api.location.Location;
+import org.apache.brooklyn.api.mgmt.Task;
+import org.apache.brooklyn.api.policy.Policy;
 import org.apache.brooklyn.api.policy.PolicySpec;
 import org.apache.brooklyn.api.sensor.AttributeSensor;
 import org.apache.brooklyn.core.entity.AbstractEntity;
+import org.apache.brooklyn.core.entity.Entities;
+import

[3/3] brooklyn-library git commit: This closes #10

2016-03-14 Thread aledsage 
This closes #10


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

Branch: refs/heads/master
Commit: 8a239404bc218e6cbd31071fee59fc787486ff4d
Parents: 65fb696 7e695d1
Author: Aled Sage 
Authored: Mon Mar 14 09:51:58 2016 +
Committer: Aled Sage 
Committed: Mon Mar 14 09:51:58 2016 +

--
 .../entity/proxy/AbstractControllerImpl.java|   5 +-
 .../proxy/AbstractNonProvisionedController.java |   4 +
 .../AbstractNonProvisionedControllerImpl.java   | 321 ---
 3 files changed, 220 insertions(+), 110 deletions(-)
--

[1/3] brooklyn-library git commit: AbstractControllerImpl: minor tidies

2016-03-14 Thread aledsage 
Repository: brooklyn-library
Updated Branches:
  refs/heads/master 65fb69694 -> 8a239404b


AbstractControllerImpl: minor tidies

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

Branch: refs/heads/master
Commit: 3bdd17e3b70a30278a897496b0aab10f6f894ffb
Parents: 65fb696
Author: Aled Sage 
Authored: Fri Feb 19 19:36:05 2016 +
Committer: Aled Sage 
Committed: Fri Mar 11 17:51:55 2016 +

--
 .../org/apache/brooklyn/entity/proxy/AbstractControllerImpl.java  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/3bdd17e3/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/AbstractControllerImpl.java
--
diff --git 
a/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/AbstractControllerImpl.java
 
b/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/AbstractControllerImpl.java
index 5c4c443..47ef7a9 100644
--- 
a/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/AbstractControllerImpl.java
+++ 
b/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/AbstractControllerImpl.java
@@ -80,7 +80,6 @@ public abstract class AbstractControllerImpl extends 
SoftwareProcessImpl impleme
 protected AbstractMembershipTrackingPolicy serverPoolMemberTrackerPolicy;
 // final because this is the synch target
 final protected Set serverPoolAddresses = Sets.newLinkedHashSet();
-protected Map serverPoolTargets = Maps.newLinkedHashMap();
 
 public AbstractControllerImpl() {
 this(MutableMap.of(), null, null);
@@ -150,7 +149,7 @@ public abstract class AbstractControllerImpl extends 
SoftwareProcessImpl impleme
 // but synch in case invoked at other times; and note if !isActive 
during start means we miss some after this,
 // we will update again on postStart after setting isActive=true
 Map serverPoolTargets = Maps.newLinkedHashMap();
-for (Entity member : getServerPool().getMembers()) {
+for (Entity member : serverPool.getMembers()) {
 if (belongsInServerPool(member)) {
 if (LOG.isTraceEnabled()) LOG.trace("Done {} checkEntity 
{}", this, member);
 String address = getAddressOfEntity(member);