[2/2] brooklyn-dist git commit: Merge and close #20

2016-03-15 Thread richard 
Merge and close #20


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

Branch: refs/heads/master
Commit: 01ac8ad8d12f45c89201fc9a3910dbc4d8162664
Parents: 2eb9409 d65dc05
Author: Richard Downer 
Authored: Tue Mar 15 21:39:14 2016 +
Committer: Richard Downer 
Committed: Tue Mar 15 21:39:14 2016 +

--
 packaging/pom.xml | 3 +++
 1 file changed, 3 insertions(+)
--

[2/2] brooklyn-dist git commit: Closes #18

2016-03-15 Thread svet 
Closes #18

change-version.sh to ignore .swp files


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

Branch: refs/heads/master
Commit: 2eb9409127dfdee44c18e8bf37ec745d0a4115a9
Parents: ce322a3 6999689
Author: Svetoslav Neykov 
Authored: Tue Mar 15 13:39:23 2016 +0200
Committer: Svetoslav Neykov 
Committed: Tue Mar 15 13:39:23 2016 +0200

--
 release/change-version.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--

[1/2] brooklyn-dist git commit: change-version.sh to ignore .swp files

2016-03-15 Thread svet 
Repository: brooklyn-dist
Updated Branches:
  refs/heads/master ce322a31d -> 2eb940912


change-version.sh to ignore .swp files

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

Branch: refs/heads/master
Commit: 6999689c1a1a12dd143b45d29c8772007f287d6b
Parents: 6b90626
Author: Aled Sage 
Authored: Tue Mar 15 10:25:56 2016 +
Committer: Aled Sage 
Committed: Tue Mar 15 10:25:56 2016 +

--
 release/change-version.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/6999689c/release/change-version.sh
--
diff --git a/release/change-version.sh b/release/change-version.sh
index 30dc930..4f658d9 100755
--- a/release/change-version.sh
+++ b/release/change-version.sh
@@ -49,13 +49,13 @@ NEW_VERSION=$2
 
 # grep --exclude-dir working only in recent versions, not on all platforms, 
replace with find;
 # skip folders named "ignored" or .xxx (but not the current folder ".");
-# exclude log, war, etc. files;
+# exclude log, war, swp, etc. files;
 # use null delimiters so files containing spaces are supported;
 # pass /dev/null as the first file to search in, so the command doesn't fail 
if find doesn't match any files;
 # add || true for the case where grep doesn't have matches, so the script 
doesn't halt
 # If there's an error "Argument list too long" add -n20 to xargs arguments and 
loop over $FILE around sed
 FILES=`find . -type d \( -name ignored -or -name target -or -name .?\* \) 
-prune \
-   -o -type f -not \( -name \*.log -or -name '*.war' -or -name '*.min.js' 
-or -name '*.min.css' \) -print0 | \
+   -o -type f -not \( -name \*.log -or -name '*.war' -or -name '*.min.js' 
-or -name '*.min.css' -or -name '*.swp' \) -print0 | \
xargs -0 grep -l "${VERSION_MARKER}\|${VERSION_MARKER_NL}" /dev/null || 
true`
 
 FILES_COUNT=`echo $FILES | wc | awk '{print $2}'`

[1/2] brooklyn-dist git commit: Add a build flag "-Dno-rpm" to allow configuration of build to avoid RPM packaging step.

2016-03-15 Thread svet 
Repository: brooklyn-dist
Updated Branches:
  refs/heads/master 6b906265f -> ce322a31d


Add a build flag "-Dno-rpm" to allow configuration of build to avoid RPM 
packaging step.


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

Branch: refs/heads/master
Commit: f161c29c142603d824b7a32c4db1367b5a1bd6d4
Parents: 6b90626
Author: Geoff Macartney 
Authored: Tue Mar 15 10:58:19 2016 +
Committer: Geoff Macartney 
Committed: Tue Mar 15 10:58:19 2016 +

--
 pom.xml | 18 +-
 1 file changed, 17 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/f161c29c/pom.xml
--
diff --git a/pom.xml b/pom.xml
index fd4b767..c13e2b5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,11 +70,27 @@
 
 
 
+
+
+
+
+rpm-module
+
+
+!no-rpm
+
+
+
+packaging
+
+
+
+
+
 
 downstream-parent
 all
 dist
-packaging
 vagrant
 archetypes/quickstart

[2/2] brooklyn-dist git commit: Closes #19

2016-03-15 Thread svet 
Closes #19

Add build flag (& profile)  "-Dno-rpm"

Add a build flag "-Dno-rpm" and profile to allow configuration of build to 
avoid RPM packaging step.


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

Branch: refs/heads/master
Commit: ce322a31d5aa5d63a2c1f1c1e00b300eb3bd38b0
Parents: 6b90626 f161c29
Author: Svetoslav Neykov 
Authored: Tue Mar 15 13:38:26 2016 +0200
Committer: Svetoslav Neykov 
Committed: Tue Mar 15 13:38:26 2016 +0200

--
 pom.xml | 18 +-
 1 file changed, 17 insertions(+), 1 deletion(-)
--

[1/2] brooklyn-server git commit: BrooklynNode: support initial catalog.bom conf

2016-03-15 Thread aledsage 
Repository: brooklyn-server
Updated Branches:
  refs/heads/master 1f6d5d987 -> b70c2b0b6


BrooklynNode: support initial catalog.bom conf


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

Branch: refs/heads/master
Commit: b98d5b2c33b26d128e7d8353d869edb261bbbdb0
Parents: f20bf0e
Author: Aled Sage 
Authored: Fri Mar 11 21:57:45 2016 +
Committer: Aled Sage 
Committed: Mon Mar 14 22:08:10 2016 +

--
 .../entity/brooklynnode/BrooklynNode.java   | 17 -
 .../brooklynnode/BrooklynNodeSshDriver.java | 27 +++-
 .../BrooklynNodeIntegrationTest.java| 72 +---
 3 files changed, 102 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/b98d5b2c/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNode.java
--
diff --git 
a/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNode.java
 
b/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNode.java
index 55c2e27..aae5455 100644
--- 
a/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNode.java
+++ 
b/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNode.java
@@ -170,24 +170,35 @@ public interface BrooklynNode extends SoftwareProcess, 
UsesJava {
 "brooklynnode.brooklynproperties.local.contents", "Contents for 
the launch-specific brooklyn properties file", null);
 
 // For use in testing primarily
-/** @deprecated since 0.7.0; TODO this should support BOM files */
+/** @deprecated since 0.7.0; instead set the catalog initial bom */
 @Deprecated
 @SetFromFlag("brooklynCatalogRemotePath")
 public static final ConfigKey BROOKLYN_CATALOG_REMOTE_PATH = 
ConfigKeys.newStringConfigKey(
 "brooklynnode.brooklyncatalog.remotepath", "Remote path for the 
brooklyn catalog.xml file to be uploaded", "${HOME}/.brooklyn/catalog.xml");
 
-/** @deprecated since 0.7.0; TODO this should support BOM files */
+/** @deprecated since 0.7.0; instead use {@link 
#BROOKLYN_CATALOG_INITIAL_BOM_URI} */
 @Deprecated
 @SetFromFlag("brooklynCatalogUri")
 public static final ConfigKey BROOKLYN_CATALOG_URI = 
ConfigKeys.newStringConfigKey(
 "brooklynnode.brooklyncatalog.uri", "URI for the brooklyn 
catalog.xml file (uploaded to ~/.brooklyn/catalog.xml)", null);
 
-/** @deprecated since 0.7.0; TODO this should support BOM files */
+/** @deprecated since 0.7.0; instead use {@link 
#BROOKLYN_CATALOG_INITIAL_BOM_CONTENTS} */
 @Deprecated
 @SetFromFlag("brooklynCatalogContents")
 public static final ConfigKey BROOKLYN_CATALOG_CONTENTS = 
ConfigKeys.newStringConfigKey(
 "brooklynnode.brooklyncatalog.contents", "Contents for the 
brooklyn catalog.xml file (uploaded to ~/.brooklyn/catalog.xml)", null);
 
+public static final ConfigKey 
BROOKLYN_CATALOG_INITIAL_BOM_REMOTE_PATH = ConfigKeys.newStringConfigKey(
+"brooklynnode.catalog.initial.bom.remotepath", 
+"Remote path for the launch-specific initial catalog file to be 
uploaded", 
+"${driver.runDir}/brooklyn-local.bom");
+
+public static final ConfigKey BROOKLYN_CATALOG_INITIAL_BOM_URI = 
ConfigKeys.newStringConfigKey(
+"brooklynnode.catalog.initial.bom.uri", "URI for the catalog .bom 
file (to overwrite the default)", null);
+
+public static final ConfigKey 
BROOKLYN_CATALOG_INITIAL_BOM_CONTENTS = ConfigKeys.newStringConfigKey(
+"brooklynnode.catalog.initial.bom.contents", "Contents for the 
catalog .bom file (to overwrite the default)", null);
+
 @SuppressWarnings({ "rawtypes", "unchecked" })
 @SetFromFlag("enabledHttpProtocols")
 public static final BasicAttributeSensorAndConfigKey 
ENABLED_HTTP_PROTOCOLS = new BasicAttributeSensorAndConfigKey(

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/b98d5b2c/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeSshDriver.java
--
diff --git 
a/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeSshDriver.java
 
b/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeSshDriver.java
index 5e2caa2..bdcad9d 100644
--- 
a/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeSshDriver.java
+++