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/04 15:36:52 UTC
[01/11] incubator-brooklyn git commit: ignore javadoc errors in docs
build
Repository: incubator-brooklyn
Updated Branches:
refs/heads/0.8.0-incubating c2ccf66b5 -> aaf97039a
ignore javadoc errors in docs build
javadoc seems a lot stricter here (updated os x environment), both in CLI and maven.
i wonder if the exit code has changed...
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/32c57abe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/32c57abe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/32c57abe
Branch: refs/heads/0.8.0-incubating
Commit: 32c57abe5df5707d6da5e96e502ae4368e918a29
Parents: c2ccf66
Author: Alex Heneveld <al...@cloudsoft.io>
Authored: Thu Sep 3 03:14:54 2015 +0100
Committer: Alex Heneveld <al...@cloudsoft.io>
Committed: Thu Sep 3 03:14:54 2015 +0100
----------------------------------------------------------------------
docs/_build/make-javadoc.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/32c57abe/docs/_build/make-javadoc.sh
----------------------------------------------------------------------
diff --git a/docs/_build/make-javadoc.sh b/docs/_build/make-javadoc.sh
index 2fa6258..c7d9a5a 100755
--- a/docs/_build/make-javadoc.sh
+++ b/docs/_build/make-javadoc.sh
@@ -42,7 +42,7 @@ javadoc -sourcepath $SOURCE_PATHS \
-footer '<b>Apache Brooklyn - Multi-Cloud Application Management</b> <br/> <a href="http://brooklyn.io/" target="_top">brooklyn.io</a>. Apache License. © '$YEARSTAMP'.' \
2>&1 1>/dev/null | tee target/javadoc.log
-if ((${PIPESTATUS[0]})) ; then echo ; echo ; echo "ERROR: javadoc process exited non-zero" ; exit 1 ; fi
+if ((${PIPESTATUS[0]})) ; then echo ; echo ; echo "wARNING: javadoc process exited non-zero" ; echo ; echo ; fi
echo ; echo
if [ ! -f target/$JAVADOC_TARGET1_SUBPATH/org/apache/brooklyn/api/entity/Entity.html ]; then echo "ERROR: missing expected content. Are the paths right?" ; exit 1 ; fi
[08/11] incubator-brooklyn git commit: remove the sandbox/ and
release/ dirs from the build
Posted by he...@apache.org.
remove the sandbox/ and release/ dirs from the build
and update the README in the root
and delete the old brooklyn-install.sh in the root.
(it is not maintained; it doesn't even refer to the apache downloads.)
basically make the source build look nice when it's unpacked
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/988b9d6b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/988b9d6b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/988b9d6b
Branch: refs/heads/0.8.0-incubating
Commit: 988b9d6b0f8dc8b75ed29ade7b6d359e0c6e879a
Parents: e5841f4
Author: Alex Heneveld <al...@cloudsoft.io>
Authored: Thu Sep 3 22:56:39 2015 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Fri Sep 4 14:33:51 2015 +0100
----------------------------------------------------------------------
README.md | 88 ++-------
brooklyn-install.sh | 315 ---------------------------------
release/make-release-artifacts.sh | 2 +-
3 files changed, 12 insertions(+), 393 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/988b9d6b/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index cfd1393..f068785 100644
--- a/README.md
+++ b/README.md
@@ -1,87 +1,21 @@
-# [](http://brooklyn.incubator.apache.org/)
+# [](http://brooklyn.incubator.apache.org/)
-Apache Brooklyn is a library and control plane for deploying and managing distributed applications.
+### Apache Brooklyn helps to model, deploy, and manage systems.
-See [brooklyn.incubator.apache.org](https://brooklyn.incubator.apache.org/) for details and examples.
+It supports blueprints in YAML or Java, and deploys them to many clouds and other target environments.
+It monitors those deployments, maintains a live model, and runs autonomic policies to maintain their health.
-Brooklyn's main emphasis is managing live applications (e.g auto-scaling, exception handling, auto recovery from failure, and working across multiple clouds). Brooklyn considers deployment part of management, like the opening move in a game of chess. (Distributed-application-management-chess, no less).
+For more information see **[brooklyn.incubator.apache.org](https://brooklyn.incubator.apache.org/)**.
-### Deployment
-Brooklyn enables single-click deployment of complex applications, while tying-in with other great tools, and reusing and complementing existing workflows.
+### To Build
-Use Brooklyn to create an Application Blueprint, instructing Brooklyn how to wire together your applications and components, customizing and extending them as needed. Share the blueprint with others (optionally using Brooklyn's Web Service Catalog) to allow them to single-click deploy your application onto the infrastructure of their choice.
+The code can be built with a:
-Brooklyn features:
+ mvn clean install
-* out-of-the-box support for many common software components.
-* integration with jclouds, allowing deployment to the majority of public and private clouds, in addition to pools of fixed IP machines.
-* integration with Apache Whirr (and thereby Chef and Puppet), allowing deployment of well-known services such as Hadoop and elasticsearch (and you can still use POBS, plain-old-bash-scripts).
-* integration with PaaS's such as OpenShift, allowing use of PaaSes alongside self-built clusters, for maximum flexibility.
+This creates a build in `usage/dist/target/brooklyn-dist`. Run with `bin/brooklyn launch`.
-In DevOps fashion, Brooklyn allows applications and roll-outs to be version controlled, tested programatically, and reused across locations and contexts. Develop on localhost, then reuse the same application descriptor to deploy to QA, and then to your production environment.
-
-### Management
-
-Brooklyn enables [autonomic management](http://en.wikipedia.org/wiki/Autonomic_computing) of applications. (i.e. many small, local, distributed control loops).
-
-Management policies can be attached to every component part in an application, and to logical groupings of components (clusters, fabrics). Policies can implement both technical and non-technical (business) requirements.
-
-At runtime, policies have access to all aspects of the deployment, including deployment topology (hierarchical) and locations (machines, PaaSes, and jurisdictions), as well as scripts, instrumentation, and operational goals and constraints. This means that once the application is launched, the policies are all set to keep the application running optimally, based on whatever optimally means in that context.
-
-These deployment patterns and management policies are expressed as Java (or Groovy) classes, open-sourced here and giving you full control over what you want to happen. More importantly, however, this code can be shared, improved, and extended.
-
-### Use As a Library
-
-Import Brooklyn into your application to natively use its distributed management smarts. e.g. [Cloudera's Certification Cluster Builder Tool](http://www.cloudsoftcorp.com/blog/creating-a-cloudera-certification-cluster-with-cloudsofts-brooklyn/).
-
-### Use As a Control Plane
-
-Alternatively, use Brooklyn as an integrated-stand-alone management node for your application or bespoke platform.
-
-## Quick Start
-
-Three quick start options are available:
-
-* The [getting started guide](https://brooklyn.incubator.apache.org/v/latest/start/running.html) will step you through downloading and installing Brooklyn and running the examples.
-* Alternatively, [download the latest release](https://github.com/apache/incubator-brooklyn/tarball/master) (tgz).
-* Fork or clone the repo: `git clone git://github.com/apache/incubator-brooklyn.git` then `cd incubator-brooklyn; mvn clean install; cd usage/dist/target/brooklyn-dist; ./brooklyn/bin/brooklyn launch`.
-
-## Community
-
-
-* Have a question that's not a feature request or bug report? Ask on the mailing lists: [brooklyn-users](http://groups.google.com/group/brooklyn-users) or [brooklyn-dev](http://groups.google.com/group/brooklyn-dev)
-* Chat with us over IRC. On the `irc.freenode.net` server, in the `#brooklyncentral` channel.
-* Follow [@ApacheBrooklyn](http://twitter.com/ApacheBrooklyn) and [@BrooklynCentral](http://twitter.com/brooklyncentral) on Twitter.
-
-
-## Bug Tracker
-
-Have a bug or a feature request? [Please open a new issue](https://issues.apache.org/jira/browse/BROOKLYN/?selectedTab=com.atlassian.jira.jira-projects-plugin:summary-panel).
-
-## Contributing
-
-Your input will be welcomed.
-
-See the [full guide to contributing](https://brooklyn.incubator.apache.org/community/how-to-contribute-docs.html) on brooklyn.incubator.apache.org.
-
-Thanks!
-
-----
-Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.
-See the [NOTICE](NOTICE) file distributed with this work for additional information
-regarding copyright ownership and the [incubation disclaimer](DISCLAIMER) file regarding project status,
-as Apache Brooklyn is currently undergoing Incubation at the Apache Software Foundation.
-
-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](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.
+The **[developer guide](https://brooklyn.incubator.apache.org/v/latest/guide/dev/)**
+has more information about the source code.
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/988b9d6b/brooklyn-install.sh
----------------------------------------------------------------------
diff --git a/brooklyn-install.sh b/brooklyn-install.sh
deleted file mode 100755
index f73d83c..0000000
--- a/brooklyn-install.sh
+++ /dev/null
@@ -1,315 +0,0 @@
-#!/usr/bin/env bash
-#
-# 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.
-#
-# Brooklyn remote install script.
-#
-# Usage:
-# brooklyn-install.sh [-h] [-q] [-s] [-e] [-g] [-u user] [-k key] [-r root] [-p port] [-v version] hostname
-#
-#set -x # DEBUG
-
-function help() {
- cat <<EOF
-
-Brooklyn remote install script.
-
-Options
-
- -q Quiet install
- -s Create and set up user account (set with -u option)
- -e Set up random entropy for SSH
- -g Generate a password for the Brooklyn admin user
- -u Change the Brooklyn username (default 'brooklyn')
- -r Change the remote root username (default 'root')
- -k The private key to use for SSH (default '~/.ssh/id_rsa')
- -p The SSH port to connect to (default 22)
- -v Set the Brooklyn version to install (default '0.7.0-M1')
-
-Usage
-
- brooklyn-install.sh [-q] [-s] [-e] [-g] [-u user] [-r root] [-k key] [-p port] [-v version] hostname
-
-Installs Brooklyn on the given hostname as 'brooklyn' or the specified
-user. Optionally it creates and configures the Brooklyn user.
-
-Passwordless SSH access as 'root' (or a user that has 'sudo' privileges) to the
-remote host must be available, with the given key.
-
-EOF
- exit 0
-}
-
-# Global settings
-LOG="brooklyn-install.log"
-
-function log() {
- if ! ${QUIET}; then
- echo $@
- fi
- date +"Timestamp: %Y-%m-%d %H:%M:%S.%s" >> ${LOG}
- if [ "$1" == "-n" ]; then
- shift
- fi
- if [ "$*" != "..." ]; then
- echo "Log: $*" | sed -e "s/\.\.\.//" >> ${LOG}
- fi
-}
-
-function fail() {
- log "...failed!"
- error "$*"
-}
-
-function error() {
- echo "Error: $*" | tee -a "${LOG}"
- usage
-}
-
-function usage() {
- echo "Usage: $(basename ${0}) [-h] [-q] [-s] [-e] [-g] [-u user] [-r root] [-k key] [-p port] [-v version] hostname"
- exit 1
-}
-
-function retry() {
- COMMAND="$@"
- MAX=10
- N=1
- while [ ${N} -le ${MAX} ]; do
- eval "${COMMAND}" 2>&1
- if [ $? -eq 0 ]; then
- return 0
- else
- echo -n "..."
- sleep 1
- N=$(($N + 1))
- fi
- done
- return 1
-}
-
-# Default options
-QUIET=false
-GENERATE_PASSWORD=false
-SETUP_USER=false
-SETUP_RANDOM=false
-BROOKLYN_VERSION="0.7.0-M1"
-ROOT="root"
-USER="brooklyn"
-PRIVATE_KEY_FILE="${HOME}/.ssh/id_rsa"
-SSH_PORT=22
-
-while getopts ":hqsegu:r:k:p:v:" o; do
- case "${o}" in
- h) help
- ;;
- q) QUIET=true
- ;;
- s) SETUP_USER=true
- ;;
- e) SETUP_RANDOM=true
- ;;
- g) GENERATE_PASSWORD=true
- log "Warning: Not supported in 0.7.0-M1 and earlier releases"
- ;;
- u) USER="${OPTARG}"
- SETUP_USER=true
- ;;
- r) ROOT="${OPTARG}"
- if [ "${ROOT}" != "root" ]; then
- SUDO="sudo"
- fi
- ;;
- k) PRIVATE_KEY_FILE="${OPTARG}"
- ;;
- p) SSH_PORT="${OPTARG}"
- ;;
- v) BROOKLYN_VERSION="${OPTARG}"
- ;;
- *) usage "Invalid option: $*"
- ;;
- esac
-done
-shift $((OPTIND-1))
-if [ $# -ne 1 ]; then
- error "Must specify remote hostname as last argument"
-fi
-HOST="$1"
-
-# Configure SSH
-SSH_OPTS="-o StrictHostKeyChecking=no -p ${SSH_PORT}"
-if [ -r "${PRIVATE_KEY_FILE}" ]; then
- SSH_OPTS="${SSH_OPTS} -i ${PRIVATE_KEY_FILE}"
-else
- error "SSH private key '${PRIVATE_KEY_FILE}' not found"
-fi
-SSH_PUBLIC_KEY_DATA=$(ssh-keygen -y -f ${PRIVATE_KEY_FILE})
-
-log "Installing Brooklyn ${BROOKLYN_VERSION}"
-
-# Pre-requisites for this script
-log -n "Checking '${HOST}:${SSH_PORT}' SSH connection... "
-ssh ${SSH_OPTS} ${ROOT}@${HOST} "${SUDO} id" >> ${LOG} 2>&1 || fail "SSH connection as ${ROOT} failed"
-log "...ok!"
-
-# Install packages
-log -n "Installing prerequisite packages..."
-ssh ${SSH_OPTS} ${ROOT}@${HOST} "${SUDO} yum check-update || ${SUDO} apt-get update" >> ${LOG} 2>&1
-for PACKAGE in "curl" "sed" "tar" "wget"; do
- ssh ${SSH_OPTS} ${ROOT}@${HOST} "which ${PACKAGE} || { ${SUDO} yum -y --nogpgcheck -q install ${PACKAGE} || ${SUDO} apt-get -y --allow-unauthenticated install ${PACKAGE}; }" >> ${LOG} 2>&1
-done
-log "...done!"
-
-# Install Java 7
-log -n "Installing Java 7 packages..."
-JAVA="java"
-JAVA_HOME="/usr"
-ssh ${SSH_OPTS} ${ROOT}@${HOST} "which ${JAVA} || { ${SUDO} yum -y --nogpgcheck -q install java-1.7.0-openjdk-devel || ${SUDO} apt-get -y --allow-unauthenticated install openjdk-7-jdk; }" >> ${LOG} 2>&1
-for JVM in "jre" "jdk" "java-1.7.0-openjdk" "java-1.7.0-openjdk-amd64"; do
- if ssh ${SSH_OPTS} ${ROOT}@${HOST} "test -d /usr/lib/jvm/${JVM}"; then
- JAVA_HOME="/usr/lib/jvm/${JVM}/" && echo "Java: ${JAVA_HOME}" >> ${LOG}
- fi
-done
-ssh ${SSH_OPTS} ${ROOT}@${HOST} "which ${JAVA} || test -x ${JAVA_HOME}/bin/${JAVA}" >> ${LOG} 2>&1 || fail "Java is not installed"
-log "...done!"
-
-# Increase linux kernel entropy for faster ssh connections
-if ${SETUP_RANDOM}; then
- log -n "Installing rng-tool to increase entropy..."
- ssh ${SSH_OPTS} ${ROOT}@${HOST} "which rng-tools || { ${SUDO} yum -y --nogpgcheck -q install rng-tools || ${SUDO} apt-get -y --allow-unauthenticated install rng-tools; }" >> ${LOG} 2>&1
- if ssh ${SSH_OPTS} ${ROOT}@${HOST} "test -f /etc/default/rng-tools"; then
- echo "HRNGDEVICE=/dev/urandom" | ssh ${SSH_OPTS} ${ROOT}@${HOST} "${SUDO} tee -a /etc/default/rng-tools" > /dev/null 2>&1
- ssh ${SSH_OPTS} ${ROOT}@${HOST} "${SUDO} /etc/init.d/rng-tools start" >> ${LOG} 2>&1
- else
- echo "EXTRAOPTIONS=\"-r /dev/urandom\"" | ssh ${SSH_OPTS} ${ROOT}@${HOST} "${SUDO} tee -a /etc/sysconfig/rngd" > /dev/null 2>&1
- ssh ${SSH_OPTS} ${ROOT}@${HOST} "${SUDO} /etc/init.d/rngd start" >> ${LOG} 2>&1
- fi
- log "...done!"
-fi
-
-# Create Brooklyn user if required
-if ! ssh ${SSH_OPTS} ${ROOT}@${HOST} "id ${USER} > /dev/null 2>&1"; then
- if ! ${SETUP_USER}; then
- error "User '${USER}' does not exist on ${HOST}"
- fi
- log -n "Creating '${USER}' user..."
- ssh ${SSH_OPTS} ${ROOT}@${HOST} "${SUDO} useradd ${USER} -s /bin/bash -d /home/${USER} -m" >> ${LOG} 2>&1
- ssh ${SSH_OPTS} ${ROOT}@${HOST} "id ${USER}" >> ${LOG} 2>&1 || fail "User was not created"
- log "...done!"
-fi
-
-# Setup Brooklyn user
-if ${SETUP_USER}; then
- log -n "Setting up '${USER}' user... "
- echo "${USER} ALL = (ALL) NOPASSWD: ALL" | ssh ${SSH_OPTS} ${ROOT}@${HOST} "${SUDO} tee -a /etc/sudoers" > /dev/null 2>&1
- ssh ${SSH_OPTS} ${ROOT}@${HOST} "${SUDO} sed -i.brooklyn.bak 's/.*requiretty.*/#brooklyn-removed-require-tty/' /etc/sudoers"
- ssh ${SSH_OPTS} ${ROOT}@${HOST} "${SUDO} mkdir -p /home/${USER}/.ssh"
- ssh ${SSH_OPTS} ${ROOT}@${HOST} "${SUDO} chmod 700 /home/${USER}/.ssh"
- echo "${SSH_PUBLIC_KEY_DATA}" | ssh ${SSH_OPTS} ${ROOT}@${HOST} "${SUDO} tee -a /home/${USER}/.ssh/authorized_keys" > /dev/null 2>&1
- ssh ${SSH_OPTS} ${ROOT}@${HOST} "${SUDO} chown -R ${USER}.${USER} /home/${USER}/.ssh"
- ssh ${SSH_OPTS} ${USER}@${HOST} "ssh-keygen -q -t rsa -N \"\" -f .ssh/id_rsa"
- ssh ${SSH_OPTS} ${USER}@${HOST} "ssh-keygen -y -f .ssh/id_rsa >> .ssh/authorized_keys"
- log "...done!"
-fi
-
-# Setup Brooklyn
-log -n "Downloading Brooklyn distribution..."
-ssh ${SSH_OPTS} ${USER}@${HOST} "curl -L -s -o brooklyn-${BROOKLYN_VERSION}.tar.gz http://search.maven.org/remotecontent?filepath=io/brooklyn/brooklyn-dist/${BROOKLYN_VERSION}/brooklyn-dist-${BROOKLYN_VERSION}-dist.tar.gz"
-ssh ${SSH_OPTS} ${USER}@${HOST} "tar zxvf brooklyn-${BROOKLYN_VERSION}.tar.gz" >> ${LOG} 2>&1
-ssh ${SSH_OPTS} ${USER}@${HOST} "test -x brooklyn-${BROOKLYN_VERSION}/bin/brooklyn" || fail "Brooklyn was not downloaded correctly"
-log "...done!"
-
-# Configure Brooklyn if no brooklyn.properties
-if ! ssh ${SSH_OPTS} ${USER}@${HOST} "test -f .brooklyn/brooklyn.properties"; then
- log -n "Configuring Brooklyn properties..."
- ssh ${SSH_OPTS} ${USER}@${HOST} "mkdir -p .brooklyn"
- ssh ${SSH_OPTS} ${USER}@${HOST} "curl -L -s -o .brooklyn/brooklyn.properties http://brooklyncentral.github.io/use/guide/quickstart/brooklyn.properties"
-
- # Generate Brooklyn admin password
- if ${GENERATE_PASSWORD}; then
- GENERATED=$(dd if=/dev/random bs=1 count=32 2> /dev/null | uuencode -m - | sed -n 2p | tr -dc "A-Za-z0-9")
- SALT=$(echo ${GENERATED} | cut -c1-4)
- PASSWORD=$(echo ${GENERATED} | cut -c5-12)
- which shasum && SHA256="shasum -a 256"
- which sha256sum && SHA256="sha256sum"
- HASH=$(printf '${SALT}${PASSWORD}\\00' | ${SHA256} | cut -d\ -f1)
- ssh ${SSH_OPTS} ${USER}@${HOST} "tee -a .brooklyn/brooklyn.properties" > /dev/null 2>&1 <<EOF
-brooklyn.webconsole.security.users = ${USER}
-brooklyn.webconsole.security.user.${USER}.salt = ${SALT}
-brooklyn.webconsole.security.user.${USER}.sha256 = ${HASH}
-EOF
- else
- ssh ${SSH_OPTS} ${USER}@${HOST} "sed -i.bak 's/^# brooklyn.webconsole.security.provider = org.apache.brooklyn.rest.security.provider.AnyoneSecurityProvider/brooklyn.webconsole.security.provider = org.apache.brooklyn.rest.security.provider.AnyoneSecurityProvider/' .brooklyn/brooklyn.properties"
- fi
- log "...done!"
-fi
-
-# Install example Jars and catalog
-log -n "Installing examples and configuring catalog..."
-ssh ${SSH_OPTS} ${USER}@${HOST} "cat > .brooklyn/catalog.xml" <<EOF
-<?xml version="1.0"?>
-<catalog>
- <name>Brooklyn Demos</name>
-
- <template type="brooklyn.demo.WebClusterDatabaseExample" name="Demo Web Cluster with DB">
- <description>Deploys a demonstration web application to a managed JBoss cluster with elasticity, persisting to MySQL</description>
- <iconUrl>http://downloads.cloudsoftcorp.com/brooklyn/catalog/logos/JBoss_by_Red_Hat.png</iconUrl>
- </template>
-
- <template type="brooklyn.demo.GlobalWebFabricExample" name="Demo GeoDNS Web Fabric DB">
- <description>Deploys a demonstration web application to JBoss clusters around the world</description>
- <iconUrl>http://downloads.cloudsoftcorp.com/brooklyn/catalog/logos/JBoss_by_Red_Hat.png</iconUrl>
- </template>
-
- <template type="brooklyn.demo.SimpleCassandraCluster" name="Demo Cassandra Cluster">
- <description>Deploys a demonstration Cassandra cluster</description>
- <iconUrl>http://downloads.cloudsoftcorp.com/brooklyn/catalog/logos/cassandra-sq-icon.jpg</iconUrl>
- </template>
-
- <template type="brooklyn.demo.SimpleCouchDBCluster" name="Demo CouchDB">
- <description>Deploys a demonstration CouchDB cluster</description>
- <iconUrl>http://downloads.cloudsoftcorp.com/brooklyn/catalog/logos/couchdb-logo-icon.png</iconUrl>
- </template>
-
- <classpath>
- <entry>http://search.maven.org/remotecontent?filepath=io/brooklyn/example/brooklyn-example-simple-web-cluster/${BROOKLYN_VERSION}/brooklyn-example-simple-web-cluster-${BROOKLYN_VERSION}.jar</entry>
- <entry>http://search.maven.org/remotecontent?filepath=io/brooklyn/example/brooklyn-example-simple-nosql-cluster/${BROOKLYN_VERSION}/brooklyn-example-simple-nosql-cluster-${BROOKLYN_VERSION}.jar</entry>
- </classpath>
-</catalog>
-EOF
-log "...done!"
-
-# Run Brooklyn
-log -n "Starting Brooklyn..."
-ssh -n -f ${SSH_OPTS} ${USER}@${HOST} "nohup ./brooklyn-${BROOKLYN_VERSION}/bin/brooklyn launch >> ./brooklyn-${BROOKLYN_VERSION}/brooklyn-console.log 2>&1 &"
-retry "ssh ${SSH_OPTS} ${USER}@${HOST} \"test -e ./brooklyn-${BROOKLYN_VERSION}/brooklyn-console.log\""
-retry "ssh ${SSH_OPTS} ${USER}@${HOST} \"grep -q \"Started Brooklyn console at\" ./brooklyn-${BROOKLYN_VERSION}/brooklyn-console.log &>/dev/null\""
-log "...done!"
-
-URL=$(ssh ${SSH_OPTS} ${USER}@${HOST} "grep 'Started Brooklyn console at' ./brooklyn-${BROOKLYN_VERSION}/brooklyn-console.log | cut -d' ' -f9 | tr -d ," | sed -e "s/127\.0\.0\.1/${HOST}/g" -e "s/0\.0\.0\.0/${HOST}/g" 2>&1)
-log "Brooklyn Console URL is ${URL}"
-
-if ${GENERATE_PASSWORD}; then
- log "Brooklyn Console password for the '${USER}' user is '${PASSWORD}'"
- CREDENTIALS="--user=admin --password=${PASSWORD}"
-fi
-
-log -n "Checking Brooklyn connection..."
-if wget -qO- --retry-connrefused --no-check-certificate ${CREDENTIALS} ${URL} &> /dev/null; then
- log "...success!"
-else
- fail "Cannot connect to Console URL"
-fi
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/988b9d6b/release/make-release-artifacts.sh
----------------------------------------------------------------------
diff --git a/release/make-release-artifacts.sh b/release/make-release-artifacts.sh
index b0b48d4..ad0bd06 100755
--- a/release/make-release-artifacts.sh
+++ b/release/make-release-artifacts.sh
@@ -162,7 +162,7 @@ git clean -dxf
echo "Creating source release folder ${release_name}"
set -x
mkdir -p ${staging_dir}
-rsync -rtp --exclude src-release-tmp --exclude bin-release-tmp --exclude .git\* --exclude '**/*.[ejw]ar' --exclude docs/ . ${staging_dir}
+rsync -rtp --exclude src-release-tmp --exclude bin-release-tmp --exclude .git\* --exclude '**/*.[ejw]ar' --exclude docs/ sandbox/ release/ . ${staging_dir}
mkdir -p ${artifact_dir}
set +x
[11/11] incubator-brooklyn git commit: reinstate jar exclusion,
with comments
Posted by he...@apache.org.
reinstate jar exclusion, with comments
these mustn't be included (and tests which want them are skipped if they aren't present)
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/aaf97039
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/aaf97039
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/aaf97039
Branch: refs/heads/0.8.0-incubating
Commit: aaf97039ab33c2b489479fe9fd2c21732731c277
Parents: 6da5c6d
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Fri Sep 4 14:27:42 2015 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Fri Sep 4 14:33:52 2015 +0100
----------------------------------------------------------------------
release/make-release-artifacts.sh | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/aaf97039/release/make-release-artifacts.sh
----------------------------------------------------------------------
diff --git a/release/make-release-artifacts.sh b/release/make-release-artifacts.sh
index a9184f3..476a6e3 100755
--- a/release/make-release-artifacts.sh
+++ b/release/make-release-artifacts.sh
@@ -173,7 +173,13 @@ echo "Creating source release folder ${release_name}"
set -x
mkdir -p ${src_staging_dir}
mkdir -p ${bin_staging_dir}
-rsync -rtp --exclude .git\* --exclude docs/ --exclude sandbox/ --exclude release/ . ${staging_dir}/${release_name}-src
+# exclude:
+# * docs (which isn't part of the release, and adding license headers to js files is cumbersome)
+# * sandbox (which hasn't been vetted so thoroughly)
+# * release (where this is running, and people who *have* the release don't need to make it)
+# * jars and friends (these are sometimes included for tests, but those are marked as skippable,
+# and apache convention does not allow them in source builds; see PR #365
+rsync -rtp --exclude .git\* --exclude docs/ --exclude sandbox/ --exclude release/ --exclude '**/*.[ejw]ar' . ${staging_dir}/${release_name}-src
rm -rf ${artifact_dir}
mkdir -p ${artifact_dir}
[03/11] incubator-brooklyn git commit: tidy up contribute-docs page,
and minor tidies elsewhere in docs
Posted by he...@apache.org.
tidy up contribute-docs page, and minor tidies elsewhere in docs
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/6f33f747
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/6f33f747
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/6f33f747
Branch: refs/heads/0.8.0-incubating
Commit: 6f33f747e5aca7bf93197fe0ba8ac1e1af26a8a7
Parents: ec25e64
Author: Alex Heneveld <al...@cloudsoft.io>
Authored: Thu Sep 3 03:16:39 2015 +0100
Committer: Alex Heneveld <al...@cloudsoft.io>
Committed: Thu Sep 3 03:16:39 2015 +0100
----------------------------------------------------------------------
.../website/community/how-to-contribute-docs.md | 163 ++++---------------
.../release-process/release-version.md | 5 +-
docs/website/meta/versions.md | 12 +-
3 files changed, 39 insertions(+), 141 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6f33f747/docs/website/community/how-to-contribute-docs.md
----------------------------------------------------------------------
diff --git a/docs/website/community/how-to-contribute-docs.md b/docs/website/community/how-to-contribute-docs.md
index 3b2159f..0da9b3b 100644
--- a/docs/website/community/how-to-contribute-docs.md
+++ b/docs/website/community/how-to-contribute-docs.md
@@ -1,153 +1,60 @@
---
layout: website-normal
-title: How to Contribute Documentation
+title: Contributing Documentation
navgroup: community
---
-<!-- TODO do we want this page? can be simplified a lot since the process is identical as for how-to-contribute,
- with the exception of the "Edit this Page" (and reminder we can accept small changes without CLA or Jira);
- we could promote much of the content from README.md to here... -->
-
-
Welcome and thank you for your interest in contributing to Apache Brooklyn! This guide will take you through the
process of making contributions to the Apache Brooklyn website and documentation.
-Two types of documentation
---------------------------
-
-The Brooklyn docs live in the **docs** project in the Brooklyn codebase,
-built using standard jekyll/markdown with a few extensions.
-
-The Brooklyn documentation is split into two parts:
-
-- **The main website and shared documentation**. This covers the root website
- and all pages that are not part of the version-specific user guide.
- Content for this is in the `website` directory.
-
-- **Version-specific user guide**. These pages have a URL with a path that
- begins /v/*version-number*: for example,
- https://brooklyn.incubator.apache.org/v/0.8.0-incubating and {% comment %}BROOKLYN_VERSION{% endcomment %}
- the special *latest* set at https://brooklyn.incubator.apache.org/v/latest .
- Content for this is in the `guide` directory.
-
-
-Contributor license agreement
------------------------------
-
-Apache Brooklyn is licensed under the [Apache License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0). All
-contributions will be under this license, so please read and understand this license before contributing.
-
-For all but the most trivial patches, you are required to file a Contributor License Agreement with the Apache
-Software Foundation. Please read the [guide to CLAs](https://www.apache.org/licenses/#clas) to find out how to file a
-CLA with the Foundation.
-
-
-Before you start
-----------------
+Quick Edits
+-----------
-### Join the community
+The easiest way to contribute improvements to the doc is with the *Edit this page*
+button at the bottom of most pages. This will take you to the GitHub repository where
+you can immediately begin editing the file.
-If it's your first contribution or it's a particularly big or complex contribution, things typically go much more
-smoothly when they start off with a conversation. Visit our [Community](index.html) page to see how you can contact
-us via IRC or email.
-
-### Create an issue in Jira
-
-Your first step is to create or find an issue in [Brooklyn's Jira](https://issues.apache.org/jira/browse/BROOKLYN)
-for your feature request or fix. For small changes this isn't necessary, but it's good to see if your change fixes an
-existing issue anyway.
-
-
-Contributing using *Edit this page*
------------------------------------
-
-Most of the pages on the website have an *Edit this page* button at the bottom.
-Clicking this button will take you to the GitHub repository and immediately
-begin editing the file. This approach makes editing easy, as you do not need to
+This approach makes editing easy, as you do not need to
clone the repository to your workstation and make changes there; they can be
changed directly on the GitHub website for the repository.
+(You will need a GitHub account but this is free and easy to create.)
-Once you have made your edits, there is a short form titled *Propose file
-change*. Provide a short description of the change in the first box; optionally,
-provide a longer description in the second box. If your change fixes or
-addresses a Jira issue, be sure to mention it. Finally, click the *Propose file
-change* button to prepare a pull request, and then *Create pull request* to
-formally submit your change request and notify the dev team of your proposed
-change.
+Once you have made your edits:
-The website is not a Wiki and your changes will not appear immediately. The
-community mailing list will receive a notification of your proposed change, and
-an Apache Brooklyn committer will review your changes. Once your change has
-passed review, the committer will merge it and re-publish the public website.
+* In the short form titled *Propose file change*,
+ provide a short description of the change in the first box
+* Optionally, provide a longer description in the second box.
+ If your change fixes or addresses a Jira issue, be sure to mention it.
+* Next click *Propose file change* to prepare a pull request
+* Finally click *Create pull request* to notify the team of your proposed change.
+ The community will review it and merge and update the web site as necessary.
-While the *Edit this page* button is great for quickly editing a single page, if
-you want to do anything that involves editing multiple pages, you will need to
-fork and clone the repository and make the changes on your own workstation - see
-the next section for information on this.
-
-
-Contributing using GitHub
--------------------------
-
-Our GitHub repository is located at
-[https://github.com/apache/incubator-brooklyn](https://github.com/apache/incubator-brooklyn)
-
-Your commit messages must properly describe the changes that have been made and
-their purpose ([here are some
-guidelines](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html)).
-If your contributions fix a Jira issue, then ensure that you reference the issue
-(like `BROOKLYN-9876`) in the commit message.
-
-Create a pull request (PR) in GitHub for the change you're interested in making.
-The comment section of the PR must contain a link to the Jira issue (if it has
-one).
-
-Some good references for working with GitHub are below. We ask that you keep
-your change rebased to master as much as possible, and we will ask you to rebase
-again if master has moved before accepting your patch.
-
-- [Setting Up Git with GitHub](https://help.github.com/articles/set-up-git)
-- [Forking a Repository](https://help.github.com/articles/fork-a-repo)
-- [Submitting Pull Requests](https://help.github.com/articles/using-pull-requests)
-- [Rebasing your Branch](https://help.github.com/articles/interactive-rebase)
-
-Finally, add a comment in the Jira issue with a link to the pull request so we
-know the code is ready to be reviewed.
-
-
-### Reviews
-
-The Apache Brooklyn community will review your pull request before it is merged.
-This process can take a while, so please be patient. If we are slow to respond,
-please feel free to post a reminder to the PR, Jira issue, IRC channel or
-mailing list - see the [Community](index.html) page to see how to contact us.
-During the review process you may be asked to make some changes to your
-submission. While working through feedback, it can be beneficial to create new
-commits so the incremental change is obvious. This can also lead to a complex
-set of commits, and having an atomic change per commit is preferred in the end.
-Use your best judgement and work with your reviewer as to when you should revise
-a commit or create a new one.
-
-A pull request is considered ready to be merged once it gets at least one +1
-from a committer. Once all the changes have been completed and the pull request
-is accepted, you may be asked to rebase it against the latest code. You may also
-wish to squash some commits together and make other history revisions, to leave
-the commit history clean and easily understood.
+Bigger Contributions
+--------------------
+While the *Edit this page* button is great for quickly editing a single page, if
+you want to do anything that involves editing multiple pages, you will need to
+fork and clone the repository and make the changes on your own workstation.
-### Contributing without using GitHub
+For this, you should first review the general tips on [How to Contribute](../developers/how-to-contribute.md).
-If you prefer to not use GitHub, then that is fine - we are also happy to accept
-patches attached to a Jira issue. Our canonical repository is located at
-`https://git-wip-us.apache.org/repos/asf/incubator-brooklyn.git`; for example:
+Next, you’ll want to become familiar with the `docs/` folder in the Brooklyn codebase where the docs live.
+In particular, note that the Brooklyn documentation is split into two parts:
- $ git clone https://git-wip-us.apache.org/repos/asf/incubator-brooklyn.git
+- **The main website and shared documentation**. This covers the root website
+ and all pages that are not part of the version-specific user guide.
+ Content for this is in the `website` directory.
+
+- **Version-specific user guide**. These pages have a URL with a path that
+ begins /v/*version-number*: for example,
+ https://brooklyn.incubator.apache.org/v/0.8.0-incubating and {% comment %}BROOKLYN_VERSION{% endcomment %}
+ the special *latest* set at https://brooklyn.incubator.apache.org/v/latest. Content for this is in the `guide` directory.
-When producing patches, please use `git format-patch` or a similar mechanism -
-this will ensure that you are properly attributed as the author of the patch
-when a committer merges it.
+The main user guide shown on this site is for the most recent stable version,
+currently {{ site.brooklyn-stable-version }}.
+Guides for other versions are available [here](../meta/versions.md).
For More Information
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6f33f747/docs/website/developers/committers/release-process/release-version.md
----------------------------------------------------------------------
diff --git a/docs/website/developers/committers/release-process/release-version.md b/docs/website/developers/committers/release-process/release-version.md
index e43868b..eea6943 100644
--- a/docs/website/developers/committers/release-process/release-version.md
+++ b/docs/website/developers/committers/release-process/release-version.md
@@ -32,9 +32,7 @@ git checkout -b $VERSION_NAME
git push -u apache $VERSION_NAME
{% endhighlight %}
-Now change the version numbers throughout the repository using the script `release/change-version.sh`.
-
-Example:
+Now change the version numbers in this branch throughout the project using the script `release/change-version.sh` and commit it:
{% highlight bash %}
./release/change-version.sh BROOKLYN $OLD_MASTER_VERSION $VERSION_NAME
@@ -45,6 +43,7 @@ git push
{% endhighlight %}
+
Update the version on master
----------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6f33f747/docs/website/meta/versions.md
----------------------------------------------------------------------
diff --git a/docs/website/meta/versions.md b/docs/website/meta/versions.md
index e178770..0cca91c 100644
--- a/docs/website/meta/versions.md
+++ b/docs/website/meta/versions.md
@@ -18,17 +18,9 @@ This documentation was generated {{ site.time | date_to_string }}.
Apache Brooklyn has made the following releases:
-* **0.7.0-incubating**: New policies, more clouds, improved Windows support and many other improvements. Apache-endorsed binary release! (July 2015)
- * [User guide](/v/0.7.0-incubating/), download via mirrors
- «<a href="https://www.apache.org/dyn/closer.cgi/incubator/brooklyn/apache-brooklyn-0.7.0-incubating/apache-brooklyn-0.7.0-incubating-bin.tar.gz">bin.tar.gz</a>»
- «<a href="https://www.apache.org/dyn/closer.cgi/incubator/brooklyn/apache-brooklyn-0.7.0-incubating/apache-brooklyn-0.7.0-incubating-bin.zip">bin.zip</a>»
- «<a href="https://www.apache.org/dyn/closer.cgi/incubator/brooklyn/apache-brooklyn-0.7.0-incubating/apache-brooklyn-0.7.0-incubating-src.tar.gz">src.tar.gz</a>»
- «<a href="https://www.apache.org/dyn/closer.cgi/incubator/brooklyn/apache-brooklyn-0.7.0-incubating/apache-brooklyn-0.7.0-incubating-src.zip">src.zip</a>»
-
-* **0.7.0-M2-incubating**: YAML, persistence, Chef, Windows, Docker. The first Apache release! (December 2014)
- * [User guide](/v/0.7.0-M2-incubating/), download via mirrors
- «<a href="https://www.apache.org/dyn/closer.cgi/incubator/brooklyn/0.7.0-M2-incubating/apache-brooklyn-0.7.0-M2-incubating.tar.gz">src.tar.gz</a>»
+* **[0.7.0-incubating](/v/0.7.0-incubating/)**: New policies, more clouds, improved Windows support and many other improvements. Apache-endorsed binary release! (July 2015)
+* **[0.7.0-M2-incubating](/v/0.7.0-M2-incubating/)**: YAML, persistence, Chef, Windows, Docker. The first Apache release! (December 2014)
Note: These "Version History" links are to permanent versions in the archive,
different to the "Current Version" links.
[09/11] incubator-brooklyn git commit: remove the cassandra snitch
jar. no binaries should be in sources apart from tests.
Posted by he...@apache.org.
remove the cassandra snitch jar. no binaries should be in sources apart from tests.
it can be built and added when needed. it is not required for operation or 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/9b279d94
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/9b279d94
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/9b279d94
Branch: refs/heads/0.8.0-incubating
Commit: 9b279d9415016f04ac676651f6647a154d281a20
Parents: 988b9d6
Author: Alex Heneveld <al...@cloudsoft.io>
Authored: Thu Sep 3 23:43:24 2015 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Fri Sep 4 14:33:51 2015 +0100
----------------------------------------------------------------------
.../entity/nosql/cassandra/CassandraNode.java | 1 +
.../cassandra/cassandra-multicloud-snitch.jar | Bin 15292 -> 0 bytes
2 files changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b279d94/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNode.java
----------------------------------------------------------------------
diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNode.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNode.java
index d5c7e2f..683c16d 100644
--- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNode.java
+++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNode.java
@@ -98,6 +98,7 @@ public interface CassandraNode extends DatastoreMixins.DatastoreCommon, Software
// some of the cassandra tooing (eg nodetool) use RMI, but we want JMXMP, so do both!
ConfigKey<JmxAgentModes> JMX_AGENT_MODE = ConfigKeys.newConfigKeyWithDefault(UsesJmx.JMX_AGENT_MODE, JmxAgentModes.JMXMP_AND_RMI);
+ // TODO the multicloud-snitch has to be built manually, it is available in the brooklyn sandbox
@SetFromFlag("customSnitchJarUrl")
ConfigKey<String> CUSTOM_SNITCH_JAR_URL = ConfigKeys.newStringConfigKey("cassandra.config.customSnitchUrl",
"URL for a jar file to be uploaded (e.g. \"classpath://org/apache/brooklyn/entity/nosql/cassandra/cassandra-multicloud-snitch.jar\"); defaults to null which means nothing to upload",
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b279d94/software/nosql/src/main/resources/org/apache/brooklyn/entity/nosql/cassandra/cassandra-multicloud-snitch.jar
----------------------------------------------------------------------
diff --git a/software/nosql/src/main/resources/org/apache/brooklyn/entity/nosql/cassandra/cassandra-multicloud-snitch.jar b/software/nosql/src/main/resources/org/apache/brooklyn/entity/nosql/cassandra/cassandra-multicloud-snitch.jar
deleted file mode 100644
index 2197705..0000000
Binary files a/software/nosql/src/main/resources/org/apache/brooklyn/entity/nosql/cassandra/cassandra-multicloud-snitch.jar and /dev/null differ
[06/11] incubator-brooklyn git commit: more info on verifying the
builds (whether downloaded or not) and vote (a script)
Posted by he...@apache.org.
more info on verifying the builds (whether downloaded or not) and vote (a script)
also tidy the release/dir moving pr_report to a subdir
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/2f199cc4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/2f199cc4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/2f199cc4
Branch: refs/heads/0.8.0-incubating
Commit: 2f199cc48b8b2dbedbaa1c2b26a2c9efcb5575c9
Parents: 509d54c
Author: Alex Heneveld <al...@cloudsoft.io>
Authored: Thu Sep 3 14:48:08 2015 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Fri Sep 4 14:33:51 2015 +0100
----------------------------------------------------------------------
.../release-process/verify-release-artifacts.md | 17 ++-
.../committers/release-process/vote.md | 44 ++++---
release/Gemfile | 5 -
release/Gemfile.lock | 38 ------
release/README.md | 3 +-
release/make-release-artifacts.sh | 4 +-
release/pr_report.rb | 12 --
release/print-vote-email.sh | 129 +++++++++++++++++++
release/pull-request-reports/Gemfile | 5 +
release/pull-request-reports/Gemfile.lock | 38 ++++++
release/pull-request-reports/pr_report.rb | 12 ++
11 files changed, 228 insertions(+), 79 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2f199cc4/docs/website/developers/committers/release-process/verify-release-artifacts.md
----------------------------------------------------------------------
diff --git a/docs/website/developers/committers/release-process/verify-release-artifacts.md b/docs/website/developers/committers/release-process/verify-release-artifacts.md
index 086e56c..40c8b20 100644
--- a/docs/website/developers/committers/release-process/verify-release-artifacts.md
+++ b/docs/website/developers/committers/release-process/verify-release-artifacts.md
@@ -36,10 +36,12 @@ curl https://dist.apache.org/repos/dist/release/incubator/brooklyn/KEYS | gpg2 -
{% endhighlight %}
-Verify the hashes and signatures of artifacts
----------------------------------------------
+Download the artifacts
+----------------------
-If the releases have been published to the pre-release area, download them:
+If you've just built the RC, simply go to that directory and skip this step.
+
+If you're verifying a build someone else has made, first download the files including all keys using:
{% highlight bash %}
TEMP_DIR=~/tmp/brooklyn/release/${VERSION_NAME}-rc${RC_NUMBER}
@@ -56,7 +58,14 @@ for ext in -src.tar.gz -src.zip -bin.tar.gz -bin.zip; do
done
{% endhighlight %}
-Then verify the hashes, and ensure you get a positive message from each one:
+(Alternatively if you have `apache-dist-dev-repo` checked out,
+you can do an `svn up` in there and `cd apache-brooklyn-${VERSION_NAME}-rc${RC_NUMBER}`.)
+
+
+Verify the hashes and signatures of artifacts
+---------------------------------------------
+
+Then check the hashes and signatures, ensuring you get a positive message from each one:
{% highlight bash %}
for ext in -src.tar.gz -src.zip -bin.tar.gz -bin.zip; do
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2f199cc4/docs/website/developers/committers/release-process/vote.md
----------------------------------------------------------------------
diff --git a/docs/website/developers/committers/release-process/vote.md b/docs/website/developers/committers/release-process/vote.md
index db8b305..d3f6930 100644
--- a/docs/website/developers/committers/release-process/vote.md
+++ b/docs/website/developers/committers/release-process/vote.md
@@ -7,32 +7,39 @@ navgroup: developers
Start the vote
--------------
-Copy-paste the e-mail below, being sure to substitute:
+A script to generate the voting email can be found in `release/print-vote-email.sh`,
+taking a single argument being the staging repo link. For example:
-- version number
-- RC number
+ release/print-vote-email.sh orgapachebrooklyn-1234 | pbcopy
+
+You should move the subject and put your name at the end, and simply eyeball the rest. This should be sent to **dev@brooklyn.incubator.apache.org**.
+
+Alternatively, copy-paste the e-mail template below, being sure to substitute:
+
+- VERSION_NAME
+- RC_NUMBER
- URLs containing version numbers
- URL for your own PGP key
- Checksums
- URL for the Maven staging repository
-### Subject: [VOTE] Release Apache Brooklyn 0.7.0-incubating [rc1]
+### Subject: [VOTE] Release Apache Brooklyn ${VERSION_NAME} [rc${RC_NUMBER}]
{% highlight text %}
-This is to call for a vote for the release of Apache Brooklyn 0.7.0-incubating.
+This is to call for a vote for the release of Apache Brooklyn ${VERSION_NAME}.
This release comprises of a source code distribution, and a corresponding
binary distribution, and Maven artifacts.
The source and binary distributions, including signatures, digests, etc. can
be found at:
-https://dist.apache.org/repos/dist/dev/incubator/brooklyn/apache-brooklyn-0.7.0-incubating-rc1
+https://dist.apache.org/repos/dist/dev/incubator/brooklyn/apache-brooklyn-${VERSION_NAME}-rc${RC_NUMBER}
The artifact SHA-256 checksums are as follows:
-c3b5c581f14b44aed786010ac7c8c2d899ea0ff511135330395a2ff2a30dd5cf *apache-brooklyn-0.7.0-incubating-rc1-bin.tar.gz
-cef49056ba6e5bf012746a72600b2cee8e2dfca1c39740c945c456eacd6b6fca *apache-brooklyn-0.7.0-incubating-rc1-bin.zip
-8069bfc54e7f811f6b57841167b35661518aa88cabcb070bf05aae2ff1167b5a *apache-brooklyn-0.7.0-incubating-rc1-src.tar.gz
-acd2229c44e93e41372fd8b7ea0038f15fe4aaede5a3bcc5056f28a770543b82 *apache-brooklyn-0.7.0-incubating-rc1-src.zip
+c3b5c581f14b44aed786010ac7c8c2d899ea0ff511135330395a2ff2a30dd5cf *apache-brooklyn-${VERSION_NAME}-rc${RC_NUMBER}-bin.tar.gz
+cef49056ba6e5bf012746a72600b2cee8e2dfca1c39740c945c456eacd6b6fca *apache-brooklyn-${VERSION_NAME}-rc${RC_NUMBER}-bin.zip
+8069bfc54e7f811f6b57841167b35661518aa88cabcb070bf05aae2ff1167b5a *apache-brooklyn-${VERSION_NAME}-rc${RC_NUMBER}-src.tar.gz
+acd2229c44e93e41372fd8b7ea0038f15fe4aaede5a3bcc5056f28a770543b82 *apache-brooklyn-${VERSION_NAME}-rc${RC_NUMBER}-src.zip
The Nexus staging repository for the Maven artifacts is located at:
https://repository.apache.org/content/repositories/orgapachebrooklyn-1004
@@ -48,10 +55,10 @@ The artifacts were built from Git commit ID
https://git-wip-us.apache.org/repos/asf?p=incubator-brooklyn.git;a=commit;h=24a23c5a4fd5967725930b8ceaed61dfbd225980
-Please vote on releasing this package as Apache Brooklyn 0.7.0-incubating.
+Please vote on releasing this package as Apache Brooklyn ${VERSION_NAME}.
The vote will be open for at least 72 hours.
-[ ] +1 Release this package as Apache Brooklyn 0.7.0-incubating
+[ ] +1 Release this package as Apache Brooklyn ${VERSION_NAME}
[ ] +0 no opinion
[ ] -1 Do not release this package because ...
@@ -99,12 +106,15 @@ Finally, count up the +1s and separate into binding (PPMC) and non-binding.
Email the vote result
---------------------
-This is a new email thread with a different subject.
+This is a new email thread with a different subject
+(the same as before with `[RESULT]` prepended).
+
+Note that you must find the URL for the previous thread at [mail-archives.apache.org](https://mail-archives.apache.org/).
-### Subject: [RESULT][VOTE] Release Apache Brooklyn 0.7.0-incubating [rc1]
+### Subject: [RESULT]\[VOTE] Release Apache Brooklyn ${VERSION_NAME} [rc${RC_NUMBER}]
{% highlight text %}
-The vote for releasing Apache Brooklyn 0.7.0-incubating passed with 5 binding +1s, 1 non-binding +1s, and no 0 or -1.
+The vote for releasing Apache Brooklyn ${VERSION_NAME} passed with 5 binding +1s, 1 non-binding +1s, and no 0 or -1.
Vote thread link:
https://mail-archives.apache.org/mod_mbox/incubator-brooklyn-dev/201507.mbox/%3CCABQFKi1WapCMRUqQ93E7Qow5onKgL3nyG3HW9Cse7vo%2BtUChRQ%40mail.gmail.com%3E
@@ -124,6 +134,6 @@ Thanks to everyone that tested our release and voted.
We will shortly begin a vote on the incubator-general list.
-Thanks,
-[Release manager name]
+Thanks.
+
{% endhighlight %}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2f199cc4/release/Gemfile
----------------------------------------------------------------------
diff --git a/release/Gemfile b/release/Gemfile
deleted file mode 100644
index 8ab84b5..0000000
--- a/release/Gemfile
+++ /dev/null
@@ -1,5 +0,0 @@
-#ruby=ruby-2.1.2
-#ruby-gemset=brooklyn-release-helpers
-
-source 'https://rubygems.org'
-gem 'github_api'
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2f199cc4/release/Gemfile.lock
----------------------------------------------------------------------
diff --git a/release/Gemfile.lock b/release/Gemfile.lock
deleted file mode 100644
index 859202a..0000000
--- a/release/Gemfile.lock
+++ /dev/null
@@ -1,38 +0,0 @@
-GEM
- remote: https://rubygems.org/
- specs:
- addressable (2.3.8)
- descendants_tracker (0.0.4)
- thread_safe (~> 0.3, >= 0.3.1)
- faraday (0.9.1)
- multipart-post (>= 1.2, < 3)
- github_api (0.12.3)
- addressable (~> 2.3)
- descendants_tracker (~> 0.0.4)
- faraday (~> 0.8, < 0.10)
- hashie (>= 3.3)
- multi_json (>= 1.7.5, < 2.0)
- nokogiri (~> 1.6.3)
- oauth2
- hashie (3.4.2)
- jwt (1.5.1)
- mini_portile (0.6.2)
- multi_json (1.11.1)
- multi_xml (0.5.5)
- multipart-post (2.0.0)
- nokogiri (1.6.6.2)
- mini_portile (~> 0.6.0)
- oauth2 (1.0.0)
- faraday (>= 0.8, < 0.10)
- jwt (~> 1.0)
- multi_json (~> 1.3)
- multi_xml (~> 0.5)
- rack (~> 1.2)
- rack (1.6.4)
- thread_safe (0.3.5)
-
-PLATFORMS
- ruby
-
-DEPENDENCIES
- github_api
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2f199cc4/release/README.md
----------------------------------------------------------------------
diff --git a/release/README.md b/release/README.md
index f1976f6..325b165 100644
--- a/release/README.md
+++ b/release/README.md
@@ -44,6 +44,7 @@ run for example `/vagrant/make-release/artifacts.sh`.
Pull request reporting
----------------------
-`pr_report.rb` (and associated files `Gemfile` and `Gemfile.lock`) uses the GitHub API to extract a list of open pull
+The files in `pull-request-reports`, mainly `pr_report.rb`
+(and associated files `Gemfile` and `Gemfile.lock`) uses the GitHub API to extract a list of open pull
requests, and writes a summary into `pr_report.tsv`. This could then be imported into Google Sheets to provide a handy
way of classifying and managing outstanding PRs ahead of making a release.
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2f199cc4/release/make-release-artifacts.sh
----------------------------------------------------------------------
diff --git a/release/make-release-artifacts.sh b/release/make-release-artifacts.sh
index 8cefc77..b0b48d4 100755
--- a/release/make-release-artifacts.sh
+++ b/release/make-release-artifacts.sh
@@ -131,8 +131,8 @@ fi
release_script_dir=$( cd $( dirname $0 ) && pwd )
brooklyn_dir=$( pwd )
-staging_dir="${brooklyn_dir}/src-release-tmp/${release_name}-src"
-bin_staging_dir="${brooklyn_dir}/bin-release-tmp/${release_name}-bin"
+staging_dir="${release_script_dir}/tmp/working-src/${release_name}-src"
+bin_staging_dir="${release_script_dir}/tmp/working-bin/${release_name}-bin"
artifact_dir="${release_script_dir}/${artifact_name}"
echo "The version is ${current_version}"
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2f199cc4/release/pr_report.rb
----------------------------------------------------------------------
diff --git a/release/pr_report.rb b/release/pr_report.rb
deleted file mode 100644
index 95b6317..0000000
--- a/release/pr_report.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-#ruby
-
-require 'CSV'
-require 'github_api'
-
-gh = Github.new
-
-CSV.open("pr_report.tsv", "wb", { :col_sep => "\t" }) do |csv|
- gh.pull_requests.list('apache', 'incubator-brooklyn').
- select { |pr| pr.state == "open" }.
- each { |pr| csv << [ pr.number, pr.title, pr.created_at, pr.user.login ] }
-end
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2f199cc4/release/print-vote-email.sh
----------------------------------------------------------------------
diff --git a/release/print-vote-email.sh b/release/print-vote-email.sh
new file mode 100755
index 0000000..ac62241
--- /dev/null
+++ b/release/print-vote-email.sh
@@ -0,0 +1,129 @@
+#!/bin/bash
+#
+# 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.
+#
+
+# prints a sample email with all the correct information
+
+set +x
+
+fail() {
+ echo >&2 "$@"
+ exit 1
+}
+
+if [ -z "${VERSION_NAME}" ] ; then fail VERSION_NAME must be set ; fi
+if [ -z "${RC_NUMBER}" ] ; then fail RC_NUMBER must be set ; fi
+
+base=apache-brooklyn-${VERSION_NAME}-rc${RC_NUMBER}
+
+if [ -z "$1" ] ; then fail "A single argument being the staging repo ID must be supplied, e.g. orgapachebrooklyn-1234" ; fi
+
+archetype_check=`curl https://repository.apache.org/content/repositories/${staging_repo_id}/archetype-catalog.xml 2> /dev/null`
+if ! echo $archetype_check | grep brooklyn-archetype-quickstart > /dev/null ; then
+ fail staging repo looks wrong at https://repository.apache.org/content/repositories/${staging_repo_id}
+fi
+if ! echo $archetype_check | grep ${VERSION_NAME} > /dev/null ; then
+ fail wrong version at https://repository.apache.org/content/repositories/${staging_repo_id}
+fi
+
+artifact=release/tmp/${base}/${base}-bin.tar.gz
+if [ ! -f $artifact ] ; then
+ fail could not find artifact $artifact
+fi
+if [ -z "$APACHE_ID" ] ; then
+ APACHE_ID=`gpg2 --verify ${artifact}.asc ${artifact} 2>&1 | egrep -o '[^<]*...@apache.org>' | cut -d @ -f 1`
+fi
+if [ -z "$APACHE_ID" ] ; then
+ fail "could not deduce APACHE_ID (your apache username); are files signed correctly?"
+fi
+if ! ( gpg2 --verify ${artifact}.asc ${artifact} 2>&1 | grep ${APACHE_ID}@apache.org > /dev/null ) ; then
+ fail "could not verify signature; are files signed correctly and ID ${APACHE_ID} correct?"
+fi
+
+cat <<EOF
+
+Subject: [VOTE] Release Apache Brooklyn ${VERSION_NAME} [rc${RC_NUMBER}]
+
+
+This is to call for a vote for the release of Apache Brooklyn ${VERSION_NAME}.
+
+This release comprises of a source code distribution, and a corresponding
+binary distribution, and Maven artifacts.
+
+The source and binary distributions, including signatures, digests, etc. can
+be found at:
+
+ https://dist.apache.org/repos/dist/dev/incubator/brooklyn/${base}
+
+The artifact SHA-256 checksums are as follows:
+
+EOF
+
+cat release/tmp/${base}/*.sha256 | awk '{print " "$0}'
+
+cat <<EOF
+
+The Nexus staging repository for the Maven artifacts is located at:
+
+ https://repository.apache.org/content/repositories/${staging_repo_id}
+
+All release artifacts are signed with the following key:
+
+ https://people.apache.org/keys/committer/${APACHE_ID}.asc
+
+KEYS file available here:
+
+ https://dist.apache.org/repos/dist/release/incubator/brooklyn/KEYS
+
+
+The artifacts were built from git commit ID $( git rev-parse HEAD ):
+
+ https://git-wip-us.apache.org/repos/asf?p=incubator-brooklyn.git;a=commit;h=$( git rev-parse HEAD )
+
+
+Please vote on releasing this package as Apache Brooklyn ${VERSION_NAME}.
+
+The vote will be open for at least 72 hours.
+[ ] +1 Release this package as Apache Brooklyn ${VERSION_NAME}
+[ ] +0 no opinion
+[ ] -1 Do not release this package because ...
+
+
+Thanks!
+EOF
+
+cat <<EOF
+
+
+
+CHECKLIST for reference
+
+[ ] Download links work.
+[ ] Binaries work.
+[ ] Checksums and PGP signatures are valid.
+[ ] Expanded source archive matches contents of RC tag.
+[ ] Expanded source archive builds and passes tests.
+[ ] LICENSE is present and correct.
+[ ] NOTICE is present and correct, including copyright date.
+[ ] All files have license headers where appropriate.
+[ ] All dependencies have compatible licenses.
+[ ] No compiled archives bundled in source archive.
+[ ] I follow this project’s commits list.
+
+EOF
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2f199cc4/release/pull-request-reports/Gemfile
----------------------------------------------------------------------
diff --git a/release/pull-request-reports/Gemfile b/release/pull-request-reports/Gemfile
new file mode 100644
index 0000000..8ab84b5
--- /dev/null
+++ b/release/pull-request-reports/Gemfile
@@ -0,0 +1,5 @@
+#ruby=ruby-2.1.2
+#ruby-gemset=brooklyn-release-helpers
+
+source 'https://rubygems.org'
+gem 'github_api'
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2f199cc4/release/pull-request-reports/Gemfile.lock
----------------------------------------------------------------------
diff --git a/release/pull-request-reports/Gemfile.lock b/release/pull-request-reports/Gemfile.lock
new file mode 100644
index 0000000..859202a
--- /dev/null
+++ b/release/pull-request-reports/Gemfile.lock
@@ -0,0 +1,38 @@
+GEM
+ remote: https://rubygems.org/
+ specs:
+ addressable (2.3.8)
+ descendants_tracker (0.0.4)
+ thread_safe (~> 0.3, >= 0.3.1)
+ faraday (0.9.1)
+ multipart-post (>= 1.2, < 3)
+ github_api (0.12.3)
+ addressable (~> 2.3)
+ descendants_tracker (~> 0.0.4)
+ faraday (~> 0.8, < 0.10)
+ hashie (>= 3.3)
+ multi_json (>= 1.7.5, < 2.0)
+ nokogiri (~> 1.6.3)
+ oauth2
+ hashie (3.4.2)
+ jwt (1.5.1)
+ mini_portile (0.6.2)
+ multi_json (1.11.1)
+ multi_xml (0.5.5)
+ multipart-post (2.0.0)
+ nokogiri (1.6.6.2)
+ mini_portile (~> 0.6.0)
+ oauth2 (1.0.0)
+ faraday (>= 0.8, < 0.10)
+ jwt (~> 1.0)
+ multi_json (~> 1.3)
+ multi_xml (~> 0.5)
+ rack (~> 1.2)
+ rack (1.6.4)
+ thread_safe (0.3.5)
+
+PLATFORMS
+ ruby
+
+DEPENDENCIES
+ github_api
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2f199cc4/release/pull-request-reports/pr_report.rb
----------------------------------------------------------------------
diff --git a/release/pull-request-reports/pr_report.rb b/release/pull-request-reports/pr_report.rb
new file mode 100644
index 0000000..95b6317
--- /dev/null
+++ b/release/pull-request-reports/pr_report.rb
@@ -0,0 +1,12 @@
+#ruby
+
+require 'CSV'
+require 'github_api'
+
+gh = Github.new
+
+CSV.open("pr_report.tsv", "wb", { :col_sep => "\t" }) do |csv|
+ gh.pull_requests.list('apache', 'incubator-brooklyn').
+ select { |pr| pr.state == "open" }.
+ each { |pr| csv << [ pr.number, pr.title, pr.created_at, pr.user.login ] }
+end
[05/11] incubator-brooklyn git commit: fix default catalog reference
to one misnamed package
Posted by he...@apache.org.
fix default catalog reference to one misnamed package
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/0d4962d3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/0d4962d3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/0d4962d3
Branch: refs/heads/0.8.0-incubating
Commit: 0d4962d340115ec716538d400c247beecf1ced51
Parents: 2f199cc
Author: Alex Heneveld <al...@cloudsoft.io>
Authored: Thu Sep 3 20:32:52 2015 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Fri Sep 4 14:33:51 2015 +0100
----------------------------------------------------------------------
usage/cli/src/main/resources/brooklyn/default.catalog.bom | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d4962d3/usage/cli/src/main/resources/brooklyn/default.catalog.bom
----------------------------------------------------------------------
diff --git a/usage/cli/src/main/resources/brooklyn/default.catalog.bom b/usage/cli/src/main/resources/brooklyn/default.catalog.bom
index 857e857..a713bed 100644
--- a/usage/cli/src/main/resources/brooklyn/default.catalog.bom
+++ b/usage/cli/src/main/resources/brooklyn/default.catalog.bom
@@ -253,7 +253,7 @@ brooklyn.catalog:
period: 5s
command: "cat output.txt | grep HTTP | grep 200 | wc | awk '{print $1}'"
# and publish the port as a sensor so the load-balancer can pick it up
- - type: org.apache.brooklyn.sensor.core.StaticSensor
+ - type: org.apache.brooklyn.core.sensor.StaticSensor
brooklyn.config:
name: app.port
targetType: int
[04/11] incubator-brooklyn git commit: remove unnecessary groovy from
test-support pom
Posted by he...@apache.org.
remove unnecessary groovy from test-support pom
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/509d54cc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/509d54cc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/509d54cc
Branch: refs/heads/0.8.0-incubating
Commit: 509d54cc49d026c0303b2192c40690ad321ddea4
Parents: 6f33f74
Author: Alex Heneveld <al...@cloudsoft.io>
Authored: Thu Sep 3 12:27:01 2015 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Fri Sep 4 14:33:50 2015 +0100
----------------------------------------------------------------------
usage/test-support/pom.xml | 11 -----------
1 file changed, 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/509d54cc/usage/test-support/pom.xml
----------------------------------------------------------------------
diff --git a/usage/test-support/pom.xml b/usage/test-support/pom.xml
index 3e19d3e..a48abd9 100644
--- a/usage/test-support/pom.xml
+++ b/usage/test-support/pom.xml
@@ -65,15 +65,4 @@
<artifactId>groovy-all</artifactId>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <inherited>true</inherited>
- <configuration>
- <compilerId>groovy-eclipse-compiler</compilerId>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
[10/11] incubator-brooklyn git commit: more tweaks to release script--
Posted by he...@apache.org.
more tweaks to release script--
use release/tmp/ and shopt expand_aliases,
and option to automatically upload to svn
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/6da5c6de
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/6da5c6de
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/6da5c6de
Branch: refs/heads/0.8.0-incubating
Commit: 6da5c6de67da51b483069ad0224e9f28101f5ae8
Parents: 9b279d9
Author: Alex Heneveld <al...@cloudsoft.io>
Authored: Thu Sep 3 23:48:21 2015 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Fri Sep 4 14:33:52 2015 +0100
----------------------------------------------------------------------
.../committers/release-process/publish-temp.md | 3 ++
release/.gitignore | 1 +
release/make-release-artifacts.sh | 57 ++++++++++++++------
3 files changed, 45 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6da5c6de/docs/website/developers/committers/release-process/publish-temp.md
----------------------------------------------------------------------
diff --git a/docs/website/developers/committers/release-process/publish-temp.md b/docs/website/developers/committers/release-process/publish-temp.md
index aaa6765..9727c52 100644
--- a/docs/website/developers/committers/release-process/publish-temp.md
+++ b/docs/website/developers/committers/release-process/publish-temp.md
@@ -25,6 +25,9 @@ svn add apache-brooklyn-${VERSION_NAME}-rc${RC_NUMBER}
svn commit --message "Add apache-brooklyn-${VERSION_NAME}-rc${RC_NUMBER} to dist/dev/incubator/brooklyn"
{% endhighlight %}
+These steps can be performed as part of the `make-release-artifacts.sh` script used earlier
+if `${APACHE_DIST_SVN_DIR}` points to the appropriate subversion directory.
+
Close the staging repository on Apache's Nexus server
-----------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6da5c6de/release/.gitignore
----------------------------------------------------------------------
diff --git a/release/.gitignore b/release/.gitignore
index 8000dd9..16d63d3 100644
--- a/release/.gitignore
+++ b/release/.gitignore
@@ -1 +1,2 @@
.vagrant
+tmp
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6da5c6de/release/make-release-artifacts.sh
----------------------------------------------------------------------
diff --git a/release/make-release-artifacts.sh b/release/make-release-artifacts.sh
index ad0bd06..a9184f3 100755
--- a/release/make-release-artifacts.sh
+++ b/release/make-release-artifacts.sh
@@ -48,6 +48,9 @@ release.
Specifying the RC number is required. Specifying the version number is
discouraged; if auto detection is not working, then this script is buggy.
+
+Additionally if APACHE_DIST_SVN_DIR is set, this will transfer artifacts to
+that directory and svn commit them.
END
# ruler --------------------------------------------------
}
@@ -131,15 +134,22 @@ fi
release_script_dir=$( cd $( dirname $0 ) && pwd )
brooklyn_dir=$( pwd )
-staging_dir="${release_script_dir}/tmp/working-src/${release_name}-src"
-bin_staging_dir="${release_script_dir}/tmp/working-bin/${release_name}-bin"
-artifact_dir="${release_script_dir}/${artifact_name}"
+rm -rf ${release_script_dir}/tmp
+staging_dir="${release_script_dir}/tmp/source/"
+src_staging_dir="${release_script_dir}/tmp/source/${release_name}-src"
+bin_staging_dir="${release_script_dir}/tmp/bin/"
+artifact_dir="${release_script_dir}/tmp/${artifact_name}"
echo "The version is ${current_version}"
echo "The rc suffix is rc${rc_suffix}"
echo "The release name is ${release_name}"
echo "The artifact name is ${artifact_name}"
echo "The artifact directory is ${artifact_dir}"
+if [ ! -z "${APACHE_DIST_SVN_DIR}" ] ; then
+ echo "The artifacts will be copied and uploaded via ${APACHE_DIST_SVN_DIR}"
+else
+ echo "The artifacts will not be copied and uploaded to the svn repo"
+fi
echo ""
confirm "Is this information correct? [y/N]" || exit
echo ""
@@ -161,15 +171,17 @@ git clean -dxf
# Source release
echo "Creating source release folder ${release_name}"
set -x
-mkdir -p ${staging_dir}
-rsync -rtp --exclude src-release-tmp --exclude bin-release-tmp --exclude .git\* --exclude '**/*.[ejw]ar' --exclude docs/ sandbox/ release/ . ${staging_dir}
+mkdir -p ${src_staging_dir}
+mkdir -p ${bin_staging_dir}
+rsync -rtp --exclude .git\* --exclude docs/ --exclude sandbox/ --exclude release/ . ${staging_dir}/${release_name}-src
+rm -rf ${artifact_dir}
mkdir -p ${artifact_dir}
set +x
-echo "Creating artifact ${artifact_dir}/${artifact_name}.tar.gz and .zip"
+echo "Creating artifact ${artifact_dir}/${artifact_name}-src.tar.gz and .zip"
set -x
-( cd src-release-tmp && tar czf ${artifact_dir}/${artifact_name}-src.tar.gz apache-brooklyn-${current_version}-src )
-( cd src-release-tmp && zip -qr ${artifact_dir}/${artifact_name}-src.zip apache-brooklyn-${current_version}-src )
+( cd ${staging_dir} && tar czf ${artifact_dir}/${artifact_name}-src.tar.gz ${release_name}-src )
+( cd ${staging_dir} && zip -qr ${artifact_dir}/${artifact_name}-src.zip ${release_name}-src )
###############################################################################
# Binary release
@@ -187,25 +199,26 @@ else
fi
# Workaround for bug BROOKLYN-1
-( cd ${staging_dir} && mvn clean --projects :brooklyn-archetype-quickstart )
+( cd ${src_staging_dir} && mvn clean --projects :brooklyn-archetype-quickstart )
# Perform the build and deploy to Nexus staging repository
-( cd ${staging_dir} && mvn deploy -Papache-release )
+( cd ${src_staging_dir} && mvn deploy -Papache-release )
+## To test the script without a big deploy, use the line below instead of above
+#( cd ${src_staging_dir} && cd usage/dist && mvn clean install )
# Re-pack the archive with the correct names
-mkdir -p bin-release-tmp
-tar xzf ${staging_dir}/usage/dist/target/brooklyn-dist-${current_version}-dist.tar.gz -C bin-release-tmp
-mv bin-release-tmp/brooklyn-dist-${current_version} bin-release-tmp/apache-brooklyn-${current_version}-bin
+tar xzf ${src_staging_dir}/usage/dist/target/brooklyn-dist-${current_version}-dist.tar.gz -C ${bin_staging_dir}
+mv ${bin_staging_dir}/brooklyn-dist-${current_version} ${bin_staging_dir}/${release_name}-bin
-( cd bin-release-tmp && tar czf ${artifact_dir}/${artifact_name}-bin.tar.gz apache-brooklyn-${current_version}-bin )
-( cd bin-release-tmp && zip -qr ${artifact_dir}/${artifact_name}-bin.zip apache-brooklyn-${current_version}-bin )
+( cd ${bin_staging_dir} && tar czf ${artifact_dir}/${artifact_name}-bin.tar.gz ${release_name}-bin )
+( cd ${bin_staging_dir} && zip -qr ${artifact_dir}/${artifact_name}-bin.zip ${release_name}-bin )
###############################################################################
# Signatures and checksums
# OSX doesn't have sha256sum, even if MacPorts md5sha1sum package is installed.
# Easy to fake it though.
-which sha256sum >/dev/null || alias sha256sum='shasum -a 256'
+which sha256sum >/dev/null || alias sha256sum='shasum -a 256' && shopt -s expand_aliases
( cd ${artifact_dir} &&
for a in *.tar.gz *.zip; do
@@ -217,6 +230,18 @@ which sha256sum >/dev/null || alias sha256sum='shasum -a 256'
)
###############################################################################
+
+if [ ! -z "${APACHE_DIST_SVN_DIR}" ] ; then
+ pushd ${APACHE_DIST_SVN_DIR}
+ rm -rf ${artifact_name}
+ cp -r ${artifact_dir} ${artifact_name}
+ svn add ${artifact_name}
+ svn commit --message "Add ${artifact_name} artifacts for incubator/brooklyn"
+ artifact_dir=${APACHE_DIST_SVN_DIR}/${artifact_name}
+ popd
+fi
+
+###############################################################################
# Conclusion
set +x
[07/11] incubator-brooklyn git commit: tidy up of warnings
Posted by he...@apache.org.
tidy up of warnings
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/e5841f4c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/e5841f4c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/e5841f4c
Branch: refs/heads/0.8.0-incubating
Commit: e5841f4cc676994263a2bc3ca8a3a768bbe8797b
Parents: 0d4962d
Author: Alex Heneveld <al...@cloudsoft.io>
Authored: Thu Sep 3 22:37:30 2015 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Fri Sep 4 14:33:51 2015 +0100
----------------------------------------------------------------------
.../org/apache/brooklyn/api/mgmt/rebind/Rebindable.java | 2 +-
.../java/org/apache/brooklyn/api/sensor/Enricher.java | 2 --
.../camp/spi/collection/AggregatingResourceLookup.java | 3 ++-
.../camp/spi/collection/BasicResourceLookup.java | 3 ++-
.../brooklyn/camp/brooklyn/BrooklynCampConstants.java | 1 -
.../creation/service/BrooklynServiceTypeResolver.java | 8 +-------
.../spi/creation/service/CatalogServiceTypeResolver.java | 1 +
.../spi/creation/service/ChefServiceTypeResolver.java | 1 +
.../spi/creation/service/JavaServiceTypeResolver.java | 1 +
.../org/apache/brooklyn/cli/CloudExplorerLiveTest.java | 7 +++----
.../brooklyn/rest/domain/CatalogLocationSummary.java | 2 ++
.../brooklyn/rest/domain/LocationConfigSummary.java | 4 +++-
.../org/apache/brooklyn/rest/domain/UsageStatistic.java | 11 +++++------
.../org/apache/brooklyn/rest/domain/VersionSummary.java | 1 -
.../rest/resources/AbstractBrooklynRestResource.java | 4 +---
.../apache/brooklyn/rest/resources/CatalogResource.java | 1 +
.../apache/brooklyn/rest/BrooklynRestApiLauncher.java | 2 +-
17 files changed, 25 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e5841f4c/api/src/main/java/org/apache/brooklyn/api/mgmt/rebind/Rebindable.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/brooklyn/api/mgmt/rebind/Rebindable.java b/api/src/main/java/org/apache/brooklyn/api/mgmt/rebind/Rebindable.java
index d443e3f..301e8e0 100644
--- a/api/src/main/java/org/apache/brooklyn/api/mgmt/rebind/Rebindable.java
+++ b/api/src/main/java/org/apache/brooklyn/api/mgmt/rebind/Rebindable.java
@@ -35,6 +35,6 @@ import com.google.common.annotations.Beta;
@Beta
public interface Rebindable {
- public RebindSupport getRebindSupport();
+ public RebindSupport<?> getRebindSupport();
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e5841f4c/api/src/main/java/org/apache/brooklyn/api/sensor/Enricher.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/brooklyn/api/sensor/Enricher.java b/api/src/main/java/org/apache/brooklyn/api/sensor/Enricher.java
index b81a948..aaaecf0 100644
--- a/api/src/main/java/org/apache/brooklyn/api/sensor/Enricher.java
+++ b/api/src/main/java/org/apache/brooklyn/api/sensor/Enricher.java
@@ -18,8 +18,6 @@
*/
package org.apache.brooklyn.api.sensor;
-import java.util.Map;
-
import org.apache.brooklyn.api.mgmt.rebind.RebindSupport;
import org.apache.brooklyn.api.mgmt.rebind.Rebindable;
import org.apache.brooklyn.api.mgmt.rebind.mementos.EnricherMemento;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e5841f4c/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/collection/AggregatingResourceLookup.java
----------------------------------------------------------------------
diff --git a/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/collection/AggregatingResourceLookup.java b/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/collection/AggregatingResourceLookup.java
index 700aafb..fe05a0c 100644
--- a/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/collection/AggregatingResourceLookup.java
+++ b/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/collection/AggregatingResourceLookup.java
@@ -27,6 +27,7 @@ public class AggregatingResourceLookup<T extends AbstractResource> extends Abstr
List<ResourceLookup<T>> targets = new ArrayList<ResourceLookup<T>>();
+ @SafeVarargs
public static <T extends AbstractResource> AggregatingResourceLookup<T> of(ResourceLookup<T> ...targets) {
AggregatingResourceLookup<T> result = new AggregatingResourceLookup<T>();
for (ResourceLookup<T> item: targets) result.targets.add(item);
@@ -52,5 +53,5 @@ public class AggregatingResourceLookup<T extends AbstractResource> extends Abstr
for (ResourceLookup<T> item: targets) result.addAll(item.links());
return result;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e5841f4c/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/collection/BasicResourceLookup.java
----------------------------------------------------------------------
diff --git a/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/collection/BasicResourceLookup.java b/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/collection/BasicResourceLookup.java
index 408823e..f1d3176 100644
--- a/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/collection/BasicResourceLookup.java
+++ b/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/collection/BasicResourceLookup.java
@@ -47,7 +47,7 @@ public class BasicResourceLookup<T extends AbstractResource> extends AbstractRes
links.put(item.getId(), newLink(item.getId(), item.getName()));
}
- public synchronized void addAll(T... items) {
+ public synchronized void addAll(@SuppressWarnings("unchecked") T... items) {
for (T item: items) add(item);
}
@@ -62,6 +62,7 @@ public class BasicResourceLookup<T extends AbstractResource> extends AbstractRes
return links.remove(id)!=null;
}
+ @SafeVarargs
public static <T extends AbstractResource> BasicResourceLookup<T> of(T ...items) {
BasicResourceLookup<T> result = new BasicResourceLookup<T>();
for (T item: items) result.add(item);
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e5841f4c/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/BrooklynCampConstants.java
----------------------------------------------------------------------
diff --git a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/BrooklynCampConstants.java b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/BrooklynCampConstants.java
index 515ec9f..0c27a74 100644
--- a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/BrooklynCampConstants.java
+++ b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/BrooklynCampConstants.java
@@ -24,7 +24,6 @@ import org.apache.brooklyn.camp.CampPlatform;
import org.apache.brooklyn.config.ConfigInheritance;
import org.apache.brooklyn.config.ConfigKey;
import org.apache.brooklyn.core.config.ConfigKeys;
-import org.apache.brooklyn.core.server.BrooklynServerConfig;
import com.google.common.collect.ImmutableSet;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e5841f4c/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/service/BrooklynServiceTypeResolver.java
----------------------------------------------------------------------
diff --git a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/service/BrooklynServiceTypeResolver.java b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/service/BrooklynServiceTypeResolver.java
index f4bc9aa..e0d2e9e 100644
--- a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/service/BrooklynServiceTypeResolver.java
+++ b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/service/BrooklynServiceTypeResolver.java
@@ -18,10 +18,6 @@
*/
package org.apache.brooklyn.camp.brooklyn.spi.creation.service;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Map;
-
import javax.annotation.Nullable;
import org.apache.brooklyn.api.catalog.CatalogItem;
@@ -33,19 +29,17 @@ import org.apache.brooklyn.camp.brooklyn.spi.creation.BrooklynEntityDecorationRe
import org.apache.brooklyn.camp.spi.PlatformComponentTemplate;
import org.apache.brooklyn.core.catalog.internal.CatalogUtils;
import org.apache.brooklyn.core.mgmt.persist.DeserializingClassRenamesProvider;
-import org.apache.brooklyn.util.exceptions.Exceptions;
import org.apache.brooklyn.util.text.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.base.Optional;
-
/**
* This converts {@link PlatformComponentTemplate} instances whose type is prefixed {@code brooklyn:}
* to Brooklyn {@link EntitySpec} instances.
*/
public class BrooklynServiceTypeResolver implements ServiceTypeResolver {
+ @SuppressWarnings("unused")
private static final Logger LOG = LoggerFactory.getLogger(ServiceTypeResolver.class);
public BrooklynServiceTypeResolver() {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e5841f4c/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/service/CatalogServiceTypeResolver.java
----------------------------------------------------------------------
diff --git a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/service/CatalogServiceTypeResolver.java b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/service/CatalogServiceTypeResolver.java
index 08a04e5..94aa8fc 100644
--- a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/service/CatalogServiceTypeResolver.java
+++ b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/service/CatalogServiceTypeResolver.java
@@ -40,6 +40,7 @@ import com.google.common.collect.ImmutableMap;
*/
public class CatalogServiceTypeResolver extends BrooklynServiceTypeResolver {
+ @SuppressWarnings("unused")
private static final Logger LOG = LoggerFactory.getLogger(ServiceTypeResolver.class);
// TODO currently a hardcoded list of aliases; would like that to come from mgmt somehow
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e5841f4c/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/service/ChefServiceTypeResolver.java
----------------------------------------------------------------------
diff --git a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/service/ChefServiceTypeResolver.java b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/service/ChefServiceTypeResolver.java
index c0fb5f9..b44deb7 100644
--- a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/service/ChefServiceTypeResolver.java
+++ b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/service/ChefServiceTypeResolver.java
@@ -35,6 +35,7 @@ import org.apache.brooklyn.util.text.Strings;
*/
public class ChefServiceTypeResolver extends BrooklynServiceTypeResolver {
+ @SuppressWarnings("unused")
private static final Logger LOG = LoggerFactory.getLogger(ServiceTypeResolver.class);
@Override
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e5841f4c/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/service/JavaServiceTypeResolver.java
----------------------------------------------------------------------
diff --git a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/service/JavaServiceTypeResolver.java b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/service/JavaServiceTypeResolver.java
index 55cff35..d6c52f4 100644
--- a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/service/JavaServiceTypeResolver.java
+++ b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/service/JavaServiceTypeResolver.java
@@ -29,6 +29,7 @@ import org.slf4j.LoggerFactory;
*/
public class JavaServiceTypeResolver extends BrooklynServiceTypeResolver {
+ @SuppressWarnings("unused")
private static final Logger LOG = LoggerFactory.getLogger(ServiceTypeResolver.class);
@Override
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e5841f4c/usage/cli/src/test/java/org/apache/brooklyn/cli/CloudExplorerLiveTest.java
----------------------------------------------------------------------
diff --git a/usage/cli/src/test/java/org/apache/brooklyn/cli/CloudExplorerLiveTest.java b/usage/cli/src/test/java/org/apache/brooklyn/cli/CloudExplorerLiveTest.java
index c027c83..4511d51 100644
--- a/usage/cli/src/test/java/org/apache/brooklyn/cli/CloudExplorerLiveTest.java
+++ b/usage/cli/src/test/java/org/apache/brooklyn/cli/CloudExplorerLiveTest.java
@@ -20,8 +20,6 @@ package org.apache.brooklyn.cli;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertTrue;
-import io.airlift.command.Cli;
-import io.airlift.command.ParseException;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -29,17 +27,18 @@ import java.io.InputStream;
import java.io.PrintStream;
import java.util.List;
-import org.apache.brooklyn.cli.Main;
import org.apache.brooklyn.cli.AbstractMain.BrooklynCommand;
import org.testng.Assert;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.Test;
-import org.apache.brooklyn.cli.AbstractMain.BrooklynCommand;
import com.google.common.base.Splitter;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
+import io.airlift.command.Cli;
+import io.airlift.command.ParseException;
+
public class CloudExplorerLiveTest {
private String stdout;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e5841f4c/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/CatalogLocationSummary.java
----------------------------------------------------------------------
diff --git a/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/CatalogLocationSummary.java b/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/CatalogLocationSummary.java
index c264db8..dd79fc1 100644
--- a/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/CatalogLocationSummary.java
+++ b/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/CatalogLocationSummary.java
@@ -28,6 +28,8 @@ import com.google.common.collect.ImmutableSet;
public class CatalogLocationSummary extends CatalogItemSummary {
+ private static final long serialVersionUID = 8420991584336514673L;
+
private final Set<LocationConfigSummary> config;
public CatalogLocationSummary(
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e5841f4c/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/LocationConfigSummary.java
----------------------------------------------------------------------
diff --git a/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/LocationConfigSummary.java b/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/LocationConfigSummary.java
index 2331ee7..6b76c1e 100644
--- a/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/LocationConfigSummary.java
+++ b/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/LocationConfigSummary.java
@@ -30,6 +30,8 @@ import com.google.common.collect.ImmutableMap;
public class LocationConfigSummary extends ConfigSummary {
+ private static final long serialVersionUID = 2232321501735217002L;
+
@JsonSerialize(include = Inclusion.NON_NULL)
private final Map<String, URI> links;
@@ -58,5 +60,5 @@ public class LocationConfigSummary extends ConfigSummary {
+ "name='" + getName() + '\''
+ ", type='" + getType() + '\''
+ '}';
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e5841f4c/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/UsageStatistic.java
----------------------------------------------------------------------
diff --git a/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/UsageStatistic.java b/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/UsageStatistic.java
index 258bb93..4e04613 100644
--- a/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/UsageStatistic.java
+++ b/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/UsageStatistic.java
@@ -18,16 +18,15 @@
*/
package org.apache.brooklyn.rest.domain;
-import org.codehaus.jackson.annotate.JsonProperty;
-
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableMap;
+import static com.google.common.base.Preconditions.checkNotNull;
import java.io.Serializable;
-import java.net.URI;
import java.util.Map;
-import static com.google.common.base.Preconditions.checkNotNull;
+import org.codehaus.jackson.annotate.JsonProperty;
+
+import com.google.common.base.Objects;
+import com.google.common.collect.ImmutableMap;
/**
* @author Adam Lowe
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e5841f4c/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/VersionSummary.java
----------------------------------------------------------------------
diff --git a/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/VersionSummary.java b/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/VersionSummary.java
index a6368b5..6ebf5e7 100644
--- a/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/VersionSummary.java
+++ b/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/VersionSummary.java
@@ -23,7 +23,6 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.io.Serializable;
import java.util.Collections;
import java.util.List;
-import java.util.Map;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e5841f4c/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/AbstractBrooklynRestResource.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/AbstractBrooklynRestResource.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/AbstractBrooklynRestResource.java
index 8fbaec3..9c24707 100644
--- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/AbstractBrooklynRestResource.java
+++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/AbstractBrooklynRestResource.java
@@ -22,14 +22,11 @@ import javax.annotation.Nullable;
import javax.servlet.ServletContext;
import javax.ws.rs.core.Context;
-import org.codehaus.jackson.map.ObjectMapper;
import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.entity.EntityLocal;
import org.apache.brooklyn.api.mgmt.ManagementContext;
-import org.apache.brooklyn.camp.CampPlatform;
import org.apache.brooklyn.core.config.render.RendererHints;
import org.apache.brooklyn.core.mgmt.ManagementContextInjectable;
-import org.apache.brooklyn.core.server.BrooklynServerConfig;
import org.apache.brooklyn.core.server.BrooklynServiceAttributes;
import org.apache.brooklyn.rest.util.BrooklynRestResourceUtils;
import org.apache.brooklyn.rest.util.WebResourceUtils;
@@ -37,6 +34,7 @@ import org.apache.brooklyn.rest.util.json.BrooklynJacksonJsonProvider;
import org.apache.brooklyn.util.core.task.Tasks;
import org.apache.brooklyn.util.guava.Maybe;
import org.apache.brooklyn.util.time.Duration;
+import org.codehaus.jackson.map.ObjectMapper;
public abstract class AbstractBrooklynRestResource implements ManagementContextInjectable {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e5841f4c/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/CatalogResource.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/CatalogResource.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/CatalogResource.java
index 3dc578b..d7c26df 100644
--- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/CatalogResource.java
+++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/CatalogResource.java
@@ -226,6 +226,7 @@ public class CatalogResource extends AbstractBrooklynRestResource implements Cat
@Override
public List<CatalogItemSummary> listApplications(String regex, String fragment, boolean allVersions) {
+ @SuppressWarnings("unchecked")
Predicate<CatalogItem<Application, EntitySpec<? extends Application>>> filter =
Predicates.and(
CatalogPredicates.IS_TEMPLATE,
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e5841f4c/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncher.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncher.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncher.java
index d16669c..4261471 100644
--- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncher.java
+++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncher.java
@@ -131,7 +131,7 @@ public class BrooklynRestApiLauncher {
* Runs the server with the given set of filters.
* Overrides any previously supplied set (or {@link #DEFAULT_FILTERS} which is used by default).
*/
- public BrooklynRestApiLauncher filters(Class<? extends Filter>... filters) {
+ public BrooklynRestApiLauncher filters(@SuppressWarnings("unchecked") Class<? extends Filter>... filters) {
this.filters = Lists.newArrayList(filters);
return this;
}
[02/11] incubator-brooklyn git commit: minor tweaks to doc build
process advice
Posted by he...@apache.org.
minor tweaks to doc build process advice
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/ec25e649
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/ec25e649
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/ec25e649
Branch: refs/heads/0.8.0-incubating
Commit: ec25e649830e4149aadb0c853087314c544cbd2c
Parents: 32c57ab
Author: Alex Heneveld <al...@cloudsoft.io>
Authored: Thu Sep 3 03:16:09 2015 +0100
Committer: Alex Heneveld <al...@cloudsoft.io>
Committed: Thu Sep 3 03:16:09 2015 +0100
----------------------------------------------------------------------
docs/README.md | 3 ++-
docs/_build/build.sh | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ec25e649/docs/README.md
----------------------------------------------------------------------
diff --git a/docs/README.md b/docs/README.md
index 8728afc..ade8824 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -247,7 +247,8 @@ you've done that these commands might be useful:
cd ${BROOKLYN_SITE_DIR-../../incubator-brooklyn-site-public}
svn add * --force
- svn rm $( svn status | sed -e '/^!/!d' -e 's/^!//' )
+ export DELETIONS=$( svn status | sed -e '/^!/!d' -e 's/^!//' )
+ if [ ! -z "${DELETIONS}" ] ; then svn rm ${DELETIONS} ; fi
Then check in the changes (probably picking a better message than shown here):
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ec25e649/docs/_build/build.sh
----------------------------------------------------------------------
diff --git a/docs/_build/build.sh b/docs/_build/build.sh
index 9024a6a..cb57461 100755
--- a/docs/_build/build.sh
+++ b/docs/_build/build.sh
@@ -170,7 +170,7 @@ function test_site() {
return
fi
echo "Running htmlproof on _site"
- mkdir -p target
+ mkdir -p _build/target
HTMLPROOF_LOG="_build/target/htmlproof.log"
if [ "$QUICK_HTMLPROOF" == "true" ]; then
HTMLPROOF_OPTS="$HTMLPROOF_OPTS --disable_external"