[2/2] brooklyn-library git commit: This closes #17

[aledsage]

This closes #17


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

Branch: refs/heads/master
Commit: 65fb696945ec84b036da6b45ddcf87573848df26
Parents: fad103e 1e7c2ce
Author: Aled Sage 
Authored: Fri Mar 11 17:48:18 2016 +
Committer: Aled Sage 
Committed: Fri Mar 11 17:48:18 2016 +

--
 .../java/org/apache/brooklyn/entity/cm/ansible/AnsibleEntity.java  | 2 ++
 1 file changed, 2 insertions(+)
--

[1/2] brooklyn-library git commit: Adding @Catalog annotation to the AnsibleEntity

[aledsage]

Repository: brooklyn-library
Updated Branches:
  refs/heads/master fad103e96 -> 65fb69694


Adding @Catalog annotation to the AnsibleEntity

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

Branch: refs/heads/master
Commit: 1e7c2ce0be12e100bf9211777db591764ddf3813
Parents: fad103e
Author: Yavor Yanchev 
Authored: Fri Mar 11 11:24:30 2016 +0200
Committer: Yavor Yanchev 
Committed: Fri Mar 11 11:24:30 2016 +0200

--
 .../java/org/apache/brooklyn/entity/cm/ansible/AnsibleEntity.java  | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/1e7c2ce0/software/cm/ansible/src/main/java/org/apache/brooklyn/entity/cm/ansible/AnsibleEntity.java
--
diff --git 
a/software/cm/ansible/src/main/java/org/apache/brooklyn/entity/cm/ansible/AnsibleEntity.java
 
b/software/cm/ansible/src/main/java/org/apache/brooklyn/entity/cm/ansible/AnsibleEntity.java
index a2c9676..a795b76 100644
--- 
a/software/cm/ansible/src/main/java/org/apache/brooklyn/entity/cm/ansible/AnsibleEntity.java
+++ 
b/software/cm/ansible/src/main/java/org/apache/brooklyn/entity/cm/ansible/AnsibleEntity.java
@@ -18,6 +18,7 @@
  */
 package org.apache.brooklyn.entity.cm.ansible;
 
+import org.apache.brooklyn.api.catalog.Catalog;
 import org.apache.brooklyn.api.entity.ImplementedBy;
 import org.apache.brooklyn.core.annotation.Effector;
 import org.apache.brooklyn.core.annotation.EffectorParam;
@@ -25,6 +26,7 @@ import org.apache.brooklyn.core.effector.MethodEffector;
 import org.apache.brooklyn.entity.software.base.SoftwareProcess;
 
 @ImplementedBy(AnsibleEntityImpl.class)
+@Catalog(name="AnsibleEntity", description="Software managed by Ansible CM")
 public interface AnsibleEntity extends SoftwareProcess, AnsibleConfig {
 
 MethodEffector ANSIBLE_COMMAND = new 
MethodEffector<>(AnsibleEntity.class, "ansibleCommand");

[2/3] brooklyn-docs git commit: typo

[aledsage]

typo


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

Branch: refs/heads/master
Commit: e5f836e35afefe4e5fd35f34265938a7fc363b46
Parents: f483e6a
Author: Duncan Godwin 
Authored: Fri Mar 11 12:27:25 2016 +
Committer: Duncan Godwin 
Committed: Fri Mar 11 12:27:25 2016 +

--
 guide/ops/catalog/index.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/e5f836e3/guide/ops/catalog/index.md
--
diff --git a/guide/ops/catalog/index.md b/guide/ops/catalog/index.md
index 3b33128..230eedc 100644
--- a/guide/ops/catalog/index.md
+++ b/guide/ops/catalog/index.md
@@ -13,11 +13,10 @@ children:
 ---
 
 Apache Brooklyn provides a **catalog**, which is a persisted collection of 
versioned blueprints and other resources. 
-Blueprints in the catalog can be deployed directly, via the Brooklyn REST API 
or the web console,
+A set of blueprints is loaded from the `default.catalog.bom` in the Brooklyn 
folder by default and additional ones can be added through the web console or 
CLI. 
+Blueprints in the catalog can be deployed directly, via the Brooklyn CLI or 
the web console,
 or referenced in other blueprints using their `id`.
 
-A set of blueprints is loaded from `default.catalog.bom` in the brooklyn 
folder by default.
-
  
 ### Catalog Items YAML Syntax
 

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

[aledsage]

This closes #28


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

Branch: refs/heads/master
Commit: c95a55cd6b7cce5cf66b119078590159323c783b
Parents: 8f63114 e5f836e
Author: Aled Sage 
Authored: Fri Mar 11 17:42:57 2016 +
Committer: Aled Sage 
Committed: Fri Mar 11 17:42:57 2016 +

--
 guide/ops/catalog/index.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--

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

[aledsage]

Repository: brooklyn-server
Updated Branches:
  refs/heads/master f20bf0e77 -> f8476be1b


Remove Incubator DISCLAIMER file


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

Branch: refs/heads/master
Commit: dde1124a9257304ae5869142eb61ac2f6b86ae17
Parents: f20bf0e
Author: Richard Downer 
Authored: Fri Mar 11 13:35:01 2016 +
Committer: Richard Downer 
Committed: Fri Mar 11 13:35:41 2016 +

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


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/dde1124a/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 08d69e3..5e721a3 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1109,7 +1109,7 @@
   
 
 
-
 
 org.apache.maven.plugins
@@ -1122,7 +1122,6 @@
 
 
 
org.apache:apache-jar-resource-bundle:1.4
-
org.apache:apache-incubator-disclaimer-resource-bundle:1.1
 
 
 

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/dde1124a/utils/jmx/jmxmp-ssl-agent/pom.xml
--
diff --git a/utils/jmx/jmxmp-ssl-agent/pom.xml 
b/utils/jmx/jmxmp-ssl-agent/pom.xml
index 930f0a3..123e6f4 100644
--- a/utils/jmx/jmxmp-ssl-agent/pom.xml
+++ b/utils/jmx/jmxmp-ssl-agent/pom.xml
@@ -78,7 +78,6 @@
 
 META-INF/LICENSE
 META-INF/NOTICE
-META-INF/DISCLAIMER
 
 
 
@@ -90,10 +89,6 @@
 META-INF/NOTICE
 src/main/license/NOTICE.shaded
 
-
-META-INF/DISCLAIMER
-src/main/license/DISCLAIMER.shaded
-
 
 
 

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

[aledsage]

This closes #57


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

Branch: refs/heads/master
Commit: f8476be1bb408f0020695e7a71c27ca30a01eeb9
Parents: f20bf0e dde1124
Author: Aled Sage 
Authored: Fri Mar 11 17:38:42 2016 +
Committer: Aled Sage 
Committed: Fri Mar 11 17:38:42 2016 +

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

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

[aledsage]

This closes #16


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

Branch: refs/heads/master
Commit: 6b906265fbc8a54dae21fe26b453681fe8d9baf4
Parents: 29baf8c 43bc853
Author: Aled Sage 
Authored: Fri Mar 11 17:32:33 2016 +
Committer: Aled Sage 
Committed: Fri Mar 11 17:32:33 2016 +

--
 all/pom.xml | 5 +
 1 file changed, 5 insertions(+)
--

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

[aledsage]

This closes #13


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

Branch: refs/heads/master
Commit: dadbc93ac3df6b4625b2f0c1d2cf582eb962119c
Parents: 7177e20 87818e5
Author: Aled Sage 
Authored: Fri Mar 11 17:28:50 2016 +
Committer: Aled Sage 
Committed: Fri Mar 11 17:28:50 2016 +

--
 packaging/pom.xml | 26 --
 pom.xml   |  1 +
 2 files changed, 9 insertions(+), 18 deletions(-)
--

[1/2] brooklyn-dist git commit: Add packaging to pom modules, fix version

[aledsage]

Repository: brooklyn-dist
Updated Branches:
  refs/heads/master 7177e2070 -> dadbc93ac


Add packaging to pom modules, fix version


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

Branch: refs/heads/master
Commit: 87818e5d3fd168582cc10f65fb3eb106ab712ae2
Parents: b38cdc7
Author: alrick87 
Authored: Wed Mar 9 08:52:23 2016 -0800
Committer: alrick87 
Committed: Fri Mar 11 09:15:29 2016 -0800

--
 packaging/pom.xml | 26 --
 pom.xml   |  1 +
 2 files changed, 9 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/87818e5d/packaging/pom.xml
--
diff --git a/packaging/pom.xml b/packaging/pom.xml
index c4c0a99..ece4b01 100644
--- a/packaging/pom.xml
+++ b/packaging/pom.xml
@@ -19,8 +19,8 @@
 -->
 http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
 4.0.0
-jar
-brooklyn-dist
+pom
+brooklyn-packaging
 Brooklyn RPM Package
 
 Brooklyn RPM Package for Centos 7 and RHEL 7 operating systems
@@ -36,22 +36,9 @@
 
 
 org.apache.brooklyn
-brooklyn-all
+brooklyn-dist
 ${project.version}
 
-
-
-
-org.apache.brooklyn
-brooklyn-test-support
-${project.version}
-test
-
-
-org.testng
-testng
-test
-
 
 
 
@@ -63,7 +50,7 @@
 
 generate-rpm
 
-rpm
+attached-rpm
 
 
 
@@ -72,8 +59,11 @@
 ASL 2.0
 Applications/Internet
 
-true
+noarch
 Linux
+
+java
+
 
 
 /etc/brooklyn

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/87818e5d/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 976e575..fd4b767 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,6 +74,7 @@
 downstream-parent
 all
 dist
+packaging
 vagrant
 archetypes/quickstart