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:18:48 UTC
tomee git commit: allow to provide a custom realm to tomee embedded
Repository: tomee
Updated Branches:
refs/heads/master 8f007d2fc -> fa1dd8b0c
allow to provide a custom realm to tomee embedded
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/fa1dd8b0
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/fa1dd8b0
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/fa1dd8b0
Branch: refs/heads/master
Commit: fa1dd8b0cc8d8de5955d4d08b52d18e9b427faa0
Parents: 8f007d2
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Fri Apr 24 20:18:42 2015 +0200
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Fri Apr 24 20:18:42 2015 +0200
----------------------------------------------------------------------
.../java/org/apache/tomee/embedded/Configuration.java | 12 ++++++++++++
.../main/java/org/apache/tomee/embedded/Container.java | 8 ++++++--
2 files changed, 18 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/fa1dd8b0/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 e437fca..cfc5ee7 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
@@ -16,6 +16,7 @@
*/
package org.apache.tomee.embedded;
+import org.apache.catalina.Realm;
import org.apache.openejb.util.NetworkUtil;
import java.io.File;
@@ -53,6 +54,8 @@ public class Configuration {
private LoginConfigBuilder loginConfig;
private Collection<SecurityConstaintBuilder> securityConstraints = new LinkedList<>();
+ private Realm realm;
+
private boolean deployOpenEjbApp;
private Map<String, String> users;
@@ -307,4 +310,13 @@ public class Configuration {
securityConstraints.add(constraint);
return this;
}
+
+ public Realm getRealm() {
+ return realm;
+ }
+
+ public Configuration setRealm(final Realm realm) {
+ this.realm = realm;
+ return this;
+ }
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/fa1dd8b0/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java b/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
index 4934700..00b7eb2 100644
--- a/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
+++ b/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
@@ -84,8 +84,6 @@ import org.apache.xbean.finder.UrlSet;
import org.apache.xbean.finder.filter.Filters;
import org.codehaus.swizzle.stream.ReplaceStringsInputStream;
-import javax.naming.Context;
-import javax.naming.NamingException;
import java.io.File;
import java.io.FileOutputStream;
import java.io.FileWriter;
@@ -103,6 +101,8 @@ import java.util.Map;
import java.util.Properties;
import java.util.Set;
import java.util.concurrent.CountDownLatch;
+import javax.naming.Context;
+import javax.naming.NamingException;
import static java.util.Arrays.asList;
@@ -470,6 +470,10 @@ public class Container implements AutoCloseable {
tomcat.setHostname(configuration.getHost());
}
+ if (configuration.getRealm() != null) {
+ tomcat.getEngine().setRealm(configuration.getRealm());
+ }
+
if (tomcat.getRawConnector() == null && !configuration.isSkipHttp()) {
final Connector connector = new Connector(Http11Protocol.class.getName());
connector.setPort(configuration.getHttpPort());