clustering/common/src/main/java/org/jboss/as/clustering/controller/AddStepHandler.java

@@ -191,6 +191,11 @@ protected void populateModel(OperationContext context, ModelNode operation, Reso
         // Auto-create required child resources as necessary
         addRequiredChildren(context, this.descriptor.getRequiredChildren(), (Resource parent, PathElement path) -> parent.hasChild(path));
         addRequiredChildren(context, this.descriptor.getRequiredSingletonChildren(), (Resource parent, PathElement path) -> parent.hasChildren(path.getKey()));
+
+        // Don't leave model undefined
+        if (!model.isDefined()) {
+            model.setEmptyObject();
+        }
     }
 
     private static void addRequiredChildren(OperationContext context, Collection<PathElement> paths, BiPredicate<Resource, PathElement> present) {

clustering/common/src/main/java/org/jboss/as/clustering/controller/BinaryRequirementCapability.java

@@ -22,6 +22,8 @@
 
 package org.jboss.as.clustering.controller;
 
+import java.util.function.UnaryOperator;
+
 import org.jboss.as.controller.capability.RuntimeCapability;
 import org.wildfly.clustering.service.BinaryRequirement;
 
@@ -44,13 +46,19 @@ public BinaryRequirementCapability(BinaryRequirement requirement) {
     /**
      * Creates a new capability based on the specified requirement
      * @param requirement the requirement basis
-     * @param configurator configures the capability
+     * @param resolver a capability name resolver
      */
     public BinaryRequirementCapability(BinaryRequirement requirement, BinaryCapabilityNameResolver resolver) {
-        this.definition = RuntimeCapability.Builder.of(requirement.getName(), true)
-                .setServiceType(requirement.getType())
-                .setDynamicNameMapper(resolver)
-                .build();
+        this(requirement, new CapabilityNameResolverConfigurator(resolver));
+    }
+
+    /**
+     * Creates a new capability based on the specified requirement
+     * @param requirement the requirement basis
+     * @param configurator configures the capability
+     */
+    public BinaryRequirementCapability(BinaryRequirement requirement, UnaryOperator<RuntimeCapability.Builder<Void>> configurator) {
+        this.definition = configurator.apply(RuntimeCapability.Builder.of(requirement.getName(), true).setServiceType(requirement.getType())).build();
     }
 
     @Override

clustering/common/src/main/java/org/jboss/as/clustering/controller/CapabilityNameResolverConfigurator.java

@@ -0,0 +1,51 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2018, Red Hat, Inc., and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.as.clustering.controller;
+
+import java.util.function.Function;
+import java.util.function.UnaryOperator;
+
+import org.jboss.as.controller.PathAddress;
+import org.jboss.as.controller.capability.RuntimeCapability;
+
+/**
+ * Operator that configures a runtime capability with a given capability name resolver.
+ * @author Paul Ferraro
+ */
+public class CapabilityNameResolverConfigurator implements UnaryOperator<RuntimeCapability.Builder<Void>> {
+
+    private final Function<PathAddress, String[]> resolver;
+
+    /**
+     * Creates a new capability name resolver configurator
+     * @param mapper a capability name resolver
+     */
+    public CapabilityNameResolverConfigurator(Function<PathAddress, String[]> resolver) {
+        this.resolver = resolver;
+    }
+
+    @Override
+    public RuntimeCapability.Builder<Void> apply(RuntimeCapability.Builder<Void> builder) {
+        return builder.setDynamicNameMapper(this.resolver);
+    }
+}

clustering/common/src/main/java/org/jboss/as/clustering/controller/UnaryRequirementCapability.java

@@ -22,6 +22,8 @@
 
 package org.jboss.as.clustering.controller;
 
+import java.util.function.UnaryOperator;
+
 import org.jboss.as.controller.capability.RuntimeCapability;
 import org.wildfly.clustering.service.UnaryRequirement;
 
@@ -44,12 +46,19 @@ public UnaryRequirementCapability(UnaryRequirement requirement) {
     /**
      * Creates a new capability based on the specified unary requirement
      * @param requirement the unary requirement basis
+     * @param resolver a capability name resolver
      */
     public UnaryRequirementCapability(UnaryRequirement requirement, UnaryCapabilityNameResolver resolver) {
-        this.definition = RuntimeCapability.Builder.of(requirement.getName(), true)
-                .setServiceType(requirement.getType())
-                .setDynamicNameMapper(resolver)
-                .build();
+        this(requirement, new CapabilityNameResolverConfigurator(resolver));
+    }
+
+    /**
+     * Creates a new capability based on the specified unary requirement
+     * @param requirement the unary requirement basis
+     * @param configurator configures the runtime capability
+     */
+    public UnaryRequirementCapability(UnaryRequirement requirement, UnaryOperator<RuntimeCapability.Builder<Void>> configurator) {
+        this.definition = configurator.apply(RuntimeCapability.Builder.of(requirement.getName(), true).setServiceType(requirement.getType())).build();
     }
 
     @Override

clustering/common/src/main/java/org/jboss/as/clustering/controller/persistence/AttributeXMLBuilderOperator.java

@@ -0,0 +1,78 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2018, Red Hat, Inc., and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.as.clustering.controller.persistence;
+
+import java.util.ArrayList;
+import java.util.EnumSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+import java.util.function.UnaryOperator;
+
+import org.jboss.as.clustering.controller.Attribute;
+import org.jboss.as.controller.AttributeDefinition;
+import org.jboss.as.controller.PersistentResourceXMLDescription.PersistentResourceXMLBuilder;
+
+/**
+ * PersistentResourceXMLBuilder operator that adds the attributes of a given Attribute enumeration
+ * @author Paul Ferraro
+ */
+public class AttributeXMLBuilderOperator implements UnaryOperator<PersistentResourceXMLBuilder> {
+
+    private final List<Attribute> attributes;
+
+    public AttributeXMLBuilderOperator() {
+        this.attributes = new LinkedList<>();
+    }
+
+    public <A extends Enum<A> & Attribute> AttributeXMLBuilderOperator(Class<A> attributeClass) {
+        this.attributes = new ArrayList<>(EnumSet.allOf(attributeClass));
+    }
+
+    public <A extends Enum<A> & Attribute> AttributeXMLBuilderOperator addAttributes(Class<A> attributeClass) {
+        return this.addAttributes(EnumSet.allOf(attributeClass));
+    }
+
+    public <A extends Attribute> AttributeXMLBuilderOperator addAttributes(Set<A> attributes) {
+        this.attributes.addAll(attributes);
+        return this;
+    }
+
+    @Override
+    public PersistentResourceXMLBuilder apply(PersistentResourceXMLBuilder builder) {
+        // Ensure element-based attributes are processed last
+        List<AttributeDefinition> elementAttributes = new LinkedList<>();
+        for (Attribute attribute : this.attributes) {
+            AttributeDefinition definition = attribute.getDefinition();
+            if (definition.getParser().isParseAsElement()) {
+                elementAttributes.add(definition);
+            } else {
+                builder.addAttribute(definition, definition.getParser(), definition.getMarshaller());
+            }
+        }
+        for (AttributeDefinition attribute : elementAttributes) {
+            builder.addAttribute(attribute, attribute.getParser(), attribute.getMarshaller());
+        }
+        return builder;
+    }
+}

clustering/ejb/infinispan/src/main/java/org/wildfly/clustering/ejb/infinispan/ClientMappingsCacheServiceConfiguratorProvider.java

@@ -42,10 +42,10 @@
 import org.wildfly.clustering.infinispan.spi.InfinispanCacheRequirement;
 import org.wildfly.clustering.infinispan.spi.service.CacheServiceConfigurator;
 import org.wildfly.clustering.infinispan.spi.service.TemplateConfigurationServiceConfigurator;
+import org.wildfly.clustering.service.ServiceNameRegistry;
 import org.wildfly.clustering.spi.CacheServiceConfiguratorProvider;
 import org.wildfly.clustering.spi.ClusteringCacheRequirement;
 import org.wildfly.clustering.spi.IdentityCacheServiceConfiguratorProvider;
-import org.wildfly.clustering.spi.ServiceNameRegistry;
 
 /**
  * Creates client mapping services.

clustering/infinispan/extension/src/main/java/org/jboss/as/clustering/infinispan/subsystem/CacheContainerServiceHandler.java

@@ -50,10 +50,10 @@
 import org.wildfly.clustering.infinispan.spi.InfinispanCacheRequirement;
 import org.wildfly.clustering.service.IdentityServiceConfigurator;
 import org.wildfly.clustering.service.ServiceNameProvider;
+import org.wildfly.clustering.service.ServiceNameRegistry;
 import org.wildfly.clustering.spi.IdentityCacheServiceConfiguratorProvider;
 import org.wildfly.clustering.spi.CapabilityServiceNameRegistry;
 import org.wildfly.clustering.spi.ClusteringCacheRequirement;
-import org.wildfly.clustering.spi.ServiceNameRegistry;
 
 /**
  * @author Paul Ferraro

clustering/infinispan/extension/src/main/java/org/jboss/as/clustering/infinispan/subsystem/CacheServiceHandler.java

@@ -47,10 +47,10 @@
 import org.wildfly.clustering.infinispan.spi.service.CacheServiceConfigurator;
 import org.wildfly.clustering.service.IdentityServiceConfigurator;
 import org.wildfly.clustering.service.ServiceNameProvider;
+import org.wildfly.clustering.service.ServiceNameRegistry;
 import org.wildfly.clustering.spi.CacheServiceConfiguratorProvider;
 import org.wildfly.clustering.spi.CapabilityServiceNameRegistry;
 import org.wildfly.clustering.spi.ClusteringCacheRequirement;
-import org.wildfly.clustering.spi.ServiceNameRegistry;
 
 /**
  * @author Paul Ferraro

clustering/infinispan/extension/src/main/java/org/jboss/as/clustering/infinispan/subsystem/InfinispanSubsystemServiceHandler.java

@@ -37,12 +37,12 @@
 import org.jboss.msc.service.ServiceTarget;
 import org.wildfly.clustering.jgroups.spi.JGroupsRequirement;
 import org.wildfly.clustering.service.ServiceNameProvider;
+import org.wildfly.clustering.service.ServiceNameRegistry;
 import org.wildfly.clustering.spi.CapabilityServiceNameRegistry;
 import org.wildfly.clustering.spi.ClusteringRequirement;
 import org.wildfly.clustering.spi.IdentityGroupServiceConfiguratorProvider;
 import org.wildfly.clustering.spi.GroupServiceConfiguratorProvider;
 import org.wildfly.clustering.spi.LocalGroupServiceConfiguratorProvider;
-import org.wildfly.clustering.spi.ServiceNameRegistry;
 
 /**
  * @author Paul Ferraro

clustering/infinispan/extension/src/main/java/org/jboss/as/clustering/infinispan/subsystem/JGroupsTransportServiceHandler.java

@@ -35,10 +35,10 @@
 import org.jboss.dmr.ModelNode;
 import org.jboss.msc.service.ServiceTarget;
 import org.wildfly.clustering.service.ServiceNameProvider;
+import org.wildfly.clustering.service.ServiceNameRegistry;
 import org.wildfly.clustering.spi.CapabilityServiceNameRegistry;
 import org.wildfly.clustering.spi.ClusteringRequirement;
 import org.wildfly.clustering.spi.IdentityGroupServiceConfiguratorProvider;
-import org.wildfly.clustering.spi.ServiceNameRegistry;
 
 /**
  * @author Paul Ferraro

clustering/infinispan/extension/src/main/java/org/jboss/as/clustering/infinispan/subsystem/NoTransportServiceHandler.java

@@ -35,11 +35,11 @@
 import org.jboss.dmr.ModelNode;
 import org.jboss.msc.service.ServiceTarget;
 import org.wildfly.clustering.service.ServiceNameProvider;
+import org.wildfly.clustering.service.ServiceNameRegistry;
 import org.wildfly.clustering.spi.CapabilityServiceNameRegistry;
 import org.wildfly.clustering.spi.ClusteringRequirement;
 import org.wildfly.clustering.spi.IdentityGroupServiceConfiguratorProvider;
 import org.wildfly.clustering.spi.LocalGroupServiceConfiguratorProvider;
-import org.wildfly.clustering.spi.ServiceNameRegistry;
 
 /**
  * @author Paul Ferraro

clustering/infinispan/extension/src/main/java/org/jboss/as/clustering/infinispan/subsystem/remote/ClientThreadPoolServiceConfigurator.java

@@ -30,6 +30,7 @@
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import org.infinispan.client.hotrod.configuration.ConfigurationBuilder;
 import org.infinispan.client.hotrod.configuration.ExecutorFactoryConfiguration;
@@ -47,7 +48,7 @@
 /**
  * @author Radoslav Husar
  */
-public class ClientThreadPoolServiceConfigurator extends ComponentServiceConfigurator<ExecutorFactoryConfiguration> implements ThreadFactory {
+public class ClientThreadPoolServiceConfigurator extends ComponentServiceConfigurator<ExecutorFactoryConfiguration> {
 
     private final ThreadPoolDefinition definition;
 
@@ -68,9 +69,9 @@ public ServiceConfigurator configure(OperationContext context, ModelNode model)
         this.factory = new ExecutorFactory() {
             @Override
             public ExecutorService getExecutor(Properties property) {
-                ThreadFactory clThreadFactory = new ClassLoaderThreadFactory(ClientThreadPoolServiceConfigurator.this, AccessController.doPrivileged((PrivilegedAction<ClassLoader>) ClassLoaderThreadFactory.class::getClassLoader));
+                ThreadFactory factory = new ClassLoaderThreadFactory(new DaemonThreadFactory(DefaultAsyncExecutorFactory.THREAD_NAME), AccessController.doPrivileged((PrivilegedAction<ClassLoader>) ClassLoaderThreadFactory.class::getClassLoader));
 
-                return new ThreadPoolExecutor(minThreads, maxThreads, keepAliveTime, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<>(queueLength), clThreadFactory);
+                return new ThreadPoolExecutor(minThreads, maxThreads, keepAliveTime, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<>(queueLength), factory);
             }
         };
 
@@ -82,11 +83,20 @@ public ExecutorFactoryConfiguration get() {
         return new ConfigurationBuilder().asyncExecutorFactory().factory(this.factory).create();
     }
 
-    @Override
-    public Thread newThread(Runnable task) {
-        Thread thread = new Thread(task, DefaultAsyncExecutorFactory.THREAD_NAME + "-" + DefaultAsyncExecutorFactory.counter.getAndIncrement());
-        thread.setDaemon(true);
-        return thread;
+    private static class DaemonThreadFactory implements ThreadFactory {
+        private final AtomicInteger index = new AtomicInteger(0);
+        private final String name;
+
+        DaemonThreadFactory(String name) {
+            this.name = name;
+        }
+
+        @Override
+        public Thread newThread(Runnable task) {
+            Thread thread = new Thread(task, String.join("-", this.name, String.valueOf(this.index.getAndIncrement())));
+            thread.setDaemon(true);
+            return thread;
+        }
     }
 }
 

clustering/infinispan/extension/src/main/resources/subsystem-templates/infinispan.xml

@@ -18,6 +18,11 @@
                     <transaction mode="BATCH"/>
                     <file-store passivation="true" purge="false"/>
                 </local-cache>
+                <local-cache name="sso">
+                    <locking isolation="REPEATABLE_READ"/>
+                    <transaction mode="BATCH"/>
+                </local-cache>
+                <local-cache name="routing"/>
             </cache-container>
             <cache-container name="ejb" aliases="sfsb" default-cache="passivation" module="org.wildfly.clustering.ejb.infinispan">
                 <local-cache name="passivation">
@@ -54,6 +59,11 @@
                     <transaction mode="BATCH"/>
                     <file-store/>
                 </distributed-cache>
+                <replicated-cache name="dist">
+                    <locking isolation="REPEATABLE_READ"/>
+                    <transaction mode="BATCH"/>
+                </replicated-cache>
+                <replicated-cache name="routing"/>
             </cache-container>
             <cache-container name="ejb" aliases="sfsb" default-cache="dist" module="org.wildfly.clustering.ejb.infinispan">
                 <transport lock-timeout="60000"/>