build-legacy/pom.xml

@@ -30,7 +30,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-core-parent</artifactId>
-        <version>9.0.0.Beta3-SNAPSHOT</version>
+        <version>9.0.0.Beta4-SNAPSHOT</version>
     </parent>
 
     <artifactId>wildfly-core-build-legacy</artifactId>

build/pom.xml

@@ -30,7 +30,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-core-parent</artifactId>
-        <version>9.0.0.Beta3-SNAPSHOT</version>
+        <version>9.0.0.Beta4-SNAPSHOT</version>
     </parent>
 
     <artifactId>wildfly-core-build</artifactId>

cli/pom.xml

@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-core-parent</artifactId>
-        <version>9.0.0.Beta3-SNAPSHOT</version>
+        <version>9.0.0.Beta4-SNAPSHOT</version>
     </parent>
 
     <artifactId>wildfly-cli</artifactId>

cli/src/main/java/org/jboss/as/cli/embedded/ThreadLocalContextSelector.java

@@ -69,7 +69,8 @@ void restore(Contexts toRestore) {
     @Override
     public StdioContext getStdioContext() {
         // CLI loggers should only use the default stdio context regardless if the thread-local context is set.
-        if (WildFlySecurityManager.getCurrentContextClassLoaderPrivileged().equals(cliClassLoader)) {
+        final ClassLoader tccl = WildFlySecurityManager.getCurrentContextClassLoaderPrivileged();
+        if (tccl != null && tccl.equals(cliClassLoader)) {
             return defaultContexts.getStdioContext();
         }
         Contexts threadContext = threadLocal.get();
@@ -81,7 +82,8 @@ public StdioContext getStdioContext() {
     public LogContext getLogContext() {
         // CLI loggers should only use the default stdio context regardless if the thread-local context is set This
         // allows the context configured for CLI, e.g. jboss-cli-logging.properties.
-        if (WildFlySecurityManager.getCurrentContextClassLoaderPrivileged().equals(cliClassLoader)) {
+        final ClassLoader tccl = WildFlySecurityManager.getCurrentContextClassLoaderPrivileged();
+        if (tccl != null && tccl.equals(cliClassLoader)) {
             return defaultContexts.getLogContext();
         }
         Contexts threadContext = threadLocal.get();

component-matrix-builder/pom.xml

@@ -26,7 +26,7 @@
         Maintain separation between the artifact id and the version to help prevent
         merge conflicts between commits changing the GA and those changing the V.
         -->
-        <version>9.0.0.Beta3-SNAPSHOT</version>
+        <version>9.0.0.Beta4-SNAPSHOT</version>
     </parent>
 
     <groupId>org.wildfly.core</groupId>

controller-client/pom.xml

@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-core-parent</artifactId>
-        <version>9.0.0.Beta3-SNAPSHOT</version>
+        <version>9.0.0.Beta4-SNAPSHOT</version>
     </parent>
 
     <artifactId>wildfly-controller-client</artifactId>

controller/pom.xml

@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-core-parent</artifactId>
-        <version>9.0.0.Beta3-SNAPSHOT</version>
+        <version>9.0.0.Beta4-SNAPSHOT</version>
     </parent>
 
     <artifactId>wildfly-controller</artifactId>

controller/src/main/java/org/jboss/as/controller/AbstractControllerService.java

@@ -334,10 +334,7 @@ public void start(final StartContext context) throws StartException {
                 rootResourceRegistration,
                 new ContainerStateMonitor(container, getStabilityMonitor()),
                 configurationPersister, processType, runningModeControl, prepareStep,
-                processState, executorService,
-                getMaxParallelBootExtensionTasks(),
-                getMaxParallelBootSubsystemTasks(),
-                expressionResolver, authorizer, securityIdentitySupplier, auditLogger, notificationSupport,
+                processState, executorService, expressionResolver, authorizer, securityIdentitySupplier, auditLogger, notificationSupport,
                 bootErrorCollector, createExtraValidationStepHandler(), capabilityRegistry, getPartialModelIndicator(),
                 injectedInstabilityListener.getOptionalValue());
 
@@ -398,14 +395,6 @@ public ServiceTarget getServiceTarget() {
         bootThread.start();
     }
 
-    protected int getMaxParallelBootExtensionTasks() {
-        return 1;
-    }
-
-    protected int getMaxParallelBootSubsystemTasks() {
-        return 1;
-    }
-
     /**
      * Gets whether this controller service should install a {@link ModelControllerClientFactory}
      * and a {@link org.jboss.as.controller.notification.NotificationHandlerRegistry}

controller/src/main/java/org/jboss/as/controller/CapabilityServiceBuilder.java

@@ -20,7 +20,7 @@
 
 import org.jboss.as.controller.capability.RuntimeCapability;
 import org.jboss.msc.inject.Injector;
-import org.jboss.msc.service.Service;
+import org.jboss.msc.Service;
 import org.jboss.msc.service.ServiceBuilder;
 import org.jboss.msc.service.ServiceController;
 import org.jboss.msc.service.ServiceName;
@@ -29,7 +29,7 @@
 
 /**
  * A builder for an individual service in a {@code CapabilityServiceTarget}.
- * Create an instance via the {@link CapabilityServiceTarget#addCapability(RuntimeCapability, Service)},
+ * Create an instance via the {@link CapabilityServiceTarget#addCapability(RuntimeCapability)},
  * {@link #addCapabilityRequirement(String, Class, Injector)} or other methods.
  * Builder also add supports to add capability requirement for service injection via {@link #addCapabilityRequirement(String, Class, Injector)}
  *
@@ -103,6 +103,13 @@
     @Override
     CapabilityServiceBuilder<T> setInitialMode(ServiceController.Mode mode);
 
+    /**
+     * {@inheritDoc}
+     * @return this builder
+     */
+    @Override
+    CapabilityServiceBuilder<T> setInstance(Service service);
+
     /**
      * Capability requirement.
      *

controller/src/main/java/org/jboss/as/controller/ModelControllerImpl.java

@@ -125,8 +125,6 @@
     private final OperationStepHandler prepareStep;
     private final ControlledProcessState processState;
     private final ExecutorService executorService;
-    private final int maxParallelBootExtensionTasks;
-    private final int maxParallelBootSubsystemTasks;
     private final ExpressionResolver expressionResolver;
     private final Authorizer authorizer;
     private final Supplier<SecurityIdentity> securityIdentitySupplier;
@@ -155,8 +153,6 @@
                         final ContainerStateMonitor stateMonitor, final ConfigurationPersister persister,
                         final ProcessType processType, final RunningModeControl runningModeControl,
                         final OperationStepHandler prepareStep, final ControlledProcessState processState, final ExecutorService executorService,
-                        final int maxParallelBootExtensionTasks,
-                        final int maxParallelBootSubsystemTasks,
                         final ExpressionResolver expressionResolver, final Authorizer authorizer, final Supplier<SecurityIdentity> securityIdentitySupplier,
                         final ManagedAuditLogger auditLogger, NotificationSupport notificationSupport,
                         final BootErrorCollector bootErrorCollector, final OperationStepHandler extraValidationStepHandler,
@@ -190,8 +186,6 @@
         this.processState = processState;
         this.serviceTarget.addMonitor(stateMonitor.getStabilityMonitor());
         this.executorService = executorService;
-        this.maxParallelBootExtensionTasks = maxParallelBootExtensionTasks;
-        this.maxParallelBootSubsystemTasks = maxParallelBootSubsystemTasks;
         assert expressionResolver != null;
         this.expressionResolver = expressionResolver;
         assert securityIdentitySupplier != null;
@@ -606,10 +600,9 @@ private BootOperations organizeBootOperations(List<ModelNode> bootList, final in
         final ManagementResourceRegistration rootRegistration = managementModel.get().getRootResourceRegistration();
         final MutableRootResourceRegistrationProvider parallellBRRRProvider = parallelBootRootResourceRegistrationProvider != null ?
                 parallelBootRootResourceRegistrationProvider : getMutableRootResourceRegistrationProvider();
-        ParallelExtensionAddHandler parallelExtensionAddHandler = executorService == null || maxParallelBootExtensionTasks < 2 ? null : new ParallelExtensionAddHandler(executorService, maxParallelBootExtensionTasks, parallellBRRRProvider);
-        ParallelBootOperationStepHandler parallelSubsystemHandler = (executorService != null && maxParallelBootSubsystemTasks > 1 && processType.isServer() && runningModeControl.getRunningMode() == RunningMode.NORMAL)
-                ? new ParallelBootOperationStepHandler(executorService, maxParallelBootSubsystemTasks, rootRegistration, processState, this, lockPermit, extraValidationStepHandler)
-                : null;
+        ParallelExtensionAddHandler parallelExtensionAddHandler = executorService == null ? null : new ParallelExtensionAddHandler(executorService, parallellBRRRProvider);
+        ParallelBootOperationStepHandler parallelSubsystemHandler = (executorService != null && processType.isServer() && runningModeControl.getRunningMode() == RunningMode.NORMAL)
+                ? new ParallelBootOperationStepHandler(executorService, rootRegistration, processState, this, lockPermit, extraValidationStepHandler) : null;
         boolean registeredParallelSubsystemHandler = false;
         int subsystemIndex = 0;
         for (ModelNode bootOp : bootList) {

controller/src/main/java/org/jboss/as/controller/OperationContextImpl.java

@@ -2639,6 +2639,12 @@ public ServiceName getCapabilityServiceName(String capabilityBaseName, String ..
             return this;
         }
 
+        @Override
+        public CapabilityServiceBuilder<T> setInstance(org.jboss.msc.Service service) {
+            super.setInstance(service);
+            return this;
+        }
+
         @Override
         public <V> Supplier<V> requiresCapability(String capabilityBaseName, Class<V> dependencyType, String... referenceNames) {
             String capabilityName;