Merge branch 'master' of github.com:grkvlt/brooklyn-central into
feature/resourceutils-static
* 'master' of github.com:grkvlt/brooklyn-central: (37 commits)
Replaced erroneous magic number with constant
Fixed indentation following PR comments
Changed pubsub message text to be in line with new Subscribe output
Update following PR comments
Fixed addition of elasticsearch dependency that had broken whirr/base/pom.xml
Fixed another reference to StandaloneBrokerExample vs
StandaloneQpidBrokerExample
Fixed issue that mean example subscriber would quit after 101 messages, not
100
Added message to the example message subscriber to clarify why it run, then
quit
Added call to super.connectSensors() in QpidBrokerImpl (its ommission meant
the BROKER_URL sensor was never set)
Updated example text to use same classname as provided class
Updated whirr example to add whirr-elasticsearch jar to BROOKLYN_CLASSPATH
and added note about including whirr-elasticsearch as a dependency
Added whirr-elasticsearch dependency to hadoop-and-whirr example pom and test
dependency to whirr/base/pom
Updated screenshots in whirr hadoop example
Fixed typo in whirrhadoop example
Added explicit call to Entities.manage() for whirr entities (fixes entity
display issue in web console)
Added version-specific dependency for jclouds-enterprise (required by whirr)
Update WideAreaCassandraCluster.java
Update HighAvailabilityCassandraCluster.java
fix test for removal of delete button from home page js gui
tweak web example sql so it is more portable
...
Conflicts:
examples/simple-nosql-cluster/src/main/java/brooklyn/demo/CumulusRDFApplication.java
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/358c13e5
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/358c13e5
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/358c13e5
Branch: refs/heads/0.6.0
Commit: 358c13e56f104b03bb74919804a1e3d118407665
Parents: 3fb845b 1ed1f10
Author: Andrew Kennedy <[email protected]>
Authored: Tue Nov 5 13:09:12 2013 +0000
Committer: Andrew Kennedy <[email protected]>
Committed: Tue Nov 5 13:09:12 2013 +0000
----------------------------------------------------------------------
.../entity/group/DynamicClusterImpl.java | 8 +++---
.../location/basic/SshMachineLocation.java | 28 ++++++++++++--------
.../main/resources/visitors-creation-script.sql | 10 +++++--
locations/jclouds/pom.xml | 2 +-
.../brooklyn/location-metadata.properties | 4 +--
pom.xml | 2 +-
.../test/resources/visitors-creation-script.sql | 10 +++++--
.../entity/basic/SoftwareProcessImpl.java | 2 +-
.../entity/chef/ChefLifecycleEffectorTasks.java | 13 ++++++++-
systems/whirr/base/pom.xml | 11 ++++++++
.../extras/whirr/core/WhirrClusterImpl.java | 6 +++--
.../brooklyn/util/collections/MutableMap.java | 7 +++--
12 files changed, 75 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/358c13e5/core/src/main/java/brooklyn/location/basic/SshMachineLocation.java
----------------------------------------------------------------------
diff --cc core/src/main/java/brooklyn/location/basic/SshMachineLocation.java
index 58804e9,e56e962..1643665
--- a/core/src/main/java/brooklyn/location/basic/SshMachineLocation.java
+++ b/core/src/main/java/brooklyn/location/basic/SshMachineLocation.java
@@@ -624,15 -626,17 +624,17 @@@ public class SshMachineLocation extend
/**
* @see #obtainPort(PortRange)
- * @see BasicPortRange#ANY_HIGH_PORT
+ * @see PortRanges#ANY_HIGH_PORT
*/
public boolean obtainSpecificPort(int portNumber) {
- // TODO Does not yet check if the port really is free on this
machine
- if (usedPorts.contains(portNumber)) {
- return false;
- } else {
- usedPorts.add(portNumber);
- return true;
+ synchronized (usedPorts) {
+ // TODO Does not yet check if the port really is free on this
machine
+ if (usedPorts.contains(portNumber)) {
+ return false;
+ } else {
+ usedPorts.add(portNumber);
+ return true;
+ }
}
}
