Skip to content

Commit

Permalink
Change namespace from old to new urn
Browse files Browse the repository at this point in the history
  • Loading branch information
laurentschoelens committed Oct 10, 2023
1 parent 72cc98f commit 640c4ac
Show file tree
Hide file tree
Showing 42 changed files with 67 additions and 81 deletions.
2 changes: 1 addition & 1 deletion hyperjaxb/ejb/tests/annox/src/main/resources/bindings.xjb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
xmlns:hj="urn:hyperjaxb3.jvnet.org:ejb:schemas:customizations"
xmlns:orm="https://jakarta.ee/xml/ns/persistence/orm"

xmlns:annox="http://annox.dev.java.net"
xmlns:annox="urn:jaxb.jvnet.org:annox"

jaxb:extensionBindingPrefixes="hj orm annox">

Expand Down
6 changes: 3 additions & 3 deletions hyperjaxb/ejb/tests/annox/src/main/resources/schema.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@

xmlns:hj="urn:hyperjaxb3.jvnet.org:ejb:schemas:customizations"

xmlns:annox="http://annox.dev.java.net"
xmlns:hs="http://annox.dev.java.net/org.hibernate.search.annotations"
xmlns:ha="http://annox.dev.java.net/org.hibernate.annotations"
xmlns:annox="urn:jaxb.jvnet.org:annox"
xmlns:hs="urn:jaxb.jvnet.org:annox:org.hibernate.search.annotations"
xmlns:ha="urn:jaxb.jvnet.org:annox:org.hibernate.annotations"

jaxb:extensionBindingPrefixes="hj annox">

Expand Down
2 changes: 1 addition & 1 deletion hyperjaxb/ejb/tests/cu-one/src/main/resources/bindings.xjb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:hj="urn:hyperjaxb3.jvnet.org:ejb:schemas:customizations"
xmlns:orm="https://jakarta.ee/xml/ns/persistence/orm"
xmlns:annox="http://annox.dev.java.net"
xmlns:annox="urn:jaxb.jvnet.org:annox"
jaxb:extensionBindingPrefixes="hj orm annox">

<jaxb:bindings schemaLocation="schema.xsd" node="/xs:schema">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
xmlns:hj="urn:hyperjaxb3.jvnet.org:ejb:schemas:customizations"
xmlns:orm="https://jakarta.ee/xml/ns/persistence/orm"
xmlns:annox="http://annox.dev.java.net"
xmlns:annox="urn:jaxb.jvnet.org:annox"

jaxb:extensionBindingPrefixes="hj orm annox">

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
xmlns:hj="urn:hyperjaxb3.jvnet.org:ejb:schemas:customizations" xmlns:orm="https://jakarta.ee/xml/ns/persistence/orm"
xmlns:annox="http://annox.dev.java.net"
xmlns:annox="urn:jaxb.jvnet.org:annox"
jaxb:extensionBindingPrefixes="hj orm annox" jaxb:version="3.0">
<xs:annotation>
<xs:appinfo>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
xmlns:hj="urn:hyperjaxb3.jvnet.org:ejb:schemas:customizations"
xmlns:orm="https://jakarta.ee/xml/ns/persistence/orm"
xmlns:annox="http://annox.dev.java.net"
xmlns:annox="urn:jaxb.jvnet.org:annox"

jaxb:extensionBindingPrefixes="hj orm annox">

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
xmlns:hj="urn:hyperjaxb3.jvnet.org:ejb:schemas:customizations" xmlns:orm="https://jakarta.ee/xml/ns/persistence/orm"
xmlns:annox="http://annox.dev.java.net"
xmlns:annox="urn:jaxb.jvnet.org:annox"
jaxb:extensionBindingPrefixes="hj orm annox" jaxb:version="3.0">
<xs:annotation>
<xs:appinfo>
Expand Down
4 changes: 2 additions & 2 deletions hyperjaxb/ejb/tests/rim/src/main/resources/binding.xjb
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
jaxb:extensionBindingPrefixes="xjc hj annox"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:annox="http://annox.dev.java.net"
xmlns:hsa="http://annox.dev.java.net/org.hibernate.search.annotations"
xmlns:annox="urn:jaxb.jvnet.org:annox"
xmlns:hsa="urn:jaxb.jvnet.org:annox:org.hibernate.search.annotations"
xmlns:orm="https://jakarta.ee/xml/ns/persistence/orm"
xsi:schemaLocation="http://java.sun.com/xml/ns/jaxb http://java.sun.com/xml/ns/jaxb/bindingschema_2_0.xsd http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd">
>
Expand Down
18 changes: 9 additions & 9 deletions jaxb-annotate-parent/plugin/src/test/resources/schema.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
-->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
xmlns:annox="http://annox.dev.java.net" jaxb:extensionBindingPrefixes="annox"
jaxb:version="2.0">
xmlns:annox="urn:jaxb.jvnet.org:annox" jaxb:extensionBindingPrefixes="annox"
jaxb:version="3.0">

<xs:annotation>
<xs:appinfo>
Expand All @@ -53,7 +53,7 @@
<xs:appinfo>
<annox:annotate>
<A
xmlns="http://annox.dev.java.net/org.jvnet.jaxb.plugin.annotate.tests"
xmlns="urn:jaxb.jvnet.org:annox:org.jvnet.jaxb.plugin.annotate.tests"
booleanField="false" byteField="0" charField="a"
classField="java.lang.String" anotherClassField="org.jvnet.jaxb.plugin.annotate.tests.One" doubleField="1" enumField="ONE"
floatField="2.3" intField="4" longField="5" shortField="6"
Expand Down Expand Up @@ -88,7 +88,7 @@
<annox:annotate>

<A
xmlns="http://annox.dev.java.net/org.jvnet.jaxb.plugin.annotate.tests"
xmlns="urn:jaxb.jvnet.org:annox:org.jvnet.jaxb.plugin.annotate.tests"
booleanField="false" byteField="0" charField="a"
classField="double" doubleField="1"
enumField="ONE" floatField="2.3" intField="4"
Expand Down Expand Up @@ -119,7 +119,7 @@
</annox:annotate>
<annox:annotate target="field">
<A
xmlns="http://annox.dev.java.net/org.jvnet.jaxb.plugin.annotate.tests"
xmlns="urn:jaxb.jvnet.org:annox:org.jvnet.jaxb.plugin.annotate.tests"
booleanField="false" byteField="0" charField="a"
classField="double[]" doubleField="1"
enumField="ONE" floatField="2.3" intField="4"
Expand Down Expand Up @@ -150,7 +150,7 @@
</annox:annotate>
<annox:annotate target="setter">
<A
xmlns="http://annox.dev.java.net/org.jvnet.jaxb.plugin.annotate.tests"
xmlns="urn:jaxb.jvnet.org:annox:org.jvnet.jaxb.plugin.annotate.tests"
booleanField="false" byteField="0" charField="a"
classField="java.lang.String" doubleField="1"
enumField="ONE" floatField="2.3" intField="4"
Expand Down Expand Up @@ -181,7 +181,7 @@
</annox:annotate>
<annox:annotate target="class">
<A
xmlns="http://annox.dev.java.net/org.jvnet.jaxb.plugin.annotate.tests"
xmlns="urn:jaxb.jvnet.org:annox:org.jvnet.jaxb.plugin.annotate.tests"
booleanField="false" byteField="0" charField="a"
classField="java.lang.String" doubleField="1"
enumField="ONE" floatField="2.3" intField="4"
Expand Down Expand Up @@ -222,7 +222,7 @@
<xs:annotation>
<xs:appinfo>
<annox:annotate>
<F xmlns="http://annox.dev.java.net/org.jvnet.jaxb.plugin.annotate.tests" value="enum type" />
<F xmlns="urn:jaxb.jvnet.org:annox:org.jvnet.jaxb.plugin.annotate.tests" value="enum type" />
</annox:annotate>
</xs:appinfo>
</xs:annotation>
Expand All @@ -231,7 +231,7 @@
<xs:annotation>
<xs:appinfo>
<annox:annotate>
<F xmlns="http://annox.dev.java.net/org.jvnet.jaxb.plugin.annotate.tests" value="enum constant" />
<F xmlns="urn:jaxb.jvnet.org:annox:org.jvnet.jaxb.plugin.annotate.tests" value="enum constant" />
</annox:annotate>
</xs:appinfo>
</xs:annotation>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
version="3.0"
xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:annox="http://annox.dev.java.net"
xmlns:annox="urn:jaxb.jvnet.org:annox"

jaxb:extensionBindingPrefixes="annox">

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
jaxb:version="3.0"
xmlns:annox="http://annox.dev.java.net"
xmlns:s="http://annox.dev.java.net/org.hibernate.search.annotations"
xmlns:annox="urn:jaxb.jvnet.org:annox"
xmlns:s="urn:jaxb.jvnet.org:annox:org.hibernate.search.annotations"
jaxb:extensionBindingPrefixes="annox">

<xsd:element name="foo" type="FooType"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:annox="http://annox.dev.java.net"
xmlns:annox="urn:jaxb.jvnet.org:annox"
xsi:schemaLocation="https://jakarta.ee/xml/ns/jaxb https://jakarta.ee/xml/ns/jaxb/bindingschema_3_0.xsd"
jaxb:extensionBindingPrefixes="xjc annox"
version="3.0">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
jaxb:version="3.0"
xmlns:annox="http://annox.dev.java.net"
xmlns:annox="urn:jaxb.jvnet.org:annox"
jaxb:extensionBindingPrefixes="annox"
xmlns:jl="http://annox.dev.java.net/java.lang">
xmlns:jl="urn:jaxb.jvnet.org:annox:java.lang">

<xsd:element name="foo" type="FooType">
<xsd:annotation>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<jaxb:bindings
xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:annox="http://annox.dev.java.net"
xmlns:annox="urn:jaxb.jvnet.org:annox"
jaxb:extensionBindingPrefixes="annox"
jaxb:version="3.0">

Expand Down
18 changes: 9 additions & 9 deletions jaxb-annotate-parent/tests/annox/src/main/resources/schema.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
jaxb:version="3.0"
xmlns:annox="http://annox.dev.java.net"
xmlns:annox="urn:jaxb.jvnet.org:annox"
jaxb:extensionBindingPrefixes="annox"
xmlns:a="http://annox.dev.java.net/org.jvnet.jaxb.plugin.annotate.tests.annotations">
xmlns:a="urn:jaxb.jvnet.org:annox:org.jvnet.jaxb.plugin.annotate.tests.annotations">

<xsd:annotation>
<xsd:appinfo>
Expand Down Expand Up @@ -71,7 +71,7 @@
<xsd:appinfo>
<annox:annotate>
<A
xmlns="http://annox.dev.java.net/org.jvnet.jaxb.plugin.annotate.tests.annotations"
xmlns="urn:jaxb.jvnet.org:annox:org.jvnet.jaxb.plugin.annotate.tests.annotations"
booleanField="false" byteField="0" charField="a"
classField="java.lang.String" anotherClassField="org.jvnet.jaxb2_commons.plugin.annotate.test.annox.schema.One" doubleField="1" enumField="ONE"
floatField="2.3" intField="4" longField="5" shortField="6"
Expand Down Expand Up @@ -106,7 +106,7 @@
<annox:annotate>

<A
xmlns="http://annox.dev.java.net/org.jvnet.jaxb.plugin.annotate.tests.annotations"
xmlns="urn:jaxb.jvnet.org:annox:org.jvnet.jaxb.plugin.annotate.tests.annotations"
booleanField="false" byteField="0" charField="a"
classField="java.lang.String" doubleField="1"
enumField="ONE" floatField="2.3" intField="4"
Expand Down Expand Up @@ -137,7 +137,7 @@
</annox:annotate>
<annox:annotate target="field">
<A
xmlns="http://annox.dev.java.net/org.jvnet.jaxb.plugin.annotate.tests.annotations"
xmlns="urn:jaxb.jvnet.org:annox:org.jvnet.jaxb.plugin.annotate.tests.annotations"
booleanField="false" byteField="0" charField="a"
classField="java.lang.String" doubleField="1"
enumField="ONE" floatField="2.3" intField="4"
Expand Down Expand Up @@ -168,7 +168,7 @@
</annox:annotate>
<annox:annotate target="setter">
<A
xmlns="http://annox.dev.java.net/org.jvnet.jaxb.plugin.annotate.tests.annotations"
xmlns="urn:jaxb.jvnet.org:annox:org.jvnet.jaxb.plugin.annotate.tests.annotations"
booleanField="false" byteField="0" charField="a"
classField="java.lang.String" doubleField="1"
enumField="ONE" floatField="2.3" intField="4"
Expand Down Expand Up @@ -199,7 +199,7 @@
</annox:annotate>
<annox:annotate target="class">
<A
xmlns="http://annox.dev.java.net/org.jvnet.jaxb.plugin.annotate.tests.annotations"
xmlns="urn:jaxb.jvnet.org:annox:org.jvnet.jaxb.plugin.annotate.tests.annotations"
booleanField="false" byteField="0" charField="a"
classField="java.lang.String" doubleField="1"
enumField="ONE" floatField="2.3" intField="4"
Expand Down Expand Up @@ -240,7 +240,7 @@
<xsd:annotation>
<xsd:appinfo>
<annox:annotate>
<F xmlns="http://annox.dev.java.net/org.jvnet.jaxb.plugin.annotate.tests.annotations" value="enum type" />
<F xmlns="urn:jaxb.jvnet.org:annox:org.jvnet.jaxb.plugin.annotate.tests.annotations" value="enum type" />
</annox:annotate>
</xsd:appinfo>
</xsd:annotation>
Expand All @@ -249,7 +249,7 @@
<xsd:annotation>
<xsd:appinfo>
<annox:annotate>
<F xmlns="http://annox.dev.java.net/org.jvnet.jaxb.plugin.annotate.tests.annotations" value="enum constant" />
<F xmlns="urn:jaxb.jvnet.org:annox:org.jvnet.jaxb.plugin.annotate.tests.annotations" value="enum constant" />
</annox:annotate>
</xsd:appinfo>
</xsd:annotation>
Expand Down
14 changes: 0 additions & 14 deletions jaxb-annotate-parent/tests/base-dependent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,10 @@
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>4.0.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-xjc</artifactId>
<version>4.0.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.jvnet.jaxb</groupId>
Expand All @@ -42,18 +40,6 @@
<plugin>
<groupId>org.jvnet.jaxb</groupId>
<artifactId>jaxb-maven-plugin</artifactId>
<dependencies>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>4.0.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-xjc</artifactId>
<version>4.0.4-SNAPSHOT</version>
</dependency>
</dependencies>
<executions>
<execution>
<id>base</id>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:base="ns.base"
xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
xmlns:annox="http://annox.dev.java.net"
xmlns:annox="urn:jaxb.jvnet.org:annox"
targetNamespace="ns.base"
attributeFormDefault="unqualified"
elementFormDefault="unqualified"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
xmlns:dependent="ns.dependent"
xmlns:base="ns.base"
xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
xmlns:annox="http://annox.dev.java.net"
xmlns:annox="urn:jaxb.jvnet.org:annox"
targetNamespace="ns.dependent"
attributeFormDefault="unqualified"
elementFormDefault="unqualified"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<jaxb:bindings
xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:annox="http://annox.dev.java.net"
xmlns:annox="urn:jaxb.jvnet.org:annox"
jaxb:extensionBindingPrefixes="annox"

jaxb:version="3.0">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
targetNamespace="urn:issues:class:annotate:target:package"
elementFormDefault="qualified"
xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
xmlns:annox="http://annox.dev.java.net"
xmlns:annox="urn:jaxb.jvnet.org:annox"

jaxb:extensionBindingPrefixes="annox"
jaxb:version="3.0">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
targetNamespace="urn:issues:class:annotatePackage"
elementFormDefault="qualified"
xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
xmlns:annox="http://annox.dev.java.net"
xmlns:annox="urn:jaxb.jvnet.org:annox"

jaxb:extensionBindingPrefixes="annox"
jaxb:version="3.0">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
targetNamespace="urn:issues:class"
elementFormDefault="qualified"
xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
xmlns:annox="http://annox.dev.java.net"
xmlns:annox="urn:jaxb.jvnet.org:annox"

jaxb:extensionBindingPrefixes="annox"
jaxb:version="3.0">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
targetNamespace="urn:issues:element:annotate:target:package"
elementFormDefault="qualified"
xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
xmlns:annox="http://annox.dev.java.net"
xmlns:annox="urn:jaxb.jvnet.org:annox"

jaxb:extensionBindingPrefixes="annox"
jaxb:version="3.0">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
targetNamespace="urn:issues:element:annotatePackage"
elementFormDefault="qualified"
xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
xmlns:annox="http://annox.dev.java.net"
xmlns:annox="urn:jaxb.jvnet.org:annox"

jaxb:extensionBindingPrefixes="annox"
jaxb:version="3.0">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
targetNamespace="urn:issues:element"
elementFormDefault="qualified"
xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
xmlns:annox="http://annox.dev.java.net"
xmlns:annox="urn:jaxb.jvnet.org:annox"

jaxb:extensionBindingPrefixes="annox"
jaxb:version="3.0">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
targetNamespace="urn:issues:enum:annotate:target:enum-fromValue-method"
elementFormDefault="qualified"
xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
xmlns:annox="http://annox.dev.java.net"
xmlns:annox="urn:jaxb.jvnet.org:annox"

jaxb:extensionBindingPrefixes="annox"
jaxb:version="3.0">
Expand Down
Loading

0 comments on commit 640c4ac

Please sign in to comment.