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 2015/04/24 20:09:18 UTC
tomee git commit: let provide a web.xml as well - experimental since
it needs to be a File
Repository: tomee
Updated Branches:
refs/heads/master fdceeb5d4 -> 8f007d2fc
let provide a web.xml as well - experimental since it needs to be a File
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/8f007d2f
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/8f007d2f
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/8f007d2f
Branch: refs/heads/master
Commit: 8f007d2fc8321cb2152a61fccd4e5cf4b0ee9b11
Parents: fdceeb5
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Fri Apr 24 20:09:11 2015 +0200
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Fri Apr 24 20:09:11 2015 +0200
----------------------------------------------------------------------
.../java/org/apache/tomee/embedded/Configuration.java | 10 ++++++++++
.../embedded/internal/StandardContextCustomizer.java | 4 ++++
2 files changed, 14 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/8f007d2f/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Configuration.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Configuration.java b/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Configuration.java
index f54aff9..e437fca 100644
--- a/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Configuration.java
+++ b/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Configuration.java
@@ -49,6 +49,7 @@ public class Configuration {
private String keyAlias;
private String sslProtocol;
+ private String webXml;
private LoginConfigBuilder loginConfig;
private Collection<SecurityConstaintBuilder> securityConstraints = new LinkedList<>();
@@ -280,6 +281,15 @@ public class Configuration {
return this;
}
+ public Configuration setWebXml(final String webXml) {
+ this.webXml = webXml;
+ return this;
+ }
+
+ public String getWebXml() {
+ return webXml;
+ }
+
public LoginConfigBuilder getLoginConfig() {
return loginConfig;
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/8f007d2f/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/internal/StandardContextCustomizer.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/internal/StandardContextCustomizer.java b/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/internal/StandardContextCustomizer.java
index 17ded9e..bc22a5a 100644
--- a/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/internal/StandardContextCustomizer.java
+++ b/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/internal/StandardContextCustomizer.java
@@ -18,6 +18,7 @@
*/
package org.apache.tomee.embedded.internal;
+import org.apache.catalina.Globals;
import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleEvent;
import org.apache.catalina.WebResourceRoot;
@@ -94,6 +95,9 @@ public class StandardContextCustomizer {
for (final SecurityConstaintBuilder sc : config.getSecurityConstraints()) {
context.addConstraint(sc.build());
}
+ if (config.getWebXml() != null) {
+ context.getServletContext().setAttribute(Globals.ALT_DD_ATTR, config.getWebXml());
+ }
}
break;
case Lifecycle.CONFIGURE_START_EVENT: