Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions bindings.xjb
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@

<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.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.LocalDateTime" xmlType="xs:dateTime" adapter="org.rutebanken.netex.util.LocalDateTimeISO8601XmlAdapter" />
<xjc:javaType name="java.time.LocalTime" xmlType="xs:time" adapter="org.rutebanken.netex.util.LocalTimeISO8601XmlAdapter" />
<xjc:javaType name="java.time.LocalDateTime" xmlType="xs:date" adapter="org.rutebanken.netex.util.LocalDateXmlAdapter" />
<xjc:javaType name="java.time.Duration" xmlType="xs:duration" adapter="io.github.threetenjaxb.core.DurationXmlAdapter" />
</jxb:globalBindings>
</jxb:bindings>
Expand Down Expand Up @@ -60,7 +60,7 @@
<jxb:bindings
schemaLocation="./src/main/resources/xsd/1.16/netex_framework/netex_responsibility/netex_version_support.xsd">
<jxb:bindings node="//xsd:simpleType[@name = 'VersionIdType']">
<xjc:javaType name="java.lang.String" adapter="org.rutebanken.util.VersionXmlAdapter" />
<xjc:javaType name="java.lang.String" adapter="org.rutebanken.netex.util.VersionXmlAdapter" />
</jxb:bindings>
<jxb:bindings node="//xsd:attributeGroup[@name = 'BasicModificationDetailsGroup']/xsd:attribute[@name = 'status']">
<jxb:property name="status_BasicModificationDetailsGroup" />
Expand Down
1 change: 0 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -637,7 +637,6 @@
<configuration>
<archive>
<manifestEntries>
<Automatic-Module-Name>org.entur.netex.java.model</Automatic-Module-Name>
<Last-Commit-Id>${git.commit.id}</Last-Commit-Id>
<Last-Commit-Time>${git.commit.time}</Last-Commit-Time>
</manifestEntries>
Expand Down
19 changes: 19 additions & 0 deletions src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
module org.entur.netex.java.model {
requires transitive jakarta.xml.bind;
requires transitive java.xml;
requires transitive org.apache.commons.lang3;
requires io.github.threetenjaxb.core;
requires org.slf4j;

exports org.rutebanken.netex;
exports org.rutebanken.netex.client;
exports org.rutebanken.netex.validation;
exports org.rutebanken.netex.model;
exports org.rutebanken.netex.util;
exports net.opengis.gml._3;
exports uk.org.siri.siri;

opens org.rutebanken.netex.model to jakarta.xml.bind, org.glassfish.jaxb.runtime, org.apache.commons.lang3;
opens net.opengis.gml._3 to jakarta.xml.bind, org.glassfish.jaxb.runtime, org.apache.commons.lang3;
opens uk.org.siri.siri to jakarta.xml.bind, org.glassfish.jaxb.runtime, org.apache.commons.lang3;
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* limitations under the Licence.
*/

package org.rutebanken.util;
package org.rutebanken.netex.util;

import jakarta.xml.bind.annotation.adapters.XmlAdapter;
import java.time.LocalDateTime;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* limitations under the Licence.
*/

package org.rutebanken.util;
package org.rutebanken.netex.util;

import jakarta.xml.bind.annotation.adapters.XmlAdapter;
import java.time.LocalDateTime;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* limitations under the Licence.
*/

package org.rutebanken.util;
package org.rutebanken.netex.util;

import jakarta.xml.bind.annotation.adapters.XmlAdapter;
import java.time.LocalTime;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* limitations under the Licence.
*/

package org.rutebanken.util;
package org.rutebanken.netex.util;

import jakarta.xml.bind.annotation.adapters.XmlAdapter;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.rutebanken.util;
package org.rutebanken.netex.util;

import org.junit.jupiter.api.Test;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.rutebanken.util;
package org.rutebanken.netex.util;

import java.util.List;
import java.util.stream.Collectors;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* limitations under the Licence.
*/

package org.rutebanken.util;
package org.rutebanken.netex.util;

import org.junit.jupiter.api.Test;

Expand Down
Loading