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/CapabilityServiceTarget.java

@@ -22,14 +22,36 @@
 import org.jboss.msc.service.Service;
 import org.jboss.msc.service.ServiceTarget;
 
-/**The target of ServiceBuilder for capabilities installations.
+/**
+ * The target of ServiceBuilder for capability installations.
  * CapabilityServiceBuilder to be installed on a target should be retrieved by calling one of the {@code addCapability} methods.
  * Notice that installation will only take place after {@link CapabilityServiceBuilder#install()} is invoked.
  * CapabilityServiceBuilder that are not installed are ignored.
  *
  * @author Tomaz Cerar (c) 2017 Red Hat Inc.
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
  */
 public interface CapabilityServiceTarget extends ServiceTarget {
 
+    /**
+     * Gets a builder which can be used to add a capability service into this capability target.
+     *
+     * @param capability the capability to be installed
+     * @param service the service implementing this capability
+     * @return new capability builder instance
+     * @throws IllegalArgumentException if capability does not provide a service
+     * @deprecated use {@link #addCapability(RuntimeCapability)} method instead
+     */
+    @Deprecated
     <T> CapabilityServiceBuilder<T> addCapability(final RuntimeCapability<?> capability, final Service<T> service) throws IllegalArgumentException;
+
+    /**
+     * Gets a builder which can be used to add a capability service into this capability target.
+     *
+     * @param capability the capability to be installed
+     * @return new capability builder instance
+     * @throws IllegalArgumentException if capability does not provide a service
+     */
+    CapabilityServiceBuilder<?> addCapability(final RuntimeCapability<?> capability) throws IllegalArgumentException;
+
 }

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

@@ -2125,6 +2125,16 @@ synchronized void done() {
             }
         }
 
+        @Override
+        @SuppressWarnings("unchecked")
+        public CapabilityServiceBuilder<?> addCapability(final RuntimeCapability<?> capability) throws IllegalArgumentException {
+            if (capability.isDynamicallyNamed()){
+                return new CapabilityServiceBuilderImpl(addService(capability.getCapabilityServiceName(targetAddress)), targetAddress);
+            }else{
+                return new CapabilityServiceBuilderImpl(addService(capability.getCapabilityServiceName()), targetAddress);
+            }
+        }
+
         @Override
         protected ServiceTarget getDelegate() {
             checkNotInManagementOperation();