You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jl...@apache.org on 2020/07/23 17:43:24 UTC
[tomee] branch master updated: See where we are at with it back
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/master by this push:
new ffe5e05 See where we are at with it back
ffe5e05 is described below
commit ffe5e0599058f2e564faa4dfb1b557218362979b
Author: Jean-Louis Monteiro <je...@gmail.com>
AuthorDate: Thu Jul 23 19:43:08 2020 +0200
See where we are at with it back
---
.../servlet/TomEESecurityServletContainerInitializer.java | 8 +-------
.../org/apache/tomee/security/servlet/FormAuthServletTest.java | 2 --
2 files changed, 1 insertion(+), 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 73e6c3b..1ada16e 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
@@ -32,16 +32,10 @@ public class TomEESecurityServletContainerInitializer implements ServletContaine
@Override
public void onStartup(final Set<Class<?>> c, final ServletContext ctx) throws ServletException {
- // this needs to be investigated because the BeanManager is not yet available in TomEE at this moment and time
- // we are still deploying the app
- if (true) {
- return;
- }
-
BeanManager beanManager;
try {
beanManager = getBeanManager();
- } catch (IllegalStateException e) {
+ } catch (final IllegalStateException e) {
// CDI not enabled?
return;
diff --git a/tomee/tomee-security/src/test/java/org/apache/tomee/security/servlet/FormAuthServletTest.java b/tomee/tomee-security/src/test/java/org/apache/tomee/security/servlet/FormAuthServletTest.java
index 4e824c8..efb6873 100644
--- a/tomee/tomee-security/src/test/java/org/apache/tomee/security/servlet/FormAuthServletTest.java
+++ b/tomee/tomee-security/src/test/java/org/apache/tomee/security/servlet/FormAuthServletTest.java
@@ -22,7 +22,6 @@ import com.gargoylesoftware.htmlunit.html.HtmlForm;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
import org.apache.tomee.security.AbstractTomEESecurityTest;
import org.apache.tomee.security.cdi.TomcatUserIdentityStoreDefinition;
-import org.junit.Ignore;
import org.junit.Test;
import javax.security.enterprise.authentication.mechanism.http.FormAuthenticationMechanismDefinition;
@@ -38,7 +37,6 @@ import java.io.IOException;
import static org.junit.Assert.assertEquals;
-@Ignore("Until we fix the container initializer")
public class FormAuthServletTest extends AbstractTomEESecurityTest {
@Test
public void authenticate() throws Exception {