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

data/jboss/docs/examples/configs/domain-osgi-only.xml

@@ -50,13 +50,13 @@
                 </root-logger>
             </subsystem>
             <subsystem xmlns="urn:jboss:domain:configadmin:1.0"/>
-            <subsystem xmlns="urn:jboss:domain:jmx:1.1"/>
-            <subsystem xmlns="urn:jboss:domain:osgi:1.2" activation="eager">
-                <capabilities>
-                    <capability name="org.osgi.compendium"/>
-                </capabilities>
+            <subsystem xmlns="urn:jboss:domain:jmx:1.1">
+                <show-model value="true"/>
+            </subsystem>
+            <subsystem xmlns="urn:jboss:domain:osgi:1.2" activation="eager"/>
+            <subsystem xmlns="urn:jboss:domain:remoting:1.1">
+                <connector name="remoting-connector" socket-binding="remoting" security-realm="ApplicationRealm"/>
             </subsystem>
-            <subsystem xmlns="urn:jboss:domain:remoting:1.1"/>
         </profile>
     </profiles>
 
@@ -89,7 +89,7 @@
     <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>

data/jboss/docs/examples/configs/standalone-hornetq-colocated.xml

@@ -13,12 +13,10 @@
         <extension module="org.jboss.as.jaxrs"/>
         <extension module="org.jboss.as.jmx"/>
         <extension module="org.jboss.as.jpa"/>
-        <extension module="org.jboss.as.jsr77"/>
         <extension module="org.jboss.as.logging"/>
         <extension module="org.jboss.as.mail"/>
         <extension module="org.jboss.as.messaging"/>
         <extension module="org.jboss.as.naming"/>
-        <extension module="org.jboss.as.osgi"/>
         <extension module="org.jboss.as.remoting"/>
         <extension module="org.jboss.as.sar"/>
         <extension module="org.jboss.as.security"/>
@@ -33,7 +31,12 @@
         <security-realms>
             <security-realm name="ManagementRealm">
                 <authentication>
-                    <properties path="mgmt-users.properties" relative-to="jboss.server.config.dir" plain-text="true"/>
+                    <properties path="mgmt-users.properties" relative-to="jboss.server.config.dir"/>
+                </authentication>
+            </security-realm>
+            <security-realm name="ApplicationRealm">
+                <authentication>
+                    <properties path="application-users.properties" relative-to="jboss.server.config.dir"/>
                 </authentication>
             </security-realm>
         </security-realms>
@@ -89,11 +92,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>
@@ -106,8 +107,8 @@
                 </drivers>
             </datasources>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:deployment-scanner:1.0">
-            <deployment-scanner scan-interval="5000" relative-to="jboss.server.base.dir" path="deployments"/>
+        <subsystem xmlns="urn:jboss:domain:deployment-scanner:1.1">
+            <deployment-scanner path="deployments" relative-to="jboss.server.base.dir" scan-interval="5000"/>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:ee:1.0"/>
         <subsystem xmlns="urn:jboss:domain:ejb3:1.2">
@@ -141,8 +142,12 @@
             </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="false" use-qualified-name="false"/>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:infinispan:1.1" default-cache-container="hibernate">
             <cache-container name="hibernate" default-cache="local-query">
@@ -152,41 +157,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.0">
-            <orb name="JBoss" print-version="off" giop-minor-version="2">
-                <connection max-managed-buf-size="24" outbuf-cache-timeout="-1"/>
-                <naming root-context="JBoss/Naming/root" export-corbaloc="on"/>
+        <subsystem xmlns="urn:jboss:domain:jacorb:1.1">
+            <orb>
+                <initializers transactions="on" security="on"/>
             </orb>
-            <poa monitoring="off" queue-wait="off">
-                <request-processors pool-size="2" max-threads="8"/>
-            </poa>
-            <interop sun="on" chunk-custom-rmi-valuetypes="on" strict-check-on-tc-creation="off"/>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/>
         <subsystem xmlns="urn:jboss:domain:jca:1.1">
-            <archive-validation enabled="false"/>
+            <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>
@@ -197,7 +197,6 @@
         <subsystem xmlns="urn:jboss:domain:jpa:1.0">
             <jpa default-datasource=""/>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:jsr77:1.0"/>
         <subsystem xmlns="urn:jboss:domain:mail:1.0">
             <mail-session jndi-name="java:jboss/mail/Default">
                 <smtp-server outbound-socket-binding-ref="mail-smtp"/>
@@ -205,12 +204,12 @@
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:messaging:1.1">
             <hornetq-server>
-   		       <clustered>true</clustered>
-                <shared-store>true</shared-store>
+                <clustered>true</clustered>
                 <persistence-enabled>true</persistence-enabled>
+                <shared-store>true</shared-store>
+                <journal-type>ASYNCIO</journal-type>
                 <journal-file-size>102400</journal-file-size>
                 <journal-min-files>2</journal-min-files>
-                <journal-type>ASYNCIO</journal-type>
 
                 <connectors>
                     <netty-connector name="netty" socket-binding="messaging"/>
@@ -229,30 +228,30 @@
                     <in-vm-acceptor name="in-vm" server-id="0"/>
                 </acceptors>
 
-               <broadcast-groups>
-                  <broadcast-group name="bg-group1">
-                     <group-address>231.7.7.7</group-address>
-                     <group-port>9876</group-port>
-                     <broadcast-period>5000</broadcast-period>
-                     <connector-ref>netty</connector-ref>
-                  </broadcast-group>
-               </broadcast-groups>
+                <broadcast-groups>
+                    <broadcast-group name="bg-group1">
+                        <group-address>231.7.7.7</group-address>
+                        <group-port>9876</group-port>
+                        <broadcast-period>5000</broadcast-period>
+                        <connector-ref>netty</connector-ref>
+                    </broadcast-group>
+                </broadcast-groups>
 
-               <discovery-groups>
-                  <discovery-group name="dg-group1">
-                     <group-address>231.7.7.7</group-address>
-                     <group-port>9876</group-port>
-                     <refresh-timeout>10000</refresh-timeout>
-                  </discovery-group>
-               </discovery-groups>
+                <discovery-groups>
+                    <discovery-group name="dg-group1">
+                        <group-address>231.7.7.7</group-address>
+                        <group-port>9876</group-port>
+                        <refresh-timeout>10000</refresh-timeout>
+                    </discovery-group>
+                </discovery-groups>
 
-               <cluster-connections>
-                  <cluster-connection name="my-cluster">
-                     <address>jms</address>
-                     <connector-ref>netty</connector-ref>
-                     <discovery-group-ref discovery-group-name="dg-group1"/>
-                  </cluster-connection>
-               </cluster-connections>
+                <cluster-connections>
+                    <cluster-connection name="my-cluster">
+                        <address>jms</address>
+                        <connector-ref>netty</connector-ref>
+                        <discovery-group-ref discovery-group-name="dg-group1"/>
+                    </cluster-connection>
+                </cluster-connections>
 
                 <security-settings>
                     <security-setting match="#">
@@ -270,8 +269,8 @@
                         <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>
+                        <message-counter-history-day-limit>10</message-counter-history-day-limit>
                     </address-setting>
                 </address-settings>
 
@@ -291,6 +290,7 @@
                         </connectors>
                         <entries>
                             <entry name="RemoteConnectionFactory"/>
+                            <entry name="java:jboss/exported/jms/RemoteConnectionFactory"/>
                         </entries>
                     </connection-factory>
                     <pooled-connection-factory name="hornetq-ra">
@@ -307,80 +307,67 @@
                 <jms-destinations>
                     <jms-queue name="testQueue">
                         <entry name="queue/test"/>
+                        <entry name="java:jboss/exported/jms/queue/test"/>
                     </jms-queue>
                     <jms-topic name="testTopic">
                         <entry name="topic/test"/>
+                        <entry name="java:jboss/exported/jms/topic/test"/>
                     </jms-topic>
                 </jms-destinations>
             </hornetq-server>
+
             <hornetq-server name="backup-server">
-   		       <clustered>true</clustered>
+                <clustered>true</clustered>
+                <persistence-enabled>true</persistence-enabled>
                 <backup>true</backup>
                 <shared-store>true</shared-store>
-                <persistence-enabled>true</persistence-enabled>
+                <journal-type>ASYNCIO</journal-type>
                 <journal-file-size>102400</journal-file-size>
                 <journal-min-files>2</journal-min-files>
-                <journal-type>ASYNCIO</journal-type>
-                <journal-directory path="messagingjournal2"/>
-                <bindings-directory path="messagingbindings2"/>
                 <paging-directory path="messagingpaging2"/>
+                <bindings-directory path="messagingbindings2"/>
+                <journal-directory path="messagingjournal2"/>
                 <large-messages-directory path="messaginglargemessages2"/>
+
                 <connectors>
                     <netty-connector name="netty" socket-binding="messaging-backup"/>
                     <in-vm-connector name="in-vm" server-id="0"/>
                 </connectors>
+
                 <acceptors>
                     <netty-acceptor name="netty" socket-binding="messaging-backup"/>
                 </acceptors>
-	        <broadcast-groups>
-		      <broadcast-group name="bg-group1">
-			 <group-address>231.7.7.7</group-address>
-			 <group-port>9876</group-port>
-			 <broadcast-period>5000</broadcast-period>
-			 <connector-ref>netty</connector-ref>
-		      </broadcast-group>
-		   </broadcast-groups>
 
-		   <discovery-groups>
-		      <discovery-group name="dg-group1">
-			 <group-address>231.7.7.7</group-address>
-			 <group-port>9876</group-port>
-			 <refresh-timeout>10000</refresh-timeout>
-		      </discovery-group>
-		   </discovery-groups>
-		   
-		   <cluster-connections>
-		      <cluster-connection name="my-cluster">
-			 <address>jms</address>	 
-			 <connector-ref>netty</connector-ref>
-			      <discovery-group-ref discovery-group-name="dg-group1"/>
-		      </cluster-connection>
-		   </cluster-connections>
+                <broadcast-groups>
+                    <broadcast-group name="bg-group1">
+                        <group-address>231.7.7.7</group-address>
+                        <group-port>9876</group-port>
+                        <broadcast-period>5000</broadcast-period>
+                        <connector-ref>netty</connector-ref>
+                    </broadcast-group>
+                </broadcast-groups>
+
+                <discovery-groups>
+                    <discovery-group name="dg-group1">
+                        <group-address>231.7.7.7</group-address>
+                        <group-port>9876</group-port>
+                        <refresh-timeout>10000</refresh-timeout>
+                    </discovery-group>
+                </discovery-groups>
+
+                <cluster-connections>
+                    <cluster-connection name="my-cluster">
+                        <address>jms</address>
+                        <connector-ref>netty</connector-ref>
+                        <discovery-group-ref discovery-group-name="dg-group1"/>
+                    </cluster-connection>
+                </cluster-connections>
             </hornetq-server>
+
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:naming:1.1"/>
-        <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</property>
-            </properties>
-            <capabilities>
-                <!-- modules registered with the OSGi layer on startup -->
-                <capability name="javax.api"/>
-                <capability name="javax.servlet.api"/>
-                <capability name="javax.transaction.api"/>
-                <!-- bundles installed on startup -->
-                <capability name="org.osgi.compendium"/>
-                <!-- bundles started in 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.0">
-            <connector name="remoting-connector" socket-binding="remoting"/>
+        <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"/>
@@ -388,13 +375,31 @@
             <security-domains>
                 <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.server.config.dir}/application-users.properties"/>
+                            <module-option name="rolesProperties" value="${jboss.server.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:transactions:1.0">
+        <subsystem xmlns="urn:jboss:domain:threads:1.1"/>
+        <subsystem xmlns="urn:jboss:domain:transactions:1.1">
             <core-environment>
                 <process-id>
                     <uuid/>
@@ -403,34 +408,21 @@
             <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.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"/>
@@ -443,13 +435,18 @@
         <interface name="public">
             <inet-address value="${jboss.bind.address:127.0.0.1}"/>
         </interface>
+        <interface name="unsecure">
+            <!-- Used for IIOP sockets in the standarad configuration.
+                 To secure JacORB you need to setup SSL -->
+            <inet-address value="127.0.0.1"/>
+        </interface>
     </interfaces>
 
     <socket-binding-group name="standard-sockets" default-interface="public" port-offset="${jboss.socket.binding.port-offset:0}">
         <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="management-native" interface="management" port="${jboss.management.native.port:9999}"/>
         <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
         <socket-binding name="messaging" port="5445"/>
@@ -464,4 +461,4 @@
         </outbound-socket-binding>
     </socket-binding-group>
 
-</server>
+</server>