diff --git a/README.md b/README.md
index 9ef86b1..4b1093c 100644
--- a/README.md
+++ b/README.md
@@ -4,14 +4,14 @@ ModeShape Quickstarts
 What is it?
 -----------
 
-ModeShape quickstarts are a collection of self-contained projects, that demonstrate how to use ModeShape when installed as part of JBoss EAP.
+ModeShape quickstarts are a collection of self-contained projects, that demonstrate how to use ModeShape when installed as part of JBoss AS.
 Each quickstart is a small, specific, focused, working example that can be used as a reference for your own project.
 
 System requirements
 -------------------
 
-All you need to build the quickstarts is Java 6.0 (Java SDK 1.6) or better, Maven 3.0 or better. Each quickstart
-produces a web application (WAR) that is designed to be run on JBoss Enterprise Application Platform 6.
+All you need to build the quickstarts is Java 7.0 (Java SDK 1.7) or better, Maven 3.0 or better. Each quickstart
+produces a web application (WAR) that is designed to be run on JBoss Wildfly 8.
 
 Contents
 --------
@@ -19,7 +19,7 @@ Contents
 The following quickstarts are available:
 
 * [modeshape-cdi](modeshape-cdi) - shows how you use CDI to inject various ModeShape JCR object instances
-* [modeshape-cli](modeshape-cli) - shows how you use the JBoss EAP CLI to configure a ModeShape subsystem
+* [modeshape-cli](modeshape-cli) - shows how you use the JBoss AS CLI to configure a ModeShape subsystem
 * [modeshape-clustering](modeshape-clustering) - shows how you can configure multiple ModeShape nodes to run in a cluster
 * [modeshape-ejb](modeshape-ejb) - shows how you can use ModeShape from different types of EJBs
 * [modeshape-servlet](modeshape-servlet) - shows how you can use ModeShape from a standard web application Servlet
diff --git a/dist/pom.xml b/dist/pom.xml
index 1522aae..5f030cf 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -4,7 +4,7 @@
     <groupId>org.modeshape.quickstarts</groupId>
     <artifactId>modeshape-quickstarts-dist</artifactId>
     <version>3.7.1.Final</version>
-    <name>ModeShape EAP Quickstarts Distribution</name>
+    <name>ModeShape AS Quickstarts Distribution</name>
     <description>POM for building the quickstarts distribution.</description>
     <url>http://www.modeshape.org</url>
     <packaging>pom</packaging>
diff --git a/dist/src/main/assembly/assembly.xml b/dist/src/main/assembly/assembly.xml
index 6e836ae..554b9a5 100644
--- a/dist/src/main/assembly/assembly.xml
+++ b/dist/src/main/assembly/assembly.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="
-              http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.1.xsd">
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1 http://maven.apache.org/xsd/assembly-1.1.1.xsd">
     <id>dist</id>
     <baseDirectory>modeshape-quickstarts-${project.version}</baseDirectory>
     <formats>
diff --git a/modeshape-cdi/README.md b/modeshape-cdi/README.md
index f8fbf91..b8688db 100644
--- a/modeshape-cdi/README.md
+++ b/modeshape-cdi/README.md
@@ -11,15 +11,15 @@ a JSF application, using only CDI.
 System requirements
 -------------------
 
-All you need to build this project is Java 6.0 (Java SDK 1.6) or better, Maven 3.0 or better.
-The application this project produces is designed to be run on JBoss Enterprise Application Platform 6.
+All you need to build this project is Java 7.0 (Java SDK 1.7) or better, Maven 3.0 or better.
+The application this project produces is designed to be run on JBoss Wildfly 8.
 
-Install ModeShape's EAP kit into an existing JBoss EAP 6 server
+Install ModeShape's AS kit into an existing Wildfly 8 server
 -----------------------------------------------------
-Before running this demo make sure that you have installed the ModeShape EAP kit into an existing JBoss EAP server.
+Before running this demo make sure that you have installed the ModeShape Wildfly kit into an existing JBoss Wildfly server.
 The simplest way to do this is to follow the instructions provided [here](https://docs.jboss.org/author/display/MODE/Installing+ModeShape+into+AS7)
 
-Start JBoss EAP with the ModeShape configuration
+Start JBoss Wildfly with the ModeShape configuration
 --------------------------------------------------------------------------------
 
 1. Open a command line and navigate to the root of the JBoss server directory.
diff --git a/modeshape-cdi/pom.xml b/modeshape-cdi/pom.xml
index 0c46d33..1d87ead 100644
--- a/modeshape-cdi/pom.xml
+++ b/modeshape-cdi/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.modeshape.quickstarts</groupId>
     <artifactId>modeshape-cdi</artifactId>
-    <version>3.7.1.Final</version>
+    <version>4.0-SNAPSHOT</version>
     <packaging>war</packaging>
     <name>Example of a JSF web application that uses ModeShape via CDI</name>
     <description>
@@ -13,8 +13,8 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.6</maven.compiler.source>
-        <maven.compiler.target>1.6</maven.compiler.target>
+        <maven.compiler.source>1.7</maven.compiler.source>
+        <maven.compiler.target>1.7</maven.compiler.target>
 
         <!-- Maven plugin versions -->
         <version.assembly.plugin>2.4</version.assembly.plugin>
@@ -29,7 +29,7 @@
         <version.org.jboss.as.plugins.maven.plugin>7.4.Final</version.org.jboss.as.plugins.maven.plugin>
 
         <!-- Global dependency version information-->
-        <version.modeshape>3.7.1.Final</version.modeshape>
+        <version.modeshape>4.0-SNAPSHOT</version.modeshape>
     </properties>
 
     <dependencyManagement>
@@ -40,7 +40,7 @@
                  specify the versions of any of those modules.-->
             <dependency>
                 <groupId>org.modeshape.bom</groupId>
-                <artifactId>modeshape-bom-jbosseap</artifactId>
+                <artifactId>modeshape-bom-jbossas</artifactId>
                 <version>${version.modeshape}</version>
                 <type>pom</type>
                 <scope>import</scope>
@@ -92,6 +92,7 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
+
         <dependency>
             <groupId>org.jboss.arquillian.junit</groupId>
             <artifactId>arquillian-junit-container</artifactId>
@@ -213,9 +214,8 @@
             <id>arq-jbossas-remote</id>
             <dependencies>
                 <dependency>
-                    <groupId>org.jboss.as</groupId>
-                    <artifactId>jboss-as-arquillian-container-remote</artifactId>
-                    <scope>test</scope>
+                    <groupId>org.wildfly</groupId>
+                    <artifactId>wildfly-arquillian-container-remote</artifactId>
                 </dependency>
             </dependencies>
         </profile>
diff --git a/modeshape-cdi/src/main/java/org/modeshape/quickstart/cdi/CDIController.java b/modeshape-cdi/src/main/java/org/modeshape/quickstart/cdi/CDIController.java
index 39e313b..cafe4ec 100644
--- a/modeshape-cdi/src/main/java/org/modeshape/quickstart/cdi/CDIController.java
+++ b/modeshape-cdi/src/main/java/org/modeshape/quickstart/cdi/CDIController.java
@@ -1,6 +1,6 @@
 package org.modeshape.quickstart.cdi;
 
-import java.util.Collections;
+import java.util.LinkedHashSet;
 import java.util.Set;
 import java.util.TreeSet;
 import javax.enterprise.context.RequestScoped;
@@ -28,7 +28,7 @@ public class CDIController {
     private String parentPath = "/";
     private String newNodeName;
 
-    private Set<String> children = Collections.emptySet();
+    private Set<String> children = new TreeSet<>();
 
     /**
      * Sets a name for a new node to create.
@@ -79,7 +79,7 @@ public Set<String> getChildren() {
      * Loads the children nodes of the node located at {@link CDIController#parentPath}
      */
     public void loadChildren() {
-        children = new TreeSet<String>();
+        children = new TreeSet<>();
         if (parentPath == null || parentPath.trim().length() == 0) {
             FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(
                     "The absolute path of the parent node is required"));
diff --git a/modeshape-cli/README.md b/modeshape-cli/README.md
index d8c32d8..20f23a6 100644
--- a/modeshape-cli/README.md
+++ b/modeshape-cli/README.md
@@ -11,15 +11,15 @@ a JSF application, after the ModeShape subsystem and the repository have be set
 System requirements
 -------------------
 
-All you need to build this project is Java 6.0 (Java SDK 1.6) or better, Maven 3.0 or better.
-The application this project produces is designed to be run on JBoss Enterprise Application Platform 6.
+All you need to build this project is Java 7.0 (Java SDK 1.7) or better, Maven 3.0 or better.
+The application this project produces is designed to be run on JBoss Wildfly 8.
 
-Install ModeShape's EAP kit into an existing JBoss EAP 6 server
+Install ModeShape's AS kit into an existing JBoss Wildfly server
 -----------------------------------------------------
-Before running this demo make sure that you have installed the ModeShape EAP kit into an existing JBoss EAP server.
+Before running this demo make sure that you have installed the ModeShape AS kit into an existing JBoss Wildfly server.
 The simplest way to do this is to follow the instructions provided [here](https://docs.jboss.org/author/display/MODE/Installing+ModeShape+into+AS7)
 
-Start JBoss EAP with the default configuration
+Start Wildfly with the default configuration
 --------------------------------------------------------------------------------
 
 1. Open a command line and navigate to the root of the JBoss server directory.
@@ -34,8 +34,8 @@ Run the CLI script that creates the demo repository
 1. Open a command line and navigate to the root of the JBoss server directory.
 2. The following shows the command line which runs the script that creates the repository:
 
-        For Linux:   JBOSS_HOME/bin/jboss-cli.sh -c --file QUICKSTART_ROOT/src/main/resources/create-repository.cli
-        For Windows: JBOSS_HOME\bin\jboss-cli.bat -c --file QUICKSTART_ROOT\src\main\resources\create-repository.cli
+        For Linux:   JBOSS_HOME/bin/jboss-cli.sh -c --file=QUICKSTART_ROOT/src/main/resources/create-repository.cli
+        For Windows: JBOSS_HOME\bin\jboss-cli.bat -c --file=QUICKSTART_ROOT\src\main\resources\create-repository.cli
 
 Build and Deploy the Quickstart
 -------------------------
diff --git a/modeshape-cli/pom.xml b/modeshape-cli/pom.xml
index cb3ca5f..c9ba635 100644
--- a/modeshape-cli/pom.xml
+++ b/modeshape-cli/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.modeshape.quickstarts</groupId>
     <artifactId>modeshape-cli</artifactId>
-    <version>3.7.1.Final</version>
+    <version>4.0-SNAPSHOT</version>
     <packaging>war</packaging>
     <name>Example of a JSF web application that uses CLI scripts to create and remove a repository</name>
     <description>
@@ -13,8 +13,8 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.6</maven.compiler.source>
-        <maven.compiler.target>1.6</maven.compiler.target>
+        <maven.compiler.source>1.7</maven.compiler.source>
+        <maven.compiler.target>1.7</maven.compiler.target>
 
         <!-- Maven plugin versions -->
         <version.assembly.plugin>2.4</version.assembly.plugin>
@@ -29,7 +29,7 @@
         <version.org.jboss.as.plugins.maven.plugin>7.4.Final</version.org.jboss.as.plugins.maven.plugin>
 
         <!-- Global dependency version information-->
-        <version.modeshape>3.7.1.Final</version.modeshape>
+        <version.modeshape>4.0-SNAPSHOT</version.modeshape>
     </properties>
 
     <dependencyManagement>
@@ -40,7 +40,7 @@
                  specify the versions of any of those modules.-->
             <dependency>
                 <groupId>org.modeshape.bom</groupId>
-                <artifactId>modeshape-bom-jbosseap</artifactId>
+                <artifactId>modeshape-bom-jbossas</artifactId>
                 <version>${version.modeshape}</version>
                 <type>pom</type>
                 <scope>import</scope>
@@ -260,9 +260,8 @@
             <id>arq-jbossas-remote</id>
             <dependencies>
                 <dependency>
-                    <groupId>org.jboss.as</groupId>
-                    <artifactId>jboss-as-arquillian-container-remote</artifactId>
-                    <scope>test</scope>
+                    <groupId>org.wildfly</groupId>
+                    <artifactId>wildfly-arquillian-container-remote</artifactId>
                 </dependency>
             </dependencies>
         </profile>
diff --git a/modeshape-cli/src/main/resources/create-repository.cli b/modeshape-cli/src/main/resources/create-repository.cli
index c3eb4a6..62b1ee4 100644
--- a/modeshape-cli/src/main/resources/create-repository.cli
+++ b/modeshape-cli/src/main/resources/create-repository.cli
@@ -14,7 +14,7 @@ if (outcome != success) of /subsystem=infinispan/cache-container=modeshape-test:
     /subsystem=infinispan/cache-container=modeshape-test:add
     /subsystem=infinispan/cache-container=modeshape-test/local-cache=test-cli:add
     /subsystem=infinispan/cache-container=modeshape-test/local-cache=test-cli/transaction=TRANSACTION:add(mode=NON_XA)
-    /subsystem=infinispan/cache-container=modeshape-test/local-cache=test-cli/file-store=FILE_STORE:add(path="modeshape/store/test-cli",relative-to="jboss.server.data.dir",passivation=false,purge=false)
+    /subsystem=infinispan/cache-container=modeshape-test/local-cache=test-cli/file-store=FILE_STORE:add(path="modeshape/store/test-cli",passivation=false,purge=false)
 end-if
 
 # Add the test repository
diff --git a/modeshape-clustering/README.md b/modeshape-clustering/README.md
index e0ac7ba..e0ce12b 100644
--- a/modeshape-clustering/README.md
+++ b/modeshape-clustering/README.md
@@ -20,16 +20,16 @@ is the distributed JMS configuration, with the __JMS provider configured for Hig
 System requirements
 -------------------
 
-All you need to build this project is Java 6.0 (Java SDK 1.6) or better, Maven 3.0 or better.
-The application this project produces is designed to be run on JBoss Enterprise Application Platform 6.
+All you need to build this project is Java 7.0 (Java SDK 1.7) or better, Maven 3.0 or better.
+The application this project produces is designed to be run on JBoss Wildfly.
 
-Install ModeShape's EAP kit into an existing JBoss EAP 6 server
+Install ModeShape's Wildfly kit into an existing JBoss Wildfly server
 ---------------------------------------------------------------
 
-Before running this demo make sure that you have installed the ModeShape EAP kit into an existing JBoss EAP server.
+Before running this demo make sure that you have installed the ModeShape Wildfly kit into an existing JBoss Wildfly server.
 The simplest way to do this is to follow the instructions provided [here](https://docs.jboss.org/author/display/MODE/Installing+ModeShape+into+AS7)
 
-Start 2 JBoss EAP instances with either set of provided configurations (see above)
+Start 2 JBoss Wildfly instances with either set of provided configurations (see above)
 --------------------------------------------------------------------------------------
 
 1. Copy the `standalone-modeshape-master.xml` and `standalone-modeshape-slave.xml` configuration files from the root of the quickstart
diff --git a/modeshape-clustering/pom.xml b/modeshape-clustering/pom.xml
index b8c2b5a..f8851c6 100644
--- a/modeshape-clustering/pom.xml
+++ b/modeshape-clustering/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.modeshape.quickstarts</groupId>
     <artifactId>modeshape-clustering</artifactId>
-    <version>3.7.1.Final</version>
+    <version>4.0-SNAPSHOT</version>
     <packaging>war</packaging>
     <name>Example of a JSF web application that uses several clustered ModeShape servers</name>
     <description>
@@ -13,8 +13,8 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.6</maven.compiler.source>
-        <maven.compiler.target>1.6</maven.compiler.target>
+        <maven.compiler.source>1.7</maven.compiler.source>
+        <maven.compiler.target>1.7</maven.compiler.target>
 
         <!-- Maven plugin versions -->
         <version.assembly.plugin>2.4</version.assembly.plugin>
@@ -29,7 +29,7 @@
         <version.org.jboss.as.plugins.maven.plugin>7.4.Final</version.org.jboss.as.plugins.maven.plugin>
 
         <!-- Global dependency version information-->
-        <version.modeshape>3.7.1.Final</version.modeshape>
+        <version.modeshape>4.0-SNAPSHOT</version.modeshape>
     </properties>
 
     <dependencyManagement>
@@ -40,7 +40,7 @@
                  specify the versions of any of those modules.-->
             <dependency>
                 <groupId>org.modeshape.bom</groupId>
-                <artifactId>modeshape-bom-jbosseap</artifactId>
+                <artifactId>modeshape-bom-jbossas</artifactId>
                 <version>${version.modeshape}</version>
                 <type>pom</type>
                 <scope>import</scope>
@@ -214,9 +214,8 @@
             <id>arq-jbossas-remote</id>
             <dependencies>
                 <dependency>
-                    <groupId>org.jboss.as</groupId>
-                    <artifactId>jboss-as-arquillian-container-remote</artifactId>
-                    <scope>test</scope>
+                    <groupId>org.wildfly</groupId>
+                    <artifactId>wildfly-arquillian-container-remote</artifactId>
                 </dependency>
             </dependencies>
         </profile>
diff --git a/modeshape-clustering/src/main/java/org/modeshape/quickstart/clustering/ClusteringController.java b/modeshape-clustering/src/main/java/org/modeshape/quickstart/clustering/ClusteringController.java
index ced8157..e388268 100644
--- a/modeshape-clustering/src/main/java/org/modeshape/quickstart/clustering/ClusteringController.java
+++ b/modeshape-clustering/src/main/java/org/modeshape/quickstart/clustering/ClusteringController.java
@@ -36,7 +36,7 @@ public class ClusteringController {
     private String newNodeName;
     private String nodeNamePattern;
 
-    private Set<String> nodes = Collections.emptySet();
+    private Set<String> nodes = new TreeSet<String>();
 
     /**
      * Sets a name for a new node to create.
diff --git a/modeshape-clustering/standalone-modeshape-master-jms.xml b/modeshape-clustering/standalone-modeshape-master-jms.xml
index 899f2b8..6a3ed78 100644
--- a/modeshape-clustering/standalone-modeshape-master-jms.xml
+++ b/modeshape-clustering/standalone-modeshape-master-jms.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 
-<server xmlns="urn:jboss:domain:1.4">
+<server xmlns="urn:jboss:domain:2.0">
     <extensions>
         <extension module="org.jboss.as.clustering.infinispan"/>
         <extension module="org.jboss.as.clustering.jgroups"/>
@@ -8,13 +8,16 @@
         <extension module="org.jboss.as.deployment-scanner"/>
         <extension module="org.jboss.as.ee"/>
         <extension module="org.jboss.as.ejb3"/>
+        <extension module="org.jboss.as.jacorb"/>
         <extension module="org.jboss.as.jaxrs"/>
         <extension module="org.jboss.as.jdr"/>
         <extension module="org.jboss.as.jmx"/>
         <extension module="org.jboss.as.jpa"/>
         <extension module="org.jboss.as.jsf"/>
+        <extension module="org.jboss.as.jsr77"/>
         <extension module="org.jboss.as.logging"/>
         <extension module="org.jboss.as.mail"/>
+        <extension module="org.jboss.as.messaging"/>
         <extension module="org.jboss.as.modcluster"/>
         <extension module="org.jboss.as.naming"/>
         <extension module="org.jboss.as.pojo"/>
@@ -23,11 +26,12 @@
         <extension module="org.jboss.as.security"/>
         <extension module="org.jboss.as.threads"/>
         <extension module="org.jboss.as.transactions"/>
-        <extension module="org.jboss.as.web"/>
         <extension module="org.jboss.as.webservices"/>
         <extension module="org.jboss.as.weld"/>
+        <extension module="org.wildfly.extension.batch"/>
+        <extension module="org.wildfly.extension.io"/>
+        <extension module="org.wildfly.extension.undertow"/>
         <extension module="org.modeshape"/>
-        <extension module="org.jboss.as.messaging"/>
     </extensions>
 
     <system-properties>
@@ -42,6 +46,9 @@
                     <local default-user="$local"/>
                     <properties path="mgmt-users.properties" relative-to="jboss.server.config.dir"/>
                 </authentication>
+                <authorization map-groups-to-roles="false">
+                    <properties path="mgmt-groups.properties" relative-to="jboss.server.config.dir"/>
+                </authorization>
             </security-realm>
             <security-realm name="ApplicationRealm">
                 <authentication>
@@ -53,27 +60,48 @@
                 </authorization>
             </security-realm>
         </security-realms>
+        <audit-log>
+            <formatters>
+                <json-formatter name="json-formatter"/>
+            </formatters>
+            <handlers>
+                <file-handler name="file" formatter="json-formatter" relative-to="jboss.server.data.dir" path="audit-log.log"/>
+            </handlers>
+            <logger log-boot="true" log-read-only="false" enabled="false">
+                <handlers>
+                    <handler name="file"/>
+                </handlers>
+            </logger>
+        </audit-log>
         <management-interfaces>
             <native-interface security-realm="ManagementRealm">
                 <socket-binding native="management-native"/>
             </native-interface>
-            <http-interface security-realm="ManagementRealm">
+            <http-interface security-realm="ManagementRealm" http-upgrade-enabled="true">
                 <socket-binding http="management-http"/>
             </http-interface>
         </management-interfaces>
+        <access-control provider="simple">
+            <role-mapping>
+                <role name="SuperUser">
+                    <include>
+                        <user name="$local"/>
+                    </include>
+                </role>
+            </role-mapping>
+        </access-control>
     </management>
-
     <profile>
-        <subsystem xmlns="urn:jboss:domain:logging:1.2">
+        <subsystem xmlns="urn:jboss:domain:logging:2.0">
             <console-handler name="CONSOLE">
                 <level name="INFO"/>
                 <formatter>
-                    <pattern-formatter pattern="%K{level}%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
+                    <named-formatter name="COLOR-PATTERN"/>
                 </formatter>
             </console-handler>
             <periodic-rotating-file-handler name="FILE" autoflush="true">
                 <formatter>
-                    <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
+                    <named-formatter name="PATTERN"/>
                 </formatter>
                 <file relative-to="jboss.server.log.dir" path="server.log"/>
                 <suffix value=".yyyy-MM-dd"/>
@@ -104,11 +132,26 @@
                     <handler name="FILE"/>
                 </handlers>
             </root-logger>
+            <formatter name="PATTERN">
+                <pattern-formatter pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
+            </formatter>
+            <formatter name="COLOR-PATTERN">
+                <pattern-formatter pattern="%K{level}%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
+            </formatter>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:datasources:1.1">
+        <subsystem xmlns="urn:jboss:domain:batch:1.0">
+            <job-repository>
+                <in-memory/>
+            </job-repository>
+            <thread-pool>
+                <max-threads count="10"/>
+                <keepalive-time time="100" unit="milliseconds"/>
+            </thread-pool>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:datasources:2.0">
             <datasources>
                 <datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true" use-java-context="true">
-                    <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1</connection-url>
+                    <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE</connection-url>
                     <driver>h2</driver>
                     <security>
                         <user-name>sa</user-name>
@@ -122,19 +165,34 @@
                 </drivers>
             </datasources>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:deployment-scanner:1.1">
-            <deployment-scanner path="deployments" relative-to="jboss.server.base.dir" scan-interval="5000"/>
+        <subsystem xmlns="urn:jboss:domain:deployment-scanner:2.0">
+            <deployment-scanner path="deployments" relative-to="jboss.server.base.dir" scan-interval="5000" runtime-failure-causes-rollback="${jboss.deployment.scanner.rollback.on.failure:false}"/>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:ee:1.1">
+        <subsystem xmlns="urn:jboss:domain:ee:2.0">
             <spec-descriptor-property-replacement>false</spec-descriptor-property-replacement>
             <jboss-descriptor-property-replacement>true</jboss-descriptor-property-replacement>
+            <ejb-annotation-property-replacement>false</ejb-annotation-property-replacement>
+            <concurrent>
+                <context-services>
+                    <context-service name="default" jndi-name="java:jboss/ee/concurrency/context/default" use-transaction-setup-provider="true"/>
+                </context-services>
+                <managed-executor-services>
+                    <managed-executor-service name="default" jndi-name="java:jboss/ee/concurrency/executor/default" context-service="default" hung-task-threshold="60000" core-threads="5" max-threads="25" keepalive-time="5000"/>
+                </managed-executor-services>
+                <managed-scheduled-executor-services>
+                    <managed-scheduled-executor-service name="default" jndi-name="java:jboss/ee/concurrency/scheduler/default" context-service="default" hung-task-threshold="60000" core-threads="2" keepalive-time="3000"/>
+                </managed-scheduled-executor-services>
+                <managed-thread-factories>
+                    <managed-thread-factory name="default" jndi-name="java:jboss/ee/concurrency/factory/default" context-service="default"/>
+                </managed-thread-factories>
+            </concurrent>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:ejb3:1.4">
+        <subsystem xmlns="urn:jboss:domain:ejb3:2.0">
             <session-bean>
                 <stateless>
                     <bean-instance-pool-ref pool-name="slsb-strict-max-pool"/>
                 </stateless>
-                <stateful default-access-timeout="5000" cache-ref="simple" clustered-cache-ref="clustered"/>
+                <stateful default-access-timeout="5000" cache-ref="simple" passivation-disabled-cache-ref="simple"/>
                 <singleton default-access-timeout="5000"/>
             </session-bean>
             <pools>
@@ -144,19 +202,19 @@
                 </bean-instance-pools>
             </pools>
             <caches>
-                <cache name="simple" aliases="NoPassivationCache"/>
-                <cache name="passivating" passivation-store-ref="file" aliases="SimpleStatefulCache"/>
-                <cache name="clustered" passivation-store-ref="infinispan" aliases="StatefulTreeCache"/>
+                <cache name="simple"/>
+                <cache name="distributable" aliases="passivating clustered" passivation-store-ref="infinispan"/>
             </caches>
             <passivation-stores>
-                <file-passivation-store name="file"/>
-                <cluster-passivation-store name="infinispan" cache-container="ejb"/>
+                <passivation-store name="infinispan" cache-container="ejb" max-size="10000"/>
             </passivation-stores>
             <async thread-pool-name="default"/>
-            <timer-service thread-pool-name="default">
-                <data-store path="timer-service-data" relative-to="jboss.server.data.dir"/>
+            <timer-service thread-pool-name="default" default-data-store="default-file-store">
+                <data-stores>
+                    <file-data-store name="default-file-store" path="timer-service-data" relative-to="jboss.server.data.dir"/>
+                </data-stores>
             </timer-service>
-            <remote connector-ref="remoting-connector" thread-pool-name="default"/>
+            <remote connector-ref="http-remoting-connector" thread-pool-name="default"/>
             <thread-pools>
                 <thread-pool name="default">
                     <max-threads count="10"/>
@@ -166,27 +224,78 @@
             <default-security-domain value="other"/>
             <default-missing-method-permissions-deny-access value="true"/>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:infinispan:1.4">
+        <subsystem xmlns="urn:jboss:domain:io:1.0">
+            <worker name="default" io-threads="3"/>
+            <buffer-pool name="default" buffer-size="1171875" buffers-per-slice="128"/>
+        </subsystem>
+
+        <subsystem xmlns="urn:jboss:domain:messaging:2.0">
+            <hornetq-server>
+                <security-enabled>false</security-enabled>
+                <persistence-enabled>true</persistence-enabled>
+                <journal-type>NIO</journal-type>
+                <journal-min-files>2</journal-min-files>
+                <connectors>
+                    <netty-connector name="netty" socket-binding="messaging"/>
+                </connectors>
+                <acceptors>
+                    <netty-acceptor name="netty" socket-binding="messaging"/>
+                </acceptors>
+                <address-settings>
+                    <!--default for catch all-->
+                    <address-setting match="#">
+                        <dead-letter-address>jms.queue.DLQ</dead-letter-address>
+                        <expiry-address>jms.queue.ExpiryQueue</expiry-address>
+                        <redelivery-delay>0</redelivery-delay>
+                        <max-size-bytes>10485760</max-size-bytes>
+                        <address-full-policy>BLOCK</address-full-policy>
+                        <message-counter-history-day-limit>10</message-counter-history-day-limit>
+                    </address-setting>
+                </address-settings>
+                <jms-connection-factories>
+                    <connection-factory name="RemoteConnectionFactory">
+                        <connectors>
+                            <connector-ref connector-name="netty"/>
+                        </connectors>
+                        <entries>
+                            <entry name="java:/RemoteConnectionFactory"/>
+                            <entry name="java:jboss/exported/jms/RemoteConnectionFactory"/>
+                        </entries>
+                    </connection-factory>
+                </jms-connection-factories>
+                <jms-destinations>
+                    <jms-queue name="ModeShapeIndexing">
+                        <entry name="jms/queue/ModeShapeIndexing"/>
+                        <entry name="java:jboss/exported/jms/queue/ModeShapeIndexing"/>
+                    </jms-queue>
+                </jms-destinations>
+            </hornetq-server>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:infinispan:2.0">
             <cache-container name="modeshape-repository-cache-container" aliases="modeshape-repository-cache" default-cache="clustered-repo" module="org.modeshape">
                 <transport lock-timeout="60000"/>
                 <replicated-cache name="clustered-repo" mode="SYNC" batching="true">
-                    <transaction mode="NON_XA"/>
-                    <file-store relative-to="jboss.server.data.dir" path="modeshape/store/clustered-repo-${jboss.node.name}" passivation="false" purge="false"/>
+                    <!--//TODO author=Horia Chiorean date=1/30/14 description=see https://community.jboss.org/thread/236623-->
+                    <!--<transaction mode="NON_XA"/> -->
+                    <file-store path="modeshape/store/clustered-repo-${jboss.node.name}" passivation="false" purge="false"/>
                 </replicated-cache>
             </cache-container>
             <cache-container name="modeshape-binary-cache-container" aliases="modeshape-binary-cache" default-cache="binary-fs" module="org.modeshape">
                 <transport lock-timeout="60000"/>
                 <replicated-cache name="binary-fs" mode="SYNC" batching="true">
-                    <transaction mode="NON_XA"/>
-                    <file-store relative-to="jboss.server.data.dir" path="modeshape/binary-store/clustered-repo-binary-data-${jboss.node.name}" passivation="false" purge="false"/>
+                    <!--//TODO author=Horia Chiorean date=1/30/14 description=see https://community.jboss.org/thread/236623-->
+                    <!--<transaction mode="NON_XA"/> -->
+                    <file-store path="modeshape/binary-store/clustered-repo-binary-data-${jboss.node.name}" passivation="false" purge="false"/>
                 </replicated-cache>
                 <replicated-cache name="binary-fs-meta" mode="SYNC" batching="true">
-                    <transaction mode="NON_XA"/>
-                    <file-store relative-to="jboss.server.data.dir" path="modeshape/binary-store/clustered-repo-binary-metadata-${jboss.node.name}" passivation="false" purge="false"/>
+                    <!--//TODO author=Horia Chiorean date=1/30/14 description=see https://community.jboss.org/thread/236623-->
+                    <!--<transaction mode="NON_XA"/> -->
+                    <file-store path="modeshape/binary-store/clustered-repo-binary-metadata-${jboss.node.name}" passivation="false" purge="false"/>
                 </replicated-cache>
             </cache-container>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:modeshape:1.0">
+            <!--The list of web applications that is packaged inside the kit and should be deployed when the subsystem starts up-->
             <repository name="clustered-repo" cache-name="clustered-repo" cache-container="modeshape-repository-cache-container" cluster-name="modeshape-repository" cluster-stack="tcp">
                 <indexing rebuild-upon-startup-mode="sync" rebuild-upon-startup-include-system-content="true"/>
                 <master-file-index-storage source-path="modeshape/clustered-repo/master-indexes"
@@ -200,7 +309,7 @@
             <webapp name="modeshape-webdav.war"/>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/>
-        <subsystem xmlns="urn:jboss:domain:jca:1.1">
+        <subsystem xmlns="urn:jboss:domain:jca:2.0">
             <archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/>
             <bean-validation enabled="true"/>
             <default-workmanager>
@@ -219,17 +328,16 @@
             </default-workmanager>
             <cached-connection-manager/>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:jdr:1.0"/>
-        <subsystem xmlns="urn:jboss:domain:jgroups:1.1" default-stack="tcp">
+        <subsystem xmlns="urn:jboss:domain:jgroups:2.0" default-stack="udp">
             <stack name="udp">
                 <transport type="UDP" socket-binding="jgroups-udp"/>
                 <protocol type="PING"/>
                 <protocol type="MERGE3"/>
                 <protocol type="FD_SOCK" socket-binding="jgroups-udp-fd"/>
-                <protocol type="FD"/>
+                <protocol type="FD_ALL"/>
                 <protocol type="VERIFY_SUSPECT"/>
                 <protocol type="pbcast.NAKACK2"/>
-                <protocol type="UNICAST2"/>
+                <protocol type="UNICAST3"/>
                 <protocol type="pbcast.STABLE"/>
                 <protocol type="pbcast.GMS"/>
                 <protocol type="UFC"/>
@@ -245,58 +353,16 @@
                 <protocol type="FD"/>
                 <protocol type="VERIFY_SUSPECT"/>
                 <protocol type="pbcast.NAKACK2"/>
-                <protocol type="UNICAST2"/>
+                <protocol type="UNICAST3"/>
                 <protocol type="pbcast.STABLE"/>
                 <protocol type="pbcast.GMS"/>
-                <protocol type="UFC"/>
                 <protocol type="MFC"/>
                 <protocol type="FRAG2"/>
                 <protocol type="RSVP"/>
             </stack>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:messaging:1.3">
-            <hornetq-server>
-                <security-enabled>false</security-enabled>
-                <persistence-enabled>true</persistence-enabled>
-                <journal-type>NIO</journal-type>
-                <journal-min-files>2</journal-min-files>
-                <connectors>
-                    <netty-connector name="netty" socket-binding="messaging"/>
-                </connectors>
-                <acceptors>
-                    <netty-acceptor name="netty" socket-binding="messaging"/>
-                </acceptors>
-                <address-settings>
-                    <!--default for catch all-->
-                    <address-setting match="#">
-                        <dead-letter-address>jms.queue.DLQ</dead-letter-address>
-                        <expiry-address>jms.queue.ExpiryQueue</expiry-address>
-                        <redelivery-delay>0</redelivery-delay>
-                        <max-size-bytes>10485760</max-size-bytes>
-                        <address-full-policy>BLOCK</address-full-policy>
-                        <message-counter-history-day-limit>10</message-counter-history-day-limit>
-                    </address-setting>
-                </address-settings>
-                <jms-connection-factories>
-                    <connection-factory name="RemoteConnectionFactory">
-                        <connectors>
-                            <connector-ref connector-name="netty"/>
-                        </connectors>
-                        <entries>
-                            <entry name="java:/RemoteConnectionFactory"/>
-                            <entry name="java:jboss/exported/jms/RemoteConnectionFactory"/>
-                        </entries>
-                    </connection-factory>
-                </jms-connection-factories>
-                <jms-destinations>
-                    <jms-queue name="ModeShapeIndexing">
-                        <entry name="jms/queue/ModeShapeIndexing"/>
-                        <entry name="java:jboss/exported/jms/queue/ModeShapeIndexing"/>
-                    </jms-queue>
-                </jms-destinations>
-            </hornetq-server>
-        </subsystem>
-        <subsystem xmlns="urn:jboss:domain:jmx:1.2">
+        <subsystem xmlns="urn:jboss:domain:jdr:1.0"/>
+        <subsystem xmlns="urn:jboss:domain:jmx:1.3">
             <expose-resolved-model/>
             <expose-expression-model/>
             <remoting-connector/>
@@ -305,26 +371,19 @@
             <jpa default-datasource="" default-extended-persistence-inheritance="DEEP"/>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:jsf:1.0"/>
-        <subsystem xmlns="urn:jboss:domain:mail:1.1">
-            <mail-session jndi-name="java:jboss/mail/Default">
+        <subsystem xmlns="urn:jboss:domain:mail:2.0">
+            <mail-session name="default" jndi-name="java:jboss/mail/Default">
                 <smtp-server outbound-socket-binding-ref="mail-smtp"/>
             </mail-session>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:modcluster:1.1">
-            <mod-cluster-config advertise-socket="modcluster" connector="ajp">
-                <dynamic-load-provider>
-                    <load-metric type="busyness"/>
-                </dynamic-load-provider>
-            </mod-cluster-config>
-        </subsystem>
-        <subsystem xmlns="urn:jboss:domain:naming:1.3">
+        <subsystem xmlns="urn:jboss:domain:naming:2.0">
             <remote-naming/>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:pojo:1.0"/>
-        <subsystem xmlns="urn:jboss:domain:remoting:1.1">
-            <connector name="remoting-connector" socket-binding="remoting" security-realm="ApplicationRealm"/>
+        <subsystem xmlns="urn:jboss:domain:remoting:2.0">
+            <http-connector name="http-remoting-connector" connector-ref="default" security-realm="ApplicationRealm"/>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:resource-adapters:1.1"/>
+        <subsystem xmlns="urn:jboss:domain:resource-adapters:2.0"/>
         <subsystem xmlns="urn:jboss:domain:sar:1.0"/>
         <subsystem xmlns="urn:jboss:domain:security:1.2">
             <security-domains>
@@ -351,15 +410,15 @@
                 <security-domain name="modeshape-security" cache-type="default">
                     <authentication>
                         <login-module code="UsersRoles" flag="required">
-                            <module-option name="usersProperties" value="modeshape-users.properties"/>
-                            <module-option name="rolesProperties" value="modeshape-roles.properties"/>
+                            <module-option name="usersProperties" value="${jboss.server.config.dir}/modeshape-users.properties"/>
+                            <module-option name="rolesProperties" value="${jboss.server.config.dir}/modeshape-roles.properties"/>
                         </login-module>
                     </authentication>
                 </security-domain>
             </security-domains>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:threads:1.1"/>
-        <subsystem xmlns="urn:jboss:domain:transactions:1.3">
+        <subsystem xmlns="urn:jboss:domain:transactions:2.0">
             <core-environment>
                 <process-id>
                     <uuid/>
@@ -368,13 +427,23 @@
             <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/>
             <coordinator-environment default-timeout="300"/>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:web:1.4" default-virtual-server="default-host" native="false">
-            <connector name="http" protocol="HTTP/1.1" scheme="http" socket-binding="http"/>
-            <connector name="ajp" protocol="AJP/1.3" scheme="http" socket-binding="ajp"/>
-            <virtual-server name="default-host" enable-welcome-root="true">
-                <alias name="localhost"/>
-                <alias name="example.com"/>
-            </virtual-server>
+        <subsystem xmlns="urn:jboss:domain:undertow:1.0">
+            <buffer-caches>
+                <buffer-cache name="default" buffer-size="1024" buffers-per-region="1024" max-regions="10"/>
+            </buffer-caches>
+            <server name="default-server">
+                <http-listener name="default" socket-binding="http" max-post-size="112400000"/>
+                <host name="default-host" alias="localhost">
+                    <location name="/" handler="welcome-content"/>
+                </host>
+            </server>
+            <servlet-container name="default" default-buffer-cache="default" stack-trace-on-error="local-only">
+                <jsp-config/>
+                <persistent-sessions/>
+            </servlet-container>
+            <handlers>
+                <file name="welcome-content" path="${jboss.home.dir}/welcome-content" directory-listing="true"/>
+            </handlers>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:webservices:1.2">
             <modify-wsdl-address>true</modify-wsdl-address>
@@ -387,9 +456,8 @@
             </endpoint-config>
             <client-config name="Standard-Client-Config"/>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:weld:1.0"/>
+        <subsystem xmlns="urn:jboss:domain:weld:2.0"/>
     </profile>
-
     <interfaces>
         <interface name="management">
             <inet-address value="${jboss.bind.address.management:127.0.0.1}"/>
@@ -397,30 +465,41 @@
         <interface name="public">
             <inet-address value="${jboss.bind.address:127.0.0.1}"/>
         </interface>
+        <!-- TODO - only show this if the jacorb subsystem is added  -->
         <interface name="unsecure">
+            <!--
+              ~  Used for IIOP sockets in the standard configuration.
+              ~                  To secure JacORB you need to setup SSL 
+              -->
             <inet-address value="${jboss.bind.address.unsecure:127.0.0.1}"/>
         </interface>
     </interfaces>
-
-    <socket-binding-group name="standard-sockets" default-interface="public" port-offset="${jboss.socket.binding.port-offset:0}">
+    <socket-binding-group name="standard-sockets" default-interface="public"
+                          port-offset="${jboss.socket.binding.port-offset:0}">
         <socket-binding name="management-native" interface="management" port="${jboss.management.native.port:9999}"/>
         <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
-        <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9443}"/>
-        <socket-binding name="ajp" port="8009"/>
-        <socket-binding name="http" port="${http.port:8080}"/>
-        <socket-binding name="https" port="8443"/>
-        <socket-binding name="jgroups-mping" port="0" multicast-address="${jboss.default.multicast.address:230.0.0.4}" multicast-port="45700"/>
+        <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9993}"/>
+        <socket-binding name="ajp" port="${jboss.ajp.port:8009}"/>
+        <socket-binding name="http" port="${jboss.http.port:8080}"/>
+        <socket-binding name="https" port="${jboss.https.port:8443}"/>
+        <socket-binding name="jacorb" interface="unsecure" port="3528"/>
+        <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
+        <socket-binding name="jgroups-mping" port="0" multicast-address="${jboss.default.multicast.address:230.0.0.4}"
+                        multicast-port="45700"/>
         <socket-binding name="jgroups-tcp" port="7600"/>
         <socket-binding name="jgroups-tcp-fd" port="57600"/>
-        <socket-binding name="jgroups-udp" port="55200" multicast-address="${jboss.default.multicast.address:230.0.0.4}" multicast-port="45688"/>
+        <socket-binding name="jgroups-udp" port="55200" multicast-address="${jboss.default.multicast.address:230.0.0.4}"
+                        multicast-port="45688"/>
         <socket-binding name="jgroups-udp-fd" port="54200"/>
+        <socket-binding name="messaging" port="5445"/>
+        <socket-binding name="messaging-group" port="0" multicast-address="${jboss.messaging.group.address:231.7.7.7}"
+                        multicast-port="${jboss.messaging.group.port:9876}"/>
+        <socket-binding name="messaging-throughput" port="5455"/>
         <socket-binding name="modcluster" port="0" multicast-address="224.0.1.105" multicast-port="23364"/>
-        <socket-binding name="remoting" port="4447"/>
         <socket-binding name="txn-recovery-environment" port="4712"/>
         <socket-binding name="txn-status-manager" port="4713"/>
-        <socket-binding name="messaging" port="5445"/>
         <outbound-socket-binding name="mail-smtp">
             <remote-destination host="localhost" port="25"/>
         </outbound-socket-binding>
     </socket-binding-group>
-</server>
+</server>
\ No newline at end of file
diff --git a/modeshape-clustering/standalone-modeshape-master.xml b/modeshape-clustering/standalone-modeshape-master.xml
index d630ca8..7f6c35b 100644
--- a/modeshape-clustering/standalone-modeshape-master.xml
+++ b/modeshape-clustering/standalone-modeshape-master.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 
-<server xmlns="urn:jboss:domain:1.4">
+<server xmlns="urn:jboss:domain:2.0">
     <extensions>
         <extension module="org.jboss.as.clustering.infinispan"/>
         <extension module="org.jboss.as.clustering.jgroups"/>
@@ -23,9 +23,11 @@
         <extension module="org.jboss.as.security"/>
         <extension module="org.jboss.as.threads"/>
         <extension module="org.jboss.as.transactions"/>
-        <extension module="org.jboss.as.web"/>
         <extension module="org.jboss.as.webservices"/>
         <extension module="org.jboss.as.weld"/>
+        <extension module="org.wildfly.extension.batch"/>
+        <extension module="org.wildfly.extension.io"/>
+        <extension module="org.wildfly.extension.undertow"/>
         <extension module="org.modeshape"/>
     </extensions>
 
@@ -41,6 +43,9 @@
                     <local default-user="$local"/>
                     <properties path="mgmt-users.properties" relative-to="jboss.server.config.dir"/>
                 </authentication>
+                <authorization map-groups-to-roles="false">
+                    <properties path="mgmt-groups.properties" relative-to="jboss.server.config.dir"/>
+                </authorization>
             </security-realm>
             <security-realm name="ApplicationRealm">
                 <authentication>
@@ -52,27 +57,48 @@
                 </authorization>
             </security-realm>
         </security-realms>
+        <audit-log>
+            <formatters>
+                <json-formatter name="json-formatter"/>
+            </formatters>
+            <handlers>
+                <file-handler name="file" formatter="json-formatter" relative-to="jboss.server.data.dir" path="audit-log.log"/>
+            </handlers>
+            <logger log-boot="true" log-read-only="false" enabled="false">
+                <handlers>
+                    <handler name="file"/>
+                </handlers>
+            </logger>
+        </audit-log>
         <management-interfaces>
             <native-interface security-realm="ManagementRealm">
                 <socket-binding native="management-native"/>
             </native-interface>
-            <http-interface security-realm="ManagementRealm">
+            <http-interface security-realm="ManagementRealm" http-upgrade-enabled="true">
                 <socket-binding http="management-http"/>
             </http-interface>
         </management-interfaces>
+        <access-control provider="simple">
+            <role-mapping>
+                <role name="SuperUser">
+                    <include>
+                        <user name="$local"/>
+                    </include>
+                </role>
+            </role-mapping>
+        </access-control>
     </management>
-
     <profile>
-        <subsystem xmlns="urn:jboss:domain:logging:1.2">
+        <subsystem xmlns="urn:jboss:domain:logging:2.0">
             <console-handler name="CONSOLE">
                 <level name="INFO"/>
                 <formatter>
-                    <pattern-formatter pattern="%K{level}%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
+                    <named-formatter name="COLOR-PATTERN"/>
                 </formatter>
             </console-handler>
             <periodic-rotating-file-handler name="FILE" autoflush="true">
                 <formatter>
-                    <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
+                    <named-formatter name="PATTERN"/>
                 </formatter>
                 <file relative-to="jboss.server.log.dir" path="server.log"/>
                 <suffix value=".yyyy-MM-dd"/>
@@ -103,11 +129,26 @@
                     <handler name="FILE"/>
                 </handlers>
             </root-logger>
+            <formatter name="PATTERN">
+                <pattern-formatter pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
+            </formatter>
+            <formatter name="COLOR-PATTERN">
+                <pattern-formatter pattern="%K{level}%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
+            </formatter>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:batch:1.0">
+            <job-repository>
+                <in-memory/>
+            </job-repository>
+            <thread-pool>
+                <max-threads count="10"/>
+                <keepalive-time time="100" unit="milliseconds"/>
+            </thread-pool>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:datasources:1.1">
+        <subsystem xmlns="urn:jboss:domain:datasources:2.0">
             <datasources>
                 <datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true" use-java-context="true">
-                    <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1</connection-url>
+                    <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE</connection-url>
                     <driver>h2</driver>
                     <security>
                         <user-name>sa</user-name>
@@ -121,19 +162,34 @@
                 </drivers>
             </datasources>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:deployment-scanner:1.1">
-            <deployment-scanner path="deployments" relative-to="jboss.server.base.dir" scan-interval="5000"/>
+        <subsystem xmlns="urn:jboss:domain:deployment-scanner:2.0">
+            <deployment-scanner path="deployments" relative-to="jboss.server.base.dir" scan-interval="5000" runtime-failure-causes-rollback="${jboss.deployment.scanner.rollback.on.failure:false}"/>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:ee:1.1">
+        <subsystem xmlns="urn:jboss:domain:ee:2.0">
             <spec-descriptor-property-replacement>false</spec-descriptor-property-replacement>
             <jboss-descriptor-property-replacement>true</jboss-descriptor-property-replacement>
+            <ejb-annotation-property-replacement>false</ejb-annotation-property-replacement>
+            <concurrent>
+                <context-services>
+                    <context-service name="default" jndi-name="java:jboss/ee/concurrency/context/default" use-transaction-setup-provider="true"/>
+                </context-services>
+                <managed-executor-services>
+                    <managed-executor-service name="default" jndi-name="java:jboss/ee/concurrency/executor/default" context-service="default" hung-task-threshold="60000" core-threads="5" max-threads="25" keepalive-time="5000"/>
+                </managed-executor-services>
+                <managed-scheduled-executor-services>
+                    <managed-scheduled-executor-service name="default" jndi-name="java:jboss/ee/concurrency/scheduler/default" context-service="default" hung-task-threshold="60000" core-threads="2" keepalive-time="3000"/>
+                </managed-scheduled-executor-services>
+                <managed-thread-factories>
+                    <managed-thread-factory name="default" jndi-name="java:jboss/ee/concurrency/factory/default" context-service="default"/>
+                </managed-thread-factories>
+            </concurrent>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:ejb3:1.4">
+        <subsystem xmlns="urn:jboss:domain:ejb3:2.0">
             <session-bean>
                 <stateless>
                     <bean-instance-pool-ref pool-name="slsb-strict-max-pool"/>
                 </stateless>
-                <stateful default-access-timeout="5000" cache-ref="simple" clustered-cache-ref="clustered"/>
+                <stateful default-access-timeout="5000" cache-ref="distributable" passivation-disabled-cache-ref="simple"/>
                 <singleton default-access-timeout="5000"/>
             </session-bean>
             <pools>
@@ -143,19 +199,19 @@
                 </bean-instance-pools>
             </pools>
             <caches>
-                <cache name="simple" aliases="NoPassivationCache"/>
-                <cache name="passivating" passivation-store-ref="file" aliases="SimpleStatefulCache"/>
-                <cache name="clustered" passivation-store-ref="infinispan" aliases="StatefulTreeCache"/>
+                <cache name="simple"/>
+                <cache name="distributable" aliases="passivating clustered" passivation-store-ref="infinispan"/>
             </caches>
             <passivation-stores>
-                <file-passivation-store name="file"/>
-                <cluster-passivation-store name="infinispan" cache-container="ejb"/>
+                <passivation-store name="infinispan" cache-container="ejb" max-size="10000"/>
             </passivation-stores>
             <async thread-pool-name="default"/>
-            <timer-service thread-pool-name="default">
-                <data-store path="timer-service-data" relative-to="jboss.server.data.dir"/>
+            <timer-service thread-pool-name="default" default-data-store="default-file-store">
+                <data-stores>
+                    <file-data-store name="default-file-store" path="timer-service-data" relative-to="jboss.server.data.dir"/>
+                </data-stores>
             </timer-service>
-            <remote connector-ref="remoting-connector" thread-pool-name="default"/>
+            <remote connector-ref="http-remoting-connector" thread-pool-name="default"/>
             <thread-pools>
                 <thread-pool name="default">
                     <max-threads count="10"/>
@@ -165,23 +221,30 @@
             <default-security-domain value="other"/>
             <default-missing-method-permissions-deny-access value="true"/>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:infinispan:1.4">
+        <subsystem xmlns="urn:jboss:domain:io:1.0">
+            <worker name="default" io-threads="3"/>
+            <buffer-pool name="default" buffer-size="16384" buffers-per-slice="128"/>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:infinispan:2.0">
             <cache-container name="modeshape-repository-cache-container" aliases="modeshape-repository-cache" default-cache="clustered-repo" module="org.modeshape">
                 <transport lock-timeout="60000"/>
                 <replicated-cache name="clustered-repo" mode="SYNC" batching="true">
-                    <transaction mode="NON_XA"/>
-                    <file-store relative-to="jboss.server.data.dir" path="modeshape/store/clustered-repo-${jboss.node.name}" passivation="false" purge="false"/>
+                    <!--//TODO author=Horia Chiorean date=1/30/14 description=see https://community.jboss.org/thread/236623-->
+                    <!--<transaction mode="NON_XA"/> --> 
+                    <file-store path="modeshape/store/clustered-repo-${jboss.node.name}" passivation="false" purge="false"/>
                 </replicated-cache>
             </cache-container>
             <cache-container name="modeshape-binary-cache-container" aliases="modeshape-binary-cache" default-cache="binary-fs" module="org.modeshape">
                 <transport lock-timeout="60000"/>
                 <replicated-cache name="binary-fs" mode="SYNC" batching="true">
-                    <transaction mode="NON_XA"/>
-                    <file-store relative-to="jboss.server.data.dir" path="modeshape/binary-store/clustered-repo-binary-data-${jboss.node.name}" passivation="false" purge="false"/>
+                    <!--//TODO author=Horia Chiorean date=1/30/14 description=see https://community.jboss.org/thread/236623-->
+                    <!--<transaction mode="NON_XA"/>-->
+                    <file-store path="modeshape/binary-store/clustered-repo-binary-data-${jboss.node.name}" passivation="false" purge="false"/>
                 </replicated-cache>
                 <replicated-cache name="binary-fs-meta" mode="SYNC" batching="true">
-                    <transaction mode="NON_XA"/>
-                    <file-store relative-to="jboss.server.data.dir" path="modeshape/binary-store/clustered-repo-binary-metadata-${jboss.node.name}" passivation="false" purge="false"/>
+                    <!--//TODO author=Horia Chiorean date=1/30/14 description=see https://community.jboss.org/thread/236623-->
+                    <!--<transaction mode="NON_XA"/>-->
+                    <file-store path="modeshape/binary-store/clustered-repo-binary-metadata-${jboss.node.name}" passivation="false" purge="false"/>
                 </replicated-cache>
             </cache-container>
         </subsystem>
@@ -195,7 +258,7 @@
             <webapp name="modeshape-webdav.war"/>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/>
-        <subsystem xmlns="urn:jboss:domain:jca:1.1">
+        <subsystem xmlns="urn:jboss:domain:jca:2.0">
             <archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/>
             <bean-validation enabled="true"/>
             <default-workmanager>
@@ -215,16 +278,16 @@
             <cached-connection-manager/>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:jdr:1.0"/>
-        <subsystem xmlns="urn:jboss:domain:jgroups:1.1" default-stack="tcp">
+        <subsystem xmlns="urn:jboss:domain:jgroups:2.0" default-stack="udp">
             <stack name="udp">
                 <transport type="UDP" socket-binding="jgroups-udp"/>
                 <protocol type="PING"/>
                 <protocol type="MERGE3"/>
                 <protocol type="FD_SOCK" socket-binding="jgroups-udp-fd"/>
-                <protocol type="FD"/>
+                <protocol type="FD_ALL"/>
                 <protocol type="VERIFY_SUSPECT"/>
                 <protocol type="pbcast.NAKACK2"/>
-                <protocol type="UNICAST2"/>
+                <protocol type="UNICAST3"/>
                 <protocol type="pbcast.STABLE"/>
                 <protocol type="pbcast.GMS"/>
                 <protocol type="UFC"/>
@@ -240,16 +303,15 @@
                 <protocol type="FD"/>
                 <protocol type="VERIFY_SUSPECT"/>
                 <protocol type="pbcast.NAKACK2"/>
-                <protocol type="UNICAST2"/>
+                <protocol type="UNICAST3"/>
                 <protocol type="pbcast.STABLE"/>
                 <protocol type="pbcast.GMS"/>
-                <protocol type="UFC"/>
                 <protocol type="MFC"/>
                 <protocol type="FRAG2"/>
                 <protocol type="RSVP"/>
             </stack>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:jmx:1.2">
+        <subsystem xmlns="urn:jboss:domain:jmx:1.3">
             <expose-resolved-model/>
             <expose-expression-model/>
             <remoting-connector/>
@@ -258,26 +320,26 @@
             <jpa default-datasource="" default-extended-persistence-inheritance="DEEP"/>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:jsf:1.0"/>
-        <subsystem xmlns="urn:jboss:domain:mail:1.1">
-            <mail-session jndi-name="java:jboss/mail/Default">
+        <subsystem xmlns="urn:jboss:domain:mail:2.0">
+            <mail-session name="default" jndi-name="java:jboss/mail/Default">
                 <smtp-server outbound-socket-binding-ref="mail-smtp"/>
             </mail-session>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:modcluster:1.1">
+        <subsystem xmlns="urn:jboss:domain:modcluster:1.2">
             <mod-cluster-config advertise-socket="modcluster" connector="ajp">
                 <dynamic-load-provider>
                     <load-metric type="busyness"/>
                 </dynamic-load-provider>
             </mod-cluster-config>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:naming:1.3">
+        <subsystem xmlns="urn:jboss:domain:naming:2.0">
             <remote-naming/>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:pojo:1.0"/>
-        <subsystem xmlns="urn:jboss:domain:remoting:1.1">
-            <connector name="remoting-connector" socket-binding="remoting" security-realm="ApplicationRealm"/>
+        <subsystem xmlns="urn:jboss:domain:remoting:2.0">
+            <http-connector name="http-remoting-connector" connector-ref="default" security-realm="ApplicationRealm"/>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:resource-adapters:1.1"/>
+        <subsystem xmlns="urn:jboss:domain:resource-adapters:2.0"/>
         <subsystem xmlns="urn:jboss:domain:sar:1.0"/>
         <subsystem xmlns="urn:jboss:domain:security:1.2">
             <security-domains>
@@ -304,15 +366,15 @@
                 <security-domain name="modeshape-security" cache-type="default">
                     <authentication>
                         <login-module code="UsersRoles" flag="required">
-                            <module-option name="usersProperties" value="modeshape-users.properties"/>
-                            <module-option name="rolesProperties" value="modeshape-roles.properties"/>
+                            <module-option name="usersProperties" value="${jboss.server.config.dir}/modeshape-users.properties"/>
+                            <module-option name="rolesProperties" value="${jboss.server.config.dir}/modeshape-roles.properties"/>
                         </login-module>
                     </authentication>
                 </security-domain>
             </security-domains>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:threads:1.1"/>
-        <subsystem xmlns="urn:jboss:domain:transactions:1.3">
+        <subsystem xmlns="urn:jboss:domain:transactions:2.0">
             <core-environment>
                 <process-id>
                     <uuid/>
@@ -321,13 +383,24 @@
             <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/>
             <coordinator-environment default-timeout="300"/>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:web:1.4" default-virtual-server="default-host" native="false">
-            <connector name="http" protocol="HTTP/1.1" scheme="http" socket-binding="http"/>
-            <connector name="ajp" protocol="AJP/1.3" scheme="http" socket-binding="ajp"/>
-            <virtual-server name="default-host" enable-welcome-root="true">
-                <alias name="localhost"/>
-                <alias name="example.com"/>
-            </virtual-server>
+        <subsystem xmlns="urn:jboss:domain:undertow:1.0">
+            <buffer-caches>
+                <buffer-cache name="default" buffer-size="1024" buffers-per-region="1024" max-regions="10"/>
+            </buffer-caches>
+            <server name="default-server">
+                <http-listener name="default" socket-binding="http"/>
+                <ajp-listener name="ajp" socket-binding="ajp"/>
+                <host name="default-host" alias="localhost">
+                    <location name="/" handler="welcome-content"/>
+                </host>
+            </server>
+            <servlet-container name="default" default-buffer-cache="default" stack-trace-on-error="local-only">
+                <jsp-config/>
+                <persistent-sessions/>
+            </servlet-container>
+            <handlers>
+                <file name="welcome-content" path="${jboss.home.dir}/welcome-content" directory-listing="true"/>
+            </handlers>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:webservices:1.2">
             <modify-wsdl-address>true</modify-wsdl-address>
@@ -340,9 +413,8 @@
             </endpoint-config>
             <client-config name="Standard-Client-Config"/>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:weld:1.0"/>
+        <subsystem xmlns="urn:jboss:domain:weld:2.0"/>
     </profile>
-
     <interfaces>
         <interface name="management">
             <inet-address value="${jboss.bind.address.management:127.0.0.1}"/>
@@ -350,29 +422,32 @@
         <interface name="public">
             <inet-address value="${jboss.bind.address:127.0.0.1}"/>
         </interface>
+        <!-- TODO - only show this if the jacorb subsystem is added  -->
         <interface name="unsecure">
+            <!--
+              ~  Used for IIOP sockets in the standard configuration.
+              ~                  To secure JacORB you need to setup SSL 
+              -->
             <inet-address value="${jboss.bind.address.unsecure:127.0.0.1}"/>
         </interface>
     </interfaces>
-
     <socket-binding-group name="standard-sockets" default-interface="public" port-offset="${jboss.socket.binding.port-offset:0}">
         <socket-binding name="management-native" interface="management" port="${jboss.management.native.port:9999}"/>
         <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
-        <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9443}"/>
-        <socket-binding name="ajp" port="8009"/>
-        <socket-binding name="http" port="${http.port:8080}"/>
-        <socket-binding name="https" port="8443"/>
+        <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9993}"/>
+        <socket-binding name="ajp" port="${jboss.ajp.port:8009}"/>
+        <socket-binding name="http" port="${jboss.http.port:8080}"/>
+        <socket-binding name="https" port="${jboss.https.port:8443}"/>
         <socket-binding name="jgroups-mping" port="0" multicast-address="${jboss.default.multicast.address:230.0.0.4}" multicast-port="45700"/>
         <socket-binding name="jgroups-tcp" port="7600"/>
         <socket-binding name="jgroups-tcp-fd" port="57600"/>
         <socket-binding name="jgroups-udp" port="55200" multicast-address="${jboss.default.multicast.address:230.0.0.4}" multicast-port="45688"/>
         <socket-binding name="jgroups-udp-fd" port="54200"/>
         <socket-binding name="modcluster" port="0" multicast-address="224.0.1.105" multicast-port="23364"/>
-        <socket-binding name="remoting" port="4447"/>
         <socket-binding name="txn-recovery-environment" port="4712"/>
         <socket-binding name="txn-status-manager" port="4713"/>
         <outbound-socket-binding name="mail-smtp">
             <remote-destination host="localhost" port="25"/>
         </outbound-socket-binding>
     </socket-binding-group>
-</server>
+</server>
\ No newline at end of file
diff --git a/modeshape-clustering/standalone-modeshape-slave-jms.xml b/modeshape-clustering/standalone-modeshape-slave-jms.xml
index e1adb5a..2ff5b55 100644
--- a/modeshape-clustering/standalone-modeshape-slave-jms.xml
+++ b/modeshape-clustering/standalone-modeshape-slave-jms.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 
-<server xmlns="urn:jboss:domain:1.4">
+<server xmlns="urn:jboss:domain:2.0">
     <extensions>
         <extension module="org.jboss.as.clustering.infinispan"/>
         <extension module="org.jboss.as.clustering.jgroups"/>
@@ -8,13 +8,16 @@
         <extension module="org.jboss.as.deployment-scanner"/>
         <extension module="org.jboss.as.ee"/>
         <extension module="org.jboss.as.ejb3"/>
+        <extension module="org.jboss.as.jacorb"/>
         <extension module="org.jboss.as.jaxrs"/>
         <extension module="org.jboss.as.jdr"/>
         <extension module="org.jboss.as.jmx"/>
         <extension module="org.jboss.as.jpa"/>
         <extension module="org.jboss.as.jsf"/>
+        <extension module="org.jboss.as.jsr77"/>
         <extension module="org.jboss.as.logging"/>
         <extension module="org.jboss.as.mail"/>
+        <extension module="org.jboss.as.messaging"/>
         <extension module="org.jboss.as.modcluster"/>
         <extension module="org.jboss.as.naming"/>
         <extension module="org.jboss.as.pojo"/>
@@ -23,11 +26,12 @@
         <extension module="org.jboss.as.security"/>
         <extension module="org.jboss.as.threads"/>
         <extension module="org.jboss.as.transactions"/>
-        <extension module="org.jboss.as.web"/>
         <extension module="org.jboss.as.webservices"/>
         <extension module="org.jboss.as.weld"/>
+        <extension module="org.wildfly.extension.batch"/>
+        <extension module="org.wildfly.extension.io"/>
+        <extension module="org.wildfly.extension.undertow"/>
         <extension module="org.modeshape"/>
-        <extension module="org.jboss.as.messaging"/>
     </extensions>
 
     <system-properties>
@@ -42,6 +46,9 @@
                     <local default-user="$local"/>
                     <properties path="mgmt-users.properties" relative-to="jboss.server.config.dir"/>
                 </authentication>
+                <authorization map-groups-to-roles="false">
+                    <properties path="mgmt-groups.properties" relative-to="jboss.server.config.dir"/>
+                </authorization>
             </security-realm>
             <security-realm name="ApplicationRealm">
                 <authentication>
@@ -53,27 +60,48 @@
                 </authorization>
             </security-realm>
         </security-realms>
+        <audit-log>
+            <formatters>
+                <json-formatter name="json-formatter"/>
+            </formatters>
+            <handlers>
+                <file-handler name="file" formatter="json-formatter" relative-to="jboss.server.data.dir" path="audit-log.log"/>
+            </handlers>
+            <logger log-boot="true" log-read-only="false" enabled="false">
+                <handlers>
+                    <handler name="file"/>
+                </handlers>
+            </logger>
+        </audit-log>
         <management-interfaces>
             <native-interface security-realm="ManagementRealm">
                 <socket-binding native="management-native"/>
             </native-interface>
-            <http-interface security-realm="ManagementRealm">
+            <http-interface security-realm="ManagementRealm" http-upgrade-enabled="true">
                 <socket-binding http="management-http"/>
             </http-interface>
         </management-interfaces>
+        <access-control provider="simple">
+            <role-mapping>
+                <role name="SuperUser">
+                    <include>
+                        <user name="$local"/>
+                    </include>
+                </role>
+            </role-mapping>
+        </access-control>
     </management>
-
     <profile>
-        <subsystem xmlns="urn:jboss:domain:logging:1.2">
+        <subsystem xmlns="urn:jboss:domain:logging:2.0">
             <console-handler name="CONSOLE">
                 <level name="INFO"/>
                 <formatter>
-                    <pattern-formatter pattern="%K{level}%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
+                    <named-formatter name="COLOR-PATTERN"/>
                 </formatter>
             </console-handler>
             <periodic-rotating-file-handler name="FILE" autoflush="true">
                 <formatter>
-                    <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
+                    <named-formatter name="PATTERN"/>
                 </formatter>
                 <file relative-to="jboss.server.log.dir" path="server.log"/>
                 <suffix value=".yyyy-MM-dd"/>
@@ -104,11 +132,26 @@
                     <handler name="FILE"/>
                 </handlers>
             </root-logger>
+            <formatter name="PATTERN">
+                <pattern-formatter pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
+            </formatter>
+            <formatter name="COLOR-PATTERN">
+                <pattern-formatter pattern="%K{level}%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
+            </formatter>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:datasources:1.1">
+        <subsystem xmlns="urn:jboss:domain:batch:1.0">
+            <job-repository>
+                <in-memory/>
+            </job-repository>
+            <thread-pool>
+                <max-threads count="10"/>
+                <keepalive-time time="100" unit="milliseconds"/>
+            </thread-pool>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:datasources:2.0">
             <datasources>
                 <datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true" use-java-context="true">
-                    <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1</connection-url>
+                    <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE</connection-url>
                     <driver>h2</driver>
                     <security>
                         <user-name>sa</user-name>
@@ -122,19 +165,34 @@
                 </drivers>
             </datasources>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:deployment-scanner:1.1">
-            <deployment-scanner path="deployments" relative-to="jboss.server.base.dir" scan-interval="5000"/>
+        <subsystem xmlns="urn:jboss:domain:deployment-scanner:2.0">
+            <deployment-scanner path="deployments" relative-to="jboss.server.base.dir" scan-interval="5000" runtime-failure-causes-rollback="${jboss.deployment.scanner.rollback.on.failure:false}"/>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:ee:1.1">
+        <subsystem xmlns="urn:jboss:domain:ee:2.0">
             <spec-descriptor-property-replacement>false</spec-descriptor-property-replacement>
             <jboss-descriptor-property-replacement>true</jboss-descriptor-property-replacement>
+            <ejb-annotation-property-replacement>false</ejb-annotation-property-replacement>
+            <concurrent>
+                <context-services>
+                    <context-service name="default" jndi-name="java:jboss/ee/concurrency/context/default" use-transaction-setup-provider="true"/>
+                </context-services>
+                <managed-executor-services>
+                    <managed-executor-service name="default" jndi-name="java:jboss/ee/concurrency/executor/default" context-service="default" hung-task-threshold="60000" core-threads="5" max-threads="25" keepalive-time="5000"/>
+                </managed-executor-services>
+                <managed-scheduled-executor-services>
+                    <managed-scheduled-executor-service name="default" jndi-name="java:jboss/ee/concurrency/scheduler/default" context-service="default" hung-task-threshold="60000" core-threads="2" keepalive-time="3000"/>
+                </managed-scheduled-executor-services>
+                <managed-thread-factories>
+                    <managed-thread-factory name="default" jndi-name="java:jboss/ee/concurrency/factory/default" context-service="default"/>
+                </managed-thread-factories>
+            </concurrent>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:ejb3:1.4">
+        <subsystem xmlns="urn:jboss:domain:ejb3:2.0">
             <session-bean>
                 <stateless>
                     <bean-instance-pool-ref pool-name="slsb-strict-max-pool"/>
                 </stateless>
-                <stateful default-access-timeout="5000" cache-ref="simple" clustered-cache-ref="clustered"/>
+                <stateful default-access-timeout="5000" cache-ref="simple" passivation-disabled-cache-ref="simple"/>
                 <singleton default-access-timeout="5000"/>
             </session-bean>
             <pools>
@@ -144,19 +202,19 @@
                 </bean-instance-pools>
             </pools>
             <caches>
-                <cache name="simple" aliases="NoPassivationCache"/>
-                <cache name="passivating" passivation-store-ref="file" aliases="SimpleStatefulCache"/>
-                <cache name="clustered" passivation-store-ref="infinispan" aliases="StatefulTreeCache"/>
+                <cache name="simple"/>
+                <cache name="distributable" aliases="passivating clustered" passivation-store-ref="infinispan"/>
             </caches>
             <passivation-stores>
-                <file-passivation-store name="file"/>
-                <cluster-passivation-store name="infinispan" cache-container="ejb"/>
+                <passivation-store name="infinispan" cache-container="ejb" max-size="10000"/>
             </passivation-stores>
             <async thread-pool-name="default"/>
-            <timer-service thread-pool-name="default">
-                <data-store path="timer-service-data" relative-to="jboss.server.data.dir"/>
+            <timer-service thread-pool-name="default" default-data-store="default-file-store">
+                <data-stores>
+                    <file-data-store name="default-file-store" path="timer-service-data" relative-to="jboss.server.data.dir"/>
+                </data-stores>
             </timer-service>
-            <remote connector-ref="remoting-connector" thread-pool-name="default"/>
+            <remote connector-ref="http-remoting-connector" thread-pool-name="default"/>
             <thread-pools>
                 <thread-pool name="default">
                     <max-threads count="10"/>
@@ -166,23 +224,58 @@
             <default-security-domain value="other"/>
             <default-missing-method-permissions-deny-access value="true"/>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:infinispan:1.4">
+        <subsystem xmlns="urn:jboss:domain:io:1.0">
+            <worker name="default" io-threads="3"/>
+            <buffer-pool name="default" buffer-size="1171875" buffers-per-slice="128"/>
+        </subsystem>
+
+        <subsystem xmlns="urn:jboss:domain:messaging:2.0">
+            <hornetq-server>
+                <security-enabled>false</security-enabled>
+                <persistence-enabled>false</persistence-enabled>
+                <connectors>
+                    <connector name="remote-jms">
+                        <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+                        <param key="port" value="5445" />
+                    </connector>
+                </connectors>
+                <jms-connection-factories>
+                    <connection-factory name="RemoteConnectionFactory">
+                        <connectors>
+                            <connector-ref connector-name="remote-jms"/>
+                        </connectors>
+                        <entries>
+                            <entry name="java:jboss/exported/jms/RemoteConnectionFactory"/>
+                        </entries>
+                    </connection-factory>
+                </jms-connection-factories>
+                <jms-destinations>
+                    <jms-queue name="ModeShapeIndexing">
+                        <entry name="java:jboss/exported/jms/queue/ModeShapeIndexing"/>
+                    </jms-queue>
+                </jms-destinations>
+            </hornetq-server>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:infinispan:2.0">
             <cache-container name="modeshape-repository-cache-container" aliases="modeshape-repository-cache" default-cache="clustered-repo" module="org.modeshape">
                 <transport lock-timeout="60000"/>
                 <replicated-cache name="clustered-repo" mode="SYNC" batching="true">
-                    <transaction mode="NON_XA"/>
-                    <file-store relative-to="jboss.server.data.dir" path="modeshape/store/clustered-repo-${jboss.node.name}" passivation="false" purge="false"/>
+                    <!--//TODO author=Horia Chiorean date=1/30/14 description=see https://community.jboss.org/thread/236623-->
+                    <!--<transaction mode="NON_XA"/> -->
+                    <file-store path="modeshape/store/clustered-repo-${jboss.node.name}" passivation="false" purge="false"/>
                 </replicated-cache>
             </cache-container>
             <cache-container name="modeshape-binary-cache-container" aliases="modeshape-binary-cache" default-cache="binary-fs" module="org.modeshape">
                 <transport lock-timeout="60000"/>
                 <replicated-cache name="binary-fs" mode="SYNC" batching="true">
-                    <transaction mode="NON_XA"/>
-                    <file-store relative-to="jboss.server.data.dir" path="modeshape/binary-store/clustered-repo-binary-data-${jboss.node.name}" passivation="false" purge="false"/>
+                    <!--//TODO author=Horia Chiorean date=1/30/14 description=see https://community.jboss.org/thread/236623-->
+                    <!--<transaction mode="NON_XA"/> -->
+                    <file-store path="modeshape/binary-store/clustered-repo-binary-data-${jboss.node.name}" passivation="false" purge="false"/>
                 </replicated-cache>
                 <replicated-cache name="binary-fs-meta" mode="SYNC" batching="true">
-                    <transaction mode="NON_XA"/>
-                    <file-store relative-to="jboss.server.data.dir" path="modeshape/binary-store/clustered-repo-binary-metadata-${jboss.node.name}" passivation="false" purge="false"/>
+                    <!--//TODO author=Horia Chiorean date=1/30/14 description=see https://community.jboss.org/thread/236623-->
+                    <!--<transaction mode="NON_XA"/> -->
+                    <file-store path="modeshape/binary-store/clustered-repo-binary-metadata-${jboss.node.name}" passivation="false" purge="false"/>
                 </replicated-cache>
             </cache-container>
         </subsystem>
@@ -201,7 +294,7 @@
             <webapp name="modeshape-webdav.war"/>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/>
-        <subsystem xmlns="urn:jboss:domain:jca:1.1">
+        <subsystem xmlns="urn:jboss:domain:jca:2.0">
             <archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/>
             <bean-validation enabled="true"/>
             <default-workmanager>
@@ -220,17 +313,16 @@
             </default-workmanager>
             <cached-connection-manager/>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:jdr:1.0"/>
-        <subsystem xmlns="urn:jboss:domain:jgroups:1.1" default-stack="tcp">
+        <subsystem xmlns="urn:jboss:domain:jgroups:2.0" default-stack="udp">
             <stack name="udp">
                 <transport type="UDP" socket-binding="jgroups-udp"/>
                 <protocol type="PING"/>
                 <protocol type="MERGE3"/>
                 <protocol type="FD_SOCK" socket-binding="jgroups-udp-fd"/>
-                <protocol type="FD"/>
+                <protocol type="FD_ALL"/>
                 <protocol type="VERIFY_SUSPECT"/>
                 <protocol type="pbcast.NAKACK2"/>
-                <protocol type="UNICAST2"/>
+                <protocol type="UNICAST3"/>
                 <protocol type="pbcast.STABLE"/>
                 <protocol type="pbcast.GMS"/>
                 <protocol type="UFC"/>
@@ -246,43 +338,16 @@
                 <protocol type="FD"/>
                 <protocol type="VERIFY_SUSPECT"/>
                 <protocol type="pbcast.NAKACK2"/>
-                <protocol type="UNICAST2"/>
+                <protocol type="UNICAST3"/>
                 <protocol type="pbcast.STABLE"/>
                 <protocol type="pbcast.GMS"/>
-                <protocol type="UFC"/>
                 <protocol type="MFC"/>
                 <protocol type="FRAG2"/>
                 <protocol type="RSVP"/>
             </stack>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:messaging:1.3">
-            <hornetq-server>
-                <security-enabled>false</security-enabled>
-                <persistence-enabled>false</persistence-enabled>
-                <connectors>
-                    <connector name="remote-jms">
-                        <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
-                        <param key="port" value="5445" />
-                    </connector>
-                </connectors>
-                <jms-connection-factories>
-                    <connection-factory name="RemoteConnectionFactory">
-                        <connectors>
-                            <connector-ref connector-name="remote-jms"/>
-                        </connectors>
-                        <entries>
-                            <entry name="java:jboss/exported/jms/RemoteConnectionFactory"/>
-                        </entries>
-                    </connection-factory>
-                </jms-connection-factories>
-                <jms-destinations>
-                    <jms-queue name="ModeShapeIndexing">
-                        <entry name="java:jboss/exported/jms/queue/ModeShapeIndexing"/>
-                    </jms-queue>
-                </jms-destinations>
-            </hornetq-server>
-        </subsystem>
-        <subsystem xmlns="urn:jboss:domain:jmx:1.2">
+        <subsystem xmlns="urn:jboss:domain:jdr:1.0"/>
+        <subsystem xmlns="urn:jboss:domain:jmx:1.3">
             <expose-resolved-model/>
             <expose-expression-model/>
             <remoting-connector/>
@@ -291,26 +356,19 @@
             <jpa default-datasource="" default-extended-persistence-inheritance="DEEP"/>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:jsf:1.0"/>
-        <subsystem xmlns="urn:jboss:domain:mail:1.1">
-            <mail-session jndi-name="java:jboss/mail/Default">
+        <subsystem xmlns="urn:jboss:domain:mail:2.0">
+            <mail-session name="default" jndi-name="java:jboss/mail/Default">
                 <smtp-server outbound-socket-binding-ref="mail-smtp"/>
             </mail-session>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:modcluster:1.1">
-            <mod-cluster-config advertise-socket="modcluster" connector="ajp">
-                <dynamic-load-provider>
-                    <load-metric type="busyness"/>
-                </dynamic-load-provider>
-            </mod-cluster-config>
-        </subsystem>
-        <subsystem xmlns="urn:jboss:domain:naming:1.3">
+        <subsystem xmlns="urn:jboss:domain:naming:2.0">
             <remote-naming/>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:pojo:1.0"/>
-        <subsystem xmlns="urn:jboss:domain:remoting:1.1">
-            <connector name="remoting-connector" socket-binding="remoting" security-realm="ApplicationRealm"/>
+        <subsystem xmlns="urn:jboss:domain:remoting:2.0">
+            <http-connector name="http-remoting-connector" connector-ref="default" security-realm="ApplicationRealm"/>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:resource-adapters:1.1"/>
+        <subsystem xmlns="urn:jboss:domain:resource-adapters:2.0"/>
         <subsystem xmlns="urn:jboss:domain:sar:1.0"/>
         <subsystem xmlns="urn:jboss:domain:security:1.2">
             <security-domains>
@@ -337,15 +395,15 @@
                 <security-domain name="modeshape-security" cache-type="default">
                     <authentication>
                         <login-module code="UsersRoles" flag="required">
-                            <module-option name="usersProperties" value="modeshape-users.properties"/>
-                            <module-option name="rolesProperties" value="modeshape-roles.properties"/>
+                            <module-option name="usersProperties" value="${jboss.server.config.dir}/modeshape-users.properties"/>
+                            <module-option name="rolesProperties" value="${jboss.server.config.dir}/modeshape-roles.properties"/>
                         </login-module>
                     </authentication>
                 </security-domain>
             </security-domains>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:threads:1.1"/>
-        <subsystem xmlns="urn:jboss:domain:transactions:1.3">
+        <subsystem xmlns="urn:jboss:domain:transactions:2.0">
             <core-environment>
                 <process-id>
                     <uuid/>
@@ -354,13 +412,23 @@
             <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/>
             <coordinator-environment default-timeout="300"/>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:web:1.4" default-virtual-server="default-host" native="false">
-            <connector name="http" protocol="HTTP/1.1" scheme="http" socket-binding="http"/>
-            <connector name="ajp" protocol="AJP/1.3" scheme="http" socket-binding="ajp"/>
-            <virtual-server name="default-host" enable-welcome-root="true">
-                <alias name="localhost"/>
-                <alias name="example.com"/>
-            </virtual-server>
+        <subsystem xmlns="urn:jboss:domain:undertow:1.0">
+            <buffer-caches>
+                <buffer-cache name="default" buffer-size="1024" buffers-per-region="1024" max-regions="10"/>
+            </buffer-caches>
+            <server name="default-server">
+                <http-listener name="default" socket-binding="http" max-post-size="112400000"/>
+                <host name="default-host" alias="localhost">
+                    <location name="/" handler="welcome-content"/>
+                </host>
+            </server>
+            <servlet-container name="default" default-buffer-cache="default" stack-trace-on-error="local-only">
+                <jsp-config/>
+                <persistent-sessions/>
+            </servlet-container>
+            <handlers>
+                <file name="welcome-content" path="${jboss.home.dir}/welcome-content" directory-listing="true"/>
+            </handlers>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:webservices:1.2">
             <modify-wsdl-address>true</modify-wsdl-address>
@@ -373,9 +441,8 @@
             </endpoint-config>
             <client-config name="Standard-Client-Config"/>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:weld:1.0"/>
+        <subsystem xmlns="urn:jboss:domain:weld:2.0"/>
     </profile>
-
     <interfaces>
         <interface name="management">
             <inet-address value="${jboss.bind.address.management:127.0.0.1}"/>
@@ -383,29 +450,41 @@
         <interface name="public">
             <inet-address value="${jboss.bind.address:127.0.0.1}"/>
         </interface>
+        <!-- TODO - only show this if the jacorb subsystem is added  -->
         <interface name="unsecure">
+            <!--
+              ~  Used for IIOP sockets in the standard configuration.
+              ~                  To secure JacORB you need to setup SSL 
+              -->
             <inet-address value="${jboss.bind.address.unsecure:127.0.0.1}"/>
         </interface>
     </interfaces>
-
-    <socket-binding-group name="standard-sockets" default-interface="public" port-offset="${jboss.socket.binding.port-offset:0}">
+    <socket-binding-group name="standard-sockets" default-interface="public"
+                          port-offset="${jboss.socket.binding.port-offset:0}">
         <socket-binding name="management-native" interface="management" port="${jboss.management.native.port:9999}"/>
         <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
-        <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9443}"/>
-        <socket-binding name="ajp" port="8009"/>
-        <socket-binding name="http" port="${http.port:8080}"/>
-        <socket-binding name="https" port="8443"/>
-        <socket-binding name="jgroups-mping" port="0" multicast-address="${jboss.default.multicast.address:230.0.0.4}" multicast-port="45700"/>
+        <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9993}"/>
+        <socket-binding name="ajp" port="${jboss.ajp.port:8009}"/>
+        <socket-binding name="http" port="${jboss.http.port:8080}"/>
+        <socket-binding name="https" port="${jboss.https.port:8443}"/>
+        <socket-binding name="jacorb" interface="unsecure" port="3528"/>
+        <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
+        <socket-binding name="jgroups-mping" port="0" multicast-address="${jboss.default.multicast.address:230.0.0.4}"
+                        multicast-port="45700"/>
         <socket-binding name="jgroups-tcp" port="7600"/>
         <socket-binding name="jgroups-tcp-fd" port="57600"/>
-        <socket-binding name="jgroups-udp" port="55200" multicast-address="${jboss.default.multicast.address:230.0.0.4}" multicast-port="45688"/>
+        <socket-binding name="jgroups-udp" port="55200" multicast-address="${jboss.default.multicast.address:230.0.0.4}"
+                        multicast-port="45688"/>
         <socket-binding name="jgroups-udp-fd" port="54200"/>
+        <socket-binding name="messaging" port="5445"/>
+        <socket-binding name="messaging-group" port="0" multicast-address="${jboss.messaging.group.address:231.7.7.7}"
+                        multicast-port="${jboss.messaging.group.port:9876}"/>
+        <socket-binding name="messaging-throughput" port="5455"/>
         <socket-binding name="modcluster" port="0" multicast-address="224.0.1.105" multicast-port="23364"/>
-        <socket-binding name="remoting" port="4447"/>
         <socket-binding name="txn-recovery-environment" port="4712"/>
         <socket-binding name="txn-status-manager" port="4713"/>
         <outbound-socket-binding name="mail-smtp">
             <remote-destination host="localhost" port="25"/>
         </outbound-socket-binding>
     </socket-binding-group>
-</server>
+</server>
\ No newline at end of file
diff --git a/modeshape-clustering/standalone-modeshape-slave.xml b/modeshape-clustering/standalone-modeshape-slave.xml
index 44b10b1..f9d5a24 100644
--- a/modeshape-clustering/standalone-modeshape-slave.xml
+++ b/modeshape-clustering/standalone-modeshape-slave.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 
-<server xmlns="urn:jboss:domain:1.4">
+<server xmlns="urn:jboss:domain:2.0">
     <extensions>
         <extension module="org.jboss.as.clustering.infinispan"/>
         <extension module="org.jboss.as.clustering.jgroups"/>
@@ -23,9 +23,11 @@
         <extension module="org.jboss.as.security"/>
         <extension module="org.jboss.as.threads"/>
         <extension module="org.jboss.as.transactions"/>
-        <extension module="org.jboss.as.web"/>
         <extension module="org.jboss.as.webservices"/>
         <extension module="org.jboss.as.weld"/>
+        <extension module="org.wildfly.extension.batch"/>
+        <extension module="org.wildfly.extension.io"/>
+        <extension module="org.wildfly.extension.undertow"/>
         <extension module="org.modeshape"/>
     </extensions>
 
@@ -41,6 +43,9 @@
                     <local default-user="$local"/>
                     <properties path="mgmt-users.properties" relative-to="jboss.server.config.dir"/>
                 </authentication>
+                <authorization map-groups-to-roles="false">
+                    <properties path="mgmt-groups.properties" relative-to="jboss.server.config.dir"/>
+                </authorization>
             </security-realm>
             <security-realm name="ApplicationRealm">
                 <authentication>
@@ -52,27 +57,48 @@
                 </authorization>
             </security-realm>
         </security-realms>
+        <audit-log>
+            <formatters>
+                <json-formatter name="json-formatter"/>
+            </formatters>
+            <handlers>
+                <file-handler name="file" formatter="json-formatter" relative-to="jboss.server.data.dir" path="audit-log.log"/>
+            </handlers>
+            <logger log-boot="true" log-read-only="false" enabled="false">
+                <handlers>
+                    <handler name="file"/>
+                </handlers>
+            </logger>
+        </audit-log>
         <management-interfaces>
             <native-interface security-realm="ManagementRealm">
                 <socket-binding native="management-native"/>
             </native-interface>
-            <http-interface security-realm="ManagementRealm">
+            <http-interface security-realm="ManagementRealm" http-upgrade-enabled="true">
                 <socket-binding http="management-http"/>
             </http-interface>
         </management-interfaces>
+        <access-control provider="simple">
+            <role-mapping>
+                <role name="SuperUser">
+                    <include>
+                        <user name="$local"/>
+                    </include>
+                </role>
+            </role-mapping>
+        </access-control>
     </management>
-
     <profile>
-        <subsystem xmlns="urn:jboss:domain:logging:1.2">
+        <subsystem xmlns="urn:jboss:domain:logging:2.0">
             <console-handler name="CONSOLE">
                 <level name="INFO"/>
                 <formatter>
-                    <pattern-formatter pattern="%K{level}%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
+                    <named-formatter name="COLOR-PATTERN"/>
                 </formatter>
             </console-handler>
             <periodic-rotating-file-handler name="FILE" autoflush="true">
                 <formatter>
-                    <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
+                    <named-formatter name="PATTERN"/>
                 </formatter>
                 <file relative-to="jboss.server.log.dir" path="server.log"/>
                 <suffix value=".yyyy-MM-dd"/>
@@ -103,11 +129,26 @@
                     <handler name="FILE"/>
                 </handlers>
             </root-logger>
+            <formatter name="PATTERN">
+                <pattern-formatter pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
+            </formatter>
+            <formatter name="COLOR-PATTERN">
+                <pattern-formatter pattern="%K{level}%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
+            </formatter>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:batch:1.0">
+            <job-repository>
+                <in-memory/>
+            </job-repository>
+            <thread-pool>
+                <max-threads count="10"/>
+                <keepalive-time time="100" unit="milliseconds"/>
+            </thread-pool>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:datasources:1.1">
+        <subsystem xmlns="urn:jboss:domain:datasources:2.0">
             <datasources>
                 <datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true" use-java-context="true">
-                    <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1</connection-url>
+                    <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE</connection-url>
                     <driver>h2</driver>
                     <security>
                         <user-name>sa</user-name>
@@ -121,19 +162,34 @@
                 </drivers>
             </datasources>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:deployment-scanner:1.1">
-            <deployment-scanner path="deployments" relative-to="jboss.server.base.dir" scan-interval="5000"/>
+        <subsystem xmlns="urn:jboss:domain:deployment-scanner:2.0">
+            <deployment-scanner path="deployments" relative-to="jboss.server.base.dir" scan-interval="5000" runtime-failure-causes-rollback="${jboss.deployment.scanner.rollback.on.failure:false}"/>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:ee:1.1">
+        <subsystem xmlns="urn:jboss:domain:ee:2.0">
             <spec-descriptor-property-replacement>false</spec-descriptor-property-replacement>
             <jboss-descriptor-property-replacement>true</jboss-descriptor-property-replacement>
+            <ejb-annotation-property-replacement>false</ejb-annotation-property-replacement>
+            <concurrent>
+                <context-services>
+                    <context-service name="default" jndi-name="java:jboss/ee/concurrency/context/default" use-transaction-setup-provider="true"/>
+                </context-services>
+                <managed-executor-services>
+                    <managed-executor-service name="default" jndi-name="java:jboss/ee/concurrency/executor/default" context-service="default" hung-task-threshold="60000" core-threads="5" max-threads="25" keepalive-time="5000"/>
+                </managed-executor-services>
+                <managed-scheduled-executor-services>
+                    <managed-scheduled-executor-service name="default" jndi-name="java:jboss/ee/concurrency/scheduler/default" context-service="default" hung-task-threshold="60000" core-threads="2" keepalive-time="3000"/>
+                </managed-scheduled-executor-services>
+                <managed-thread-factories>
+                    <managed-thread-factory name="default" jndi-name="java:jboss/ee/concurrency/factory/default" context-service="default"/>
+                </managed-thread-factories>
+            </concurrent>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:ejb3:1.4">
+        <subsystem xmlns="urn:jboss:domain:ejb3:2.0">
             <session-bean>
                 <stateless>
                     <bean-instance-pool-ref pool-name="slsb-strict-max-pool"/>
                 </stateless>
-                <stateful default-access-timeout="5000" cache-ref="simple" clustered-cache-ref="clustered"/>
+                <stateful default-access-timeout="5000" cache-ref="distributable" passivation-disabled-cache-ref="simple"/>
                 <singleton default-access-timeout="5000"/>
             </session-bean>
             <pools>
@@ -143,19 +199,19 @@
                 </bean-instance-pools>
             </pools>
             <caches>
-                <cache name="simple" aliases="NoPassivationCache"/>
-                <cache name="passivating" passivation-store-ref="file" aliases="SimpleStatefulCache"/>
-                <cache name="clustered" passivation-store-ref="infinispan" aliases="StatefulTreeCache"/>
+                <cache name="simple"/>
+                <cache name="distributable" aliases="passivating clustered" passivation-store-ref="infinispan"/>
             </caches>
             <passivation-stores>
-                <file-passivation-store name="file"/>
-                <cluster-passivation-store name="infinispan" cache-container="ejb"/>
+                <passivation-store name="infinispan" cache-container="ejb" max-size="10000"/>
             </passivation-stores>
             <async thread-pool-name="default"/>
-            <timer-service thread-pool-name="default">
-                <data-store path="timer-service-data" relative-to="jboss.server.data.dir"/>
+            <timer-service thread-pool-name="default" default-data-store="default-file-store">
+                <data-stores>
+                    <file-data-store name="default-file-store" path="timer-service-data" relative-to="jboss.server.data.dir"/>
+                </data-stores>
             </timer-service>
-            <remote connector-ref="remoting-connector" thread-pool-name="default"/>
+            <remote connector-ref="http-remoting-connector" thread-pool-name="default"/>
             <thread-pools>
                 <thread-pool name="default">
                     <max-threads count="10"/>
@@ -165,23 +221,30 @@
             <default-security-domain value="other"/>
             <default-missing-method-permissions-deny-access value="true"/>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:infinispan:1.4">
+        <subsystem xmlns="urn:jboss:domain:io:1.0">
+            <worker name="default" io-threads="3"/>
+            <buffer-pool name="default" buffer-size="16384" buffers-per-slice="128"/>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:infinispan:2.0">
             <cache-container name="modeshape-repository-cache-container" aliases="modeshape-repository-cache" default-cache="clustered-repo" module="org.modeshape">
                 <transport lock-timeout="60000"/>
                 <replicated-cache name="clustered-repo" mode="SYNC" batching="true">
-                    <transaction mode="NON_XA"/>
-                    <file-store relative-to="jboss.server.data.dir" path="modeshape/store/clustered-repo-${jboss.node.name}" passivation="false" purge="false"/>
+                    <!--//TODO author=Horia Chiorean date=1/30/14 description=see https://community.jboss.org/thread/236623-->
+                    <!--<transaction mode="NON_XA"/> -->
+                    <file-store path="modeshape/store/clustered-repo-${jboss.node.name}" passivation="false" purge="false"/>
                 </replicated-cache>
             </cache-container>
             <cache-container name="modeshape-binary-cache-container" aliases="modeshape-binary-cache" default-cache="binary-fs" module="org.modeshape">
                 <transport lock-timeout="60000"/>
                 <replicated-cache name="binary-fs" mode="SYNC" batching="true">
-                    <transaction mode="NON_XA"/>
-                    <file-store relative-to="jboss.server.data.dir" path="modeshape/binary-store/clustered-repo-binary-data-${jboss.node.name}" passivation="false" purge="false"/>
+                    <!--//TODO author=Horia Chiorean date=1/30/14 description=see https://community.jboss.org/thread/236623-->
+                    <!--<transaction mode="NON_XA"/>-->
+                    <file-store path="modeshape/binary-store/clustered-repo-binary-data-${jboss.node.name}" passivation="false" purge="false"/>
                 </replicated-cache>
                 <replicated-cache name="binary-fs-meta" mode="SYNC" batching="true">
-                    <transaction mode="NON_XA"/>
-                    <file-store relative-to="jboss.server.data.dir" path="modeshape/binary-store/clustered-repo-binary-metadata-${jboss.node.name}" passivation="false" purge="false"/>
+                    <!--//TODO author=Horia Chiorean date=1/30/14 description=see https://community.jboss.org/thread/236623-->
+                    <!--<transaction mode="NON_XA"/>-->
+                    <file-store path="modeshape/binary-store/clustered-repo-binary-metadata-${jboss.node.name}" passivation="false" purge="false"/>
                 </replicated-cache>
             </cache-container>
         </subsystem>
@@ -195,7 +258,7 @@
             <webapp name="modeshape-webdav.war"/>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/>
-        <subsystem xmlns="urn:jboss:domain:jca:1.1">
+        <subsystem xmlns="urn:jboss:domain:jca:2.0">
             <archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/>
             <bean-validation enabled="true"/>
             <default-workmanager>
@@ -215,16 +278,16 @@
             <cached-connection-manager/>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:jdr:1.0"/>
-        <subsystem xmlns="urn:jboss:domain:jgroups:1.1" default-stack="tcp">
+        <subsystem xmlns="urn:jboss:domain:jgroups:2.0" default-stack="udp">
             <stack name="udp">
                 <transport type="UDP" socket-binding="jgroups-udp"/>
                 <protocol type="PING"/>
                 <protocol type="MERGE3"/>
                 <protocol type="FD_SOCK" socket-binding="jgroups-udp-fd"/>
-                <protocol type="FD"/>
+                <protocol type="FD_ALL"/>
                 <protocol type="VERIFY_SUSPECT"/>
                 <protocol type="pbcast.NAKACK2"/>
-                <protocol type="UNICAST2"/>
+                <protocol type="UNICAST3"/>
                 <protocol type="pbcast.STABLE"/>
                 <protocol type="pbcast.GMS"/>
                 <protocol type="UFC"/>
@@ -240,16 +303,15 @@
                 <protocol type="FD"/>
                 <protocol type="VERIFY_SUSPECT"/>
                 <protocol type="pbcast.NAKACK2"/>
-                <protocol type="UNICAST2"/>
+                <protocol type="UNICAST3"/>
                 <protocol type="pbcast.STABLE"/>
                 <protocol type="pbcast.GMS"/>
-                <protocol type="UFC"/>
                 <protocol type="MFC"/>
                 <protocol type="FRAG2"/>
                 <protocol type="RSVP"/>
             </stack>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:jmx:1.2">
+        <subsystem xmlns="urn:jboss:domain:jmx:1.3">
             <expose-resolved-model/>
             <expose-expression-model/>
             <remoting-connector/>
@@ -258,26 +320,26 @@
             <jpa default-datasource="" default-extended-persistence-inheritance="DEEP"/>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:jsf:1.0"/>
-        <subsystem xmlns="urn:jboss:domain:mail:1.1">
-            <mail-session jndi-name="java:jboss/mail/Default">
+        <subsystem xmlns="urn:jboss:domain:mail:2.0">
+            <mail-session name="default" jndi-name="java:jboss/mail/Default">
                 <smtp-server outbound-socket-binding-ref="mail-smtp"/>
             </mail-session>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:modcluster:1.1">
+        <subsystem xmlns="urn:jboss:domain:modcluster:1.2">
             <mod-cluster-config advertise-socket="modcluster" connector="ajp">
                 <dynamic-load-provider>
                     <load-metric type="busyness"/>
                 </dynamic-load-provider>
             </mod-cluster-config>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:naming:1.3">
+        <subsystem xmlns="urn:jboss:domain:naming:2.0">
             <remote-naming/>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:pojo:1.0"/>
-        <subsystem xmlns="urn:jboss:domain:remoting:1.1">
-            <connector name="remoting-connector" socket-binding="remoting" security-realm="ApplicationRealm"/>
+        <subsystem xmlns="urn:jboss:domain:remoting:2.0">
+            <http-connector name="http-remoting-connector" connector-ref="default" security-realm="ApplicationRealm"/>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:resource-adapters:1.1"/>
+        <subsystem xmlns="urn:jboss:domain:resource-adapters:2.0"/>
         <subsystem xmlns="urn:jboss:domain:sar:1.0"/>
         <subsystem xmlns="urn:jboss:domain:security:1.2">
             <security-domains>
@@ -304,15 +366,15 @@
                 <security-domain name="modeshape-security" cache-type="default">
                     <authentication>
                         <login-module code="UsersRoles" flag="required">
-                            <module-option name="usersProperties" value="modeshape-users.properties"/>
-                            <module-option name="rolesProperties" value="modeshape-roles.properties"/>
+                            <module-option name="usersProperties" value="${jboss.server.config.dir}/modeshape-users.properties"/>
+                            <module-option name="rolesProperties" value="${jboss.server.config.dir}/modeshape-roles.properties"/>
                         </login-module>
                     </authentication>
                 </security-domain>
             </security-domains>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:threads:1.1"/>
-        <subsystem xmlns="urn:jboss:domain:transactions:1.3">
+        <subsystem xmlns="urn:jboss:domain:transactions:2.0">
             <core-environment>
                 <process-id>
                     <uuid/>
@@ -321,13 +383,24 @@
             <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/>
             <coordinator-environment default-timeout="300"/>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:web:1.4" default-virtual-server="default-host" native="false">
-            <connector name="http" protocol="HTTP/1.1" scheme="http" socket-binding="http"/>
-            <connector name="ajp" protocol="AJP/1.3" scheme="http" socket-binding="ajp"/>
-            <virtual-server name="default-host" enable-welcome-root="true">
-                <alias name="localhost"/>
-                <alias name="example.com"/>
-            </virtual-server>
+        <subsystem xmlns="urn:jboss:domain:undertow:1.0">
+            <buffer-caches>
+                <buffer-cache name="default" buffer-size="1024" buffers-per-region="1024" max-regions="10"/>
+            </buffer-caches>
+            <server name="default-server">
+                <http-listener name="default" socket-binding="http"/>
+                <ajp-listener name="ajp" socket-binding="ajp"/>
+                <host name="default-host" alias="localhost">
+                    <location name="/" handler="welcome-content"/>
+                </host>
+            </server>
+            <servlet-container name="default" default-buffer-cache="default" stack-trace-on-error="local-only">
+                <jsp-config/>
+                <persistent-sessions/>
+            </servlet-container>
+            <handlers>
+                <file name="welcome-content" path="${jboss.home.dir}/welcome-content" directory-listing="true"/>
+            </handlers>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:webservices:1.2">
             <modify-wsdl-address>true</modify-wsdl-address>
@@ -340,9 +413,8 @@
             </endpoint-config>
             <client-config name="Standard-Client-Config"/>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:weld:1.0"/>
+        <subsystem xmlns="urn:jboss:domain:weld:2.0"/>
     </profile>
-
     <interfaces>
         <interface name="management">
             <inet-address value="${jboss.bind.address.management:127.0.0.1}"/>
@@ -350,29 +422,32 @@
         <interface name="public">
             <inet-address value="${jboss.bind.address:127.0.0.1}"/>
         </interface>
+        <!-- TODO - only show this if the jacorb subsystem is added  -->
         <interface name="unsecure">
+            <!--
+              ~  Used for IIOP sockets in the standard configuration.
+              ~                  To secure JacORB you need to setup SSL 
+              -->
             <inet-address value="${jboss.bind.address.unsecure:127.0.0.1}"/>
         </interface>
     </interfaces>
-
     <socket-binding-group name="standard-sockets" default-interface="public" port-offset="${jboss.socket.binding.port-offset:0}">
         <socket-binding name="management-native" interface="management" port="${jboss.management.native.port:9999}"/>
         <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
-        <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9443}"/>
-        <socket-binding name="ajp" port="8009"/>
-        <socket-binding name="http" port="${http.port:8080}"/>
-        <socket-binding name="https" port="8443"/>
+        <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9993}"/>
+        <socket-binding name="ajp" port="${jboss.ajp.port:8009}"/>
+        <socket-binding name="http" port="${jboss.http.port:8080}"/>
+        <socket-binding name="https" port="${jboss.https.port:8443}"/>
         <socket-binding name="jgroups-mping" port="0" multicast-address="${jboss.default.multicast.address:230.0.0.4}" multicast-port="45700"/>
         <socket-binding name="jgroups-tcp" port="7600"/>
         <socket-binding name="jgroups-tcp-fd" port="57600"/>
         <socket-binding name="jgroups-udp" port="55200" multicast-address="${jboss.default.multicast.address:230.0.0.4}" multicast-port="45688"/>
         <socket-binding name="jgroups-udp-fd" port="54200"/>
         <socket-binding name="modcluster" port="0" multicast-address="224.0.1.105" multicast-port="23364"/>
-        <socket-binding name="remoting" port="4447"/>
         <socket-binding name="txn-recovery-environment" port="4712"/>
         <socket-binding name="txn-status-manager" port="4713"/>
         <outbound-socket-binding name="mail-smtp">
             <remote-destination host="localhost" port="25"/>
         </outbound-socket-binding>
     </socket-binding-group>
-</server>
+</server>
\ No newline at end of file
diff --git a/modeshape-ejb/README.md b/modeshape-ejb/README.md
index bd99ba2..0294683 100644
--- a/modeshape-ejb/README.md
+++ b/modeshape-ejb/README.md
@@ -11,15 +11,15 @@ types of EJBs via a JSF application.
 System requirements
 -------------------
 
-All you need to build this project is Java 6.0 (Java SDK 1.6) or better, Maven 3.0 or better.
-The application this project produces is designed to be run on JBoss Enterprise Application Platform 6.
+All you need to build this project is Java 7.0 (Java SDK 1.7) or better, Maven 3.0 or better.
+The application this project produces is designed to be run on JBoss Wildfly 8.
 
-Install ModeShape's EAP kit into an existing JBoss EAP 6 server
+Install ModeShape's AS kit into an existing JBoss Wildfly server
 -----------------------------------------------------
-Before running this demo make sure that you have installed the ModeShape EAP kit into an existing JBoss EAP server.
+Before running this demo make sure that you have installed the ModeShape AS kit into an existing JBoss Wildfly server.
 The simplest way to do this is to follow the instructions provided [here](https://docs.jboss.org/author/display/MODE/Installing+ModeShape+into+AS7)
 
-Start JBoss EAP with the ModeShape configuration
+Start JBoss with the ModeShape configuration
 --------------------------------------------------------------------------------
 
 1. Open a command line and navigate to the root of the JBoss server directory.
diff --git a/modeshape-ejb/pom.xml b/modeshape-ejb/pom.xml
index 8982902..f5d83f2 100644
--- a/modeshape-ejb/pom.xml
+++ b/modeshape-ejb/pom.xml
@@ -4,17 +4,17 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.modeshape.quickstarts</groupId>
     <artifactId>modeshape-ejb</artifactId>
-    <version>3.7.1.Final</version>
+    <version>4.0-SNAPSHOT</version>
     <packaging>war</packaging>
     <name>Example of web application that uses ModeShape via EJBs</name>
     <description>
-        A simple self-contained example web application that uses different EJBs to retrieve repositories managed within EAP.
+        A simple self-contained example web application that uses different EJBs to retrieve repositories managed within AS.
     </description>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.6</maven.compiler.source>
-        <maven.compiler.target>1.6</maven.compiler.target>
+        <maven.compiler.source>1.7</maven.compiler.source>
+        <maven.compiler.target>1.7</maven.compiler.target>
 
         <!-- Maven plugin versions -->
         <version.assembly.plugin>2.4</version.assembly.plugin>
@@ -29,7 +29,7 @@
         <version.org.jboss.as.plugins.maven.plugin>7.4.Final</version.org.jboss.as.plugins.maven.plugin>
 
         <!-- Global dependency version information-->
-        <version.modeshape>3.7.1.Final</version.modeshape>
+        <version.modeshape>4.0-SNAPSHOT</version.modeshape>
         <version.google.http-client>1.14.1-beta</version.google.http-client>
     </properties>
 
@@ -41,7 +41,7 @@
                  specify the versions of any of those modules.-->
             <dependency>
                 <groupId>org.modeshape.bom</groupId>
-                <artifactId>modeshape-bom-jbosseap</artifactId>
+                <artifactId>modeshape-bom-jbossas</artifactId>
                 <version>${version.modeshape}</version>
                 <type>pom</type>
                 <scope>import</scope>
@@ -227,9 +227,8 @@
             <id>arq-jbossas-remote</id>
             <dependencies>
                 <dependency>
-                    <groupId>org.jboss.as</groupId>
-                    <artifactId>jboss-as-arquillian-container-remote</artifactId>
-                    <scope>test</scope>
+                    <groupId>org.wildfly</groupId>
+                    <artifactId>wildfly-arquillian-container-remote</artifactId>
                 </dependency>
             </dependencies>
         </profile>
diff --git a/modeshape-federation/README.md b/modeshape-federation/README.md
index 5f2e972..9e94641 100644
--- a/modeshape-federation/README.md
+++ b/modeshape-federation/README.md
@@ -11,16 +11,16 @@ Federated repository.
 System requirements
 -------------------
 
-All you need to build this project is Java 6.0 (Java SDK 1.6) or better, Maven 3.0 or better.
-The application this project produces is designed to be run on JBoss Enterprise Application Platform 6.
+All you need to build this project is Java 7.0 (Java SDK 1.7) or better, Maven 3.0 or better.
+The application this project produces is designed to be run on JBoss Wildfly 8.
 
-Install ModeShape's EAP kit into an existing JBoss EAP 6 server
+Install ModeShape's Wildfly kit into an existing JBoss Wildfly server
 ---------------------------------------------------------------
 
-Before running this demo make sure that you have installed the ModeShape EAP kit into an existing JBoss EAP server.
+Before running this demo make sure that you have installed the ModeShape Wildfly kit into an existing JBoss Wildfly server.
 The simplest way to do this is to follow the instructions provided [here](https://docs.jboss.org/author/display/MODE/Installing+ModeShape+into+AS7)
 
-Start a JBoss EAP instance with the provided configuration file (see above)
+Start a JBoss Wildfly instance with the provided configuration file (see above)
 ---------------------------------------------------------------------------
 
 1. Copy the `standalone-modeshape-federation.xml` file from the root of the quickstart into the `JBOSS_HOME/standalone/configuration`
diff --git a/modeshape-federation/pom.xml b/modeshape-federation/pom.xml
index 9aed311..7f2576e 100644
--- a/modeshape-federation/pom.xml
+++ b/modeshape-federation/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.modeshape.quickstarts</groupId>
     <artifactId>modeshape-federation</artifactId>
-    <version>3.7.1.Final</version>
+    <version>4.0-SNAPSHOT</version>
     <packaging>war</packaging>
     <name>Example of a JSF web application that uses ModeShape in Federated mode</name>
     <description>
@@ -13,8 +13,8 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.6</maven.compiler.source>
-        <maven.compiler.target>1.6</maven.compiler.target>
+        <maven.compiler.source>1.7</maven.compiler.source>
+        <maven.compiler.target>1.7</maven.compiler.target>
 
         <!-- Maven plugin versions -->
         <version.assembly.plugin>2.4</version.assembly.plugin>
@@ -29,7 +29,7 @@
         <version.org.jboss.as.plugins.maven.plugin>7.4.Final</version.org.jboss.as.plugins.maven.plugin>
 
         <!-- Global dependency version information-->
-        <version.modeshape>3.7.1.Final</version.modeshape>
+        <version.modeshape>4.0-SNAPSHOT</version.modeshape>
     </properties>
 
     <dependencyManagement>
@@ -40,7 +40,7 @@
                  specify the versions of any of those modules.-->
             <dependency>
                 <groupId>org.modeshape.bom</groupId>
-                <artifactId>modeshape-bom-jbosseap</artifactId>
+                <artifactId>modeshape-bom-jbossas</artifactId>
                 <version>${version.modeshape}</version>
                 <type>pom</type>
                 <scope>import</scope>
@@ -214,9 +214,8 @@
             <id>arq-jbossas-remote</id>
             <dependencies>
                 <dependency>
-                    <groupId>org.jboss.as</groupId>
-                    <artifactId>jboss-as-arquillian-container-remote</artifactId>
-                    <scope>test</scope>
+                    <groupId>org.wildfly</groupId>
+                    <artifactId>wildfly-arquillian-container-remote</artifactId>
                 </dependency>
             </dependencies>
         </profile>
diff --git a/modeshape-federation/settings.xml b/modeshape-federation/settings.xml
deleted file mode 100644
index 9031246..0000000
--- a/modeshape-federation/settings.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
-                      http://maven.apache.org/xsd/settings-1.0.0.xsd">
-    <profiles>
-        <profile>
-            <id>jboss-public-repository</id>
-            <repositories>
-                <repository>
-                    <id>jboss-public-repository-group</id>
-                    <name>JBoss Public Maven Repository Group</name>
-                    <url>http://repository.jboss.org/nexus/content/groups/public/</url>
-                    <layout>default</layout>
-                    <releases>
-                        <enabled>true</enabled>
-                        <updatePolicy>never</updatePolicy>
-                    </releases>
-                    <snapshots>
-                        <enabled>true</enabled>
-                        <updatePolicy>never</updatePolicy>
-                    </snapshots>
-                </repository>
-            </repositories>
-            <pluginRepositories>
-                <pluginRepository>
-                    <id>jboss-public-repository-group</id>
-                    <name>JBoss Public Maven Repository Group</name>
-                    <url>http://repository.jboss.org/nexus/content/groups/public/</url>
-                    <layout>default</layout>
-                    <releases>
-                        <enabled>true</enabled>
-                        <updatePolicy>never</updatePolicy>
-                    </releases>
-                    <snapshots>
-                        <enabled>true</enabled>
-                        <updatePolicy>never</updatePolicy>
-                    </snapshots>
-                </pluginRepository>
-            </pluginRepositories>
-        </profile>
-    </profiles>
-    <activeProfiles>
-        <activeProfile>jboss-public-repository</activeProfile>
-    </activeProfiles>
-</settings>
diff --git a/modeshape-federation/standalone-modeshape-federation.xml b/modeshape-federation/standalone-modeshape-federation.xml
index f955007..0f377a6 100644
--- a/modeshape-federation/standalone-modeshape-federation.xml
+++ b/modeshape-federation/standalone-modeshape-federation.xml
@@ -1,10 +1,32 @@
 <?xml version='1.0' encoding='UTF-8'?>
 
-<server xmlns="urn:jboss:domain:1.4">
+<!--
+  ~ ModeShape (http://www.modeshape.org)
+  ~ See the COPYRIGHT.txt file distributed with this work for information
+  ~ regarding copyright ownership.  Some portions may be licensed
+  ~ to Red Hat, Inc. under one or more contributor license agreements.
+  ~ See the AUTHORS.txt file in the distribution for a full listing of
+  ~ individual contributors.
+  ~
+  ~ ModeShape is free software. Unless otherwise indicated, all code in ModeShape
+  ~ is licensed to you 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.
+  ~
+  ~ ModeShape 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.
+  -->
+
+<server xmlns="urn:jboss:domain:2.0">
     <extensions>
         <extension module="org.jboss.as.clustering.infinispan"/>
-        <extension module="org.jboss.as.clustering.jgroups"/>
-        <extension module="org.jboss.as.configadmin"/>
         <extension module="org.jboss.as.connector"/>
         <extension module="org.jboss.as.deployment-scanner"/>
         <extension module="org.jboss.as.ee"/>
@@ -17,18 +39,18 @@
         <extension module="org.jboss.as.logging"/>
         <extension module="org.jboss.as.mail"/>
         <extension module="org.jboss.as.naming"/>
-        <extension module="org.jboss.as.osgi"/>
         <extension module="org.jboss.as.pojo"/>
         <extension module="org.jboss.as.remoting"/>
         <extension module="org.jboss.as.sar"/>
         <extension module="org.jboss.as.security"/>
-        <extension module="org.modeshape"/>
         <extension module="org.jboss.as.threads"/>
         <extension module="org.jboss.as.transactions"/>
-        <extension module="org.jboss.as.web"/>
         <extension module="org.jboss.as.webservices"/>
         <extension module="org.jboss.as.weld"/>
-        <extension module="org.jboss.as.messaging"/>
+        <extension module="org.wildfly.extension.batch"/>
+        <extension module="org.wildfly.extension.io"/>
+        <extension module="org.wildfly.extension.undertow"/>
+        <extension module="org.modeshape"/>
     </extensions>
     <management>
         <security-realms>
@@ -37,6 +59,9 @@
                     <local default-user="$local"/>
                     <properties path="mgmt-users.properties" relative-to="jboss.server.config.dir"/>
                 </authentication>
+                <authorization map-groups-to-roles="false">
+                    <properties path="mgmt-groups.properties" relative-to="jboss.server.config.dir"/>
+                </authorization>
             </security-realm>
             <security-realm name="ApplicationRealm">
                 <authentication>
@@ -48,26 +73,48 @@
                 </authorization>
             </security-realm>
         </security-realms>
+        <audit-log>
+            <formatters>
+                <json-formatter name="json-formatter"/>
+            </formatters>
+            <handlers>
+                <file-handler name="file" formatter="json-formatter" relative-to="jboss.server.data.dir" path="audit-log.log"/>
+            </handlers>
+            <logger log-boot="true" log-read-only="false" enabled="false">
+                <handlers>
+                    <handler name="file"/>
+                </handlers>
+            </logger>
+        </audit-log>
         <management-interfaces>
             <native-interface security-realm="ManagementRealm">
                 <socket-binding native="management-native"/>
             </native-interface>
-            <http-interface security-realm="ManagementRealm">
+            <http-interface security-realm="ManagementRealm" http-upgrade-enabled="true">
                 <socket-binding http="management-http"/>
             </http-interface>
         </management-interfaces>
+        <access-control provider="simple">
+            <role-mapping>
+                <role name="SuperUser">
+                    <include>
+                        <user name="$local"/>
+                    </include>
+                </role>
+            </role-mapping>
+        </access-control>
     </management>
     <profile>
-        <subsystem xmlns="urn:jboss:domain:logging:1.1">
+        <subsystem xmlns="urn:jboss:domain:logging:2.0">
             <console-handler name="CONSOLE">
                 <level name="INFO"/>
                 <formatter>
-                    <pattern-formatter pattern="%K{level}%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
+                    <named-formatter name="COLOR-PATTERN"/>
                 </formatter>
             </console-handler>
             <periodic-rotating-file-handler name="FILE" autoflush="true">
                 <formatter>
-                    <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
+                    <named-formatter name="PATTERN"/>
                 </formatter>
                 <file relative-to="jboss.server.log.dir" path="server.log"/>
                 <suffix value=".yyyy-MM-dd"/>
@@ -98,131 +145,119 @@
                     <handler name="FILE"/>
                 </handlers>
             </root-logger>
+            <formatter name="PATTERN">
+                <pattern-formatter pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
+            </formatter>
+            <formatter name="COLOR-PATTERN">
+                <pattern-formatter pattern="%K{level}%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
+            </formatter>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:batch:1.0">
+            <job-repository>
+                <in-memory/>
+            </job-repository>
+            <thread-pool>
+                <max-threads count="10"/>
+                <keepalive-time time="100" unit="milliseconds"/>
+            </thread-pool>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:configadmin:1.0"/>
-        <subsystem xmlns="urn:jboss:domain:datasources:1.1">
+        <subsystem xmlns="urn:jboss:domain:datasources:2.0">
             <datasources>
-                <datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true"
-                            use-java-context="true">
-                    <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1</connection-url>
+                <datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true" use-java-context="true">
+                    <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE</connection-url>
                     <driver>h2</driver>
                     <security>
                         <user-name>sa</user-name>
                         <password>sa</password>
                     </security>
                 </datasource>
+
+                <datasource jndi-name="java:/datasources/ModeShapeDS" pool-name="ModeShapeDS" enabled="true" use-java-context="true">
+                    <connection-url>jdbc:jcr:jndi:jcr?repositoryName=artifacts</connection-url>
+                    <driver>modeshape</driver>
+                    <connection-property name="workspace">extra</connection-property>
+                    <security>
+                        <user-name>admin</user-name>
+                        <password>admin</password>
+                    </security>
+                </datasource>
                 <drivers>
                     <driver name="h2" module="com.h2database.h2">
                         <xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class>
                     </driver>
+                    <driver name="modeshape" module="org.modeshape.jdbc">
+                        <driver-class>org.modeshape.jdbc.LocalJcrDriver</driver-class>
+                    </driver>
                 </drivers>
             </datasources>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:deployment-scanner:1.1">
-            <deployment-scanner path="deployments" relative-to="jboss.server.base.dir" scan-interval="5000"/>
+        <subsystem xmlns="urn:jboss:domain:deployment-scanner:2.0">
+            <deployment-scanner path="deployments" relative-to="jboss.server.base.dir" scan-interval="5000" runtime-failure-causes-rollback="${jboss.deployment.scanner.rollback.on.failure:false}"/>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:ee:1.1">
+        <subsystem xmlns="urn:jboss:domain:ee:2.0">
             <spec-descriptor-property-replacement>false</spec-descriptor-property-replacement>
             <jboss-descriptor-property-replacement>true</jboss-descriptor-property-replacement>
+            <ejb-annotation-property-replacement>false</ejb-annotation-property-replacement>
+            <concurrent>
+                <context-services>
+                    <context-service name="default" jndi-name="java:jboss/ee/concurrency/context/default" use-transaction-setup-provider="true"/>
+                </context-services>
+                <managed-executor-services>
+                    <managed-executor-service name="default" jndi-name="java:jboss/ee/concurrency/executor/default" context-service="default" hung-task-threshold="60000" core-threads="5" max-threads="25" keepalive-time="5000"/>
+                </managed-executor-services>
+                <managed-scheduled-executor-services>
+                    <managed-scheduled-executor-service name="default" jndi-name="java:jboss/ee/concurrency/scheduler/default" context-service="default" hung-task-threshold="60000" core-threads="2" keepalive-time="3000"/>
+                </managed-scheduled-executor-services>
+                <managed-thread-factories>
+                    <managed-thread-factory name="default" jndi-name="java:jboss/ee/concurrency/factory/default" context-service="default"/>
+                </managed-thread-factories>
+            </concurrent>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:ejb3:1.4">
+        <subsystem xmlns="urn:jboss:domain:ejb3:2.0">
             <session-bean>
                 <stateless>
                     <bean-instance-pool-ref pool-name="slsb-strict-max-pool"/>
                 </stateless>
-                <stateful default-access-timeout="5000" cache-ref="simple"/>
+                <stateful default-access-timeout="5000" cache-ref="simple" passivation-disabled-cache-ref="simple"/>
                 <singleton default-access-timeout="5000"/>
             </session-bean>
-            <default-security-domain value="other"/>
             <pools>
                 <bean-instance-pools>
-                    <strict-max-pool name="slsb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5"
-                                     instance-acquisition-timeout-unit="MINUTES"/>
-                    <strict-max-pool name="mdb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5"
-                                     instance-acquisition-timeout-unit="MINUTES"/>
+                    <strict-max-pool name="slsb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
+                    <strict-max-pool name="mdb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
                 </bean-instance-pools>
             </pools>
             <caches>
-                <cache name="simple" aliases="NoPassivationCache"/>
-                <cache name="passivating" passivation-store-ref="file" aliases="SimpleStatefulCache"/>
+                <cache name="simple"/>
+                <cache name="distributable" aliases="passivating clustered" passivation-store-ref="infinispan"/>
             </caches>
             <passivation-stores>
-                <file-passivation-store name="file"/>
+                <passivation-store name="infinispan" cache-container="ejb" max-size="10000"/>
             </passivation-stores>
             <async thread-pool-name="default"/>
-            <timer-service thread-pool-name="default">
-                <data-store path="timer-service-data" relative-to="jboss.server.data.dir"/>
+            <timer-service thread-pool-name="default" default-data-store="default-file-store">
+                <data-stores>
+                    <file-data-store name="default-file-store" path="timer-service-data" relative-to="jboss.server.data.dir"/>
+                </data-stores>
             </timer-service>
-            <remote connector-ref="remoting-connector" thread-pool-name="default"/>
+            <remote connector-ref="http-remoting-connector" thread-pool-name="default"/>
             <thread-pools>
                 <thread-pool name="default">
                     <max-threads count="10"/>
                     <keepalive-time time="100" unit="milliseconds"/>
                 </thread-pool>
             </thread-pools>
+            <default-security-domain value="other"/>
+            <default-missing-method-permissions-deny-access value="true"/>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:messaging:1.3">
-            <hornetq-server>
-                <security-enabled>false</security-enabled>
-                <persistence-enabled>true</persistence-enabled>
-                <journal-type>NIO</journal-type>
-                <journal-min-files>2</journal-min-files>
-                <connectors>
-                    <netty-connector name="netty" socket-binding="messaging"/>
-                </connectors>
-                <acceptors>
-                    <netty-acceptor name="netty" socket-binding="messaging"/>
-                </acceptors>
-                <address-settings>
-                    <!--default for catch all-->
-                    <address-setting match="#">
-                        <dead-letter-address>jms.queue.DLQ</dead-letter-address>
-                        <expiry-address>jms.queue.ExpiryQueue</expiry-address>
-                        <redelivery-delay>0</redelivery-delay>
-                        <max-size-bytes>10485760</max-size-bytes>
-                        <address-full-policy>BLOCK</address-full-policy>
-                        <message-counter-history-day-limit>10</message-counter-history-day-limit>
-                    </address-setting>
-                </address-settings>
-                <jms-connection-factories>
-                    <connection-factory name="RemoteConnectionFactory">
-                        <connectors>
-                            <connector-ref connector-name="netty"/>
-                        </connectors>
-                        <entries>
-                            <entry name="java:/RemoteConnectionFactory"/>
-                            <entry name="java:jboss/exported/jms/RemoteConnectionFactory"/>
-                        </entries>
-                    </connection-factory>
-                </jms-connection-factories>
-                <jms-destinations>
-                    <jms-queue name="ModeShapeIndexing">
-                        <entry name="jms/queue/ModeShapeIndexing"/>
-                        <entry name="java:jboss/exported/jms/queue/ModeShapeIndexing"/>
-                    </jms-queue>
-                </jms-destinations>
-            </hornetq-server>
+        <subsystem xmlns="urn:jboss:domain:io:1.0">
+            <worker name="default" io-threads="3"/>
+            <buffer-pool name="default" buffer-size="16384" buffers-per-slice="128"/>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:infinispan:1.4">
-            <cache-container name="hibernate" default-cache="local-query" module="org.jboss.as.jpa.hibernate:4">
-                <local-cache name="entity">
-                    <transaction mode="NON_XA"/>
-                    <eviction strategy="LRU" max-entries="10000"/>
-                    <expiration max-idle="100000"/>
-                </local-cache>
-                <local-cache name="local-query">
-                    <transaction mode="NONE"/>
-                    <eviction strategy="LRU" max-entries="10000"/>
-                    <expiration max-idle="100000"/>
-                </local-cache>
-                <local-cache name="timestamps">
-                    <transaction mode="NONE"/>
-                    <eviction strategy="NONE"/>
-                </local-cache>
-            </cache-container>
+        <subsystem xmlns="urn:jboss:domain:infinispan:2.0">
             <!-- Each ModeShape repository uses one (or more) cache in a cache container. We define a single container
-                 named "modeshape" (other names require specifying the container names in each repository configuration
-            -->
+              named "modeshape" (other names require specifying the container names in each repository configuration
+         -->
             <cache-container name="modeshape" default-cache="sample" module="org.modeshape">
                 <local-cache name="federated-repository">
                     <!-- ModeShape requires transactions -->
@@ -254,42 +289,8 @@
                 </external-sources>
             </repository>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:jgroups:1.1" default-stack="tcp">
-            <stack name="udp">
-                <transport type="UDP" socket-binding="jgroups-udp"/>
-                <protocol type="PING"/>
-                <protocol type="MERGE3"/>
-                <protocol type="FD_SOCK" socket-binding="jgroups-udp-fd"/>
-                <protocol type="FD"/>
-                <protocol type="VERIFY_SUSPECT"/>
-                <protocol type="pbcast.NAKACK2"/>
-                <protocol type="UNICAST2"/>
-                <protocol type="pbcast.STABLE"/>
-                <protocol type="pbcast.GMS"/>
-                <protocol type="UFC"/>
-                <protocol type="MFC"/>
-                <protocol type="FRAG2"/>
-                <protocol type="RSVP"/>
-            </stack>
-            <stack name="tcp">
-                <transport type="TCP" socket-binding="jgroups-tcp"/>
-                <protocol type="MPING" socket-binding="jgroups-mping"/>
-                <protocol type="MERGE2"/>
-                <protocol type="FD_SOCK" socket-binding="jgroups-tcp-fd"/>
-                <protocol type="FD"/>
-                <protocol type="VERIFY_SUSPECT"/>
-                <protocol type="pbcast.NAKACK2"/>
-                <protocol type="UNICAST2"/>
-                <protocol type="pbcast.STABLE"/>
-                <protocol type="pbcast.GMS"/>
-                <protocol type="UFC"/>
-                <protocol type="MFC"/>
-                <protocol type="FRAG2"/>
-                <protocol type="RSVP"/>
-            </stack>
-        </subsystem>
         <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/>
-        <subsystem xmlns="urn:jboss:domain:jca:1.1">
+        <subsystem xmlns="urn:jboss:domain:jca:2.0">
             <archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/>
             <bean-validation enabled="true"/>
             <default-workmanager>
@@ -309,50 +310,28 @@
             <cached-connection-manager/>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:jdr:1.0"/>
-        <subsystem xmlns="urn:jboss:domain:jmx:1.2">
+        <subsystem xmlns="urn:jboss:domain:jmx:1.3">
             <expose-resolved-model/>
             <expose-expression-model/>
             <remoting-connector/>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:jpa:1.0">
-            <jpa default-datasource=""/>
+        <subsystem xmlns="urn:jboss:domain:jpa:1.1">
+            <jpa default-datasource="" default-extended-persistence-inheritance="DEEP"/>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:jsf:1.0"/>
-        <subsystem xmlns="urn:jboss:domain:mail:1.0">
-            <mail-session jndi-name="java:jboss/mail/Default">
+        <subsystem xmlns="urn:jboss:domain:mail:2.0">
+            <mail-session name="default" jndi-name="java:jboss/mail/Default">
                 <smtp-server outbound-socket-binding-ref="mail-smtp"/>
             </mail-session>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:naming:1.2">
+        <subsystem xmlns="urn:jboss:domain:naming:2.0">
             <remote-naming/>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:osgi:1.2" activation="lazy">
-            <properties>
-                <!-- Specifies the beginning start level of the framework -->
-                <property name="org.osgi.framework.startlevel.beginning">1</property>
-            </properties>
-            <capabilities>
-                <!-- modules registered with the OSGi layer on startup -->
-                <capability name="javax.jws.api"/>
-                <capability name="javax.persistence.api"/>
-                <capability name="javax.servlet.api"/>
-                <capability name="javax.transaction.api"/>
-                <capability name="javax.ws.rs.api"/>
-                <capability name="javax.xml.bind.api"/>
-                <capability name="javax.xml.ws.api"/>
-                <capability name="org.slf4j"/>
-                <!-- bundles started in startlevel 1 -->
-                <capability name="org.apache.felix.log" startlevel="1"/>
-                <capability name="org.jboss.osgi.logging" startlevel="1"/>
-                <capability name="org.apache.felix.configadmin" startlevel="1"/>
-                <capability name="org.jboss.as.osgi.configadmin" startlevel="1"/>
-            </capabilities>
-        </subsystem>
         <subsystem xmlns="urn:jboss:domain:pojo:1.0"/>
-        <subsystem xmlns="urn:jboss:domain:remoting:1.1">
-            <connector name="remoting-connector" socket-binding="remoting" security-realm="ApplicationRealm"/>
+        <subsystem xmlns="urn:jboss:domain:remoting:2.0">
+            <http-connector name="http-remoting-connector" connector-ref="default" security-realm="ApplicationRealm"/>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:resource-adapters:1.0"/>
+        <subsystem xmlns="urn:jboss:domain:resource-adapters:2.0"/>
         <subsystem xmlns="urn:jboss:domain:sar:1.0"/>
         <subsystem xmlns="urn:jboss:domain:security:1.2">
             <security-domains>
@@ -379,15 +358,15 @@
                 <security-domain name="modeshape-security" cache-type="default">
                     <authentication>
                         <login-module code="UsersRoles" flag="required">
-                            <module-option name="usersProperties" value="modeshape-users.properties"/>
-                            <module-option name="rolesProperties" value="modeshape-roles.properties"/>
+                            <module-option name="usersProperties" value="${jboss.server.config.dir}/modeshape-users.properties"/>
+                            <module-option name="rolesProperties" value="${jboss.server.config.dir}/modeshape-roles.properties"/>
                         </login-module>
                     </authentication>
                 </security-domain>
             </security-domains>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:threads:1.1"/>
-        <subsystem xmlns="urn:jboss:domain:transactions:1.2">
+        <subsystem xmlns="urn:jboss:domain:transactions:2.0">
             <core-environment>
                 <process-id>
                     <uuid/>
@@ -396,26 +375,36 @@
             <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/>
             <coordinator-environment default-timeout="300"/>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:web:1.2" default-virtual-server="default-host" native="false">
-            <connector name="http" protocol="HTTP/1.1" scheme="http" socket-binding="http"/>
-            <virtual-server name="default-host" enable-welcome-root="true">
-                <alias name="localhost"/>
-                <alias name="example.com"/>
-            </virtual-server>
+        <subsystem xmlns="urn:jboss:domain:undertow:1.0">
+            <buffer-caches>
+                <buffer-cache name="default" buffer-size="1024" buffers-per-region="1024" max-regions="10"/>
+            </buffer-caches>
+            <server name="default-server">
+                <http-listener name="default" socket-binding="http"/>
+                <host name="default-host" alias="localhost">
+                    <location name="/" handler="welcome-content"/>
+                </host>
+            </server>
+            <servlet-container name="default" default-buffer-cache="default" stack-trace-on-error="local-only">
+                <jsp-config/>
+                <persistent-sessions/>
+            </servlet-container>
+            <handlers>
+                <file name="welcome-content" path="${jboss.home.dir}/welcome-content" directory-listing="true"/>
+            </handlers>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:webservices:1.2">
             <modify-wsdl-address>true</modify-wsdl-address>
             <wsdl-host>${jboss.bind.address:127.0.0.1}</wsdl-host>
             <endpoint-config name="Standard-Endpoint-Config"/>
             <endpoint-config name="Recording-Endpoint-Config">
-                <pre-handler-chain name="recording-handlers"
-                                   protocol-bindings="##SOAP11_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP ##SOAP12_HTTP_MTOM">
+                <pre-handler-chain name="recording-handlers" protocol-bindings="##SOAP11_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP ##SOAP12_HTTP_MTOM">
                     <handler name="RecordingHandler" class="org.jboss.ws.common.invocation.RecordingServerHandler"/>
                 </pre-handler-chain>
             </endpoint-config>
             <client-config name="Standard-Client-Config"/>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:weld:1.0"/>
+        <subsystem xmlns="urn:jboss:domain:weld:2.0"/>
     </profile>
     <interfaces>
         <interface name="management">
@@ -428,29 +417,20 @@
         <interface name="unsecure">
             <!--
               ~  Used for IIOP sockets in the standard configuration.
-              ~                  To secure JacORB you need to setup SSL 
+              ~                  To secure JacORB you need to setup SSL
               -->
             <inet-address value="${jboss.bind.address.unsecure:127.0.0.1}"/>
         </interface>
     </interfaces>
-    <socket-binding-group name="standard-sockets" default-interface="public"
-                          port-offset="${jboss.socket.binding.port-offset:0}">
+    <socket-binding-group name="standard-sockets" default-interface="public" port-offset="${jboss.socket.binding.port-offset:0}">
         <socket-binding name="management-native" interface="management" port="${jboss.management.native.port:9999}"/>
         <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
-        <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9443}"/>
-        <socket-binding name="ajp" port="8009"/>
-        <socket-binding name="http" port="8080"/>
-        <socket-binding name="https" port="8443"/>
-        <socket-binding name="remoting" port="4447"/>
+        <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9993}"/>
+        <socket-binding name="ajp" port="${jboss.ajp.port:8009}"/>
+        <socket-binding name="http" port="${jboss.http.port:8080}"/>
+        <socket-binding name="https" port="${jboss.https.port:8443}"/>
         <socket-binding name="txn-recovery-environment" port="4712"/>
         <socket-binding name="txn-status-manager" port="4713"/>
-        <socket-binding name="jgroups-mping" port="0" multicast-address="${jboss.default.multicast.address:230.0.0.4}" multicast-port="45700"/>
-        <socket-binding name="jgroups-tcp" port="7600"/>
-        <socket-binding name="jgroups-tcp-fd" port="57600"/>
-        <socket-binding name="jgroups-udp" port="55200" multicast-address="${jboss.default.multicast.address:230.0.0.4}" multicast-port="45688"/>
-        <socket-binding name="jgroups-udp-fd" port="54200"/>
-        <socket-binding name="modcluster" port="0" multicast-address="224.0.1.105" multicast-port="23364"/>
-        <socket-binding name="messaging" port="5445"/>
         <outbound-socket-binding name="mail-smtp">
             <remote-destination host="localhost" port="25"/>
         </outbound-socket-binding>
diff --git a/modeshape-servlet/README.md b/modeshape-servlet/README.md
index 573678c..2f4c4c7 100644
--- a/modeshape-servlet/README.md
+++ b/modeshape-servlet/README.md
@@ -11,15 +11,15 @@ JNDI API.
 System requirements
 -------------------
 
-All you need to build this project is Java 6.0 (Java SDK 1.6) or better, Maven 3.0 or better.
-The application this project produces is designed to be run on JBoss Enterprise Application Platform 6.
+All you need to build this project is Java 7.0 (Java SDK 1.7) or better, Maven 3.0 or better.
+The application this project produces is designed to be run on JBoss Wildfly 8.
 
-Install ModeShape's EAP kit into an existing JBoss EAP 6 server
+Install ModeShape's Wildfly kit into an existing JBoss Wildfly server
 -----------------------------------------------------
-Before running this demo make sure that you have installed the ModeShape EAP kit into an existing JBoss EAP server.
+Before running this demo make sure that you have installed the ModeShape Wildfly kit into an existing JBoss Wildfly server.
 The simplest way to do this is to follow the instructions provided [here](https://docs.jboss.org/author/display/MODE/Installing+ModeShape+into+AS7)
 
-Start JBoss EAP with the ModeShape configuration
+Start JBoss Wildfly with the ModeShape configuration
 --------------------------------------------------------------------------------
 
 1. Open a command line and navigate to the root of the JBoss server directory.
diff --git a/modeshape-servlet/pom.xml b/modeshape-servlet/pom.xml
index acb757c..51230b7 100644
--- a/modeshape-servlet/pom.xml
+++ b/modeshape-servlet/pom.xml
@@ -4,17 +4,17 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.modeshape.quickstarts</groupId>
     <artifactId>modeshape-servlet</artifactId>
-    <version>3.7.1.Final</version>
+    <version>4.0-SNAPSHOT</version>
     <packaging>war</packaging>
     <name>Example of web application that uses ModeShape</name>
     <description>
-        A simple self-contained example web application that uses a servlet to retrieve a repository managed within EAP.
+        A simple self-contained example web application that uses a servlet to retrieve a repository managed within AS.
     </description>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.6</maven.compiler.source>
-        <maven.compiler.target>1.6</maven.compiler.target>
+        <maven.compiler.source>1.7</maven.compiler.source>
+        <maven.compiler.target>1.7</maven.compiler.target>
 
         <!-- Maven plugin versions -->
         <version.assembly.plugin>2.4</version.assembly.plugin>
@@ -29,7 +29,7 @@
         <version.org.jboss.as.plugins.maven.plugin>7.4.Final</version.org.jboss.as.plugins.maven.plugin>
 
         <!-- Global dependency version information-->
-        <version.modeshape>3.7.1.Final</version.modeshape>
+        <version.modeshape>4.0-SNAPSHOT</version.modeshape>
         <version.google.http-client>1.14.1-beta</version.google.http-client>
     </properties>
 
@@ -41,7 +41,7 @@
                  specify the versions of any of those modules.-->
             <dependency>
                 <groupId>org.modeshape.bom</groupId>
-                <artifactId>modeshape-bom-jbosseap</artifactId>
+                <artifactId>modeshape-bom-jbossas</artifactId>
                 <version>${version.modeshape}</version>
                 <type>pom</type>
                 <scope>import</scope>
@@ -212,9 +212,8 @@
             <id>arq-jbossas-remote</id>
             <dependencies>
                 <dependency>
-                    <groupId>org.jboss.as</groupId>
-                    <artifactId>jboss-as-arquillian-container-remote</artifactId>
-                    <scope>test</scope>
+                    <groupId>org.wildfly</groupId>
+                    <artifactId>wildfly-arquillian-container-remote</artifactId>
                 </dependency>
             </dependencies>
         </profile>
diff --git a/modeshape-servlet/src/test/java/org/modeshape/quickstart/servlet/RepositoryServletTest.java b/modeshape-servlet/src/test/java/org/modeshape/quickstart/servlet/RepositoryServletTest.java
index 464edbe..e1afd96 100644
--- a/modeshape-servlet/src/test/java/org/modeshape/quickstart/servlet/RepositoryServletTest.java
+++ b/modeshape-servlet/src/test/java/org/modeshape/quickstart/servlet/RepositoryServletTest.java
@@ -24,7 +24,6 @@ public class RepositoryServletTest {
     @Deployment
     public static WebArchive createDeployment() {
         return ShrinkWrap.create(WebArchive.class, "modeshape-servlet-test.war").addClass(RepositoryServlet.class)
-                .addAsWebInfResource(new File("src/main/webapp/WEB-INF/jboss-web.xml"))
                 .addAsWebInfResource(new File("src/main/webapp/WEB-INF/jboss-deployment-structure.xml"))
                 .addAsWebInfResource(new File("src/test/resources/log4j.properties"))
                 .addAsWebResource(new File("src/main/webapp/dblue106.gif"))
@@ -39,7 +38,7 @@ public void shouldExecuteQuery() throws Exception {
         HttpRequestFactory requestFactory = new NetHttpTransport().createRequestFactory();
         Assert.assertEquals(200,
                             requestFactory.buildGetRequest(new GenericUrl(
-                                    "http://localhost:8080/modeshape-servlet/session.do?repository=sample&path=/"))
+                                    "http://localhost:8080/modeshape-servlet-test/session.do?repository=sample&path=/"))
                                     .execute().getStatusCode());
     }
 }
diff --git a/pom.xml b/pom.xml
index 3eb14c9..383b7be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,8 +4,8 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.modeshape.quickstarts</groupId>
     <artifactId>modeshape-quickstarts</artifactId>
-    <version>3.7-SNAPSHOT</version>
-    <name>ModeShape EAP Quickstarts</name>
+    <version>4.0-SNAPSHOT</version>
+    <name>ModeShape AS Quickstarts</name>
     <description>Top-Level POM for building all of the quickstarts.</description>
     <url>http://www.modeshape.org</url>
     <packaging>pom</packaging>