Skip to content

Commit

Permalink
Revert "[WFLY-12510] Update all usages of wildfly-credential-referenc…
Browse files Browse the repository at this point in the history
…e_1_0.xsd to the new wildfly-credential-reference_1_1.xsd version to allow the WildFly testsuite to pass with the changes for WFCORE-4150"

This reverts commit ea885a1.
  • Loading branch information
jmesnil authored and fjuma committed Apr 21, 2020
1 parent 90ebbec commit d3f9517
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@
<xs:schema targetNamespace="urn:jboss:domain:jgroups:7.0"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:tns="urn:jboss:domain:jgroups:7.0"
xmlns:credential-reference="urn:wildfly:credential-reference:1.1"
xmlns:credential-reference="urn:wildfly:credential-reference:1.0"
elementFormDefault="qualified"
attributeFormDefault="unqualified"
version="7.0">

<xs:import namespace="urn:wildfly:credential-reference:1.1" schemaLocation="wildfly-credential-reference_1_1.xsd"/>
<xs:import namespace="urn:wildfly:credential-reference:1.0" schemaLocation="wildfly-credential-reference_1_0.xsd"/>

<xs:element name="subsystem" type="tns:subsystem">
<xs:annotation>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@

<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
targetNamespace="urn:jboss:domain:datasources:5.0" xmlns="urn:jboss:domain:datasources:5.0"
xmlns:credential-reference="urn:wildfly:credential-reference:1.1"
xmlns:credential-reference="urn:wildfly:credential-reference:1.0"
elementFormDefault="qualified" attributeFormDefault="unqualified">

<xs:import namespace="urn:wildfly:credential-reference:1.1" schemaLocation="wildfly-credential-reference_1_1.xsd"/>
<xs:import namespace="urn:wildfly:credential-reference:1.0" schemaLocation="wildfly-credential-reference_1_0.xsd"/>

<xs:element name="subsystem" type="subsystemType"/>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@

<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
targetNamespace="urn:jboss:domain:resource-adapters:5.0" xmlns="urn:jboss:domain:resource-adapters:5.0"
xmlns:credential-reference="urn:wildfly:credential-reference:1.1"
xmlns:credential-reference="urn:wildfly:credential-reference:1.0"
elementFormDefault="qualified" attributeFormDefault="unqualified">

<xs:import namespace="urn:wildfly:credential-reference:1.1" schemaLocation="wildfly-credential-reference_1_1.xsd"/>
<xs:import namespace="urn:wildfly:credential-reference:1.0" schemaLocation="wildfly-credential-reference_1_0.xsd"/>

<xs:element name="subsystem" type="subsystemType"/>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
~ 2110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="urn:jboss:domain:datasources-agroal:1.0"
xmlns="urn:jboss:domain:datasources-agroal:1.0" xmlns:credential-reference="urn:wildfly:credential-reference:1.1"
xmlns="urn:jboss:domain:datasources-agroal:1.0" xmlns:credential-reference="urn:wildfly:credential-reference:1.0"
elementFormDefault="qualified" version="1.0">

<xs:import namespace="urn:wildfly:credential-reference:1.1" schemaLocation="wildfly-credential-reference_1_1.xsd"/>
<xs:import namespace="urn:wildfly:credential-reference:1.0" schemaLocation="wildfly-credential-reference_1_0.xsd"/>

<xs:element name="subsystem" type="subsystemType"/>

Expand Down
4 changes: 2 additions & 2 deletions mail/src/main/resources/schema/wildfly-mail_3_0.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@

<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns="urn:jboss:domain:mail:3.0"
xmlns:credential-reference="urn:wildfly:credential-reference:1.1"
xmlns:credential-reference="urn:wildfly:credential-reference:1.0"
targetNamespace="urn:jboss:domain:mail:3.0"
elementFormDefault="qualified"
attributeFormDefault="unqualified"
version="1.0">

<xs:import namespace="urn:wildfly:credential-reference:1.1" schemaLocation="wildfly-credential-reference_1_1.xsd"/>
<xs:import namespace="urn:wildfly:credential-reference:1.0" schemaLocation="wildfly-credential-reference_1_0.xsd"/>

<!-- The mail subsystem root element -->
<xs:element name="subsystem" type="mail-subsystemType"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@

<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns="urn:jboss:domain:messaging-activemq:9.0"
xmlns:credential-reference="urn:wildfly:credential-reference:1.1"
xmlns:credential-reference="urn:wildfly:credential-reference:1.0"
targetNamespace="urn:jboss:domain:messaging-activemq:9.0"
elementFormDefault="qualified"
attributeFormDefault="unqualified"
version="9.0">

<xs:import namespace="urn:wildfly:credential-reference:1.1" schemaLocation="wildfly-credential-reference_1_1.xsd"/>
<xs:import namespace="urn:wildfly:credential-reference:1.0" schemaLocation="wildfly-credential-reference_1_0.xsd"/>

<xs:element name="subsystem">
<xs:complexType>
Expand Down

0 comments on commit d3f9517

Please sign in to comment.