1,23c1
< <!--
<   ~ JBoss, Home of Professional Open Source.
<   ~ Copyright 2011, Red Hat, Inc., and individual contributors
<   ~ as indicated by the @author tags. See the copyright.txt file in the
<   ~ distribution for a full listing of individual contributors.
<   ~
<   ~ This is free software; you can redistribute it and/or modify it
<   ~ under the terms of the GNU Lesser General Public License as
<   ~ published by the Free Software Foundation; either version 2.1 of
<   ~ the License, or (at your option) any later version.
<   ~
<   ~ This software is distributed in the hope that it will be useful,
<   ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
<   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
<   ~ Lesser General Public License for more details.
<   ~
<   ~ You should have received a copy of the GNU Lesser General Public
<   ~ License along with this software; if not, write to the Free
<   ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
<   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
<   -->
< 
< <server xmlns="urn:jboss:domain:1.1">
---
> <?xml version='1.0' encoding='UTF-8'?>
24a3
> <server name="rrajasek.csb" xmlns="urn:jboss:domain:1.1">
50c29,31
< 
---
>     <system-properties>
>         <property name="foo" value="test"/>
>     </system-properties>
64d44
< 
67c47
<             <console-handler name="CONSOLE">
---
>             <console-handler name="CONSOLE" autoflush="true">
73,74c53
< 
<             <periodic-rotating-file-handler name="FILE">
---
>             <periodic-rotating-file-handler name="FILE" autoflush="true">
82d60
< 
95d72
<             <!-- set jacorb.config to ERROR to avoid the "jacorb.properties not found" messages during startup -->
99d75
< 
110,114c86,92
<                 <datasource jndi-name="java:jboss/datasources/ExampleDS" enabled="true" use-java-context="true"
<                             pool-name="H2DS">
<                     <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1</connection-url>
<                     <driver>h2</driver>
<                     <pool></pool>
---
>                 <datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="H2DS">
>                     <connection-url>
>                         jdbc:h2:mem:test;DB_CLOSE_DELAY=-1
>                     </connection-url>
>                     <driver>
>                         h2
>                     </driver>
116,117c94,99
<                         <user-name>sa</user-name>
<                         <password>sa</password>
---
>                         <user-name>
>                             sa
>                         </user-name>
>                         <password>
>                             sa
>                         </password>
122c104,106
<                         <xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class>
---
>                         <xa-datasource-class>
>                             org.h2.jdbcx.JdbcDataSource
>                         </xa-datasource-class>
128c112
<             <deployment-scanner scan-interval="5000" relative-to="jboss.server.base.dir" path="deployments"/>
---
>             <deployment-scanner name="default" path="deployments" scan-enabled="true" scan-interval="5000" relative-to="jboss.server.base.dir" deployment-timeout="60"/>
130,151c114,115
<         <subsystem xmlns="urn:jboss:domain:ee:1.0" />
<         <subsystem xmlns="urn:jboss:domain:ejb3:1.2" >
< 
<             <remote connector-ref="remoting-connector" thread-pool-name="default" />
<             <async thread-pool-name="default" />
< 
<             <timer-service thread-pool-name="default" >
<                 <data-store path="timer-service-data" relative-to="jboss.server.data.dir"/>
<             </timer-service>
< 
<             <!-- EJB3 pools -->
<             <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"/>
<                 </bean-instance-pools>
<             </pools>
< 
<             <!-- Default MDB configurations -->
---
>         <subsystem xmlns="urn:jboss:domain:ee:1.0"/>
>         <subsystem xmlns="urn:jboss:domain:ejb3:1.2">
156,157c120,121
< 
<             <!-- Session bean configurations -->
---
>             <remote connector-ref="remoting-connector" thread-pool-name="default"/>
>             <async thread-pool-name="default"/>
162d125
<                 <stateful default-access-timeout="5000"/>
163a127
>                 <stateful default-access-timeout="5000"/>
165c129,137
< 
---
>             <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"/>
>                 </bean-instance-pools>
>             </pools>
>             <timer-service thread-pool-name="default">
>                 <data-store path="timer-service-data" relative-to="jboss.server.data.dir"/>
>             </timer-service>
167c139
<                 <thread-pool name="default" max-threads="10" keepalive-time="100" />
---
>                 <thread-pool name="default" max-threads="10" keepalive-time="100"/>
216c188
<             <jmx-connector registry-binding="jmx-connector-registry" server-binding="jmx-connector-server" />
---
>             <jmx-connector server-binding="jmx-connector-server" registry-binding="jmx-connector-registry"/>
222c194
<             <mail-session jndi-name="java:jboss/mail/Default">
---
>             <mail-session jndi-name="java:jboss/mail/Default" debug="false">
228,242c200,211
<                 <!-- 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>
<                 <journal-type>NIO</journal-type>
<                 <!-- disable messaging persistence -->
<                 <persistence-enabled>false</persistence-enabled>
< 
<                 <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>
< 
---
>                 <persistence-enabled>
>                     false
>                 </persistence-enabled>
>                 <journal-type>
>                     NIO
>                 </journal-type>
>                 <journal-file-size>
>                     102400
>                 </journal-file-size>
>                 <journal-min-files>
>                     2
>                 </journal-min-files>
251c220,248
< 
---
>                 <address-settings>
>                     <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>
>                 <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>
254,256d250
<                         <permission type="createNonDurableQueue" roles="guest"/>
<                         <permission type="deleteNonDurableQueue" roles="guest"/>
<                         <permission type="consume" roles="guest"/>
257a252
>                         <permission type="consume" roles="guest"/>
260,273c255
< 
<                 <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 Stuff-->
---
>                 <core-queues/>
292d273
<                         <transaction mode="xa"/>
298a280
>                         <transaction mode="xa"/>
301d282
< 
312c293
<         <subsystem xmlns="urn:jboss:domain:naming:1.0"/>
---
>         <subsystem xmlns="urn:jboss:domain:naming:1.1"/>
318,319c299,301
<                 <!-- Specifies the beginning start level of the framework -->
<                 <property name="org.osgi.framework.startlevel.beginning">1</property>
---
>                 <property name="org.osgi.framework.startlevel.beginning">
>                     1
>                 </property>
322d303
<                 <!-- modules registered with the OSGi layer on startup -->
326d306
<                 <!-- bundles installed on startup -->
330d309
<                 <!-- bundles started in startlevel 1 -->
335d313
<                 <!-- bundles started in startlevel 2 -->
345d322
<                 <!-- bundles started in startlevel 3 -->
354c331
<         <subsystem xmlns="urn:jboss:domain:resource-adapters:1.0" />
---
>         <subsystem xmlns="urn:jboss:domain:resource-adapters:1.0"/>
356c333
<         <subsystem xmlns="urn:jboss:domain:security:1.0">
---
>         <subsystem xmlns="urn:jboss:domain:security:1.1">
377d353
<             <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/>
382a359
>             <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/>
385,386c362,363
<         <subsystem xmlns="urn:jboss:domain:web:1.0" default-virtual-server="default-host">
<             <connector name="http" scheme="http" protocol="HTTP/1.1" socket-binding="http"/>
---
>         <subsystem xmlns="urn:jboss:domain:web:1.1" default-virtual-server="default-host">
>             <connector name="http" protocol="HTTP/1.1" socket-binding="http" scheme="http"/>
392,400c369,379
<         <subsystem xmlns="urn:jboss:domain:webservices:1.0">
<             <modify-wsdl-address>true</modify-wsdl-address>
<             <wsdl-host>localhost</wsdl-host>
<             <!--
<             <wsdl-port>8080</wsdl-port>
<             <wsdl-secure-port>8443</wsdl-secure-port>
<             -->
<             <endpoint-config xmlns:ws="urn:jboss:jbossws-jaxws-config:4.0">
<                 <ws:config-name>Standard-Endpoint-Config</ws:config-name>
---
>         <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">
>             <modify-wsdl-address>
>                 true
>             </modify-wsdl-address>
>             <wsdl-host>
>                 localhost
>             </wsdl-host>
>             <endpoint-config>
>                 <jaxwsconfig:config-name>
>                     Standard-Endpoint-Config
>                 </jaxwsconfig:config-name>
402,413c381,399
<             <endpoint-config xmlns:ws="urn:jboss:jbossws-jaxws-config:4.0">
<                 <ws:config-name>Recording-Endpoint-Config</ws:config-name>
<                 <ws:pre-handler-chains>
<                     <handler-chain xmlns="http://java.sun.com/xml/ns/javaee">
<                         <protocol-bindings>##SOAP11_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP ##SOAP12_HTTP_MTOM
<                         </protocol-bindings>
<                         <handler>
<                             <handler-name>RecordingHandler</handler-name>
<                             <handler-class>org.jboss.ws.common.invocation.RecordingServerHandler</handler-class>
<                         </handler>
<                     </handler-chain>
<                 </ws:pre-handler-chains>
---
>             <endpoint-config>
>                 <jaxwsconfig:config-name>
>                     Recording-Endpoint-Config
>                 </jaxwsconfig:config-name>
>                 <jaxwsconfig:pre-handler-chains>
>                     <javaee:handler-chain>
>                         <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>
418d403
< 
424c409
<            <inet-address value="${jboss.bind.address:127.0.0.1}"/>
---
>             <inet-address value="${jboss.bind.address:127.0.0.1}"/>
427d411
< 
433,434c417,418
<         <socket-binding name="jmx-connector-registry" interface="management" port="1090"/>
<         <socket-binding name="jmx-connector-server" interface="management" port="1091"/>
---
>         <socket-binding name="jmx-connector-registry" port="1090" interface="management"/>
>         <socket-binding name="jmx-connector-server" port="1091" interface="management"/>
438c422
<         <socket-binding name="osgi-http" interface="management" port="8090"/>
---
>         <socket-binding name="osgi-http" port="8090" interface="management"/>
443,444c427
< 
< </server>
---
> </server>
\ No newline at end of file