Fix issues with web.xml schema

jbossas · Feb 12, 2013 · 1549c3c · 1549c3c
1 parent d9ae7ae
commit 1549c3c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/build/src/main/resources/configuration/subsystems/web.xml b/build/src/main/resources/configuration/subsystems/web.xml
@@ -2,7 +2,7 @@
 <!--  See src/resources/configuration/ReadMe.txt for how the configuration assembly works -->
 <config>
    <extension-module>org.jboss.as.web</extension-module>
-   <subsystem xmlns="urn:jboss:domain:web:1.2" default-virtual-server="default-host" native="false">
+   <subsystem xmlns="urn:jboss:domain:web:1.4" default-virtual-server="default-host" native="false">
        <connector name="http" protocol="HTTP/1.1" scheme="http" socket-binding="http"/>
        <?AJP?>
        <virtual-server name="default-host" enable-welcome-root="true">

diff --git a/build/src/main/resources/docs/schema/jboss-as-web_1_4.xsd b/build/src/main/resources/docs/schema/jboss-as-web_1_4.xsd
@@ -24,11 +24,11 @@
   -->
 
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-           targetNamespace="urn:jboss:domain:web:1.3"
-           xmlns="urn:jboss:domain:web:1.3"
+           targetNamespace="urn:jboss:domain:web:1.4"
+           xmlns="urn:jboss:domain:web:1.4"
            elementFormDefault="qualified"
            attributeFormDefault="unqualified"
-           version="1.3">
+           version="1.4">
 
    <!-- The web subsystem root element -->
    <xs:element name="subsystem" type="web-containerType" />
@@ -46,7 +46,7 @@
          <xs:element minOccurs="0" maxOccurs="1" name="configuration" type="webConfigType" />
          <xs:element maxOccurs="unbounded" ref="connector" />
          <xs:element maxOccurs="unbounded" ref="virtual-server" />
-         <xs:element maxOccurs="unbounded" ref="valve" />
+         <xs:element minOccurs="0" maxOccurs="unbounded" ref="valve" />
       </xs:sequence>
       <xs:attribute name="default-virtual-server"/>
       <xs:attribute name="instance-id"/>
@@ -154,7 +154,7 @@
             <xs:element name="access-log" minOccurs="0" type="http-access-logType" />
             <xs:element name="rewrite" minOccurs="0" type="http-rewriteType" />
             <xs:element name="sso" minOccurs="0" maxOccurs="1" type="ssoType" />
-            <xs:element maxOccurs="unbounded" ref="valve" />
+            <xs:element minOccurs="0" maxOccurs="unbounded" ref="valve" />
          </xs:sequence>
          <xs:attributeGroup ref="virtual-server-attlist" />
       </xs:complexType>