#30291: waiting on OSGI to be initiated correctly before registering …

…any workflow actionlets (#30531)

To avoid possible race condition, the OSGI actionlets registration is
now preceded by a check that makes sure (after a reasonable number of
tries) that OSGI framework is fully loaded.

dotCMS/src/main/java/com/dotcms/rest/api/v1/osgi/OSGIResource.java

@@ -544,7 +544,7 @@ private void removeReferences() {
         Logger.info( this, "Portlets Removed: " + OSGIUtil.getInstance().portletIDsStopped.toString());
 
         //Remove Actionlets in the list
-        OSGIUtil.getInstance().actionletsStopped.forEach(p -> OSGIUtil.getInstance().workflowOsgiService.removeActionlet(p));
+        OSGIUtil.getInstance().actionletsStopped.forEach(p -> OSGIUtil.getInstance().getWorkflowOsgiService().removeActionlet(p));
         Logger.info( this, "Actionlets Removed: " + OSGIUtil.getInstance().actionletsStopped.toString());
 
         //Cleanup lists

dotCMS/src/main/java/com/dotmarketing/osgi/GenericBundleActivator.java

@@ -82,16 +82,13 @@
 public abstract class GenericBundleActivator implements BundleActivator {
 
     private static final String MANIFEST_HEADER_OVERRIDE_CLASSES = "Override-Classes";
-
     private static final String INIT_PARAM_VIEW_JSP = "view-jsp";
     private static final String INIT_PARAM_VIEW_TEMPLATE = "view-template";
     public static final String BYTEBUDDY_CLASS_RELOADING_STRATEGY_NOT_SET_JAVA_AGENT_NOT_SET = "bytebuddy ClassReloadingStrategy not set [java agent not set?]";
     public static final String COM_LIFERAY_PORTLET_JSPPORTLET = "com.liferay.portlet.JSPPortlet";
     public static final String COM_LIFERAY_PORTLET_VELOCITY_PORTLET = "com.liferay.portlet.VelocityPortlet";
 
     private BundleContext context;
-
-
     private PrimitiveToolboxManager toolboxManager;
     private CacheOSGIService cacheOSGIService;
     private ConditionletOSGIService conditionletOSGIService;
@@ -109,7 +106,6 @@ public abstract class GenericBundleActivator implements BundleActivator {
     private final Collection<String> postHooks = new ArrayList<>();
     private final Collection<String> overriddenClasses = new HashSet<>();
 
-
     protected ClassLoader getBundleClassloader () {
         return this.getClass().getClassLoader();
     }
@@ -563,21 +559,8 @@ protected void addRewriteRule ( String from, String to, String type, String name
      * @param context
      * @param actionlet
      */
-    protected void registerActionlet ( BundleContext context, WorkFlowActionlet actionlet ) {
-
-        //Getting the service to register our Actionlet
-        ServiceReference<?> serviceRefSelected = context.getServiceReference( WorkflowAPIOsgiService.class.getName() );
-        if ( serviceRefSelected == null ) {
-            return;
-        }
-
-
-        OSGIUtil.getInstance().workflowOsgiService = (WorkflowAPIOsgiService) context.getService( serviceRefSelected );
-        OSGIUtil.getInstance().workflowOsgiService.addActionlet( actionlet.getClass() );
-        actionlets.add( actionlet );
-
-        Logger.info( this, "Added actionlet: " + actionlet.getName() );
-        OSGIUtil.getInstance().actionletsStopped.remove(actionlet.getClass().getCanonicalName());
+    protected void registerActionlet(final BundleContext context, final WorkFlowActionlet actionlet) {
+        OSGIUtil.getInstance().registerActionlet(context, actionlet, actionlets);
     }
 
     /**
@@ -831,7 +814,7 @@ protected void unpublishBundleServices () {
      */
     protected void unregisterActionlets () {
 
-        if (OSGIUtil.getInstance().workflowOsgiService != null) {
+        if (OSGIUtil.getInstance().getWorkflowOsgiService() != null) {
             for ( WorkFlowActionlet actionlet : actionlets ) {
                 if(!OSGIUtil.getInstance().actionletsStopped.contains(actionlet.getClass().getCanonicalName())){
                     OSGIUtil.getInstance().actionletsStopped.add(actionlet.getClass().getCanonicalName());