Skip to content

Commit 1b6f29f

Browse files
marko-bekhtamarko-bekhta
authored
Add Jakarta Validation 3.1 XSDs (#221)
* Add Jakarta Validation 3.1 XSDs * Keep the original Jakarta Bean Validation name for the previous revisions of the spec this partially reverts the changes applied in 8990acd since the spec name remains the same for versions < 3.1
1 parent cac4dff commit 1b6f29f

8 files changed

+417
-12
lines changed

‎src/main/xsd/validation-configuration-1.1.xsd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414

1515
<xs:annotation>
1616
<xs:documentation><![CDATA[
17-
This is the XML Schema for the Jakarta Validation configuration file.
17+
This is the XML Schema for the Jakarta Bean Validation configuration file.
1818
The configuration file must be named "META-INF/validation.xml".
1919
20-
Jakarta Validation configuration files must indicate the Jakarta Validation
20+
Jakarta Bean Validation configuration files must indicate the Jakarta Bean Validation
2121
XML schema by using the validation namespace:
2222
2323
http://jboss.org/xml/ns/javax/validation/configuration

‎src/main/xsd/validation-configuration-2.0.xsd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414

1515
<xs:annotation>
1616
<xs:documentation><![CDATA[
17-
This is the XML Schema for the Jakarta Validation configuration file.
17+
This is the XML Schema for the Jakarta Bean Validation configuration file.
1818
The configuration file must be named "META-INF/validation.xml".
1919
20-
Jakarta Validation configuration files must indicate the Jakarta Validation
20+
Jakarta Bean Validation configuration files must indicate the Jakarta Bean Validation
2121
XML schema by using the validation namespace:
2222
2323
http://xmlns.jcp.org/xml/ns/validation/configuration

‎src/main/xsd/validation-configuration-3.0.xsd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414

1515
<xs:annotation>
1616
<xs:documentation><![CDATA[
17-
This is the XML Schema for the Jakarta Validation configuration file.
17+
This is the XML Schema for the Jakarta Bean Validation configuration file.
1818
The configuration file must be named "META-INF/validation.xml".
1919
20-
Jakarta Validation configuration files must indicate the Jakarta Validation
20+
Jakarta Bean Validation configuration files must indicate the Jakarta Bean Validation
2121
XML schema by using the validation namespace:
2222
2323
https://jakarta.ee/xml/ns/validation/configuration

‎src/main/xsd/validation-configuration-3.1.xsd

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
~ Jakarta Validation API
4+
~
5+
~ License: Apache License, Version 2.0
6+
~ See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
7+
-->
8+
<xs:schema attributeFormDefault="unqualified"
9+
elementFormDefault="qualified"
10+
targetNamespace="https://jakarta.ee/xml/ns/validation/configuration"
11+
xmlns:xs="http://www.w3.org/2001/XMLSchema"
12+
xmlns:config="https://jakarta.ee/xml/ns/validation/configuration"
13+
version="3.1">
14+
15+
<xs:annotation>
16+
<xs:documentation><![CDATA[
17+
This is the XML Schema for the Jakarta Validation configuration file.
18+
The configuration file must be named "META-INF/validation.xml".
19+
20+
Jakarta Validation configuration files must indicate the Jakarta Validation
21+
XML schema by using the validation namespace:
22+
23+
https://jakarta.ee/xml/ns/validation/configuration
24+
25+
and indicate the version of the schema by using the version attribute
26+
as shown below:
27+
28+
<validation-config
29+
xmlns="https://jakarta.ee/xml/ns/validation/configuration"
30+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
31+
xsi:schemaLocation="
32+
https://jakarta.ee/xml/ns/validation/configuration
33+
https://jakarta.ee/xml/ns/validation/validation-configuration-3.1.xsd"
34+
version="3.1">
35+
[...]
36+
</validation-config>
37+
]]>
38+
</xs:documentation>
39+
</xs:annotation>
40+
41+
<xs:element name="validation-config" type="config:validation-configType"/>
42+
<xs:complexType name="validation-configType">
43+
<xs:sequence>
44+
<xs:element type="xs:string" name="default-provider" minOccurs="0"/>
45+
<xs:element type="xs:string" name="message-interpolator" minOccurs="0"/>
46+
<xs:element type="xs:string" name="traversable-resolver" minOccurs="0"/>
47+
<xs:element type="xs:string" name="constraint-validator-factory" minOccurs="0"/>
48+
<xs:element type="xs:string" name="parameter-name-provider" minOccurs="0"/>
49+
<xs:element type="xs:string" name="clock-provider" minOccurs="0"/>
50+
<xs:element type="xs:string" name="value-extractor" maxOccurs="unbounded"
51+
minOccurs="0"/>
52+
<xs:element type="config:executable-validationType" name="executable-validation"
53+
minOccurs="0"/>
54+
<xs:element type="xs:string" name="constraint-mapping" maxOccurs="unbounded"
55+
minOccurs="0"/>
56+
<xs:element type="config:propertyType" name="property" maxOccurs="unbounded"
57+
minOccurs="0"/>
58+
</xs:sequence>
59+
<xs:attribute name="version" type="config:versionType" fixed="3.0" use="required"/>
60+
</xs:complexType>
61+
62+
<xs:complexType name="executable-validationType">
63+
<xs:sequence>
64+
<xs:element type="config:default-validated-executable-typesType"
65+
name="default-validated-executable-types" minOccurs="0"/>
66+
</xs:sequence>
67+
<xs:attribute name="enabled" use="optional" type="xs:boolean" default="true"/>
68+
</xs:complexType>
69+
<xs:complexType name="default-validated-executable-typesType">
70+
<xs:sequence>
71+
<xs:element name="executable-type" maxOccurs="unbounded" minOccurs="1">
72+
<xs:simpleType>
73+
<xs:restriction base="xs:string">
74+
<xs:enumeration value="NONE"/>
75+
<xs:enumeration value="CONSTRUCTORS"/>
76+
<xs:enumeration value="NON_GETTER_METHODS"/>
77+
<xs:enumeration value="GETTER_METHODS"/>
78+
<xs:enumeration value="ALL"/>
79+
</xs:restriction>
80+
</xs:simpleType>
81+
</xs:element>
82+
</xs:sequence>
83+
</xs:complexType>
84+
<xs:complexType name="propertyType">
85+
<xs:simpleContent>
86+
<xs:extension base="xs:string">
87+
<xs:attribute name="name" use="required" type="xs:string"/>
88+
</xs:extension>
89+
</xs:simpleContent>
90+
</xs:complexType>
91+
<xs:simpleType name="versionType">
92+
<xs:restriction base="xs:token">
93+
<xs:pattern value="[0-9]+(\.[0-9]+)*" />
94+
</xs:restriction>
95+
</xs:simpleType>
96+
</xs:schema>

‎src/main/xsd/validation-mapping-1.1.xsd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414

1515
<xs:annotation>
1616
<xs:documentation><![CDATA[
17-
This is the XML Schema for Jakarta Validation constraint mapping files.
17+
This is the XML Schema for Jakarta Bean Validation constraint mapping files.
1818
19-
Jakarta Validation constraint mapping files must indicate the Jakarta Validation
19+
Jakarta Bean Validation constraint mapping files must indicate the Jakarta Bean Validation
2020
XML schema by using the constraint mapping namespace:
2121
2222
http://jboss.org/xml/ns/javax/validation/mapping

‎src/main/xsd/validation-mapping-2.0.xsd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414

1515
<xs:annotation>
1616
<xs:documentation><![CDATA[
17-
This is the XML Schema for Jakarta Validation constraint mapping files.
17+
This is the XML Schema for Jakarta Bean Validation constraint mapping files.
1818
19-
Jakarta Validation constraint mapping files must indicate the Jakarta Validation
19+
Jakarta Bean Validation constraint mapping files must indicate the Jakarta Bean Validation
2020
XML schema by using the constraint mapping namespace:
2121
2222
http://xmlns.jcp.org/xml/ns/validation/mapping

‎src/main/xsd/validation-mapping-3.0.xsd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414

1515
<xs:annotation>
1616
<xs:documentation><![CDATA[
17-
This is the XML Schema for Jakarta Validation constraint mapping files.
17+
This is the XML Schema for Jakarta Bean Validation constraint mapping files.
1818
19-
Jakarta Validation constraint mapping files must indicate the Jakarta Validation
19+
Jakarta Bean Validation constraint mapping files must indicate the Jakarta Bean Validation
2020
XML schema by using the constraint mapping namespace:
2121
2222
https://jakarta.ee/xml/ns/validation/mapping

0 commit comments

Comments
 (0)