TOMEE-1706 fat war support renaming as well - flag
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/68d79578 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/68d79578 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/68d79578 Branch: refs/heads/master Commit: 68d7957813a62fd8c4e43642375024133f0d9902 Parents: 4312a6a Author: Romain manni-Bucau <[email protected]> Authored: Mon Feb 8 20:31:19 2016 +0100 Committer: Romain manni-Bucau <[email protected]> Committed: Mon Feb 8 20:31:19 2016 +0100 ---------------------------------------------------------------------- .../openejb/itest/legacy/LegacyServerTest.java" | 338 +++++++++++++++++++ .../java/org/apache/tomee/embedded/Main.java | 4 +- 2 files changed, 341 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/68d79578/"itests/legacy-server\263src/test/java/org/apache/openejb/itest/legacy/LegacyServerTest.java"; ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/68d79578/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Main.java ---------------------------------------------------------------------- diff --git a/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Main.java b/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Main.java index 04d6458..44306ff 100644 --- a/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Main.java +++ b/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Main.java @@ -37,6 +37,7 @@ public class Main { public static final String DIRECTORY = "directory"; public static final String DOC_BASE = "doc-base"; public static final String AS_WAR = "as-war"; + public static final String RENAMING = "renaming"; public static void main(final String[] args) { final CommandLineParser parser = new PosixParser(); @@ -90,7 +91,7 @@ public class Main { if (autoWar) { // nothing deployed check if we are a war and deploy ourself then final File me = jarLocation(Main.class); if (me.getName().endsWith(".war")) { - container.deploy(contexts == null || i == contexts.length ? "" : contexts[i], me, true); + container.deploy(contexts == null || i == contexts.length ? "" : contexts[i], me, line.hasOption(RENAMING)); } } @@ -119,6 +120,7 @@ public class Main { options.addOption("d", DIRECTORY, true, "TomEE directory"); options.addOption("c", AS_WAR, false, "deploy classpath as war"); options.addOption("b", DOC_BASE, true, "when deploy classpath as war, the doc base"); + options.addOption(null, RENAMING, true, "for fat war only, is renaming of the context supported"); return options; }
