[tomee] 42/48: TOMEE-2365 - Values for layer and appContext.

[radcortez]

This is an automated email from the ASF dual-hosted git repository.

radcortez pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git

commit 99d6f10fbd213d6bb857c2aae4a7e653faf2995a
Author: Roberto Cortez <radcor...@yahoo.com>
AuthorDate: Tue Jan 8 15:34:52 2019 +0000

    TOMEE-2365 - Values for layer and appContext.
---
 .../TomEESecurityServletContainerInitializer.java      | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git 
a/tomee/tomee-security/src/main/java/org/apache/tomee/security/servlet/TomEESecurityServletContainerInitializer.java
 
b/tomee/tomee-security/src/main/java/org/apache/tomee/security/servlet/TomEESecurityServletContainerInitializer.java
index 6dc9b25..fcf8452 100644
--- 
a/tomee/tomee-security/src/main/java/org/apache/tomee/security/servlet/TomEESecurityServletContainerInitializer.java
+++ 
b/tomee/tomee-security/src/main/java/org/apache/tomee/security/servlet/TomEESecurityServletContainerInitializer.java
@@ -20,23 +20,23 @@ import org.apache.tomee.security.cdi.TomEESecurityExtension;
 import org.apache.tomee.security.provider.TomEESecurityAuthConfigProvider;
 
 import javax.enterprise.inject.spi.CDI;
-import javax.inject.Inject;
 import javax.security.auth.message.config.AuthConfigFactory;
 import javax.servlet.ServletContainerInitializer;
 import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
-import java.util.Optional;
 import java.util.Set;
 
 public class TomEESecurityServletContainerInitializer implements 
ServletContainerInitializer {
     @Override
     public void onStartup(final Set<Class<?>> c, final ServletContext ctx) 
throws ServletException {
-        
Optional.ofNullable(CDI.current().getBeanManager().getExtension(TomEESecurityExtension.class))
-                .map(TomEESecurityExtension::hasAuthenticationMechanisms)
-                .filter(has -> has.equals(true))
-                .ifPresent(has -> AuthConfigFactory.getFactory()
-                                                   .registerConfigProvider(new 
TomEESecurityAuthConfigProvider(),
-                                                                           
null, null,
-                                                                           
"TomEE Security JSR-375"));
+        final TomEESecurityExtension securityExtension =
+                
CDI.current().getBeanManager().getExtension(TomEESecurityExtension.class);
+
+        if (securityExtension.hasAuthenticationMechanisms()) {
+            AuthConfigFactory.getFactory()
+                             .registerConfigProvider(new 
TomEESecurityAuthConfigProvider(),
+                                                     "http", 
ctx.getVirtualServerName() + " " + ctx.getContextPath(),
+                                                     "TomEE Security JSR-375");
+        }
     }
 }