You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bval.apache.org by mb...@apache.org on 2018/03/16 22:59:05 UTC
[05/12] bval git commit: correct v2 xmlns uris
correct v2 xmlns uris
Project: http://git-wip-us.apache.org/repos/asf/bval/repo
Commit: http://git-wip-us.apache.org/repos/asf/bval/commit/0bf9b3a7
Tree: http://git-wip-us.apache.org/repos/asf/bval/tree/0bf9b3a7
Diff: http://git-wip-us.apache.org/repos/asf/bval/diff/0bf9b3a7
Branch: refs/heads/bv2
Commit: 0bf9b3a72e07a20c50b29fa1d2e61517ccfe254e
Parents: 8926063
Author: Matt Benson <mb...@apache.org>
Authored: Thu Mar 15 15:59:04 2018 -0500
Committer: Matt Benson <mb...@apache.org>
Committed: Thu Mar 15 15:59:04 2018 -0500
----------------------------------------------------------------------
.../java/org/apache/bval/jsr/xml/ValidationMappingParser.java | 2 +-
.../src/main/java/org/apache/bval/jsr/xml/ValidationParser.java | 2 +-
bval-jsr/src/main/xsd/validation-configuration-2.0.xsd | 4 ++--
bval-jsr/src/main/xsd/validation-mapping-2.0.xsd | 4 ++--
bval-jsr/src/test/resources/sample-validation2.xml | 4 ++--
5 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bval/blob/0bf9b3a7/bval-jsr/src/main/java/org/apache/bval/jsr/xml/ValidationMappingParser.java
----------------------------------------------------------------------
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/xml/ValidationMappingParser.java b/bval-jsr/src/main/java/org/apache/bval/jsr/xml/ValidationMappingParser.java
index 766871f..c7e0f75 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/xml/ValidationMappingParser.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/xml/ValidationMappingParser.java
@@ -47,7 +47,7 @@ public class ValidationMappingParser {
.add(null, "http://jboss.org/xml/ns/javax/validation/mapping", "META-INF/validation-mapping-1.0.xsd")
.add(XmlBuilder.Version.v11.getId(), "http://jboss.org/xml/ns/javax/validation/mapping",
"META-INF/validation-mapping-1.1.xsd")
- .add(XmlBuilder.Version.v20.getId(), "http://xmlns.jcp.org/xml/ns/javax/validation/mapping",
+ .add(XmlBuilder.Version.v20.getId(), "http://xmlns.jcp.org/xml/ns/validation/mapping",
"META-INF/validation-mapping-2.0.xsd")
.build();
http://git-wip-us.apache.org/repos/asf/bval/blob/0bf9b3a7/bval-jsr/src/main/java/org/apache/bval/jsr/xml/ValidationParser.java
----------------------------------------------------------------------
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/xml/ValidationParser.java b/bval-jsr/src/main/java/org/apache/bval/jsr/xml/ValidationParser.java
index a8972e2..6402971 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/xml/ValidationParser.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/xml/ValidationParser.java
@@ -61,7 +61,7 @@ public class ValidationParser {
"META-INF/validation-configuration-1.0.xsd")
.add(XmlBuilder.Version.v11.getId(), "http://jboss.org/xml/ns/javax/validation/configuration",
"META-INF/validation-configuration-1.1.xsd")
- .add(XmlBuilder.Version.v20.getId(), "http://xmlns.jcp.org/xml/ns/javax/validation/configuration",
+ .add(XmlBuilder.Version.v20.getId(), "http://xmlns.jcp.org/xml/ns/validation/configuration",
"META-INF/validation-configuration-2.0.xsd")
.build();
http://git-wip-us.apache.org/repos/asf/bval/blob/0bf9b3a7/bval-jsr/src/main/xsd/validation-configuration-2.0.xsd
----------------------------------------------------------------------
diff --git a/bval-jsr/src/main/xsd/validation-configuration-2.0.xsd b/bval-jsr/src/main/xsd/validation-configuration-2.0.xsd
index 6fd7874..6eaaf30 100644
--- a/bval-jsr/src/main/xsd/validation-configuration-2.0.xsd
+++ b/bval-jsr/src/main/xsd/validation-configuration-2.0.xsd
@@ -19,9 +19,9 @@
-->
<xs:schema attributeFormDefault="unqualified"
elementFormDefault="qualified"
- targetNamespace="http://xmlns.jcp.org/xml/ns/javax/validation/configuration"
+ targetNamespace="http://xmlns.jcp.org/xml/ns/validation/configuration"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:config="http://xmlns.jcp.org/xml/ns/javax/validation/configuration"
+ xmlns:config="http://xmlns.jcp.org/xml/ns/validation/configuration"
version="2.0">
<xs:element name="validation-config" type="config:validation-configType" />
<xs:complexType name="validation-configType">
http://git-wip-us.apache.org/repos/asf/bval/blob/0bf9b3a7/bval-jsr/src/main/xsd/validation-mapping-2.0.xsd
----------------------------------------------------------------------
diff --git a/bval-jsr/src/main/xsd/validation-mapping-2.0.xsd b/bval-jsr/src/main/xsd/validation-mapping-2.0.xsd
index 9d16bf3..418b68b 100644
--- a/bval-jsr/src/main/xsd/validation-mapping-2.0.xsd
+++ b/bval-jsr/src/main/xsd/validation-mapping-2.0.xsd
@@ -19,9 +19,9 @@
-->
<xs:schema attributeFormDefault="unqualified"
elementFormDefault="qualified"
- targetNamespace="http://xmlns.jcp.org/xml/ns/javax/validation/mapping"
+ targetNamespace="http://xmlns.jcp.org/xml/ns/validation/mapping"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:map="http://xmlns.jcp.org/xml/ns/javax/validation/mapping"
+ xmlns:map="http://xmlns.jcp.org/xml/ns/validation/mapping"
version="2.0">
<xs:element name="constraint-mappings" type="map:constraint-mappingsType" />
http://git-wip-us.apache.org/repos/asf/bval/blob/0bf9b3a7/bval-jsr/src/test/resources/sample-validation2.xml
----------------------------------------------------------------------
diff --git a/bval-jsr/src/test/resources/sample-validation2.xml b/bval-jsr/src/test/resources/sample-validation2.xml
index 4758454..f4422e5 100644
--- a/bval-jsr/src/test/resources/sample-validation2.xml
+++ b/bval-jsr/src/test/resources/sample-validation2.xml
@@ -16,10 +16,10 @@
limitations under the License.
-->
<validation-config
- xmlns="http://xmlns.jcp.org/xml/ns/javax/validation/configuration"
+ xmlns="http://xmlns.jcp.org/xml/ns/validation/configuration"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation=
- "http://xmlns.jcp.org/xml/ns/javax/validation/configuration validation-configuration-2.0.xsd"
+ "http://xmlns.jcp.org/xml/ns/validation/configuration validation-configuration-2.0.xsd"
version="2.0">
<default-provider>org.apache.bval.jsr.ApacheValidationProvider</default-provider>
<message-interpolator>org.apache.bval.jsr.xml.TestMessageInterpolator</message-interpolator>