templates/torquebox/config/rubber/role/torquebox/standalone-ha.xml in rubber-2.1.0 vs templates/torquebox/config/rubber/role/torquebox/standalone-ha.xml in rubber-2.1.1
- old
+ new
@@ -1,9 +1,9 @@
<%
@path = "#{rubber_env.torquebox_dir}/jboss/standalone/configuration/standalone-ha.xml"
%><?xml version='1.0' encoding='UTF-8'?>
-<server xmlns='urn:jboss:domain:1.2'>
+<server xmlns='urn:jboss:domain:1.3'>
<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'/>
@@ -33,35 +33,40 @@
<extension module='org.jboss.as.web'/>
<extension module='org.jboss.as.webservices'/>
<extension module='org.jboss.as.weld'/>
<extension module='org.torquebox.bootstrap'/>
<extension module='org.torquebox.core'/>
- <extension module='org.torquebox.services'/>
- <extension module='org.torquebox.security'/>
- <extension module='org.torquebox.jobs'/>
- <extension module='org.torquebox.stomp'/>
<extension module='org.torquebox.messaging'/>
- <extension module='org.torquebox.cdi'/>
+ <extension module='org.torquebox.stomp'/>
<extension module='org.torquebox.web'/>
- <extension module='org.torquebox.cache'/>
+ <extension module='org.torquebox.security'/>
+ <extension module='org.torquebox.services'/>
+ <extension module='org.torquebox.cdi'/>
+ <extension module='org.torquebox.jobs'/>
<extension module='org.projectodd.polyglot.hasingleton'/>
+ <extension module='org.projectodd.polyglot.cache'/>
</extensions>
<system-properties>
<property name='org.apache.tomcat.util.http.ServerCookie.FWD_SLASH_IS_SEPARATOR' value='false'/>
<property name='org.apache.tomcat.util.net.WAIT_FOR_THREAD' value='false'/>
</system-properties>
<management>
<security-realms>
<security-realm name='ManagementRealm'>
<authentication>
+ <local default-user='$local'/>
<properties path='mgmt-users.properties' relative-to='jboss.server.config.dir'/>
</authentication>
</security-realm>
<security-realm name='ApplicationRealm'>
<authentication>
+ <local default-user='$local' allowed-users='*'/>
<properties path='application-users.properties' relative-to='jboss.server.config.dir'/>
</authentication>
+ <authorization>
+ <properties path='application-roles.properties' relative-to='jboss.server.config.dir'/>
+ </authorization>
</security-realm>
</security-realms>
<management-interfaces>
<native-interface>
<socket-binding native='management-native'/>
@@ -113,11 +118,11 @@
<level name='ERROR'/>
</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'>
+ <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>
jdbc:h2:mem:test;DB_CLOSE_DELAY=-1
</connection-url>
@@ -143,12 +148,19 @@
</datasources>
</subsystem>
<subsystem xmlns='urn:jboss:domain:deployment-scanner:1.1'>
<deployment-scanner path='deployments' relative-to='jboss.server.base.dir' scan-interval='5000' deployment-timeout='1200'/>
</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'/>
</stateless>
<stateful default-access-timeout='5000' cache-ref='simple' clustered-cache-ref='clustered'/>
@@ -184,44 +196,44 @@
<keepalive-time time='100' unit='milliseconds'/>
</thread-pool>
</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>
<!--
~ Clustered cache used internally by EJB subsytem for managing the client-mapping(s) of
~ 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'/>
<eviction strategy='LRU' max-entries='10000'/>
<expiration max-idle='100000'/>
@@ -235,12 +247,12 @@
<transaction mode='NONE'/>
<eviction strategy='NONE'/>
</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>
<subsystem xmlns='urn:jboss:domain:jaxr:1.1'>
<connection-factory jndi-name='java:jboss/jaxr/ConnectionFactory'/>
@@ -280,19 +292,19 @@
<protocol type='pbcast.STABLE'/>
<protocol type='pbcast.GMS'/>
<protocol type='UFC'/>
<protocol type='MFC'/>
<protocol type='FRAG2'/>
+ <protocol type='RSVP'/>
</stack>
<stack name='tcp'>
<transport type='TCP' socket-binding='jgroups-tcp' diagnostics-socket-binding='jgroups-diagnostics'/>
<protocol type="TCPPING">
<property name="initial_hosts">
<%= rubber_instances.for_role('torquebox').collect { |host| "#{host.full_name}[7600]" }.join(',') %>
</property>
</protocol>
- <protocol type='MPING' socket-binding='jgroups-mping'/>
<protocol type='MERGE2'/>
<protocol type='FD_SOCK' socket-binding='jgroups-tcp-fd'/>
<protocol type='FD'/>
<protocol type='VERIFY_SUSPECT'/>
<protocol type='BARRIER'/>
@@ -301,10 +313,11 @@
<protocol type='pbcast.STABLE'/>
<protocol type='pbcast.GMS'/>
<protocol type='UFC'/>
<protocol type='MFC'/>
<protocol type='FRAG2'/>
+ <protocol type='RSVP'/>
</stack>
</subsystem>
<subsystem xmlns='urn:jboss:domain:jmx:1.1'>
<show-model value='true'/>
<remoting-connector/>
@@ -316,15 +329,18 @@
<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'>
+ <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>
<journal-file-size>
102400
@@ -347,29 +363,29 @@
</netty-acceptor>
<in-vm-acceptor name='in-vm' server-id='0'/>
</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>
<cluster-connection name='my-cluster'>
<address>
@@ -430,11 +446,10 @@
<connection-factory name='RemoteConnectionFactory'>
<connectors>
<connector-ref connector-name='netty'/>
</connectors>
<entries>
- <entry name='RemoteConnectionFactory'/>
<entry name='java:jboss/exported/jms/RemoteConnectionFactory'/>
</entries>
<consumer-window-size>
1
</consumer-window-size>
@@ -447,34 +462,28 @@
<entries>
<entry name='java:/JmsXA'/>
</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>
<security-enabled>
false
</security-enabled>
</hornetq-server>
</subsystem>
- <subsystem xmlns='urn:jboss:domain:modcluster:1.0'>
- <mod-cluster-config proxy-list="${jboss.mod_cluster.proxyList}" excluded-contexts='invoker,jbossws,juddi,console'>
+ <subsystem xmlns='urn:jboss:domain:modcluster:1.1'>
+ <mod-cluster-config advertise="false" proxy-list="${jboss.mod_cluster.proxyList}" 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 -->
<property name='org.osgi.framework.startlevel.beginning'>
1
@@ -495,21 +504,18 @@
<subsystem xmlns='urn:jboss:domain:remoting:1.1'>
<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'>
+ <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.server.config.dir}/application-users.properties'/>
- <module-option name='rolesProperties' value='${jboss.server.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>
</security-domain>
<security-domain name='jboss-web-policy' cache-type='default'>
@@ -523,11 +529,11 @@
</authorization>
</security-domain>
</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/>
</process-id>
</core-environment>
@@ -557,19 +563,19 @@
</endpoint-config>
</subsystem>
<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-services:1.0'/>
- <subsystem xmlns='urn:jboss:domain:torquebox-security:1.0'/>
- <subsystem xmlns='urn:jboss:domain:torquebox-jobs:1.0'/>
- <subsystem xmlns='urn:jboss:domain:torquebox-stomp:1.0' socket-binding='stomp'/>
<subsystem xmlns='urn:jboss:domain:torquebox-messaging:1.0'/>
- <subsystem xmlns='urn:jboss:domain:torquebox-cdi: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-cache:1.0'/>
+ <subsystem xmlns='urn:jboss:domain:torquebox-security:1.0'/>
+ <subsystem xmlns='urn:jboss:domain:torquebox-services:1.0'/>
+ <subsystem xmlns='urn:jboss:domain:torquebox-cdi:1.0'/>
+ <subsystem xmlns='urn:jboss:domain:torquebox-jobs:1.0'/>
<subsystem xmlns='urn:jboss:domain:polyglot-hasingleton:1.0'/>
+ <subsystem xmlns='urn:jboss:domain:polyglot-cache:1.0'/>
</profile>
<interfaces>
<interface name='management'>
<inet-address value='${jboss.bind.address.management:127.0.0.1}'/>
</interface>
@@ -599,18 +605,18 @@
<socket-binding name='jgroups-tcp' port='7600'/>
<socket-binding name='jgroups-tcp-fd' port='57600'/>
<socket-binding name='jgroups-udp' port='55200' multicast-address='${jboss.default.multicast.address:230.0.0.4}' multicast-port='45688'/>
<socket-binding name='jgroups-udp-fd' port='54200'/>
<socket-binding name='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'/>
<socket-binding name='remoting' port='4447'/>
<socket-binding name='txn-recovery-environment' port='4712'/>
<socket-binding name='txn-status-manager' port='4713'/>
<outbound-socket-binding name='mail-smtp'>
<remote-destination host='localhost' port='25'/>
</outbound-socket-binding>
<socket-binding 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>
</server>
\ No newline at end of file