Repository: brooklyn-server Updated Branches: refs/heads/master 5e0749ef9 -> 93523965f
Deprecate passing groovy to Brooklyn Main Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/1d056d81 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/1d056d81 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/1d056d81 Branch: refs/heads/master Commit: 1d056d812d15a6ddd92e29cafd07d8f3b03c736e Parents: 7d8dfdd Author: Aled Sage <[email protected]> Authored: Fri Mar 24 18:15:38 2017 +0000 Committer: Aled Sage <[email protected]> Committed: Tue Mar 28 10:37:48 2017 +0100 ---------------------------------------------------------------------- .../src/main/java/org/apache/brooklyn/cli/Main.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/1d056d81/server-cli/src/main/java/org/apache/brooklyn/cli/Main.java ---------------------------------------------------------------------- diff --git a/server-cli/src/main/java/org/apache/brooklyn/cli/Main.java b/server-cli/src/main/java/org/apache/brooklyn/cli/Main.java index 1863f71..3cf0bc9 100644 --- a/server-cli/src/main/java/org/apache/brooklyn/cli/Main.java +++ b/server-cli/src/main/java/org/apache/brooklyn/cli/Main.java @@ -207,14 +207,14 @@ public class Main extends AbstractMain { @Option(name = { "-a", "--app" }, title = "application class or file", description = "The Application to start. " + - "For example, my.AppName, file://my/app.yaml, or classpath://my/AppName.groovy -- " - + "note that a BROOKLYN_CLASSPATH environment variable may be required to " - + "load classes from other locations") + "For example, my.AppName, file://my/app.yaml, or classpath://my/AppName.groovy " + + "(but passing groovy scripts is deprecated) -- note that a BROOKLYN_CLASSPATH " + + "environment variable may be required to load classes from other locations") public String app; @Beta @Option(name = { "-s", "--script" }, title = "script URI", - description = "EXPERIMENTAL. URI for a Groovy script to parse and load." + + description = "DEPRECATED. URI for a Groovy script to parse and load." + " This script will run before starting the app.") public String script = null; @@ -414,6 +414,7 @@ public class Main extends AbstractMain { // First, run a setup script if the user has provided one if (script != null) { + log.warn("Use of --script for groovy-script execution is deprecated"); execGroovyScript(utils, loader, script); } @@ -747,6 +748,7 @@ public class Main extends AbstractMain { log.debug("Loading \"{}\" as class on classpath failed, now trying as .groovy source file", app); String content = utils.getResourceAsString(app); tempclazz = loader.parseClass(content); + log.warn("Use of --app with a groovy source file is deprecated"); } final Class<?> clazz = tempclazz;
