Merge pull request #2 from t2gran/rename_rutebanken

leonardehrenfried · web-flow · commit c975fd3fd0c3 · 2025-05-14T16:44:32.000+02:00
Rename rutebanken to opentripplanner
diff --git a/bindings.xjb b/bindings.xjb
@@ -7,11 +7,11 @@
 
   <jxb:bindings>
     <jxb:globalBindings underscoreBinding="asCharInWord">
-      <xjc:javaType name="org.rutebanken.time.XmlDateTime" xmlType="xs:dateTime" adapter="org.rutebanken.util.XmlDateTimeAdapter" />
-      <!--<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" />
+      <xjc:javaType name="org.opentripplanner.ojp.time.XmlDateTime" xmlType="xs:dateTime" adapter="org.opentripplanner.ojp.util.XmlDateTimeAdapter" />
+      <!--<xjc:javaType name="java.time.ZonedDateTime" xmlType="xs:dateTime" adapter="org.opentripplanner.ojp.util.ZonedDateTimeISO8601XmlAdapter" />-->
+      <xjc:javaType name="java.time.LocalTime" xmlType="xs:time" adapter="org.opentripplanner.ojp.util.LocalTimeISO8601XmlAdapter" />
+      <xjc:javaType name="java.time.LocalDateTime" xmlType="xs:date" adapter="org.opentripplanner.ojp.util.LocalDateXmlAdapter" />
+      <xjc:javaType name="java.time.Duration" xmlType="xs:duration" adapter="org.opentripplanner.ojp.util.DurationXmlAdapter" />
     </jxb:globalBindings>
   </jxb:bindings>
 
diff --git a/pom.xml b/pom.xml
@@ -304,7 +304,7 @@
                                     <extensionArgs>
                                         <extensionArg>-Xbug986</extensionArg>
                                         <extensionArg>-Xfluent-api</extensionArg>
-                                        <extensionArg>-Xts:style:org.rutebanken.netex.OmitNullsToStringStyle.INSTANCE
+                                        <extensionArg>-Xts:style:org.opentripplanner.ojp.netex.OmitNullsToStringStyle.INSTANCE
                                         </extensionArg>
                                     </extensionArgs>
                                 </xsdOption>
diff --git a/src/main/java/org/opentipplanner/ojp/netex/OmitNullsToStringStyle.java b/src/main/java/org/opentipplanner/ojp/netex/OmitNullsToStringStyle.java
@@ -13,7 +13,7 @@
  * limitations under the Licence.
  */
 
-package org.rutebanken.netex;
+package org.opentripplanner.ojp.netex;
 
 import org.apache.commons.lang3.builder.ToStringStyle;
 
diff --git a/src/main/java/org/opentipplanner/ojp/time/XmlDateTime.java b/src/main/java/org/opentipplanner/ojp/time/XmlDateTime.java
@@ -1,4 +1,4 @@
-package org.rutebanken.time;
+package org.opentripplanner.ojp.time;
 
 import java.time.LocalDateTime;
 import java.time.ZoneId;
diff --git a/src/main/java/org/opentipplanner/ojp/util/DurationXmlAdapter.java b/src/main/java/org/opentipplanner/ojp/util/DurationXmlAdapter.java
@@ -1,4 +1,4 @@
-package org.rutebanken.util;
+package org.opentripplanner.ojp.util;
 
 import jakarta.xml.bind.annotation.adapters.XmlAdapter;
 import java.time.Duration;
diff --git a/src/main/java/org/opentipplanner/ojp/util/LocalDateTimeISO8601XmlAdapter.java b/src/main/java/org/opentipplanner/ojp/util/LocalDateTimeISO8601XmlAdapter.java
@@ -13,7 +13,7 @@
  * limitations under the Licence.
  */
 
-package org.rutebanken.util;
+package org.opentripplanner.ojp.util;
 
 import jakarta.xml.bind.annotation.adapters.XmlAdapter;
 import java.time.LocalDateTime;
diff --git a/src/main/java/org/opentipplanner/ojp/util/LocalDateXmlAdapter.java b/src/main/java/org/opentipplanner/ojp/util/LocalDateXmlAdapter.java
@@ -13,7 +13,7 @@
  * limitations under the Licence.
  */
 
-package org.rutebanken.util;
+package org.opentripplanner.ojp.util;
 
 import jakarta.xml.bind.annotation.adapters.XmlAdapter;
 import java.time.LocalDateTime;
diff --git a/src/main/java/org/opentipplanner/ojp/util/LocalTimeISO8601XmlAdapter.java b/src/main/java/org/opentipplanner/ojp/util/LocalTimeISO8601XmlAdapter.java
@@ -13,7 +13,7 @@
  * limitations under the Licence.
  */
 
-package org.rutebanken.util;
+package org.opentripplanner.ojp.util;
 
 import jakarta.xml.bind.annotation.adapters.XmlAdapter;
 import java.time.LocalTime;
diff --git a/src/main/java/org/opentipplanner/ojp/util/XmlDateTimeAdapter.java b/src/main/java/org/opentipplanner/ojp/util/XmlDateTimeAdapter.java
@@ -13,7 +13,7 @@
  * limitations under the Licence.
  */
 
-package org.rutebanken.util;
+package org.opentripplanner.ojp.util;
 
 import jakarta.xml.bind.annotation.adapters.XmlAdapter;
 import java.time.LocalDateTime;
@@ -22,7 +22,7 @@
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeFormatterBuilder;
 import java.time.temporal.ChronoField;
-import org.rutebanken.time.XmlDateTime;
+import org.opentripplanner.ojp.time.XmlDateTime;
 
 public class XmlDateTimeAdapter extends XmlAdapter<String, XmlDateTime> {
 
diff --git a/src/main/java/org/opentipplanner/ojp/util/ZonedDateTimeISO8601XmlAdapter.java b/src/main/java/org/opentipplanner/ojp/util/ZonedDateTimeISO8601XmlAdapter.java
@@ -13,7 +13,7 @@
  * limitations under the Licence.
  */
 
-package org.rutebanken.util;
+package org.opentripplanner.ojp.util;
 
 import jakarta.xml.bind.annotation.adapters.XmlAdapter;
 import java.time.ZonedDateTime;
diff --git a/src/test/java/org/opentripplanner/ojp/util/XmlDateTimeAdapterTest.java b/src/test/java/org/opentripplanner/ojp/util/XmlDateTimeAdapterTest.java
@@ -1,4 +1,4 @@
-package org.rutebanken.util;
+package org.opentripplanner.ojp.util;
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package org.rutebanken.time;`
	`1`	`+package org.opentripplanner.ojp.time;`
`2`	`2`
`3`	`3`	`import java.time.LocalDateTime;`
`4`	`4`	`import java.time.ZoneId;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package org.rutebanken.util;`
	`1`	`+package org.opentripplanner.ojp.util;`
`2`	`2`
`3`	`3`	`import jakarta.xml.bind.annotation.adapters.XmlAdapter;`
`4`	`4`	`import java.time.Duration;`