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

data/jboss/docs/schema/jboss-as-infinispan_1_1.xsd

@@ -61,23 +61,26 @@
                 <xs:documentation>Uniquely identifies this cache container.</xs:documentation>
             </xs:annotation>
         </xs:attribute>
-        <!-- Preparation for AS7-2883 -->
-        <!-- Will also need to remove alias element from cache-container -->
-        <!--xs:attribute name="aliases" type="tns:aliases">
+        <xs:attribute name="aliases" type="tns:aliases">
             <xs:annotation>
                 <xs:documentation>A set of aliases by which this cache container may also be referenced.</xs:documentation>
             </xs:annotation>
-        </xs:attribute-->
+        </xs:attribute>
         <xs:attribute name="jndi-name" type="xs:string">
             <xs:annotation>
                 <xs:documentation>The jndi name to which to bind this cache container.</xs:documentation>
             </xs:annotation>
         </xs:attribute>
-        <xs:attribute name="default-cache" type="xs:string" use="required">
+        <xs:attribute name="default-cache" type="xs:string">
             <xs:annotation>
                 <xs:documentation></xs:documentation>
             </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="start" type="tns:controller-mode" default="LAZY">
+            <xs:annotation>
+                <xs:documentation>Should this cache container be started on server startup, or lazily when requested by a service or deployment.</xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
         <xs:attribute name="listener-executor" type="xs:string">
             <xs:annotation>
                 <xs:documentation>Defines the executor used for asynchronous cache listener notifications.</xs:documentation>
@@ -119,11 +122,6 @@
         <xs:complexContent>
             <xs:extension base="tns:base-cache-container">
                 <xs:sequence>
-                    <xs:element name="alias" type="xs:string" minOccurs="0" maxOccurs="unbounded">
-                        <xs:annotation>
-                            <xs:documentation>Defines an additional name by which this cache container may be referenced.</xs:documentation>
-                        </xs:annotation>
-                    </xs:element>
                     <xs:element name="transport" type="tns:transport" minOccurs="0">
                         <xs:annotation>
                             <xs:documentation>Overrides the transport characteristics for this cache container.</xs:documentation>
@@ -293,6 +291,11 @@
                 <xs:documentation></xs:documentation>
             </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="locking" type="tns:locking-mode" default="OPTIMISTIC">
+            <xs:annotation>
+                <xs:documentation></xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
     </xs:complexType>
 
     <xs:complexType name="eviction">
@@ -334,7 +337,7 @@
                         <xs:documentation></xs:documentation>
                     </xs:annotation>
                 </xs:attribute>
-                <xs:attribute name="queue-size" type="xs:int" default="1000">
+                <xs:attribute name="queue-size" type="xs:int" default="0">
                     <xs:annotation>
                         <xs:documentation></xs:documentation>
                     </xs:annotation>
@@ -356,13 +359,6 @@
     <xs:complexType name="invalidation-cache">
         <xs:complexContent>
             <xs:extension base="tns:clustered-cache">
-                <xs:sequence>
-                    <xs:element name="state-transfer" type="tns:state-transfer" minOccurs="0">
-                        <xs:annotation>
-                            <xs:documentation></xs:documentation>
-                        </xs:annotation>
-                    </xs:element>
-                </xs:sequence>
             </xs:extension>
         </xs:complexContent>
     </xs:complexType>
@@ -385,7 +381,7 @@
         <xs:complexContent>
             <xs:extension base="tns:clustered-cache">
                 <xs:sequence>
-                    <xs:element name="rehashing" type="tns:rehashing" minOccurs="0">
+                    <xs:element name="state-transfer" type="tns:state-transfer" minOccurs="0">
                         <xs:annotation>
                             <xs:documentation></xs:documentation>
                         </xs:annotation>
@@ -654,25 +650,7 @@
                 <xs:documentation></xs:documentation>
             </xs:annotation>
         </xs:attribute>
-        <xs:attribute name="flush-timeout" type="xs:long" default="60000">
-            <xs:annotation>
-                <xs:documentation></xs:documentation>
-            </xs:annotation>
-        </xs:attribute>
-    </xs:complexType>
-
-    <xs:complexType name="rehashing">
-        <xs:attribute name="enabled" type="xs:boolean" default="true">
-            <xs:annotation>
-                <xs:documentation></xs:documentation>
-            </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="timeout" type="xs:long" default="600000">
-            <xs:annotation>
-                <xs:documentation></xs:documentation>
-            </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="wait" type="xs:long" default="600000">
+        <xs:attribute name="chunk-size" type="xs:integer" default="10000">
             <xs:annotation>
                 <xs:documentation></xs:documentation>
             </xs:annotation>
@@ -831,6 +809,21 @@
         </xs:restriction>
     </xs:simpleType>
 
+    <xs:simpleType name="locking-mode">
+        <xs:restriction base="xs:token">
+            <xs:enumeration value="OPTIMISTIC">
+                <xs:annotation>
+                    <xs:documentation></xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="PESSIMISTIC">
+                <xs:annotation>
+                    <xs:documentation></xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+        </xs:restriction>
+    </xs:simpleType>
+
     <xs:simpleType name="controller-mode">
         <xs:restriction base="xs:token">
             <xs:enumeration value="EAGER">

data/jboss/docs/schema/jboss-as-jacorb_1_1.xsd

@@ -82,11 +82,11 @@
             <xs:element name="initializers" minOccurs="0" maxOccurs="1" type="orbInitializersConfigType"/>
         </xs:sequence>
         <xs:attribute name="name" type="xs:string" use="optional" default="JBoss"/>
-        <xs:attribute name="print-version" type="xs:string" use="optional" default="off"/>
-        <xs:attribute name="use-imr" type="xs:string" use="optional" default="off"/>
-        <xs:attribute name="use-bom" type="xs:string" use="optional" default="off"/>
-        <xs:attribute name="cache-typecodes" type="xs:string" use="optional" default="off"/>
-        <xs:attribute name="cache-poa-names" type="xs:string" use="optional" default="off"/>
+        <xs:attribute name="print-version" type="onOffType" use="optional" default="off"/>
+        <xs:attribute name="use-imr" type="onOffType" use="optional" default="off"/>
+        <xs:attribute name="use-bom" type="onOffType" use="optional" default="off"/>
+        <xs:attribute name="cache-typecodes" type="onOffType" use="optional" default="off"/>
+        <xs:attribute name="cache-poa-names" type="onOffType" use="optional" default="off"/>
         <xs:attribute name="giop-minor-version" type="xs:integer" use="optional" default="2"/>
     </xs:complexType>
 
@@ -136,7 +136,7 @@
                         ]]>
             </xs:documentation>
         </xs:annotation>
-        <xs:attribute name="security" type="securityEnabledType" use="optional" default="off"/>
+        <xs:attribute name="security" type="onOffType" use="optional" default="off"/>
         <xs:attribute name="transactions" type="transactionEnabledType" use="optional" default="off"/>
     </xs:complexType>
 
@@ -161,8 +161,8 @@
         <xs:sequence>
             <xs:element name="request-processors" minOccurs="0" maxOccurs="1" type="poaRequestProcessorsConfigType"/>
         </xs:sequence>
-        <xs:attribute name="monitoring" type="xs:string" use="optional" default="off"/>
-        <xs:attribute name="queue-wait" type="xs:string" use="optional" default="off"/>
+        <xs:attribute name="monitoring" type="onOffType" use="optional" default="off"/>
+        <xs:attribute name="queue-wait" type="onOffType" use="optional" default="off"/>
         <xs:attribute name="queue-min" type="xs:integer" use="optional" default="10"/>
         <xs:attribute name="queue-max" type="xs:integer" use="optional" default="100"/>
     </xs:complexType>
@@ -198,7 +198,7 @@
             </xs:documentation>
         </xs:annotation>
         <xs:attribute name="root-context" type="xs:string" use="optional" default="JBoss/Naming/root"/>
-        <xs:attribute name="export-corbaloc" type="xs:string" use="optional" default="on"/>
+        <xs:attribute name="export-corbaloc" type="onOffType" use="optional" default="on"/>
     </xs:complexType>
 
     <xs:complexType name="interopConfigType">
@@ -221,13 +221,13 @@
                         ]]>
             </xs:documentation>
         </xs:annotation>
-        <xs:attribute name="sun" type="xs:string" use="optional" default="on"/>
-        <xs:attribute name="comet" type="xs:string" use="optional" default="off"/>
-        <xs:attribute name="iona" type="xs:string" use="optional" default="off"/>
-        <xs:attribute name="chunk-custom-rmi-valuetypes" type="xs:string" use="optional" default="on"/>
-        <xs:attribute name="lax-boolean-encoding" type="xs:string" use="optional" default="off"/>
-        <xs:attribute name="indirection-encoding-disable" type="xs:string" use="optional" default="off"/>
-        <xs:attribute name="strict-check-on-tc-creation" type="xs:string" use="optional" default="off"/>
+        <xs:attribute name="sun" type="onOffType" use="optional" default="on"/>
+        <xs:attribute name="comet" type="onOffType" use="optional" default="off"/>
+        <xs:attribute name="iona" type="onOffType" use="optional" default="off"/>
+        <xs:attribute name="chunk-custom-rmi-valuetypes" type="onOffType" use="optional" default="on"/>
+        <xs:attribute name="lax-boolean-encoding" type="onOffType" use="optional" default="off"/>
+        <xs:attribute name="indirection-encoding-disable" type="onOffType" use="optional" default="off"/>
+        <xs:attribute name="strict-check-on-tc-creation" type="onOffType" use="optional" default="off"/>
     </xs:complexType>
 
     <xs:complexType name="securityConfigType">
@@ -241,30 +241,24 @@
                                    to establish SSL connections.
                 * add-component-via-interceptor: indicates whether SSL components should be added by an IOR interceptor
                                                  (on) or not (off).
-                * client-supports: value that indicates the client SSL supported parameters (EstablishTrustInTarget=20,
-                                   EstablishTrustInClient=40, MutualAuth=60).
-                * client-requires: value that indicates the client SSL required parameters (EstablishTrustInTarget=20,
-                                   EstablishTrustInClient=40, MutualAuth=60).
-                * server-supports: value that indicates the server SSL supported parameters (EstablishTrustInTarget=20,
-                                   EstablishTrustInClient=40, MutualAuth=60).
-                * server-requires: value that indicates the server SSL required parameters (EstablishTrustInTarget=20,
-                                   EstablishTrustInClient=40, MutualAuth=60).
-                * use-domain-socket-factory: indicates whether the JBoss domain socket factory should be used (on) or
-                                             not (off).
-                * use-domain-server-socket-factory: indicates whether the JBoss domain server socket factory should be
-                                                    used (on) or not (off).
+                * client-supports: value that indicates the client SSL supported parameters (None, ServerAuth, ClientAuth.
+                                   MutualAuth)
+                * client-requires: value that indicates the client SSL required parameters (None, ServerAuth, ClientAuth.
+                                   MutualAuth)
+                * server-supports: value that indicates the server SSL supported parameters (None, ServerAuth, ClientAuth.
+                                   MutualAuth)
+                * server-requires: value that indicates the server SSL required parameters (None, ServerAuth, ClientAuth.
+                                   MutualAuth)
                         ]]>
             </xs:documentation>
         </xs:annotation>
-        <xs:attribute name="support-ssl" type="xs:string" use="optional" default="off"/>
+        <xs:attribute name="support-ssl" type="onOffType" use="optional" default="off"/>
         <xs:attribute name="security-domain" type="xs:string" use="optional"/>
-        <xs:attribute name="add-component-via-interceptor" type="xs:string" use="optional" default="on"/>
-        <xs:attribute name="client-supports" type="xs:integer" use="optional" default="60"/>
-        <xs:attribute name="client-requires" type="xs:integer" use="optional" default="0"/>
-        <xs:attribute name="server-supports" type="xs:integer" use="optional" default="60"/>
-        <xs:attribute name="server-requires" type="xs:integer" use="optional" default="0"/>
-        <xs:attribute name="use-domain-socket-factory" type="xs:string" use="optional" default="off"/>
-        <xs:attribute name="use-domain-server-socket-factory" type="xs:string" use="optional" default="off"/>
+        <xs:attribute name="add-component-via-interceptor" type="onOffType" use="optional" default="on"/>
+        <xs:attribute name="client-supports" type="sslConfigType" use="optional" default="MutualAuth"/>
+        <xs:attribute name="client-requires" type="sslConfigType" use="optional" default="None"/>
+        <xs:attribute name="server-supports" type="sslConfigType" use="optional" default="MutualAuth"/>
+        <xs:attribute name="server-requires" type="sslConfigType" use="optional" default="None"/>
     </xs:complexType>
 
     <xs:complexType name="genericPropertiesType">
@@ -293,10 +287,12 @@
         <xs:attribute name="value" type="xs:string" use="required"/>
     </xs:complexType>
 
-    <xs:simpleType name="securityEnabledType">
+    <xs:simpleType name="onOffType">
         <xs:annotation>
             <xs:documentation>
-                Enumeration for the security interceptor config.
+                <![CDATA[
+                    Enumeration of allowed values for the standard JacORB attributes.
+                ]]>
             </xs:documentation>
         </xs:annotation>
         <xs:restriction base="xs:token">
@@ -308,7 +304,7 @@
     <xs:simpleType name="transactionEnabledType">
         <xs:annotation>
             <xs:documentation>
-                Enumeration for the transaction interceptor config.
+                Enumeration of allowed values for the transaction interceptor config.
             </xs:documentation>
         </xs:annotation>
         <xs:restriction base="xs:token">
@@ -318,4 +314,18 @@
         </xs:restriction>
     </xs:simpleType>
 
+    <xs:simpleType name="sslConfigType">
+        <xs:annotation>
+            <xs:documentation>
+                Enumeration of allowed values for the SSL config.
+            </xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:token">
+            <xs:enumeration value="None"/>
+            <xs:enumeration value="ServerAuth"/>
+            <xs:enumeration value="ClientAuth"/>
+            <xs:enumeration value="MutualAuth"/>
+        </xs:restriction>
+    </xs:simpleType>
+
 </xs:schema>

data/jboss/docs/schema/jboss-as-jca_1_1.xsd

@@ -24,12 +24,12 @@
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
            targetNamespace="urn:jboss:domain:jca:1.1"
            xmlns="urn:jboss:domain:jca:1.1"
-           xmlns:threads="urn:jboss:domain:threads:1.0"
+           xmlns:threads="urn:jboss:domain:threads:1.1"
            elementFormDefault="qualified"
            attributeFormDefault="unqualified"
            version="1.0">
 
-    <xs:import namespace="urn:jboss:domain:threads:1.0" schemaLocation="jboss-as-threads_1_0.xsd"/>
+    <xs:import namespace="urn:jboss:domain:threads:1.1" schemaLocation="jboss-as-threads_1_1.xsd"/>
 
     <xs:element name="subsystem" type="subsystemType"/>
 
@@ -166,20 +166,17 @@
         <xs:annotation>
             <xs:documentation>
             <![CDATA[
-                See threads:bounded-queue-thread-pool.
+                See threads:blocking-bounded-queue-thread-pool.
             ]]>
             </xs:documentation>
         </xs:annotation>
         <xs:all>
-            <xs:element name="core-threads" type="threads:scaled-count" minOccurs="0"/>
-            <xs:element name="queue-length" type="threads:scaled-count"/>
-            <xs:element name="max-threads" type="threads:scaled-count"/>
+            <xs:element name="core-threads" type="threads:countType" minOccurs="0"/>
+            <xs:element name="queue-length" type="threads:countType"/>
+            <xs:element name="max-threads" type="threads:countType"/>
             <xs:element name="keepalive-time" type="threads:time" minOccurs="0"/>
             <xs:element name="thread-factory" type="threads:ref" minOccurs="0"/>
-            <xs:element name="handoff-executor" type="threads:ref" minOccurs="0"/>
-            <xs:element name="properties" type="threads:properties" minOccurs="0"/>
         </xs:all>
         <xs:attribute name="allow-core-timeout" use="optional" type="xs:boolean"/>
-        <xs:attribute name="blocking" use="optional" type="xs:boolean"/>
     </xs:complexType>
 </xs:schema>

data/jboss/docs/schema/jboss-as-jmx_1_1.xsd

@@ -42,7 +42,14 @@
     </xs:complexType>
 
     <xs:complexType name="remotingConnectorRefType">
-
+        <xs:attribute name="use-management-endpoint" type="xs:boolean" default="true" use="optional" >
+            <xs:annotation>
+                <xs:documentation>
+                    If true then this connector will use the management endpoint, otherwise it will use the
+                    remoting subsystem endpoint.
+                </xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
     </xs:complexType>
 
 </xs:schema>

data/jboss/docs/schema/jboss-as-messaging-deployment_1_0.xsd

@@ -0,0 +1,120 @@
+<!--
+  ~ 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.
+  -->
+
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           xmlns="urn:jboss:messaging-deployment:1.0"
+           targetNamespace="urn:jboss:messaging-deployment:1.0"
+           elementFormDefault="qualified"
+           attributeFormDefault="unqualified"
+           version="1.0">
+
+    <xs:element name="messaging-deployment">
+        <xs:annotation>
+            <xs:documentation>
+                <![CDATA[
+                The configuration of a messaging deployment
+            ]]>
+            </xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element maxOccurs="unbounded" minOccurs="0" name="hornetq-server" type="hornetq-serverType"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:complexType name="hornetq-serverType">
+        <xs:annotation>
+            <xs:documentation>
+                <![CDATA[
+                The configuration of entries for a HornetQ server.
+            ]]>
+            </xs:documentation>
+        </xs:annotation>
+        <xs:all>
+            <xs:element maxOccurs="1" minOccurs="0" name="jms-destinations">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element name="jms-queue" maxOccurs="unbounded" minOccurs="0" type="jmsQueueType"/>
+                        <xs:element name="jms-topic" maxOccurs="unbounded" minOccurs="0" type="jmsTopicType"/>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+        </xs:all>
+        <xs:attribute name="name" type="xs:string" use="optional" default="default">
+            <xs:annotation>
+                <xs:documentation>
+                    The name to use for this HornetQ Server. Must correspond to a HornetQ server installed in
+                    the main configuration.
+                </xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+    </xs:complexType>
+
+    <xs:complexType name="entryType">
+        <xs:attribute name="name" type="xs:string" use="required"/>
+    </xs:complexType>
+    <xs:complexType name="jmsQueueType">
+        <xs:sequence>
+            <xs:element name="entry" type="entryType" maxOccurs="unbounded" minOccurs="1"/>
+            <xs:element name="selector" maxOccurs="1" minOccurs="0">
+                <xs:complexType>
+                    <xs:attribute name="string" type="xs:string" use="required"/>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="durable" type="xs:boolean" maxOccurs="1" minOccurs="0"/>
+        </xs:sequence>
+        <xs:attribute name="name" type="xs:string" use="required"/>
+    </xs:complexType>
+
+    <xs:complexType name="jmsTopicType">
+        <xs:sequence>
+            <xs:element name="entry" type="entryType" maxOccurs="unbounded" minOccurs="1"/>
+        </xs:sequence>
+        <xs:attribute name="name" type="xs:string" use="required"/>
+    </xs:complexType>
+
+    <xs:complexType name="transactionType">
+        <xs:attribute name="mode" use="required" type="modeType"/>
+    </xs:complexType>
+
+    <xs:simpleType name="modeType">
+        <xs:restriction base="xs:token">
+            <xs:enumeration value="xa">
+                <xs:annotation>
+                    <xs:documentation></xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="local">
+                <xs:annotation>
+                    <xs:documentation></xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="none">
+                <xs:annotation>
+                    <xs:documentation></xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+        </xs:restriction>
+    </xs:simpleType>
+
+</xs:schema>

data/jboss/docs/schema/jboss-as-messaging_1_1.xsd

@@ -72,6 +72,7 @@
                   </xs:documentation>
               </xs:annotation>
           </xs:element>
+          <xs:element maxOccurs="1" minOccurs="0" name="security-domain" type="xs:string" />
           <xs:element maxOccurs="1" minOccurs="0" name="security-enabled" type="xs:boolean" />
           <xs:element maxOccurs="1" minOccurs="0" name="security-invalidation-interval" type="xs:long" />
           <xs:element maxOccurs="1" minOccurs="0" name="wild-card-routing-enabled" type="xs:boolean" />
@@ -618,6 +619,7 @@
                </xs:sequence>
             </xs:complexType>
          </xs:element>
+         <xs:element name="factory-type" type="connectionFactoryType" minOccurs="0" maxOccurs="1"/>
          <xs:element name="ha" type="xs:boolean" minOccurs="0" maxOccurs="1"/>
          <xs:element name="client-failure-check-period" type="xs:long" maxOccurs="1" minOccurs="0" />
          <xs:element name="connection-ttl" type="xs:long" maxOccurs="1" minOccurs="0" />
@@ -652,6 +654,17 @@
       <xs:attribute name="name" type="xs:string" />
    </xs:complexType>
 
+   <xs:simpleType name="connectionFactoryType">
+      <xs:restriction base="xs:token">
+         <xs:enumeration value="GENERIC"/>
+         <xs:enumeration value="QUEUE"/>
+         <xs:enumeration value="TOPIC"/>
+         <xs:enumeration value="XA_GENERIC"/>
+         <xs:enumeration value="XA_QUEUE"/>
+         <xs:enumeration value="XA_TOPIC"/>
+      </xs:restriction>
+   </xs:simpleType>
+
       <xs:complexType name="pooled-connection-factoryType">
       <xs:all>
          <xs:element name="inbound-config" maxOccurs="1" minOccurs="0">
@@ -716,6 +729,8 @@
          <xs:element name="scheduled-thread-pool-max-size" type="xs:int" maxOccurs="1" minOccurs="0" />
          <xs:element name="thread-pool-max-size" type="xs:int" maxOccurs="1" minOccurs="0" />
          <xs:element name="group-id" type="xs:string" maxOccurs="1" minOccurs="0" />
+         <xs:element name="user" type="xs:string" maxOccurs="1" minOccurs="0" />
+         <xs:element name="password" type="xs:string" maxOccurs="1" minOccurs="0" />
       </xs:all>
       <xs:attribute name="name" type="xs:string" />
    </xs:complexType>

data/jboss/docs/schema/jboss-as-mod-cluster_1_0.xsd

@@ -48,17 +48,38 @@
     </xs:sequence>
 
     <!-- Get the actual advertiseGroupAddress / advertisePort from advertiseSocket -->
-    <xs:attribute name="advertise-socket" />
-    <xs:attribute name="proxy-list" />
-    <xs:attribute name="proxy-url" />
-    <xs:attribute name="advertise" />
-    <xs:attribute name="advertise-security-key" />
+    <xs:attribute name="advertise-socket" type="xs:string" use="optional"/>
+    <xs:attribute name="proxy-list" type="xs:string" use="optional"/>
+    <xs:attribute name="proxy-url" type="xs:string" use="optional"/>
+    <xs:attribute name="advertise" type="xs:boolean" use="optional" default="true"/>
+    <xs:attribute name="advertise-security-key" type="xs:string" use="optional"/>
+    <xs:attribute name="sticky-session-force" type="xs:boolean" use="optional" default="true"/>
+    <xs:attribute name="sticky-session-remove" type="xs:boolean" use="optional" default="false"/>
+    <xs:attribute name="sticky-session" type="xs:boolean" use="optional" default="true"/>
 
     <!-- mod_cluster parameters that describe node behaviour -->
-    <xs:attribute name="excluded-contexts" default="ROOT,admin-console,invoker,jbossws,jmx-console,juddi,web-console" />
-    <xs:attribute name="auto-enable-contexts" default="true" />
-    <xs:attribute name="stop-context-timeout" default="10" />
-    <xs:attribute name="socket-timeout" />
+    <xs:attribute name="excluded-contexts" type="xs:string" use="optional" default="ROOT,invoker,jbossws,juddi,console" />
+    <xs:attribute name="auto-enable-contexts" type="xs:boolean" use="optional" default="true" />
+    <xs:attribute name="stop-context-timeout" type="xs:int" use="optional" default="10">
+      <xs:annotation>
+        <xs:documentation>The amount of time in seconds for which to wait for clean shutdown of a context.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="socket-timeout" type="xs:int" use="optional" default="20">
+      <xs:annotation>
+        <xs:documentation>Number of seconds to wait for a response from an httpd proxy to MCMP commands before timing out, and flagging the proxy as in error.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="node-timeout" type="xs:int" use="optional" default="-1">
+      <xs:annotation>
+        <xs:documentation>Timeout (in seconds) for proxy connections to a node. That is the time mod_cluster will wait for the back-end response before returning error.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="ping" type="xs:int" use="optional" default="10">
+      <xs:annotation>
+        <xs:documentation>Time (in seconds) in which to wait for a pong answer to a ping.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
   </xs:complexType>
 
   <!-- general SSL definitions -->
@@ -73,26 +94,26 @@
         sslTrustMaxCertLength (5: default value only)
       </xs:documentation>
     </xs:annotation>
-    <xs:attribute name="key-alias" default="jboss">
+    <xs:attribute name="key-alias" type="xs:string" use="optional" default="jboss">
       <xs:annotation>
         <xs:documentation>sslKeyAlias The alias of the key holding the client certificates in the key store.</xs:documentation>
       </xs:annotation>
     </xs:attribute>
-    <xs:attribute name="password">
+    <xs:attribute name="password" type="xs:string" use="optional">
       <xs:annotation>
         <xs:documentation>
           sslKeyStorePassword/sslTrustStorePassword Password granting access to the key store and trust store.
         </xs:documentation>
       </xs:annotation>
     </xs:attribute>
-    <xs:attribute name="certificate-key-file" default="${user.home}/.keystore">
+    <xs:attribute name="certificate-key-file" type="xs:string" use="optional" default="${user.home}/.keystore">
       <xs:annotation>
         <xs:documentation>
           sslKeyStore: That is the keystore name here.
         </xs:documentation>
       </xs:annotation>
     </xs:attribute>
-    <xs:attribute name="cipher-suite" default="ALL">
+    <xs:attribute name="cipher-suite" type="xs:string" use="optional" default="ALL">
       <xs:annotation>
         <xs:documentation>
           sslCiphers: comma separated list of encryption ciphers the configuration is allowed to use, that MUST NOT be
@@ -108,14 +129,14 @@
         </xs:documentation>
       </xs:annotation>
     </xs:attribute>
-    <xs:attribute name="ca-certificate-file">
+    <xs:attribute name="ca-certificate-file" type="xs:string" use="optional">
       <xs:annotation>
         <xs:documentation>
           sslTrustStore location of the file containing the trust store.
         </xs:documentation>
       </xs:annotation>
     </xs:attribute>
-    <xs:attribute name="ca-revocation-url">
+    <xs:attribute name="ca-revocation-url" type="xs:string" use="optional">
       <xs:annotation>
         <xs:documentation>
           sslCrlFile A file or URL to get the revocation list.
@@ -136,7 +157,7 @@
 
   <!-- <simple-load-provider load="1"/> -->
   <xs:complexType name="simple-load-providerType">
-    <xs:attribute name="factor" default="1" />
+    <xs:attribute name="factor"  type="xs:int" use="optional" default="1" />
   </xs:complexType>
 
   <!-- Something like.
@@ -151,13 +172,13 @@
       <xs:element name="load-metric" type="load-metricType"/>
       <xs:element name="custom-load-metric" type="custom-load-metricType"/>
     </xs:choice>
-    <xs:attribute name="history" default="9" />
-    <xs:attribute name="decay" default="2"/>
+    <xs:attribute name="history" type="xs:int" use="optional" default="9" />
+    <xs:attribute name="decay" type="xs:int" use="optional" default="2"/>
   </xs:complexType>
 
   <xs:complexType name="common-load-metricType" abstract="true">
-    <xs:attribute name="weight" type="xs:int"/>
-    <xs:attribute name="capacity" type="xs:double"/>
+    <xs:attribute name="weight" type="xs:int" use="optional" default="1"/>
+    <xs:attribute name="capacity" type="xs:double" use="optional" default="1.0"/>
   </xs:complexType>
 
   <xs:complexType name="load-metricType">
@@ -186,8 +207,6 @@
       <xs:enumeration value="send-traffic"/>
       <xs:enumeration value="receive-traffic"/>
       <xs:enumeration value="busyness"/>
-      <xs:enumeration value="connection-pool"/>
-      <!-- TODO add missing ones. -->
     </xs:restriction>
   </xs:simpleType>