Add nicer namespaces

Author: leonardehrenfried

.gitignore

@@ -8,7 +8,9 @@ dependency-reduced-pom.xml
 buildNumber.properties
 .mvn/timing.properties
 profile
+junkyard/
 .idea
 *.iml
+*.zip
 src/main/resources/xsd/
 *.zip

bindings.xjb

@@ -1,16 +1,18 @@
 <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: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:globalBindings>
+    </jxb:globalBindings>
 	</jxb:bindings>
 
 	<!-- See the script bin/version_updater.sh It updates version in schema locations-->
@@ -20,5 +22,4 @@
 			<jxb:package name="de.vdv.ojp20.model" />
 		</jxb:schemaBindings>
 	</jxb:bindings>
-
 </jxb:bindings>

package-info.java

@@ -0,0 +1,15 @@
+@jakarta.xml.bind.annotation.XmlSchema(
+    namespace = "http://www.siri.org.uk/siri",
+    elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED,
+    xmlns = {
+        @jakarta.xml.bind.annotation.XmlNs(prefix = "ojp", namespaceURI = "http://www.vdv.de/ojp"),
+        @jakarta.xml.bind.annotation.XmlNs(prefix = "ifopt", namespaceURI = "http://www.ifopt.org.uk/ifopt"),
+        @jakarta.xml.bind.annotation.XmlNs(prefix = "acsb", namespaceURI = "http://www.ifopt.org.uk/acsb"),
+        @jakarta.xml.bind.annotation.XmlNs(prefix = "siri", namespaceURI = "http://www.siri.org.uk/siri")
+    }
+)
+package de.vdv.ojp.model;
+
+import jakarta.xml.bind.annotation.XmlNs;
+import jakarta.xml.bind.annotation.XmlNsForm;
+import jakarta.xml.bind.annotation.XmlSchema;

pom.xml

@@ -18,7 +18,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>de.vdv</groupId>
     <artifactId>ojp-java-model</artifactId>
-    <version>2.0.0</version>
+    <version>2.0.1</version>
 
     <name>ojp-java-model</name>
     <description>Generates Java model from OJP xsds using jaxb.</description>
@@ -323,7 +323,26 @@
                     </dependency>
                 </dependencies>
             </plugin>
-
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>3.0.0</version>
+                <executions>
+                    <execution>
+                        <id>copy-package-info</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <target>
+                                <copy file="${project.basedir}/package-info.java"
+                                    todir="${project.build.directory}/generated-sources/xjc/de/vdv/ojp/model" overwrite="true"/>
+                            </target>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -462,7 +481,7 @@
                         <artifactId>maven-surefire-plugin</artifactId>
                         <version>${maven-surefire-plugin.version}</version>
 		</plugin>
-		
+
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>