[openwebbeans] branch main updated: OWB-1417 fire the Startup event

[struberg]

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

struberg pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/openwebbeans.git


The following commit(s) were added to refs/heads/main by this push:
     new 1d4fc0ef1 OWB-1417 fire the Startup event
1d4fc0ef1 is described below

commit 1d4fc0ef1cccdd9a4aaf033abc71a6fd79ddd552
Author: Mark Struberg <strub...@apache.org>
AuthorDate: Thu Jan 26 18:05:03 2023 +0100

    OWB-1417 fire the Startup event
---
 .../src/main/java/org/apache/webbeans/container/BeanManagerImpl.java  | 1 -
 .../main/java/org/apache/webbeans/lifecycle/StandaloneLifeCycle.java  | 4 ++++
 webbeans-tck/testng-dev.xml                                           | 2 +-
 .../java/org/apache/webbeans/web/lifecycle/WebContainerLifecycle.java | 4 ++++
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git 
a/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
 
b/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
index 92cb21c29..e11e9518c 100644
--- 
a/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
+++ 
b/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
@@ -447,7 +447,6 @@ public class BeanManagerImpl implements BeanManager, 
Referenceable
      * @deprecated  This method got deprecated in CDI-2.0.
      *      Users should use {@link #getEvent()} instead.
      */
-    @Deprecated
     public void fireEvent(Object event, Annotation... bindings)
     {
         fireEvent(event, false, bindings);
diff --git 
a/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/StandaloneLifeCycle.java
 
b/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/StandaloneLifeCycle.java
index 60b1fddea..183c34282 100644
--- 
a/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/StandaloneLifeCycle.java
+++ 
b/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/StandaloneLifeCycle.java
@@ -22,6 +22,7 @@ import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.enterprise.context.ConversationScoped;
 import jakarta.enterprise.context.RequestScoped;
 import jakarta.enterprise.context.SessionScoped;
+import jakarta.enterprise.event.Startup;
 import jakarta.inject.Singleton;
 import java.util.Properties;
 import java.util.logging.Logger;
@@ -71,6 +72,9 @@ public class StandaloneLifeCycle extends AbstractLifeCycle
             webBeansContext.getBeanManagerImpl().fireContextLifecyleEvent(
                     new Object(), 
InitializedLiteral.INSTANCE_APPLICATION_SCOPED);
         }
+
+        // fire Startup event
+        webBeansContext.getBeanManagerImpl().fireEvent(new Startup());
     }
 
     @Override
diff --git a/webbeans-tck/testng-dev.xml b/webbeans-tck/testng-dev.xml
index 7d0df47e7..8e4dc015b 100644
--- a/webbeans-tck/testng-dev.xml
+++ b/webbeans-tck/testng-dev.xml
@@ -18,7 +18,7 @@
 <suite name="JSR-346-TCK" verbose="2" configfailurepolicy="continue">
   <test name="JSR-346 TCK">
     <classes>
-          <class 
name="org.jboss.cdi.tck.tests.definition.stereotype.broken.multiplePriorities.inherited.StereotypeInheritedPriorityConflictTest"
 >
+          <class 
name="org.jboss.cdi.tck.tests.event.lifecycle.StartupShutdownTest" >
             <methods>
               <include name=".*"/>
             </methods>
diff --git 
a/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/WebContainerLifecycle.java
 
b/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/WebContainerLifecycle.java
index 45fd63521..d7e79b578 100644
--- 
a/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/WebContainerLifecycle.java
+++ 
b/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/WebContainerLifecycle.java
@@ -18,6 +18,7 @@
  */
 package org.apache.webbeans.web.lifecycle;
 
+import jakarta.enterprise.event.Startup;
 import org.apache.webbeans.annotation.InitializedLiteral;
 import org.apache.webbeans.config.OWBLogConst;
 import org.apache.webbeans.config.WebBeansContext;
@@ -144,6 +145,9 @@ public class WebContainerLifecycle extends AbstractLifeCycle
             webBeansContext.getBeanManagerImpl().fireEvent(
                 servletContext != null ? servletContext : new Object(), 
InitializedLiteral.INSTANCE_APPLICATION_SCOPED);
 
+            // fire Startup event
+            webBeansContext.getBeanManagerImpl().fireEvent(new Startup());
+
             // shut down the RequestContext again
             
webBeansContext.getContextsService().endContext(RequestScoped.class, null);
         }