You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2016/09/02 11:09:27 UTC
[2/2] tomee git commit: handling help case in tomee embedded
handling help case in tomee embedded
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/36a534ad
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/36a534ad
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/36a534ad
Branch: refs/heads/master
Commit: 36a534adb3d6acaad53708d6ffee6b0893335bb2
Parents: acaec7e
Author: Romain manni-Bucau <rm...@gmail.com>
Authored: Fri Sep 2 13:09:06 2016 +0200
Committer: Romain manni-Bucau <rm...@gmail.com>
Committed: Fri Sep 2 13:09:06 2016 +0200
----------------------------------------------------------------------
.../java/org/apache/tomee/embedded/FatApp.java | 7 ++++++-
.../java/org/apache/tomee/embedded/Main.java | 19 +++++++++++++++----
2 files changed, 21 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/36a534ad/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/FatApp.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/FatApp.java b/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/FatApp.java
index fc64d81..3617358 100644
--- a/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/FatApp.java
+++ b/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/FatApp.java
@@ -22,10 +22,15 @@ import java.util.Collection;
import static java.util.Arrays.asList;
// Main like forcing --as-war --single-classloader
-// commong for fatjars
+// common for fatjars
public final class FatApp {
public static void main(final String[] args) {
final Collection<String> a = args == null || args.length == 0 ? new ArrayList<String>() : new ArrayList<>(asList(args));
+ if (a.size() == 1 && "--help".equals(a.iterator().next())) {
+ Main.main(new String[] {"--help"});
+ return;
+ }
+
if (!a.contains("--as-war")) {
a.add("--as-war");
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/36a534ad/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 74d3db7..9f404ac 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
@@ -74,6 +74,7 @@ public class Main {
public static final String PRE_TASK = "pre-task";
public static final String INTERACTIVE = "interactive";
public static final String CLASSPATH_CONFIGURATION = "classpath-configuration";
+ public static final String HELP = "help";
public static void main(final String[] args) {
final CommandLineParser parser = new PosixParser();
@@ -84,7 +85,12 @@ public class Main {
try {
line = parser.parse(options, args, true);
} catch (final ParseException exp) {
- new HelpFormatter().printHelp("java -jar tomee-embedded-user.jar", options);
+ help(options);
+ return;
+ }
+
+ if (line.hasOption(HELP)) {
+ help(options);
return;
}
@@ -197,6 +203,10 @@ public class Main {
}
}
+ private static void help(Options options) {
+ new HelpFormatter().printHelp("java -jar tomee-embedded-user.jar", options);
+ }
+
private static void close(final Collection<Closeable> post) {
synchronized (post) {
for (final Closeable p : post) {
@@ -245,9 +255,10 @@ public class Main {
options.addOption(null, JAAS_CONFIG, true, "forces tomee to use JAAS with the set config");
options.addOption(null, CACHE_WEB_RESOURCES, true, "should web resources be cached");
options.addOption(null, BASIC, true, "basic authentication if set");
- options.addOption(null, SIMPLE_LOG, true, "should tomee use simple log format (level - message) - demo intended");
- options.addOption("i", INTERACTIVE, true, "should tomee start and wait for SIGTERM signal or wait for 'exit' to be entered");
+ options.addOption(null, SIMPLE_LOG, false, "should tomee use simple log format (level - message) - demo intended");
+ options.addOption("i", INTERACTIVE, false, "should tomee start and wait for SIGTERM signal or wait for 'exit' to be entered");
options.addOption(null, CLASSPATH_CONFIGURATION, true, "a properties file containing the configuration to load");
+ options.addOption("h", HELP, false, "show help");
return options;
}
@@ -268,7 +279,7 @@ public class Main {
if (args.hasOption(TOMEE_XML)) {
config.property("openejb.conf.file", args.getOptionValue(TOMEE_XML));
}
- if (args.hasOption(SIMPLE_LOG) && Boolean.parseBoolean(args.getOptionValue(SIMPLE_LOG))) {
+ if (args.hasOption(SIMPLE_LOG)) {
config.property("openejb.jul.forceReload", "true");
}
if (args.hasOption(PROPERTY)) {