Configure SIRI namespace

Author: leonardehrenfried

bindings.xjb

@@ -1,25 +1,32 @@
 <jxb:bindings xmlns:jxb="https://jakarta.ee/xml/ns/jaxb"
-              xmlns:xs="http://www.w3.org/2001/XMLSchema"
-              xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-              xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
-							jxb:version="3.0"
-							jxb:extensionBindingPrefixes="xjc">
+  xmlns:xs="http://www.w3.org/2001/XMLSchema"
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+  xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
+  jxb:version="3.0"
+  jxb:extensionBindingPrefixes="xjc">
 
-	<jxb:bindings>
-		<jxb:globalBindings underscoreBinding="asCharInWord">
-			<xjc:javaType name="java.time.LocalDateTime" xmlType="xs:dateTime" adapter="org.rutebanken.util.LocalDateTimeISO8601XmlAdapter" />
-			<xjc:javaType name="java.time.ZonedDateTime" xmlType="xs:dateTime" adapter="org.rutebanken.util.ZonedDateTimeISO8601XmlAdapter" />
-			<xjc:javaType name="java.time.LocalTime" xmlType="xs:time" adapter="org.rutebanken.util.LocalTimeISO8601XmlAdapter" />
-			<xjc:javaType name="java.time.LocalDateTime" xmlType="xs:date" adapter="org.rutebanken.util.LocalDateXmlAdapter" />
-			<xjc:javaType name="java.time.Duration" xmlType="xs:duration" adapter="org.rutebanken.util.DurationXmlAdapter" />
+  <jxb:bindings>
+    <jxb:globalBindings underscoreBinding="asCharInWord">
+      <xjc:javaType name="java.time.LocalDateTime" xmlType="xs:dateTime" adapter="org.rutebanken.util.LocalDateTimeISO8601XmlAdapter" />
+      <xjc:javaType name="java.time.ZonedDateTime" xmlType="xs:dateTime" adapter="org.rutebanken.util.ZonedDateTimeISO8601XmlAdapter" />
+      <xjc:javaType name="java.time.LocalTime" xmlType="xs:time" adapter="org.rutebanken.util.LocalTimeISO8601XmlAdapter" />
+      <xjc:javaType name="java.time.LocalDateTime" xmlType="xs:date" adapter="org.rutebanken.util.LocalDateXmlAdapter" />
+      <xjc:javaType name="java.time.Duration" xmlType="xs:duration" adapter="org.rutebanken.util.DurationXmlAdapter" />
     </jxb:globalBindings>
-	</jxb:bindings>
+  </jxb:bindings>
 
-	<!-- See the script bin/version_updater.sh It updates version in schema locations-->
+  <!-- See the script bin/version_updater.sh It updates version in schema locations-->
 
-	<jxb:bindings schemaLocation="./src/main/resources/xsd/2.0/OJP.xsd">
-		<jxb:schemaBindings>
-			<jxb:package name="de.vdv.ojp20.model" />
-		</jxb:schemaBindings>
-	</jxb:bindings>
+  <jxb:bindings schemaLocation="./src/main/resources/xsd/2.0/OJP.xsd">
+    <jxb:schemaBindings>
+      <jxb:package name="de.vdv.ojp20" />
+    </jxb:schemaBindings>
+  </jxb:bindings>
+  <!-- the netex-java-model already defines the siri types in uk.org.siri which leads to clashes.
+       therefore we put the generate siri types into a sub-package of de.vdv.ojp -->
+  <jxb:bindings schemaLocation="./src/main/resources/xsd/2.0/siri/xsd/siri_model/siri_all.xsd">
+    <jxb:schemaBindings>
+      <jxb:package name="de.vdv.ojp20.siri" />
+    </jxb:schemaBindings>
+  </jxb:bindings>
 </jxb:bindings>