date:20160319

[04/18] brooklyn-server git commit: misc deprecation updates

2016-03-19 Thread heneveld

misc deprecation updates


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

Branch: refs/heads/master
Commit: 515af88879f541e28c907237c7c28a817d0113d0
Parents: 40fd76d
Author: Alex Heneveld 
Authored: Tue Mar 15 12:16:32 2016 +
Committer: Alex Heneveld 
Committed: Tue Mar 15 12:16:32 2016 +

--
 .../camp/brooklyn/EmptySoftwareProcessYamlTest.java  |  1 -
 .../camp/brooklyn/ReloadBrooklynPropertiesTest.java  |  6 ++
 .../brooklyn/TestSensorAndEffectorInitializer.java   |  3 +--
 .../camp/brooklyn/VanillaBashNetcatYamlTest.java | 15 +++
 .../brooklyn/camp/brooklyn/WindowsYamlLiveTest.java  |  6 +++---
 5 files changed, 13 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/515af888/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/EmptySoftwareProcessYamlTest.java
--
diff --git 
a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/EmptySoftwareProcessYamlTest.java
 
b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/EmptySoftwareProcessYamlTest.java
index 0554917..35a896a 100644
--- 
a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/EmptySoftwareProcessYamlTest.java
+++ 
b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/EmptySoftwareProcessYamlTest.java
@@ -29,7 +29,6 @@ import org.apache.brooklyn.core.entity.Entities;
 import org.apache.brooklyn.core.entity.EntityAsserts;
 import org.apache.brooklyn.entity.software.base.EmptySoftwareProcess;
 import org.apache.brooklyn.location.ssh.SshMachineLocation;
-import org.apache.brooklyn.test.EntityTestUtils;
 import org.apache.brooklyn.util.collections.Jsonya;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/515af888/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ReloadBrooklynPropertiesTest.java
--
diff --git 
a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ReloadBrooklynPropertiesTest.java
 
b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ReloadBrooklynPropertiesTest.java
index a5263f6..504b605 100644
--- 
a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ReloadBrooklynPropertiesTest.java
+++ 
b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ReloadBrooklynPropertiesTest.java
@@ -23,13 +23,11 @@ import java.io.Reader;
 import org.apache.brooklyn.api.entity.Entity;
 import org.apache.brooklyn.api.mgmt.ManagementContext;
 import org.apache.brooklyn.camp.CampPlatform;
-import org.apache.brooklyn.camp.brooklyn.BrooklynCampConstants;
-import org.apache.brooklyn.camp.brooklyn.BrooklynCampPlatformLauncherNoServer;
 import org.apache.brooklyn.camp.spi.Assembly;
 import org.apache.brooklyn.camp.spi.AssemblyTemplate;
 import org.apache.brooklyn.core.entity.Entities;
+import org.apache.brooklyn.core.entity.EntityAsserts;
 import org.apache.brooklyn.core.entity.trait.Startable;
-import org.apache.brooklyn.test.EntityTestUtils;
 import org.apache.brooklyn.util.core.ResourceUtils;
 import org.apache.brooklyn.util.exceptions.Exceptions;
 import org.apache.brooklyn.util.stream.Streams;
@@ -78,7 +76,7 @@ public class ReloadBrooklynPropertiesTest {
 final Entity app = 
brooklynMgmt.getEntityManager().getEntity(assembly.getId());
 LOG.info("App - " + app);
 Assert.assertEquals(app.getDisplayName(), 
"test-entity-basic-template");
-EntityTestUtils.assertAttributeEqualsEventually(app, 
Startable.SERVICE_UP, true);
+EntityAsserts.assertAttributeEqualsEventually(app, 
Startable.SERVICE_UP, true);
 } catch (Exception e) {
 LOG.warn("Unable to instantiate " + template + " (rethrowing): " + 
e);
 throw Exceptions.propagate(e);

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/515af888/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/TestSensorAndEffectorInitializer.java
--
diff --git 
a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/TestSensorAndEffectorInitializer.java
 
b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/TestSensorAndEffectorInitializer.java
index 91c18ed..72c427f 100644
---

[12/16] brooklyn-ui git commit: Swap localhost main type for advanced

2016-03-19 Thread heneveld

Swap localhost main type for advanced


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

Branch: refs/heads/master
Commit: 3a49e64ce2e5ed49598c3b18c35488626974d9c4
Parents: fd32f2d
Author: Thomas Bouron 
Authored: Fri Mar 18 09:55:38 2016 +
Committer: Thomas Bouron 
Committed: Fri Mar 18 09:55:38 2016 +

--
 src/main/webapp/assets/js/view/catalog.js   |  1 +
 .../webapp/assets/js/view/location-wizard.js| 98 +++-
 .../tpl/location-wizard/location-type.html  | 12 +--
 3 files changed, 62 insertions(+), 49 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/3a49e64c/src/main/webapp/assets/js/view/catalog.js
--
diff --git a/src/main/webapp/assets/js/view/catalog.js 
b/src/main/webapp/assets/js/view/catalog.js
index 0493355..0dfd3da 100644
--- a/src/main/webapp/assets/js/view/catalog.js
+++ b/src/main/webapp/assets/js/view/catalog.js
@@ -191,6 +191,7 @@ define([
 addViewParent.loadAccordionItem("locations", data.id, true);
 },
 onFinish: function(wizard, data) {
+addViewParent.loadAccordionItem("locations", data.id);
 addView.clearWithHtml( "Added: "+data.id+". Loading..." );
 }
 }).render();

http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/3a49e64c/src/main/webapp/assets/js/view/location-wizard.js
--
diff --git a/src/main/webapp/assets/js/view/location-wizard.js 
b/src/main/webapp/assets/js/view/location-wizard.js
index 74374e2..375baa1 100644
--- a/src/main/webapp/assets/js/view/location-wizard.js
+++ b/src/main/webapp/assets/js/view/location-wizard.js
@@ -105,7 +105,7 @@ define([
 
 // Render actions buttons
 var actionContainer = this.$('.location-wizard-actions').empty();
-if ((this.type === 'cloud' && this.step === 2) || (this.type !== 
'cloud' && this.step === 1)) {
+if (this.step === 2 || (this.type === 'byon' && this.step === 1)) {
 _.each(this.actions, function(element, index, list) {
 actionContainer.append($('').addClass('btn 
btn-mini btn-info location-wizard-action ' + 
element.class).html(element.label));
 });
@@ -130,7 +130,7 @@ define([
 }
 if (this.step == this.steps.length - 1) {
 next.hide();
-} else if (this.step == this.steps.length - 2 && this.type !== 
'cloud') {
+} else if (this.step == this.steps.length - 2 && this.type === 
'byon') {
 next.hide();
 } else {
 next.show();
@@ -385,7 +385,7 @@ define([
 require: true
 }
 ],
-localhost: [
+byon: [
 {
 id: 'name',
 label: 'Location ID',
@@ -404,28 +404,36 @@ define([
 id: 'user',
 label: 'User',
 type: 'text',
-help: 'The user to use to connect to localhost'
+help: 'The user to use to connect to the machines'
 },
 {
 id: 'password',
 label: 'Password',
 type: 'password',
-help: 'The password to use to connect to localhost'
+help: 'The password to use to connect to the machines'
 },
 {
 id: 'privateKeyFile',
 label: 'Private Key',
 type: 'textarea',
-help: 'Content of a private key file use to connect to 
localhost (the corresponding public key needs to be add into your 
.authorized_keycode> file)'
+help: 'Content of a private key file use to connect to the 
machines (the corresponding public key needs to be add into your 
.authorized_keycode> file)'
 },
 {
 id: 'privateKeyPassphrase',
 label: 'Private Key Passphrase',
 type: 'text',
 help: 'The passphrase to unlock the private key specified 
abve (if applicable)'
+},
+{
+id: 'hosts',
+label: 'Hosts',
+type: 'textarea',
+help: 'List of host IP addresses, one per

[1/2] brooklyn git commit: update license

2016-03-19 Thread heneveld

Repository: brooklyn
Updated Branches:
  refs/heads/master 1fa9a8b5e -> f74dae097


update license


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

Branch: refs/heads/master
Commit: b1e89c40b4811eaa7549e87529cf01c90c4296da
Parents: 1fa9a8b
Author: Alex Heneveld 
Authored: Fri Mar 18 14:35:26 2016 +
Committer: Alex Heneveld 
Committed: Fri Mar 18 14:35:26 2016 +

--
 LICENSE | 6 ++
 1 file changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/brooklyn/blob/b1e89c40/LICENSE
--
diff --git a/LICENSE b/LICENSE
index 13e9bcc..ccac2ba 100644
--- a/LICENSE
+++ b/LICENSE
@@ -281,6 +281,12 @@ This project includes the software: DataTables Table 
plug-in for jQuery
   Used under the following license: The BSD 3-Clause (New BSD) License 
(http://opensource.org/licenses/BSD-3-Clause)
   Copyright (c) Allan Jardine (2008-2012)
 
+This project includes the software: jquery.easy-autocomplete.js
+  Available at: https://github.com/pawelczak/EasyAutocomplete
+  Version used: 1.3.1
+  Used under the following license: The MIT License 
(http://opensource.org/licenses/MIT)
+  Copyright (c) Åukasz PaweÅczak (2015)
+
 This project includes the software: jQuery Form Plugin
   Available at: https://github.com/malsup/form
   Developed by: Mike Alsup (http://malsup.com/)

[15/18] brooklyn-server git commit: This closes #67

2016-03-19 Thread heneveld

This closes #67


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

Branch: refs/heads/master
Commit: 41a8d66db06e6b5b97b68d5890dc0a5f68980733
Parents: dfcc6df 60f470d
Author: Alex Heneveld 
Authored: Thu Mar 17 18:42:16 2016 +
Committer: Alex Heneveld 
Committed: Thu Mar 17 18:42:16 2016 +

--
 .../apache/brooklyn/location/ssh/SshMachineLocation.java | 11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/41a8d66d/core/src/main/java/org/apache/brooklyn/location/ssh/SshMachineLocation.java
--

[6/6] brooklyn-docs git commit: update license

2016-03-19 Thread heneveld

update license


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

Branch: refs/heads/master
Commit: df024e3fa0f125f18289d432b8a611f9190e3d65
Parents: b0e4f9f
Author: Alex Heneveld 
Authored: Fri Mar 18 14:34:06 2016 +
Committer: Alex Heneveld 
Committed: Fri Mar 18 14:34:06 2016 +

--
 LICENSE | 6 ++
 1 file changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/df024e3f/LICENSE
--
diff --git a/LICENSE b/LICENSE
index 13e9bcc..ccac2ba 100644
--- a/LICENSE
+++ b/LICENSE
@@ -281,6 +281,12 @@ This project includes the software: DataTables Table 
plug-in for jQuery
   Used under the following license: The BSD 3-Clause (New BSD) License 
(http://opensource.org/licenses/BSD-3-Clause)
   Copyright (c) Allan Jardine (2008-2012)
 
+This project includes the software: jquery.easy-autocomplete.js
+  Available at: https://github.com/pawelczak/EasyAutocomplete
+  Version used: 1.3.1
+  Used under the following license: The MIT License 
(http://opensource.org/licenses/MIT)
+  Copyright (c) Åukasz PaweÅczak (2015)
+
 This project includes the software: jQuery Form Plugin
   Available at: https://github.com/malsup/form
   Developed by: Mike Alsup (http://malsup.com/)

[05/16] brooklyn-dist git commit: Make release script: submodule fixes

2016-03-19 Thread heneveld

Make release script: submodule fixes

git clean all submodules and display commit IDs for all submodules.

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

Branch: refs/heads/master
Commit: 7dea96ad863c52d46476d79cac4bced592098bfc
Parents: de1c425
Author: Richard Downer 
Authored: Wed Mar 16 16:01:46 2016 +
Committer: Richard Downer 
Committed: Wed Mar 16 16:09:36 2016 +

--
 release/make-release-artifacts.sh | 10 --
 1 file changed, 8 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/7dea96ad/release/make-release-artifacts.sh
--
diff --git a/release/make-release-artifacts.sh 
b/release/make-release-artifacts.sh
index d2257c4..c15fdaa 100755
--- a/release/make-release-artifacts.sh
+++ b/release/make-release-artifacts.sh
@@ -145,9 +145,13 @@ fi
 # A GPG no-op, but causes the password request to happen. It should then be 
cached by gpg-agent.
 gpg2 -o /dev/null --sign /dev/null
 
+# Discover submodules
+submodules="$( perl -n -e 'if ($_ =~ /path += +(.*)$/) { print $1."\n" }' < 
.gitmodules )"
+modules=". ${submodules}"
+
 ###
 # Clean the workspace
-git clean -dxf
+for module in ${modules}; do ( cd $module && git clean -dxf ); done
 
 ###
 # Source release
@@ -240,4 +244,6 @@ set +x
 echo "The release is done - here is what has been created:"
 ls ${artifact_dir}
 echo "You can find these files in: ${artifact_dir}"
-echo "The git commit ID for the voting emails is: $( git rev-parse HEAD )"
+echo "The git commit IDs for the voting emails are:"
+echo -n "brooklyn: " && git rev-parse HEAD
+git submodule --quiet foreach 'echo -n "${name}: " && git rev-parse HEAD'

[07/18] brooklyn-server git commit: Fix SshMachineLocation cleanup

2016-03-19 Thread heneveld

Fix SshMachineLocation cleanup

Previously if a temporary location was created (i.e. using 
CREATE_UNMANAGED=true) then the cleanup task would execute immediately
and would close the ssh-connections-pool (potentially while the other 
thread tried to execute something).

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

Branch: refs/heads/master
Commit: 60f470d3b82b8f0d7fec686a0c005627910e100e
Parents: b70c2b0
Author: Aled Sage 
Authored: Thu Mar 17 06:48:35 2016 +
Committer: Aled Sage 
Committed: Thu Mar 17 06:48:35 2016 +

--
 .../apache/brooklyn/location/ssh/SshMachineLocation.java | 11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/60f470d3/core/src/main/java/org/apache/brooklyn/location/ssh/SshMachineLocation.java
--
diff --git 
a/core/src/main/java/org/apache/brooklyn/location/ssh/SshMachineLocation.java 
b/core/src/main/java/org/apache/brooklyn/location/ssh/SshMachineLocation.java
index 50349e6..c3d7e59 100644
--- 
a/core/src/main/java/org/apache/brooklyn/location/ssh/SshMachineLocation.java
+++ 
b/core/src/main/java/org/apache/brooklyn/location/ssh/SshMachineLocation.java
@@ -69,6 +69,7 @@ import 
org.apache.brooklyn.core.location.LocationConfigUtils.OsCredential;
 import org.apache.brooklyn.core.location.PortRanges;
 import org.apache.brooklyn.core.location.access.PortForwardManager;
 import org.apache.brooklyn.core.mgmt.BrooklynTaskTags;
+import org.apache.brooklyn.core.mgmt.internal.LocalLocationManager;
 import org.apache.brooklyn.util.collections.MutableMap;
 import org.apache.brooklyn.util.core.ResourceUtils;
 import org.apache.brooklyn.util.core.config.ConfigBag;
@@ -452,6 +453,12 @@ public class SshMachineLocation extends AbstractLocation 
implements MachineLocat
 LOG.debug("No management context for "+this+"; ssh-pool cache will 
only be closed when machine is closed");
 return;
 }
+if 
(Boolean.TRUE.equals(config().get(LocalLocationManager.CREATE_UNMANAGED))) {
+// Assume the caller will deal with the cleanup in a timely 
manner, given they have 
+// asking that the management context not treat the location as 
"managed".
+LOG.debug("Create-unmanaged for "+this+"; no explicit cleanup 
task; ssh-pool cache will only be closed when machine is closed");
+return;
+}
 
 Callable cleanupTaskFactory = new Callable() {
 @Override public Task call() {
@@ -484,7 +491,9 @@ public class SshMachineLocation extends AbstractLocation 
implements MachineLocat
 
 Duration expiryDuration = getConfig(SSH_CACHE_EXPIRY_DURATION);
 cleanupTask = getManagementContext().getExecutionManager().submit(new 
ScheduledTask(
-MutableMap.of("displayName", "scheduled[ssh-location cache 
cleaner]"), cleanupTaskFactory).period(expiryDuration));
+MutableMap.of("displayName", "scheduled[ssh-location cache 
cleaner]"), cleanupTaskFactory)
+.period(expiryDuration)
+.delay(expiryDuration));
 }
 
 // TODO close has been used for a long time to perform clean-up wanted on 
unmanagement, but that's not clear;

[02/18] brooklyn-server git commit: Merge branch 'master' into no-localhost-default

2016-03-19 Thread heneveld

Merge branch 'master' into no-localhost-default


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

Branch: refs/heads/master
Commit: bcf4d9b8abb5a1bc79fe52b295dde6e16beadb7b
Parents: d332bcc 1465b04
Author: Alex Heneveld 
Authored: Mon Mar 14 19:12:11 2016 +
Committer: Alex Heneveld 
Committed: Mon Mar 14 19:12:11 2016 +

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

[06/16] brooklyn-dist git commit: Make release script: add “dry run” mode

2016-03-19 Thread heneveld

Make release script: add âdry runâ mode

Maven deployments and SVN commits will NOT be done. This will still
delete working and temporary files, however.


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

Branch: refs/heads/master
Commit: f5d4b6a7a1a2f7738c70e8b27a5692969095e0d0
Parents: 184ad56
Author: Richard Downer 
Authored: Wed Mar 16 16:07:39 2016 +
Committer: Richard Downer 
Committed: Wed Mar 16 16:09:36 2016 +

--
 release/make-release-artifacts.sh | 38 +-
 1 file changed, 24 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/f5d4b6a7/release/make-release-artifacts.sh
--
diff --git a/release/make-release-artifacts.sh 
b/release/make-release-artifacts.sh
index f755cb5..7a9936d 100755
--- a/release/make-release-artifacts.sh
+++ b/release/make-release-artifacts.sh
@@ -49,6 +49,9 @@ release.
  the artifacts.
   -y answers "y" to all questions automatically, to
  use defaults and make this suitable for batch mode
+  -n dry run - Maven deployments and SVN commits will
+ NOT be done. This will still delete working and
+ temporary files, however.
 
 Specifying the RC number is required. Specifying the version number is
 discouraged; if auto detection is not working, then this script is buggy.
@@ -63,7 +66,7 @@ END
 # Argument parsing
 rc_suffix=
 OPTIND=1
-while getopts "h?v:r:y?" opt; do
+while getopts "h?v:r:y?:n?" opt; do
 case "$opt" in
 h|\?)
 show_help
@@ -78,6 +81,9 @@ while getopts "h?v:r:y?" opt; do
 y)
 batch_confirm_y=true
 ;;
+n)
+dry_run=true
+;;
 *)
 show_help
 exit 1
@@ -116,7 +122,7 @@ echo "The rc suffix is rc${rc_suffix}"
 echo "The release name is ${release_name}"
 echo "The artifact name is ${artifact_name}"
 echo "The artifact directory is ${artifact_dir}"
-if [ ! -z "${APACHE_DIST_SVN_DIR}" ] ; then
+if [ -z "${dry_run}" -a ! -z "${APACHE_DIST_SVN_DIR}" ] ; then
   echo "The artifacts will be copied to ${APACHE_DIST_SVN_DIR} and readied for 
commit"
 else
   echo "The artifacts will not be copied into a Subversion working copy"
@@ -130,10 +136,12 @@ echo "This includes build artifacts and all uncommitted 
local files and director
 echo "If you want to check what will happen, answer no and run 'git clean 
-dxn' to dry run."
 echo ""
 confirm || exit
-echo ""
-echo "This script will cause uploads to be made to a staging repository on the 
Apache Nexus server."
-echo ""
-confirm "Shall I continue?  [y/N]" || exit
+if [ -z "${dry_run}" ]; then
+echo ""
+echo "This script will cause uploads to be made to a staging repository on 
the Apache Nexus server."
+echo ""
+confirm "Shall I continue?  [y/N]" || exit
+fi
 
 # Set up GPG agent
 if [ ! -z "${GPG_AGENT_INFO}" ]; then
@@ -187,10 +195,12 @@ set -x
 # Workaround for bug BROOKLYN-1
 ( cd ${src_staging_dir} && mvn clean --projects :brooklyn-archetype-quickstart 
)
 
-# Perform the build and deploy to Nexus staging repository
-( cd ${src_staging_dir} && mvn deploy -Papache-release )
-## To test the script without a big deploy, use the line below instead of above
-#( cd ${src_staging_dir} && mvn clean install )
+# Perform the build
+if [ -z "${dry_run}" ]; then
+( cd ${src_staging_dir} && mvn deploy -Papache-release )
+else
+( cd ${src_staging_dir} && mvn install -Papache-release )
+fi
 
 # Re-pack the archive with the correct names
 tar xzf 
${src_staging_dir}/brooklyn-dist/dist/target/brooklyn-dist-${current_version}-dist.tar.gz
 -C ${bin_staging_dir}
@@ -230,13 +240,13 @@ which sha256sum >/dev/null || alias sha256sum='shasum -a 
256' && shopt -s expand
 
 ###
 
-if [ ! -z "${APACHE_DIST_SVN_DIR}" ] ; then
-  pushd ${APACHE_DIST_SVN_DIR}
-  rm -rf ${artifact_name}
+if [ -z "${dry_run}" -a ! -z "${APACHE_DIST_SVN_DIR}" ] ; then (
+  cd ${APACHE_DIST_SVN_DIR}
+  [ -d ${artifact_name} ] && ( svn revert -R ${artifact_name}; svn rm -R 
${artifact_name}; rm -rf ${artifact_name} )
   cp -r ${artifact_dir} ${artifact_name}
   svn add ${artifact_name}
+  )
   artifact_dir=${APACHE_DIST_SVN_DIR}/${artifact_name}
-  popd
 fi
 
 ###

[2/2] brooklyn-client git commit: This closes #9

2016-03-19 Thread aledsage

This closes #9


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

Branch: refs/heads/master
Commit: 285013a19abad7f4bcb224e77ce2a86fcb38ea52
Parents: bf696e5 daf8fea
Author: Aled Sage 
Authored: Sat Mar 19 22:30:30 2016 +
Committer: Aled Sage 
Committed: Sat Mar 19 22:30:30 2016 +

--
 io/config.go | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)
--

[1/2] brooklyn-client git commit: Close config file object (deferred close)

2016-03-19 Thread aledsage

Repository: brooklyn-client
Updated Branches:
  refs/heads/master bf696e55b -> 285013a19


Close config file object (deferred close)


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

Branch: refs/heads/master
Commit: daf8fea098c4ff2e9ea2468ae7f9cf73c69a40dc
Parents: bf696e5
Author: Lyuben Blagoev 
Authored: Thu Mar 17 09:33:28 2016 +0200
Committer: Lyuben Blagoev 
Committed: Thu Mar 17 09:33:28 2016 +0200

--
 io/config.go | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/daf8fea0/io/config.go
--
diff --git a/io/config.go b/io/config.go
index 4ba80ab..ea9ca01 100644
--- a/io/config.go
+++ b/io/config.go
@@ -20,9 +20,10 @@ package io
 
 import (
"encoding/json"
-   "github.com/apache/brooklyn-client/error_handler"
"os"
"path/filepath"
+
+   "github.com/apache/brooklyn-client/error_handler"
 )
 
 type Config struct {
@@ -48,12 +49,12 @@ func GetConfig() (config *Config) {
 }
 
 func (config *Config) Write() {
-
// Create file as read/write by user (but does not change perms of 
existing file)
fileToWrite, err := os.OpenFile(config.FilePath, 
os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0600)
if err != nil {
error_handler.ErrorExit(err)
}
+   defer fileToWrite.Close()
 
enc := json.NewEncoder(fileToWrite)
enc.Encode(config.Map)
@@ -64,6 +65,8 @@ func (config *Config) Read() {
if err != nil {
error_handler.ErrorExit(err)
}
+   defer fileToRead.Close()
+
dec := json.NewDecoder(fileToRead)
dec.Decode()
 }

brooklyn-dist git commit: update license

2016-03-19 Thread heneveld

Repository: brooklyn-dist
Updated Branches:
  refs/heads/master b6250f32a -> ab035402d


update license


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

Branch: refs/heads/master
Commit: ab035402d4a3854d9666be6f4f08cb48ae4c30b1
Parents: b6250f3
Author: Alex Heneveld 
Authored: Fri Mar 18 14:34:56 2016 +
Committer: Alex Heneveld 
Committed: Fri Mar 18 14:34:56 2016 +

--
 LICENSE | 6 ++
 dist/src/main/license/files/LICENSE | 6 ++
 2 files changed, 12 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/ab035402/LICENSE
--
diff --git a/LICENSE b/LICENSE
index 13e9bcc..ccac2ba 100644
--- a/LICENSE
+++ b/LICENSE
@@ -281,6 +281,12 @@ This project includes the software: DataTables Table 
plug-in for jQuery
   Used under the following license: The BSD 3-Clause (New BSD) License 
(http://opensource.org/licenses/BSD-3-Clause)
   Copyright (c) Allan Jardine (2008-2012)
 
+This project includes the software: jquery.easy-autocomplete.js
+  Available at: https://github.com/pawelczak/EasyAutocomplete
+  Version used: 1.3.1
+  Used under the following license: The MIT License 
(http://opensource.org/licenses/MIT)
+  Copyright (c) Åukasz PaweÅczak (2015)
+
 This project includes the software: jQuery Form Plugin
   Available at: https://github.com/malsup/form
   Developed by: Mike Alsup (http://malsup.com/)

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/ab035402/dist/src/main/license/files/LICENSE
--
diff --git a/dist/src/main/license/files/LICENSE 
b/dist/src/main/license/files/LICENSE
index d83fe1f..65ee5f7 100644
--- a/dist/src/main/license/files/LICENSE
+++ b/dist/src/main/license/files/LICENSE
@@ -510,6 +510,12 @@ This project includes the software: DataTables Table 
plug-in for jQuery
   Used under the following license: The BSD 3-Clause (New BSD) License 
(http://opensource.org/licenses/BSD-3-Clause)
   Copyright (c) Allan Jardine (2008-2012)
 
+This project includes the software: jquery.easy-autocomplete.js
+  Available at: https://github.com/pawelczak/EasyAutocomplete
+  Version used: 1.3.1
+  Used under the following license: The MIT License 
(http://opensource.org/licenses/MIT)
+  Copyright (c) Åukasz PaweÅczak (2015)
+
 This project includes the software: jQuery Form Plugin
   Available at: https://github.com/malsup/form
   Developed by: Mike Alsup (http://malsup.com/)

[07/16] brooklyn-ui git commit: Add "Edit YAML" button if user wants to manually edit the generated location

2016-03-19 Thread heneveld

Add "Edit YAML" button if user wants to manually edit the generated location


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

Branch: refs/heads/master
Commit: cea004a1c891f64adb03c82452ab4a15fb44c676
Parents: 1785d6d
Author: Thomas Bouron 
Authored: Thu Mar 17 10:56:40 2016 +
Committer: Thomas Bouron 
Committed: Thu Mar 17 12:49:11 2016 +

--
 src/main/webapp/assets/js/view/editor.js|  2 +-
 .../webapp/assets/js/view/location-wizard.js| 50 
 2 files changed, 51 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/cea004a1/src/main/webapp/assets/js/view/editor.js
--
diff --git a/src/main/webapp/assets/js/view/editor.js 
b/src/main/webapp/assets/js/view/editor.js
index c5a24f3..db10181 100644
--- a/src/main/webapp/assets/js/view/editor.js
+++ b/src/main/webapp/assets/js/view/editor.js
@@ -80,7 +80,7 @@ define([
 } else if (this.options.type === MODE_CATALOG) {
 this.setMode(MODE_CATALOG);
 } else {
-console.log("unknown mode '"+this.option.type+"'; using 
'"+MODE_APP+"'");
+console.log("unknown mode '"+this.options.type+"'; using 
'"+MODE_APP+"'");
 this.setMode(MODE_APP);
 }
 this.options.catalog = new CatalogApplication.Collection();

http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/cea004a1/src/main/webapp/assets/js/view/location-wizard.js
--
diff --git a/src/main/webapp/assets/js/view/location-wizard.js 
b/src/main/webapp/assets/js/view/location-wizard.js
index a6ade81..b7c6c6b 100644
--- a/src/main/webapp/assets/js/view/location-wizard.js
+++ b/src/main/webapp/assets/js/view/location-wizard.js
@@ -28,11 +28,18 @@ define([
 
 'jquery-easy-autocomplete'
 ], function(_, Backbone, $, Util, Location, ModalHtml, LocationTypeHtml, 
LocationConfigurationHtml, LocationProvisioningHtml, LocationProvisioningEntry) 
{
+var _YAML_HEADER = [
+'brooklyn.catalog:',
+'  version: 0.0.1',
+'  items:'
+];
+
 var Wizard = Backbone.View.extend({
 template: _.template(ModalHtml),
 events: {
 'click .location-wizard-previous': 'previousStep',
 'click .location-wizard-next': 'nextStep',
+'click .location-wizard-edit': 'edit',
 'click .location-wizard-save': 'save',
 'click .location-wizard-save-and-reset': 'saveAndReset'
 },
@@ -65,6 +72,10 @@ define([
 
 this.actions = [
 {
+label: 'Edit in YAML',
+class: 'location-wizard-edit'
+},
+{
 label: 'Save and add another',
 class: 'location-wizard-save-and-reset'
 },
@@ -151,6 +162,45 @@ define([
 return text && text.charAt(0).toUpperCase() + text.slice(1);
 },
 
+edit: function() {
+var baseSpacing = '  ';
+
+var content = [].concat(_YAML_HEADER);
+
+content.push(baseSpacing + '- id: ' + this.location.get('name'));
+
+baseSpacing += '  ';
+content.push(baseSpacing + 'itemType: location');
+content.push(baseSpacing + 'item:');
+
+baseSpacing += '  ';
+content.push(baseSpacing + 'type: ' + this.location.get('spec'));
+
+var config = this.location.get('config');
+if (_.keys(config).length > 0) {
+content.push(baseSpacing + 'brooklyn.config:');
+baseSpacing += '  ';
+
+_.each(config, function(value, key) {
+if (_.isArray(value)) {
+content.push(baseSpacing + key + ':');
+_.each(value, function(valueValue) {
+content.push(baseSpacing + '- ' + valueValue);
+});
+} else if (_.isObject(value)) {
+content.push(baseSpacing + key + ':');
+_.each(value, function(valueValue, valueKey) {
+content.push(baseSpacing + '  ' + valueKey + ': ' 
+ valueValue);
+});
+} else {
+content.push(baseSpacing + key + ': ' + value);
+}
+});
+}
+
+

[08/18] brooklyn-server git commit: first pass rewriting LocationRegistry and resolvers to return specs

2016-03-19 Thread heneveld

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/f755c25d/core/src/main/java/org/apache/brooklyn/location/multi/MultiLocationResolver.java
--
diff --git 
a/core/src/main/java/org/apache/brooklyn/location/multi/MultiLocationResolver.java
 
b/core/src/main/java/org/apache/brooklyn/location/multi/MultiLocationResolver.java
index 5d9dd19..022b7e2 100644
--- 
a/core/src/main/java/org/apache/brooklyn/location/multi/MultiLocationResolver.java
+++ 
b/core/src/main/java/org/apache/brooklyn/location/multi/MultiLocationResolver.java
@@ -34,14 +34,13 @@ import org.apache.brooklyn.api.mgmt.ManagementContext;
 import org.apache.brooklyn.core.location.BasicLocationRegistry;
 import org.apache.brooklyn.core.location.LocationConfigUtils;
 import 
org.apache.brooklyn.core.location.LocationPropertiesFromBrooklynProperties;
-import org.apache.brooklyn.core.location.Locations;
 import org.apache.brooklyn.util.collections.MutableMap;
-import org.apache.brooklyn.util.exceptions.Exceptions;
 import org.apache.brooklyn.util.text.KeyValueParser;
 import org.apache.brooklyn.util.text.StringEscapes.JavaStringEscapes;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 
 public class MultiLocationResolver implements LocationResolver {
@@ -60,11 +59,16 @@ public class MultiLocationResolver implements 
LocationResolver {
 }
 
 @Override
-public Location newLocationFromString(Map locationFlags, String spec, 
LocationRegistry registry) {
+public boolean isEnabled() {
+return LocationConfigUtils.isResolverPrefixEnabled(managementContext, 
getPrefix());
+}
+
+@Override
+public LocationSpec newLocationSpecFromString(String 
spec, Map locationFlags, LocationRegistry registry) {
 // FIXME pass all flags into the location
 
-Map globalProperties = registry.getProperties();
-Map locationArgs;
+Map globalProperties = registry.getProperties();
+Map locationArgs;
 if (spec.equalsIgnoreCase(MULTI)) {
 locationArgs = MutableMap.copyOf(locationFlags);
 } else {
@@ -74,12 +78,13 @@ public class MultiLocationResolver implements 
LocationResolver {
 }
 String args = matcher.group(2);
 // TODO we are ignoring locationFlags after this (apart from 
named), looking only at these args
-locationArgs = KeyValueParser.parseMap(args);
+locationArgs = 
MutableMap.copyOf(KeyValueParser.parseMap(args));
 }
 String namedLocation = (String) locationFlags.get("named");
 
-Map filteredProperties = new 
LocationPropertiesFromBrooklynProperties().getLocationProperties(null, 
namedLocation, globalProperties);
-MutableMap flags = MutableMap.builder()
+@SuppressWarnings({ "unchecked", "rawtypes" })
+Map filteredProperties = new 
LocationPropertiesFromBrooklynProperties().getLocationProperties(null, 
namedLocation, (Map)globalProperties);
+MutableMap flags = MutableMap.builder()
 .putAll(filteredProperties)
 .putAll(locationFlags)
 .removeAll("named")
@@ -90,50 +95,37 @@ public class MultiLocationResolver implements 
LocationResolver {
 }
 
 // TODO do we need to pass location flags etc into the children to 
ensure they are inherited?
-List targets = Lists.newArrayList();
+List targets = Lists.newArrayList();
 Object targetSpecs = locationArgs.remove("targets");
-try {
-if (targetSpecs instanceof String) {
-for (String targetSpec : 
JavaStringEscapes.unwrapJsonishListIfPossible((String)targetSpecs)) {
-
targets.add(managementContext.getLocationRegistry().resolve(targetSpec));
-}
-} else if (targetSpecs instanceof Iterable) {
-for (Object targetSpec: (Iterable)targetSpecs) {
-if (targetSpec instanceof String) {
-
targets.add(managementContext.getLocationRegistry().resolve((String)targetSpec));
-} else {
-Set keys = ((Map)targetSpec).keySet();
-if (keys.size()!=1) 
-throw new IllegalArgumentException("targets 
supplied to MultiLocation must be a list of single-entry maps (got map of size 
"+keys.size()+": "+targetSpec+")");
-Object key = keys.iterator().next();
-Object flagsS = ((Map)targetSpec).get(key);
-
targets.add(managementContext.getLocationRegistry().resolve((String)key, 
(Map)flagsS));
-}
-

[2/2] brooklyn-dist git commit: This closes #22

2016-03-19 Thread heneveld

This closes #22


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

Branch: refs/heads/master
Commit: b6250f32acda4840b48ab7d6c62adbd155dd521a
Parents: a2d513b a282e77
Author: Alex Heneveld 
Authored: Fri Mar 18 12:15:59 2016 +
Committer: Alex Heneveld 
Committed: Fri Mar 18 12:15:59 2016 +

--
 dist/licensing/overrides.yaml | 6 ++
 1 file changed, 6 insertions(+)
--

[11/16] brooklyn-dist git commit: Release Vagrantfile: download Maven instead of apt-get

2016-03-19 Thread heneveld

Release Vagrantfile: download Maven instead of apt-get

This gets us a newer version than the outdated one in Ubuntu, which is
required for Brooklyn.

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

Branch: refs/heads/master
Commit: 4c69c487594408addb082a9029363dcfa7ee6eb0
Parents: 0586975
Author: Richard Downer 
Authored: Wed Mar 16 16:48:14 2016 +
Committer: Richard Downer 
Committed: Wed Mar 16 16:48:14 2016 +

--
 release/Vagrantfile | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/4c69c487/release/Vagrantfile
--
diff --git a/release/Vagrantfile b/release/Vagrantfile
index 80aade0..2d823c1 100644
--- a/release/Vagrantfile
+++ b/release/Vagrantfile
@@ -53,13 +53,16 @@ Vagrant.configure(2) do |config|
 apt-get update
 apt-get upgrade -y
 wget -q -O /tmp/artifactory.zip http://bit.ly/Hqv9aj
-apt-get install -y default-jdk maven git subversion xmlstarlet zip unzip 
language-pack-en vim-nox gnupg2 gnupg-agent pinentry-curses
+apt-get install -y default-jdk git subversion xmlstarlet zip unzip 
language-pack-en vim-nox gnupg2 gnupg-agent pinentry-curses
 mkdir -p /opt
 unzip /tmp/artifactory.zip -d /opt
 sudo sed -i -e '/Connector port=/ s/=\".*\"/=\"'"8008"'\"/' 
/opt/artifactory*/tomcat/conf/server.xml
 /opt/artifactory*/bin/installService.sh
 service artifactory start
 chmod -R go= ~vagrant/.gnupg
+curl 
http://archive.apache.org/dist/maven/maven-3/3.1.1/binaries/apache-maven-3.1.1-bin.tar.gz
 | tar xz -C /opt
+ln -s /opt/apache-maven-3.1.1/bin/mvn /usr/local/bin
+echo "MAVEN_OPTS=\"-Xmx512m -XX:+CMSClassUnloadingEnabled 
-XX:MaxPermSize=256M\"" >> /etc/environment
 mkdir -p /work
 mount -ttmpfs -osize=3g none /work
 cat /etc/ssh/ssh_host_*_key.pub | awk '{print "localhost,127.0.0.1 "$0}' 
>> /etc/ssh/ssh_known_hosts

[04/16] brooklyn-ui git commit: Fix build issues

2016-03-19 Thread heneveld

Fix build issues


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

Branch: refs/heads/master
Commit: 2851c1ef81bf03b148455755fdce1f43961f58c8
Parents: cea004a
Author: Thomas Bouron 
Authored: Thu Mar 17 12:30:22 2016 +
Committer: Thomas Bouron 
Committed: Thu Mar 17 12:49:11 2016 +

--
 .../location-provisioning-entry.html | 19 +++
 src/test/javascript/config.txt   |  2 ++
 2 files changed, 21 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/2851c1ef/src/main/webapp/assets/tpl/location-wizard/location-provisioning-entry.html
--
diff --git 
a/src/main/webapp/assets/tpl/location-wizard/location-provisioning-entry.html 
b/src/main/webapp/assets/tpl/location-wizard/location-provisioning-entry.html
index 56eeb3e..ea1d731 100644
--- 
a/src/main/webapp/assets/tpl/location-wizard/location-provisioning-entry.html
+++ 
b/src/main/webapp/assets/tpl/location-wizard/location-provisioning-entry.html
@@ -1,3 +1,22 @@
+
+
 
 
 

http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/2851c1ef/src/test/javascript/config.txt
--
diff --git a/src/test/javascript/config.txt b/src/test/javascript/config.txt
index 5052f5e..87513b9 100644
--- a/src/test/javascript/config.txt
+++ b/src/test/javascript/config.txt
@@ -30,6 +30,7 @@
 "jquery-slideto":"js/util/jquery.slideto",
 "jquery-wiggle":"js/libs/jquery.wiggle.min",
 "jquery-ba-bbq":"js/libs/jquery.ba-bbq.min",
+"jquery-easy-autocomplete": "js/libs/jquery.easy-autocomplete",
 "moment":"js/libs/moment",
 "handlebars":"js/libs/handlebars-1.0.rc.1",
 "brooklyn":"js/util/brooklyn",
@@ -76,6 +77,7 @@
 "jquery-slideto": { deps: [ "jquery" ] },
 "jquery-wiggle": { deps: [ "jquery" ] },
 "jquery-ba-bbq": { deps: [ "jquery" ] },
+"jquery-easy-autocomplete": { deps: [ "jquery" ] },
 "handlebars": { deps: [ "jquery" ] },
 "bootstrap": { deps: [ "jquery" ] /* 
http://stackoverflow.com/questions/9227406/bootstrap-typeerror-undefined-is-not-a-function-has-no-method-tab-when-us
 */ }
 },

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

2016-03-19 Thread heneveld

This closes #68


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

Branch: refs/heads/master
Commit: 16ee522c5a44b960d78886801731acc0817d530b
Parents: a16f8c7 f718bff
Author: Alex Heneveld 
Authored: Thu Mar 17 18:44:39 2016 +
Committer: Alex Heneveld 
Committed: Thu Mar 17 18:44:39 2016 +

--
 .../core/entity/lifecycle/ServiceStateLogic.java  |  6 ++
 .../stock/AbstractMultipleSensorAggregator.java   | 18 +-
 2 files changed, 15 insertions(+), 9 deletions(-)
--

[18/18] brooklyn-server git commit: This closes #70

2016-03-19 Thread heneveld

This closes #70


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

Branch: refs/heads/master
Commit: 5c8cdfa884f1808d0ce539146d5100ccfb6b3272
Parents: 23ed194 138e0f6
Author: Alex Heneveld 
Authored: Fri Mar 18 11:06:02 2016 +
Committer: Alex Heneveld 
Committed: Fri Mar 18 11:06:02 2016 +

--
 .../apache/brooklyn/api/entity/EntitySpec.java  |  59 +++--
 .../internal/AbstractBrooklynObjectSpec.java|   5 +
 .../api/location/LocationDefinition.java|   2 +-
 .../brooklyn/api/location/LocationRegistry.java |  75 ---
 .../brooklyn/api/location/LocationResolver.java |  23 +---
 .../brooklyn/api/mgmt/LocationManager.java  |   5 +
 .../BrooklynComponentTemplateResolver.java  |   6 +-
 .../creation/BrooklynYamlLocationResolver.java  |  29 ++--
 .../spi/creation/CampInternalUtils.java |  15 +--
 .../camp/brooklyn/ByonLocationsYamlTest.java|   2 +-
 .../brooklyn/EmptySoftwareProcessYamlTest.java  |   1 -
 .../ExternalConfigBrooklynPropertiesTest.java   |   2 +-
 .../camp/brooklyn/LocationsYamlTest.java|   4 +-
 .../brooklyn/ReloadBrooklynPropertiesTest.java  |   6 +-
 .../TestSensorAndEffectorInitializer.java   |   3 +-
 .../brooklyn/VanillaBashNetcatYamlTest.java |  15 +--
 .../camp/brooklyn/WindowsYamlLiveTest.java  |   6 +-
 .../catalog/CatalogYamlLocationTest.java|  64 +
 .../apache/brooklyn/core/config/ConfigKeys.java |   2 +-
 .../brooklyn/core/entity/trait/Startable.java   |   2 +-
 .../core/location/AbstractLocationResolver.java |  18 ++-
 .../core/location/BasicLocationRegistry.java| 132 ++-
 .../core/location/CatalogLocationResolver.java  |  34 -
 .../location/DefinedLocationByIdResolver.java   |  11 +-
 .../core/location/LocationConfigUtils.java  |  13 +-
 .../brooklyn/core/location/Locations.java   |  23 +++-
 .../core/location/NamedLocationResolver.java|  14 +-
 .../location/access/PortForwardManagerImpl.java |   1 -
 .../PortForwardManagerLocationResolver.java |  73 +++---
 .../location/internal/LocationInternal.java |   3 -
 .../core/mgmt/EntityManagementUtils.java|   6 +-
 .../mgmt/internal/LocalLocationManager.java |  11 +-
 .../mgmt/internal/LocationManagerInternal.java  |   8 ++
 .../mgmt/persist/BrooklynPersistenceUtils.java  |  19 ++-
 .../core/objs/proxy/InternalEntityFactory.java  |  30 +++--
 .../core/objs/proxy/InternalFactory.java|  30 -
 .../objs/proxy/InternalLocationFactory.java |   2 +-
 .../core/objs/proxy/InternalPolicyFactory.java  |   8 +-
 .../proxy/SpecialBrooklynObjectConstructor.java |  80 +++
 .../entity/group/DynamicClusterImpl.java|  12 +-
 .../entity/group/DynamicRegionsFabricImpl.java  |   2 +-
 .../location/byon/HostLocationResolver.java |   9 +-
 .../byon/SingleMachineLocationResolver.java |  10 +-
 .../byon/SingleMachineProvisioningLocation.java |   2 +-
 .../localhost/LocalhostLocationResolver.java|   8 +-
 .../brooklyn/location/multi/MultiLocation.java  |  42 --
 .../location/multi/MultiLocationResolver.java   |  86 ++--
 .../location/ssh/SshMachineLocation.java|  13 +-
 .../ssh/SshCommandEffectorIntegrationTest.java  |   5 +-
 .../core/entity/EntityFunctionsTest.java|   2 +-
 .../core/entity/EntityPredicatesTest.java   |   2 +-
 .../core/entity/EntitySuppliersTest.java|   2 +-
 .../core/location/LocationManagementTest.java   |  41 +-
 .../core/location/LocationPredicatesTest.java   |   2 +-
 .../core/location/LocationRegistryTest.java |  37 +++---
 .../brooklyn/core/location/MachinesTest.java|  64 +
 .../access/BrooklynAccessUtilsTest.java |   2 +-
 .../PortForwardManagerLocationResolverTest.java |   2 +-
 .../access/PortForwardManagerRebindTest.java|   2 +-
 .../location/access/PortForwardManagerTest.java |   4 +-
 .../internal/LocalManagementContextTest.java|   8 +-
 .../BrooklynMementoPersisterTestFixture.java|   7 +-
 .../core/mgmt/rebind/RebindEntityTest.java  |   4 +-
 .../core/mgmt/rebind/RebindPolicyTest.java  |   2 +-
 .../core/sensor/http/HttpRequestSensorTest.java |  17 +--
 .../password/CreatePasswordSensorTest.java  |   3 +-
 .../ssh/SshCommandSensorIntegrationTest.java|   9 +-
 .../core/test/entity/TestApplication.java   |  10 +-
 .../core/test/entity/TestApplicationImpl.java   |   2 +-
 .../location/byon/ByonLocationResolverTest.java |  17 +--
 .../location/byon/HostLocationResolverTest.java |   2 +-
 .../byon/SingleMachineLocationResolverTest.java |   2 +-

[03/18] brooklyn-server git commit: add more tests for the number of locations being managed

2016-03-19 Thread heneveld

add more tests for the number of locations being managed

including a failing test for the case where a blueprint added to catalog 
includes a location


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

Branch: refs/heads/master
Commit: 40fd76d8124b4f570082f72d3c576b2db05dedf1
Parents: bcf4d9b
Author: Alex Heneveld 
Authored: Tue Mar 15 12:10:55 2016 +
Committer: Alex Heneveld 
Committed: Tue Mar 15 12:10:55 2016 +

--
 .../camp/brooklyn/LocationsYamlTest.java|  2 +-
 .../catalog/CatalogYamlLocationTest.java| 64 
 .../core/location/LocationManagementTest.java   | 37 +++
 3 files changed, 102 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/40fd76d8/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/LocationsYamlTest.java
--
diff --git 
a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/LocationsYamlTest.java
 
b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/LocationsYamlTest.java
index 371a477..f1efd33 100644
--- 
a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/LocationsYamlTest.java
+++ 
b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/LocationsYamlTest.java
@@ -281,5 +281,5 @@ public class LocationsYamlTest extends AbstractYamlTest {
 protected Logger getLogger() {
 return log;
 }
-
+
 }

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/40fd76d8/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlLocationTest.java
--
diff --git 
a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlLocationTest.java
 
b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlLocationTest.java
index f792d65..cd1e917 100644
--- 
a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlLocationTest.java
+++ 
b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlLocationTest.java
@@ -36,8 +36,11 @@ import org.apache.brooklyn.core.entity.Entities;
 import org.apache.brooklyn.core.mgmt.osgi.OsgiStandaloneTest;
 import org.apache.brooklyn.core.typereg.RegisteredTypePredicates;
 import org.apache.brooklyn.core.typereg.RegisteredTypes;
+import org.apache.brooklyn.entity.stock.BasicEntity;
 import 
org.apache.brooklyn.location.localhost.LocalhostMachineProvisioningLocation;
+import org.apache.brooklyn.test.Asserts;
 import org.apache.brooklyn.test.support.TestResourceUnavailableException;
+import org.apache.brooklyn.util.collections.CollectionFunctionals;
 import org.apache.brooklyn.util.text.StringFunctions;
 import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
@@ -250,4 +253,65 @@ public class CatalogYamlLocationTest extends 
AbstractYamlTest {
 return 
Iterables.size(mgmt().getTypeRegistry().getMatching(RegisteredTypePredicates.IS_LOCATION));
 }
 
+@Test
+public void testManagedLocationsCreateAndCleanup() {
+assertLocationRegistryCount(0);
+assertLocationManagerInstancesCount(0);
+assertCatalogCount(0);
+
+String symbolicName = "lh1";
+addCatalogLocation(symbolicName, LOCALHOST_LOCATION_TYPE, null);
+
+assertLocationRegistryCount(1);
+assertCatalogCount(1);
+assertLocationManagerInstancesCount(0);
+
+Location loc = mgmt().getLocationRegistry().resolve("lh1");
+
+assertLocationRegistryCount(1);
+assertCatalogCount(1);
+assertLocationManagerInstancesCount(1);
+
+mgmt().getLocationManager().unmanage(loc);
+
+
+assertLocationRegistryCount(1);
+assertCatalogCount(1);
+assertLocationManagerInstancesCount(0);
+
+deleteCatalogEntity("lh1");
+
+assertLocationRegistryCount(0);
+assertCatalogCount(0);
+assertLocationManagerInstancesCount(0);
+}
+
+private void assertLocationRegistryCount(int size) {
+
Asserts.assertThat(mgmt().getLocationRegistry().getDefinedLocations().keySet(), 
CollectionFunctionals.sizeEquals(size));
+}
+private void assertLocationManagerInstancesCount(int size) {
+Asserts.assertThat(mgmt().getLocationManager().getLocations(), 
CollectionFunctionals.sizeEquals(size));
+}
+private void

[10/18] brooklyn-server git commit: update tests to use LocationRegistry spec methods

2016-03-19 Thread heneveld

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3f1e4c61/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationResolverTest.java
--
diff --git 
a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationResolverTest.java
 
b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationResolverTest.java
index 1ef3148..03c7ab6 100644
--- 
a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationResolverTest.java
+++ 
b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationResolverTest.java
@@ -273,7 +273,7 @@ public class JcloudsLocationResolverTest {
 conf = 
resolve("named:softlayer-was2").config().getBag().getAllConfig();
 assertEquals(conf.get("region"), "was02");
 
-conf = ((LocationInternal) 
managementContext.getLocationRegistry().resolve("named:softlayer-was2", 
MutableMap.of("region", "was03")))
+conf = ((LocationInternal) 
managementContext.getLocationRegistry().getLocationManaged("named:softlayer-was2",
 MutableMap.of("region", "was03")))
 .config().getBag().getAllConfig();;
 assertEquals(conf.get("region"), "was03");
 }
@@ -391,6 +391,6 @@ public class JcloudsLocationResolverTest {
 }
 
 private JcloudsLocation resolve(String spec) {
-return (JcloudsLocation) 
managementContext.getLocationRegistry().resolve(spec);
+return (JcloudsLocation) 
managementContext.getLocationRegistry().getLocationManaged(spec);
 }
 }

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3f1e4c61/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationSuspendResumeMachineLiveTest.java
--
diff --git 
a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationSuspendResumeMachineLiveTest.java
 
b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationSuspendResumeMachineLiveTest.java
index 048a563..dd8865a 100644
--- 
a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationSuspendResumeMachineLiveTest.java
+++ 
b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationSuspendResumeMachineLiveTest.java
@@ -41,7 +41,7 @@ public class JcloudsLocationSuspendResumeMachineLiveTest 
extends AbstractJclouds
 public void setUp() throws Exception {
 super.setUp();
 jcloudsLocation = (JcloudsLocation) 
managementContext.getLocationRegistry()
-.resolve(AWS_EC2_PROVIDER + ":" + AWS_EC2_EUWEST_REGION_NAME);
+.getLocationManaged(AWS_EC2_PROVIDER + ":" + 
AWS_EC2_EUWEST_REGION_NAME);
 }
 
 @Test(groups = "Live")

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3f1e4c61/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationTemplateOptionsCustomisersLiveTest.java
--
diff --git 
a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationTemplateOptionsCustomisersLiveTest.java
 
b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationTemplateOptionsCustomisersLiveTest.java
index 60b4725..b47595f 100644
--- 
a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationTemplateOptionsCustomisersLiveTest.java
+++ 
b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationTemplateOptionsCustomisersLiveTest.java
@@ -103,6 +103,6 @@ public class 
JcloudsLocationTemplateOptionsCustomisersLiveTest extends AbstractJ
 }
 
 private JcloudsLocation resolve(String spec) {
-return (JcloudsLocation) 
managementContext.getLocationRegistry().resolve("jclouds:"+spec);
+return (JcloudsLocation) 
managementContext.getLocationRegistry().getLocationManaged("jclouds:"+spec);
 }
 }

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3f1e4c61/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLoginLiveTest.java
--
diff --git 
a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLoginLiveTest.java
 
b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLoginLiveTest.java
index d8c38fa..8c2b68b 100644
--- 
a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLoginLiveTest.java
+++ 
b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLoginLiveTest.java
@@ -87,7 +87,7 @@ public class JcloudsLoginLiveTest extends 
AbstractJcloudsLiveTest {
 protected void testAwsEc2SpecifyingJustPrivateSshKeyInDeprecatedForm() 
throws Exception {

[2/2] brooklyn-ui git commit: This closes #20

2016-03-19 Thread heneveld

This closes #20


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

Branch: refs/heads/master
Commit: bf75d7f07e0ac1a094550075e408f9bf3293476f
Parents: 559d391 c8308f0
Author: Alex Heneveld 
Authored: Fri Mar 18 14:38:21 2016 +
Committer: Alex Heneveld 
Committed: Fri Mar 18 14:38:21 2016 +

--
 src/main/webapp/assets/js/config.js | 13 -
 src/main/webapp/assets/js/router.js | 14 ++
 2 files changed, 14 insertions(+), 13 deletions(-)
--

[3/6] brooklyn-docs git commit: This closes #30

2016-03-19 Thread heneveld

This closes #30


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

Branch: refs/heads/master
Commit: dcb4014698f7ab18a6ef2e6223902876ca67707b
Parents: c95a55c 26c6bca
Author: Alex Heneveld 
Authored: Fri Mar 18 12:18:17 2016 +
Committer: Alex Heneveld 
Committed: Fri Mar 18 12:18:17 2016 +

--
 guide/ops/locations/byon.md  | 3 +++
 guide/ops/locations/clouds.md| 4 
 guide/ops/locations/index.md | 3 ++-
 guide/ops/locations/localhost.md | 3 +++
 4 files changed, 12 insertions(+), 1 deletion(-)
--

[2/2] brooklyn-dist git commit: This closes #23

2016-03-19 Thread aledsage

This closes #23


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

Branch: refs/heads/master
Commit: a2d513b9d47adf66c79925eade1eadb452891f87
Parents: 5ee9370 a789125
Author: Aled Sage 
Authored: Fri Mar 18 09:57:26 2016 +
Committer: Aled Sage 
Committed: Fri Mar 18 09:57:26 2016 +

--
 packaging/pom.xml | 5 -
 1 file changed, 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/a2d513b9/packaging/pom.xml
--

brooklyn-server git commit: update license

2016-03-19 Thread heneveld

Repository: brooklyn-server
Updated Branches:
  refs/heads/master 5c8cdfa88 -> d0590884f


update license


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

Branch: refs/heads/master
Commit: d0590884fd6eca38776d88c53c86e18ce8fd72cb
Parents: 5c8cdfa
Author: Alex Heneveld 
Authored: Fri Mar 18 14:29:45 2016 +
Committer: Alex Heneveld 
Committed: Fri Mar 18 14:29:45 2016 +

--
 LICENSE | 6 ++
 1 file changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d0590884/LICENSE
--
diff --git a/LICENSE b/LICENSE
index 13e9bcc..ccac2ba 100644
--- a/LICENSE
+++ b/LICENSE
@@ -281,6 +281,12 @@ This project includes the software: DataTables Table 
plug-in for jQuery
   Used under the following license: The BSD 3-Clause (New BSD) License 
(http://opensource.org/licenses/BSD-3-Clause)
   Copyright (c) Allan Jardine (2008-2012)
 
+This project includes the software: jquery.easy-autocomplete.js
+  Available at: https://github.com/pawelczak/EasyAutocomplete
+  Version used: 1.3.1
+  Used under the following license: The MIT License 
(http://opensource.org/licenses/MIT)
+  Copyright (c) Åukasz PaweÅczak (2015)
+
 This project includes the software: jQuery Form Plugin
   Available at: https://github.com/malsup/form
   Developed by: Mike Alsup (http://malsup.com/)

[13/16] brooklyn-ui git commit: Fix small bugs within the location wizard

2016-03-19 Thread heneveld

Fix small bugs within the location wizard


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

Branch: refs/heads/master
Commit: d6c47ff919b93b62cd03d62bf902ffc8bb0bd537
Parents: 3a49e64
Author: Thomas Bouron 
Authored: Fri Mar 18 10:57:42 2016 +
Committer: Thomas Bouron 
Committed: Fri Mar 18 10:58:01 2016 +

--
 src/main/webapp/assets/js/view/location-wizard.js | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/d6c47ff9/src/main/webapp/assets/js/view/location-wizard.js
--
diff --git a/src/main/webapp/assets/js/view/location-wizard.js 
b/src/main/webapp/assets/js/view/location-wizard.js
index 375baa1..12680a5 100644
--- a/src/main/webapp/assets/js/view/location-wizard.js
+++ b/src/main/webapp/assets/js/view/location-wizard.js
@@ -166,6 +166,10 @@ define([
 },
 
 edit: function() {
+Â§if (this.currentView instanceof LocationProvisioning) {
+this.currentView.setProvisioningProperties();
+}
+
 var baseSpacing = '  ';
 
 var content = [].concat(_YAML_HEADER);
@@ -606,7 +610,7 @@ define([
 disable = disable && _.contains(values, 
that.$('[name=' + key + ']').val());
 });
 if (disable) {
-$(this).attr('disabled', 'disabled');
+$(this).attr('disabled', 'disabled').val('');
 } else {
 $(this).removeAttr('disabled');
 }

[1/2] brooklyn-server git commit: Remove DISCLAIMER remnant

2016-03-19 Thread sjcorbett

Repository: brooklyn-server
Updated Branches:
  refs/heads/master b8fe16647 -> a16f8c740


Remove DISCLAIMER remnant

Missed one file in my earlier attempt to clean up DISCLAIMERs.


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

Branch: refs/heads/master
Commit: cc2555441b04a273aeed5b44b0145064fc311e54
Parents: b70c2b0
Author: Richard Downer 
Authored: Tue Mar 15 13:57:56 2016 +
Committer: Richard Downer 
Committed: Tue Mar 15 13:57:56 2016 +

--
 utils/jmx/jmxmp-ssl-agent/src/main/license/DISCLAIMER.shaded | 8 
 1 file changed, 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/cc255544/utils/jmx/jmxmp-ssl-agent/src/main/license/DISCLAIMER.shaded
--
diff --git a/utils/jmx/jmxmp-ssl-agent/src/main/license/DISCLAIMER.shaded 
b/utils/jmx/jmxmp-ssl-agent/src/main/license/DISCLAIMER.shaded
deleted file mode 100644
index 9e6119b..000
--- a/utils/jmx/jmxmp-ssl-agent/src/main/license/DISCLAIMER.shaded
+++ /dev/null
@@ -1,8 +0,0 @@
-
-Apache Brooklyn is an effort undergoing incubation at The Apache Software 
Foundation (ASF), 
-sponsored by the Apache Incubator. Incubation is required of all newly 
accepted projects until 
-a further review indicates that the infrastructure, communications, and 
decision making process 
-have stabilized in a manner consistent with other successful ASF projects. 
While incubation 
-status is not necessarily a reflection of the completeness or stability of the 
code, it does 
-indicate that the project has yet to be fully endorsed by the ASF.
-

[16/18] brooklyn-server git commit: Merge branch 'master' into fix-location-leak

2016-03-19 Thread heneveld

Merge branch 'master' into fix-location-leak


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

Branch: refs/heads/master
Commit: 138e0f66397f57779dc2eb64b14f60081aa2496d
Parents: 41a8d66 16ee522
Author: Alex Heneveld 
Authored: Thu Mar 17 18:45:09 2016 +
Committer: Alex Heneveld 
Committed: Thu Mar 17 18:45:09 2016 +

--
 .../core/entity/lifecycle/ServiceStateLogic.java  |  6 ++
 .../stock/AbstractMultipleSensorAggregator.java   | 18 +-
 2 files changed, 15 insertions(+), 9 deletions(-)
--

[2/2] brooklyn-ui git commit: This closes #16

2016-03-19 Thread heneveld

This closes #16


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

Branch: refs/heads/master
Commit: 0fca312d10da7d0a07895d991563b005efa7a6df
Parents: c64754d 1418b65
Author: Alex Heneveld 
Authored: Thu Mar 17 12:57:43 2016 +
Committer: Alex Heneveld 
Committed: Thu Mar 17 12:57:43 2016 +

--
 src/main/license/files/DISCLAIMER | 8 
 src/test/license/DISCLAIMER   | 8 
 2 files changed, 16 deletions(-)
--

[05/16] brooklyn-ui git commit: Add location wizard into the YAML editor

2016-03-19 Thread heneveld

Add location wizard into the YAML editor


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

Branch: refs/heads/master
Commit: 1785d6d287519214b53c7655bca1a09ae103c039
Parents: e011fe1
Author: Thomas Bouron 
Authored: Wed Mar 16 12:30:01 2016 +
Committer: Thomas Bouron 
Committed: Thu Mar 17 12:49:11 2016 +

--
 src/main/webapp/assets/js/router.js |  1 +
 src/main/webapp/assets/js/view/editor.js| 49 ++--
 .../webapp/assets/js/view/location-wizard.js| 10 ++--
 .../assets/tpl/editor/location-alert.html   | 34 ++
 4 files changed, 85 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/1785d6d2/src/main/webapp/assets/js/router.js
--
diff --git a/src/main/webapp/assets/js/router.js 
b/src/main/webapp/assets/js/router.js
index aaccf70..26722ac 100644
--- a/src/main/webapp/assets/js/router.js
+++ b/src/main/webapp/assets/js/router.js
@@ -183,6 +183,7 @@ define([
 var editorView = new EditorView({
 collection: this.applications,
 appRouter: this,
+locations: this.locations,
 type: type,
 typeId: typeId,
 content: content

http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/1785d6d2/src/main/webapp/assets/js/view/editor.js
--
diff --git a/src/main/webapp/assets/js/view/editor.js 
b/src/main/webapp/assets/js/view/editor.js
index 83200df..c5a24f3 100644
--- a/src/main/webapp/assets/js/view/editor.js
+++ b/src/main/webapp/assets/js/view/editor.js
@@ -17,8 +17,11 @@
  * under the License.
 */
 define([
-"underscore", "jquery", "backbone", "model/catalog-application", 
"js-yaml", "brooklyn-yaml-completion-proposals", "codemirror",
+"underscore", "jquery", "backbone", "model/catalog-application",
+"model/location", "view/location-wizard", "view/viewutils",
+"js-yaml", "brooklyn-yaml-completion-proposals", "codemirror",
 "text!tpl/editor/page.html",
+"text!tpl/editor/location-alert.html",
 
 // no constructor
 "jquery-slideto",
@@ -26,7 +29,7 @@ define([
 "jquery-ba-bbq",
 "handlebars",
 "bootstrap"
-], function (_, $, Backbone, CatalogApplication, jsYaml, BrooklynCompletion, 
CodeMirror, EditorHtml) {
+], function (_, $, Backbone, CatalogApplication, Location, LocationWizard, 
ViewUtils, jsYaml, BrooklynCompletion, CodeMirror, EditorHtml, 
LocationAlertHtml) {
 var _DEFAULT_BLUEPRINT = 
 'name: Sample Blueprint\n'+
 'description: runs `sleep` for sixty seconds then stops triggering 
ON_FIRE in Brooklyn\n'+
@@ -64,6 +67,7 @@ define([
 'click #button-switch-catalog':'switchModeCatalog',
 'click #button-example':'populateExampleBlueprint',
 'click #button-docs':'openDocumentation',
+'click .add-location':'createLocation'
 },
 editorTemplate:_.template(EditorHtml),
 
@@ -86,18 +90,36 @@ define([
 vm.initializeEditor();
 }
 });
+this.options.locations.on('reset', this.renderLocationAlert, this);
+
+ViewUtils.fetchRepeatedlyWithDelay(this, this.options.locations, { 
fetchOptions: { reset: true }, doitnow: true });
 },
 setMode: function(mode) {
 if (this.mode === mode) return;
 this.mode = mode;
 this.refresh();
 },
+beforeClose:function () {
+this.options.locations.off('reset', this.renderLocationAlert);
+},
 render:function (eventName) {
-this.$el.html(_.template(EditorHtml, {}));
+this.$el
+.append(_.template(LocationAlertHtml, {
+locations: this.options.locations
+}))
+.append(_.template(EditorHtml))
+.find('#location-alert').hide();
 this.loadEditor();
 this.refresh();
 return this;
 },
+renderLocationAlert: function(event) {
+if (event.size() === 0) {
+this.$('#location-alert').show();
+} else {
+this.$('#location-alert').hide();
+}
+},
 refresh: function() {
 $("#button-run", this.$el).html(this.mode==MODE_CATALOG ? "Add to 
Catalog" : "Deploy");
 if (this.mode==MODE_CATALOG) {
@@ -358,6 +380,27

[09/16] brooklyn-dist git commit: Release Vagrantfile: boost VM specs and add RAM disk

2016-03-19 Thread heneveld

Release Vagrantfile: boost VM specs and add RAM disk

Adds a tmpfs mount to provide enough space to act as the working
directory for a release. Boost the VM memory to make sure thereâs
enough, and add an extra CPU for a bit more.

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

Branch: refs/heads/master
Commit: 8f787340a8a385f8a047e16c423eac0d138d771e
Parents: f4b73e9
Author: Richard Downer 
Authored: Wed Mar 16 16:33:50 2016 +
Committer: Richard Downer 
Committed: Wed Mar 16 16:33:50 2016 +

--
 release/Vagrantfile | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/8f787340/release/Vagrantfile
--
diff --git a/release/Vagrantfile b/release/Vagrantfile
index 016c48f..9256f91 100644
--- a/release/Vagrantfile
+++ b/release/Vagrantfile
@@ -34,7 +34,8 @@ Vagrant.configure(2) do |config|
   # Provider-specific configuration so you can fine-tune various
   # backing providers for Vagrant. These expose provider-specific options.
   config.vm.provider "virtualbox" do |vb|
-vb.memory = "2048"
+vb.memory = "6144"
+vb.cpus = 2
   end
 
   config.vm.network "forwarded_port", guest: 8008, host: 8008
@@ -59,6 +60,8 @@ Vagrant.configure(2) do |config|
 /opt/artifactory*/bin/installService.sh
 service artifactory start
 chmod -R go= ~vagrant/.gnupg
+mkdir -p /work
+mount -ttmpfs -osize=3g none /work
 cat /etc/ssh/ssh_host_*_key.pub | awk '{print "localhost,127.0.0.1 "$0}' 
>> /etc/ssh/ssh_known_hosts
 su -c 'ssh-keygen -t rsa -b 2048 -N "" -f ~/.ssh/id_rsa; cat ~/.ssh/*.pub 
>> ~/.ssh/authorized_keys' vagrant
 su -c 'git clone 
https://git-wip-us.apache.org/repos/asf/incubator-brooklyn.git 
apache-brooklyn-git' vagrant

[5/6] brooklyn-docs git commit: update release notes for locations changes

2016-03-19 Thread heneveld

update release notes for locations changes


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

Branch: refs/heads/master
Commit: b0e4f9febb531022fd0800ac07fd496751d73809
Parents: 75a940f
Author: Alex Heneveld 
Authored: Fri Mar 18 12:24:55 2016 +
Committer: Alex Heneveld 
Committed: Fri Mar 18 12:24:55 2016 +

--
 guide/misc/release-notes.md | 13 -
 1 file changed, 12 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/b0e4f9fe/guide/misc/release-notes.md
--
diff --git a/guide/misc/release-notes.md b/guide/misc/release-notes.md
index 6007f58..7cd9413 100644
--- a/guide/misc/release-notes.md
+++ b/guide/misc/release-notes.md
@@ -32,9 +32,10 @@ For a good demonstration, see the "Custom Entities" section 
of the YAML chapter
 [ TODO - 
 restructuring and graduation; 
 the `br` client CLI tool;
+better YAML editor in the UI;
+a location wizard for defining new clouds;
 test framework;
 `$brooklyn:external(...)` extension for taking values from other sources is 
supported in more places;
-better YAML editor in the UI;
 OSGi-native mode using Karaf, to simplify packaging of blueprints;
 a new pure-java WinRM client (winrm4j), hugely reducing the number of 
dependencies and distro size;
 several version bumps (jclouds) and performance and reliability improvements
@@ -78,5 +79,15 @@ If you are referencing this sensor in blueprint DSL or 
somewhere else please use
 
 If you are referencing this sensor in blueprint DSL or somewhere else please 
use the key `rdp.port`.
 
+6. Location resolvers now generate `LocationSpec` instances instead of 
`Location` instances.
+This makes it clearer when locations become managed and prevents a memory leak 
which can
+happen when some locations are never unmanaged. All implementations of 
`LocationResolver`
+need to be updated to conform to the new interface.   
+   
+7. The named location `localhost` is no longer automatically added by default 
on a fresh Brooklyn install.
+Instead UI users are directed to a location wizard where they can configure 
their targets, including localhost. 
+If you require `localhost` to be available on boot, define it as a named 
location in `brooklyn.properties`
+or the default catalog. (The property 
`brooklyn.location.name.localhost=localhost` is usually sufficient.)
+
 For changes in prior versions, please refer to the release notes for 
 [0.8.0](/v/0.8.0-incubating/misc/release-notes.html).

[1/2] brooklyn-server git commit: multi-sensor-aggregator: respect the EntityFilter

2016-03-19 Thread heneveld

Repository: brooklyn-server
Updated Branches:
  refs/heads/master a16f8c740 -> 16ee522c5


multi-sensor-aggregator: respect the EntityFilter

This is useful for apps that want to override the 
ComputeServiceIndicatorsFromChildrenAndMembers. For example, in 
clocker the appâs health depends on just two of the children (rather 
than all/one or quorum).

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

Branch: refs/heads/master
Commit: f718bff32f127066492b8cf5892b7b7205a0e1ee
Parents: b70c2b0
Author: Aled Sage 
Authored: Thu Mar 17 06:46:36 2016 +
Committer: Aled Sage 
Committed: Thu Mar 17 06:46:36 2016 +

--
 .../core/entity/lifecycle/ServiceStateLogic.java  |  6 ++
 .../stock/AbstractMultipleSensorAggregator.java   | 18 +-
 2 files changed, 15 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/f718bff3/core/src/main/java/org/apache/brooklyn/core/entity/lifecycle/ServiceStateLogic.java
--
diff --git 
a/core/src/main/java/org/apache/brooklyn/core/entity/lifecycle/ServiceStateLogic.java
 
b/core/src/main/java/org/apache/brooklyn/core/entity/lifecycle/ServiceStateLogic.java
index e64e41e..3eaf022 100644
--- 
a/core/src/main/java/org/apache/brooklyn/core/entity/lifecycle/ServiceStateLogic.java
+++ 
b/core/src/main/java/org/apache/brooklyn/core/entity/lifecycle/ServiceStateLogic.java
@@ -69,6 +69,7 @@ import org.slf4j.LoggerFactory;
 import com.google.common.base.Function;
 import com.google.common.base.Functions;
 import com.google.common.base.Preconditions;
+import com.google.common.base.Predicate;
 import com.google.common.base.Stopwatch;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
@@ -604,6 +605,11 @@ public class ServiceStateLogic {
 
configure(ComputeServiceIndicatorsFromChildrenAndMembers.RUNNING_QUORUM_CHECK, 
check);
 return self();
 }
+
+public ComputeServiceIndicatorsFromChildrenAndMembersSpec 
entityFilter(Predicate val) {
+
configure(ComputeServiceIndicatorsFromChildrenAndMembers.ENTITY_FILTER, val);
+return self();
+}
 }
 
 /** provides the default {@link 
ComputeServiceIndicatorsFromChildrenAndMembers} enricher, 

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/f718bff3/core/src/main/java/org/apache/brooklyn/enricher/stock/AbstractMultipleSensorAggregator.java
--
diff --git 
a/core/src/main/java/org/apache/brooklyn/enricher/stock/AbstractMultipleSensorAggregator.java
 
b/core/src/main/java/org/apache/brooklyn/enricher/stock/AbstractMultipleSensorAggregator.java
index d63aa57..e0f0d6d 100644
--- 
a/core/src/main/java/org/apache/brooklyn/enricher/stock/AbstractMultipleSensorAggregator.java
+++ 
b/core/src/main/java/org/apache/brooklyn/enricher/stock/AbstractMultipleSensorAggregator.java
@@ -20,7 +20,6 @@ package org.apache.brooklyn.enricher.stock;
 
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -37,7 +36,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.google.common.base.Preconditions;
-import com.google.common.collect.ImmutableMap;
 
 /** Building on {@link AbstractAggregator} for a single source sensor (on 
multiple children and/or members) */
 public abstract class AbstractMultipleSensorAggregator extends 
AbstractAggregator implements SensorEventListener {
@@ -129,15 +127,17 @@ public abstract class AbstractMultipleSensorAggregator 
extends AbstractAggreg
 @Override
 public void onEvent(SensorEvent event) {
 Entity e = event.getSource();
-synchronized (values) {
-Map vs = values.get(event.getSensor().getName());
-if (vs==null) {
-LOG.debug(this+" received event when no entry for sensor 
("+event+"); likely just added or removed, and will initialize subsequently if 
needed");
-} else {
-vs.put(e, event.getValue());
+if (entityFilter.apply(e)) {
+synchronized (values) {
+Map vs = 
values.get(event.getSensor().getName());
+if (vs==null) {
+LOG.debug(this+" received event when no entry for sensor 
("+event+"); likely just added or removed, and will initialize

[1/2] brooklyn-ui git commit: Fix typo

2016-03-19 Thread heneveld

Repository: brooklyn-ui
Updated Branches:
  refs/heads/master 8c7b1dde3 -> 947f979e8


Fix typo


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

Branch: refs/heads/master
Commit: 2e051f4a7a67788cda9698cb72635ccffec86878
Parents: 8c7b1dd
Author: Thomas Bouron 
Authored: Fri Mar 18 11:32:04 2016 +
Committer: Thomas Bouron 
Committed: Fri Mar 18 11:32:17 2016 +

--
 src/main/webapp/assets/js/view/location-wizard.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/2e051f4a/src/main/webapp/assets/js/view/location-wizard.js
--
diff --git a/src/main/webapp/assets/js/view/location-wizard.js 
b/src/main/webapp/assets/js/view/location-wizard.js
index 008b906..5013f06 100644
--- a/src/main/webapp/assets/js/view/location-wizard.js
+++ b/src/main/webapp/assets/js/view/location-wizard.js
@@ -166,7 +166,7 @@ define([
 },
 
 edit: function() {
-Â§if (this.currentView instanceof LocationProvisioning) {
+if (this.currentView instanceof LocationProvisioning) {
 this.currentView.setProvisioningProperties();
 }

[1/2] brooklyn-server git commit: Disable tests on Windows

2016-03-19 Thread sjcorbett

Repository: brooklyn-server
Updated Branches:
  refs/heads/master b70c2b0b6 -> b8fe16647


Disable tests on Windows

Windows doesn't support the expected file attributes, disable tests.


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

Branch: refs/heads/master
Commit: 8dbd6542623562e3dbc1ab29730ea12efe58e704
Parents: b70c2b0
Author: Svetoslav Neykov 
Authored: Thu Mar 17 18:38:34 2016 +0200
Committer: Svetoslav Neykov 
Committed: Thu Mar 17 18:49:09 2016 +0200

--
 .../launcher/common/BrooklynPropertiesFactoryHelperTest.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/8dbd6542/launcher-common/src/test/java/org/apache/brooklyn/launcher/common/BrooklynPropertiesFactoryHelperTest.java
--
diff --git 
a/launcher-common/src/test/java/org/apache/brooklyn/launcher/common/BrooklynPropertiesFactoryHelperTest.java
 
b/launcher-common/src/test/java/org/apache/brooklyn/launcher/common/BrooklynPropertiesFactoryHelperTest.java
index 9629bd5..9c31fcc 100644
--- 
a/launcher-common/src/test/java/org/apache/brooklyn/launcher/common/BrooklynPropertiesFactoryHelperTest.java
+++ 
b/launcher-common/src/test/java/org/apache/brooklyn/launcher/common/BrooklynPropertiesFactoryHelperTest.java
@@ -43,7 +43,7 @@ import com.google.common.io.Files;
 
 public class BrooklynPropertiesFactoryHelperTest {
 
-@Test
+@Test(groups="UNIX")
 public void testChecksGlobalBrooklynPropertiesPermissionsX00() throws 
Exception {
 File propsFile = 
File.createTempFile("testChecksGlobalBrooklynPropertiesPermissionsX00", 
".properties");
 propsFile.setReadable(true, false);
@@ -59,7 +59,7 @@ public class BrooklynPropertiesFactoryHelperTest {
 }
 }
 
-@Test
+@Test(groups="UNIX")
 public void testChecksLocalBrooklynPropertiesPermissionsX00() throws 
Exception {
 File propsFile = 
File.createTempFile("testChecksLocalBrooklynPropertiesPermissionsX00", 
".properties");
 propsFile.setReadable(true, false);

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

2016-03-19 Thread sjcorbett

This closes #64

Remove DISCLAIMER remnant


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

Branch: refs/heads/master
Commit: a16f8c740a782a3fdf08ac8cf15e0469604df8cd
Parents: b8fe166 cc25554
Author: Sam Corbett 
Authored: Thu Mar 17 18:25:02 2016 +
Committer: Sam Corbett 
Committed: Thu Mar 17 18:25:02 2016 +

--
 utils/jmx/jmxmp-ssl-agent/src/main/license/DISCLAIMER.shaded | 8 
 1 file changed, 8 deletions(-)
--

[12/18] brooklyn-server git commit: allow a special constructor to be given to specs (beta, needed for PortForwardManager)

2016-03-19 Thread heneveld

allow a special constructor to be given to specs (beta, needed for 
PortForwardManager)

this fixes the port-manager-related failures


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

Branch: refs/heads/master
Commit: a3d74701fc37ae9b3daae15865510dfb1b94e327
Parents: 3f1e4c6
Author: Alex Heneveld 
Authored: Thu Mar 17 11:18:22 2016 +
Committer: Alex Heneveld 
Committed: Thu Mar 17 12:03:39 2016 +

--
 .../PortForwardManagerLocationResolver.java | 73 +-
 .../core/objs/proxy/InternalEntityFactory.java  | 24 +++---
 .../core/objs/proxy/InternalFactory.java| 30 +++-
 .../objs/proxy/InternalLocationFactory.java |  2 +-
 .../core/objs/proxy/InternalPolicyFactory.java  |  8 +-
 .../proxy/SpecialBrooklynObjectConstructor.java | 80 
 6 files changed, 176 insertions(+), 41 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/a3d74701/core/src/main/java/org/apache/brooklyn/core/location/access/PortForwardManagerLocationResolver.java
--
diff --git 
a/core/src/main/java/org/apache/brooklyn/core/location/access/PortForwardManagerLocationResolver.java
 
b/core/src/main/java/org/apache/brooklyn/core/location/access/PortForwardManagerLocationResolver.java
index 102bcad..7988590 100644
--- 
a/core/src/main/java/org/apache/brooklyn/core/location/access/PortForwardManagerLocationResolver.java
+++ 
b/core/src/main/java/org/apache/brooklyn/core/location/access/PortForwardManagerLocationResolver.java
@@ -20,16 +20,23 @@ package org.apache.brooklyn.core.location.access;
 
 import java.util.Map;
 
+import org.apache.brooklyn.api.internal.AbstractBrooklynObjectSpec;
 import org.apache.brooklyn.api.location.Location;
 import org.apache.brooklyn.api.location.LocationRegistry;
 import org.apache.brooklyn.api.location.LocationSpec;
+import org.apache.brooklyn.api.mgmt.ManagementContext;
+import org.apache.brooklyn.config.ConfigKey;
+import org.apache.brooklyn.core.config.ConfigKeys;
 import org.apache.brooklyn.core.location.AbstractLocationResolver;
 import org.apache.brooklyn.core.location.LocationConfigUtils;
 import org.apache.brooklyn.core.location.LocationPredicates;
+import org.apache.brooklyn.core.location.cloud.CloudLocationConfig;
 import org.apache.brooklyn.core.location.internal.LocationInternal;
+import org.apache.brooklyn.core.objs.proxy.SpecialBrooklynObjectConstructor;
+import 
org.apache.brooklyn.core.objs.proxy.SpecialBrooklynObjectConstructor.Config;
+import org.apache.brooklyn.util.core.config.ConfigBag;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.apache.brooklyn.util.core.config.ConfigBag;
 
 import com.google.common.base.Optional;
 import com.google.common.base.Predicates;
@@ -49,27 +56,15 @@ public class PortForwardManagerLocationResolver extends 
AbstractLocationResolver
 @Override
 public LocationSpec newLocationSpecFromString(String spec, Map 
locationFlags, LocationRegistry registry) {
 ConfigBag config = extractConfig(locationFlags, spec, registry);
-Map globalProperties = registry.getProperties();
+Map globalProperties = registry.getProperties();
 String namedLocation = (String) 
locationFlags.get(LocationInternal.NAMED_SPEC_NAME.getName());
 String scope = config.get(PortForwardManager.SCOPE);
 
-Optional result = 
Iterables.tryFind(managementContext.getLocationManager().getLocations(), 
-Predicates.and(
-Predicates.instanceOf(PortForwardManager.class), 
-
LocationPredicates.configEqualTo(PortForwardManager.SCOPE, scope)));
-
-if (result.isPresent()) {
-// XXX
-//return result.get();
-return null;
-} else {
-LocationSpec loc = 
LocationSpec.create(PortForwardManagerImpl.class)
-.configure(config.getAllConfig())
-.configure(LocationConfigUtils.finalAndOriginalSpecs(spec, 
locationFlags, globalProperties, namedLocation));
-
-if (LOG.isDebugEnabled()) LOG.debug("Created "+loc+" for scope 
"+scope);
-return loc;
-}
+return LocationSpec.create(PortForwardManagerImpl.class)
+.configure(config.getAllConfig())
+.configure(LocationConfigUtils.finalAndOriginalSpecs(spec, 
locationFlags, globalProperties, namedLocation))
+.configure(PortForwardManagerConstructor.SCOPE, scope)
+

[2/2] brooklyn-library git commit: Merge branch 'master' of https://github.com/apache/brooklyn-library

2016-03-19 Thread heneveld

Merge branch 'master' of https://github.com/apache/brooklyn-library


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

Branch: refs/heads/master
Commit: c19037bcdb89ec2226da7834cd0d058fc4e065af
Parents: 878b172 8a23940
Author: Alex Heneveld 
Authored: Fri Mar 18 14:33:21 2016 +
Committer: Alex Heneveld 
Committed: Fri Mar 18 14:33:21 2016 +

--
 .../entity/cm/ansible/AnsibleEntity.java|   2 +
 .../entity/proxy/AbstractControllerImpl.java|   5 +-
 .../proxy/AbstractNonProvisionedController.java |   4 +
 .../AbstractNonProvisionedControllerImpl.java   | 321 ---
 4 files changed, 222 insertions(+), 110 deletions(-)
--

[09/18] brooklyn-server git commit: first pass rewriting LocationRegistry and resolvers to return specs

2016-03-19 Thread heneveld

first pass rewriting LocationRegistry and resolvers to return specs


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

Branch: refs/heads/master
Commit: f755c25d2e66fa93a4a5f9f29ab8edc8d1c5be48
Parents: d2c5cc8
Author: Alex Heneveld 
Authored: Wed Mar 16 20:43:56 2016 +
Committer: Alex Heneveld 
Committed: Thu Mar 17 12:02:47 2016 +

--
 .../internal/AbstractBrooklynObjectSpec.java|   5 +
 .../api/location/LocationDefinition.java|   2 +-
 .../brooklyn/api/location/LocationRegistry.java |  75 +++--
 .../brooklyn/api/location/LocationResolver.java |  23 +--
 .../brooklyn/api/mgmt/LocationManager.java  |   5 +
 .../BrooklynComponentTemplateResolver.java  |   7 +-
 .../creation/BrooklynYamlLocationResolver.java  |  29 ++--
 .../spi/creation/CampInternalUtils.java |  15 +-
 .../apache/brooklyn/core/config/ConfigKeys.java |   2 +-
 .../brooklyn/core/entity/trait/Startable.java   |   2 +-
 .../core/location/AbstractLocationResolver.java |  18 ++-
 .../core/location/BasicLocationRegistry.java| 112 ++
 .../core/location/CatalogLocationResolver.java  |  15 +-
 .../location/DefinedLocationByIdResolver.java   |  11 +-
 .../core/location/LocationConfigUtils.java  |  13 +-
 .../brooklyn/core/location/Locations.java   |  23 ++-
 .../core/location/NamedLocationResolver.java|  14 +-
 .../location/access/PortForwardManagerImpl.java |   1 -
 .../PortForwardManagerLocationResolver.java |  10 +-
 .../location/internal/LocationInternal.java |   3 -
 .../mgmt/internal/LocalLocationManager.java |  11 +-
 .../mgmt/internal/LocationManagerInternal.java  |   8 +
 .../mgmt/persist/BrooklynPersistenceUtils.java  |  19 ++-
 .../entity/group/DynamicRegionsFabricImpl.java  |   2 +-
 .../location/byon/HostLocationResolver.java |   9 +-
 .../byon/SingleMachineLocationResolver.java |  10 +-
 .../byon/SingleMachineProvisioningLocation.java |   2 +-
 .../localhost/LocalhostLocationResolver.java|   8 +-
 .../brooklyn/location/multi/MultiLocation.java  |  42 +++--
 .../location/multi/MultiLocationResolver.java   |  86 +-
 .../location/ssh/SshMachineLocation.java|   2 +-
 .../brooklyn/launcher/common/BasicLauncher.java |   2 +-
 .../JcloudsBlobStoreBasedObjectStore.java   |   2 +-
 .../jclouds/JcloudsByonLocationResolver.java|  17 +-
 .../jclouds/JcloudsLocationResolver.java|  24 +--
 .../rest/resources/ApplicationResource.java |   2 +-
 .../rest/transform/LocationTransformer.java | 155 ---
 .../rest/util/BrooklynRestResourceUtils.java|   3 +-
 .../org/apache/brooklyn/cli/CloudExplorer.java  |   4 +-
 .../entity/machine/pool/ServerPoolImpl.java |   9 +-
 .../pool/ServerPoolLocationResolver.java|  20 ++-
 .../MachineLifecycleEffectorTasks.java  |   4 +-
 .../location/winrm/WinRmMachineLocation.java|   2 +-
 43 files changed, 511 insertions(+), 317 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/f755c25d/api/src/main/java/org/apache/brooklyn/api/internal/AbstractBrooklynObjectSpec.java
--
diff --git 
a/api/src/main/java/org/apache/brooklyn/api/internal/AbstractBrooklynObjectSpec.java
 
b/api/src/main/java/org/apache/brooklyn/api/internal/AbstractBrooklynObjectSpec.java
index 789d282..3f95342 100644
--- 
a/api/src/main/java/org/apache/brooklyn/api/internal/AbstractBrooklynObjectSpec.java
+++ 
b/api/src/main/java/org/apache/brooklyn/api/internal/AbstractBrooklynObjectSpec.java
@@ -247,6 +247,11 @@ public abstract class AbstractBrooklynObjectSpec

[1/2] brooklyn-library git commit: update tests for locations changes

2016-03-19 Thread heneveld

Repository: brooklyn-library
Updated Branches:
  refs/heads/master 8a239404b -> c19037bcd


update tests for locations changes


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

Branch: refs/heads/master
Commit: 878b17225d0ff7a76965a595f8560f21f2f4808f
Parents: fad103e
Author: Alex Heneveld 
Authored: Fri Mar 18 14:32:55 2016 +
Committer: Alex Heneveld 
Committed: Fri Mar 18 14:32:55 2016 +

--
 LICENSE |  6 +
 .../SoftlayerObtainPrivateLiveTest.java |  2 +-
 .../org/apache/brooklyn/qa/load/LoadTest.java   |  2 +-
 .../entity/cm/salt/SaltIntegrationTest.java |  2 +-
 .../database/mariadb/MariaDbLiveEc2Test.java|  2 +-
 .../mariadb/MariaDbLiveRackspaceTest.java   |  2 +-
 .../mysql/MySqlClusterIntegrationTest.java  |  2 +-
 .../entity/database/mysql/MySqlLiveEc2Test.java |  2 +-
 .../database/mysql/MySqlLiveRackspaceTest.java  |  2 +-
 .../postgresql/PostgreSqlEc2LiveTest.java   |  2 +-
 .../postgresql/PostgreSqlRackspaceLiveTest.java |  2 +-
 .../rubyrep/RubyRepRackspaceLiveTest.java   |  2 +-
 .../messaging/rabbit/RabbitEc2LiveTest.java |  2 +-
 .../storm/StormAbstractCloudLiveTest.java   |  2 +-
 .../zookeeper/ZooKeeperEnsembleLiveTest.java|  2 +-
 .../network/bind/BindDnsServerByonLiveTest.java |  2 +-
 .../cassandra/CassandraDatacenterLiveTest.java  |  2 +-
 .../cassandra/CassandraNodeEc2LiveTest.java |  2 +-
 .../nosql/cassandra/CassandraNodeLiveTest.java  |  2 +-
 .../nosql/couchdb/CouchDBClusterLiveTest.java   |  2 +-
 .../nosql/couchdb/CouchDBNodeLiveTest.java  |  2 +-
 .../nosql/mongodb/MongoDBEc2LiveTest.java   |  5 ++---
 .../entity/nosql/redis/RedisEc2LiveTest.java|  2 +-
 .../entity/nosql/riak/RiakNodeEc2LiveTest.java  |  2 +-
 .../entity/nosql/solr/SolrServerLiveTest.java   |  2 +-
 .../entity/dns/AbstractGeoDnsServiceTest.java   | 23 ++--
 .../nginx/NginxHttpsSslIntegrationTest.java |  2 +-
 .../proxy/nginx/NginxIntegrationTest.java   |  2 +-
 .../proxy/nginx/NginxWebClusterEc2LiveTest.java |  2 +-
 .../webapp/WebAppLiveIntegrationTest.java   |  8 +++
 .../jboss/JBoss6ServerAwsEc2LiveTest.java   |  2 +-
 .../jboss/JBoss7ServerAwsEc2LiveTest.java   |  2 +-
 .../JBoss7ServerRebindingIntegrationTest.java   |  2 +-
 .../webapp/tomcat/TomcatServerEc2LiveTest.java  |  2 +-
 34 files changed, 52 insertions(+), 50 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/878b1722/LICENSE
--
diff --git a/LICENSE b/LICENSE
index 13e9bcc..ccac2ba 100644
--- a/LICENSE
+++ b/LICENSE
@@ -281,6 +281,12 @@ This project includes the software: DataTables Table 
plug-in for jQuery
   Used under the following license: The BSD 3-Clause (New BSD) License 
(http://opensource.org/licenses/BSD-3-Clause)
   Copyright (c) Allan Jardine (2008-2012)
 
+This project includes the software: jquery.easy-autocomplete.js
+  Available at: https://github.com/pawelczak/EasyAutocomplete
+  Version used: 1.3.1
+  Used under the following license: The MIT License 
(http://opensource.org/licenses/MIT)
+  Copyright (c) Åukasz PaweÅczak (2015)
+
 This project includes the software: jQuery Form Plugin
   Available at: https://github.com/malsup/form
   Developed by: Mike Alsup (http://malsup.com/)

http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/878b1722/qa/src/test/java/org/apache/brooklyn/qa/brooklynnode/SoftlayerObtainPrivateLiveTest.java
--
diff --git 
a/qa/src/test/java/org/apache/brooklyn/qa/brooklynnode/SoftlayerObtainPrivateLiveTest.java
 
b/qa/src/test/java/org/apache/brooklyn/qa/brooklynnode/SoftlayerObtainPrivateLiveTest.java
index 9f351ce..3869b51 100644
--- 
a/qa/src/test/java/org/apache/brooklyn/qa/brooklynnode/SoftlayerObtainPrivateLiveTest.java
+++ 
b/qa/src/test/java/org/apache/brooklyn/qa/brooklynnode/SoftlayerObtainPrivateLiveTest.java
@@ -117,7 +117,7 @@ public class SoftlayerObtainPrivateLiveTest {
 }
 
 private Location createLocation() {
-return mgmt.getLocationRegistry().resolve(LOCATION_SPEC);
+return mgmt.getLocationRegistry().getLocationManaged(LOCATION_SPEC);
 }
 
 @Test(groups="Live")

http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/878b1722/qa/src/test/java/org/apache/brooklyn/qa/load/LoadTest.java
--
diff --git

[4/6] brooklyn-docs git commit: This closes #29

2016-03-19 Thread heneveld

This closes #29


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

Branch: refs/heads/master
Commit: 75a940f9e238c4b4d06124d17f65e2fc2e8e19ed
Parents: dcb4014 c38e954
Author: Alex Heneveld 
Authored: Fri Mar 18 12:19:01 2016 +
Committer: Alex Heneveld 
Committed: Fri Mar 18 12:19:01 2016 +

--
 .../yaml/ansible/creating-ansible-blueprints.md | 102 +++
 1 file changed, 102 insertions(+)
--

[01/18] brooklyn-server git commit: does not create a localhost named location any longer. the wizard (coming soon) will do this for us.

2016-03-19 Thread heneveld

Repository: brooklyn-server
Updated Branches:
  refs/heads/master 16ee522c5 -> 5c8cdfa88


does not create a localhost named location any longer.  the wizard (coming 
soon) will do this for us.


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

Branch: refs/heads/master
Commit: d332bcc4d60868736716990660f388c648dd8546
Parents: 379cd5c
Author: Alex Heneveld 
Authored: Mon Mar 14 16:53:54 2016 +
Committer: Alex Heneveld 
Committed: Mon Mar 14 16:53:54 2016 +

--
 .../core/location/BasicLocationRegistry.java| 30 +++---
 .../localhost/LocalhostLocationResolver.java|  9 ++-
 .../core/location/LocationRegistryTest.java | 61 +++-
 .../ApplicationResourceIntegrationTest.java |  2 +-
 .../rest/client/BrooklynApiRestClientTest.java  |  2 +-
 .../rest/testing/BrooklynRestApiTest.java   |  2 +-
 .../rest/testing/BrooklynRestApiTest.java   |  2 +-
 7 files changed, 79 insertions(+), 29 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d332bcc4/core/src/main/java/org/apache/brooklyn/core/location/BasicLocationRegistry.java
--
diff --git 
a/core/src/main/java/org/apache/brooklyn/core/location/BasicLocationRegistry.java
 
b/core/src/main/java/org/apache/brooklyn/core/location/BasicLocationRegistry.java
index 0dc88d0..c7d7127 100644
--- 
a/core/src/main/java/org/apache/brooklyn/core/location/BasicLocationRegistry.java
+++ 
b/core/src/main/java/org/apache/brooklyn/core/location/BasicLocationRegistry.java
@@ -47,6 +47,7 @@ import 
org.apache.brooklyn.core.location.internal.LocationInternal;
 import org.apache.brooklyn.core.mgmt.internal.LocalLocationManager;
 import org.apache.brooklyn.core.mgmt.internal.ManagementContextInternal;
 import org.apache.brooklyn.core.typereg.RegisteredTypePredicates;
+import org.apache.brooklyn.location.localhost.LocalhostLocationResolver;
 import org.apache.brooklyn.util.collections.MutableList;
 import org.apache.brooklyn.util.collections.MutableMap;
 import org.apache.brooklyn.util.core.config.ConfigBag;
@@ -278,16 +279,6 @@ public class BasicLocationRegistry implements 
LocationRegistry {
 }
 if (log.isDebugEnabled())
 log.debug("Found "+count+" defined locations from properties 
(*.named.* syntax): "+definedLocations.values());
-if (getDefinedLocationByName("localhost")==null && 
!BasicOsDetails.Factory.newLocalhostInstance().isWindows()
-&& LocationConfigUtils.isEnabled(mgmt, 
"brooklyn.location.localhost")) {
-log.debug("Adding a defined location for localhost");
-// add 'localhost' *first*
-ImmutableMap oldDefined = 
ImmutableMap.copyOf(definedLocations);
-definedLocations.clear();
-String id = Identifiers.makeRandomId(8);
-definedLocations.put(id, localhost(id));
-definedLocations.putAll(oldDefined);
-}
 
 for (RegisteredType item: 
mgmt.getTypeRegistry().getMatching(RegisteredTypePredicates.IS_LOCATION)) {
 updateDefinedLocation(item);
@@ -296,13 +287,7 @@ public class BasicLocationRegistry implements 
LocationRegistry {
 }
 }
 
-@VisibleForTesting
-void disablePersistence() {
-// persistence isn't enabled yet anyway (have to manually save things,
-// defining the format and file etc)
-}
-
-protected static BasicLocationDefinition localhost(String id) {
+private static BasicLocationDefinition localhost(String id) {
 return new BasicLocationDefinition(id, "localhost", "localhost", null);
 }
 
@@ -477,12 +462,15 @@ public class BasicLocationRegistry implements 
LocationRegistry {
 }
 
 @VisibleForTesting
-public static void setupLocationRegistryForTesting(ManagementContext mgmt) 
{
-// ensure localhost is added (even on windows)
+public static void addNamedLocationLocalhost(ManagementContext mgmt) {
+if 
(!mgmt.getConfig().getConfig(LocalhostLocationResolver.LOCALHOST_ENABLED)) {
+throw new IllegalStateException("Localhost is disabled.");
+}
+
+// ensure localhost is added (even on windows, it's just for testing)
 LocationDefinition l = 
mgmt.getLocationRegistry().getDefinedLocationByName("localhost");
 if (l==null) mgmt.getLocationRegistry().updateDefinedLocation(

[15/16] brooklyn-ui git commit: This closes #18

2016-03-19 Thread heneveld

This closes #18


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

Branch: refs/heads/master
Commit: 93ff2cbbeb1f6eb1b53bf5763ae6d76b9ddf0d6f
Parents: 6970dcf 926ae85
Author: Alex Heneveld 
Authored: Fri Mar 18 11:02:11 2016 +
Committer: Alex Heneveld 
Committed: Fri Mar 18 11:02:11 2016 +

--
 src/main/webapp/assets/js/view/catalog.js   | 42 ++-
 .../assets/tpl/catalog/details-location.html| 43 
 2 files changed, 76 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/93ff2cbb/src/main/webapp/assets/js/view/catalog.js
--

[01/16] brooklyn-dist git commit: make-release-artifacts.sh: refactor reusable code

2016-03-19 Thread heneveld

Repository: brooklyn-dist
Updated Branches:
  refs/heads/master 01ac8ad8d -> 5ee9370cc


make-release-artifacts.sh: refactor reusable code

fail(), confirm() and detect_version() are refactored into a separate
script, along with new function assert_in_project_root(), which is
sourced in.

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

Branch: refs/heads/master
Commit: 9e4100d8866042aa3ac26d681d5c54ef90a4f887
Parents: 01ac8ad
Author: Richard Downer 
Authored: Tue Mar 15 13:50:09 2016 +
Committer: Richard Downer 
Committed: Wed Mar 16 15:39:17 2016 +

--
 release/common.sh | 64 ++
 release/make-release-artifacts.sh | 43 +++
 2 files changed, 69 insertions(+), 38 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/9e4100d8/release/common.sh
--
diff --git a/release/common.sh b/release/common.sh
new file mode 100755
index 000..51ed3d4
--- /dev/null
+++ b/release/common.sh
@@ -0,0 +1,64 @@
+#!/bin/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
+# 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.
+#
+
+###
+fail() {
+echo >&2 "$@"
+exit 1
+}
+
+###
+confirm() {
+# call with a prompt string or use a default
+if [ "${batch_confirm_y}" == "true" ] ; then
+true
+else
+  read -r -p "${1:-Are you sure? [y/N]} " response
+  case $response in
+[yY][eE][sS]|[yY]) 
+true
+;;
+*)
+false
+;;
+  esac
+fi
+}
+
+###
+detect_version() {
+if [ \! -z "${current_version}" ]; then
+return
+fi
+
+set +e
+current_version=$( xmlstarlet select -t -v '/_:project/_:version/text()' 
pom.xml 2>/dev/null )
+success=$?
+set -e
+if [ "${success}" -ne 0 -o -z "${current_version}" ]; then
+fail Could not detect version number
+fi
+}
+
+###
+assert_in_project_root() {
+[ -d .git ] || fail Must run in brooklyn project root directory
+}
+

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/9e4100d8/release/make-release-artifacts.sh
--
diff --git a/release/make-release-artifacts.sh 
b/release/make-release-artifacts.sh
index 90f138e..7bd2f18 100755
--- a/release/make-release-artifacts.sh
+++ b/release/make-release-artifacts.sh
@@ -25,11 +25,12 @@
 
 set -e
 
-###
-fail() {
-echo >&2 "$@"
+release_script_dir=$( cd $( dirname $0 ) && pwd )
+[ -f "${release_script_dir}/common.sh" ] || {
+echo >&2 "Could not find common.sh in the same directory as this script"
 exit 1
 }
+. "${release_script_dir}/common.sh"
 
 ###
 show_help() {
@@ -59,39 +60,6 @@ END
 }
 
 ###
-confirm() {
-# call with a prompt string or use a default
-if [ "${batch_confirm_y}" == "true" ] ; then
-true
-else
-  read -r -p "${1:-Are you sure? [y/N]} " response
-  case $response in
-[yY][eE][sS]|[yY]) 
-true
-;;
-*)
-false
-;;
-  esac
-fi
-}
-
-###
-detect_version() {
-if [ \! -z "${current_version}" ]; then
-return
-fi
-
-set +e
-current_version=$(

[17/18] brooklyn-server git commit: This closes #62

2016-03-19 Thread heneveld

This closes #62


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

Branch: refs/heads/master
Commit: 23ed1940090190eb54a9357f437c4aac5ec8ee31
Parents: 16ee522 bcf4d9b
Author: Alex Heneveld 
Authored: Fri Mar 18 11:05:58 2016 +
Committer: Alex Heneveld 
Committed: Fri Mar 18 11:05:58 2016 +

--
 .../core/location/BasicLocationRegistry.java| 30 +++---
 .../localhost/LocalhostLocationResolver.java|  9 ++-
 .../core/location/LocationRegistryTest.java | 61 +++-
 .../ApplicationResourceIntegrationTest.java |  2 +-
 .../rest/client/BrooklynApiRestClientTest.java  |  2 +-
 .../rest/testing/BrooklynRestApiTest.java   |  2 +-
 .../rest/testing/BrooklynRestApiTest.java   |  2 +-
 7 files changed, 79 insertions(+), 29 deletions(-)
--

[08/16] brooklyn-dist git commit: Make release script: minor tweaks

2016-03-19 Thread heneveld

Make release script: minor tweaks

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

Branch: refs/heads/master
Commit: f4b73e9514ad924079416185b8ea796df2e38159
Parents: 0c9e1cc
Author: Richard Downer 
Authored: Wed Mar 16 16:09:05 2016 +
Committer: Richard Downer 
Committed: Wed Mar 16 16:09:37 2016 +

--
 release/make-release-artifacts.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/f4b73e95/release/make-release-artifacts.sh
--
diff --git a/release/make-release-artifacts.sh 
b/release/make-release-artifacts.sh
index c7ab1c1..310b3b6 100755
--- a/release/make-release-artifacts.sh
+++ b/release/make-release-artifacts.sh
@@ -169,7 +169,7 @@ for module in ${modules}; do ( cd $module && git clean -dxf 
); done
 echo "Creating source release folder ${release_name}"
 set -x
 mkdir -p ${src_staging_dir}
-mkdir -p ${bin_staging_dir}
+
 # exclude: 
 # * docs (which isn't part of the release, and adding license headers to js 
files is cumbersome)
 # * sandbox (which hasn't been vetted so thoroughly)
@@ -192,6 +192,7 @@ set +x
 echo "Proceeding to build binary release"
 set -x
 
+mkdir -p ${bin_staging_dir}
 
 # Workaround for bug BROOKLYN-1
 ( cd ${src_staging_dir} && mvn clean --projects :brooklyn-archetype-quickstart 
)

[16/16] brooklyn-ui git commit: minor tidies of location wizard

2016-03-19 Thread heneveld

minor tidies of location wizard


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

Branch: refs/heads/master
Commit: 8c7b1dde3b21474ece627dc4e4908de1cca5a075
Parents: 93ff2cb
Author: Alex Heneveld 
Authored: Fri Mar 18 11:01:09 2016 +
Committer: Alex Heneveld 
Committed: Fri Mar 18 11:02:18 2016 +

--
 .../webapp/assets/js/view/location-wizard.js| 91 
 .../tpl/location-wizard/location-type.html  |  6 +-
 2 files changed, 40 insertions(+), 57 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/8c7b1dde/src/main/webapp/assets/js/view/location-wizard.js
--
diff --git a/src/main/webapp/assets/js/view/location-wizard.js 
b/src/main/webapp/assets/js/view/location-wizard.js
index 12680a5..008b906 100644
--- a/src/main/webapp/assets/js/view/location-wizard.js
+++ b/src/main/webapp/assets/js/view/location-wizard.js
@@ -54,8 +54,8 @@ define([
 
 this.steps = [
 {
-title: 'Location type',
-subtitle: 'Select the location type you want to add',
+title: 'Location Type',
+subtitle: 'Select the location type to make available for 
deployments',
 view: LocationType
 },
 {
@@ -75,7 +75,7 @@ define([
 class: 'location-wizard-edit'
 },
 {
-label: 'Save and add another',
+label: 'Save and Add Another',
 class: 'location-wizard-save-and-reset'
 },
 {
@@ -312,6 +312,22 @@ define([
 }
 });
 
+var common_fields = {
+location_id: {
+id: 'name',
+label: 'Location ID',
+type: 'text',
+help: 'A label to identify this location in YAML. Typically this 
is lower case using hyphens and no spaces',
+require: true
+},
+location_name: {
+id: 'displayName',
+label: 'Location Name',
+type: 'text',
+help: 'A display name to present this location to a user 
(optional)'
+},
+};
+
 var LocationConfiguration = Backbone.View.extend({
 className: 'location-wizard-body',
 template: _.template(LocationConfigurationHtml),
@@ -322,19 +338,8 @@ define([
 
 fields: {
 cloud: [
-{
-id: 'name',
-label: 'Location ID',
-type: 'text',
-help: 'Label to identify this location. Typically this is 
lower case using hyphens and no spaces',
-require: true
-},
-{
-id: 'displayName',
-label: 'Location Name',
-type: 'text',
-help: 'Display name used throughout the web console'
-},
+common_fields.location_id,
+common_fields.location_name,
 {
 id: 'spec',
 label: 'Cloud Provider',
@@ -344,14 +349,14 @@ define([
 'jclouds:google-compute-engine': 'Google',
 'jclouds:openstack': 'Openstack',
 'jclouds:softlayer': 'Softlayer',
-other: 'Other'
+other: 'Other (supply location spec string)'
 }
 },
 {
 id: 'region',
 label: 'Cloud Region',
 type: 'text',
-help: 'Some cloud providers have different regions for you 
to use. You can enter here this information',
+help: 'Public cloud providers often have multiple regions 
available. Enter the region to use if applicable (optional)',
 disable: {
 spec: [
 'jclouds:openstack'
@@ -362,7 +367,7 @@ define([
 id: 'endpoint',
 label: 'Cloud Endpoint',
 type: 'text',
-help: 'Cloud endpoint used by Brooklyn to communicate with 
their API',
+help: 'If using a private cloud, the URL to connect to it 
is required',
 require: {
 spec: [
 'jclouds:openstack'
@@

[05/18] brooklyn-server git commit: support location spec on entity spec, and deprecate methods which take concrete objects

2016-03-19 Thread heneveld

support location spec on entity spec, and deprecate methods which take concrete 
objects


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

Branch: refs/heads/master
Commit: 2876a9e5884332c38cdd2f631d0d221de2de35c9
Parents: 515af88
Author: Alex Heneveld 
Authored: Tue Mar 15 13:27:35 2016 +
Committer: Alex Heneveld 
Committed: Tue Mar 15 13:27:35 2016 +

--
 .../apache/brooklyn/api/entity/EntitySpec.java  | 59 
 .../BrooklynComponentTemplateResolver.java  |  1 +
 .../core/mgmt/EntityManagementUtils.java|  6 +-
 .../core/objs/proxy/InternalEntityFactory.java  |  6 +-
 .../entity/group/DynamicClusterImpl.java| 12 ++--
 5 files changed, 65 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/2876a9e5/api/src/main/java/org/apache/brooklyn/api/entity/EntitySpec.java
--
diff --git a/api/src/main/java/org/apache/brooklyn/api/entity/EntitySpec.java 
b/api/src/main/java/org/apache/brooklyn/api/entity/EntitySpec.java
index 58cf946..9287aab 100644
--- a/api/src/main/java/org/apache/brooklyn/api/entity/EntitySpec.java
+++ b/api/src/main/java/org/apache/brooklyn/api/entity/EntitySpec.java
@@ -28,6 +28,7 @@ import javax.annotation.Nullable;
 
 import org.apache.brooklyn.api.internal.AbstractBrooklynObjectSpec;
 import org.apache.brooklyn.api.location.Location;
+import org.apache.brooklyn.api.location.LocationSpec;
 import org.apache.brooklyn.api.policy.Policy;
 import org.apache.brooklyn.api.policy.PolicySpec;
 import org.apache.brooklyn.api.sensor.Enricher;
@@ -108,6 +109,7 @@ public class EntitySpec extends 
AbstractBrooklynObjectSpec enricherSpecs = Lists.newArrayList();
 private final List locations = Lists.newArrayList();
+private final List locationSpecs = Lists.newArrayList();
 private final Set additionalInterfaces = Sets.newLinkedHashSet();
 private final List entityInitializers = 
Lists.newArrayList();
 private final List children = Lists.newArrayList();
@@ -131,6 +133,7 @@ public class EntitySpec extends 
AbstractBrooklynObjectSpec getLocationSpecs() {
+return locationSpecs;
+}
+
+/** @deprecated since 0.9.0 in future only {@link #getLocationSpecs()} 
will be supported */ @Deprecated
 public List getLocations() {
 return locations;
 }
@@ -311,7 +321,8 @@ public class EntitySpec extends 
AbstractBrooklynObjectSpec

[13/16] brooklyn-dist git commit: Release Vagrantfile: install Go and RPM

2016-03-19 Thread heneveld

Release Vagrantfile: install Go and RPM

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

Branch: refs/heads/master
Commit: ae0f7b032e835a79bcdcdc45bf744c2ba76c00ab
Parents: 0e5e100
Author: Richard Downer 
Authored: Wed Mar 16 16:50:37 2016 +
Committer: Richard Downer 
Committed: Wed Mar 16 16:50:37 2016 +

--
 release/Vagrantfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/ae0f7b03/release/Vagrantfile
--
diff --git a/release/Vagrantfile b/release/Vagrantfile
index 83b8a7c..2b7d634 100644
--- a/release/Vagrantfile
+++ b/release/Vagrantfile
@@ -49,9 +49,10 @@ Vagrant.configure(2) do |config|
   # Update the VM, install Java and Maven, enable 
passwordless-ssh-to-localhost,
   # clone the canonical repository
   config.vm.provision "shell", inline: <<-SHELL
+add-apt-repository -y ppa:mwhudson/go16-trusty
 apt-get update
 apt-get upgrade -y
-apt-get install -y default-jdk git subversion xmlstarlet zip unzip 
language-pack-en vim-nox gnupg2 gnupg-agent pinentry-curses
+apt-get install -y default-jdk git subversion xmlstarlet zip unzip 
language-pack-en vim-nox gnupg2 gnupg-agent pinentry-curses golang-1.6 rpm
 mkdir -p /opt
 chmod -R go= ~vagrant/.gnupg
 curl 
http://archive.apache.org/dist/maven/maven-3/3.1.1/binaries/apache-maven-3.1.1-bin.tar.gz
 | tar xz -C /opt

[08/16] brooklyn-ui git commit: Add source exclusion for licensing

2016-03-19 Thread heneveld

Add source exclusion for licensing


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

Branch: refs/heads/master
Commit: 193c5b88af2d77ece02f90bd6d043ace80ed7b31
Parents: 2851c1e
Author: Thomas Bouron 
Authored: Thu Mar 17 12:46:15 2016 +
Committer: Thomas Bouron 
Committed: Thu Mar 17 12:49:12 2016 +

--
 src/main/license/source-inclusions.yaml | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/193c5b88/src/main/license/source-inclusions.yaml
--
diff --git a/src/main/license/source-inclusions.yaml 
b/src/main/license/source-inclusions.yaml
index d61d6d6..1c3040e 100644
--- a/src/main/license/source-inclusions.yaml
+++ b/src/main/license/source-inclusions.yaml
@@ -43,4 +43,5 @@
 - id: codemirror.js
 - id: font-awesome-fonts
 - id: font-awesome-code
+- id: jquery.easy-autocomplete.js

[1/2] brooklyn-ui git commit: Move jQuery code inside a closure managed by require

2016-03-19 Thread heneveld

Repository: brooklyn-ui
Updated Branches:
  refs/heads/master 559d39173 -> bf75d7f07


Move jQuery code inside a closure managed by require


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

Branch: refs/heads/master
Commit: c8308f00325f4ad36c41d0b46055b09c143b
Parents: 2e051f4
Author: Thomas Bouron 
Authored: Fri Mar 18 14:17:43 2016 +
Committer: Thomas Bouron 
Committed: Fri Mar 18 14:17:43 2016 +

--
 src/main/webapp/assets/js/config.js | 13 -
 src/main/webapp/assets/js/router.js | 14 ++
 2 files changed, 14 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/c8308f00/src/main/webapp/assets/js/config.js
--
diff --git a/src/main/webapp/assets/js/config.js 
b/src/main/webapp/assets/js/config.js
index 55c2275..5a02080 100644
--- a/src/main/webapp/assets/js/config.js
+++ b/src/main/webapp/assets/js/config.js
@@ -103,16 +103,3 @@ require([
 new Router().startBrooklynGui();
 });
 
-/*
- * Prepend a base URL to REST API calls
- */
-$.ajaxSetup({
-beforeSend: function(jqXHR, settings) {
-//var baseURL = "/api/brooklyn/";
-var baseURL = "";
-
-if (baseURL && settings.url.startsWith("/v1")) {
-settings.url = (baseURL + settings.url).replace("//", "/");
-}
-}
-});

http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/c8308f00/src/main/webapp/assets/js/router.js
--
diff --git a/src/main/webapp/assets/js/router.js 
b/src/main/webapp/assets/js/router.js
index 26722ac..d26bec2 100644
--- a/src/main/webapp/assets/js/router.js
+++ b/src/main/webapp/assets/js/router.js
@@ -253,5 +253,19 @@ define([
 }
 });
 
+/*
+ * Prepend a base URL to REST API calls
+ */
+$.ajaxSetup({
+beforeSend: function(jqXHR, settings) {
+// var baseURL = "/api/brooklyn/";
+var baseURL = "";
+
+if (baseURL && settings.url.startsWith("/v1")) {
+settings.url = (baseURL + settings.url).replace("//", "/");
+}
+}
+});
+
 return Router
 })

51 matches

Mail list logo