build-legacy/pom.xml

@@ -30,7 +30,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-core-parent</artifactId>
-        <version>9.0.0.Beta2-SNAPSHOT</version>
+        <version>9.0.0.Beta3-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.Beta2-SNAPSHOT</version>
+        <version>9.0.0.Beta3-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.Beta2-SNAPSHOT</version>
+        <version>9.0.0.Beta3-SNAPSHOT</version>
     </parent>
 
     <artifactId>wildfly-cli</artifactId>

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

@@ -26,10 +26,14 @@
 import org.jboss.logmanager.LogContextSelector;
 import org.jboss.stdio.StdioContext;
 import org.jboss.stdio.StdioContextSelector;
+import org.wildfly.security.manager.WildFlySecurityManager;
 
 /**
  * {@link org.jboss.stdio.StdioContextSelector} and {@link org.jboss.logmanager.LogContextSelector}
  * that uses an {@link java.lang.InheritableThreadLocal} as a source of the contexts.
+ * <p>
+ * Note that if the logger is a CLI logger the default contexts will be used regardless of the thread-local contexts.
+ * </p>
  *
  * @author Brian Stansberry (c) 2015 Red Hat Inc.
  */
@@ -39,6 +43,7 @@
 
     private final Contexts localContexts;
     private final Contexts defaultContexts;
+    private final ClassLoader cliClassLoader;
 
     ThreadLocalContextSelector(Contexts local, Contexts defaults) {
         assert local != null;
@@ -48,6 +53,7 @@
         assert defaults.getLogContext() != null;
         this.localContexts = local;
         this.defaultContexts = defaults;
+        cliClassLoader = ThreadLocalContextSelector.class.getClassLoader();
     }
 
     Contexts pushLocal() {
@@ -62,13 +68,22 @@ 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)) {
+            return defaultContexts.getStdioContext();
+        }
         Contexts threadContext = threadLocal.get();
         StdioContext local = threadContext != null ? threadContext.getStdioContext() : null;
         return local == null ? defaultContexts.getStdioContext() : local;
     }
 
     @Override
     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)) {
+            return defaultContexts.getLogContext();
+        }
         Contexts threadContext = threadLocal.get();
         LogContext local = threadContext != null ? threadContext.getLogContext() : null;
         return local == null ? defaultContexts.getLogContext() : local;

cli/src/main/java/org/jboss/as/cli/impl/CommandContextImpl.java

@@ -1743,6 +1743,11 @@ private void handleCommand(ParsedCommandLine parsed) throws CommandFormatExcepti
                         }
                     }
                 }
+                // Needed to have the command be fully parsed and retrieve the
+                // child command. This is caused by aesh 2.0 behavior.
+                if (isBatchMode()) {
+                    exec.populateCommand();
+                }
                 BatchCompliantCommand bc = exec.getBatchCompliant();
                 if (isBatchMode() && bc != null) {
                     try {

cli/src/main/java/org/jboss/as/cli/impl/aesh/cmd/deployment/AbstractDeployContentCommand.java

@@ -128,9 +128,11 @@ private ModelNode buildDeploymentRequest(CommandContext ctx, String op,
         // replace
         final ModelNode request = new ModelNode();
         request.get(Util.OPERATION).set(op);
-        request.get(Util.NAME).set(name);
         if (op.equals(Util.ADD)) { // replace is on root, add is on deployed artifact.
             request.get(Util.ADDRESS, Util.DEPLOYMENT).set(name);
+        } else {
+            request.get(Util.NAME).set(name);
+            request.get(Util.ADDRESS).setEmptyList();
         }
         if (runtimeName != null) {
             request.get(Util.RUNTIME_NAME).set(runtimeName);

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.Beta2-SNAPSHOT</version>
+        <version>9.0.0.Beta3-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.Beta2-SNAPSHOT</version>
+        <version>9.0.0.Beta3-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.Beta2-SNAPSHOT</version>
+        <version>9.0.0.Beta3-SNAPSHOT</version>
     </parent>
 
     <artifactId>wildfly-controller</artifactId>

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

@@ -1499,7 +1499,7 @@ public void registerCapability(RuntimeCapability capability) {
         registerCapability(capability, activeStep, null);
     }
 
-    void registerCapability(RuntimeCapability capability, Step step, String attribute) {
+    void registerCapability(RuntimeCapability<?> capability, Step step, String attribute) {
         assert isControllingThread();
         assertStageModel(currentStage);
         ensureLocalCapabilityRegistry();
@@ -1614,7 +1614,7 @@ void removeCapability(String capabilityName, Step step) {
         CapabilityScope context = createCapabilityContext(step.address);
         RuntimeCapabilityRegistration capReg = managementModel.getCapabilityRegistry().removeCapability(capabilityName, context, step.address);
         if (capReg != null) {
-            RuntimeCapability capability = capReg.getCapability();
+            RuntimeCapability<?> capability = capReg.getCapability();
             for (String required : capability.getRequirements()) {
                 removeRequirement(required, context, step);
             }
@@ -1994,7 +1994,7 @@ private RuntimeRequirementRegistration createRequirementRegistration(String requ
         return new RuntimeRequirementRegistration(required, dependent, context, rp, runtimeOnly);
     }
 
-    private RuntimeCapabilityRegistration createCapabilityRegistration(RuntimeCapability capability, Step step, String attribute) {
+    private RuntimeCapabilityRegistration createCapabilityRegistration(RuntimeCapability<?> capability, Step step, String attribute) {
         CapabilityScope context = createCapabilityContext(step.address);
         RegistrationPoint rp = new RegistrationPoint(step.address, attribute);
         return new RuntimeCapabilityRegistration(capability, context, rp);

controller/src/main/java/org/jboss/as/controller/capability/RuntimeCapability.java

@@ -300,6 +300,46 @@ private ServiceName getServiceName() {
         return additionalPackages;
     }
 
+    @Override
+    public String getName() {
+        return super.getName();
+    }
+
+    @Override
+    public Set<String> getRequirements() {
+        return super.getRequirements();
+    }
+
+    @Override
+    public boolean isDynamicallyNamed() {
+        return super.isDynamicallyNamed();
+    }
+
+    @Override
+    public String getDynamicName(String dynamicNameElement) {
+        return super.getDynamicName(dynamicNameElement);
+    }
+
+    @Override
+    public String getDynamicName(PathAddress address) {
+        return super.getDynamicName(address);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return super.equals(o);
+    }
+
+    @Override
+    public int hashCode() {
+        return super.hashCode();
+    }
+
+    @Override
+    public String toString() {
+        return super.toString();
+    }
+
     /**
      * Builder for a {@link RuntimeCapability}.
      *

controller/src/main/java/org/jboss/as/controller/capability/registry/CapabilityRegistration.java

@@ -38,7 +38,7 @@
  *
  * @author Brian Stansberry (c) 2014 Red Hat Inc.
  */
-public class CapabilityRegistration<C extends Capability> implements Comparable<CapabilityRegistration> {
+public class CapabilityRegistration<C extends Capability> implements Comparable<CapabilityRegistration<C>> {
 
     private final Map<PathAddress, RegistrationPoint> registrationPoints = new LinkedHashMap<>();
     private final C capability;

controller/src/main/java/org/jboss/as/controller/capability/registry/RuntimeCapabilityRegistration.java

@@ -31,9 +31,9 @@
  *
  * @author Brian Stansberry (c) 2014 Red Hat Inc.
  */
-public class RuntimeCapabilityRegistration extends CapabilityRegistration<RuntimeCapability> {
+public class RuntimeCapabilityRegistration extends CapabilityRegistration<RuntimeCapability<?>> {
 
-    public RuntimeCapabilityRegistration(RuntimeCapability capability, CapabilityScope context, RegistrationPoint registrationPoint) {
+    public RuntimeCapabilityRegistration(RuntimeCapability<?> capability, CapabilityScope context, RegistrationPoint registrationPoint) {
         super(capability, context, registrationPoint);
     }
 

controller/src/main/java/org/jboss/as/controller/operations/global/ReadFeatureDescriptionHandler.java

@@ -814,8 +814,7 @@ private void addRequiredCapabilities(ModelNode feature,
                     }
                 }
                 // WFLY-4164 record the fixed requirements of the registration's capabilities
-                Set<RuntimeCapability> regCaps = registration.getCapabilities();
-                for (RuntimeCapability regCap : regCaps) {
+                for (RuntimeCapability<?> regCap : registration.getCapabilities()) {
                     for (String capReq : regCap.getRequirements()) {
                         if (!required.containsKey(capReq)) {
                             ModelNode capability = new ModelNode();

core-feature-pack/pom.xml

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

core-galleon-pack/pom.xml

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

core-management/core-management-client/pom.xml

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

core-management/core-management-subsystem/pom.xml

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

core-management/pom.xml

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

core-model-test/framework/pom.xml

@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-core-model-test</artifactId>
-        <version>9.0.0.Beta2-SNAPSHOT</version>
+        <version>9.0.0.Beta3-SNAPSHOT</version>
     </parent>
 
     <artifactId>wildfly-core-model-test-framework</artifactId>

core-model-test/pom.xml

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

core-model-test/test-controller-optional/pom.xml

@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-core-model-test</artifactId>
-        <version>9.0.0.Beta2-SNAPSHOT</version>
+        <version>9.0.0.Beta3-SNAPSHOT</version>
     </parent>
     <!--
       Just here for the tests module to include as an optional dependency to avoid picking up

core-model-test/tests/pom.xml

@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-core-model-test</artifactId>
-        <version>9.0.0.Beta2-SNAPSHOT</version>
+        <version>9.0.0.Beta3-SNAPSHOT</version>
     </parent>
 
     <artifactId>wildfly-core-model-test-tests</artifactId>

core-security/api/pom.xml

@@ -31,7 +31,7 @@
     <parent>
        <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-core-security-parent</artifactId>
-        <version>9.0.0.Beta2-SNAPSHOT</version>
+        <version>9.0.0.Beta3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

core-security/implementation/pom.xml

@@ -31,7 +31,7 @@
     <parent>
        <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-core-security-parent</artifactId>
-        <version>9.0.0.Beta2-SNAPSHOT</version>
+        <version>9.0.0.Beta3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

core-security/pom.xml

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

deployment-repository/pom.xml

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

deployment-scanner/pom.xml

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

discovery/pom.xml

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

dist-legacy/pom.xml

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

dist/pom.xml

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

domain-http/error-context/pom.xml

@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-domain-http</artifactId>
-        <version>9.0.0.Beta2-SNAPSHOT</version>
+        <version>9.0.0.Beta3-SNAPSHOT</version>
     </parent>
 
     <artifactId>wildfly-domain-http-error-context</artifactId>