Set version to 1.1.0-SNAPSHOT
diff --git a/cli/README.md b/cli/README.md
index 762b612..da996a2 100644
--- a/cli/README.md
+++ b/cli/README.md
@@ -106,7 +106,7 @@
<artifactId>brooklyn-client-cli</artifactId>
<classifier>bin</classifier>
<type>zip</type>
-<version>1.0.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+<version>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
```
Most of the work is delegated to the `release/build.sh` script;
diff --git a/cli/README.md.bak b/cli/README.md.bak
new file mode 100644
index 0000000..da996a2
--- /dev/null
+++ b/cli/README.md.bak
@@ -0,0 +1,138 @@
+
+# [](http://brooklyn.apache.org/)
+
+### Apache Brooklyn Client CLI
+
+A command line client for [Apache Brooklyn](https://brooklyn.apache.org).
+
+## Toolchain
+
+The CLI tool is written in Go and should be obtained and built as a standard Go project.
+You will need the following tools to build it:
+
+- Go (version 1.6.1 or higher), with full cross-compiler support:
+the standard [binary packages](https://golang.org/dl) include this,
+or you can use your favorite package managers (e.g. `brew install go --with-cc-all`).
+
+Optional:
+- Maven (used by the Brooklyn build process)
+
+- Maven (see note below on the Brooklyn build process)
+
+
+## Workspace Setup
+
+Go is very particular about the layout of a source tree and the source repository,
+as it relies on this in the naming of packages.
+
+If you're familiar with Go and just want to develop the `br` tool itself you may simply work in your usual `GOPATH`,
+using `go get github.com/apache/brooklyn-client/cli/br` and adding your own fork as a remote.
+
+`br` is built just like any other Go project. Dependencies are managed through [dep](https://github.com/golang/dep).
+
+If you're new to Go and you want to work on the CLI alongside non-Go components in Apache Brooklyn,
+then the common Go setup -- where code lives under the `GOPATH` -- may be tedious to work with.
+A good pattern is to have the requisite `GOPATH` entry linking to the `brooklyn-client` project
+elsewhere on disk, so you have just one copy in the usual space and there is no need to touch the `GOPATH` thereafter.
+This is the recommended default described by the instructions below.
+
+First ensure that a `GOPATH` is set; this is where Go will store its files.
+`~/go` is the default, and `~/.go` is acceptable also. For example:
+
+```bash
+export GOPATH=$HOME/go
+```
+
+These instructions now assume that you have `brooklyn-client` checked out and are
+in the `cli` subdirectory, where this file resides.
+Tell Go to use this checked-out project by linking to it under `GOPATH`:
+
+```bash
+rm -rf $GOPATH/src/github.com/apache/brooklyn-client
+cd ..
+ln -s `pwd` $GOPATH/src/github.com/apache/brooklyn-client
+cd cli
+```
+
+
+## Compiling the code with Go for development purposes
+
+Just use the regular Go build commands:
+
+```bash
+go build -o target/br ./br
+```
+
+The binary is now ready to use in `target/br`.
+
+
+## Testing
+
+The code includes a test script in the [test](test) directory. This deploys a Tomcat server on a location of your choice
+and runs a number of tests against it, to verify that the br commands perform as expected. To use this you must edit
+the file "test_app.yaml" to change the location to your own value, and then invoke the test script like the following,
+where the username and password need only be supplied if Brooklyn requires them:
+
+```bash
+sh test.sh http://your-brooklyn-host:8081 myuser mypassword
+```
+
+Note, the tests are not yet comprehensive, and contributions are welcome.
+
+
+## Building the code as part of the Brooklyn build process
+
+For consistency with the other sub-projects of the overall [Brooklyn](https://github.com/apache/brooklyn) build, Maven
+is used to perform the build when brooklyn-client is built as one of the sub-modules of Brooklyn, cross-compiling the code for a number of platform-architecture combinations.
+
+Invoke the build script via Maven with one of
+
+ - ```mvn clean install``` build for all supported platforms
+ - ```mvn -Dtarget=native clean install``` build for the current platform
+ - ```mvn -Dtarget=cross -Dos=OS -Darch=ARCH clean install``` build for platform with operating system OS and architecture ARCH
+
+*NOTE* This does *not* build the code into your usual GOPATH. To allow the project to be checked out along with the
+other Brooklyn submodules and built using Maven, without any special treatment to install it into a separate GOPATH
+location, the Maven build makes no assumption about the location of the project root directory. Instead, the Maven
+`target` directory is used as the GOPATH, and a soft link is created as `target/src/github.com/apache/brooklyn-cli` to
+the code in the root directory.
+
+This builds the requested binaries into the `target/` directory, each in its own subdirectory with a name that includes
+the platform/architecture details, e.g. `bin/linux.386/br`. The build installs a maven artifact to the maven repository,
+consisting of a zip file containing all the binaries. This artifact can be referenced in a POM as
+
+```xml
+<groupId>org.apache.brooklyn</groupId>
+<artifactId>brooklyn-client-cli</artifactId>
+<classifier>bin</classifier>
+<type>zip</type>
+<version>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+```
+
+Most of the work is delegated to the `release/build.sh` script;
+it is not normally necessary to use this, but if you need to know more,
+try `release/build.sh -h` for more information.
+
+
+## Usage
+
+See instructions in the included [Runtime README](release/files/README) file.
+
+
+----
+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.
diff --git a/cli/app/app.go b/cli/app/app.go
index 4767f45..7ace04a 100644
--- a/cli/app/app.go
+++ b/cli/app/app.go
@@ -38,7 +38,7 @@
Name: os.Args[0],
HelpName: os.Args[0],
Usage: "A Brooklyn command line client application",
- Version: "1.0.0-SNAPSHOT", // BROOKLYN_VERSION
+ Version: "1.1.0-SNAPSHOT", // BROOKLYN_VERSION
}
func NewApp(baseName string, cmdRunner command_runner.Runner, metadatas ...command_metadata.CommandMetadata) (app *cli.App) {
diff --git a/cli/app/app.go.bak b/cli/app/app.go.bak
new file mode 100644
index 0000000..7ace04a
--- /dev/null
+++ b/cli/app/app.go.bak
@@ -0,0 +1,185 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package app
+
+import (
+ "github.com/apache/brooklyn-client/cli/command_metadata"
+ "github.com/apache/brooklyn-client/cli/command_runner"
+ "github.com/apache/brooklyn-client/cli/error_handler"
+ "github.com/urfave/cli"
+ "os"
+ "strings"
+)
+
+type configDefaults struct {
+ Name string
+ HelpName string
+ Usage string
+ Version string
+}
+
+var appConfig = configDefaults{
+ Name: os.Args[0],
+ HelpName: os.Args[0],
+ Usage: "A Brooklyn command line client application",
+ Version: "1.1.0-SNAPSHOT", // BROOKLYN_VERSION
+}
+
+func NewApp(baseName string, cmdRunner command_runner.Runner, metadatas ...command_metadata.CommandMetadata) (app *cli.App) {
+
+ cli.AppHelpTemplate = appHelpTemplate()
+ cli.CommandHelpTemplate = commandHelpTemplate()
+ app = cli.NewApp()
+ app.Name = appConfig.Name
+ app.HelpName = appConfig.HelpName
+ app.Usage = appConfig.Usage
+ app.Version = appConfig.Version
+
+ app.Flags = []cli.Flag{
+ cli.BoolFlag{
+ Name: "skipSslChecks",
+ Usage: "Skip verification of server's certificate chain and hostname (for use with self-signed certs)",
+ },
+ cli.StringFlag{
+ Name: "json, j",
+ Usage: "Render value as json with json path selector. (Experimental, not supported on all commands at present) ",
+ },
+ cli.BoolFlag{
+ Name: "raw-output, r",
+ Usage: "Used with --json; if result is a string, write it without quotes",
+ },
+ cli.BoolFlag{
+ Name: "verbose",
+ Usage: "Print HTTP requests and responses",
+ },
+ cli.BoolFlag{
+ Name: "vverbose",
+ Usage: "Print HTTP requests and responses and include body data",
+ },
+ }
+
+ app.Commands = []cli.Command{}
+
+ for _, metadata := range metadatas {
+ primaryCommand := getCommand(baseName, metadata, cmdRunner)
+ app.Commands = append(app.Commands, primaryCommand)
+ }
+ return
+}
+
+func getCommand(baseName string, metadata command_metadata.CommandMetadata, runner command_runner.Runner) cli.Command {
+ command := cli.Command{
+ Name: metadata.Name,
+ Aliases: metadata.Aliases,
+ ShortName: metadata.ShortName,
+ Description: metadata.Description,
+ Usage: strings.Replace(metadata.Usage, "BROOKLYN_NAME", baseName, -1),
+ Action: func(context *cli.Context) {
+ err := runner.RunCmdByName(metadata.Name, context)
+ if err != nil {
+ error_handler.ErrorExit(err)
+ }
+ },
+ Flags: metadata.Flags,
+ SkipFlagParsing: metadata.SkipFlagParsing,
+ }
+
+ if nil != metadata.Operands {
+ command.Subcommands = make([]cli.Command, 0)
+ for _, operand := range metadata.Operands {
+ command.Subcommands = append(command.Subcommands, cli.Command{
+ Name: operand.Name,
+ Aliases: operand.Aliases,
+ ShortName: operand.ShortName,
+ Description: operand.Description,
+ Usage: strings.Replace(operand.Usage, "BROOKLYN_NAME", baseName, -1),
+ Flags: operand.Flags,
+ SkipFlagParsing: operand.SkipFlagParsing,
+ Action: subCommandAction(command.Name, operand.Name, runner),
+ })
+ command.Usage = strings.Join([]string{
+ command.Usage, "\n... ", operand.Usage, "\t", operand.Description,
+ }, "")
+ }
+ }
+
+ return command
+}
+
+func subCommandAction(command string, operand string, runner command_runner.Runner) func(context *cli.Context) {
+ return func(context *cli.Context) {
+ err := runner.RunSubCmdByName(command, operand, context)
+ if err != nil {
+ error_handler.ErrorExit(err)
+ }
+ }
+}
+
+func appHelpTemplate() string {
+ return `NAME:
+ {{.Name}} - {{.Usage}}
+USAGE:
+ {{.Name}} {{if .Flags}}[global options] {{end}}command{{if .Flags}} [command options]{{end}} [arguments...]
+
+VERSION:
+ {{.Version}}{{if or .Author .Email}}
+
+AUTHOR:{{if .Author}}
+ {{.Author}}{{if .Email}} - <{{.Email}}>{{end}}{{else}}
+ {{.Email}}{{end}}{{end}}
+
+
+SCOPES:
+ Many commands require a "scope" expression to indicate the target on which they operate. The scope expressions are
+ as follows (values in brackets are aliases for the scope):
+ - application APP-ID (app, a) Selects and application, e.g. "br app myapp"
+ - entity ENT-ID (ent, e) Selects an entity within an application scope, e.g. "br app myapp ent myserver"
+ - effector EFF-ID (eff, f) Selects an effector of an entity or application, e.g. "br a myapp e myserver eff xyz"
+ - config CONF-KEY (conf, con, c) Selects a configuration key of an entity e.g. "br a myapp e myserver config jmx.agent.mode"
+ - activity ACT-ID (act, v) Selects an activity of an entity e.g. "br a myapp e myserver act iHG7sq1"
+
+
+COMMANDS:
+
+ Commands whose description begins with a "*" character are particularly experimental and likely to change in upcoming
+ releases. If not otherwise specified, "SCOPE" below means application or entity scope. If an entity scope is not
+ specified, the application entity is used as a default.
+
+ {{range .Commands}}{{.Name}}{{with .ShortName}}, {{.}}{{end}}{{ "\t" }}{{.Description}}
+ {{end}}{{if .Flags}}
+GLOBAL OPTIONS:
+ {{range .Flags}}{{.}}
+ {{end}}{{end}}
+`
+}
+
+func commandHelpTemplate() string {
+ return `NAME:
+ {{.Name}} - {{.Description}}
+{{with .ShortName}}
+ALIAS:
+ {{.}}
+{{end}}
+USAGE:
+ {{.Usage}}{{with .Flags}}
+OPTIONS:
+{{range .}} {{.}}
+{{end}}{{else}}
+{{end}}`
+}
diff --git a/cli/pom.xml b/cli/pom.xml
index d58e96e..e57f846 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-client</artifactId>
- <version>1.0.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/cli/pom.xml.bak b/cli/pom.xml.bak
new file mode 100644
index 0000000..e57f846
--- /dev/null
+++ b/cli/pom.xml.bak
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<project
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.brooklyn</groupId>
+ <artifactId>brooklyn-client</artifactId>
+ <version>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <packaging>pom</packaging>
+
+ <artifactId>brooklyn-client-cli</artifactId>
+ <name>Brooklyn Client Command Line Interface</name>
+ <description>
+ A command line client for Apache Brooklyn
+ </description>
+
+
+ <!--
+
+ Run as one of:
+
+ mvn -Dtarget=native clean install build for local platform
+ mvn -Dtarget=all clean install build for all supported platforms
+ mvn -Dtarget=cross -Dos=OS -Darch=ARCH clean install build for platform with operating system OS and architecture ARCH
+
+ -->
+
+ <properties>
+ <maven.antrun.plugin.version>1.8</maven.antrun.plugin.version>
+ <maven.assembly.plugin.version>2.6</maven.assembly.plugin.version>
+ <target>all</target>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>process-build-all</id>
+ <phase>compile</phase>
+ <configuration>
+ <target>
+ <ant target="${target}"/>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+
+ </executions>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>release/assembly.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes combine.children="append">
+ <exclude>vendor/**</exclude>
+ <exclude>Gopkg.*</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+
+ </plugins>
+
+ </build>
+
+</project>
diff --git a/java/pom.xml b/java/pom.xml
index 5e5aaa8..bb08eda 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -29,7 +29,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-client</artifactId>
- <version>1.0.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/java/pom.xml.bak b/java/pom.xml.bak
new file mode 100644
index 0000000..bb08eda
--- /dev/null
+++ b/java/pom.xml.bak
@@ -0,0 +1,704 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>brooklyn-rest-client</artifactId>
+ <packaging>jar</packaging>
+ <name>Brooklyn REST java Client</name>
+ <description>
+ Client library for Brooklyn REST interface
+ </description>
+
+ <parent>
+ <groupId>org.apache.brooklyn</groupId>
+ <artifactId>brooklyn-client</artifactId>
+ <version>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <properties>
+ <resteasy.version>3.6.2.Final</resteasy.version>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.brooklyn</groupId>
+ <artifactId>brooklyn-rest-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.brooklyn</groupId>
+ <artifactId>brooklyn-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-jaxrs</artifactId>
+ <version>${resteasy.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-jackson2-provider</artifactId>
+ <version>${resteasy.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.brooklyn</groupId>
+ <artifactId>brooklyn-utils-common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.brooklyn</groupId>
+ <artifactId>brooklyn-core</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.brooklyn</groupId>
+ <artifactId>brooklyn-core</artifactId>
+ <version>${project.version}</version>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.brooklyn</groupId>
+ <artifactId>brooklyn-rest-server</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.brooklyn</groupId>
+ <artifactId>brooklyn-rest-resources</artifactId>
+ <version>${project.version}</version>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.brooklyn</groupId>
+ <artifactId>brooklyn-rest-server</artifactId>
+ <version>${project.version}</version>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.brooklyn</groupId>
+ <artifactId>brooklyn-test-support</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.google.mockwebserver</groupId>
+ <artifactId>mockwebserver</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Import-Package>*,org.jboss.resteasy.client.core.marshallers</Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>Documentation</id>
+ <reporting>
+ <excludeDefaults>true</excludeDefaults>
+ <plugins>
+ <plugin>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.4</version>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>index</report>
+ <report>modules</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.8</version>
+ <configuration>
+ <links>
+ <link>http://download.oracle.com/javaee/6/api</link>
+ </links>
+ <keywords>true</keywords>
+ <author>false</author>
+ <quiet>true</quiet>
+ <aggregate>false</aggregate>
+ <detectLinks />
+ <tags>
+ <tag>
+ <name>todo</name>
+ <placement>a</placement>
+ <head>To-do:</head>
+ </tag>
+ </tags>
+ </configuration>
+ <reportSets>
+ <reportSet>
+ <id>javadoc</id>
+ <reports>
+ <report>javadoc</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ </plugins>
+ </reporting>
+ </profile>
+ <profile>
+ <id>Bundle</id>
+ <activation>
+ <file>
+ <!-- NB - this is all the leaf projects, including logback-* (with no src);
+ the archetype project neatly ignores this however -->
+ <exists>${basedir}/src</exists>
+ </file>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <!-- configure plugin to generate MANIFEST.MF
+ adapted from http://blog.knowhowlab.org/2010/06/osgi-tutorial-from-project-structure-to.html -->
+ <executions>
+ <execution>
+ <id>bundle-manifest</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <supportedProjectTypes>
+ <supportedProjectType>jar</supportedProjectType>
+ </supportedProjectTypes>
+ <instructions>
+ <!-- OSGi specific instruction -->
+ <!--
+ By default packages containing impl and internal
+ are not included in the export list. Setting an
+ explicit wildcard will include all packages
+ regardless of name.
+ In time we should minimize our export lists to
+ what is really needed.
+ -->
+ <Export-Package>brooklyn.*,org.apache.brooklyn.*</Export-Package>
+ <Implementation-SHA-1>${buildNumber}</Implementation-SHA-1>
+ <Implementation-Branch>${scmBranch}</Implementation-Branch>
+ </instructions>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile> ${project.build.outputDirectory}/META-INF/MANIFEST.MF </manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>Tests</id>
+ <activation>
+ <file> <exists>${basedir}/src/test</exists> </file>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <properties>
+ <property>
+ <name>listener</name>
+ <value>org.apache.brooklyn.test.support.LoggingVerboseReporter,org.apache.brooklyn.test.support.BrooklynLeakListener,org.apache.brooklyn.test.support.PlatformTestSelectorListener</value>
+ </property>
+ </properties>
+ <enableAssertions>true</enableAssertions>
+ <groups>${includedTestGroups}</groups>
+ <excludedGroups>${excludedTestGroups}</excludedGroups>
+ <testFailureIgnore>false</testFailureIgnore>
+ <systemPropertyVariables>
+ <verbose>-1</verbose>
+ <net.sourceforge.cobertura.datafile>${project.build.directory}/cobertura/cobertura.ser</net.sourceforge.cobertura.datafile>
+ <cobertura.user.java.nio>false</cobertura.user.java.nio>
+ </systemPropertyVariables>
+ <printSummary>true</printSummary>
+ <useSystemClassLoader>false</useSystemClassLoader>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <inherited>true</inherited>
+ <executions>
+ <execution>
+ <id>test-jar-creation</id>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ <configuration>
+ <forceCreation>true</forceCreation>
+ <archive combine.self="override" />
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>Integration</id>
+ <properties>
+ <includedTestGroups>Integration</includedTestGroups>
+ <excludedTestGroups>Acceptance,Live,WIP,Broken</excludedTestGroups>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <inherited>true</inherited>
+ <executions>
+ <execution>
+ <id>run-tests</id>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <phase>integration-test</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>Acceptance</id>
+ <properties>
+ <includedTestGroups>Acceptance</includedTestGroups>
+ <excludedTestGroups>Integration,Live,WIP,Broken</excludedTestGroups>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <inherited>true</inherited>
+ <executions>
+ <execution>
+ <id>run-tests</id>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <phase>integration-test</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>Live</id>
+ <properties>
+ <includedTestGroups>Live</includedTestGroups>
+ <excludedTestGroups>Acceptance,WIP,Broken</excludedTestGroups>
+ </properties>
+ </profile>
+
+ <profile>
+ <id>Live-sanity</id>
+ <properties>
+ <includedTestGroups>Live-sanity</includedTestGroups>
+ <excludedTestGroups>Acceptance,WIP,Broken</excludedTestGroups>
+ </properties>
+ </profile>
+
+ <profile>
+ <id>CI</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <configuration>
+ <xmlOutput>true</xmlOutput>
+ <xmlOutputDirectory>target/site</xmlOutputDirectory>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>findbugs</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <version>2.5</version>
+ <inherited>true</inherited>
+ <configuration>
+ <failOnViolation>false</failOnViolation>
+ <linkXref>true</linkXref>
+ <sourceEncoding>${project.build.sourceEncoding}</sourceEncoding>
+ <minimumTokens>100</minimumTokens>
+ <targetJdk>${java.version}</targetJdk>
+ <excludes>
+ <exclude>**/*Test.java</exclude>
+ <exclude>**/tests/**/*.java</exclude>
+ <!-- add any more generated source code directories here -->
+ </excludes>
+ <excludeRoots>
+ <excludeRoot>
+ ${pom.basedir}/target/generated-sources/groovy-stubs/main
+ </excludeRoot>
+ </excludeRoots>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>check</goal>
+ <goal>cpd-check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>Coverage</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ <version>${cobertura.plugin.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <inherited>true</inherited>
+ <executions>
+ <execution>
+ <id>run-tests</id>
+ </execution>
+ <execution>
+ <id>instrument classes</id>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <phase>process-test-classes</phase>
+ <configuration>
+ <target>
+ <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath" />
+ <taskdef resource="tasks.properties" classpathref="maven.plugin.classpath" />
+ <if>
+ <available property="gogocobertura" file="target/test-classes" />
+ <then>
+ <echo message="INSTRUMENTING CLASSES FOR COBERTURA" />
+ <!-- Ensure any and all bits of our project are copied in first -->
+ <copy todir="target/cobertura/coverage-classes">
+ <fileset erroronmissingdir="false" dir="target/classes" />
+ </copy>
+ <cobertura-instrument datafile="target/cobertura/cobertura.ser" todir="target/test-classes">
+ <fileset erroronmissingdir="false" dir="target/classes">
+ <include name="brooklyn/**/*.class" />
+ <exclude name="brooklyn/**/*Test.class" />
+ </fileset>
+ <fileset erroronmissingdir="false" dir="target/cobertura/dependency-classes">
+ <include name="brooklyn/**/*.class" />
+ <exclude name="brooklyn/**/*Test.class" />
+ </fileset>
+ </cobertura-instrument>
+ </then>
+ </if>
+ </target>
+ </configuration>
+ </execution>
+ <execution>
+ <id>coverage report</id>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <phase>post-integration-test</phase>
+ <configuration>
+ <target>
+ <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath" />
+ <taskdef resource="tasks.properties" classpathref="maven.plugin.classpath" />
+ <if>
+ <available property="gogocobertura" file="target/cobertura/cobertura.ser" />
+ <then>
+ <echo message="GENERATING COBERTURA COVERAGE REPORT" />
+ <cobertura-report format="xml" destdir="target/site/cobertura" datafile="target/cobertura/cobertura.ser">
+ <fileset erroronmissingdir="false" dir="src/main/java" />
+ <fileset erroronmissingdir="false" dir="target/cobertura/dependency-sources" />
+ </cobertura-report>
+ <cobertura-report format="html" destdir="target/site/cobertura" datafile="target/cobertura/cobertura.ser">
+ <fileset erroronmissingdir="false" dir="src/main/java" />
+ <fileset erroronmissingdir="false" dir="target/cobertura/dependency-sources" />
+ </cobertura-report>
+ </then>
+ </if>
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>ant-contrib</groupId>
+ <artifactId>ant-contrib</artifactId>
+ <version>1.0b3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-launcher</artifactId>
+ <version>${ant.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>${ant.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>${testng.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ <version>${cobertura.plugin.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack-coverage-sources</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+ <classifier>sources</classifier>
+ <includeScope>compile</includeScope>
+ <includeGroupIds>brooklyn</includeGroupIds>
+ <outputDirectory>
+ ${project.build.directory}/cobertura/dependency-sources
+ </outputDirectory>
+ <failOnMissingClassifierArtifact>false</failOnMissingClassifierArtifact>
+ </configuration>
+ </execution>
+ <execution>
+ <id>unpack-coverage-classes</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+ <type>jar</type>
+ <includeScope>compile</includeScope>
+ <includeGroupIds>brooklyn</includeGroupIds>
+ <outputDirectory>
+ ${project.build.directory}/cobertura/dependency-classes
+ </outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <inherited>true</inherited>
+ <configuration>
+ <reportFormat>xml</reportFormat>
+ <classesDirectory>${project.build.directory}/cobertura/coverage-classes</classesDirectory>
+ <systemProperties>
+ <property>
+ <name>net.sourceforge.cobertura.datafile</name>
+ <value>${project.build.directory}/cobertura/cobertura.ser
+ </value>
+ </property>
+ <property>
+ <name>cobertura.user.java.nio</name>
+ <value>false</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>test-jar-creation</id>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!-- build sources jars by default, it's quick -->
+ <profile>
+ <id>make-sources-jar</id>
+ <activation> <property><name>!skipSources</name></property> </activation>
+ <build><plugins><plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ </plugin></plugins></build>
+ </profile>
+
+ <!-- only build javadoc if asked, or if deploying (it's slow) -->
+ <profile>
+ <id>make-javadoc-jar</id>
+ <activation> <property><name>javadoc</name></property> </activation>
+ <build><plugins><plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ </plugin></plugins></build>
+ </profile>
+
+ <!-- sign and make javadoc when deploying; note, this means you'll need gpg set up to deploy -->
+ <profile>
+ <id>make-more-things-when-deploying</id>
+ <activation> <property><name>brooklyn.deployTo</name></property> </activation>
+ <build><plugins>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-gpg-plugin</artifactId>
+ </plugin>
+ </plugins></build>
+ </profile>
+ <profile>
+ <id>apache-repo</id>
+ <activation> <property><name>brooklyn.deployTo</name><value>apache</value></property> </activation>
+ <!-- distributionManagement configured by the parent Apache POM -->
+ </profile>
+ <profile>
+ <id>eclipse-compiler</id>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <compilerId>eclipse</compilerId>
+ <optimize>true</optimize>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-compiler-eclipse</artifactId>
+ <version>2.6</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ </profile>
+ </profiles>
+
+</project>
diff --git a/pom.xml b/pom.xml
index 89f67a5..769eb41 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<relativePath>../brooklyn-server/parent/</relativePath>
</parent>
diff --git a/pom.xml.bak b/pom.xml.bak
new file mode 100644
index 0000000..769eb41
--- /dev/null
+++ b/pom.xml.bak
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.brooklyn</groupId>
+ <artifactId>brooklyn-parent</artifactId>
+ <version>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <relativePath>../brooklyn-server/parent/</relativePath>
+ </parent>
+
+ <artifactId>brooklyn-client</artifactId>
+ <packaging>pom</packaging>
+
+ <name>Brooklyn Client</name>
+ <description>
+ Brooklyn Client project root, serving as the ancestor POM for all projects --
+ declaring versions, profiles, and the modules to build
+ </description>
+
+ <scm>
+ <connection>scm:git:https://git-wip-us.apache.org/repos/asf/brooklyn-client.git</connection>
+ <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/brooklyn-client.git</developerConnection>
+ <url>https://git-wip-us.apache.org/repos/asf?p=brooklyn-client.git</url>
+ <tag>HEAD</tag>
+ </scm>
+
+ <issueManagement>
+ <system>JIRA</system>
+ <url>https://issues.apache.org/jira/browse/BROOKLYN</url>
+ </issueManagement>
+
+ <ciManagement>
+ <system>Jenkins</system>
+ <url>https://builds.apache.org/view/Brooklyn/job/brooklyn-client-master/</url>
+ </ciManagement>
+
+ <mailingLists>
+ <mailingList>
+ <name>Brooklyn Developer List</name>
+ <subscribe>dev-subscribe@brooklyn.apache.org</subscribe>
+ <unsubscribe>dev-unsubscribe@brooklyn.apache.org</unsubscribe>
+ <post>dev@brooklyn.apache.org</post>
+ <archive>
+ http://mail-archives.apache.org/mod_mbox/brooklyn-dev/
+ </archive>
+ </mailingList>
+ </mailingLists>
+
+ <repositories>
+ <!--
+ Same as in the parent apache pom. Repeated here in case
+ direct parent's pom not found at relativePath. Can't fetch
+ the parent from remote repos for snapshot versions - no
+ snapshot repos enabled by default.
+ -->
+ <repository>
+ <id>apache.snapshots</id>
+ <name>Apache Snapshot Repository</name>
+ <url>http://repository.apache.org/snapshots</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </repository>
+ </repositories>
+
+ <modules>
+ <module>cli</module>
+ <module>java</module>
+ </modules>
+
+</project>
