You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2015/09/08 15:59:16 UTC
[1/5] incubator-brooklyn git commit: Fix mysql download URL for
integration tests
Repository: incubator-brooklyn
Updated Branches:
refs/heads/master 29936339f -> e92dd1ef4
Fix mysql download URL for integration tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/a43bb6f9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/a43bb6f9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/a43bb6f9
Branch: refs/heads/master
Commit: a43bb6f90a42dabbcea1a5e463592b7667fdbf54
Parents: 6212d19
Author: Thomas Bouron <th...@cloudsoftcorp.com>
Authored: Mon Aug 31 14:47:59 2015 +0100
Committer: Thomas Bouron <th...@cloudsoftcorp.com>
Committed: Thu Sep 3 09:14:59 2015 +0100
----------------------------------------------------------------------
.../base/test/mysql/DynamicToyMySqlEntityBuilder.java | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a43bb6f9/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/mysql/DynamicToyMySqlEntityBuilder.java
----------------------------------------------------------------------
diff --git a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/mysql/DynamicToyMySqlEntityBuilder.java b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/mysql/DynamicToyMySqlEntityBuilder.java
index 65baf9a..c26b01b 100644
--- a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/mysql/DynamicToyMySqlEntityBuilder.java
+++ b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/mysql/DynamicToyMySqlEntityBuilder.java
@@ -70,8 +70,7 @@ public class DynamicToyMySqlEntityBuilder {
// download
String version = "5.5.37";
String osTag = getOsTag(e);
- String mirrorUrl = "http://www.mirrorservice.org/sites/ftp.mysql.com/";
- return "http://dev.mysql.com/get/Downloads/MySQL-5.5/mysql-"+version+"-"+osTag+".tar.gz/from/"+mirrorUrl;
+ return "http://cdn.mysql.com/archives/mysql-5.5/mysql-"+version+"-"+osTag+".tar.gz";
}
public static final String installDir(Entity e, boolean isLocalhost) {
@@ -88,18 +87,15 @@ public class DynamicToyMySqlEntityBuilder {
public static String getOsTag(Entity e) {
// e.g. "osx10.6-x86_64"; see http://www.mysql.com/downloads/mysql/#downloads
OsDetails os = ((SshMachineLocation)Iterables.getOnlyElement(e.getLocations())).getOsDetails();
- if (os == null) return "linux-glibc2.5-x86_64";
+ if (os == null) return "linux2.6-x86_64";
if (os.isMac()) {
- String osp1 = os.getVersion()==null ? "osx10.8" //lowest common denominator
- : new ComparableVersion(os.getVersion()).isGreaterThanOrEqualTo(OsVersions.MAC_10_9) ? "osx10.9"
- : "osx10.8"; //lowest common denominator
if (!os.is64bit()) {
throw new IllegalStateException("Only 64 bit MySQL build is available for OS X");
}
- return osp1+"-x86_64";
+ return "osx10.6-x86_64";
}
//assume generic linux
- String osp1 = "linux-glibc2.5";
+ String osp1 = "linux2.6";
String osp2 = os.is64bit() ? "x86_64" : "i686";
return osp1+"-"+osp2;
}
[5/5] incubator-brooklyn git commit: This closes #883
Posted by he...@apache.org.
This closes #883
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/e92dd1ef
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/e92dd1ef
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/e92dd1ef
Branch: refs/heads/master
Commit: e92dd1ef43a01a4ff2637e89730c96f62bd63569
Parents: ca59c86 8cbfd55
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Tue Sep 8 14:58:53 2015 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Tue Sep 8 14:58:53 2015 +0100
----------------------------------------------------------------------
examples/global-web-fabric/README.txt | 6 +++++-
examples/simple-messaging-pubsub/README.txt | 10 +++++-----
examples/simple-nosql-cluster/README.md | 10 +++++-----
examples/simple-web-cluster/README.txt | 12 +++++-------
usage/qa/start-monitor.sh | 2 +-
usage/qa/start-webcluster.sh | 2 +-
6 files changed, 22 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
[3/5] incubator-brooklyn git commit: Fix classnames in qa start
scripts
Posted by he...@apache.org.
Fix classnames in qa start scripts
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/8cbfd55d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/8cbfd55d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/8cbfd55d
Branch: refs/heads/master
Commit: 8cbfd55d46cac2ee12e62b7046cfbaa1c879de0a
Parents: 2806009
Author: Sam Corbett <sa...@cloudsoftcorp.com>
Authored: Tue Sep 8 13:07:21 2015 +0100
Committer: Sam Corbett <sa...@cloudsoftcorp.com>
Committed: Tue Sep 8 13:07:42 2015 +0100
----------------------------------------------------------------------
usage/qa/start-monitor.sh | 2 +-
usage/qa/start-webcluster.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/8cbfd55d/usage/qa/start-monitor.sh
----------------------------------------------------------------------
diff --git a/usage/qa/start-monitor.sh b/usage/qa/start-monitor.sh
index 7188af6..0fa8247 100755
--- a/usage/qa/start-monitor.sh
+++ b/usage/qa/start-monitor.sh
@@ -24,7 +24,7 @@
#
#set -x # debug
-CLASS=brooklyn.qa.longevity.Monitor
+CLASS=org.apache.brooklyn.qa.longevity.Monitor
VERSION=0.9.0-SNAPSHOT # BROOKLYN_VERSION
ROOT=$(cd $(dirname $0) && pwd)
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/8cbfd55d/usage/qa/start-webcluster.sh
----------------------------------------------------------------------
diff --git a/usage/qa/start-webcluster.sh b/usage/qa/start-webcluster.sh
index 814e274..7aa678a 100755
--- a/usage/qa/start-webcluster.sh
+++ b/usage/qa/start-webcluster.sh
@@ -24,7 +24,7 @@
#
#set -x # debug
-CLASS=brooklyn.qa.longevity.webcluster.WebClusterApp
+CLASS=org.apache.brooklyn.qa.longevity.webcluster.WebClusterApp
VERSION=0.9.0-SNAPSHOT # BROOKLYN_VERSION
ROOT=$(cd $(dirname $0) && pwd)
[2/5] incubator-brooklyn git commit: Update example app instructions
to use org.apache packages.
Posted by he...@apache.org.
Update example app instructions to use org.apache packages.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/28060091
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/28060091
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/28060091
Branch: refs/heads/master
Commit: 28060091045d3c9515015728594cddb30ae0e58b
Parents: 2993633
Author: Sam Corbett <sa...@cloudsoftcorp.com>
Authored: Tue Sep 8 12:33:54 2015 +0100
Committer: Sam Corbett <sa...@cloudsoftcorp.com>
Committed: Tue Sep 8 12:38:01 2015 +0100
----------------------------------------------------------------------
examples/global-web-fabric/README.txt | 6 +++++-
examples/simple-messaging-pubsub/README.txt | 10 +++++-----
examples/simple-nosql-cluster/README.md | 10 +++++-----
examples/simple-web-cluster/README.txt | 12 +++++-------
4 files changed, 20 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/28060091/examples/global-web-fabric/README.txt
----------------------------------------------------------------------
diff --git a/examples/global-web-fabric/README.txt b/examples/global-web-fabric/README.txt
index 81f8f9e..0d3ee8b 100644
--- a/examples/global-web-fabric/README.txt
+++ b/examples/global-web-fabric/README.txt
@@ -7,7 +7,7 @@ and you are in this directory. Adjust to taste for other configurations.
export BROOKLYN_CLASSPATH=$(pwd)/target/classes
# Launch the app in aws-ec2 regions eu-west-1 and us-east-1
- brooklyn launch --app brooklyn.demo.GlobalWebFabricExample --location "aws-ec2:eu-west-1,aws-ec2:us-east-1"
+ brooklyn launch --app org.apache.brooklyn.demo.GlobalWebFabricExample --location "aws-ec2:eu-west-1,aws-ec2:us-east-1"
---
@@ -19,6 +19,10 @@ This file should contain something like:
Brooklyn defaults to using ~/.ssh/id_rsa and ~/.ssh/id_rsa.pub.
+---
+
+For more information please visit https://brooklyn.incubator.apache.org/.
+
----
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/28060091/examples/simple-messaging-pubsub/README.txt
----------------------------------------------------------------------
diff --git a/examples/simple-messaging-pubsub/README.txt b/examples/simple-messaging-pubsub/README.txt
index 5b14552..299695f 100644
--- a/examples/simple-messaging-pubsub/README.txt
+++ b/examples/simple-messaging-pubsub/README.txt
@@ -7,26 +7,26 @@ The commands below assume that the `brooklyn` script is already on your $PATH, a
export BROOKLYN_CLASSPATH=$(pwd)/target/classes
# Launches a qpid broker on localhost
- brooklyn -v launch --app brooklyn.demo.StandaloneQpidBrokerExample --location localhost
+ brooklyn -v launch --app org.apache.brooklyn.demo.StandaloneQpidBrokerExample --location localhost
# You can get the broker's URL from the brooklyn web-console at http://localhost:8081
# by looking at the broker entity's sensors or from the verbose output from the application startup
URL="amqp://guest:guest@/localhost?brokerlist='tcp://localhost:5672'"
# Test subscribing, to receive a message from the broker
- java -cp "./resources/lib/*:./target/classes" brooklyn.demo.Subscribe ${URL}
+ java -cp "./resources/lib/*:./target/classes" org.apache.brooklyn.demo.Subscribe ${URL}
# Test publishing a message to the broker
- java -cp "./resources/lib/*:./target/classes" brooklyn.demo.Publish ${URL}
+ java -cp "./resources/lib/*:./target/classes" org.apache.brooklyn.demo.Publish ${URL}
To test a Kafka distributed messaging cluster example, use the following command:
# Launches a Kafka cluster on AWS EC2 with two brokers
- brooklyn -v launch --app brooklyn.demo.KafkaClusterExample --location aws-ec2:eu-west-1
+ brooklyn -v launch --app org.apache.brooklyn.demo.KafkaClusterExample --location aws-ec2:eu-west-1
---
-For more information, please visit: http://brooklyncentral.github.com/use/examples/messaging/
+For more information please visit https://brooklyn.incubator.apache.org/.
----
Licensed to the Apache Software Foundation (ASF) under one
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/28060091/examples/simple-nosql-cluster/README.md
----------------------------------------------------------------------
diff --git a/examples/simple-nosql-cluster/README.md b/examples/simple-nosql-cluster/README.md
index a932807..55659da 100644
--- a/examples/simple-nosql-cluster/README.md
+++ b/examples/simple-nosql-cluster/README.md
@@ -7,20 +7,20 @@ The commands below assume that the `brooklyn` script is already on your $PATH, a
export BROOKLYN_CLASSPATH=$(pwd)/target/classes
# Launches a Redis cluster on AWS EC2
- brooklyn -v launch --app brooklyn.demo.SimpleRedisCluster --location aws-ec2:eu-west-1
+ brooklyn -v launch --app org.apache.brooklyn.demo.SimpleRedisCluster --location aws-ec2:eu-west-1
# Launches a Cassandra cluster on AWS EC2
- brooklyn -v launch --app brooklyn.demo.SimpleCassandraCluster --location aws-ec2:eu-west-1
+ brooklyn -v launch --app org.apache.brooklyn.demo.SimpleCassandraCluster --location aws-ec2:eu-west-1
# Launches a CouchDB cluster on AWS EC2
- brooklyn -v launch --app brooklyn.demo.SimpleCouchDBCluster --location aws-ec2:eu-west-1
+ brooklyn -v launch --app org.apache.brooklyn.demo.SimpleCouchDBCluster --location aws-ec2:eu-west-1
# Launches a CumulusRDF application backed by a cassandra cluster on AWS EC2
- brooklyn -v launch --app brooklyn.demo.CumulusRDFApplication --location aws-ec2:eu-west-1
+ brooklyn -v launch --app org.apache.brooklyn.demo.CumulusRDFApplication --location aws-ec2:eu-west-1
--------
-For more information, please visit the (http://brooklyncentral.github.com/use/examples/nosql/)[NoSQL examples page]
+For more information please visit https://brooklyn.incubator.apache.org/.
----
Licensed to the Apache Software Foundation (ASF) under one
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/28060091/examples/simple-web-cluster/README.txt
----------------------------------------------------------------------
diff --git a/examples/simple-web-cluster/README.txt b/examples/simple-web-cluster/README.txt
index 11c1588..598a4ce 100644
--- a/examples/simple-web-cluster/README.txt
+++ b/examples/simple-web-cluster/README.txt
@@ -7,7 +7,7 @@ and you are in this directory. Adjust to taste for other configurations.
export BROOKLYN_CLASSPATH=$(pwd)/target/classes
# Three-tier: auto-scaling app-server cluster fronted by nginx, MySql backend wired up, on localhost
- brooklyn launch --app brooklyn.demo.WebClusterDatabaseExample --location localhost
+ brooklyn launch --app org.apache.brooklyn.demo.WebClusterDatabaseExample --location localhost
The above requires passwordless `ssh localhost` and requires `gcc` to build `nginx`.
You could instead target your favourite cloud, where this has been tried and tested:
@@ -22,13 +22,13 @@ You could instead target your favourite cloud, where this has been tried and tes
Other examples:
# A very simple app: a single web-server
- brooklyn launch --app brooklyn.demo.SingleWebServerExample --location localhost
+ brooklyn launch --app org.apache.brooklyn.demo.SingleWebServerExample --location localhost
# A simple app: just load-balancer and appservers
- brooklyn launch --app brooklyn.demo.WebClusterExample --location localhost
+ brooklyn launch --app org.apache.brooklyn.demo.WebClusterExample --location localhost
# Three-tier example
- brooklyn launch --app brooklyn.demo.WebClusterDatabaseExample --location localhost
+ brooklyn launch --app org.apache.brooklyn.demo.WebClusterDatabaseExample --location localhost
Redistributable embedded example:
@@ -38,9 +38,7 @@ Redistributable embedded example:
# (the redistributable will be at: target/brooklyn-*-bin.tar.gz )
mvn clean assembly:assembly
-For more information, please visit:
-
- http://brooklyncentral.github.com/use/examples/webcluster/
+For more information please visit https://brooklyn.incubator.apache.org/.
----
Licensed to the Apache Software Foundation (ASF) under one
[4/5] incubator-brooklyn git commit: This closes #880
Posted by he...@apache.org.
This closes #880
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/ca59c861
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/ca59c861
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/ca59c861
Branch: refs/heads/master
Commit: ca59c86107d3a8ced6af9a5b6c5b194440cad21b
Parents: 2993633 a43bb6f
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Tue Sep 8 14:58:49 2015 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Tue Sep 8 14:58:49 2015 +0100
----------------------------------------------------------------------
.../base/test/mysql/DynamicToyMySqlEntityBuilder.java | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
----------------------------------------------------------------------