Repository: brooklyn-dist
Updated Branches:
  refs/heads/master [created] 26c4604ca


http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/29757eea/usage/dist/src/main/license/files/NOTICE
----------------------------------------------------------------------
diff --git a/usage/dist/src/main/license/files/NOTICE 
b/usage/dist/src/main/license/files/NOTICE
deleted file mode 100644
index f790f13..0000000
--- a/usage/dist/src/main/license/files/NOTICE
+++ /dev/null
@@ -1,5 +0,0 @@
-Apache Brooklyn
-Copyright 2014-2015 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/29757eea/usage/dist/src/test/java/org/apache/brooklyn/cli/BaseCliIntegrationTest.java
----------------------------------------------------------------------
diff --git 
a/usage/dist/src/test/java/org/apache/brooklyn/cli/BaseCliIntegrationTest.java 
b/usage/dist/src/test/java/org/apache/brooklyn/cli/BaseCliIntegrationTest.java
deleted file mode 100644
index 4cb2d2b..0000000
--- 
a/usage/dist/src/test/java/org/apache/brooklyn/cli/BaseCliIntegrationTest.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.brooklyn.cli;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
-
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.NoSuchElementException;
-import java.util.Scanner;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-import org.apache.brooklyn.core.entity.factory.ApplicationBuilder;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-
-import com.google.common.collect.Lists;
-
-/**
- * Command line interface test support.
- */
-public class BaseCliIntegrationTest {
-
-    // TODO does this need to be hard-coded?
-    private static final String BROOKLYN_BIN_PATH = 
"./target/brooklyn-dist/bin/brooklyn";
-    private static final String BROOKLYN_CLASSPATH = 
"./target/test-classes/:./target/classes/";
-
-    // Times in seconds to allow Brooklyn to run and produce output
-    private static final long DELAY = 10l;
-    private static final long TIMEOUT = DELAY + 30l;
-
-    private ExecutorService executor;
-
-    @BeforeMethod(alwaysRun = true)
-    public void setup() {
-        executor = Executors.newCachedThreadPool();
-    }
-
-    @AfterMethod(alwaysRun = true)
-    public void teardown() {
-        executor.shutdownNow();
-    }
-
-    /** Invoke the brooklyn script with arguments. */
-    public Process startBrooklyn(String...argv) throws Throwable {
-        ProcessBuilder pb = new ProcessBuilder();
-        pb.environment().remove("BROOKLYN_HOME");
-        pb.environment().put("BROOKLYN_CLASSPATH", BROOKLYN_CLASSPATH);
-        pb.command(Lists.asList(BROOKLYN_BIN_PATH, argv));
-        return pb.start();
-    }
-
-    public void testBrooklyn(Process brooklyn, BrooklynCliTest test, int 
expectedExit) throws Throwable {
-        testBrooklyn(brooklyn, test, expectedExit, false);
-    }
-
-    /** Tests the operation of the Brooklyn CLI. */
-    public void testBrooklyn(Process brooklyn, BrooklynCliTest test, int 
expectedExit, boolean stop) throws Throwable {
-        try {
-            Future<Integer> future = executor.submit(test);
-
-            // Send CR to stop if required
-            if (stop) {
-                OutputStream out = brooklyn.getOutputStream();
-                out.write('\n');
-                out.flush();
-            }
-
-            int exitStatus = future.get(TIMEOUT, TimeUnit.SECONDS);
-
-            // Check error code from process
-            assertEquals(exitStatus, expectedExit, "Command returned wrong 
status");
-        } catch (TimeoutException te) {
-            fail("Timed out waiting for process to complete", te);
-        } catch (ExecutionException ee) {
-            if (ee.getCause() instanceof AssertionError) {
-                throw ee.getCause();
-            } else throw ee;
-        } finally {
-            brooklyn.destroy();
-        }
-    }
-
-    /** A {@link Callable} that encapsulates Brooklyn CLI test logic. */
-    public static abstract class BrooklynCliTest implements Callable<Integer> {
-
-        private final Process brooklyn;
-
-        private String consoleOutput;
-        private String consoleError;
-
-        public BrooklynCliTest(Process brooklyn) {
-            this.brooklyn = brooklyn;
-        }
-
-        @Override
-        public Integer call() throws Exception {
-            // Wait for initial output
-            Thread.sleep(TimeUnit.SECONDS.toMillis(DELAY));
-
-            // Get the console output of running that command
-            consoleOutput = convertStreamToString(brooklyn.getInputStream());
-            consoleError = convertStreamToString(brooklyn.getErrorStream());
-
-            // Check if the output looks as expected
-            checkConsole();
-
-            // Return exit status on completion
-            return brooklyn.waitFor();
-        }
-
-        /** Perform test assertions on console output and error streams. */
-        public abstract void checkConsole();
-
-        private String convertStreamToString(InputStream is) {
-            try {
-                return new Scanner(is).useDelimiter("\\A").next();
-            } catch (NoSuchElementException e) {
-                return "";
-            }
-        }
-
-        protected void assertConsoleOutput(String...expected) {
-            for (String e : expected) {
-                assertTrue(consoleOutput.contains(e), "Execution output not 
logged; output=" + consoleOutput);
-            }
-        }
-
-        protected void assertNoConsoleOutput(String...expected) {
-            for (String e : expected) {
-                assertFalse(consoleOutput.contains(e), "Execution output 
logged; output=" + consoleOutput);
-            }
-        }
-
-        protected void assertConsoleError(String...expected) {
-            for (String e : expected) {
-                assertTrue(consoleError.contains(e), "Execution error not 
logged; error=" + consoleError);
-            }
-        }
-
-        protected void assertNoConsoleError(String...expected) {
-            for (String e : expected) {
-                assertFalse(consoleError.contains(e), "Execution error logged; 
error=" + consoleError);
-            }
-        }
-
-        protected void assertConsoleOutputEmpty() {
-            assertTrue(consoleOutput.isEmpty(), "Output present; output=" + 
consoleOutput);
-        }
-
-        protected void assertConsoleErrorEmpty() {
-            assertTrue(consoleError.isEmpty(), "Error present; error=" + 
consoleError);
-        }
-    };
-
-    /** An empty application for testing. */
-    public static class TestApplication extends ApplicationBuilder {
-        @Override
-        protected void doBuild() {
-            // Empty, for testing
-        }
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/29757eea/usage/dist/src/test/java/org/apache/brooklyn/cli/CliIntegrationTest.java
----------------------------------------------------------------------
diff --git 
a/usage/dist/src/test/java/org/apache/brooklyn/cli/CliIntegrationTest.java 
b/usage/dist/src/test/java/org/apache/brooklyn/cli/CliIntegrationTest.java
deleted file mode 100644
index adf9559..0000000
--- a/usage/dist/src/test/java/org/apache/brooklyn/cli/CliIntegrationTest.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.brooklyn.cli;
-
-import org.testng.annotations.Test;
-
-/**
- * Test the command line interface operation.
- */
-public class CliIntegrationTest extends BaseCliIntegrationTest {
-
-    /**
-     * Checks if running {@code brooklyn help} produces the expected output.
-     */
-    @Test(groups = {"Integration","Broken"})
-    public void testLaunchCliHelp() throws Throwable {
-        final Process brooklyn = startBrooklyn("help");
-
-        BrooklynCliTest test = new BrooklynCliTest(brooklyn) {
-            @Override
-            public void checkConsole() {
-                assertConsoleOutput("usage: brooklyn"); // Usage info not 
present
-                assertConsoleOutput("The most commonly used brooklyn commands 
are:");
-                assertConsoleOutput("help     Display help for available 
commands",
-                                    "info     Display information about 
brooklyn",
-                                    "launch   Starts a brooklyn application"); 
// List of common commands not present
-                assertConsoleOutput("See 'brooklyn help <command>' for more 
information on a specific command.");
-                assertConsoleErrorEmpty();
-            }
-        };
-
-        testBrooklyn(brooklyn, test, 0);
-    }
-
-    /*
-        Exception java.io.IOException
-        
-        Message: Cannot run program "./target/brooklyn-dist/bin/brooklyn": 
error=2, No such file or directory
-        Stacktrace:
-        
-        
-        at java.lang.ProcessBuilder.start(ProcessBuilder.java:1047)
-        at 
org.apache.brooklyn.cli.BaseCliIntegrationTest.startBrooklyn(BaseCliIntegrationTest.java:75)
-        at 
org.apache.brooklyn.cli.CliIntegrationTest.testLaunchCliApp(CliIntegrationTest.java:56)
-        at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-        at 
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
-        at 
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-        at java.lang.reflect.Method.invoke(Method.java:606)
-        at 
org.testng.internal.MethodInvocationHelper.invokeMethod(MethodInvocationHelper.java:84)
-        at org.testng.internal.Invoker.invokeMethod(Invoker.java:714)
-        at org.testng.internal.Invoker.invokeTestMethod(Invoker.java:901)
-        at org.testng.internal.Invoker.invokeTestMethods(Invoker.java:1231)
-        at 
org.testng.internal.TestMethodWorker.invokeTestMethods(TestMethodWorker.java:127)
-        at org.testng.internal.TestMethodWorker.run(TestMethodWorker.java:111)
-        at org.testng.TestRunner.privateRun(TestRunner.java:767)
-        at org.testng.TestRunner.run(TestRunner.java:617)
-        at org.testng.SuiteRunner.runTest(SuiteRunner.java:348)
-        at org.testng.SuiteRunner.runSequentially(SuiteRunner.java:343)
-        at org.testng.SuiteRunner.privateRun(SuiteRunner.java:305)
-        at org.testng.SuiteRunner.run(SuiteRunner.java:254)
-        at org.testng.SuiteRunnerWorker.runSuite(SuiteRunnerWorker.java:52)
-        at org.testng.SuiteRunnerWorker.run(SuiteRunnerWorker.java:86)
-        at org.testng.TestNG.runSuitesSequentially(TestNG.java:1224)
-        at org.testng.TestNG.runSuitesLocally(TestNG.java:1149)
-        at org.testng.TestNG.run(TestNG.java:1057)
-        at 
org.apache.maven.surefire.testng.TestNGExecutor.run(TestNGExecutor.java:115)
-        at 
org.apache.maven.surefire.testng.TestNGDirectoryTestSuite.executeMulti(TestNGDirectoryTestSuite.java:205)
-        at 
org.apache.maven.surefire.testng.TestNGDirectoryTestSuite.execute(TestNGDirectoryTestSuite.java:108)
-        at 
org.apache.maven.surefire.testng.TestNGProvider.invoke(TestNGProvider.java:111)
-        at 
org.apache.maven.surefire.booter.ForkedBooter.invokeProviderInSameClassLoader(ForkedBooter.java:203)
-        at 
org.apache.maven.surefire.booter.ForkedBooter.runSuitesInProcess(ForkedBooter.java:155)
-        at 
org.apache.maven.surefire.booter.ForkedBooter.main(ForkedBooter.java:103)
-        Caused by: java.io.IOException: error=2, No such file or directory
-        at java.lang.UNIXProcess.forkAndExec(Native Method)
-        at java.lang.UNIXProcess.<init>(UNIXProcess.java:186)
-        at java.lang.ProcessImpl.start(ProcessImpl.java:130)
-        at java.lang.ProcessBuilder.start(ProcessBuilder.java:1028)
-        ... 30 more
-     */
-    /**
-     * Checks if launching an application using {@code brooklyn launch} 
produces the expected output.
-     */
-    @Test(groups = {"Integration","Broken"})
-    public void testLaunchCliApp() throws Throwable {
-        final Process brooklyn = startBrooklyn("--verbose", "launch", 
"--stopOnKeyPress", "--app", 
"org.apache.brooklyn.cli.BaseCliIntegrationTest$TestApplication", "--location", 
"localhost", "--noConsole");
-
-        BrooklynCliTest test = new BrooklynCliTest(brooklyn) {
-            @Override
-            public void checkConsole() {
-                assertConsoleOutput("Launching brooklyn app:"); // Launch 
message not output
-                assertNoConsoleOutput("Initiating Jersey application"); // Web 
console started
-                assertConsoleOutput("Started application 
BasicApplicationImpl"); // Application not started
-                assertConsoleOutput("Server started. Press return to stop."); 
// Server started message not output
-                assertConsoleErrorEmpty();
-            }
-        };
-
-        testBrooklyn(brooklyn, test, 0, true);
-    }
-
-    /**
-     * Checks if a correct error and help message is given if using incorrect 
param.
-     */
-    @Test(groups = {"Integration","Broken"})
-    public void testLaunchCliAppParamError() throws Throwable {
-        final Process brooklyn = startBrooklyn("launch", "nothing", "--app");
-
-        BrooklynCliTest test = new BrooklynCliTest(brooklyn) {
-            @Override
-            public void checkConsole() {
-                assertConsoleError("Parse error: Required values for option 
'application class or file' not provided");
-                assertConsoleError("NAME", "SYNOPSIS", "OPTIONS", "COMMANDS");
-                assertConsoleOutputEmpty();
-            }
-        };
-
-        testBrooklyn(brooklyn, test, 1);
-    }
-
-    /*
-        Exception java.io.IOException
-        
-        Message: Cannot run program "./target/brooklyn-dist/bin/brooklyn": 
error=2, No such file or directory
-        Stacktrace:
-        
-        
-        at java.lang.ProcessBuilder.start(ProcessBuilder.java:1047)
-        at 
org.apache.brooklyn.cli.BaseCliIntegrationTest.startBrooklyn(BaseCliIntegrationTest.java:75)
-        at 
org.apache.brooklyn.cli.CliIntegrationTest.testLaunchCliAppCommandError(CliIntegrationTest.java:96)
-        at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-        at 
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
-        at 
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-        at java.lang.reflect.Method.invoke(Method.java:606)
-        at 
org.testng.internal.MethodInvocationHelper.invokeMethod(MethodInvocationHelper.java:84)
-        at org.testng.internal.Invoker.invokeMethod(Invoker.java:714)
-        at org.testng.internal.Invoker.invokeTestMethod(Invoker.java:901)
-        at org.testng.internal.Invoker.invokeTestMethods(Invoker.java:1231)
-        at 
org.testng.internal.TestMethodWorker.invokeTestMethods(TestMethodWorker.java:127)
-        at org.testng.internal.TestMethodWorker.run(TestMethodWorker.java:111)
-        at org.testng.TestRunner.privateRun(TestRunner.java:767)
-        at org.testng.TestRunner.run(TestRunner.java:617)
-        at org.testng.SuiteRunner.runTest(SuiteRunner.java:348)
-        at org.testng.SuiteRunner.runSequentially(SuiteRunner.java:343)
-        at org.testng.SuiteRunner.privateRun(SuiteRunner.java:305)
-        at org.testng.SuiteRunner.run(SuiteRunner.java:254)
-        at org.testng.SuiteRunnerWorker.runSuite(SuiteRunnerWorker.java:52)
-        at org.testng.SuiteRunnerWorker.run(SuiteRunnerWorker.java:86)
-        at org.testng.TestNG.runSuitesSequentially(TestNG.java:1224)
-        at org.testng.TestNG.runSuitesLocally(TestNG.java:1149)
-        at org.testng.TestNG.run(TestNG.java:1057)
-        at 
org.apache.maven.surefire.testng.TestNGExecutor.run(TestNGExecutor.java:115)
-        at 
org.apache.maven.surefire.testng.TestNGDirectoryTestSuite.executeMulti(TestNGDirectoryTestSuite.java:205)
-        at 
org.apache.maven.surefire.testng.TestNGDirectoryTestSuite.execute(TestNGDirectoryTestSuite.java:108)
-        at 
org.apache.maven.surefire.testng.TestNGProvider.invoke(TestNGProvider.java:111)
-        at 
org.apache.maven.surefire.booter.ForkedBooter.invokeProviderInSameClassLoader(ForkedBooter.java:203)
-        at 
org.apache.maven.surefire.booter.ForkedBooter.runSuitesInProcess(ForkedBooter.java:155)
-        at 
org.apache.maven.surefire.booter.ForkedBooter.main(ForkedBooter.java:103)
-        Caused by: java.io.IOException: error=2, No such file or directory
-        at java.lang.UNIXProcess.forkAndExec(Native Method)
-        at java.lang.UNIXProcess.<init>(UNIXProcess.java:186)
-        at java.lang.ProcessImpl.start(ProcessImpl.java:130)
-        at java.lang.ProcessBuilder.start(ProcessBuilder.java:1028)
-        ... 30 more
-     */
-    /**
-     * Checks if a correct error and help message is given if using incorrect 
command.
-     */
-    @Test(groups = "Integration")
-    public void testLaunchCliAppCommandError() throws Throwable {
-        final Process brooklyn = startBrooklyn("biscuit");
-
-        BrooklynCliTest test = new BrooklynCliTest(brooklyn) {
-            @Override
-            public void checkConsole() {
-                assertConsoleError("Parse error: No command specified");
-                assertConsoleError("NAME", "SYNOPSIS", "OPTIONS", "COMMANDS");
-                assertConsoleOutputEmpty();
-            }
-        };
-
-        testBrooklyn(brooklyn, test, 1);
-    }
-
-    /**
-     * Checks if a correct error and help message is given if using incorrect 
application.
-     */
-    @Test(groups = {"Integration","Broken"})
-    public void testLaunchCliAppLaunchError() throws Throwable {
-        final String app = "org.eample.DoesNotExist";
-        final Process brooklyn = startBrooklyn("launch", "--app", app, 
"--location", "nowhere");
-
-        BrooklynCliTest test = new BrooklynCliTest(brooklyn) {
-            @Override
-            public void checkConsole() {
-                assertConsoleOutput(app, "not found");
-                assertConsoleError("ERROR", "Fatal", "getting resource", app);
-            }
-        };
-
-        testBrooklyn(brooklyn, test, 2);
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/29757eea/usage/downstream-parent/pom.xml
----------------------------------------------------------------------
diff --git a/usage/downstream-parent/pom.xml b/usage/downstream-parent/pom.xml
deleted file mode 100644
index 6580281..0000000
--- a/usage/downstream-parent/pom.xml
+++ /dev/null
@@ -1,506 +0,0 @@
-<?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</artifactId>
-    <version>0.9.0-SNAPSHOT</version>  <!-- BROOKLYN_VERSION -->
-    <relativePath>../../pom.xml</relativePath>
-  </parent>
-
-  <artifactId>brooklyn-downstream-parent</artifactId>
-  <packaging>pom</packaging>
-  <name>Brooklyn Downstream Project Parent</name>
-  <description>
-      Parent pom that can be used by downstream projects that use Brooklyn,
-      or that contribute additional functionality to Brooklyn.
-  </description>
-
-  <properties>
-    <!-- Compilation -->
-    <java.version>1.7</java.version>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-
-    <!-- Testing -->
-    <testng.version>6.8.8</testng.version>
-    <surefire.version>2.18.1</surefire.version>
-    <includedTestGroups />
-    
<excludedTestGroups>Integration,Acceptance,Live,Live-sanity,WIP</excludedTestGroups>
-
-    <!-- Dependencies -->
-    <brooklyn.version>0.9.0-SNAPSHOT</brooklyn.version>  <!-- BROOKLYN_VERSION 
-->
-    <jclouds.groupId>org.apache.jclouds</jclouds.groupId> <!-- 
JCLOUDS_GROUPID_VERSION -->
-
-    <!-- versions should match those used by Brooklyn, to avoid conflicts -->
-    <jclouds.version>1.9.1</jclouds.version> <!-- JCLOUDS_VERSION -->
-    <logback.version>1.0.7</logback.version>
-    <slf4j.version>1.6.6</slf4j.version>  <!-- used for java.util.logging 
jul-to-slf4j interception -->
-    <guava.version>17.0</guava.version>
-    <xstream.version>1.4.7</xstream.version>
-    <jackson.version>1.9.13</jackson.version>  <!-- codehaus jackson, used by 
brooklyn rest server -->
-    <fasterxml.jackson.version>2.4.5</fasterxml.jackson.version>  <!-- more 
recent jackson, but not compatible with old annotations! -->
-    <jersey.version>1.19</jersey.version>
-    <httpclient.version>4.4.1</httpclient.version>
-    <commons-lang3.version>3.1</commons-lang3.version>
-    <groovy.version>2.3.7</groovy.version> <!-- Version supported by 
https://github.com/groovy/groovy-eclipse/wiki/Groovy-Eclipse-2.9.1-Release-Notes
 -->
-    <jsr305.version>2.0.1</jsr305.version>
-    <snakeyaml.version>1.11</snakeyaml.version>
-  </properties>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <!-- this would pull in all brooklyn entities and clouds;
-             you can cherry pick selected ones instead (for a smaller build) 
-->
-        <groupId>org.apache.brooklyn</groupId>
-        <artifactId>brooklyn-all</artifactId>
-        <version>${brooklyn.version}</version>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
-  <dependencies>
-    <dependency>
-      <!-- this gives us flexible and easy-to-use logging; just edit 
logback-custom.xml! -->
-      <groupId>org.apache.brooklyn</groupId>
-      <artifactId>brooklyn-logback-xml</artifactId>
-      <version>${brooklyn.version}</version>
-      <!-- optional so that this project has logging; dependencies may 
redeclare or supply their own;
-           provided so that it isn't put into the assembly (as it supplies its 
own explicit logback.xml);
-           see Logging in the Brooklyn website/userguide for more info -->
-      <optional>true</optional>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <!-- includes testng and useful logging for tests -->
-      <groupId>org.apache.brooklyn</groupId>
-      <artifactId>brooklyn-test-support</artifactId>
-      <version>${brooklyn.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <!-- includes org.apache.brooklyn.test.support.LoggingVerboseReporter -->
-      <groupId>org.apache.brooklyn</groupId>
-      <artifactId>brooklyn-utils-test-support</artifactId>
-      <version>${brooklyn.version}</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <testSourceDirectory>src/test/java</testSourceDirectory>
-    <testResources>
-      <testResource>
-        <directory>src/test/resources</directory>
-      </testResource>
-    </testResources>
-
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <artifactId>maven-assembly-plugin</artifactId>
-          <version>2.5.4</version>
-          <configuration>
-            <tarLongFileMode>gnu</tarLongFileMode>
-          </configuration>
-        </plugin>
-        <plugin>
-          <artifactId>maven-clean-plugin</artifactId>
-          <version>2.6.1</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.3</version>
-          <configuration>
-            <source>${java.version}</source>
-            <target>${java.version}</target>
-          </configuration>
-        </plugin>
-        <plugin>
-          <artifactId>maven-deploy-plugin</artifactId>
-          <version>2.8.2</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-eclipse-plugin</artifactId>
-          <version>2.10</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-enforcer-plugin</artifactId>
-          <version>1.4</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-failsafe-plugin</artifactId>
-          <version>2.18.1</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-gpg-plugin</artifactId>
-          <version>1.6</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-jar-plugin</artifactId>
-          <version>2.6</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-javadoc-plugin</artifactId>
-          <version>2.10.3</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-resources-plugin</artifactId>
-          <version>2.7</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-source-plugin</artifactId>
-          <version>2.4</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.18.1</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.felix</groupId>
-          <artifactId>maven-bundle-plugin</artifactId>
-          <version>2.3.4</version>
-        </plugin>
-        <!--This plugin's configuration is used to store Eclipse m2e settings 
only. It has no influence on the Maven build itself.-->
-        <plugin>
-          <groupId>org.eclipse.m2e</groupId>
-          <artifactId>lifecycle-mapping</artifactId>
-          <version>1.0.0</version>
-          <configuration>
-            <lifecycleMappingMetadata>
-              <pluginExecutions>
-                <pluginExecution>
-                  <pluginExecutionFilter>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-assembly-plugin</artifactId>
-                    <versionRange>[2.4.1,)</versionRange>
-                    <goals>
-                      <goal>single</goal>
-                    </goals>
-                  </pluginExecutionFilter>
-                  <action>
-                    <ignore />
-                  </action>
-                </pluginExecution>
-                <pluginExecution>
-                  <pluginExecutionFilter>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>build-helper-maven-plugin</artifactId>
-                    <versionRange>[1.7,)</versionRange>
-                    <goals>
-                      <goal>attach-artifact</goal>
-                    </goals>
-                  </pluginExecutionFilter>
-                  <action>
-                    <ignore />
-                  </action>
-                </pluginExecution>
-                <pluginExecution>
-                  <pluginExecutionFilter>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-enforcer-plugin</artifactId>
-                    <versionRange>[1.3.1,)</versionRange>
-                    <goals>
-                      <goal>enforce</goal>
-                    </goals>
-                  </pluginExecutionFilter>
-                  <action>
-                    <ignore />
-                  </action>
-                </pluginExecution>
-                <pluginExecution>
-                  <pluginExecutionFilter>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-remote-resources-plugin</artifactId>
-                    <versionRange>[1.5,)</versionRange>
-                    <goals>
-                      <goal>process</goal>
-                    </goals>
-                  </pluginExecutionFilter>
-                  <action>
-                    <ignore />
-                  </action>
-                </pluginExecution>
-                <pluginExecution>
-                  <pluginExecutionFilter>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-dependency-plugin</artifactId>
-                    <versionRange>[2.8,)</versionRange>
-                    <goals>
-                      <goal>unpack</goal>
-                      <goal>copy</goal>
-                    </goals>
-                  </pluginExecutionFilter>
-                  <action>
-                    <ignore />
-                  </action>
-                </pluginExecution>
-                <pluginExecution>
-                  <pluginExecutionFilter>
-                    <groupId>com.github.skwakman.nodejs-maven-plugin</groupId>
-                    <artifactId>nodejs-maven-plugin</artifactId>
-                    <versionRange>[1.0.3,)</versionRange>
-                    <goals>
-                      <goal>extract</goal>
-                    </goals>
-                  </pluginExecutionFilter>
-                  <action>
-                    <ignore />
-                  </action>
-                </pluginExecution>
-                <pluginExecution>
-                  <pluginExecutionFilter>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-war-plugin</artifactId>
-                    <versionRange>[2.4,)</versionRange>
-                    <goals>
-                      <goal>exploded</goal>
-                    </goals>
-                  </pluginExecutionFilter>
-                  <action>
-                    <ignore />
-                  </action>
-                </pluginExecution>
-              </pluginExecutions>
-             </lifecycleMappingMetadata>
-           </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-
-    <plugins>
-      <plugin>
-        <artifactId>maven-clean-plugin</artifactId>
-        <configuration>
-          <filesets>
-            <fileset>
-              <directory>.</directory>
-              <includes>
-                <include>brooklyn*.log</include>
-                <include>brooklyn*.log.*</include>
-                <include>stacktrace.log</include>
-                <include>test-output</include>
-                <include>prodDb.*</include>
-              </includes>
-            </fileset>
-          </filesets>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <artifactId>maven-resources-plugin</artifactId>
-      </plugin>
-
-      <plugin>
-        <artifactId>maven-eclipse-plugin</artifactId>
-        <configuration>
-          <additionalProjectnatures>
-            <projectnature>org.maven.ide.eclipse.maven2Nature</projectnature>
-          </additionalProjectnatures>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <argLine>-Xms256m -Xmx512m -XX:MaxPermSize=512m</argLine>
-          <properties>
-            <property>
-              <name>listener</name>
-              
<value>org.apache.brooklyn.test.support.LoggingVerboseReporter</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>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-  <profiles>
-
-    <profile>
-      <id>Tests</id>
-      <activation>
-        <file> <exists>${basedir}/src/test</exists> </file>
-      </activation>
-      <build>
-        <plugins>
-          <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>
-
-    <!-- run Integration tests with -PIntegration -->
-    <profile>
-      <id>Integration</id>
-      <properties>
-        <includedTestGroups>Integration</includedTestGroups>
-        
<excludedTestGroups>Acceptance,Live,Live-sanity,WIP</excludedTestGroups>
-      </properties>
-    </profile>
-
-    <!-- run Live tests with -PLive -->
-    <profile>
-      <id>Live</id>
-      <properties>
-        <includedTestGroups>Live,Live-sanity</includedTestGroups>
-        <excludedTestGroups>Acceptance,WIP</excludedTestGroups>
-      </properties>
-    </profile>
-
-    <!-- run Live-sanity tests with -PLive-sanity -->
-    <profile>
-      <id>Live-sanity</id>
-      <properties>
-        <includedTestGroups>Live-sanity</includedTestGroups>
-        <excludedTestGroups>Acceptance,WIP</excludedTestGroups>
-      </properties>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-jar-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>test-jar-creation</id>
-                <configuration>
-                  <skip>true</skip>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </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>
-                <!-- Brooklyn-Feature prefix triggers inclusion of the 
project's metadata in the server's features list. -->
-                <Brooklyn-Feature-Name>${project.name}</Brooklyn-Feature-Name>
-              </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>
-
-    <!-- different properties used to deploy to different locations depending 
on profiles;
-         default is cloudsoft filesystem repo, but some sources still use 
cloudsoft artifactory as source
-         and soon we will support artifactory. use this profile for the ASF 
repositories and
-         sonatype-oss-release profile for the Sonatype OSS repositories.
-    -->
-    <!-- profile>
-      <id>apache-release</id>
-      <activation>
-        <property>
-          <name>brooklyn.deployTo</name>
-          <value>apache</value>
-        </property>
-      </activation>
-      <distributionManagement>
-        <repository>
-          <id>apache.releases.https</id>
-          <name>Apache Release Distribution Repository</name>
-          
<url>https://repository.apache.org/service/local/staging/deploy/maven2</url>
-        </repository>
-        <snapshotRepository>
-          <id>apache.snapshots.https</id>
-          <name>Apache Development Snapshot Repository</name>
-          
<url>https://repository.apache.org/content/repositories/snapshots</url>
-        </snapshotRepository>
-      </distributionManagement>
-    </profile -->
-  </profiles>
-
-</project>

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/29757eea/usage/jsgui/src/main/license/files/LICENSE
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/main/license/files/LICENSE 
b/usage/jsgui/src/main/license/files/LICENSE
deleted file mode 100644
index 4a1f38b..0000000
--- a/usage/jsgui/src/main/license/files/LICENSE
+++ /dev/null
@@ -1,482 +0,0 @@
-
-This software is distributed under the Apache License, version 2.0. See (1) 
below.
-This software is copyright (c) The Apache Software Foundation and contributors.
-
-Contents:
-
-  (1) This software license: Apache License, version 2.0
-  (2) Notices for bundled software
-  (3) Licenses for bundled software
-
-
----------------------------------------------------
-
-(1) This software license: Apache License, version 2.0
-
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-
----------------------------------------------------
-
-(2) Notices for bundled software
-
-This project includes the software: async.js
-  Available at: 
https://github.com/p15martin/google-maps-hello-world/blob/master/js/libs/async.js
-  Developed by: Miller Medeiros (https://github.com/millermedeiros/)
-  Version used: 0.1.1
-  Used under the following license: The MIT License 
(http://opensource.org/licenses/MIT)
-  Copyright (c) Miller Medeiros (2011)
-
-This project includes the software: backbone.js
-  Available at: http://backbonejs.org
-  Developed by: DocumentCloud Inc. (http://www.documentcloud.org/)
-  Version used: 1.0.0
-  Used under the following license: The MIT License 
(http://opensource.org/licenses/MIT)
-  Copyright (c) Jeremy Ashkenas, DocumentCloud Inc. (2010-2013)
-
-This project includes the software: backbone.js
-  Available at: http://backbonejs.org
-  Developed by: DocumentCloud Inc. (http://www.documentcloud.org/)
-  Version used: 1.1.2
-  Used under the following license: The MIT License 
(http://opensource.org/licenses/MIT)
-  Copyright (c) Jeremy Ashkenas, DocumentCloud (2010-2014)
-
-This project includes the software: bootstrap.js
-  Available at: http://twitter.github.com/bootstrap/javascript.html#transitions
-  Version used: 2.0.4
-  Used under the following license: Apache License, version 2.0 
(http://www.apache.org/licenses/LICENSE-2.0)
-  Copyright (c) Twitter, Inc. (2012)
-
-This project includes the software: handlebars.js
-  Available at: https://github.com/wycats/handlebars.js
-  Developed by: Yehuda Katz (https://github.com/wycats/)
-  Inclusive of: handlebars*.js
-  Version used: 1.0-rc1
-  Used under the following license: The MIT License 
(http://opensource.org/licenses/MIT)
-  Copyright (c) Yehuda Katz (2012)
-
-This project includes the software: handlebars.js
-  Available at: https://github.com/wycats/handlebars.js
-  Developed by: Yehuda Katz (https://github.com/wycats/)
-  Inclusive of: handlebars*.js
-  Version used: 2.0.0
-  Used under the following license: The MIT License 
(http://opensource.org/licenses/MIT)
-  Copyright (C) by Yehuda Katz (2011-2014)
-
-This project includes the software: jQuery JavaScript Library
-  Available at: http://jquery.com/
-  Developed by: The jQuery Foundation (http://jquery.org/)
-  Inclusive of: jquery.js
-  Version used: 1.7.2
-  Used under the following license: The MIT License 
(http://opensource.org/licenses/MIT)
-  Copyright (c) John Resig (2005-2011)
-  Includes code fragments from sizzle.js:
-    Copyright (c) The Dojo Foundation
-    Available at http://sizzlejs.com
-    Used under the MIT license
-
-This project includes the software: jQuery JavaScript Library
-  Available at: http://jquery.com/
-  Developed by: The jQuery Foundation (http://jquery.org/)
-  Inclusive of: jquery.js
-  Version used: 1.8.0
-  Used under the following license: The MIT License 
(http://opensource.org/licenses/MIT)
-  Copyright (c) jQuery Foundation and other contributors (2012)
-  Includes code fragments from sizzle.js:
-    Copyright (c) The Dojo Foundation
-    Available at http://sizzlejs.com
-    Used under the MIT license
-
-This project includes the software: jQuery BBQ: Back Button & Query Library
-  Available at: http://benalman.com/projects/jquery-bbq-plugin/
-  Developed by: "Cowboy" Ben Alman (http://benalman.com/)
-  Inclusive of: jquery.ba-bbq*.js
-  Version used: 1.2.1
-  Used under the following license: The MIT License 
(http://opensource.org/licenses/MIT)
-  Copyright (c) "Cowboy" Ben Alman (2010)"
-
-This project includes the software: DataTables Table plug-in for jQuery
-  Available at: http://www.datatables.net/
-  Developed by: SpryMedia Ltd (http://sprymedia.co.uk/)
-  Inclusive of: jquery.dataTables.{js,css}
-  Version used: 1.9.4
-  Used under the following license: The BSD 3-Clause (New BSD) License 
(http://opensource.org/licenses/BSD-3-Clause)
-  Copyright (c) Allan Jardine (2008-2012)
-
-This project includes the software: jQuery Form Plugin
-  Available at: https://github.com/malsup/form
-  Developed by: Mike Alsup (http://malsup.com/)
-  Inclusive of: jquery.form.js
-  Version used: 3.09
-  Used under the following license: The MIT License 
(http://opensource.org/licenses/MIT)
-  Copyright (c) M. Alsup (2006-2013)
-
-This project includes the software: jQuery Wiggle
-  Available at: https://github.com/jordanthomas/jquery-wiggle
-  Inclusive of: jquery.wiggle.min.js
-  Version used: swagger-ui:1.0.1
-  Used under the following license: The MIT License 
(http://opensource.org/licenses/MIT)
-  Copyright (c) WonderGroup and Jordan Thomas (2010)
-  Previously online at http://labs.wondergroup.com/demos/mini-ui/index.html.
-  The version included here is from the Swagger UI distribution.
-
-This project includes the software: js-uri
-  Available at: http://code.google.com/p/js-uri/
-  Developed by: js-uri contributors (https://code.google.com/js-uri)
-  Inclusive of: URI.js
-  Version used: 0.1
-  Used under the following license: The BSD 3-Clause (New BSD) License 
(http://opensource.org/licenses/BSD-3-Clause)
-  Copyright (c) js-uri contributors (2013)
-
-This project includes the software: js-yaml.js
-  Available at: https://github.com/nodeca/
-  Developed by: Vitaly Puzrin (https://github.com/nodeca/)
-  Version used: 3.2.7
-  Used under the following license: The MIT License 
(http://opensource.org/licenses/MIT)
-  Copyright (c) Vitaly Puzrin (2011-2015)
-
-This project includes the software: moment.js
-  Available at: http://momentjs.com
-  Developed by: Tim Wood (http://momentjs.com)
-  Version used: 2.1.0
-  Used under the following license: The MIT License 
(http://opensource.org/licenses/MIT)
-  Copyright (c) Tim Wood, Iskren Chernev, Moment.js contributors (2011-2014)
-
-This project includes the software: RequireJS
-  Available at: http://requirejs.org/
-  Developed by: The Dojo Foundation (http://dojofoundation.org/)
-  Inclusive of: require.js, text.js
-  Version used: 2.0.6
-  Used under the following license: The MIT License 
(http://opensource.org/licenses/MIT)
-  Copyright (c) The Dojo Foundation (2010-2012)
-
-This project includes the software: RequireJS (r.js maven plugin)
-  Available at: http://github.com/jrburke/requirejs
-  Developed by: The Dojo Foundation (http://dojofoundation.org/)
-  Inclusive of: r.js
-  Version used: 2.1.6
-  Used under the following license: The MIT License 
(http://opensource.org/licenses/MIT)
-  Copyright (c) The Dojo Foundation (2009-2013)
-  Includes code fragments for source-map and other functionality:
-    Copyright (c) The Mozilla Foundation and contributors (2011)
-    Used under the BSD 2-Clause license.
-  Includes code fragments for parse-js and other functionality:
-    Copyright (c) Mihai Bazon (2010, 2012)
-    Used under the BSD 2-Clause license.
-  Includes code fragments for uglifyjs/consolidator:
-    Copyright (c) Robert Gust-Bardon (2012)
-    Used under the BSD 2-Clause license.
-  Includes code fragments for the esprima parser:
-    Copyright (c):
-      Ariya Hidayat (2011, 2012)
-      Mathias Bynens (2012)
-      Joost-Wim Boekesteijn (2012)
-      Kris Kowal (2012)
-      Yusuke Suzuki (2012)
-      Arpad Borsos (2012)
-    Used under the BSD 2-Clause license.
-
-This project includes the software: Swagger JS
-  Available at: https://github.com/swagger-api/swagger-js
-  Inclusive of: swagger.js
-  Version used: 2.1.6
-  Used under the following license: Apache License, version 2.0 
(http://www.apache.org/licenses/LICENSE-2.0)
-  Copyright (c) SmartBear Software (2015)
-
-This project includes the software: Swagger UI
-  Available at: https://github.com/swagger-api/swagger-ui
-  Inclusive of: swagger-ui.js
-  Version used: 2.1.3
-  Used under the following license: Apache License, version 2.0 
(http://www.apache.org/licenses/LICENSE-2.0)
-  Copyright (c) SmartBear Software (2015)
-
-This project includes the software: underscore.js
-  Available at: http://underscorejs.org
-  Developed by: DocumentCloud Inc. (http://www.documentcloud.org/)
-  Inclusive of: underscore*.{js,map}
-  Version used: 1.4.4
-  Used under the following license: The MIT License 
(http://opensource.org/licenses/MIT)
-  Copyright (c) Jeremy Ashkenas, DocumentCloud Inc. (2009-2013)
-
-This project includes the software: underscore.js
-  Available at: http://underscorejs.org
-  Developed by: DocumentCloud Inc. (http://www.documentcloud.org/)
-  Inclusive of: underscore*.{js,map}
-  Version used: 1.7.0
-  Used under the following license: The MIT License 
(http://opensource.org/licenses/MIT)
-  Copyright (c) Jeremy Ashkenas, DocumentCloud and Investigative Reporters & 
Editors (2009-2014)
-
-This project includes the software: ZeroClipboard
-  Available at: http://zeroclipboard.org/
-  Developed by: ZeroClipboard contributors (https://github.com/zeroclipboard)
-  Inclusive of: ZeroClipboard.*
-  Version used: 1.3.1
-  Used under the following license: The MIT License 
(http://opensource.org/licenses/MIT)
-  Copyright (c) Jon Rohan, James M. Greene (2014)
-
-This project includes the software: marked.js
-  Available at: https://github.com/chjj/marked
-  Developed by: Christopher Jeffrey (https://github.com/chjj)
-  Inclusive of: marked.js
-  Version used: 0.3.1
-  Used under the following license: The MIT License 
(http://opensource.org/licenses/MIT)
-  Copyright (c) Christopher Jeffrey (2011-2014)
-
----------------------------------------------------
-
-(3) Licenses for bundled software
-
-Contents:
-
-  The BSD 2-Clause License
-  The BSD 3-Clause License ("New BSD")
-  The MIT License ("MIT")
-
-
-The BSD 2-Clause License
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-  
-  1. Redistributions of source code must retain the above copyright notice, 
this
-  list of conditions and the following disclaimer.
-  
-  2. Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-  
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  
-
-The BSD 3-Clause License ("New BSD")
-
-  Redistribution and use in source and binary forms, with or without 
modification,
-  are permitted provided that the following conditions are met:
-  
-  1. Redistributions of source code must retain the above copyright notice, 
-  this list of conditions and the following disclaimer.
-  
-  2. Redistributions in binary form must reproduce the above copyright notice, 
-  this list of conditions and the following disclaimer in the documentation 
-  and/or other materials provided with the distribution.
-  
-  3. Neither the name of the copyright holder nor the names of its 
contributors 
-  may be used to endorse or promote products derived from this software 
without 
-  specific prior written permission.
-  
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
AND 
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
IMPLIED 
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
DISCLAIMED. 
-  IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY 
DIRECT, 
-  INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
(INCLUDING, BUT 
-  NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
DATA, OR 
-  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF 
LIABILITY, 
-  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR 
OTHERWISE) 
-  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
-  POSSIBILITY OF SUCH DAMAGE.
-  
-
-The MIT License ("MIT")
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-  
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-  
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
-  
-

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/29757eea/usage/jsgui/src/main/license/files/NOTICE
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/main/license/files/NOTICE 
b/usage/jsgui/src/main/license/files/NOTICE
deleted file mode 100644
index f790f13..0000000
--- a/usage/jsgui/src/main/license/files/NOTICE
+++ /dev/null
@@ -1,5 +0,0 @@
-Apache Brooklyn
-Copyright 2014-2015 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/29757eea/usage/jsgui/src/test/license/DISCLAIMER
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/test/license/DISCLAIMER 
b/usage/jsgui/src/test/license/DISCLAIMER
deleted file mode 100644
index 9e6119b..0000000
--- a/usage/jsgui/src/test/license/DISCLAIMER
+++ /dev/null
@@ -1,8 +0,0 @@
-
-Apache Brooklyn is an effort undergoing incubation at The Apache Software 
Foundation (ASF), 
-sponsored by the Apache Incubator. Incubation is required of all newly 
accepted projects until 
-a further review indicates that the infrastructure, communications, and 
decision making process 
-have stabilized in a manner consistent with other successful ASF projects. 
While incubation 
-status is not necessarily a reflection of the completeness or stability of the 
code, it does 
-indicate that the project has yet to be fully endorsed by the ASF.
-

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/29757eea/usage/jsgui/src/test/license/NOTICE
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/test/license/NOTICE 
b/usage/jsgui/src/test/license/NOTICE
deleted file mode 100644
index f790f13..0000000
--- a/usage/jsgui/src/test/license/NOTICE
+++ /dev/null
@@ -1,5 +0,0 @@
-Apache Brooklyn
-Copyright 2014-2015 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/29757eea/usage/scripts/buildAndTest
----------------------------------------------------------------------
diff --git a/usage/scripts/buildAndTest b/usage/scripts/buildAndTest
deleted file mode 100755
index 45c1a26..0000000
--- a/usage/scripts/buildAndTest
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/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.
-#
-# Convenience script to clean, build, install and run unit and/or integration 
tests.
-# Recommend you run this prior to pushing to Github to reduce the chances of 
breaking
-# the continuous integration (unit tests) or overnight builds (integration 
tests.)
-#
-# Also very useful when using "git bisect" to find out which commit was 
responsible
-# for breaking the overnight build - invoke as "git bisect run ./buildAndRun"
-#
-# Run "./buildAndRun --help" to see the usage.
-#
-
-# Has an integration test left a Java process running? See if there is any 
running
-# Java processes and offer to kill them/
-cleanup(){
-    PROCS=$(ps ax | grep '[j]ava' | grep -v set_tab_title)
-    if [ ! -z "${PROCS}" ]; then
-       echo "These Java processes are running:"
-       echo ${PROCS}
-       echo -n "Kill them? y=yes, n=no, x=abort: "
-       read $RESPONSE
-       [ "${RESPONSE}" = "y" ] && killall java && sleep 1s
-       [ "${RESPONSE}" = "x" ] && exit 50
-    fi
-}
-
-# Check a return value, and bail if its non-zero - invoke as "assert $? 'Unit 
tests'"
-assert(){
-    [ $1 -eq 0 ] && return
-    echo '*** Command returned '$1' on '$2
-    exit $1
-}
-
-# The defaults
-unit=1
-integration=1
-
-if [ ! -z "$1" ]; then
-    case "$1" in
-       u)
-           unit=1
-           integration=0
-           ;;
-       i)
-           unit=0
-           integration=1
-           ;;
-       ui)
-           unit=1
-           integration=1
-           ;;
-       b)
-           unit=0
-           integration=0
-           ;;
-       *)
-           echo >&2 Usage: buildAndTest [action]
-           echo >&2 where action is:
-           echo >&2 u - build from clean and run unit tests
-           echo >&2 i - build from clean and run integration tests
-           echo >&2 ui - build from clean and run unit and integration tests 
\(default\)
-           echo >&2 b - build from clean and do not run any tests
-           exit 1
-           ;;
-    esac
-fi
-
-echo '*** BUILD'
-mvn clean install -DskipTests -PConsole
-assert $? 'BUILD'
-cleanup
-if [ $unit -eq 1 ]; then
-    echo '*** UNIT TEST'
-    mvn integration-test -PConsole
-    assert $? 'UNIT TEST'
-    cleanup
-fi
-if [ $integration -eq 1 ]; then
-    echo '*** INTEGRATION TEST'
-    mvn integration-test -PConsole,Integration
-    assert $? 'INTEGRATION TEST'
-    cleanup
-fi
-
-exit 0

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/29757eea/usage/scripts/grep-in-poms.sh
----------------------------------------------------------------------
diff --git a/usage/scripts/grep-in-poms.sh b/usage/scripts/grep-in-poms.sh
deleted file mode 100755
index aca9258..0000000
--- a/usage/scripts/grep-in-poms.sh
+++ /dev/null
@@ -1,25 +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.
-#
-
-# usage: run in the root dir of a project, it will grep in poms up to 3 levels 
deep
-# e.g. where are shaded jars defined?
-# brooklyn% grep-in-poms -i slf4j
-
-grep $* {.,*,*/*,*/*/*}/pom.xml

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/29757eea/usage/scripts/release-branch-from-master
----------------------------------------------------------------------
diff --git a/usage/scripts/release-branch-from-master 
b/usage/scripts/release-branch-from-master
deleted file mode 100755
index 8d7befa..0000000
--- a/usage/scripts/release-branch-from-master
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/bin/bash -e
-#
-# 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.
-#
-
-usage(){
-       echo >&2 'Usage: release-branch-from-master --release <version> [ 
--release-suffix <suffix> ]'
-       echo >&2 '                                  --master <version>  [ 
--master-suffix <suffix> ]'
-       echo >&2 'Creates a release branch, and updates the version number in 
both the branch and master.'
-       echo >&2 '<version> should be a two-part version number, such as 3.6 or 
4.0.'
-       echo >&2 '<suffix> will normally be of the form ".patchlevel", plus 
"-RC1" or similar if required,'
-       echo >&2 'plus "-SNAPSHOT". Example: ".0.RC1-SNAPSHOT". The defaults 
for the suffix are normally sensible.'
-       echo >&2 'This command will preview what it is going to do and require 
confirmation before it makes changes.'
-}
-
-release_ver=
-release_ver_suffix=.0-RC1-SNAPSHOT
-master_ver=
-master_ver_suffix=.0-SNAPSHOT
-
-[ $# -eq 0 ] && echo >&2 "No arguments given, so I'm going to try and figure 
it out myself. Invoke with the --help option if you want to find how to invoke 
this script."
-
-while [ $# -gt 0 ]; do
-       case $1 in
-               --release)                      shift; release_ver=$1;;
-               --release-suffix)       shift; release_ver_suffix=$1;;
-               --master)                       shift; master_ver=$1;;
-               --master-suffix)        shift; master_ver_suffix=$1;;
-               *)                                      usage; exit 1;;
-       esac
-       shift
-done
-
-# Use xpath to query the current version number in the pom
-xpath='xpath'
-type -P $xpath &>/dev/null && {
-       set +e
-       current_version=$( xpath pom.xml '/project/version/text()' 2>/dev/null )
-       ( echo ${current_version} | grep -qE '^([0-9]+).([0-9]+).0-SNAPSHOT$' )
-       current_version_valid=$?
-       set -e 
-} || { 
-       echo "Cannot guess version number as $xpath command not found."
-       current_version_valid=1
-}
-
-if [ "${current_version_valid}" -ne 0 -a -z "${release_ver}" -a -z 
"${master_ver}" ]; then
-       echo >&2 "Detected current version as '${current_version}', but I can't 
parse this. Please supply --release and --master parameters."
-       exit 1
-fi
-
-[ -z "${release_ver}" ] && {
-       release_ver=${current_version%-SNAPSHOT}
-       release_ver=${release_ver%.0}
-       [ -z "${release_ver}" ] && { echo >&2 Could not determine the version 
of the release branch. Please use the --release parameter. ; exit 1 ; }
-}
-
-[ -z "${master_ver}" ] && {
-       master_ver=$( echo ${current_version} | perl -n -e 'if 
(/^(\d+).(\d+)(.*)$/) { printf "%s.%s\n", $1, $2+1 }' )
-       [ -z "${master_ver}" ] && { echo >&2 Could not determine the version of 
the master branch. Please use the --master parameter. ; exit 1 ; }
-}
-
-version_on_branch=${release_ver}${release_ver_suffix}
-version_on_master=${master_ver}${master_ver_suffix}
-branch_name=${version_on_branch}
-
-# Show the details and get confirmation
-echo "The current version is:                                  
${current_version}"
-echo "The release branch will be named:                        ${branch_name}"
-echo "The version number on the release branch will be set to: 
${version_on_branch}"
-echo "The version number on 'master' will be set to:           
${version_on_master}"
-echo "If you proceed, the new branch and version number changes will be pushed 
to GitHub."
-echo -n 'Enter "y" if this is correct, anything else to abort: '
-read input
-[ "$input" == "y" ] || { echo >&2 Aborted. ; exit 1 ; }
-
-# Fail if not in a Git repository
-[ -d .git ] || {
-       echo >&2 Error: this directory is not a git repository root. Nothing 
happened.
-       exit 1
-}
-
-# Warn if the current branch isn't master
-current_branch=$( git name-rev --name-only HEAD )
-[ ${current_branch} == "master" ] || {
-       echo Current branch is ${current_branch}. Usually, release branches are 
made from master.
-       echo -n 'Enter "y" if this is correct, anything else to abort: '
-       read input
-       [ "$input" == "y" ] || { echo >&2 Aborted. ; exit 1 ; }
-}
-
-# Get Maven to make the branch
-set -x
-mvn release:clean release:branch -P 
Brooklyn,Console,Example,Launcher,Acceptance,Documentation --batch-mode 
-DautoVersionSubmodules=true -DbranchName=${branch_name} 
-DupdateBranchVersions=true -DreleaseVersion=${version_on_branch} 
-DdevelopmentVersion=${version_on_master}
-set +x
-
-# Done!
-echo Completed. Your repository is still looking at ${current_branch}. To 
switch to the release branch, enter:
-echo git checkout ${branch_name}

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/29757eea/usage/scripts/release-make
----------------------------------------------------------------------
diff --git a/usage/scripts/release-make b/usage/scripts/release-make
deleted file mode 100755
index df46ea1..0000000
--- a/usage/scripts/release-make
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/bin/bash -e -u
-#
-# 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.
-#
-
-usage(){
-       echo >&2 'Usage: release-make [ --release <version> ] [ --next 
<version> ]'
-       echo >&2 'Creates and tags a release based on the current branch.'
-       echo >&2 'Arguments are optional - if omitted, the script tries to work 
out the correct versions.'
-       echo >&2 'release <version> should be a full version number, such as 
3.6.0-RC1'
-       echo >&2 'next <version> should be a snapshot version number, such as 
3.6.0-RC2-SNAPSHOT'
-       echo >&2 'This command will preview what it is going to do and require 
confirmation before it makes changes.'
-}
-
-[ $# -eq 0 ] && echo >&2 "No arguments given, so I'm going to try and figure 
it out myself. Invoke with the --help option if you want to find how to invoke 
this script."
-
-release_tag_ver=
-release_branch_ver=
-
-while [ $# -gt 0 ]; do
-       case $1 in
-               --release)      shift; release_tag_ver=$1;;
-               --next)         shift; release_branch_ver=$1;;
-               *)                                      usage; exit 1;;
-       esac
-       shift
-done
-
-# Some magic to derive the anticipated version of the release.
-# Use xpath to query the version number in the pom
-xpath='xpath'
-type -P $xpath &>/dev/null && {
-       set +e
-       current_version=$( xpath pom.xml '/project/version/text()' 2>/dev/null )
-       set -e
-} || {
-        echo "Cannot guess version number as $xpath command not found."
-}
-# If the user didn't supply the release version, strip -SNAPSHOT off the 
current version and use that
-[ -z "$release_tag_ver" ] && release_tag_ver=${current_version%-SNAPSHOT}
-
-# More magic, this time to guess the next version.
-# If the user didn't supply the next version, modify the digits off the end of 
the release to increment by one and append -SNAPSHOT
-[ -z "$release_branch_ver" ] && release_branch_ver=$( echo ${release_tag_ver} 
| perl -n -e 'if (/^(.*)(\d+)$/) { print $1.($2+1)."-SNAPSHOT\n" }' )
-
-current_branch=$( git name-rev --name-only HEAD )
-
-echo "The release is on the branch:                             
${current_branch}"
-echo "The current version (detected) is:                        
${current_version}"
-echo "The release version is:                                   
${release_tag_ver}"
-echo "Development on the release branch continues with version: 
${release_branch_ver}"
-echo -n 'Enter "y" if this is correct, anything else to abort: '
-read input
-[ "$input" == "y" ] || { echo >&2 Aborted. ; exit 1 ; }
-
-# Warn if the current branch is master
-[ ${current_branch} == "master" ] && {
-       echo Current branch is ${current_branch}. Usually, releases are made 
from a release branch.
-       echo -n 'Enter "y" if this is correct, anything else to abort: '
-       read input
-       [ "$input" == "y" ] || { echo >&2 Aborted. ; exit 1 ; }
-}
-
-# Release prepare
-mvn release:clean release:prepare -PExample,Launcher,Four,Three --batch-mode 
-DautoVersionSubmodules=true -DreleaseVersion=${release_tag_ver} 
-DdevelopmentVersion=${release_branch_ver}
-
-# Release perform
-mvn release:perform -PExample,Launcher,Four,Three --batch-mode

Reply via email to