From f4dde552a21aa437ddc2a1f706d4cff13025f279 Mon Sep 17 00:00:00 2001
From: "Ian Y. Choi" <ianyrchoi@gmail.com>
Date: Thu, 19 Jan 2017 03:56:38 +0000
Subject: [PATCH] standalone.xml.erb for Wildfly 10 & Zanata 3.9.6

Change-Id: Iea29eba84b83879dd5e7b2e7522efc3f20ca7058
Co-Authored-By: Alex Eng <aeng@redhat.com>
---
 templates/wildfly-10-standalone.xml.erb | 533 +++++++++++++-----------
 1 file changed, 293 insertions(+), 240 deletions(-)

diff --git a/templates/wildfly-10-standalone.xml.erb b/templates/wildfly-10-standalone.xml.erb
index 53993d0..f404c3f 100644
--- a/templates/wildfly-10-standalone.xml.erb
+++ b/templates/wildfly-10-standalone.xml.erb
@@ -1,37 +1,43 @@
 <?xml version='1.0' encoding='UTF-8'?>
 
-<server xmlns="urn:jboss:domain:2.1">
+<server xmlns="urn:jboss:domain:4.0">
 
     <extensions>
-        <extension module="org.jboss.as.clustering.infinispan"/>
-        <extension module="org.jboss.as.connector"/>
-        <extension module="org.jboss.as.deployment-scanner"/>
-        <extension module="org.jboss.as.ee"/>
-        <extension module="org.jboss.as.ejb3"/>
-        <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.logging"/>
-        <extension module="org.jboss.as.mail"/>
-        <extension module="org.jboss.as.messaging"/>
-        <extension module="org.jboss.as.naming"/>
-        <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.jboss.as.transactions"/>
-        <extension module="org.jboss.as.webservices"/>
-        <extension module="org.wildfly.extension.batch"/>
-        <extension module="org.wildfly.extension.io"/>
-        <extension module="org.wildfly.extension.undertow"/>
+        <extension module="org.jboss.as.clustering.infinispan" />
+        <extension module="org.jboss.as.connector" />
+        <extension module="org.jboss.as.deployment-scanner" />
+        <extension module="org.jboss.as.ee" />
+        <extension module="org.jboss.as.ejb3" />
+        <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.naming" />
+        <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.jboss.as.transactions" />
+        <extension module="org.jboss.as.webservices" />
+        <extension module="org.jboss.as.weld" />
+        <extension module="org.wildfly.extension.batch.jberet" />
+        <extension module="org.wildfly.extension.bean-validation" />
+        <extension module="org.wildfly.extension.io" />
+        <extension module="org.wildfly.extension.messaging-activemq" />
+        <extension module="org.wildfly.extension.request-controller" />
+        <extension module="org.wildfly.extension.security.manager" />
+        <extension module="org.wildfly.extension.undertow" />
     </extensions>
 
     <system-properties>
         <property name="javamelody.storage-directory" value="<%= @zanata_storage_dir %>/stats"/>
         <property name="hibernate.search.default.indexBase" value="<%= @zanata_storage_dir %>/indexes"/>
         <property name="ehcache.disk.store.dir" value="<%= @zanata_storage_dir %>/ehcache"/>
+        <property name="jboss.as.management.blocking.timeout" value="1000"/>
     </system-properties>
 
 
@@ -86,7 +92,7 @@
     </management>
 
     <profile>
-        <subsystem xmlns="urn:jboss:domain:logging:2.0">
+        <subsystem xmlns="urn:jboss:domain:logging:3.0">
             <console-handler name="CONSOLE">
                 <level name="INFO"/>
                 <formatter>
@@ -102,47 +108,82 @@
                 <append value="true"/>
             </periodic-rotating-file-handler>
             <logger category="com.arjuna">
-                <level name="WARN"/>
+                <level name="WARN" />
             </logger>
-            <logger category="org.apache.tomcat.util.modeler">
-                <level name="WARN"/>
+            <!-- JDBC connection allocation/release will be logged to server.log -->
+            <logger
+              category="org.hibernate.engine.jdbc.internal.LogicalConnectionImpl">
+                <level name="DEBUG" />
+            </logger>
+            <!-- More info about JDBC connections will be logged to server.log -->
+            <logger category="org.hibernate.engine.jdbc.internal.JdbcCoordinatorImpl">
+                <level name="DEBUG" />
             </logger>
             <logger category="org.jboss.as.config">
-                <level name="DEBUG"/>
+                <level name="DEBUG" />
             </logger>
-            <logger category="sun.rmi">
-                <level name="WARN"/>
+            <!-- Disable some startup warnings triggered by third-party jars -->
+            <logger category="org.jboss.as.server.deployment">
+                <filter-spec value="not(any( match(&quot;JBAS015960&quot;), match(&quot;JBAS015893&quot;) ))"/>
             </logger>
-            <logger category="jacorb">
-                <level name="WARN"/>
-            </logger>
-            <logger category="jacorb.config">
+            <!-- Disable WARN about GWT's org.hibernate.validator.ValidationMessages -->
+            <logger category="org.jboss.modules">
                 <level name="ERROR"/>
             </logger>
+            <!-- Disable WARN: "RP discovery / realm validation disabled;" -->
+            <logger category="org.openid4java.server.RealmVerifier">
+                <level name="ERROR"/>
+            </logger>
+            <!-- Disable WARN: "JMS API was found on the classpath..." -->
+            <logger category="org.richfaces.log.Application">
+                <filter-spec value="not( match(&quot;JMS API was found on the classpath&quot;) )"/>
+            </logger>
+            <!-- Disable WARN: "Queue with name '...' has already been registered" -->
+            <logger category="org.richfaces.log.Components">
+                <level name="ERROR"/>
+            </logger>
+            <!-- Enable if you want to log all HTTP requests to server.log: -->
+            <!--<logger category="org.zanata.requests">-->
+            <!--<level name="DEBUG"/>-->
+            <!--</logger>-->
+            <logger category="sun.rmi">
+                <level name="WARN" />
+            </logger>
+            <logger category="jacorb">
+                <level name="WARN" />
+            </logger>
+            <logger category="jacorb.config">
+                <level name="ERROR" />
+            </logger>
             <root-logger>
-                <level name="INFO"/>
+                <level name="INFO" />
                 <handlers>
-                    <handler name="CONSOLE"/>
-                    <handler name="FILE"/>
+                    <handler name="CONSOLE" />
+                    <handler name="FILE" />
                 </handlers>
             </root-logger>
             <formatter name="PATTERN">
-                <pattern-formatter pattern="%d{HH:mm:ss,SSS}Z %-5p [%c] (%t) %s%E%n"/>
+                <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}%z{utc}%d{yyyy-MM-dd}T%d{HH:mm:ss,SSS}Z %-5p [%c] (%t) %s%E%n"/>
+                <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/>
+        <subsystem xmlns="urn:jboss:domain:batch-jberet:1.0">
+            <default-job-repository name="in-memory" />
+            <default-thread-pool name="batch" />
+            <job-repository name="in-memory">
+                <in-memory />
             </job-repository>
-            <thread-pool>
-                <max-threads count="10"/>
-                <keepalive-time time="30" unit="seconds"/>
+            <thread-pool name="batch">
+                <max-threads count="10" />
+                <keepalive-time time="30" unit="seconds" />
             </thread-pool>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:datasources:2.0">
+        <subsystem xmlns="urn:jboss:domain:bean-validation:1.0" />
+        <subsystem xmlns="urn:jboss:domain:datasources:4.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;DB_CLOSE_ON_EXIT=FALSE</connection-url>
@@ -170,6 +211,12 @@
                     <statement>
                         <track-statements>NOWARN</track-statements>
                     </statement>
+                    <validation>
+                        <validate-on-match>true</validate-on-match>
+                        <background-validation>false</background-validation>
+                        <valid-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.mysql.MySQLValidConnectionChecker"></valid-connection-checker>
+                        <exception-sorter class-name="org.jboss.jca.adapters.jdbc.extensions.mysql.MySQLExceptionSorter"></exception-sorter>
+                    </validation>
                 </datasource>
                 <drivers>
                     <driver name="h2" module="com.h2database.h2">
@@ -179,131 +226,173 @@
             </datasources>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:deployment-scanner:2.0">
-            <deployment-scanner path="deployments" relative-to="jboss.server.base.dir" scan-interval="5000"/>
+            <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:2.0">
+        <subsystem xmlns="urn:jboss:domain:ee:4.0">
             <spec-descriptor-property-replacement>false</spec-descriptor-property-replacement>
             <concurrent>
                 <context-services>
-                    <context-service name="default" jndi-name="java:jboss/ee/concurrency/context/default" use-transaction-setup-provider="true"/>
+                    <context-service name="default"
+                      jndi-name="java:jboss/ee/concurrency/context/default"
+                      use-transaction-setup-provider="true" />
                 </context-services>
                 <managed-thread-factories>
-                    <managed-thread-factory name="default" jndi-name="java:jboss/ee/concurrency/factory/default" context-service="default"/>
+                    <managed-thread-factory name="default"
+                      jndi-name="java:jboss/ee/concurrency/factory/default"
+                      context-service="default" />
                 </managed-thread-factories>
                 <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-service name="default" jndi-name="java:jboss/ee/concurrency/executor/default" context-service="default" hung-task-threshold="60000" 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-service name="default" jndi-name="java:jboss/ee/concurrency/scheduler/default" context-service="default" hung-task-threshold="60000" keepalive-time="3000"/>
                 </managed-scheduled-executor-services>
             </concurrent>
-            <default-bindings context-service="java:jboss/ee/concurrency/context/default" datasource="java:jboss/datasources/ExampleDS" jms-connection-factory="java:jboss/DefaultJMSConnectionFactory" managed-executor-service="java:jboss/ee/concurrency/executor/default" managed-scheduled-executor-service="java:jboss/ee/concurrency/scheduler/default" managed-thread-factory="java:jboss/ee/concurrency/factory/default"/>
+            <default-bindings
+              context-service="java:jboss/ee/concurrency/context/default"
+              datasource="java:jboss/datasources/ExampleDS"
+              jms-connection-factory="java:jboss/DefaultJMSConnectionFactory"
+              managed-executor-service="java:jboss/ee/concurrency/executor/default"
+              managed-scheduled-executor-service="java:jboss/ee/concurrency/scheduler/default"
+              managed-thread-factory="java:jboss/ee/concurrency/factory/default" />
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:ejb3:2.0">
+        <subsystem xmlns="urn:jboss:domain:ejb3:4.0">
             <session-bean>
-                <stateful default-access-timeout="5000" cache-ref="simple" passivation-disabled-cache-ref="simple"/>
-                <singleton default-access-timeout="5000"/>
+                <stateful default-access-timeout="5000" cache-ref="simple"
+                  passivation-disabled-cache-ref="simple" />
+                <stateless>
+                    <bean-instance-pool-ref pool-name="slsb-strict-max-pool"/>
+                </stateless>
+                <singleton default-access-timeout="5000" />
             </session-bean>
+            <mdb>
+                <resource-adapter-ref
+                  resource-adapter-name="${ejb.resource-adapter-name:activemq-ra.rar}" />
+                <bean-instance-pool-ref pool-name="mdb-strict-max-pool" />
+            </mdb>
             <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"/>
+                    <!-- Automatically configure pools. Alternatively, max-pool-size can be set to a specific value -->
+                    <strict-max-pool name="slsb-strict-max-pool" derive-size="from-worker-pools" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
+                    <strict-max-pool name="mdb-strict-max-pool" derive-size="from-cpu-count" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
                 </bean-instance-pools>
             </pools>
             <caches>
-                <cache name="simple"/>
-                <cache name="distributable" passivation-store-ref="infinispan" aliases="passivating clustered"/>
+                <cache name="simple" />
+                <cache name="distributable" passivation-store-ref="infinispan"
+                  aliases="passivating clustered" />
             </caches>
             <passivation-stores>
-                <passivation-store name="infinispan" cache-container="ejb" max-size="10000"/>
+                <passivation-store name="infinispan" cache-container="ejb"
+                  max-size="10000" />
             </passivation-stores>
-            <async thread-pool-name="default"/>
-            <timer-service thread-pool-name="default" default-data-store="default-file-store">
+            <async thread-pool-name="default" />
+            <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"/>
+                    <file-data-store name="default-file-store" path="timer-service-data"
+                      relative-to="jboss.server.data.dir" />
                 </data-stores>
             </timer-service>
-            <remote connector-ref="http-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"/>
+                    <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"/>
-            <mdb>
-                <resource-adapter-ref resource-adapter-name="hornetq-ra"/>
-                <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/>
-            </mdb>
+            <iiop enable-by-default="false" use-qualified-name="false" />
+            <default-security-domain value="other" />
+            <default-missing-method-permissions-deny-access value="true" />
+            <log-system-exceptions value="true" />
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:io:1.1">
             <worker name="default"/>
             <buffer-pool name="default"/>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:infinispan:2.0">
-	  <cache-container name="zanata" default-cache="default"
-              jndi-name="java:jboss/infinispan/container/zanata"
-              start="EAGER"
-              module="org.jboss.as.clustering.web.infinispan">
-              <local-cache name="default">
-                  <transaction mode="NON_XA"/>
-                  <eviction strategy="LRU" max-entries="10000"/>
-                  <expiration max-idle="100000"/>
-              </local-cache>
-          </cache-container>
-            <cache-container name="web" default-cache="passivation" module="org.wildfly.clustering.web.infinispan">
-                <local-cache name="passivation" batching="true">
-                    <file-store passivation="true" purge="false"/>
-                </local-cache>
-                <local-cache name="persistent" batching="true">
-                    <file-store passivation="false" purge="false"/>
+        <subsystem xmlns="urn:jboss:domain:infinispan:4.0">
+            <cache-container name="server" module="org.wildfly.clustering.server"
+              default-cache="default">
+                <local-cache name="default">
+                    <transaction mode="BATCH" />
                 </local-cache>
             </cache-container>
-            <cache-container name="ejb" default-cache="passivation" module="org.wildfly.clustering.ejb.infinispan" aliases="sfsb">
-                <local-cache name="passivation" batching="true">
-                    <file-store passivation="true" purge="false"/>
+            <cache-container name="web" module="org.wildfly.clustering.web.infinispan"
+              default-cache="passivation">
+                <local-cache name="passivation">
+                    <locking isolation="REPEATABLE_READ" />
+                    <transaction mode="BATCH" />
+                    <file-store passivation="true" purge="false" />
                 </local-cache>
-                <local-cache name="persistent" batching="true">
-                    <file-store passivation="false" purge="false"/>
+                <local-cache name="persistent">
+                    <locking isolation="REPEATABLE_READ" />
+                    <transaction mode="BATCH" />
+                    <file-store passivation="false" purge="false" />
                 </local-cache>
             </cache-container>
-            <cache-container name="hibernate" default-cache="local-query" module="org.hibernate">
+            <cache-container name="ejb" aliases="sfsb"
+              module="org.wildfly.clustering.ejb.infinispan"
+              default-cache="passivation">
+                <local-cache name="passivation">
+                    <locking isolation="REPEATABLE_READ" />
+                    <transaction mode="BATCH" />
+                    <file-store passivation="true" purge="false" />
+                </local-cache>
+                <local-cache name="persistent">
+                    <locking isolation="REPEATABLE_READ" />
+                    <transaction mode="BATCH" />
+                    <file-store passivation="false" purge="false" />
+                </local-cache>
+            </cache-container>
+            <cache-container name="hibernate" module="org.hibernate.infinispan"
+              default-cache="local-query">
                 <local-cache name="entity">
-                    <transaction mode="NON_XA"/>
-                    <eviction strategy="LRU" max-entries="10000"/>
-                    <expiration max-idle="100000"/>
+                    <transaction mode="NON_XA" />
+                    <eviction max-entries="10000" strategy="LRU" />
+                    <expiration max-idle="100000" />
                 </local-cache>
                 <local-cache name="local-query">
-                    <transaction mode="NONE"/>
-                    <eviction strategy="LRU" max-entries="10000"/>
-                    <expiration max-idle="100000"/>
+                    <eviction max-entries="10000" strategy="LRU" />
+                    <expiration max-idle="100000" />
                 </local-cache>
-                <local-cache name="timestamps">
-                    <transaction mode="NONE"/>
-                    <eviction strategy="NONE"/>
+                <local-cache name="timestamps" />
+            </cache-container>
+            <!--
+            Zanata multi-purpose caches.
+            -->
+            <cache-container name="zanata"
+              module="org.jboss.as.clustering.web.infinispan" default-cache="default"
+              jndi-name="java:jboss/infinispan/container/zanata">
+                <local-cache name="default">
+                    <transaction mode="NON_XA" />
+                    <eviction max-entries="10000" strategy="LRU" />
+                    <expiration max-idle="100000" />
                 </local-cache>
             </cache-container>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/>
-        <subsystem xmlns="urn:jboss:domain:jca:2.0">
-            <archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/>
-            <bean-validation enabled="true"/>
+        <subsystem xmlns="urn:jboss:domain:jca:4.0">
+            <archive-validation enabled="true" fail-on-error="true"
+              fail-on-warn="false" />
+            <bean-validation enabled="true" />
             <default-workmanager>
                 <short-running-threads>
-                    <core-threads count="50"/>
-                    <queue-length count="50"/>
-                    <max-threads count="50"/>
-                    <keepalive-time time="10" unit="seconds"/>
+                    <core-threads count="50" />
+                    <queue-length count="50" />
+                    <max-threads count="50" />
+                    <keepalive-time time="10" unit="seconds" />
                 </short-running-threads>
                 <long-running-threads>
-                    <core-threads count="50"/>
-                    <queue-length count="50"/>
-                    <max-threads count="50"/>
-                    <keepalive-time time="10" unit="seconds"/>
+                    <core-threads count="50" />
+                    <queue-length count="50" />
+                    <max-threads count="50" />
+                    <keepalive-time time="10" unit="seconds" />
                 </long-running-threads>
             </default-workmanager>
-            <cached-connection-manager debug="true"/>
+            <cached-connection-manager debug="true" error="true" />
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:jdr:1.0"/>
         <subsystem xmlns="urn:jboss:domain:jmx:1.3">
@@ -314,102 +403,46 @@
         <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" default-jsf-impl-slot="mojarra-2.1.28"/>
+        <subsystem xmlns="urn:jboss:domain:jsf:1.0" />
+        <subsystem xmlns="urn:jboss:domain:jsr77:1.0" />
         <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"/>
+                <smtp-server outbound-socket-binding-ref="mail-smtp" />
             </mail-session>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:messaging:2.0">
-            <hornetq-server>
-                <persistence-enabled>true</persistence-enabled>
-                <security-enabled>false</security-enabled>
-                <journal-type>NIO</journal-type>
-                <journal-file-size>102400</journal-file-size>
-                <journal-min-files>2</journal-min-files>
-                <connectors>
-                    <http-connector name="http-connector" socket-binding="http">
-                        <param key="http-upgrade-endpoint" value="http-acceptor"/>
-                    </http-connector>
-                    <http-connector name="http-connector-throughput" socket-binding="http">
-                        <param key="http-upgrade-endpoint" value="http-acceptor-throughput"/>
-                        <param key="batch-delay" value="50"/>
-                    </http-connector>
-                    <in-vm-connector name="in-vm" server-id="0"/>
-                </connectors>
-                <acceptors>
-                    <http-acceptor name="http-acceptor" http-listener="default"/>
-                    <http-acceptor name="http-acceptor-throughput" http-listener="default">
-                        <param key="batch-delay" value="50"/>
-                        <param key="direct-deliver" value="false"/>
-                    </http-acceptor>
-                    <in-vm-acceptor name="in-vm" server-id="0"/>
-                </acceptors>
-                <security-settings>
-                    <security-setting match="#">
-                        <permission type="send" roles="guest"/>
-                        <permission type="consume" roles="guest"/>
-                        <permission type="createNonDurableQueue" roles="guest"/>
-                        <permission type="deleteNonDurableQueue" roles="guest"/>
-                    </security-setting>
-                </security-settings>
-                <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>5000</redelivery-delay>
-                        <max-delivery-attempts>2</max-delivery-attempts>
-                        <max-size-bytes>10485760</max-size-bytes>
-                        <page-size-bytes>2097152</page-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="InVmConnectionFactory">
-                        <connectors>
-                            <connector-ref connector-name="in-vm"/>
-                        </connectors>
-                        <entries>
-                            <entry name="java:/ConnectionFactory"/>
-                        </entries>
-                    </connection-factory>
-                    <connection-factory name="RemoteConnectionFactory">
-                        <connectors>
-                            <connector-ref connector-name="http-connector"/>
-                        </connectors>
-                        <entries>
-                            <entry name="java:jboss/exported/jms/RemoteConnectionFactory"/>
-                        </entries>
-                    </connection-factory>
-                    <pooled-connection-factory name="hornetq-ra">
-                        <transaction mode="xa"/>
-                        <connectors>
-                            <connector-ref connector-name="in-vm"/>
-                        </connectors>
-                        <entries>
-                            <entry name="java:/JmsXA"/>
-                            <!-- Global JNDI entry used to provide a default JMS Connection factory to EE application -->
-                            <entry name="java:jboss/DefaultJMSConnectionFactory"/>
-                        </entries>
-                    </pooled-connection-factory>
-                </jms-connection-factories>
-                <jms-destinations>
-                    <jms-queue name="MailsQueue">
-                        <entry name="jms/queue/MailsQueue"/>
-                        <durable>true</durable>
-                    </jms-queue>
-                    <jms-queue name="ExpiryQueue">
-                        <entry name="jms/queue/ExpiryQueue"/>
-                        <durable>true</durable>
-                    </jms-queue>
-                    <jms-queue name="DLQ">
-                        <entry name="jms/queue/DLQ"/>
-                        <durable>true</durable>
-                    </jms-queue>
-                </jms-destinations>
-            </hornetq-server>
+        <subsystem xmlns="urn:jboss:domain:messaging-activemq:1.0">
+            <server name="default">
+                <security-setting name="#">
+                    <role name="guest" delete-non-durable-queue="true"
+                      create-non-durable-queue="true" consume="true" send="true" />
+                </security-setting>
+                <address-setting name="#" message-counter-history-day-limit="10"
+                  page-size-bytes="2097152" max-size-bytes="10485760"
+                  expiry-address="jms.queue.ExpiryQueue"
+                  dead-letter-address="jms.queue.DLQ" />
+                <http-connector name="http-connector" socket-binding="http" endpoint="http-acceptor"/>
+                <http-connector name="http-connector-throughput" socket-binding="http" endpoint="http-acceptor-throughput">
+                    <param name="batch-delay" value="50" />
+                </http-connector>
+                <in-vm-connector name="in-vm" server-id="0" />
+                <http-acceptor name="http-acceptor" http-listener="default" />
+                <http-acceptor name="http-acceptor-throughput" http-listener="default">
+                    <param name="batch-delay" value="50" />
+                    <param name="direct-deliver" value="false" />
+                </http-acceptor>
+                <in-vm-acceptor name="in-vm" server-id="0" />
+                <jms-queue name="ExpiryQueue" entries="java:/jms/queue/ExpiryQueue" />
+                <jms-queue name="DLQ" entries="java:/jms/queue/DLQ" />
+                <jms-queue name="MailsQueue" entries="java:/jms/queue/MailsQueue" />
+                <connection-factory name="InVmConnectionFactory"
+                  entries="java:/ConnectionFactory" connectors="in-vm" />
+                <connection-factory name="RemoteConnectionFactory"
+                  entries="java:jboss/exported/jms/RemoteConnectionFactory"
+                  connectors="http-connector" />
+                <pooled-connection-factory name="activemq-ra" transaction="xa"
+                  entries="java:/JmsXA java:jboss/DefaultJMSConnectionFactory"
+                  connectors="in-vm" />
+            </server>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:naming:2.0">
             <bindings>
@@ -446,12 +479,21 @@
             <remote-naming/>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:pojo:1.0"/>
-        <subsystem xmlns="urn:jboss:domain:remoting:2.0">
-            <endpoint worker="default"/>
-            <http-connector name="http-remoting-connector" connector-ref="default" security-realm="ApplicationRealm"/>
+        <subsystem xmlns="urn:jboss:domain:remoting:3.0">
+            <endpoint />
+            <http-connector name="http-remoting-connector" connector-ref="default"
+              security-realm="ApplicationRealm" />
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:resource-adapters:2.0"/>
+        <subsystem xmlns="urn:jboss:domain:resource-adapters:4.0" />
+        <subsystem xmlns="urn:jboss:domain:request-controller:1.0" />
         <subsystem xmlns="urn:jboss:domain:sar:1.0"/>
+        <subsystem xmlns="urn:jboss:domain:security-manager:1.0">
+            <deployment-permissions>
+                <maximum-set>
+                    <permission class="java.security.AllPermission" />
+                </maximum-set>
+            </deployment-permissions>
+        </subsystem>
         <subsystem xmlns="urn:jboss:domain:security:1.2">
             <security-domains>
                 <security-domain name="zanata">
@@ -466,12 +508,7 @@
                 </security-domain>
                 <security-domain name="zanata.openid">
                     <authentication>
-
-                        <login-module code="org.zanata.security.OpenIdLoginModule" flag="required">
-<% if @zanata_openid_provider_url != '' -%>
-                            <module-option name="providerURL" value="<%= @zanata_openid_provider_url %>" />
-<% end -%>
-                        </login-module>
+                        <login-module code="org.zanata.security.OpenIdLoginModule" flag="required" />
                     </authentication>
                 </security-domain>
                 <security-domain name="zanata.jaas">
@@ -539,16 +576,17 @@
                 </security-domain>
             </security-domains>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:transactions:2.0">
+        <subsystem xmlns="urn:jboss:domain:transactions:3.0">
             <core-environment>
                 <process-id>
-                    <uuid/>
+                    <uuid />
                 </process-id>
             </core-environment>
-            <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/>
+            <recovery-environment socket-binding="txn-recovery-environment"
+              status-socket-binding="txn-status-manager" />
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:undertow:1.1">
-            <buffer-cache name="default"/>
+        <subsystem xmlns="urn:jboss:domain:undertow:3.0">
+            <buffer-cache name="default" />
             <server name="default-server">
 
 <% @zanata_listeners.each do |listener| -%>
@@ -573,19 +611,21 @@
                 <file name="welcome-content" path="${jboss.home.dir}/welcome-content"/>
             </handlers>
             <filters>
-                <response-header name="server-header" header-name="Server" header-value="WildFly/8"/>
+                <response-header name="server-header" header-name="Server" header-value="WildFly/10"/>
                 <response-header name="x-powered-by-header" header-name="X-Powered-By" header-value="Undertow/1"/>
             </filters>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:webservices:1.2">
+        <subsystem xmlns="urn:jboss:domain:webservices:2.0">
             <wsdl-host>${jboss.bind.address:127.0.0.1}</wsdl-host>
-            <endpoint-config name="Standard-Endpoint-Config"/>
+            <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">
-                    <handler name="RecordingHandler" class="org.jboss.ws.common.invocation.RecordingServerHandler"/>
+                <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"/>
+            <client-config name="Standard-Client-Config" />
         </subsystem>
     </profile>
 
@@ -601,16 +641,29 @@
         </interface>
     </interfaces>
 
-    <socket-binding-group name="standard-sockets" default-interface="public" port-offset="${jboss.socket.binding.port-offset:0}">
-        <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: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-group name="standard-sockets" default-interface="public"
+      port-offset="${jboss.socket.binding.port-offset:0}">
+        <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: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="iiop" interface="unsecure"
+              port="${jboss.iiop.port:3528}"/>
+            <socket-binding name="iiop-ssl" interface="unsecure"
+              port="${jboss.iiop.ssl.port:3529}"/>
+        -->
+        <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"/>
+            <remote-destination host="localhost" port="25" />
         </outbound-socket-binding>
     </socket-binding-group>