svn commit: r1719606 - in /brooklyn/site: download/index.html download/verify.html index.html meta/sitemap.html meta/versions.html style/js/catalog/items.js
Author: richard Date: Sat Dec 12 00:21:50 2015 New Revision: 1719606 URL: http://svn.apache.org/viewvc?rev=1719606&view=rev Log: Update Brooklyn website - source repo commit ID ed928a5 Modified: brooklyn/site/download/index.html brooklyn/site/download/verify.html brooklyn/site/index.html brooklyn/site/meta/sitemap.html brooklyn/site/meta/versions.html brooklyn/site/style/js/catalog/items.js Modified: brooklyn/site/download/index.html URL: http://svn.apache.org/viewvc/brooklyn/site/download/index.html?rev=1719606&r1=1719605&r2=1719606&view=diff == --- brooklyn/site/download/index.html (original) +++ brooklyn/site/download/index.html Sat Dec 12 00:21:50 2015 @@ -377,8 +377,8 @@ under the License. Choose your preferred file format to see the list of mirrors where you can download this file. - https://www.apache.org/dyn/closer.lua/incubator/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-bin.tar.gz"; role="button">Tarball - https://www.apache.org/dyn/closer.lua/incubator/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-bin.zip"; role="button">Zip + https://www.apache.org/dyn/closer.lua/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-bin.tar.gz"; role="button">Tarball + https://www.apache.org/dyn/closer.lua/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-bin.zip"; role="button">Zip These are not direct download links, sorry @@ -401,8 +401,8 @@ contribute code changes to Apache Brookl Choose your preferred file format to see the list of mirrors where you can download this file. - https://www.apache.org/dyn/closer.lua/incubator/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-src.tar.gz"; role="button">Tarball - https://www.apache.org/dyn/closer.lua/incubator/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-src.zip"; role="button">Zip + https://www.apache.org/dyn/closer.lua/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-src.tar.gz"; role="button">Tarball + https://www.apache.org/dyn/closer.lua/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-src.zip"; role="button">Zip These are not direct download links, sorry Modified: brooklyn/site/download/verify.html URL: http://svn.apache.org/viewvc/brooklyn/site/download/verify.html?rev=1719606&r1=1719605&r2=1719606&view=diff == --- brooklyn/site/download/verify.html (original) +++ brooklyn/site/download/verify.html Sat Dec 12 00:21:50 2015 @@ -376,57 +376,57 @@ so there is already reduced opportunity apache-brooklyn-0.8.0-incubating-bin.tar.gz -https://www.apache.org/dist/incubator/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-bin.tar.gz.md5";>md5 -https://www.apache.org/dist/incubator/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-bin.tar.gz.sha1";>sha1 -https://www.apache.org/dist/incubator/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-bin.tar.gz.sha256";>sha256 +https://www.apache.org/dist/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-bin.tar.gz.md5";>md5 +https://www.apache.org/dist/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-bin.tar.gz.sha1";>sha1 +https://www.apache.org/dist/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-bin.tar.gz.sha256";>sha256 apache-brooklyn-0.8.0-incubating-bin.zip -https://www.apache.org/dist/incubator/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-bin.zip.md5";>md5 -https://www.apache.org/dist/incubator/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-bin.zip.sha1";>sha1 -https://www.apache.org/dist/incubator/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-bin.zip.sha256";>sha256 +https://www.apache.org/dist/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-bin.zip.md5";>md5 +https://www.apache.org/dist/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-bin.zip.sha1";>sha1 +https://www.apache.org/dist/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-bin.zip.sha256";>sha256 apache-brooklyn-0.8.0-incubating-src.tar.gz -https://www.apache.org/dist/incubator/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-src.tar.gz.md5";>md5 -https://www.apache.org/dist/incubator/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-src.tar.gz.sha1";>sha1 -https://www.apache.org/dist/incubator/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-src.tar.gz.sha256";>sha256 +https://w
[1/3] incubator-brooklyn git commit: Update index.md
Repository: incubator-brooklyn Updated Branches: refs/heads/master 4ed9e97a8 -> ed928a594 Update index.md Button broken, changing the file path to the working version of the 'getting started' page. Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/f71c3637 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/f71c3637 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/f71c3637 Branch: refs/heads/master Commit: f71c3637283f63dcfe7f53ad8ad86e56475a095e Parents: 4ed9e97 Author: Morgan Brooke Wright Authored: Fri Dec 11 11:29:25 2015 -0800 Committer: Morgan Brooke Wright Committed: Fri Dec 11 11:29:25 2015 -0800 -- docs/website/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f71c3637/docs/website/index.md -- diff --git a/docs/website/index.md b/docs/website/index.md index 5409d30..09ece7d 100644 --- a/docs/website/index.md +++ b/docs/website/index.md @@ -70,7 +70,7 @@ View and modify using the *web console* or automate using the *REST API* learn more -get started +get started
[2/3] incubator-brooklyn git commit: Merge and close #1105
Merge and close #1105 Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/d3af13a7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/d3af13a7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/d3af13a7 Branch: refs/heads/master Commit: d3af13a7487671f96a339621a0c75674cbb79487 Parents: 4ed9e97 f71c363 Author: Richard Downer Authored: Sat Dec 12 00:19:52 2015 + Committer: Richard Downer Committed: Sat Dec 12 00:19:52 2015 + -- docs/website/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[3/3] incubator-brooklyn git commit: Fix some more links broken by the graduation moves
Fix some more links broken by the graduation moves Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/ed928a59 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/ed928a59 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/ed928a59 Branch: refs/heads/master Commit: ed928a59480b77ec40927df7a25be15c362c2c0d Parents: d3af13a Author: Richard Downer Authored: Sat Dec 12 00:18:15 2015 + Committer: Richard Downer Committed: Sat Dec 12 00:19:56 2015 + -- docs/website/download/verify.md | 66 ++-- 1 file changed, 33 insertions(+), 33 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ed928a59/docs/website/download/verify.md -- diff --git a/docs/website/download/verify.md b/docs/website/download/verify.md index 1689972..7fff787 100644 --- a/docs/website/download/verify.md +++ b/docs/website/download/verify.md @@ -19,57 +19,57 @@ so there is already reduced opportunity for anyone maliciously tampering with th apache-brooklyn-0.8.0-incubating-bin.tar.gz -https://www.apache.org/dist/incubator/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-bin.tar.gz.md5";>md5 -https://www.apache.org/dist/incubator/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-bin.tar.gz.sha1";>sha1 -https://www.apache.org/dist/incubator/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-bin.tar.gz.sha256";>sha256 +https://www.apache.org/dist/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-bin.tar.gz.md5";>md5 +https://www.apache.org/dist/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-bin.tar.gz.sha1";>sha1 +https://www.apache.org/dist/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-bin.tar.gz.sha256";>sha256 apache-brooklyn-0.8.0-incubating-bin.zip -https://www.apache.org/dist/incubator/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-bin.zip.md5";>md5 -https://www.apache.org/dist/incubator/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-bin.zip.sha1";>sha1 -https://www.apache.org/dist/incubator/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-bin.zip.sha256";>sha256 +https://www.apache.org/dist/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-bin.zip.md5";>md5 +https://www.apache.org/dist/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-bin.zip.sha1";>sha1 +https://www.apache.org/dist/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-bin.zip.sha256";>sha256 apache-brooklyn-0.8.0-incubating-src.tar.gz -https://www.apache.org/dist/incubator/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-src.tar.gz.md5";>md5 -https://www.apache.org/dist/incubator/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-src.tar.gz.sha1";>sha1 -https://www.apache.org/dist/incubator/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-src.tar.gz.sha256";>sha256 +https://www.apache.org/dist/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-src.tar.gz.md5";>md5 +https://www.apache.org/dist/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-src.tar.gz.sha1";>sha1 +https://www.apache.org/dist/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-src.tar.gz.sha256";>sha256 apache-brooklyn-0.8.0-incubating-src.zip -https://www.apache.org/dist/incubator/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-src.zip.md5";>md5 -https://www.apache.org/dist/incubator/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-src.zip.sha1";>sha1 -https://www.apache.org/dist/incubator/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-src.zip.sha256";>sha256 +https://www.apache.org/dist/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-src.zip.md5";>md5 +https://www.apache.org/dist/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-src.zip.sha1";>sha1 +https://www.apache.org/dist/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-src.zip.sha256";>sha256 apache-brooklyn-0.7.0-incubating-bin.tar.gz -https://www.apache.org/dist/incubator/brooklyn/apache-brooklyn-0.7.0-incubating/apache-brooklyn-0.7.0-incubating-bin.tar.gz.md5";>md5 -https://www.apache.org/dist/incubator/brooklyn/apache-brooklyn-0.7.0-incubating/apache-brooklyn-0.7.0-incubating-bin.tar.gz.sha1";>sha1 -https://www.apa
[1/2] incubator-brooklyn git commit: Fix jboss7 serviceUp
Repository: incubator-brooklyn
Updated Branches:
refs/heads/0.8.x b3e523d2a -> a6c4ea3b7
Fix jboss7 serviceUp
Previously, serviceUp was never set to true, for two reasons:
1. because connectServiceUpIsRunning was not called, nothing was
unsetting the service-not-up-indicator for SERVICE_PROCESS_IS_RUNNING
2. because the service-not-up-indicator for MANAGEMENT_URL_UP said
suppressDuplicates=true, then it checked if the map was equal to
the âoldâ map before publishing. But the map was the same object,
and that object had been modified in-place. So the object was
always equal to itself. It therefore never did an emit(), so the
enricher that listened to it to set serviceUp never fired.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/155a570b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/155a570b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/155a570b
Branch: refs/heads/0.8.x
Commit: 155a570b95f9746ba10a9f93c490e60cbe035f9c
Parents: 09bfa07
Author: Aled Sage
Authored: Sat Sep 19 15:41:05 2015 +0100
Committer: Alasdair Hodge
Committed: Fri Dec 11 13:15:43 2015 +
--
.../org/apache/brooklyn/entity/webapp/jboss/JBoss7ServerImpl.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/155a570b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7ServerImpl.java
--
diff --git
a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7ServerImpl.java
b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7ServerImpl.java
index 09f09c1..51e624d 100644
---
a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7ServerImpl.java
+++
b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7ServerImpl.java
@@ -126,10 +126,11 @@ public class JBoss7ServerImpl extends
JavaWebAppSoftwareProcessImpl implements J
}
protected void connectServiceUp() {
+connectServiceUpIsRunning();
+
addEnricher(Enrichers.builder().updatingMap(Attributes.SERVICE_NOT_UP_INDICATORS)
.from(MANAGEMENT_URL_UP)
.computing(Functionals.ifNotEquals(true).value("Management URL not
reachable") )
-.suppressDuplicates(true)
.build());
}
[2/2] incubator-brooklyn git commit: This closes #1103
This closes #1103 Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/a6c4ea3b Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/a6c4ea3b Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/a6c4ea3b Branch: refs/heads/0.8.x Commit: a6c4ea3b76fe1f2f4208722f34b3948b2b267c3b Parents: b3e523d 155a570 Author: Aled Sage Authored: Fri Dec 11 15:50:48 2015 + Committer: Aled Sage Committed: Fri Dec 11 15:50:48 2015 + -- .../org/apache/brooklyn/entity/webapp/jboss/JBoss7ServerImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --
[4/4] incubator-brooklyn git commit: This closes #1102
This closes #1102 Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/b3e523d2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/b3e523d2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/b3e523d2 Branch: refs/heads/0.8.x Commit: b3e523d2ab8a74a9e80d4e87e1d009b5cc88c046 Parents: a046f43 482461d Author: Aled Sage Authored: Fri Dec 11 15:48:42 2015 + Committer: Aled Sage Committed: Fri Dec 11 15:48:42 2015 + -- .../brooklyn/entity/database/mysql/MySqlNode.java | 2 +- .../brooklyn/entity/database/mysql/MySqlNodeImpl.java | 4 ++-- .../entity/database/mysql/MySqlSshDriver.java | 14 ++ 3 files changed, 13 insertions(+), 7 deletions(-) --
[3/4] incubator-brooklyn git commit: Derive correct URL path for specified version.
Derive correct URL path for specified version.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/482461d6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/482461d6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/482461d6
Branch: refs/heads/0.8.x
Commit: 482461d61a40e101e8abc2b76a8e694bc1824b1a
Parents: e78c922
Author: Alasdair Hodge
Authored: Wed Dec 9 12:57:11 2015 +
Committer: Alasdair Hodge
Committed: Fri Dec 11 13:06:53 2015 +
--
.../org/apache/brooklyn/entity/database/mysql/MySqlNode.java| 2 +-
.../apache/brooklyn/entity/database/mysql/MySqlSshDriver.java | 5 +
2 files changed, 6 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/482461d6/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNode.java
--
diff --git
a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNode.java
b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNode.java
index 484606e..3e5bb7e 100644
---
a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNode.java
+++
b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNode.java
@@ -50,7 +50,7 @@ public interface MySqlNode extends SoftwareProcess,
HasShortName, DatastoreCommo
//http://dev.mysql.com/get/Downloads/MySQL-5.6/mysql-5.6.26-linux-glibc2.5-x86_64.tar.gz
@SetFromFlag("downloadUrl")
BasicAttributeSensorAndConfigKey DOWNLOAD_URL = new
StringAttributeSensorAndConfigKey(
-Attributes.DOWNLOAD_URL,
"http://dev.mysql.com/get/Downloads/MySQL-5.6/mysql-${version}-${driver.osTag}.tar.gz";);
+Attributes.DOWNLOAD_URL,
"http://dev.mysql.com/get/Downloads/MySQL-${driver.majorVersion}/mysql-${version}-${driver.osTag}.tar.gz";);
@SetFromFlag("port")
PortAttributeSensorAndConfigKey MYSQL_PORT = new
PortAttributeSensorAndConfigKey("mysql.port", "MySQL port",
PortRanges.fromString("3306, 13306+"));
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/482461d6/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlSshDriver.java
--
diff --git
a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlSshDriver.java
b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlSshDriver.java
index 1ce6ddd..1e52585 100644
---
a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlSshDriver.java
+++
b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlSshDriver.java
@@ -107,6 +107,11 @@ public class MySqlSshDriver extends
AbstractSoftwareProcessSshDriver implements
return "mymysql.cnf";
}
+// Only invoked to determine the default download URL form the specified
version.
+public String getMajorVersion() {
+return
getEntity().config().get(MySqlNode.SUGGESTED_VERSION).replaceAll("(\\d+\\.\\d+)\\.\\d+",
"$1");
+}
+
public String getDefaultUnpackedDirectoryName() {
return Strings.removeAllFromEnd(resolver.getFilename(), ".tar.gz");
}
[1/4] incubator-brooklyn git commit: Derive artefact and directory names from download URL.
Repository: incubator-brooklyn
Updated Branches:
refs/heads/0.8.x a046f433b -> b3e523d2a
Derive artefact and directory names from download URL.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/87673df4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/87673df4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/87673df4
Branch: refs/heads/0.8.x
Commit: 87673df4939a9470820f1ae1f8ce072155e26b61
Parents: 09bfa07
Author: Alasdair Hodge
Authored: Wed Dec 9 11:22:04 2015 +
Committer: Alasdair Hodge
Committed: Fri Dec 11 13:06:52 2015 +
--
.../brooklyn/entity/database/mysql/MySqlSshDriver.java | 9 +
1 file changed, 5 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/87673df4/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlSshDriver.java
--
diff --git
a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlSshDriver.java
b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlSshDriver.java
index 313a583..1ce6ddd 100644
---
a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlSshDriver.java
+++
b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlSshDriver.java
@@ -107,14 +107,15 @@ public class MySqlSshDriver extends
AbstractSoftwareProcessSshDriver implements
return "mymysql.cnf";
}
-public String getInstallFilename() {
-return String.format("mysql-%s-%s.tar.gz", getVersion(), getOsTag());
+public String getDefaultUnpackedDirectoryName() {
+return Strings.removeAllFromEnd(resolver.getFilename(), ".tar.gz");
}
@Override
public void preInstall() {
-resolver = Entities.newDownloader(this, ImmutableMap.of("filename",
getInstallFilename()));
-setExpandedInstallDir(Os.mergePaths(getInstallDir(),
resolver.getUnpackedDirectoryName(format("mysql-%s-%s", getVersion(),
getOsTag();
+resolver = Entities.newDownloader(this);
+String unpackedDirectoryName =
resolver.getUnpackedDirectoryName(getDefaultUnpackedDirectoryName());
+setExpandedInstallDir(Os.mergePaths(getInstallDir(),
unpackedDirectoryName));
}
@Override
[2/4] incubator-brooklyn git commit: Atomic sensor test-and-set.
Atomic sensor test-and-set.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/e78c9226
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/e78c9226
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/e78c9226
Branch: refs/heads/0.8.x
Commit: e78c9226f637398d84ba0b63c1170af8e2f57139
Parents: 87673df
Author: Alasdair Hodge
Authored: Wed Dec 9 11:22:47 2015 +
Committer: Alasdair Hodge
Committed: Fri Dec 11 13:06:53 2015 +
--
.../org/apache/brooklyn/entity/database/mysql/MySqlNodeImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e78c9226/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNodeImpl.java
--
diff --git
a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNodeImpl.java
b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNodeImpl.java
index 5346fcb..8b3b5d6 100644
---
a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNodeImpl.java
+++
b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNodeImpl.java
@@ -132,8 +132,8 @@ public class MySqlNodeImpl extends SoftwareProcessImpl
implements MySqlNode {
public int getPort() {
return getAttribute(MYSQL_PORT);
}
-
-public String getSocketUid() {
+
+public synchronized String getSocketUid() {
String result = getAttribute(MySqlNode.SOCKET_UID);
if (Strings.isBlank(result)) {
result = Identifiers.makeRandomId(6);
[11/15] incubator-brooklyn git commit: This closes #1092
This closes #1092 Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/7dfe9595 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/7dfe9595 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/7dfe9595 Branch: refs/heads/master Commit: 7dfe9595c959fd892ba99d13f204b6b69fdfeed5 Parents: c03827e 3f34c4a Author: Sam Corbett Authored: Fri Dec 11 12:37:15 2015 + Committer: Sam Corbett Committed: Fri Dec 11 12:37:15 2015 + -- .../brooklyn/entity/nosql/redis/RedisStoreSshDriver.java | 10 -- 1 file changed, 8 insertions(+), 2 deletions(-) --
[05/15] incubator-brooklyn git commit: Derive artefact and directory names from download URL.
Derive artefact and directory names from download URL.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/6fcc0e62
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/6fcc0e62
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/6fcc0e62
Branch: refs/heads/master
Commit: 6fcc0e623208a803abb01124384f4b1e91c2b34a
Parents: 89440c3
Author: Alasdair Hodge
Authored: Wed Dec 9 11:22:04 2015 +
Committer: Alasdair Hodge
Committed: Wed Dec 9 12:57:53 2015 +
--
.../brooklyn/entity/database/mysql/MySqlSshDriver.java | 9 +
1 file changed, 5 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6fcc0e62/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlSshDriver.java
--
diff --git
a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlSshDriver.java
b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlSshDriver.java
index 2d14726..7b38cbd 100644
---
a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlSshDriver.java
+++
b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlSshDriver.java
@@ -111,14 +111,15 @@ public class MySqlSshDriver extends
AbstractSoftwareProcessSshDriver implements
return "mymysql.cnf";
}
-public String getInstallFilename() {
-return String.format("mysql-%s-%s.tar.gz", getVersion(), getOsTag());
+public String getDefaultUnpackedDirectoryName() {
+return Strings.removeAllFromEnd(resolver.getFilename(), ".tar.gz");
}
@Override
public void preInstall() {
-resolver = Entities.newDownloader(this, ImmutableMap.of("filename",
getInstallFilename()));
-setExpandedInstallDir(Os.mergePaths(getInstallDir(),
resolver.getUnpackedDirectoryName(format("mysql-%s-%s", getVersion(),
getOsTag();
+resolver = Entities.newDownloader(this);
+String unpackedDirectoryName =
resolver.getUnpackedDirectoryName(getDefaultUnpackedDirectoryName());
+setExpandedInstallDir(Os.mergePaths(getInstallDir(),
unpackedDirectoryName));
}
@Override
[10/15] incubator-brooklyn git commit: This closes #1100
This closes #1100 Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/c03827e7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/c03827e7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/c03827e7 Branch: refs/heads/master Commit: c03827e71cbfedc11d595e62a3170ecafd68326c Parents: d58d503 812c5bd Author: Sam Corbett Authored: Fri Dec 11 12:33:54 2015 + Committer: Sam Corbett Committed: Fri Dec 11 12:33:54 2015 + -- usage/rest-api/pom.xml | 46 +++-- 1 file changed, 44 insertions(+), 2 deletions(-) --
[01/15] incubator-brooklyn git commit: TestCase no longer extends BaseTest, but rather extends Entity directly. Added check in TestCaseImpl to ensure that only non-started children are startable. Adde
Repository: incubator-brooklyn
Updated Branches:
refs/heads/master d58d5035f -> 4ed9e97a8
TestCase no longer extends BaseTest, but rather extends Entity directly. Added
check in TestCaseImpl to ensure that only non-started children are startable.
Added InfrastructureDeploymentTestCase
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/2b40644d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/2b40644d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/2b40644d
Branch: refs/heads/master
Commit: 2b40644d83601773d368d4416bd5fb938e673f5a
Parents: aeb56fd
Author: Graeme-Miller
Authored: Fri Dec 4 19:32:28 2015 +
Committer: Graeme-Miller
Committed: Mon Dec 7 13:41:39 2015 +
--
.../InfrastructureDeploymentTestCase.java | 54 +++
.../InfrastructureDeploymentTestCaseImpl.java | 57
.../brooklyn/test/framework/TestCase.java | 4 +-
.../brooklyn/test/framework/TestCaseImpl.java | 19 +--
4 files changed, 128 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2b40644d/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/InfrastructureDeploymentTestCase.java
--
diff --git
a/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/InfrastructureDeploymentTestCase.java
b/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/InfrastructureDeploymentTestCase.java
new file mode 100644
index 000..5f368df
--- /dev/null
+++
b/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/InfrastructureDeploymentTestCase.java
@@ -0,0 +1,54 @@
+/*
+ * 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.
+ */
+package org.apache.brooklyn.test.framework;
+
+import com.google.common.reflect.TypeToken;
+import org.apache.brooklyn.api.entity.EntitySpec;
+import org.apache.brooklyn.api.entity.ImplementedBy;
+import org.apache.brooklyn.config.ConfigKey;
+import org.apache.brooklyn.core.config.ConfigKeys;
+import org.apache.brooklyn.core.entity.StartableApplication;
+import org.apache.brooklyn.entity.software.base.SoftwareProcess;
+
+/**
+ * Created by graememiller on 04/12/2015.
+ */
+@ImplementedBy(value = InfrastructureDeploymentTestCaseImpl.class)
+public interface InfrastructureDeploymentTestCase extends TestCase {
+
+/**
+ * Entity spec to deploy. This will be deployed second, after the
INFRASTRUCTURE_SPEC has been deployed. This will be deployed to the
DEPLOYMENT_LOCATION.
+ * All children will be deployed after this
+ */
+ConfigKey> ENTITY_SPEC_TO_DEPLOY =
ConfigKeys.newConfigKey(new TypeToken>(){},
"infrastructure.deployment.entity.spec", "Entity spec to deploy to
infrastructure");
+
+
+/**
+ * Infrastructure to deploy. This will be deployed first, then the
ENTITY_SPEC_TO_DEPLOY will be deployed, then any children
+ */
+ConfigKey> INFRASTRUCTURE_SPEC =
ConfigKeys.newConfigKey(new TypeToken>(){},
"infrastructure.deployment.spec", "Infrastructure to deploy");
+
+
+/**
+ * The The location to deploy ENTITY_SPEC_TO_DEPLOY.
+ */
+ConfigKey DEPLOYMENT_LOCATION_SENSOR_NAME =
ConfigKeys.newStringConfigKey("infrastructure.deployment.location.sensor",
"Name of the sensor of INFRASTRUCTURE_SPEC to retrieve the Location to deploy
the entity to");
+
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2b40644d/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/InfrastructureDeploymentTestCaseImpl.java
--
diff --git
a/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/InfrastructureDeploymentTestCaseImpl.java
b/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/InfrastructureDeploymentTestCaseImpl.java
new file mode 100644
index 000..900c0a0
--- /dev/null
+++
b/usage/test-fra
[15/15] incubator-brooklyn git commit: This closes #1098
This closes #1098 Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/4ed9e97a Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/4ed9e97a Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/4ed9e97a Branch: refs/heads/master Commit: 4ed9e97a8f143e80e05f757e63397321ae69227b Parents: 0a856de 3e63987 Author: Sam Corbett Authored: Fri Dec 11 12:39:37 2015 + Committer: Sam Corbett Committed: Fri Dec 11 12:39:37 2015 + -- .../brooklyn/entity/database/mysql/MySqlNode.java | 2 +- .../brooklyn/entity/database/mysql/MySqlNodeImpl.java | 4 ++-- .../entity/database/mysql/MySqlSshDriver.java | 14 ++ 3 files changed, 13 insertions(+), 7 deletions(-) --
[14/15] incubator-brooklyn git commit: This closes #1097
This closes #1097 Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/0a856ded Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/0a856ded Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/0a856ded Branch: refs/heads/master Commit: 0a856dedb17d704b2b4a614edfa53b191682f0af Parents: a218cd9 333eeeb Author: Sam Corbett Authored: Fri Dec 11 12:38:59 2015 + Committer: Sam Corbett Committed: Fri Dec 11 12:38:59 2015 + -- .../yaml/test/example_yaml/entities/script1.sh | 2 + .../entities/simpleshellcommandtest-entity.yaml | 24 +++ docs/guide/yaml/test/index.md | 1 + docs/guide/yaml/test/test-entities.md | 68 4 files changed, 83 insertions(+), 12 deletions(-) --
[07/15] incubator-brooklyn git commit: Atomic sensor test-and-set.
Atomic sensor test-and-set.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/c2088db6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/c2088db6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/c2088db6
Branch: refs/heads/master
Commit: c2088db62faf1e0f9e3a34b5b03a540a9a88268f
Parents: 6fcc0e6
Author: Alasdair Hodge
Authored: Wed Dec 9 11:22:47 2015 +
Committer: Alasdair Hodge
Committed: Wed Dec 9 12:57:54 2015 +
--
.../org/apache/brooklyn/entity/database/mysql/MySqlNodeImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c2088db6/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNodeImpl.java
--
diff --git
a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNodeImpl.java
b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNodeImpl.java
index f470390..e2b0c2e 100644
---
a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNodeImpl.java
+++
b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNodeImpl.java
@@ -135,8 +135,8 @@ public class MySqlNodeImpl extends SoftwareProcessImpl
implements MySqlNode {
public int getPort() {
return getAttribute(MYSQL_PORT);
}
-
-public String getSocketUid() {
+
+public synchronized String getSocketUid() {
String result = getAttribute(MySqlNode.SOCKET_UID);
if (Strings.isBlank(result)) {
result = Identifiers.makeRandomId(6);
[06/15] incubator-brooklyn git commit: Derive correct URL path for specified version.
Derive correct URL path for specified version.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/3e639874
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/3e639874
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/3e639874
Branch: refs/heads/master
Commit: 3e6398740489bd67cc3901d9892eff799a2690d6
Parents: c2088db
Author: Alasdair Hodge
Authored: Wed Dec 9 12:57:11 2015 +
Committer: Alasdair Hodge
Committed: Wed Dec 9 12:57:54 2015 +
--
.../org/apache/brooklyn/entity/database/mysql/MySqlNode.java| 2 +-
.../apache/brooklyn/entity/database/mysql/MySqlSshDriver.java | 5 +
2 files changed, 6 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3e639874/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNode.java
--
diff --git
a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNode.java
b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNode.java
index 7f9e508..6306956 100644
---
a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNode.java
+++
b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNode.java
@@ -50,7 +50,7 @@ public interface MySqlNode extends SoftwareProcess,
HasShortName, DatastoreCommo
//http://dev.mysql.com/get/Downloads/MySQL-5.6/mysql-5.6.26-linux-glibc2.5-x86_64.tar.gz
@SetFromFlag("downloadUrl")
BasicAttributeSensorAndConfigKey DOWNLOAD_URL = new
StringAttributeSensorAndConfigKey(
-Attributes.DOWNLOAD_URL,
"http://dev.mysql.com/get/Downloads/MySQL-5.6/mysql-${version}-${driver.osTag}.tar.gz";);
+Attributes.DOWNLOAD_URL,
"http://dev.mysql.com/get/Downloads/MySQL-${driver.majorVersion}/mysql-${version}-${driver.osTag}.tar.gz";);
@SetFromFlag("port")
PortAttributeSensorAndConfigKey MYSQL_PORT = new
PortAttributeSensorAndConfigKey("mysql.port", "MySQL port",
PortRanges.fromString("3306, 13306+"));
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3e639874/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlSshDriver.java
--
diff --git
a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlSshDriver.java
b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlSshDriver.java
index 7b38cbd..868d158 100644
---
a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlSshDriver.java
+++
b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlSshDriver.java
@@ -111,6 +111,11 @@ public class MySqlSshDriver extends
AbstractSoftwareProcessSshDriver implements
return "mymysql.cnf";
}
+// Only invoked to determine the default download URL form the specified
version.
+public String getMajorVersion() {
+return
getEntity().config().get(MySqlNode.SUGGESTED_VERSION).replaceAll("(\\d+\\.\\d+)\\.\\d+",
"$1");
+}
+
public String getDefaultUnpackedDirectoryName() {
return Strings.removeAllFromEnd(resolver.getFilename(), ".tar.gz");
}
[13/15] incubator-brooklyn git commit: This closes #1091
This closes #1091 Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/a218cd98 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/a218cd98 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/a218cd98 Branch: refs/heads/master Commit: a218cd98ae88f8d1732fd85892a1178cd7fdbdbb Parents: 3b99c6f 2b40644 Author: Sam Corbett Authored: Fri Dec 11 12:38:27 2015 + Committer: Sam Corbett Committed: Fri Dec 11 12:38:27 2015 + -- .../InfrastructureDeploymentTestCase.java | 54 +++ .../InfrastructureDeploymentTestCaseImpl.java | 57 .../brooklyn/test/framework/TestCase.java | 4 +- .../brooklyn/test/framework/TestCaseImpl.java | 19 +-- 4 files changed, 128 insertions(+), 6 deletions(-) --
[04/15] incubator-brooklyn git commit: Add documentation for assertions and SimpleShellCommandTest.
Add documentation for assertions and SimpleShellCommandTest.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/14e63fc2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/14e63fc2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/14e63fc2
Branch: refs/heads/master
Commit: 14e63fc2d6153bcf50b8f8a8921435d427171a07
Parents: b39ef3a
Author: Geoff Macartney
Authored: Wed Dec 9 10:24:04 2015 +
Committer: Geoff Macartney
Committed: Wed Dec 9 10:25:44 2015 +
--
.../entities/simpleshellcommandtest-entity.yaml | 27 +++
docs/guide/yaml/test/index.md | 1 +
docs/guide/yaml/test/test-entities.md | 77 +---
3 files changed, 93 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/14e63fc2/docs/guide/yaml/test/example_yaml/entities/simpleshellcommandtest-entity.yaml
--
diff --git
a/docs/guide/yaml/test/example_yaml/entities/simpleshellcommandtest-entity.yaml
b/docs/guide/yaml/test/example_yaml/entities/simpleshellcommandtest-entity.yaml
new file mode 100644
index 000..c8217eb
--- /dev/null
+++
b/docs/guide/yaml/test/example_yaml/entities/simpleshellcommandtest-entity.yaml
@@ -0,0 +1,27 @@
+name: simpleShellCommandTest
+location: mybyonhost
+services:
+- type: org.apache.brooklyn.test.framework.TestCase
+ name: testcase1
+ targetId: testprocess
+ brooklyn.children:
+- type: org.apache.brooklyn.entity.software.base.EmptySoftwareProcess
+ id: testprocess
+
+- type: org.apache.brooklyn.test.framework.SimpleShellCommandTest
+ defaultCommand: hostname
+ assertStatus:
+equals: 0
+ assertOut:
+equals: mybyonhost
+ assertErr:
+isEmpty: true
+
+- type: org.apache.brooklyn.test.framework.SimpleShellCommandTest
+ downloadUrl: http://localhost:8080/script1.sh
+ assertStatus:
+equals: 0
+ assertOut:
+equals: hello world
+ assertErr:
+isEmpty: true
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/14e63fc2/docs/guide/yaml/test/index.md
--
diff --git a/docs/guide/yaml/test/index.md b/docs/guide/yaml/test/index.md
index 4666b8b..ae7f818 100644
--- a/docs/guide/yaml/test/index.md
+++ b/docs/guide/yaml/test/index.md
@@ -18,6 +18,7 @@ Validation test entities include:
- `TestSensor` - perform assertion on a specified sensor.
- `TestEffector` - invoke effector on specified target entity.
- `TestHttpCall` - perform assertion on response to specified HTTP GET Request.
+- `SimpleShellCommandTest` - test assertions on the result of a shell command
on the same node as the target entity.
The following sections provide details on each test entity along with examples
of their use.
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/14e63fc2/docs/guide/yaml/test/test-entities.md
--
diff --git a/docs/guide/yaml/test/test-entities.md
b/docs/guide/yaml/test/test-entities.md
index 73eb398..ddbf60b 100644
--- a/docs/guide/yaml/test/test-entities.md
+++ b/docs/guide/yaml/test/test-entities.md
@@ -6,6 +6,16 @@ layout: website-normal
{% include fields.md %}
+- [Structural Test Entities](#structural-test-entities)
+ - [TestCase](#testcase)
+ - [ParallelTestCase](#paralleltestcase)
+- [Validation Test Entities](#validation-test-entities)
+ - [TestSensor](#testsensor)
+ - [TestEffector](#testeffector)
+ - [TestHttpCall](#testhttpcall)
+ - [SimpleShellCommandTest](#simpleshellcommandtest)
+- [Assertions](#assertions)
+
## Structural Test Entities
### TestCase
@@ -46,12 +56,7 @@ The `TestSensor` entity performs an assertion on a specified
sensors value.
- `targetId` - alternative to the `target` parameter which wraps the DSL
component lookup requiring only the `id` be supplied. For example, `tomcat`.
- `sensor` - sensor to evaluate. For example `service.isUp`.
- `timeout` - duration to wait on assertion to return a result. For example
`10s`, `10m`, etc
-- `assert` - assertion to perform on the specified sensor value, options
include:
- - `equals`,`equalTo`,`isEqualTo` - tests that the sensor value equals the
supplied value. For example `true`.
- - `contains` - tests that the sensor value contains the supplied value
- - `matches` - tests that the sensor value matches the supplied [regex
pattern](http://docs.oracle.com/javase/7/docs/api/java/util/regex/Pattern.html?is-external=true),
for example `".*hello.*"`.
- - `isNull` - tests that the sensor value is `null`.
- - `notNull` - tests that the sensor value is
[12/15] incubator-brooklyn git commit: This closes #1095
This closes #1095 Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/3b99c6f6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/3b99c6f6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/3b99c6f6 Branch: refs/heads/master Commit: 3b99c6f6d63347aa6717a99e0ac8fa9b88af3ca5 Parents: 7dfe959 ecb8976 Author: Sam Corbett Authored: Fri Dec 11 12:37:48 2015 + Committer: Sam Corbett Committed: Fri Dec 11 12:37:48 2015 + -- docs/website/download/index.md | 8 1 file changed, 4 insertions(+), 4 deletions(-) --
[09/15] incubator-brooklyn git commit: Generate Swagger API Specification using a maven plugin
Generate Swagger API Specification using a maven plugin
- combined with https://github.com/swagger-api/swagger-codegen, it can generate
rest bindings for multiple languages
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/812c5bdb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/812c5bdb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/812c5bdb
Branch: refs/heads/master
Commit: 812c5bdbc4d1aeb51d563e74187123932d3a594a
Parents: d58d503
Author: Andrea Turli
Authored: Thu Dec 10 15:53:32 2015 +0100
Committer: Andrea Turli
Committed: Fri Dec 11 12:38:53 2015 +0100
--
usage/rest-api/pom.xml | 46 +++--
1 file changed, 44 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/812c5bdb/usage/rest-api/pom.xml
--
diff --git a/usage/rest-api/pom.xml b/usage/rest-api/pom.xml
index bc54587..81306e5 100644
--- a/usage/rest-api/pom.xml
+++ b/usage/rest-api/pom.xml
@@ -7,9 +7,9 @@
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
@@ -98,4 +98,46 @@
+
+
+
+com.github.kongchen
+swagger-maven-plugin
+3.1.0
+
+
+
+false
+org.apache.brooklyn.rest.api
+http,https
+
+Swagger API Specification for Brooklyn
REST server
+v1
+
+Swagger API Specification for Brooklyn
REST server
+
+
+
http://www.github.com/apache/incubator-brooklyn
+
+
+
http://www.apache.org/licenses/LICENSE-2.0.html
+Apache 2.0
+
+
+
${project.build.directory}/generated/swagger-api-spec
+
+
+
+
+
+compile
+
+generate
+
+
+
+
+
+
+
[03/15] incubator-brooklyn git commit: removed incubator from mirror download urls
removed incubator from mirror download urls
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/ecb89769
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/ecb89769
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/ecb89769
Branch: refs/heads/master
Commit: ecb89769b6c714fcce3bfeff36cf3eb387de7443
Parents: b39ef3a
Author: John McCabe
Authored: Wed Dec 9 10:12:00 2015 +
Committer: John McCabe
Committed: Wed Dec 9 10:12:00 2015 +
--
docs/website/download/index.md | 8
1 file changed, 4 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ecb89769/docs/website/download/index.md
--
diff --git a/docs/website/download/index.md b/docs/website/download/index.md
index 0b9c7d9..077e068 100644
--- a/docs/website/download/index.md
+++ b/docs/website/download/index.md
@@ -25,8 +25,8 @@ A pre-built package that contains Apache Brooklyn and all of
its dependencies in
**Choose your preferred file format to see the list of mirrors where you can
download this file.**
- https://www.apache.org/dyn/closer.lua/incubator/brooklyn/apache-brooklyn-{{
site.brooklyn-stable-version }}/apache-brooklyn-{{
site.brooklyn-stable-version }}-bin.tar.gz" role="button">Tarball
- https://www.apache.org/dyn/closer.lua/incubator/brooklyn/apache-brooklyn-{{
site.brooklyn-stable-version }}/apache-brooklyn-{{
site.brooklyn-stable-version }}-bin.zip" role="button">Zip
+ https://www.apache.org/dyn/closer.lua/brooklyn/apache-brooklyn-{{
site.brooklyn-stable-version }}/apache-brooklyn-{{ site.brooklyn-stable-version
}}-bin.tar.gz" role="button">Tarball
+ https://www.apache.org/dyn/closer.lua/brooklyn/apache-brooklyn-{{
site.brooklyn-stable-version }}/apache-brooklyn-{{ site.brooklyn-stable-version
}}-bin.zip" role="button">Zip
These are not direct download links, sorry
@@ -49,8 +49,8 @@ contribute code changes to Apache Brooklyn, we recommend you
get the source code
**Choose your preferred file format to see the list of mirrors where you can
download this file.**
- https://www.apache.org/dyn/closer.lua/incubator/brooklyn/apache-brooklyn-{{
site.brooklyn-stable-version }}/apache-brooklyn-{{
site.brooklyn-stable-version }}-src.tar.gz" role="button">Tarball
- https://www.apache.org/dyn/closer.lua/incubator/brooklyn/apache-brooklyn-{{
site.brooklyn-stable-version }}/apache-brooklyn-{{
site.brooklyn-stable-version }}-src.zip" role="button">Zip
+ https://www.apache.org/dyn/closer.lua/brooklyn/apache-brooklyn-{{
site.brooklyn-stable-version }}/apache-brooklyn-{{ site.brooklyn-stable-version
}}-src.tar.gz" role="button">Tarball
+ https://www.apache.org/dyn/closer.lua/brooklyn/apache-brooklyn-{{
site.brooklyn-stable-version }}/apache-brooklyn-{{ site.brooklyn-stable-version
}}-src.zip" role="button">Zip
These are not direct download links, sorry
[08/15] incubator-brooklyn git commit: Add documentation for assertions and SimpleShellCommandTest.
Add documentation for assertions and SimpleShellCommandTest.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/333eeeb1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/333eeeb1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/333eeeb1
Branch: refs/heads/master
Commit: 333eeeb15d6b4712542da64ad1adcc30f25a7e8e
Parents: 14e63fc
Author: Geoff Macartney
Authored: Wed Dec 9 14:39:38 2015 +
Committer: Geoff Macartney
Committed: Wed Dec 9 14:39:38 2015 +
--
.../yaml/test/example_yaml/entities/script1.sh | 2 ++
.../entities/simpleshellcommandtest-entity.yaml | 13 +
docs/guide/yaml/test/test-entities.md| 19 +--
3 files changed, 12 insertions(+), 22 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/333eeeb1/docs/guide/yaml/test/example_yaml/entities/script1.sh
--
diff --git a/docs/guide/yaml/test/example_yaml/entities/script1.sh
b/docs/guide/yaml/test/example_yaml/entities/script1.sh
new file mode 100644
index 000..2a98304
--- /dev/null
+++ b/docs/guide/yaml/test/example_yaml/entities/script1.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+echo hello world
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/333eeeb1/docs/guide/yaml/test/example_yaml/entities/simpleshellcommandtest-entity.yaml
--
diff --git
a/docs/guide/yaml/test/example_yaml/entities/simpleshellcommandtest-entity.yaml
b/docs/guide/yaml/test/example_yaml/entities/simpleshellcommandtest-entity.yaml
index c8217eb..3e14aa5 100644
---
a/docs/guide/yaml/test/example_yaml/entities/simpleshellcommandtest-entity.yaml
+++
b/docs/guide/yaml/test/example_yaml/entities/simpleshellcommandtest-entity.yaml
@@ -1,24 +1,21 @@
-name: simpleShellCommandTest
-location: mybyonhost
-services:
- type: org.apache.brooklyn.test.framework.TestCase
name: testcase1
targetId: testprocess
brooklyn.children:
-- type: org.apache.brooklyn.entity.software.base.EmptySoftwareProcess
+- type: org.apache.brooklyn.entity.webapp.tomcat.TomcatServer
id: testprocess
- type: org.apache.brooklyn.test.framework.SimpleShellCommandTest
- defaultCommand: hostname
+ command: ps -ef
assertStatus:
equals: 0
- assertOut:
-equals: mybyonhost
+ assertOut:
+contains: tomcat
assertErr:
isEmpty: true
- type: org.apache.brooklyn.test.framework.SimpleShellCommandTest
- downloadUrl: http://localhost:8080/script1.sh
+ downloadUrl:
https://raw.githubusercontent.com/apache/incubator-brooklyn/master/docs/guide/yaml/test/entities/script1.sh
assertStatus:
equals: 0
assertOut:
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/333eeeb1/docs/guide/yaml/test/test-entities.md
--
diff --git a/docs/guide/yaml/test/test-entities.md
b/docs/guide/yaml/test/test-entities.md
index ddbf60b..f8eb087 100644
--- a/docs/guide/yaml/test/test-entities.md
+++ b/docs/guide/yaml/test/test-entities.md
@@ -6,15 +6,6 @@ layout: website-normal
{% include fields.md %}
-- [Structural Test Entities](#structural-test-entities)
- - [TestCase](#testcase)
- - [ParallelTestCase](#paralleltestcase)
-- [Validation Test Entities](#validation-test-entities)
- - [TestSensor](#testsensor)
- - [TestEffector](#testeffector)
- - [TestHttpCall](#testhttpcall)
- - [SimpleShellCommandTest](#simpleshellcommandtest)
-- [Assertions](#assertions)
## Structural Test Entities
@@ -56,7 +47,7 @@ The `TestSensor` entity performs an assertion on a specified
sensors value.
- `targetId` - alternative to the `target` parameter which wraps the DSL
component lookup requiring only the `id` be supplied. For example, `tomcat`.
- `sensor` - sensor to evaluate. For example `service.isUp`.
- `timeout` - duration to wait on assertion to return a result. For example
`10s`, `10m`, etc
-- `assert` - assertion to perform on the specified sensor value.
+- `assert` - assertion to perform on the specified sensor value. See section
on assertions below.
### TestEffector
The `TestEffector` entity invokes the specified effector on a target entity.
@@ -81,12 +72,12 @@ The `TestHttpCall` entity performs a HTTP GET on the
specified URL and performs
- `url` - URL to perform GET request on, this can use DSL for example
`$brooklyn:component("tomcat").attributeWhenReady("webapp.url")`.
- `timeout` - duration to wait on a HTTP response. For example `10s`, `10m`,
etc
- `applyAssertionTo` - The filed to apply the assertion
[02/15] incubator-brooklyn git commit: Redis install - make sure all build dependencies are installed
Redis install - make sure all build dependencies are installed
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/3f34c4ad
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/3f34c4ad
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/3f34c4ad
Branch: refs/heads/master
Commit: 3f34c4adfa2d307498531262019653e8b852a049
Parents: 27d7b78
Author: Svetoslav Neykov
Authored: Tue Dec 8 11:28:20 2015 +0200
Committer: Svetoslav Neykov
Committed: Tue Dec 8 11:28:20 2015 +0200
--
.../brooklyn/entity/nosql/redis/RedisStoreSshDriver.java | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3f34c4ad/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/redis/RedisStoreSshDriver.java
--
diff --git
a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/redis/RedisStoreSshDriver.java
b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/redis/RedisStoreSshDriver.java
index 4aa2b8e..81ebfe3 100644
---
a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/redis/RedisStoreSshDriver.java
+++
b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/redis/RedisStoreSshDriver.java
@@ -21,9 +21,8 @@ package org.apache.brooklyn.entity.nosql.redis;
import static java.lang.String.format;
import java.util.List;
+import java.util.Map;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.apache.brooklyn.api.location.Location;
import org.apache.brooklyn.core.entity.Entities;
import
org.apache.brooklyn.entity.software.base.AbstractSoftwareProcessSshDriver;
@@ -31,8 +30,11 @@ import org.apache.brooklyn.location.ssh.SshMachineLocation;
import org.apache.brooklyn.util.collections.MutableMap;
import org.apache.brooklyn.util.os.Os;
import org.apache.brooklyn.util.ssh.BashCommands;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
/**
* Start a {@link RedisStore} in a {@link Location} accessible over ssh.
@@ -66,6 +68,9 @@ public class RedisStoreSshDriver extends
AbstractSoftwareProcessSshDriver implem
"yum", "make",
"apt", "make",
"port", null);
+//Headers still might be missing on some systems (especially if gcc &
make are pre-installed)
+Map installBuildEssentialPackageFlags =
ImmutableMap.of(
+"apt", "build-essential");
List commands = ImmutableList.builder()
.addAll(BashCommands.commandsToDownloadUrlsAs(urls, saveAs))
@@ -73,6 +78,7 @@ public class RedisStoreSshDriver extends
AbstractSoftwareProcessSshDriver implem
.add(BashCommands.INSTALL_CURL)
.add(BashCommands.installPackage(installGccPackageFlags,
"redis-prerequisites-gcc"))
.add(BashCommands.installPackage(installMakePackageFlags,
"redis-prerequisites-make"))
+
.add(BashCommands.installPackage(installBuildEssentialPackageFlags, null))
.add("tar xzfv " + saveAs)
.add(format("cd redis-%s", getVersion()))
.add("pushd deps")
