Skip to content

Commit 22acdcf

Browse files
GunnarAtEgdeGunnarAtEgde
committed
The NeTEx next version
1 parent 5b9a4ba commit 22acdcf

File tree

409 files changed

+53916
-21565
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

409 files changed

+53916
-21565
lines changed

‎bindings.xjb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc" jxb:version="3.0" jxb:extensionBindingPrefixes="xjc">
55

66
<jxb:bindings>
7-
<jxb:globalBindings underscoreBinding="asCharInWord">
7+
<jxb:globalBindings underscoreBinding="asCharInWord" typesafeEnumMaxMembers="5000">
88
<xjc:javaType name="java.time.LocalDateTime" xmlType="xs:dateTime" adapter="org.rutebanken.util.LocalDateTimeISO8601XmlAdapter" />
99
<xjc:javaType name="java.time.LocalTime" xmlType="xs:time" adapter="org.rutebanken.util.LocalTimeISO8601XmlAdapter" />
1010
<xjc:javaType name="java.time.LocalDateTime" xmlType="xs:date" adapter="org.rutebanken.util.LocalDateXmlAdapter" />

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<modelVersion>4.0.0</modelVersion>
1818
<groupId>org.entur</groupId>
1919
<artifactId>netex-java-model</artifactId>
20-
<version>2.0.16-SNAPSHOT</version>
20+
<version>2.0.16-2-SNAPSHOT</version>
2121

2222
<name>netex-java-model</name>
2323
<description>Generates Java model from NeTEx XSDs using JAXB.</description>

‎src/main/resources/xsd/2.0/NX.xsd‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,8 @@
131131
<xsd:element name="organisations" minOccurs="0">
132132
<xsd:complexType>
133133
<xsd:sequence>
134-
<xsd:element ref="Organisation_" minOccurs="0" maxOccurs="unbounded"/>
135-
<xsd:element ref="OrganisationRef_"/>
134+
<xsd:element ref="Organisation_Dummy" minOccurs="0" maxOccurs="unbounded"/>
135+
<xsd:element ref="OrganisationRef_Dummy"/>
136136
</xsd:sequence>
137137
</xsd:complexType>
138138
</xsd:element>
@@ -147,15 +147,15 @@
147147
<xsd:element name="assignments" minOccurs="0">
148148
<xsd:complexType>
149149
<xsd:sequence>
150-
<xsd:element ref="Assignment_"/>
150+
<xsd:element ref="Assignment_Dummy"/>
151151
<xsd:element ref="AssignmentRef"/>
152152
</xsd:sequence>
153153
</xsd:complexType>
154154
</xsd:element>
155155
<xsd:element name="priceableObjects" minOccurs="0">
156156
<xsd:complexType>
157157
<xsd:sequence>
158-
<xsd:element ref="PriceableObject_" maxOccurs="unbounded"/>
158+
<xsd:element ref="PriceableObject_Dummy" maxOccurs="unbounded"/>
159159
<xsd:element ref="PriceableObjectRef"/>
160160
</xsd:sequence>
161161
</xsd:complexType>
@@ -226,7 +226,7 @@
226226
</xsd:element>
227227
<xsd:element name="courseOfJourneys" minOccurs="0">
228228
<xsd:annotation>
229-
<xsd:documentation>COURSE OF JOURNEYs (Runs) in frame.</xsd:documentation>
229+
<xsd:documentation>COURSE OF JOURNEYs (Runs) in frame.</xsd:documentation>
230230
</xsd:annotation>
231231
<xsd:complexType>
232232
<xsd:sequence>
@@ -280,7 +280,7 @@
280280
<xsd:element name="quality" minOccurs="0">
281281
<xsd:complexType>
282282
<xsd:sequence>
283-
<xsd:element ref="QualityStructureFactor_" minOccurs="0" maxOccurs="unbounded"/>
283+
<xsd:element ref="QualityStructureFactor_Dummy" minOccurs="0" maxOccurs="unbounded"/>
284284
</xsd:sequence>
285285
</xsd:complexType>
286286
</xsd:element>
@@ -307,7 +307,7 @@
307307
<xsd:element name="usageParameters" minOccurs="0">
308308
<xsd:complexType>
309309
<xsd:sequence>
310-
<xsd:element ref="UsageParameter_" minOccurs="0" maxOccurs="unbounded"/>
310+
<xsd:element ref="UsageParameter_Dummy" minOccurs="0" maxOccurs="unbounded"/>
311311
<xsd:element ref="UsageParameterPrice" minOccurs="0" maxOccurs="unbounded"/>
312312
<xsd:element ref="TypeOfUsageParameter" minOccurs="0" maxOccurs="unbounded"/>
313313
<xsd:element ref="TypeOfConcession" minOccurs="0"/>
@@ -325,7 +325,7 @@
325325
<xsd:element name="fareProducts" minOccurs="0">
326326
<xsd:complexType>
327327
<xsd:sequence>
328-
<xsd:element ref="FareProduct_" maxOccurs="unbounded"/>
328+
<xsd:element ref="FareProduct_Dummy" maxOccurs="unbounded"/>
329329
<xsd:element ref="ChargingMoment" minOccurs="0" maxOccurs="unbounded"/>
330330
<xsd:element ref="TypeOfFareProduct" minOccurs="0" maxOccurs="unbounded"/>
331331
<xsd:element ref="AccessRightInProduct" minOccurs="0" maxOccurs="unbounded"/>
@@ -381,22 +381,22 @@
381381
<xsd:complexType>
382382
<xsd:sequence>
383383
<xsd:element ref="PriceUnit" minOccurs="0" maxOccurs="unbounded"/>
384-
<xsd:element ref="FarePrice_" minOccurs="0" maxOccurs="unbounded"/>
384+
<xsd:element ref="FarePrice_Dummy" minOccurs="0" maxOccurs="unbounded"/>
385385
</xsd:sequence>
386386
</xsd:complexType>
387387
</xsd:element>
388388
<xsd:element name="priceGroups" minOccurs="0">
389389
<xsd:complexType>
390390
<xsd:sequence>
391-
<xsd:element ref="PriceGroup_"/>
392-
<xsd:element ref="Cell_"/>
391+
<xsd:element ref="PriceGroup_Dummy"/>
392+
<xsd:element ref="Cell_Dummy"/>
393393
</xsd:sequence>
394394
</xsd:complexType>
395395
</xsd:element>
396396
<xsd:element name="priceableObjects" minOccurs="0">
397397
<xsd:complexType>
398398
<xsd:sequence>
399-
<xsd:element ref="PriceableObject_"/>
399+
<xsd:element ref="PriceableObject_Dummy"/>
400400
</xsd:sequence>
401401
</xsd:complexType>
402402
</xsd:element>
@@ -469,7 +469,7 @@
469469
<xsd:element name="routes" minOccurs="0">
470470
<xsd:complexType>
471471
<xsd:sequence>
472-
<xsd:element ref="Route_" minOccurs="0" maxOccurs="unbounded"/>
472+
<xsd:element ref="Route_Dummy" minOccurs="0" maxOccurs="unbounded"/>
473473
<xsd:element ref="RouteLink" minOccurs="0" maxOccurs="unbounded"/>
474474
<xsd:element ref="RoutePoint" minOccurs="0" maxOccurs="unbounded"/>
475475
</xsd:sequence>
@@ -486,7 +486,7 @@
486486
<xsd:complexType>
487487
<xsd:sequence>
488488
<xsd:element ref="GroupOfLines" maxOccurs="unbounded"/>
489-
<xsd:element ref="Line_" maxOccurs="unbounded"/>
489+
<xsd:element ref="Line_Dummy" maxOccurs="unbounded"/>
490490
<xsd:element ref="Direction" maxOccurs="unbounded"/>
491491
</xsd:sequence>
492492
</xsd:complexType>
@@ -538,7 +538,7 @@
538538
<xsd:annotation>
539539
<xsd:documentation>JOURNEY PATTERN.</xsd:documentation>
540540
</xsd:annotation>
541-
<xsd:element ref="JourneyPattern_" maxOccurs="unbounded"/>
541+
<xsd:element ref="JourneyPattern_Dummy" maxOccurs="unbounded"/>
542542
<xsd:element ref="TimingLinkInJourneyPattern" maxOccurs="unbounded"/>
543543
<xsd:element ref="StopPointInJourneyPattern" maxOccurs="unbounded"/>
544544
</xsd:sequence>
@@ -560,7 +560,7 @@
560560
<xsd:element name="journeys" minOccurs="0">
561561
<xsd:complexType>
562562
<xsd:choice maxOccurs="unbounded">
563-
<xsd:element ref="Journey_"/>
563+
<xsd:element ref="Journey_Dummy"/>
564564
<xsd:element ref="JourneyPart" maxOccurs="unbounded"/>
565565
<xsd:element ref="JourneyPartCouple"/>
566566
<xsd:element ref="GroupOfServices" maxOccurs="1"/>
@@ -573,7 +573,7 @@
573573
<xsd:choice maxOccurs="unbounded">
574574
<xsd:element ref="InterchangeRule"/>
575575
<xsd:element ref="JourneyMeeting" maxOccurs="unbounded"/>
576-
<xsd:element ref="Interchange_"/>
576+
<xsd:element ref="Interchange_Dummy"/>
577577
</xsd:choice>
578578
</xsd:complexType>
579579
</xsd:element>

0 commit comments

Comments
 (0)