Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Jakarta Validation 3.1 XSDs (#221) #231

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/xsd/validation-configuration-1.1.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@

<xs:annotation>
<xs:documentation><![CDATA[
This is the XML Schema for the Jakarta Validation configuration file.
This is the XML Schema for the Jakarta Bean Validation configuration file.
The configuration file must be named "META-INF/validation.xml".
Jakarta Validation configuration files must indicate the Jakarta Validation
Jakarta Bean Validation configuration files must indicate the Jakarta Bean Validation
XML schema by using the validation namespace:
http://jboss.org/xml/ns/javax/validation/configuration
Expand Down
4 changes: 2 additions & 2 deletions src/main/xsd/validation-configuration-2.0.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@

<xs:annotation>
<xs:documentation><![CDATA[
This is the XML Schema for the Jakarta Validation configuration file.
This is the XML Schema for the Jakarta Bean Validation configuration file.
The configuration file must be named "META-INF/validation.xml".

Jakarta Validation configuration files must indicate the Jakarta Validation
Jakarta Bean Validation configuration files must indicate the Jakarta Bean Validation
XML schema by using the validation namespace:

http://xmlns.jcp.org/xml/ns/validation/configuration
Expand Down
4 changes: 2 additions & 2 deletions src/main/xsd/validation-configuration-3.0.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@

<xs:annotation>
<xs:documentation><![CDATA[
This is the XML Schema for the Jakarta Validation configuration file.
This is the XML Schema for the Jakarta Bean Validation configuration file.
The configuration file must be named "META-INF/validation.xml".

Jakarta Validation configuration files must indicate the Jakarta Validation
Jakarta Bean Validation configuration files must indicate the Jakarta Bean Validation
XML schema by using the validation namespace:

https://jakarta.ee/xml/ns/validation/configuration
Expand Down
96 changes: 96 additions & 0 deletions src/main/xsd/validation-configuration-3.1.xsd
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Jakarta Validation API
~
~ License: Apache License, Version 2.0
~ See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
-->
<xs:schema attributeFormDefault="unqualified"
elementFormDefault="qualified"
targetNamespace="https://jakarta.ee/xml/ns/validation/configuration"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:config="https://jakarta.ee/xml/ns/validation/configuration"
version="3.1">

<xs:annotation>
<xs:documentation><![CDATA[
This is the XML Schema for the Jakarta Validation configuration file.
The configuration file must be named "META-INF/validation.xml".

Jakarta Validation configuration files must indicate the Jakarta Validation
XML schema by using the validation namespace:

https://jakarta.ee/xml/ns/validation/configuration

and indicate the version of the schema by using the version attribute
as shown below:

<validation-config
xmlns="https://jakarta.ee/xml/ns/validation/configuration"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
https://jakarta.ee/xml/ns/validation/configuration
https://jakarta.ee/xml/ns/validation/validation-configuration-3.1.xsd"
version="3.1">
[...]
</validation-config>
]]>
</xs:documentation>
</xs:annotation>

<xs:element name="validation-config" type="config:validation-configType"/>
<xs:complexType name="validation-configType">
<xs:sequence>
<xs:element type="xs:string" name="default-provider" minOccurs="0"/>
<xs:element type="xs:string" name="message-interpolator" minOccurs="0"/>
<xs:element type="xs:string" name="traversable-resolver" minOccurs="0"/>
<xs:element type="xs:string" name="constraint-validator-factory" minOccurs="0"/>
<xs:element type="xs:string" name="parameter-name-provider" minOccurs="0"/>
<xs:element type="xs:string" name="clock-provider" minOccurs="0"/>
<xs:element type="xs:string" name="value-extractor" maxOccurs="unbounded"
minOccurs="0"/>
<xs:element type="config:executable-validationType" name="executable-validation"
minOccurs="0"/>
<xs:element type="xs:string" name="constraint-mapping" maxOccurs="unbounded"
minOccurs="0"/>
<xs:element type="config:propertyType" name="property" maxOccurs="unbounded"
minOccurs="0"/>
</xs:sequence>
<xs:attribute name="version" type="config:versionType" fixed="3.0" use="required"/>
</xs:complexType>

<xs:complexType name="executable-validationType">
<xs:sequence>
<xs:element type="config:default-validated-executable-typesType"
name="default-validated-executable-types" minOccurs="0"/>
</xs:sequence>
<xs:attribute name="enabled" use="optional" type="xs:boolean" default="true"/>
</xs:complexType>
<xs:complexType name="default-validated-executable-typesType">
<xs:sequence>
<xs:element name="executable-type" maxOccurs="unbounded" minOccurs="1">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:enumeration value="NONE"/>
<xs:enumeration value="CONSTRUCTORS"/>
<xs:enumeration value="NON_GETTER_METHODS"/>
<xs:enumeration value="GETTER_METHODS"/>
<xs:enumeration value="ALL"/>
</xs:restriction>
</xs:simpleType>
</xs:element>
</xs:sequence>
</xs:complexType>
<xs:complexType name="propertyType">
<xs:simpleContent>
<xs:extension base="xs:string">
<xs:attribute name="name" use="required" type="xs:string"/>
</xs:extension>
</xs:simpleContent>
</xs:complexType>
<xs:simpleType name="versionType">
<xs:restriction base="xs:token">
<xs:pattern value="[0-9]+(\.[0-9]+)*" />
</xs:restriction>
</xs:simpleType>
</xs:schema>
4 changes: 2 additions & 2 deletions src/main/xsd/validation-mapping-1.1.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@

<xs:annotation>
<xs:documentation><![CDATA[
This is the XML Schema for Jakarta Validation constraint mapping files.
This is the XML Schema for Jakarta Bean Validation constraint mapping files.

Jakarta Validation constraint mapping files must indicate the Jakarta Validation
Jakarta Bean Validation constraint mapping files must indicate the Jakarta Bean Validation
XML schema by using the constraint mapping namespace:

http://jboss.org/xml/ns/javax/validation/mapping
Expand Down
4 changes: 2 additions & 2 deletions src/main/xsd/validation-mapping-2.0.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@

<xs:annotation>
<xs:documentation><![CDATA[
This is the XML Schema for Jakarta Validation constraint mapping files.
This is the XML Schema for Jakarta Bean Validation constraint mapping files.

Jakarta Validation constraint mapping files must indicate the Jakarta Validation
Jakarta Bean Validation constraint mapping files must indicate the Jakarta Bean Validation
XML schema by using the constraint mapping namespace:

http://xmlns.jcp.org/xml/ns/validation/mapping
Expand Down
4 changes: 2 additions & 2 deletions src/main/xsd/validation-mapping-3.0.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@

<xs:annotation>
<xs:documentation><![CDATA[
This is the XML Schema for Jakarta Validation constraint mapping files.
This is the XML Schema for Jakarta Bean Validation constraint mapping files.

Jakarta Validation constraint mapping files must indicate the Jakarta Validation
Jakarta Bean Validation constraint mapping files must indicate the Jakarta Bean Validation
XML schema by using the constraint mapping namespace:

https://jakarta.ee/xml/ns/validation/mapping
Expand Down
Loading
Loading