cli/src/main/java/org/jboss/as/cli/impl/aesh/CLICommandContainer.java

@@ -161,6 +161,16 @@ public void complete(AeshCompleteOperation completeOperation, ParsedLine line, I
         public void doPopulate(ProcessedCommand processedCommand, InvocationProviders invocationProviders, AeshContext aeshContext, Mode mode) throws CommandLineParserException, OptionValidatorException {
             parser.doPopulate(processedCommand, invocationProviders, aeshContext, mode);
         }
+
+        @Override
+        public void updateAnsiMode(boolean mode) {
+            parser.updateAnsiMode(mode);
+        }
+
+        @Override
+        public String getFormattedCommand(int offset, int descriptionStart) {
+            return parser.getFormattedCommand(offset, descriptionStart);
+        }
     }
 
     public class CLICommandParser implements CommandLineParser<CLICommandInvocation> {
@@ -273,6 +283,16 @@ public void complete(AeshCompleteOperation completeOperation, ParsedLine line, I
         public void doPopulate(ProcessedCommand processedCommand, InvocationProviders invocationProviders, AeshContext aeshContext, Mode mode) throws CommandLineParserException, OptionValidatorException {
             container.getParser().doPopulate(processedCommand, invocationProviders, aeshContext, mode);
         }
+
+        @Override
+        public void updateAnsiMode(boolean mode) {
+            container.getParser().updateAnsiMode(mode);
+        }
+
+        @Override
+        public String getFormattedCommand(int offset, int descriptionStart) {
+            return container.getParser().getFormattedCommand(offset, descriptionStart);
+        }
     }
 
     private final CommandContainer<CLICommandInvocation> container;

cli/src/main/java/org/jboss/as/cli/impl/aesh/cmd/operation/LegacyCommandContainer.java

@@ -192,6 +192,16 @@ public void complete(AeshCompleteOperation completeOperation, ParsedLine line, I
         @Override
         public void doPopulate(ProcessedCommand processedCommand, InvocationProviders invocationProviders, AeshContext aeshContext, Mode mode) throws CommandLineParserException, OptionValidatorException {
         }
+
+        @Override
+        public void updateAnsiMode(boolean mode) {
+
+        }
+
+        @Override
+        public String getFormattedCommand(int offset, int descriptionStart) {
+            return null;
+        }
     }
 
     private final Command<CLICommandInvocation> command = new LegacyCommand();

cli/src/main/java/org/jboss/as/cli/impl/aesh/cmd/operation/OperationCommandContainer.java

@@ -186,6 +186,16 @@ public void complete(AeshCompleteOperation completeOperation, ParsedLine line, I
         @Override
         public void doPopulate(ProcessedCommand processedCommand, InvocationProviders invocationProviders, AeshContext aeshContext, Mode mode) throws CommandLineParserException, OptionValidatorException {
         }
+
+        @Override
+        public void updateAnsiMode(boolean mode) {
+
+        }
+
+        @Override
+        public String getFormattedCommand(int offset, int descriptionStart) {
+            return null;
+        }
     }
 
     private final Command<CLICommandInvocation> command = new OperationCommand();

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

@@ -334,7 +334,10 @@ public void start(final StartContext context) throws StartException {
                 rootResourceRegistration,
                 new ContainerStateMonitor(container, getStabilityMonitor()),
                 configurationPersister, processType, runningModeControl, prepareStep,
-                processState, executorService, expressionResolver, authorizer, securityIdentitySupplier, auditLogger, notificationSupport,
+                processState, executorService,
+                getMaxParallelBootExtensionTasks(),
+                getMaxParallelBootSubsystemTasks(),
+                expressionResolver, authorizer, securityIdentitySupplier, auditLogger, notificationSupport,
                 bootErrorCollector, createExtraValidationStepHandler(), capabilityRegistry, getPartialModelIndicator(),
                 injectedInstabilityListener.getOptionalValue());
 
@@ -395,6 +398,14 @@ 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,6 +125,8 @@
     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;
@@ -153,6 +155,8 @@
                         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,
@@ -186,6 +190,8 @@
         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;
@@ -600,9 +606,10 @@ 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 ? null : new ParallelExtensionAddHandler(executorService, parallellBRRRProvider);
-        ParallelBootOperationStepHandler parallelSubsystemHandler = (executorService != null && processType.isServer() && runningModeControl.getRunningMode() == RunningMode.NORMAL)
-                ? new ParallelBootOperationStepHandler(executorService, rootRegistration, processState, this, lockPermit, extraValidationStepHandler) : null;
+        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;
         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;