torquebox-server 2.0.3-java → 2.1.0-java

data/jboss/domain/configuration/domain.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?> 
-<domain xmlns='urn:jboss:domain:1.2'>
+<domain xmlns='urn:jboss:domain:1.3'>
     <extensions>
         <extension module='org.jboss.as.clustering.infinispan'/>
         <extension module='org.jboss.as.clustering.jgroups'/>
@@ -32,15 +32,15 @@
         <extension module='org.jboss.as.weld'/>
         <extension module='org.torquebox.bootstrap'/>
         <extension module='org.torquebox.core'/>
-        <extension module='org.torquebox.jobs'/>
-        <extension module='org.torquebox.cache'/>
         <extension module='org.torquebox.cdi'/>
-        <extension module='org.torquebox.services'/>
-        <extension module='org.torquebox.messaging'/>
+        <extension module='org.torquebox.jobs'/>
         <extension module='org.torquebox.security'/>
-        <extension module='org.torquebox.web'/>
         <extension module='org.torquebox.stomp'/>
+        <extension module='org.torquebox.web'/>
+        <extension module='org.torquebox.services'/>
+        <extension module='org.torquebox.messaging'/>
         <extension module='org.projectodd.polyglot.hasingleton'/>
+        <extension module='org.projectodd.polyglot.cache'/>
     </extensions>
     <system-properties>
         <!-- IPv4 is not required, but setting this helps avoid unintended use of IPv6 -->
@@ -92,7 +92,7 @@
                 </logger>
             </subsystem>
             <subsystem xmlns='urn:jboss:domain:configadmin:1.0'/>
-            <subsystem xmlns='urn:jboss:domain:datasources:1.0'>
+            <subsystem xmlns='urn:jboss:domain:datasources:1.1'>
                 <datasources>
                     <datasource jndi-name='java:jboss/datasources/ExampleDS' pool-name='ExampleDS' enabled='true' use-java-context='true'>
                         <connection-url>
@@ -119,8 +119,15 @@
                     </drivers>
                 </datasources>
             </subsystem>
-            <subsystem xmlns='urn:jboss:domain:ee:1.0'/>
-            <subsystem xmlns='urn:jboss:domain:ejb3:1.2'>
+            <subsystem xmlns='urn:jboss:domain:ee:1.1'>
+                <spec-descriptor-property-replacement>
+                    false
+                </spec-descriptor-property-replacement>
+                <jboss-descriptor-property-replacement>
+                    true
+                </jboss-descriptor-property-replacement>
+            </subsystem>
+            <subsystem xmlns='urn:jboss:domain:ejb3:1.3'>
                 <session-bean>
                     <stateless>
                         <bean-instance-pool-ref pool-name='slsb-strict-max-pool'/>
@@ -155,27 +162,27 @@
                     </thread-pool>
                 </thread-pools>
             </subsystem>
-            <subsystem xmlns='urn:jboss:domain:infinispan:1.2' default-cache-container='cluster'>
+            <subsystem xmlns='urn:jboss:domain:infinispan:1.3'>
                 <cache-container name='cluster' aliases='ha-partition' default-cache='default'>
                     <transport lock-timeout='60000'/>
                     <replicated-cache name='default' mode='SYNC' batching='true'>
                         <locking isolation='REPEATABLE_READ'/>
                     </replicated-cache>
                 </cache-container>
-                <cache-container name='web' aliases='torquebox standard-session-cache' default-cache='repl'>
+                <cache-container name='web' aliases='polyglot torquebox standard-session-cache' default-cache='repl' module='org.jboss.as.clustering.web.infinispan'>
                     <transport lock-timeout='60000'/>
-                    <replicated-cache name='repl' mode='ASYNC' batching='true'>
+                    <replicated-cache name='repl' mode='ASYNC' batching='true' start='EAGER'>
                         <file-store/>
                     </replicated-cache>
                     <replicated-cache name='sso' mode='SYNC' batching='true'/>
-                    <distributed-cache name='dist' mode='ASYNC' batching='true'>
+                    <distributed-cache name='dist' mode='ASYNC' batching='true' l1-lifespan='0'>
                         <file-store/>
                     </distributed-cache>
                 </cache-container>
-                <cache-container name='ejb' aliases='sfsb sfsb-cache' default-cache='repl'>
+                <cache-container name='ejb' aliases='sfsb sfsb-cache' default-cache='repl' module='org.jboss.as.clustering.ejb3.infinispan'>
                     <transport lock-timeout='60000'/>
                     <replicated-cache name='repl' mode='ASYNC' batching='true'>
-                        <eviction strategy='LRU'/>
+                        <eviction strategy='LRU' max-entries='10000'/>
                         <file-store/>
                     </replicated-cache>
                     <!--
@@ -183,12 +190,12 @@
                       ~                 the socketbinding referenced by the EJB remoting connector 
                       -->
                     <replicated-cache name='remote-connector-client-mappings' mode='SYNC' batching='true'/>
-                    <distributed-cache name='dist' mode='ASYNC' batching='true'>
-                        <eviction strategy='LRU'/>
+                    <distributed-cache name='dist' mode='ASYNC' batching='true' l1-lifespan='0'>
+                        <eviction strategy='LRU' max-entries='10000'/>
                         <file-store/>
                     </distributed-cache>
                 </cache-container>
-                <cache-container name='hibernate' default-cache='local-query'>
+                <cache-container name='hibernate' default-cache='local-query' module='org.jboss.as.jpa.hibernate:4'>
                     <transport lock-timeout='60000'/>
                     <local-cache name='local-query'>
                         <transaction mode='NONE'/>
@@ -243,6 +250,7 @@
                     <protocol type='UFC'/>
                     <protocol type='MFC'/>
                     <protocol type='FRAG2'/>
+                    <protocol type='RSVP'/>
                 </stack>
                 <stack name='tcp'>
                     <transport type='TCP' socket-binding='jgroups-tcp' diagnostics-socket-binding='jgroups-diagnostics'/>
@@ -259,6 +267,7 @@
                     <protocol type='UFC'/>
                     <protocol type='MFC'/>
                     <protocol type='FRAG2'/>
+                    <protocol type='RSVP'/>
                 </stack>
             </subsystem>
             <subsystem xmlns='urn:jboss:domain:jmx:1.1'>
@@ -273,14 +282,16 @@
                     <smtp-server outbound-socket-binding-ref='mail-smtp'/>
                 </mail-session>
             </subsystem>
-            <subsystem xmlns='urn:jboss:domain:modcluster:1.0'>
-                <mod-cluster-config advertise-socket='modcluster' excluded-contexts='invoker,jbossws,juddi,console'>
+            <subsystem xmlns='urn:jboss:domain:modcluster:1.1'>
+                <mod-cluster-config advertise-socket='modcluster' connector='ajp' excluded-contexts='invoker,jbossws,juddi,console'>
                     <dynamic-load-provider>
                         <load-metric type='busyness'/>
                     </dynamic-load-provider>
                 </mod-cluster-config>
             </subsystem>
-            <subsystem xmlns='urn:jboss:domain:naming:1.1'/>
+            <subsystem xmlns='urn:jboss:domain:naming:1.2'>
+                <remote-naming/>
+            </subsystem>
             <subsystem xmlns='urn:jboss:domain:osgi:1.2' activation='lazy'>
                 <properties>
                     <!-- Specifies the beginning start level of the framework -->
@@ -305,17 +316,14 @@
             </subsystem>
             <subsystem xmlns='urn:jboss:domain:resource-adapters:1.0'/>
             <subsystem xmlns='urn:jboss:domain:sar:1.0'/>
-            <subsystem xmlns='urn:jboss:domain:security:1.1'>
+            <subsystem xmlns='urn:jboss:domain:security:1.2'>
                 <security-domains>
                     <security-domain name='other' cache-type='default'>
                         <authentication>
                             <login-module code='Remoting' flag='optional'>
                                 <module-option name='password-stacking' value='useFirstPass'/>
                             </login-module>
-                            <login-module code='RealmUsersRoles' flag='required'>
-                                <module-option name='usersProperties' value='${jboss.domain.config.dir}/application-users.properties'/>
-                                <module-option name='rolesProperties' value='${jboss.domain.config.dir}/application-roles.properties'/>
-                                <module-option name='realm' value='ApplicationRealm'/>
+                            <login-module code='RealmDirect' flag='required'>
                                 <module-option name='password-stacking' value='useFirstPass'/>
                             </login-module>
                         </authentication>
@@ -333,7 +341,7 @@
                 </security-domains>
             </subsystem>
             <subsystem xmlns='urn:jboss:domain:threads:1.1'/>
-            <subsystem xmlns='urn:jboss:domain:transactions:1.1'>
+            <subsystem xmlns='urn:jboss:domain:transactions:1.2'>
                 <core-environment>
                     <process-id>
                         <uuid/>
@@ -367,15 +375,15 @@
             <subsystem xmlns='urn:jboss:domain:weld:1.0'/>
             <subsystem xmlns='urn:jboss:domain:torquebox-bootstrap:1.0'/>
             <subsystem xmlns='urn:jboss:domain:torquebox-core:1.0'/>
-            <subsystem xmlns='urn:jboss:domain:torquebox-jobs:1.0'/>
-            <subsystem xmlns='urn:jboss:domain:torquebox-cache:1.0'/>
             <subsystem xmlns='urn:jboss:domain:torquebox-cdi:1.0'/>
-            <subsystem xmlns='urn:jboss:domain:torquebox-services:1.0'/>
-            <subsystem xmlns='urn:jboss:domain:torquebox-messaging:1.0'/>
+            <subsystem xmlns='urn:jboss:domain:torquebox-jobs:1.0'/>
             <subsystem xmlns='urn:jboss:domain:torquebox-security:1.0'/>
-            <subsystem xmlns='urn:jboss:domain:torquebox-web:1.0'/>
             <subsystem xmlns='urn:jboss:domain:torquebox-stomp:1.0' socket-binding='stomp'/>
+            <subsystem xmlns='urn:jboss:domain:torquebox-web:1.0'/>
+            <subsystem xmlns='urn:jboss:domain:torquebox-services:1.0'/>
+            <subsystem xmlns='urn:jboss:domain:torquebox-messaging:1.0'/>
             <subsystem xmlns='urn:jboss:domain:polyglot-hasingleton:1.0'/>
+            <subsystem xmlns='urn:jboss:domain:polyglot-cache:1.0'/>
         </profile>
         <profile name='full'>
             <subsystem xmlns='urn:jboss:domain:logging:1.1'>
@@ -421,7 +429,7 @@
             </subsystem>
             <subsystem xmlns='urn:jboss:domain:cmp:1.0'/>
             <subsystem xmlns='urn:jboss:domain:configadmin:1.0'/>
-            <subsystem xmlns='urn:jboss:domain:datasources:1.0'>
+            <subsystem xmlns='urn:jboss:domain:datasources:1.1'>
                 <datasources>
                     <datasource jndi-name='java:jboss/datasources/ExampleDS' pool-name='ExampleDS' enabled='true' use-java-context='true'>
                         <connection-url>
@@ -448,8 +456,15 @@
                     </drivers>
                 </datasources>
             </subsystem>
-            <subsystem xmlns='urn:jboss:domain:ee:1.0'/>
-            <subsystem xmlns='urn:jboss:domain:ejb3:1.2'>
+            <subsystem xmlns='urn:jboss:domain:ee:1.1'>
+                <spec-descriptor-property-replacement>
+                    false
+                </spec-descriptor-property-replacement>
+                <jboss-descriptor-property-replacement>
+                    true
+                </jboss-descriptor-property-replacement>
+            </subsystem>
+            <subsystem xmlns='urn:jboss:domain:ejb3:1.3'>
                 <session-bean>
                     <stateless>
                         <bean-instance-pool-ref pool-name='slsb-strict-max-pool'/>
@@ -487,8 +502,8 @@
                 </thread-pools>
                 <iiop enable-by-default='false' use-qualified-name='false'/>
             </subsystem>
-            <subsystem xmlns='urn:jboss:domain:infinispan:1.2' default-cache-container='hibernate'>
-                <cache-container name='hibernate' default-cache='local-query'>
+            <subsystem xmlns='urn:jboss:domain:infinispan:1.3'>
+                <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'/>
@@ -505,8 +520,8 @@
                     </local-cache>
                 </cache-container>
             </subsystem>
-            <subsystem xmlns='urn:jboss:domain:jacorb:1.1'>
-                <orb>
+            <subsystem xmlns='urn:jboss:domain:jacorb:1.2'>
+                <orb socket-binding='jacorb' ssl-socket-binding='jacorb-ssl'>
                     <initializers transactions='spec' security='on'/>
                 </orb>
             </subsystem>
@@ -547,7 +562,7 @@
                     <smtp-server outbound-socket-binding-ref='mail-smtp'/>
                 </mail-session>
             </subsystem>
-            <subsystem xmlns='urn:jboss:domain:messaging:1.1'>
+            <subsystem xmlns='urn:jboss:domain:messaging:1.2'>
                 <hornetq-server>
                     <persistence-enabled>
                         true
@@ -621,7 +636,6 @@
                                 <connector-ref connector-name='netty'/>
                             </connectors>
                             <entries>
-                                <entry name='RemoteConnectionFactory'/>
                                 <entry name='java:jboss/exported/jms/RemoteConnectionFactory'/>
                             </entries>
                             <consumer-window-size>
@@ -638,14 +652,6 @@
                             </entries>
                         </pooled-connection-factory>
                     </jms-connection-factories>
-                    <jms-destinations>
-                    </jms-destinations>
-                    <cluster-user>
-                        admin
-                    </cluster-user>
-                    <cluster-password>
-                        password
-                    </cluster-password>
                     <jmx-management-enabled>
                         true
                     </jmx-management-enabled>
@@ -654,7 +660,9 @@
                     </security-enabled>
                 </hornetq-server>
             </subsystem>
-            <subsystem xmlns='urn:jboss:domain:naming:1.1'/>
+            <subsystem xmlns='urn:jboss:domain:naming:1.2'>
+                <remote-naming/>
+            </subsystem>
             <subsystem xmlns='urn:jboss:domain:osgi:1.2' activation='lazy'>
                 <properties>
                     <!-- Specifies the beginning start level of the framework -->
@@ -679,17 +687,14 @@
             </subsystem>
             <subsystem xmlns='urn:jboss:domain:resource-adapters:1.0'/>
             <subsystem xmlns='urn:jboss:domain:sar:1.0'/>
-            <subsystem xmlns='urn:jboss:domain:security:1.1'>
+            <subsystem xmlns='urn:jboss:domain:security:1.2'>
                 <security-domains>
                     <security-domain name='other' cache-type='default'>
                         <authentication>
                             <login-module code='Remoting' flag='optional'>
                                 <module-option name='password-stacking' value='useFirstPass'/>
                             </login-module>
-                            <login-module code='RealmUsersRoles' flag='required'>
-                                <module-option name='usersProperties' value='${jboss.domain.config.dir}/application-users.properties'/>
-                                <module-option name='rolesProperties' value='${jboss.domain.config.dir}/application-roles.properties'/>
-                                <module-option name='realm' value='ApplicationRealm'/>
+                            <login-module code='RealmDirect' flag='required'>
                                 <module-option name='password-stacking' value='useFirstPass'/>
                             </login-module>
                         </authentication>
@@ -707,7 +712,7 @@
                 </security-domains>
             </subsystem>
             <subsystem xmlns='urn:jboss:domain:threads:1.1'/>
-            <subsystem xmlns='urn:jboss:domain:transactions:1.1'>
+            <subsystem xmlns='urn:jboss:domain:transactions:1.2'>
                 <core-environment>
                     <process-id>
                         <uuid/>
@@ -740,15 +745,15 @@
             <subsystem xmlns='urn:jboss:domain:weld:1.0'/>
             <subsystem xmlns='urn:jboss:domain:torquebox-bootstrap:1.0'/>
             <subsystem xmlns='urn:jboss:domain:torquebox-core:1.0'/>
-            <subsystem xmlns='urn:jboss:domain:torquebox-jobs:1.0'/>
-            <subsystem xmlns='urn:jboss:domain:torquebox-cache:1.0'/>
             <subsystem xmlns='urn:jboss:domain:torquebox-cdi:1.0'/>
-            <subsystem xmlns='urn:jboss:domain:torquebox-services:1.0'/>
-            <subsystem xmlns='urn:jboss:domain:torquebox-messaging:1.0'/>
+            <subsystem xmlns='urn:jboss:domain:torquebox-jobs:1.0'/>
             <subsystem xmlns='urn:jboss:domain:torquebox-security:1.0'/>
-            <subsystem xmlns='urn:jboss:domain:torquebox-web:1.0'/>
             <subsystem xmlns='urn:jboss:domain:torquebox-stomp:1.0' socket-binding='stomp'/>
+            <subsystem xmlns='urn:jboss:domain:torquebox-web:1.0'/>
+            <subsystem xmlns='urn:jboss:domain:torquebox-services:1.0'/>
+            <subsystem xmlns='urn:jboss:domain:torquebox-messaging:1.0'/>
             <subsystem xmlns='urn:jboss:domain:polyglot-hasingleton:1.0'/>
+            <subsystem xmlns='urn:jboss:domain:polyglot-cache:1.0'/>
         </profile>
         <profile name='default'>
             <subsystem xmlns='urn:jboss:domain:logging:1.1'>
@@ -794,7 +799,7 @@
             </subsystem>
             <subsystem xmlns='urn:jboss:domain:cmp:1.0'/>
             <subsystem xmlns='urn:jboss:domain:configadmin:1.0'/>
-            <subsystem xmlns='urn:jboss:domain:datasources:1.0'>
+            <subsystem xmlns='urn:jboss:domain:datasources:1.1'>
                 <datasources>
                     <datasource jndi-name='java:jboss/datasources/ExampleDS' pool-name='ExampleDS' enabled='true' use-java-context='true'>
                         <connection-url>
@@ -821,8 +826,15 @@
                     </drivers>
                 </datasources>
             </subsystem>
-            <subsystem xmlns='urn:jboss:domain:ee:1.0'/>
-            <subsystem xmlns='urn:jboss:domain:ejb3:1.2'>
+            <subsystem xmlns='urn:jboss:domain:ee:1.1'>
+                <spec-descriptor-property-replacement>
+                    false
+                </spec-descriptor-property-replacement>
+                <jboss-descriptor-property-replacement>
+                    true
+                </jboss-descriptor-property-replacement>
+            </subsystem>
+            <subsystem xmlns='urn:jboss:domain:ejb3:1.3'>
                 <session-bean>
                     <stateless>
                         <bean-instance-pool-ref pool-name='slsb-strict-max-pool'/>
@@ -862,27 +874,27 @@
                 </thread-pools>
                 <iiop enable-by-default='false' use-qualified-name='false'/>
             </subsystem>
-            <subsystem xmlns='urn:jboss:domain:infinispan:1.2' default-cache-container='cluster'>
+            <subsystem xmlns='urn:jboss:domain:infinispan:1.3'>
                 <cache-container name='cluster' aliases='ha-partition' default-cache='default'>
                     <transport lock-timeout='60000'/>
                     <replicated-cache name='default' mode='SYNC' batching='true'>
                         <locking isolation='REPEATABLE_READ'/>
                     </replicated-cache>
                 </cache-container>
-                <cache-container name='web' aliases='torquebox standard-session-cache' default-cache='repl'>
+                <cache-container name='web' aliases='polyglot torquebox standard-session-cache' default-cache='repl' module='org.jboss.as.clustering.web.infinispan'>
                     <transport lock-timeout='60000'/>
-                    <replicated-cache name='repl' mode='ASYNC' batching='true'>
+                    <replicated-cache name='repl' mode='ASYNC' batching='true' start='EAGER'>
                         <file-store/>
                     </replicated-cache>
                     <replicated-cache name='sso' mode='SYNC' batching='true'/>
-                    <distributed-cache name='dist' mode='ASYNC' batching='true'>
+                    <distributed-cache name='dist' mode='ASYNC' batching='true' l1-lifespan='0'>
                         <file-store/>
                     </distributed-cache>
                 </cache-container>
-                <cache-container name='ejb' aliases='sfsb sfsb-cache' default-cache='repl'>
+                <cache-container name='ejb' aliases='sfsb sfsb-cache' default-cache='repl' module='org.jboss.as.clustering.ejb3.infinispan'>
                     <transport lock-timeout='60000'/>
                     <replicated-cache name='repl' mode='ASYNC' batching='true'>
-                        <eviction strategy='LRU'/>
+                        <eviction strategy='LRU' max-entries='10000'/>
                         <file-store/>
                     </replicated-cache>
                     <!--
@@ -890,12 +902,12 @@
                       ~                 the socketbinding referenced by the EJB remoting connector 
                       -->
                     <replicated-cache name='remote-connector-client-mappings' mode='SYNC' batching='true'/>
-                    <distributed-cache name='dist' mode='ASYNC' batching='true'>
-                        <eviction strategy='LRU'/>
+                    <distributed-cache name='dist' mode='ASYNC' batching='true' l1-lifespan='0'>
+                        <eviction strategy='LRU' max-entries='10000'/>
                         <file-store/>
                     </distributed-cache>
                 </cache-container>
-                <cache-container name='hibernate' default-cache='local-query'>
+                <cache-container name='hibernate' default-cache='local-query' module='org.jboss.as.jpa.hibernate:4'>
                     <transport lock-timeout='60000'/>
                     <local-cache name='local-query'>
                         <transaction mode='NONE'/>
@@ -913,8 +925,8 @@
                     </replicated-cache>
                 </cache-container>
             </subsystem>
-            <subsystem xmlns='urn:jboss:domain:jacorb:1.1'>
-                <orb>
+            <subsystem xmlns='urn:jboss:domain:jacorb:1.2'>
+                <orb socket-binding='jacorb' ssl-socket-binding='jacorb-ssl'>
                     <initializers transactions='spec' security='on'/>
                 </orb>
             </subsystem>
@@ -958,6 +970,7 @@
                     <protocol type='UFC'/>
                     <protocol type='MFC'/>
                     <protocol type='FRAG2'/>
+                    <protocol type='RSVP'/>
                 </stack>
                 <stack name='tcp'>
                     <transport type='TCP' socket-binding='jgroups-tcp' diagnostics-socket-binding='jgroups-diagnostics'/>
@@ -974,6 +987,7 @@
                     <protocol type='UFC'/>
                     <protocol type='MFC'/>
                     <protocol type='FRAG2'/>
+                    <protocol type='RSVP'/>
                 </stack>
             </subsystem>
             <subsystem xmlns='urn:jboss:domain:jmx:1.1'>
@@ -989,11 +1003,14 @@
                     <smtp-server outbound-socket-binding-ref='mail-smtp'/>
                 </mail-session>
             </subsystem>
-            <subsystem xmlns='urn:jboss:domain:messaging:1.1'>
+            <subsystem xmlns='urn:jboss:domain:messaging:1.2'>
                 <hornetq-server>
                     <clustered>
                         true
                     </clustered>
+                    <cluster-password>
+                        ${jboss.messaging.cluster.password:CHANGE ME!!}
+                    </cluster-password>
                     <persistence-enabled>
                         true
                     </persistence-enabled>
@@ -1020,25 +1037,25 @@
                     </acceptors>
                     <broadcast-groups>
                         <broadcast-group name='bg-group1'>
+                            <socket-binding>
+                                messaging-group
+                            </socket-binding>
                             <broadcast-period>
                                 5000
                             </broadcast-period>
                             <connector-ref>
                                 netty
                             </connector-ref>
-                            <socket-binding>
-                                messaging-group
-                            </socket-binding>
                         </broadcast-group>
                     </broadcast-groups>
                     <discovery-groups>
                         <discovery-group name='dg-group1'>
-                            <refresh-timeout>
-                                10000
-                            </refresh-timeout>
                             <socket-binding>
                                 messaging-group
                             </socket-binding>
+                            <refresh-timeout>
+                                10000
+                            </refresh-timeout>
                         </discovery-group>
                     </discovery-groups>
                     <cluster-connections>
@@ -1100,7 +1117,6 @@
                                 <connector-ref connector-name='netty'/>
                             </connectors>
                             <entries>
-                                <entry name='RemoteConnectionFactory'/>
                                 <entry name='java:jboss/exported/jms/RemoteConnectionFactory'/>
                             </entries>
                         </connection-factory>
@@ -1114,21 +1130,21 @@
                             </entries>
                         </pooled-connection-factory>
                     </jms-connection-factories>
-                    <jms-destinations>
-                    </jms-destinations>
                     <security-enabled>
                         false
                     </security-enabled>
                 </hornetq-server>
             </subsystem>
-            <subsystem xmlns='urn:jboss:domain:modcluster:1.0'>
-                <mod-cluster-config advertise-socket='modcluster' excluded-contexts='invoker,jbossws,juddi,console'>
+            <subsystem xmlns='urn:jboss:domain:modcluster:1.1'>
+                <mod-cluster-config advertise-socket='modcluster' connector='ajp' excluded-contexts='invoker,jbossws,juddi,console'>
                     <dynamic-load-provider>
                         <load-metric type='busyness'/>
                     </dynamic-load-provider>
                 </mod-cluster-config>
             </subsystem>
-            <subsystem xmlns='urn:jboss:domain:naming:1.1'/>
+            <subsystem xmlns='urn:jboss:domain:naming:1.2'>
+                <remote-naming/>
+            </subsystem>
             <subsystem xmlns='urn:jboss:domain:osgi:1.2' activation='lazy'>
                 <properties>
                     <!-- Specifies the beginning start level of the framework -->
@@ -1153,17 +1169,14 @@
             </subsystem>
             <subsystem xmlns='urn:jboss:domain:resource-adapters:1.0'/>
             <subsystem xmlns='urn:jboss:domain:sar:1.0'/>
-            <subsystem xmlns='urn:jboss:domain:security:1.1'>
+            <subsystem xmlns='urn:jboss:domain:security:1.2'>
                 <security-domains>
                     <security-domain name='other' cache-type='default'>
                         <authentication>
                             <login-module code='Remoting' flag='optional'>
                                 <module-option name='password-stacking' value='useFirstPass'/>
                             </login-module>
-                            <login-module code='RealmUsersRoles' flag='required'>
-                                <module-option name='usersProperties' value='${jboss.domain.config.dir}/application-users.properties'/>
-                                <module-option name='rolesProperties' value='${jboss.domain.config.dir}/application-roles.properties'/>
-                                <module-option name='realm' value='ApplicationRealm'/>
+                            <login-module code='RealmDirect' flag='required'>
                                 <module-option name='password-stacking' value='useFirstPass'/>
                             </login-module>
                         </authentication>
@@ -1181,7 +1194,7 @@
                 </security-domains>
             </subsystem>
             <subsystem xmlns='urn:jboss:domain:threads:1.1'/>
-            <subsystem xmlns='urn:jboss:domain:transactions:1.1'>
+            <subsystem xmlns='urn:jboss:domain:transactions:1.2'>
                 <core-environment>
                     <process-id>
                         <uuid/>
@@ -1215,15 +1228,15 @@
             <subsystem xmlns='urn:jboss:domain:weld:1.0'/>
             <subsystem xmlns='urn:jboss:domain:torquebox-bootstrap:1.0'/>
             <subsystem xmlns='urn:jboss:domain:torquebox-core:1.0'/>
-            <subsystem xmlns='urn:jboss:domain:torquebox-jobs:1.0'/>
-            <subsystem xmlns='urn:jboss:domain:torquebox-cache:1.0'/>
             <subsystem xmlns='urn:jboss:domain:torquebox-cdi:1.0'/>
-            <subsystem xmlns='urn:jboss:domain:torquebox-services:1.0'/>
-            <subsystem xmlns='urn:jboss:domain:torquebox-messaging:1.0'/>
+            <subsystem xmlns='urn:jboss:domain:torquebox-jobs:1.0'/>
             <subsystem xmlns='urn:jboss:domain:torquebox-security:1.0'/>
-            <subsystem xmlns='urn:jboss:domain:torquebox-web:1.0'/>
             <subsystem xmlns='urn:jboss:domain:torquebox-stomp:1.0' socket-binding='stomp'/>
+            <subsystem xmlns='urn:jboss:domain:torquebox-web:1.0'/>
+            <subsystem xmlns='urn:jboss:domain:torquebox-services:1.0'/>
+            <subsystem xmlns='urn:jboss:domain:torquebox-messaging:1.0'/>
             <subsystem xmlns='urn:jboss:domain:polyglot-hasingleton:1.0'/>
+            <subsystem xmlns='urn:jboss:domain:polyglot-cache:1.0'/>
         </profile>
     </profiles>
     <!--
@@ -1260,7 +1273,6 @@
             <outbound-socket-binding name='mail-smtp'>
                 <remote-destination host='localhost' port='25'/>
             </outbound-socket-binding>
-            <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-group>
         <socket-binding-group name='full-sockets' default-interface='public'>
             <!-- Needed for server groups using the 'full' profile  -->
@@ -1270,6 +1282,7 @@
             <socket-binding name='jacorb' interface='unsecure' port='3528'/>
             <socket-binding name='jacorb-ssl' interface='unsecure' port='3529'/>
             <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='osgi-http' interface='management' port='8090'/>
             <socket-binding name='remoting' port='4447'/>
@@ -1278,7 +1291,6 @@
             <outbound-socket-binding name='mail-smtp'>
                 <remote-destination host='localhost' port='25'/>
             </outbound-socket-binding>
-            <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-group>
         <socket-binding-group name='standard-sockets' default-interface='public'>
             <!-- Needed for server groups using the 'full-ha' profile  -->
@@ -1294,6 +1306,7 @@
             <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='osgi-http' interface='management' port='8090'/>
@@ -1304,7 +1317,6 @@
                 <remote-destination host='localhost' port='25'/>
             </outbound-socket-binding>
             <socket-binding name='stomp' port='8675'/>
-            <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-group>
     </socket-binding-groups>
     <server-groups>