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:24:36 UTC
tomee git commit: fixing some tomee embedded options
Repository: tomee
Updated Branches:
refs/heads/master 36a534adb -> 469e7cb94
fixing some tomee embedded options
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/469e7cb9
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/469e7cb9
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/469e7cb9
Branch: refs/heads/master
Commit: 469e7cb94c52d06102622bd0f54e0bf1a6a470ff
Parents: 36a534a
Author: Romain manni-Bucau <rm...@gmail.com>
Authored: Fri Sep 2 13:23:46 2016 +0200
Committer: Romain manni-Bucau <rm...@gmail.com>
Committed: Fri Sep 2 13:23:46 2016 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/tomee/embedded/FatApp.java | 3 +++
.../src/main/java/org/apache/tomee/embedded/Main.java | 1 +
2 files changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/469e7cb9/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 3617358..8a3f227 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
@@ -37,6 +37,9 @@ public final class FatApp {
if (!a.contains("--single-classloader")) {
a.add("--single-classloader");
}
+ if (Thread.currentThread().getContextClassLoader().getResource("tomee-embedded.properties") != null) { // automatic
+ a.add("--classpath-configuration=tomee-embedded.properties");
+ }
Main.main(a.toArray(new String[a.size()]));
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/469e7cb9/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 9f404ac..fc497ef 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
@@ -258,6 +258,7 @@ public class Main {
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(null, SINGLE_CLASSLOADER, false, "if the application should use the same classloader as the boot one");
options.addOption("h", HELP, false, "show help");
return options;
}