Version 1.1.0

README.md

@@ -12,7 +12,7 @@ Docker Cloud infrastructure.
 This repository contains all of the required Brooklyn entities, locations and examples.
 
 <!-- CLOCKER_VERSION_BELOW -->
-[![Build Status](https://api.travis-ci.org/brooklyncentral/clocker.svg?branch=master)](https://travis-ci.org/brooklyncentral/clocker)&nbsp;[![Latest Builds](http://img.shields.io/badge/version-1.1.0--SNAPSHOT-blue.svg?style=flat)](http://clocker-latest.s3-website-eu-west-1.amazonaws.com/)&nbsp;[![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/brooklyncentral/clocker)&nbsp;[![Docker Image](https://badge.imagelayers.io/clockercentral/clocker:1.1.0-PREVIEW.20160402.svg)](https://imagelayers.io/?images=clockercentral/clocker:1.1.0-PREVIEW.20160402)
+[![Build Status](https://api.travis-ci.org/brooklyncentral/clocker.svg?branch=master)](https://travis-ci.org/brooklyncentral/clocker)&nbsp;[![Latest Builds](http://img.shields.io/badge/version-1.2.0--SNAPSHOT-blue.svg?style=flat)](http://clocker-latest.s3-website-eu-west-1.amazonaws.com/)&nbsp;[![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/brooklyncentral/clocker)&nbsp;[![Docker Image](https://badge.imagelayers.io/clockercentral/clocker:1.1.0.svg)](https://imagelayers.io/?images=clockercentral/clocker:1.1.0)
 
 ## Getting started
 
@@ -34,12 +34,12 @@ depending on your choice of SDN provider.
 ### Using the latest Clocker release
 
 <!-- CLOCKER_VERSION_BELOW -->
-The latest version of Clocker is [1.1.0-PREVIEW.20160402](https://github.com/brooklyncentral/clocker/releases/tag/v1.1.0-PREVIEW.20160402).
+The latest version of Clocker is [1.1.0](https://github.com/brooklyncentral/clocker/releases/tag/v1.1.0).
 You can deploy your own **Docker Cloud** with a Weave SDN by running these commands with the _network_ argument
 set to `weave`, to use Project Calico as your SDN provider, change the last argument to `calico` instead:
 ```Bash
 % wget --no-check-certificate --quiet \
-    -O brooklyn-clocker-dist.tar.gz http://git.io/v2rFC
+    -O brooklyn-clocker-dist.tar.gz http://git.io/vwPri
 % tar zxf brooklyn-clocker-dist.tar.gz
 % cd brooklyn-clocker
 % ./bin/clocker.sh location network
@@ -62,7 +62,7 @@ _jclouds:softlayer:sjc01_, a group of machines as _byon:(hosts="10.1.2.3,10.1.2.
 location from your `brooklyn.properties` file as _named:alias_.
 
 For all cloud locations you must first configure the `~/.brooklyn/brooklyn.properties` file with any
-necessary credentials and security details, and select an SSH key (defaulting to `~/.ssh/id_rsa`).
+necessary credentials and security details, and select an SSH key (defaulting to `~/.ssh/id\_rsa`).
 A basic `brooklyn.properties` file should look like the following:
 
 ```properties
@@ -124,7 +124,7 @@ Build and run this version of Clocker from source as follows:
 % cd clocker
 % mvn clean install
 ...
-% tar zxf examples/target/brooklyn-clocker-dist.tar.gz
+% tar zxf dist/target/brooklyn-clocker-dist.tar.gz
 % cd brooklyn-clocker
 % ./bin/clocker.sh location network
 ...

clocker.bom

@@ -13,19 +13,20 @@
 # limitations under the License.
 
 brooklyn.catalog:
-  version: "1.1.0-PREVIEW.20160402" # CLOCKER_VERSION
+  version: "1.1.0" # CLOCKER_VERSION
 
   brooklyn.libraries:
 
-  - "http://ccweb.cloudsoftcorp.com/maven/libs-release-local/io/brooklyn/clocker/brooklyn-clocker-patches/1.1.0-PREVIEW.20160402/brooklyn-clocker-patches-1.1.0-PREVIEW.20160402.jar" # CLOCKER_VERSION
-  - "http://ccweb.cloudsoftcorp.com/maven/libs-release-local/io/brooklyn/clocker/brooklyn-clocker-docker/1.1.0-PREVIEW.20160402/brooklyn-clocker-docker-1.1.0-PREVIEW.20160402.jar" # CLOCKER_VERSION
-  - "http://ccweb.cloudsoftcorp.com/maven/libs-release-local/io/brooklyn/clocker/brooklyn-clocker-dist/1.1.0-PREVIEW.20160402/brooklyn-clocker-dist-1.1.0-PREVIEW.20160402.jar" # CLOCKER_VERSION
-  - "https://s3-eu-west-1.amazonaws.com/brooklyn-clocker/patch-softlayer-clocker-137.jar"
-  - "https://oss.sonatype.org/content/repositories/releases/io/brooklyn/networking/brooklyn-networking-portforwarding/0.8.0-incubating/brooklyn-networking-portforwarding-0.8.0-incubating.jar" # ADVANCED_NETWORKING_VERSION
-  - "https://oss.sonatype.org/content/repositories/releases/io/brooklyn/networking/brooklyn-networking-common/0.8.0-incubating/brooklyn-networking-common-0.8.0-incubating.jar" # ADVANCED_NETWORKING_VERSION
-  - "https://oss.sonatype.org/content/repositories/releases/io/brooklyn/networking/brooklyn-networking-cloudstack/0.8.0-incubating/brooklyn-networking-cloudstack-0.8.0-incubating.jar" # ADVANCED_NETWORKING_VERSION
-  - "https://repository.apache.org/service/local/repositories/releases/content/org/apache/jclouds/labs/docker/1.9.1/docker-1.9.1.jar"
-  - "https://repository.apache.org/service/local/repositories/releases/content/org/apache/jclouds/api/cloudstack/1.9.1/cloudstack-1.9.1.jar"
+  - "http://ccweb.cloudsoftcorp.com/maven/libs-release-local/io/brooklyn/clocker/brooklyn-clocker-patches/1.1.0/brooklyn-clocker-patches-1.1.0.jar" # CLOCKER_VERSION
+  - "http://ccweb.cloudsoftcorp.com/maven/libs-release-local/io/brooklyn/clocker/brooklyn-clocker-extras/1.1.0/brooklyn-clocker-extras-1.1.0.jar" # CLOCKER_VERSION
+  - "http://ccweb.cloudsoftcorp.com/maven/libs-release-local/io/brooklyn/clocker/brooklyn-clocker-docker/1.1.0/brooklyn-clocker-docker-1.1.0.jar" # CLOCKER_VERSION
+  - "http://ccweb.cloudsoftcorp.com/maven/libs-release-local/io/brooklyn/clocker/brooklyn-clocker-mesos/1.1.0/brooklyn-clocker-mesos-1.1.0.jar" # CLOCKER_VERSION
+  - "http://ccweb.cloudsoftcorp.com/maven/libs-release-local/io/brooklyn/clocker/brooklyn-clocker-dist/1.1.0/brooklyn-clocker-dist-1.1.0.jar" # CLOCKER_VERSION
+  - "https://oss.sonatype.org/content/repositories/releases/io/brooklyn/networking/brooklyn-networking-portforwarding/0.9.0/brooklyn-networking-portforwarding-0.9.0.jar" # ADVANCED_NETWORKING_VERSION
+  - "https://oss.sonatype.org/content/repositories/releases/io/brooklyn/networking/brooklyn-networking-common/0.9.0/brooklyn-networking-common-0.9.0.jar" # ADVANCED_NETWORKING_VERSION
+  - "https://oss.sonatype.org/content/repositories/releases/io/brooklyn/networking/brooklyn-networking-cloudstack/0.9.0/brooklyn-networking-cloudstack-0.9.0.jar" # ADVANCED_NETWORKING_VERSION
+  - "https://repository.apache.org/service/local/repositories/releases/content/org/apache/jclouds/labs/docker/1.9.2/docker-1.9.2.jar" # JCLOUDS_VERSION
+  - "https://repository.apache.org/service/local/repositories/releases/content/org/apache/jclouds/api/cloudstack/1.9.2/cloudstack-1.9.2.jar" # JCLOUDS_VERSION
 
   items:
 

console/pom.xml

@@ -31,7 +31,7 @@
     <parent>
         <groupId>io.brooklyn.clocker</groupId>
         <artifactId>brooklyn-clocker-parent</artifactId>
-        <version>1.1.0-PREVIEW.20160402</version>  <!-- CLOCKER_VERSION -->
+        <version>1.1.0</version>  <!-- CLOCKER_VERSION -->
         <relativePath>../pom.xml</relativePath>
     </parent>
 

dist/Dockerfile

@@ -16,7 +16,7 @@ FROM gliderlabs/alpine:3.1
 MAINTAINER [email protected]
 
 # CLOCKER_VERSION_BELOW
-LABEL version="1.1.0-PREVIEW.20160402"
+LABEL version="1.1.0"
 
 RUN apk-install openjdk7-jre-base ; \
     apk-install openjdk7-jre-lib ; \
@@ -29,7 +29,7 @@ RUN bash /tmp/certgen.sh /usr/lib/jvm/java-1.7-openjdk/jre/lib/security/cacerts
     rm -f /tmp/certgen.sh
 
 # CLOCKER_VERSION_BELOW
-RUN wget --no-check-certificate http://ccweb.cloudsoftcorp.com/maven/libs-release-local/io/brooklyn/clocker/brooklyn-clocker-dist/1.1.0-PREVIEW.20160402/brooklyn-clocker-dist-1.1.0-PREVIEW.20160402-dist.tar.gz -O /brooklyn-clocker-dist.tar.gz ; \
+RUN wget --no-check-certificate http://ccweb.cloudsoftcorp.com/maven/libs-release-local/io/brooklyn/clocker/brooklyn-clocker-dist/1.1.0/brooklyn-clocker-dist-1.1.0-dist.tar.gz -O /brooklyn-clocker-dist.tar.gz ; \
     tar zxf brooklyn-clocker-dist.tar.gz ; \
     rm -f brooklyn-clocker-dist.tar.gz
 

dist/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>brooklyn-clocker-parent</artifactId>
         <groupId>io.brooklyn.clocker</groupId>
-        <version>1.1.0-PREVIEW.20160402</version>  <!-- CLOCKER_VERSION -->
+        <version>1.1.0</version>  <!-- CLOCKER_VERSION -->
         <relativePath>../pom.xml</relativePath>
     </parent>
 

dist/src/main/assembly/conf/brooklyn/default.catalog.bom

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 brooklyn.catalog:
-  version: 1.1.0-PREVIEW.20160402 # CLOCKER_VERSION
+  version: 1.1.0 # CLOCKER_VERSION
   items:
 
   # load everything in the classpath with a @Catalog annotation

dist/src/test/resources/quality_assurance/apps/nodejs_test.yaml

@@ -18,7 +18,7 @@ brooklyn.catalog:
                 #TEST 1- Ensure that the nodejs-demo works as expected
                 - type: org.apache.brooklyn.test.framework.TestCase
                   brooklyn.children:
-                    - type: "nodejs-demo-application:1.1.0-SNAPSHOT" # CLOCKER_VERSION
+                    - type: "nodejs-demo-application:1.1.0" # CLOCKER_VERSION
                       id: nodejs-demo
                       brooklyn.children:
                     - type: org.apache.brooklyn.test.framework.TestSensor

dist/src/test/resources/quality_assurance/combined_test.yaml

@@ -1,26 +1,26 @@
 brooklyn.catalog:
   id: test
-  version: 1.1.0-SNAPSHOT # CLOCKER_VERSION
+  version: 1.1.0 # CLOCKER_VERSION
   name: Test
   itemType: template
   item:
     services:
-      - type: "TestApp:1.1.0-SNAPSHOT" # CLOCKER_VERSION
+      - type: "TestApp:1.1.0" # CLOCKER_VERSION
         brooklyn.config:
           appToTest:
             $brooklyn:entitySpec:
-              - type: "docker-cloud-single:1.1.0-SNAPSHOT" # CLOCKER_VERSION
+              - type: "docker-cloud-single:1.1.0" # CLOCKER_VERSION
                 id: infrastructure1
                 brooklyn.config:
                   docker.host.cluster.initial.size: 2
                   docker.registry.start: false
                   docker.version: 1.10.3 # DOCKER_VERSION
                   entity.dynamicLocation.name: ""
-      - type: "TestApp:1.1.0-SNAPSHOT" # CLOCKER_VERSION
+      - type: "TestApp:1.1.0" # CLOCKER_VERSION
         brooklyn.config:
           appToTest:
             $brooklyn:entitySpec:
-              - type: "docker-cloud-calico:1.1.0-SNAPSHOT" # CLOCKER_VERSION
+              - type: "docker-cloud-calico:1.1.0" # CLOCKER_VERSION
                 id: infrastructure2
                 brooklyn.config:
                   docker.host.cluster.initial.size: 2

dist/src/test/resources/quality_assurance/deploy_sdn_app_test.yaml

@@ -1,6 +1,6 @@
 brooklyn.catalog:
   id: sdn-test
-  version: 1.1.0-SNAPSHOT # CLOCKER_VERSION
+  version: 1.1.0 # CLOCKER_VERSION
   name: SDN Test
   itemType: template
   item:
@@ -10,7 +10,7 @@ brooklyn.catalog:
           infrastructure.deployment.location.sensor: entity.dynamicLocation
           infrastructure.deployment.spec:
             $brooklyn:entitySpec:
-              - type: "docker-cloud-calico:1.1.0-SNAPSHOT" # CLOCKER_VERSION
+              - type: "docker-cloud-calico:1.1.0" # CLOCKER_VERSION
                 id: infrastructure
                 brooklyn.config:
                   entity.dynamicLocation.name: my-docker-cloud

dist/src/test/resources/quality_assurance/deploy_simple_app_test.yaml

@@ -1,6 +1,6 @@
 brooklyn.catalog:
   id: simple-test
-  version: 1.1.0-SNAPSHOT # CLOCKER_VERSION
+  version: 1.1.0 # CLOCKER_VERSION
   name: Simple Test
   itemType: template
   item:

dist/src/test/resources/quality_assurance/locations/test_location_aws_cali.yaml

@@ -1,6 +1,6 @@
 brooklyn.catalog:
   id: cal
-  version: 1.1.0-SNAPSHOT # CLOCKER_VERSION
+  version: 1.1.0 # CLOCKER_VERSION
   itemType: location
   name: cal
   item:

dist/src/test/resources/quality_assurance/locations/test_location_softlayer.yaml

@@ -1,6 +1,6 @@
 brooklyn.catalog:
   id: soft
-  version: 1.1.0-SNAPSHOT # CLOCKER_VERSION
+  version: 1.1.0 # CLOCKER_VERSION
   itemType: location
   name: soft
   item:

dist/src/test/resources/quality_assurance/test_app.yaml

@@ -1,12 +1,12 @@
 brooklyn.catalog:
   id: simple-test-app
-  version: 1.1.0-SNAPSHOT # CLOCKER_VERSION
+  version: 1.1.0 # CLOCKER_VERSION
   itemType: template
   name: Simple Test App
   license: Apache-2.0
   item:
     services:
-      - type: "docker-cloud-single:1.1.0-SNAPSHOT" # CLOCKER_VERSION
+      - type: "docker-cloud-single:1.1.0" # CLOCKER_VERSION
         id: infrastructure1
         brooklyn.config:
           entity.dynamicLocation.name: my-docker-cloud

dist/src/test/resources/quality_assurance/very_basic_test.yaml

@@ -1,6 +1,6 @@
 brooklyn.catalog:
   id: simple-test
-  version: 1.1.0-SNAPSHOT # CLOCKER_VERSION
+  version: 1.1.0 # CLOCKER_VERSION
   name: Simple Test
   itemType: template
   item:

dist/src/test/resources/test_location.yaml

@@ -1,6 +1,6 @@
 brooklyn.catalog:
   id: cal1
-  version: 1.1.0-SNAPSHOT # CLOCKER_VERSION
+  version: 1.1.0 # CLOCKER_VERSION
   itemType: location
   name: cal1
   item:

docker/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>brooklyn-clocker-parent</artifactId>
         <groupId>io.brooklyn.clocker</groupId>
-        <version>1.1.0-PREVIEW.20160402</version>  <!-- CLOCKER_VERSION -->
+        <version>1.1.0</version>  <!-- CLOCKER_VERSION -->
         <relativePath>../pom.xml</relativePath>
     </parent>
 

docker/src/main/resources/clocker/docker/entity/container/SshdDockerfile

@@ -18,7 +18,7 @@ FROM ${fullyQualifiedImageName}
 MAINTAINER Cloudsoft "[email protected]"
 
 # CLOCKER_VERSION_BELOW
-LABEL version="1.1.0-PREVIEW.20160402"
+LABEL version="1.1.0"
 
 # setup locale
 RUN type locale-gen ; if [ "$?" -eq "0" ] ; then locale-gen en_US.UTF-8 ; fi

docker/src/main/resources/clocker/docker/entity/container/centos/Dockerfile

@@ -18,4 +18,4 @@ FROM centos:6.6
 MAINTAINER Cloudsoft "[email protected]"
 
 # CLOCKER_VERSION_BELOW
-LABEL version="1.1.0-PREVIEW.20160402"
+LABEL version="1.1.0"

docker/src/main/resources/clocker/docker/entity/container/coreos/Dockerfile

@@ -18,7 +18,7 @@ FROM ubuntu:12.04
 MAINTAINER Cloudsoft "[email protected]"
 
 # CLOCKER_VERSION_BELOW
-LABEL version="1.1.0-PREVIEW.20160402"
+LABEL version="1.1.0"
 
 # make sure the package repository is up to date
 RUN ( echo "deb http://archive.ubuntu.com/ubuntu precise main universe" ; echo "deb http://archive.ubuntu.com/ubuntu precise-updates main universe" ) > /etc/apt/sources.list

docker/src/main/resources/clocker/docker/entity/container/ubuntu/Dockerfile

@@ -18,7 +18,7 @@ FROM ubuntu:14.04
 MAINTAINER Cloudsoft "[email protected]"
 
 # CLOCKER_VERSION_BELOW
-LABEL version="1.1.0-PREVIEW.20160402"
+LABEL version="1.1.0"
 
 # Make sure the package repository is up to date
 RUN ( echo "deb http://archive.ubuntu.com/ubuntu trusty main universe" ; echo "deb http://archive.ubuntu.com/ubuntu trusty-updates main universe" ) > /etc/apt/sources.list

docker/src/main/resources/clocker/docker/entity/container/ubuntu/NetworkingDockerfile

@@ -18,7 +18,7 @@ FROM ubuntu:14.04
 MAINTAINER Cloudsoft "[email protected]"
 
 # CLOCKER_VERSION_BELOW
-LABEL version="1.1.0-PREVIEW.20160402"
+LABEL version="1.1.0"
 
 # make sure the package repository is up to date
 RUN ( echo "deb http://archive.ubuntu.com/ubuntu trusty main universe" ; echo "deb http://archive.ubuntu.com/ubuntu trusty-updates main universe" ) > /etc/apt/sources.list

docker/src/main/resources/clocker/docker/entity/container/ubuntu/UsesJavaDockerfile

@@ -18,7 +18,7 @@ FROM ubuntu:14.04
 MAINTAINER Cloudsoft "[email protected]"
 
 # CLOCKER_VERSION_BELOW
-LABEL version="1.1.0-PREVIEW.20160402"
+LABEL version="1.1.0"
 
 # make sure the package repository is up to date
 RUN ( echo "deb http://archive.ubuntu.com/ubuntu trusty main universe" ; echo "deb http://archive.ubuntu.com/ubuntu trusty-updates main universe" ) > /etc/apt/sources.list

extras/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>brooklyn-clocker-parent</artifactId>
         <groupId>io.brooklyn.clocker</groupId>
-        <version>1.1.0-SNAPSHOT</version>  <!-- CLOCKER_VERSION -->
+        <version>1.1.0</version>  <!-- CLOCKER_VERSION -->
         <relativePath>../pom.xml</relativePath>
     </parent>
 

jsgui/pom.xml

@@ -15,7 +15,7 @@
     <parent>
         <groupId>io.brooklyn.clocker</groupId>
         <artifactId>brooklyn-clocker-parent</artifactId>
-        <version>1.1.0-PREVIEW.20160402</version> <!-- CLOCKER_VERSION -->
+        <version>1.1.0</version> <!-- CLOCKER_VERSION -->
         <relativePath>../pom.xml</relativePath>
     </parent>
 

jsgui/src/main/webapp/assets/tpl/help/page.html

@@ -32,7 +32,7 @@ <h3>Clocker Help</h3>
     using Docker and Marathon in the Cloud.
     </p>
     <p>
-    You are currently using Clocker Version 1.1.0-PREVIEW.20160402 <!-- CLOCKER_VERSION -->
+    You are currently using Clocker Version 1.1.0 <!-- CLOCKER_VERSION -->
     </p>
     <hr/>
     <h3>References</h3>

jsgui/src/main/webapp/index.html

@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!-- github GIT_SHA_1 -->
-<!-- clocker 1.1.0-PREVIEW.20160402 --> <!-- CLOCKER_VERSION -->
+<!-- clocker 1.1.0 --> <!-- CLOCKER_VERSION -->
 <!-- brooklyn 0.9.0 --> <!-- BROOKLYN_VERSION -->
 <!-- advanced-networking 0.9.0 --> <!-- ADVANCED_NETWORKING_VERSION -->
 <!-- jclouds 1.9.2 --> <!-- JCLOUDS_VERSION -->
 <html>
 <head>
     <meta charset='utf-8'/>
-    <title>Clocker 1.1.0-PREVIEW.20160402</title><!-- CLOCKER_VERSION -->
+    <title>Clocker 1.1.0</title><!-- CLOCKER_VERSION -->
 
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">

mesos/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>brooklyn-clocker-parent</artifactId>
         <groupId>io.brooklyn.clocker</groupId>
-        <version>1.1.0-PREVIEW.20160402</version>  <!-- CLOCKER_VERSION -->
+        <version>1.1.0</version>  <!-- CLOCKER_VERSION -->
         <relativePath>../pom.xml</relativePath>
     </parent>
 

patches/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>brooklyn-clocker-parent</artifactId>
         <groupId>io.brooklyn.clocker</groupId>
-        <version>1.1.0-PREVIEW.20160402</version>  <!-- CLOCKER_VERSION -->
+        <version>1.1.0</version>  <!-- CLOCKER_VERSION -->
         <relativePath>../pom.xml</relativePath>
     </parent>
 

pom.xml

@@ -34,7 +34,7 @@
 
     <groupId>io.brooklyn.clocker</groupId>
     <artifactId>brooklyn-clocker-parent</artifactId>
-    <version>1.1.0-PREVIEW.20160402</version>  <!-- CLOCKER_VERSION -->
+    <version>1.1.0</version>  <!-- CLOCKER_VERSION -->
     <packaging>pom</packaging>
     <name>Clocker Project (Parent)</name>
     <description>