torquebox-server 2.0.0.beta3-java → 2.0.0.cr1-java

data/jboss/docs/examples/configs/domain-jts.xml

@@ -5,7 +5,6 @@
     <extensions>
         <extension module="org.jboss.as.clustering.infinispan"/>
         <extension module="org.jboss.as.clustering.jgroups"/>
-        <extension module="org.jboss.as.cmp"/>
         <extension module="org.jboss.as.configadmin"/>
         <extension module="org.jboss.as.connector"/>
         <extension module="org.jboss.as.ee"/>
@@ -17,7 +16,6 @@
         <extension module="org.jboss.as.jpa"/>
         <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.osgi"/>
@@ -75,14 +73,12 @@
                     </handlers>
                 </root-logger>
             </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">
                 <datasources>
-                    <datasource jndi-name="java:jboss/datasources/ExampleDS" enabled="true" use-java-context="true" pool-name="ExampleDS">
+                    <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>
                         <driver>h2</driver>
-                        <pool></pool>
                         <security>
                             <user-name>sa</user-name>
                             <password>sa</password>
@@ -127,9 +123,11 @@
                 </timer-service>
                 <remote connector-ref="remoting-connector" thread-pool-name="default"/>
                 <thread-pools>
-                    <thread-pool name="default" max-threads="10" keepalive-time="100"/>
+                    <thread-pool name="default">
+                        <max-threads count="10"/>
+                        <keepalive-time time="100" unit="milliseconds"/>
+                    </thread-pool>
                 </thread-pools>
-                <iiop enable-by-default="true" use-qualified-name="true"/>
             </subsystem>
             <subsystem xmlns="urn:jboss:domain:infinispan:1.1" default-cache-container="hibernate">
                 <cache-container name="hibernate" default-cache="local-query">
@@ -139,36 +137,36 @@
                         <expiration max-idle="100000"/>
                     </local-cache>
                     <local-cache name="local-query">
-                        <transaction mode="NON_XA"/>
+                        <transaction mode="NONE"/>
                         <eviction strategy="LRU" max-entries="10000"/>
                         <expiration max-idle="100000"/>
                     </local-cache>
                     <local-cache name="timestamps">
-                        <transaction mode="NON_XA"/>
+                        <transaction mode="NONE"/>
                         <eviction strategy="NONE"/>
                     </local-cache>
                 </cache-container>
             </subsystem>
             <subsystem xmlns="urn:jboss:domain:jacorb:1.1">
                 <orb>
-                    <initializers transactions="on" security="on"/>
+                    <initializers transactions="spec" security="on"/>
                 </orb>
             </subsystem>
             <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/>
             <subsystem xmlns="urn:jboss:domain:jca:1.1">
-                <archive-validation enabled="true"/>
-                <bean-validation enabled="true"/>
+                <archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/>
+                <bean-validation enabled="false"/>
                 <default-workmanager>
-                    <short-running-threads blocking="true">
-                        <core-threads count="10" per-cpu="20"/>
-                        <queue-length count="10" per-cpu="20"/>
-                        <max-threads count="10" per-cpu="20"/>
+                    <short-running-threads>
+                        <core-threads count="50"/>
+                        <queue-length count="50"/>
+                        <max-threads count="50"/>
                         <keepalive-time time="10" unit="seconds"/>
                     </short-running-threads>
-                    <long-running-threads blocking="true">
-                        <core-threads count="10" per-cpu="20"/>
-                        <queue-length count="10" per-cpu="20"/>
-                        <max-threads count="10" per-cpu="20"/>
+                    <long-running-threads>
+                        <core-threads count="50"/>
+                        <queue-length count="50"/>
+                        <max-threads count="50"/>
                         <keepalive-time time="10" unit="seconds"/>
                     </long-running-threads>
                 </default-workmanager>
@@ -185,90 +183,6 @@
                     <smtp-server outbound-socket-binding-ref="mail-smtp"/>
                 </mail-session>
             </subsystem>
-            <subsystem xmlns="urn:jboss:domain:messaging:1.1">
-                <hornetq-server>
-                    <!-- disable messaging persistence -->
-                    <persistence-enabled>false</persistence-enabled>
-                    <!-- Default journal file size is 10Mb, reduced here to 100k for faster first boot -->
-                    <journal-file-size>102400</journal-file-size>
-                    <journal-min-files>2</journal-min-files>
-
-                    <connectors>
-                        <netty-connector name="netty" socket-binding="messaging"/>
-                        <netty-connector name="netty-throughput" socket-binding="messaging-throughput">
-                            <param key="batch-delay" value="50"/>
-                        </netty-connector>
-                        <in-vm-connector name="in-vm" server-id="0"/>
-                    </connectors>
-
-                    <acceptors>
-                        <netty-acceptor name="netty" socket-binding="messaging"/>
-                        <netty-acceptor name="netty-throughput" socket-binding="messaging-throughput">
-                            <param key="batch-delay" value="50"/>
-                            <param key="direct-deliver" value="false"/>
-                        </netty-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>0</redelivery-delay>
-                            <max-size-bytes>10485760</max-size-bytes>
-                            <message-counter-history-day-limit>10</message-counter-history-day-limit>
-                            <address-full-policy>BLOCK</address-full-policy>
-                        </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="netty"/>
-                            </connectors>
-                            <entries>
-                                <entry name="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"/>
-                            </entries>
-                        </pooled-connection-factory>
-                    </jms-connection-factories>
-
-                    <jms-destinations>
-                        <jms-queue name="testQueue">
-                            <entry name="queue/test"/>
-                        </jms-queue>
-                        <jms-topic name="testTopic">
-                            <entry name="topic/test"/>
-                        </jms-topic>
-                    </jms-destinations>
-                </hornetq-server>
-            </subsystem>
             <subsystem xmlns="urn:jboss:domain:naming:1.1"/>
             <subsystem xmlns="urn:jboss:domain:osgi:1.2" activation="lazy">
                 <properties>
@@ -277,73 +191,73 @@
                 </properties>
                 <capabilities>
                     <!-- modules registered with the OSGi layer on startup -->
-                    <capability name="javax.api"/>
-                    <capability name="javax.servlet.api"/>
+                    <capability name="javax.servlet.api:v25"/>
                     <capability name="javax.transaction.api"/>
-                    <!-- bundles installed on startup -->
-                    <capability name="org.osgi.compendium"/>
                     <!-- 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"/>
-                    <!-- bundles started in startlevel 2 -->
-                    <capability name="org.jboss.netty" startlevel="2"/>
-                    <capability name="org.projectodd.stilts" startlevel="2"/>
                 </capabilities>
             </subsystem>
             <subsystem xmlns="urn:jboss:domain:remoting:1.1">
-                <connector name="remoting-connector" socket-binding="remoting"/>
+                <connector name="remoting-connector" socket-binding="remoting" security-realm="ApplicationRealm"/>
             </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">
                 <security-domains>
-                    <security-domain name="other">
+                    <security-domain name="other" cache-type="default">
                         <authentication>
-                            <login-module code="UsersRoles" flag="required"/>
+                            <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"/>
+                                <module-option name="password-stacking" value="useFirstPass"/>
+                            </login-module>
                         </authentication>
                     </security-domain>
+                    <security-domain name="jboss-web-policy" cache-type="default">
+                        <authorization>
+                            <policy-module code="Delegating" flag="required"/>
+                        </authorization>
+                    </security-domain>
+                    <security-domain name="jboss-ejb-policy" cache-type="default">
+                        <authorization>
+                            <policy-module code="Delegating" flag="required"/>
+                        </authorization>
+                    </security-domain>
                 </security-domains>
             </subsystem>
-            <subsystem xmlns="urn:jboss:domain:threads:1.0"/>
+            <subsystem xmlns="urn:jboss:domain:threads:1.1"/>
             <subsystem xmlns="urn:jboss:domain:transactions:1.1">
-                <recovery-environment socket-binding="txn-recovery-environment"
-                                      status-socket-binding="txn-status-manager"/>
                 <core-environment>
                     <process-id>
                         <uuid/>
                     </process-id>
                 </core-environment>
+                <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/>
                 <coordinator-environment default-timeout="300"/>
                 <jts/>
             </subsystem>
-            <subsystem xmlns="urn:jboss:domain:web:1.1" default-virtual-server="default-host">
+            <subsystem xmlns="urn:jboss:domain:web:1.1" 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>
-            <subsystem xmlns="urn:jboss:domain:webservices:1.0" xmlns:javaee="http://java.sun.com/xml/ns/javaee" xmlns:jaxwsconfig="urn:jboss:jbossws-jaxws-config:4.0">
+            <subsystem xmlns="urn:jboss:domain:webservices:1.1">
                 <modify-wsdl-address>true</modify-wsdl-address>
                 <wsdl-host>${jboss.bind.address:127.0.0.1}</wsdl-host>
-                <!--
-                <wsdl-port>8080</wsdl-port>
-                <wsdl-secure-port>8443</wsdl-secure-port>
-                -->
-                <endpoint-config>
-                    <jaxwsconfig:config-name>Standard-Endpoint-Config</jaxwsconfig:config-name>
-                </endpoint-config>
-                <endpoint-config>
-                    <jaxwsconfig:config-name>Recording-Endpoint-Config</jaxwsconfig:config-name>
-                    <jaxwsconfig:pre-handler-chains>
-                        <javaee:handler-chain xmlns="http://java.sun.com/xml/ns/javaee">
-                            <javaee:protocol-bindings>##SOAP11_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP ##SOAP12_HTTP_MTOM</javaee:protocol-bindings>
-                            <javaee:handler>
-                                <javaee:handler-name>RecordingHandler</javaee:handler-name>
-                                <javaee:handler-class>org.jboss.ws.common.invocation.RecordingServerHandler</javaee:handler-class>
-                            </javaee:handler>
-                        </javaee:handler-chain>
-                    </jaxwsconfig:pre-handler-chains>
+                <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>
                 </endpoint-config>
             </subsystem>
             <subsystem xmlns="urn:jboss:domain:weld:1.0"/>
@@ -390,10 +304,9 @@
             <subsystem xmlns="urn:jboss:domain:configadmin:1.0"/>
             <subsystem xmlns="urn:jboss:domain:datasources:1.0">
                 <datasources>
-                    <datasource jndi-name="java:jboss/datasources/ExampleDS" enabled="true" use-java-context="true" pool-name="java:jboss/datasources/ExampleDS">
+                    <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>
                         <driver>h2</driver>
-                        <pool></pool>
                         <security>
                             <user-name>sa</user-name>
                             <password>sa</password>
@@ -432,7 +345,7 @@
                 </caches>
                 <passivation-stores>
                     <file-passivation-store name="file"/>
-                    <cluster-passivation-store name="infinispan" backing-cache="sfsb"/>
+                    <cluster-passivation-store name="infinispan" cache-container="ejb"/>
                 </passivation-stores>
                 <async thread-pool-name="default"/>
                 <timer-service thread-pool-name="default">
@@ -440,73 +353,78 @@
                 </timer-service>
                 <remote connector-ref="remoting-connector" thread-pool-name="default"/>
                 <thread-pools>
-                    <thread-pool name="default" max-threads="10" keepalive-time="100"/>
+                    <thread-pool name="default">
+                        <max-threads count="10"/>
+                        <keepalive-time time="100" unit="milliseconds"/>
+                    </thread-pool>
                 </thread-pools>
-                <iiop enable-by-default="true" use-qualified-name="true"/>
             </subsystem>
             <subsystem xmlns="urn:jboss:domain:infinispan:1.1" default-cache-container="cluster">
-                <cache-container name="cluster" default-cache="default">
-                    <alias>ha-partition</alias>
+                <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" default-cache="repl">
-                    <alias>standard-session-cache</alias>
+                <cache-container name="web" aliases="standard-session-cache" default-cache="repl">
                     <transport lock-timeout="60000"/>
                     <replicated-cache name="repl" mode="ASYNC" batching="true">
                         <file-store/>
                     </replicated-cache>
+                    <replicated-cache name="sso" mode="SYNC" batching="true"/>
                     <distributed-cache name="dist" mode="ASYNC" batching="true">
                         <file-store/>
                     </distributed-cache>
                 </cache-container>
-                <cache-container name="sfsb" default-cache="repl">
-                    <alias>sfsb-cache</alias>
+                <cache-container name="ejb" aliases="sfsb sfsb-cache" default-cache="repl">
                     <transport lock-timeout="60000"/>
                     <replicated-cache name="repl" mode="ASYNC" batching="true">
                         <eviction strategy="LRU" max-entries="10000"/>
                         <file-store/>
                     </replicated-cache>
+                    <replicated-cache name="remote-connector-client-mappings" mode="SYNC" batching="true"/>
                 </cache-container>
                 <cache-container name="hibernate" default-cache="local-query">
                     <transport lock-timeout="60000"/>
-                    <invalidation-cache name="entity" mode="SYNC">
-                        <eviction strategy="LRU" max-entries="10000"/>
-                        <expiration max-idle="100000"/>
-                    </invalidation-cache>
                     <local-cache name="local-query">
                         <eviction strategy="LRU" max-entries="10000"/>
                         <expiration max-idle="100000"/>
                     </local-cache>
+                    <invalidation-cache name="entity" mode="SYNC">
+                        <eviction strategy="LRU" max-entries="10000"/>
+                        <expiration max-idle="100000"/>
+                    </invalidation-cache>
                     <replicated-cache name="timestamps" mode="ASYNC">
                         <eviction strategy="NONE"/>
                     </replicated-cache>
                 </cache-container>
             </subsystem>
-            <subsystem xmlns="urn:jboss:domain:jacorb:1.1"/>
+            <subsystem xmlns="urn:jboss:domain:jacorb:1.1">
+                <orb>
+                    <initializers transactions="spec" security="on"/>
+                </orb>
+            </subsystem>
             <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/>
             <subsystem xmlns="urn:jboss:domain:jca:1.1">
                 <archive-validation enabled="true"/>
-                <bean-validation enabled="true"/>
+                <bean-validation enabled="false"/>
                 <default-workmanager>
-                    <short-running-threads blocking="true">
-                        <core-threads count="10" per-cpu="20"/>
-                        <queue-length count="10" per-cpu="20"/>
-                        <max-threads count="10" per-cpu="20"/>
+                    <short-running-threads>
+                        <core-threads count="50"/>
+                        <queue-length count="50"/>
+                        <max-threads count="50"/>
                         <keepalive-time time="10" unit="seconds"/>
                     </short-running-threads>
-                    <long-running-threads blocking="true">
-                        <core-threads count="10" per-cpu="20"/>
-                        <queue-length count="10" per-cpu="20"/>
-                        <max-threads count="10" per-cpu="20"/>
+                    <long-running-threads>
+                        <core-threads count="50"/>
+                        <queue-length count="50"/>
+                        <max-threads count="50"/>
                         <keepalive-time time="10" unit="seconds"/>
                     </long-running-threads>
                 </default-workmanager>
             </subsystem>
             <subsystem xmlns="urn:jboss:domain:jdr:1.0"/>
-            <subsystem xmlns="urn:jboss:domain:jgroups:1.0" default-stack="udp">
+            <subsystem xmlns="urn:jboss:domain:jgroups:1.1" default-stack="udp">
                 <stack name="udp">
                     <transport type="UDP" socket-binding="jgroups-udp" diagnostics-socket-binding="jgroups-diagnostics"/>
                     <protocol type="PING"/>
@@ -522,8 +440,6 @@
                     <protocol type="UFC"/>
                     <protocol type="MFC"/>
                     <protocol type="FRAG2"/>
-                    <protocol type="pbcast.STATE_TRANSFER"/>
-                    <protocol type="pbcast.FLUSH"/>
                 </stack>
                 <stack name="tcp">
                     <transport type="TCP" socket-binding="jgroups-tcp" diagnostics-socket-binding="jgroups-diagnostics"/>
@@ -540,105 +456,19 @@
                     <protocol type="UFC"/>
                     <protocol type="MFC"/>
                     <protocol type="FRAG2"/>
-                    <protocol type="pbcast.STATE_TRANSFER"/>
-                    <protocol type="pbcast.FLUSH"/>
                 </stack>
             </subsystem>
             <subsystem xmlns="urn:jboss:domain:jmx:1.1">
                 <show-model value="true"/>
             </subsystem>
             <subsystem xmlns="urn:jboss:domain:jpa:1.0">
-                 <jpa default-datasource=""/>
+                <jpa default-datasource=""/>
             </subsystem>
             <subsystem xmlns="urn:jboss:domain:mail:1.0">
                 <mail-session jndi-name="java:jboss/mail/Default">
                     <smtp-server outbound-socket-binding-ref="mail-smtp"/>
                 </mail-session>
             </subsystem>
-            <subsystem xmlns="urn:jboss:domain:messaging:1.1">
-                <hornetq-server>
-                    <!-- disable messaging persistence -->
-                    <persistence-enabled>false</persistence-enabled>
-                    <!-- Default journal file size is 10Mb, reduced here to 100k for faster first boot -->
-                    <journal-file-size>102400</journal-file-size>
-                    <journal-min-files>2</journal-min-files>
-
-                    <connectors>
-                        <netty-connector name="netty" socket-binding="messaging"/>
-                        <netty-connector name="netty-throughput" socket-binding="messaging-throughput">
-                            <param key="batch-delay" value="50"/>
-                        </netty-connector>
-                        <in-vm-connector name="in-vm" server-id="0"/>
-                    </connectors>
-
-                    <acceptors>
-                        <netty-acceptor name="netty" socket-binding="messaging"/>
-                        <netty-acceptor name="netty-throughput" socket-binding="messaging-throughput">
-                            <param key="batch-delay" value="50"/>
-                            <param key="direct-deliver" value="false"/>
-                        </netty-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>0</redelivery-delay>
-                            <max-size-bytes>10485760</max-size-bytes>
-                            <message-counter-history-day-limit>10</message-counter-history-day-limit>
-                            <address-full-policy>BLOCK</address-full-policy>
-                        </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="netty"/>
-                            </connectors>
-                            <entries>
-                                <entry name="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"/>
-                            </entries>
-                        </pooled-connection-factory>
-                    </jms-connection-factories>
-
-                    <jms-destinations>
-                        <jms-queue name="testQueue">
-                            <entry name="queue/test"/>
-                        </jms-queue>
-                        <jms-topic name="testTopic">
-                            <entry name="topic/test"/>
-                        </jms-topic>
-                    </jms-destinations>
-                </hornetq-server>
-            </subsystem>
             <subsystem xmlns="urn:jboss:domain:modcluster:1.0">
                 <mod-cluster-config advertise-socket="modcluster"/>
             </subsystem>
@@ -650,71 +480,72 @@
                 </properties>
                 <capabilities>
                     <!-- modules registered with the OSGi layer on startup -->
-                    <capability name="javax.api"/>
-                    <capability name="javax.servlet.api"/>
+                    <capability name="javax.servlet.api:v25"/>
                     <capability name="javax.transaction.api"/>
-                    <!-- bundles installed on startup -->
-                    <capability name="org.osgi.compendium"/>
                     <!-- 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"/>
-                    <!-- bundles started in startlevel 2 -->
-                    <capability name="org.jboss.netty" startlevel="2"/>
-                    <capability name="org.projectodd.stilts" startlevel="2"/>
                 </capabilities>
             </subsystem>
             <subsystem xmlns="urn:jboss:domain:remoting:1.1">
-                <connector name="remoting-connector" socket-binding="remoting"/>
+                <connector name="remoting-connector" socket-binding="remoting" security-realm="ApplicationRealm"/>
             </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">
                 <security-domains>
-                    <security-domain name="other">
+                    <security-domain name="other" cache-type="default">
                         <authentication>
-                            <login-module code="UsersRoles" flag="required"/>
+                            <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"/>
+                                <module-option name="password-stacking" value="useFirstPass"/>
+                            </login-module>
                         </authentication>
                     </security-domain>
+                    <security-domain name="jboss-web-policy" cache-type="default">
+                        <authorization>
+                            <policy-module code="Delegating" flag="required"/>
+                        </authorization>
+                    </security-domain>
+                    <security-domain name="jboss-ejb-policy" cache-type="default">
+                        <authorization>
+                            <policy-module code="Delegating" flag="required"/>
+                        </authorization>
+                    </security-domain>
                 </security-domains>
             </subsystem>
-            <subsystem xmlns="urn:jboss:domain:threads:1.0"/>
+            <subsystem xmlns="urn:jboss:domain:threads:1.1"/>
             <subsystem xmlns="urn:jboss:domain:transactions:1.1">
                 <core-environment>
                     <process-id>
-                        <uuid />
+                        <uuid/>
                     </process-id>
                 </core-environment>
                 <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.0" default-virtual-server="default-host">
+            <subsystem xmlns="urn:jboss:domain:web:1.1" 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>
-            <subsystem xmlns="urn:jboss:domain:webservices:1.0" xmlns:javaee="http://java.sun.com/xml/ns/javaee" xmlns:jaxwsconfig="urn:jboss:jbossws-jaxws-config:4.0">
+            <subsystem xmlns="urn:jboss:domain:webservices:1.1">
                 <modify-wsdl-address>true</modify-wsdl-address>
                 <wsdl-host>${jboss.bind.address:127.0.0.1}</wsdl-host>
-                <!--
-                <wsdl-port>8080</wsdl-port>
-                <wsdl-secure-port>8443</wsdl-secure-port>
-                -->
-                <endpoint-config>
-                    <jaxwsconfig:config-name>Standard-Endpoint-Config</jaxwsconfig:config-name>
-                </endpoint-config>
-                <endpoint-config>
-                    <jaxwsconfig:config-name>Recording-Endpoint-Config</jaxwsconfig:config-name>
-                    <jaxwsconfig:pre-handler-chains>
-                        <javaee:handler-chain xmlns="http://java.sun.com/xml/ns/javaee">
-                            <javaee:protocol-bindings>##SOAP11_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP ##SOAP12_HTTP_MTOM</javaee:protocol-bindings>
-                            <javaee:handler>
-                                <javaee:handler-name>RecordingHandler</javaee:handler-name>
-                                <javaee:handler-class>org.jboss.ws.common.invocation.RecordingServerHandler</javaee:handler-class>
-                            </javaee:handler>
-                        </javaee:handler-chain>
-                    </jaxwsconfig:pre-handler-chains>
+                <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>
                 </endpoint-config>
             </subsystem>
             <subsystem xmlns="urn:jboss:domain:weld:1.0"/>
@@ -731,18 +562,17 @@
     <interfaces>
         <interface name="management"/>
         <interface name="public"/>
+        <interface name="unsecure"/>
     </interfaces>
 
     <socket-binding-groups>
         <socket-binding-group name="standard-sockets" default-interface="public">
             <socket-binding name="http" port="8080"/>
             <socket-binding name="https" port="8443"/>
-            <socket-binding name="jacorb" port="3528"/>
-            <socket-binding name="jacorb-ssl" port="3529"/>
+            <socket-binding name="jacorb" interface="unsecure" port="3528"/>
+            <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
             <socket-binding name="jmx-connector-registry" interface="management" port="1090"/>
             <socket-binding name="jmx-connector-server" interface="management" port="1091"/>
-            <socket-binding name="messaging" port="5445"/>
-            <socket-binding name="messaging-throughput" port="5455"/>
             <socket-binding name="osgi-http" interface="management" port="8090"/>
             <socket-binding name="remoting" port="4447"/>
             <socket-binding name="txn-recovery-environment" port="4712"/>
@@ -754,8 +584,8 @@
         <socket-binding-group name="ha-sockets" default-interface="public">
             <socket-binding name="http" port="8080"/>
             <socket-binding name="https" port="8443"/>
-            <socket-binding name="jacorb" port="3528"/>
-            <socket-binding name="jacorb-ssl" port="3529"/>
+            <socket-binding name="jacorb" interface="unsecure" port="3528"/>
+            <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
             <socket-binding name="jgroups-diagnostics" port="0" multicast-address="224.0.75.75" multicast-port="7500"/>
             <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"/>
@@ -764,9 +594,7 @@
             <socket-binding name="jgroups-udp-fd" port="54200"/>
             <socket-binding name="jmx-connector-registry" interface="management" port="1090"/>
             <socket-binding name="jmx-connector-server" interface="management" port="1091"/>
-            <socket-binding name="messaging" port="5445"/>
-            <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="modcluster" port="0" multicast-address="224.0.1.105" multicast-port="23364"/>
             <socket-binding name="osgi-http" interface="management" port="8090"/>
             <socket-binding name="remoting" port="4447"/>
             <socket-binding name="txn-recovery-environment" port="4712"/>
@@ -780,13 +608,13 @@
     <server-groups>
         <server-group name="main-server-group" profile="default">
             <jvm name="default">
-               <heap size="64m" max-size="512m"/>
+                <heap size="64m" max-size="512m"/>
             </jvm>
             <socket-binding-group ref="standard-sockets"/>
         </server-group>
         <server-group name="other-server-group" profile="ha">
             <jvm name="default">
-               <heap size="64m" max-size="512m"/>
+                <heap size="64m" max-size="512m"/>
             </jvm>
             <socket-binding-group ref="ha-sockets"/>
         </server-group>