Rename package 'onebusaway' to 'onebusaway'. Moving files and renamin…

…g package is done in 2 commits to preserve git history. (Refactor OTP to have new OTP classes to replace the OBA GTFS classes #2494)
opentripplanner · Sep 12, 2017 · d04ac42 · d04ac42
1 parent d8f3e7d
commit d04ac42
Show file tree

Hide file tree

Showing 254 changed files with 705 additions and 705 deletions.
diff --git a/src/main/java/org/onebusaway2/gtfs/impl/GenericDaoImpl.java b/src/main/java/org/onebusaway2/gtfs/impl/GenericDaoImpl.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onebusaway.gtfs.impl;
+package org.onebusaway2.gtfs.impl;
 
 import java.io.Serializable;
 import java.lang.reflect.Field;
@@ -23,8 +23,8 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.onebusaway.gtfs.model.IdentityBean;
-import org.onebusaway.gtfs.services.GenericMutableDao;
+import org.onebusaway2.gtfs.model.IdentityBean;
+import org.onebusaway2.gtfs.services.GenericMutableDao;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/src/main/java/org/onebusaway2/gtfs/impl/GenericMutableDaoWrapper.java b/src/main/java/org/onebusaway2/gtfs/impl/GenericMutableDaoWrapper.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onebusaway.gtfs.impl;
+package org.onebusaway2.gtfs.impl;
 
 import java.io.Serializable;
 import java.util.Collection;
 
-import org.onebusaway.gtfs.model.IdentityBean;
-import org.onebusaway.gtfs.services.GenericMutableDao;
+import org.onebusaway2.gtfs.model.IdentityBean;
+import org.onebusaway2.gtfs.services.GenericMutableDao;
 
 /**
  * Support class that provides an implementation of {@link GenericMutableDao}

diff --git a/src/main/java/org/onebusaway2/gtfs/impl/GtfsDaoImpl.java b/src/main/java/org/onebusaway2/gtfs/impl/GtfsDaoImpl.java
@@ -13,31 +13,31 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onebusaway.gtfs.impl;
+package org.onebusaway2.gtfs.impl;
 
 import java.io.Serializable;
 import java.util.Collection;
 import java.util.Map;
 
-import org.onebusaway.gtfs.model.Agency;
-import org.onebusaway.gtfs.model.AgencyAndId;
-import org.onebusaway.gtfs.model.FareAttribute;
-import org.onebusaway.gtfs.model.FareRule;
-import org.onebusaway.gtfs.model.FeedInfo;
-import org.onebusaway.gtfs.model.Frequency;
-import org.onebusaway.gtfs.model.IdentityBean;
-import org.onebusaway.gtfs.model.Pathway;
-import org.onebusaway.gtfs.model.Route;
-import org.onebusaway.gtfs.model.ServiceCalendar;
-import org.onebusaway.gtfs.model.ServiceCalendarDate;
-import org.onebusaway.gtfs.model.ShapePoint;
-import org.onebusaway.gtfs.model.Stop;
-import org.onebusaway.gtfs.model.StopTime;
-import org.onebusaway.gtfs.model.Transfer;
-import org.onebusaway.gtfs.model.Trip;
-import org.onebusaway.gtfs.services.GenericMutableDao;
-import org.onebusaway.gtfs.services.GtfsDao;
-import org.onebusaway.gtfs.services.GtfsMutableDao;
+import org.onebusaway2.gtfs.model.Agency;
+import org.onebusaway2.gtfs.model.AgencyAndId;
+import org.onebusaway2.gtfs.model.FareAttribute;
+import org.onebusaway2.gtfs.model.FareRule;
+import org.onebusaway2.gtfs.model.FeedInfo;
+import org.onebusaway2.gtfs.model.Frequency;
+import org.onebusaway2.gtfs.model.IdentityBean;
+import org.onebusaway2.gtfs.model.Pathway;
+import org.onebusaway2.gtfs.model.Route;
+import org.onebusaway2.gtfs.model.ServiceCalendar;
+import org.onebusaway2.gtfs.model.ServiceCalendarDate;
+import org.onebusaway2.gtfs.model.ShapePoint;
+import org.onebusaway2.gtfs.model.Stop;
+import org.onebusaway2.gtfs.model.StopTime;
+import org.onebusaway2.gtfs.model.Transfer;
+import org.onebusaway2.gtfs.model.Trip;
+import org.onebusaway2.gtfs.services.GenericMutableDao;
+import org.onebusaway2.gtfs.services.GtfsDao;
+import org.onebusaway2.gtfs.services.GtfsMutableDao;
 
 public class GtfsDaoImpl extends GenericDaoImpl implements GtfsMutableDao {
 

diff --git a/src/main/java/org/onebusaway2/gtfs/impl/GtfsRelationalDaoImpl.java b/src/main/java/org/onebusaway2/gtfs/impl/GtfsRelationalDaoImpl.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onebusaway.gtfs.impl;
+package org.onebusaway2.gtfs.impl;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -29,19 +29,19 @@
 import org.onebusaway.csv_entities.exceptions.EntityInstantiationException;
 import org.onebusaway.csv_entities.schema.BeanWrapper;
 import org.onebusaway.csv_entities.schema.BeanWrapperFactory;
-import org.onebusaway.gtfs.model.Agency;
-import org.onebusaway.gtfs.model.AgencyAndId;
-import org.onebusaway.gtfs.model.FareAttribute;
-import org.onebusaway.gtfs.model.FareRule;
-import org.onebusaway.gtfs.model.Frequency;
-import org.onebusaway.gtfs.model.Route;
-import org.onebusaway.gtfs.model.ServiceCalendar;
-import org.onebusaway.gtfs.model.ServiceCalendarDate;
-import org.onebusaway.gtfs.model.ShapePoint;
-import org.onebusaway.gtfs.model.Stop;
-import org.onebusaway.gtfs.model.StopTime;
-import org.onebusaway.gtfs.model.Trip;
-import org.onebusaway.gtfs.services.GtfsMutableRelationalDao;
+import org.onebusaway2.gtfs.model.Agency;
+import org.onebusaway2.gtfs.model.AgencyAndId;
+import org.onebusaway2.gtfs.model.FareAttribute;
+import org.onebusaway2.gtfs.model.FareRule;
+import org.onebusaway2.gtfs.model.Frequency;
+import org.onebusaway2.gtfs.model.Route;
+import org.onebusaway2.gtfs.model.ServiceCalendar;
+import org.onebusaway2.gtfs.model.ServiceCalendarDate;
+import org.onebusaway2.gtfs.model.ShapePoint;
+import org.onebusaway2.gtfs.model.Stop;
+import org.onebusaway2.gtfs.model.StopTime;
+import org.onebusaway2.gtfs.model.Trip;
+import org.onebusaway2.gtfs.services.GtfsMutableRelationalDao;
 
 /**
  * A in-memory implementation of GtfsRelationalDaoImpl. It's super fast for most

diff --git a/src/main/java/org/onebusaway2/gtfs/impl/MultipleCalendarsForServiceIdException.java b/src/main/java/org/onebusaway2/gtfs/impl/MultipleCalendarsForServiceIdException.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onebusaway.gtfs.impl;
+package org.onebusaway2.gtfs.impl;
 
 import org.onebusaway.csv_entities.exceptions.CsvEntityException;
-import org.onebusaway.gtfs.model.AgencyAndId;
-import org.onebusaway.gtfs.model.ServiceCalendar;
+import org.onebusaway2.gtfs.model.AgencyAndId;
+import org.onebusaway2.gtfs.model.ServiceCalendar;
 
 /**
  * Indicates that multiple {@link ServiceCalendar} entities, as loaded from

diff --git a/src/main/java/org/onebusaway2/gtfs/impl/ShapePointArray.java b/src/main/java/org/onebusaway2/gtfs/impl/ShapePointArray.java
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onebusaway.gtfs.impl;
+package org.onebusaway2.gtfs.impl;
 
 import java.util.AbstractList;
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 import java.util.NoSuchElementException;
 
-import org.onebusaway.gtfs.model.AgencyAndId;
-import org.onebusaway.gtfs.model.ShapePoint;
-import org.onebusaway.gtfs.model.ShapePointProxy;
+import org.onebusaway2.gtfs.model.AgencyAndId;
+import org.onebusaway2.gtfs.model.ShapePoint;
+import org.onebusaway2.gtfs.model.ShapePointProxy;
 
 public class ShapePointArray extends AbstractList<ShapePoint> {
 

diff --git a/src/main/java/org/onebusaway2/gtfs/impl/StopTimeArray.java b/src/main/java/org/onebusaway2/gtfs/impl/StopTimeArray.java
@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onebusaway.gtfs.impl;
+package org.onebusaway2.gtfs.impl;
 
 import java.util.AbstractList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 
-import org.onebusaway.gtfs.model.Stop;
-import org.onebusaway.gtfs.model.StopTime;
-import org.onebusaway.gtfs.model.StopTimeProxy;
-import org.onebusaway.gtfs.model.Trip;
+import org.onebusaway2.gtfs.model.Stop;
+import org.onebusaway2.gtfs.model.StopTime;
+import org.onebusaway2.gtfs.model.StopTimeProxy;
+import org.onebusaway2.gtfs.model.Trip;
 
 public class StopTimeArray extends AbstractList<StopTime> {
 

diff --git a/src/main/java/org/onebusaway2/gtfs/impl/calendar/CalendarServiceDataFactoryImpl.java b/src/main/java/org/onebusaway2/gtfs/impl/calendar/CalendarServiceDataFactoryImpl.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onebusaway.gtfs.impl.calendar;
+package org.onebusaway2.gtfs.impl.calendar;
 
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -26,16 +26,16 @@
 import java.util.Set;
 import java.util.TimeZone;
 
-import org.onebusaway.gtfs.model.Agency;
-import org.onebusaway.gtfs.model.AgencyAndId;
-import org.onebusaway.gtfs.model.ServiceCalendar;
-import org.onebusaway.gtfs.model.ServiceCalendarDate;
-import org.onebusaway.gtfs.model.calendar.CalendarServiceData;
-import org.onebusaway.gtfs.model.calendar.LocalizedServiceId;
-import org.onebusaway.gtfs.model.calendar.ServiceDate;
-import org.onebusaway.gtfs.services.GtfsRelationalDao;
-import org.onebusaway.gtfs.services.calendar.CalendarService;
-import org.onebusaway.gtfs.services.calendar.CalendarServiceDataFactory;
+import org.onebusaway2.gtfs.model.Agency;
+import org.onebusaway2.gtfs.model.AgencyAndId;
+import org.onebusaway2.gtfs.model.ServiceCalendar;
+import org.onebusaway2.gtfs.model.ServiceCalendarDate;
+import org.onebusaway2.gtfs.model.calendar.CalendarServiceData;
+import org.onebusaway2.gtfs.model.calendar.LocalizedServiceId;
+import org.onebusaway2.gtfs.model.calendar.ServiceDate;
+import org.onebusaway2.gtfs.services.GtfsRelationalDao;
+import org.onebusaway2.gtfs.services.calendar.CalendarService;
+import org.onebusaway2.gtfs.services.calendar.CalendarServiceDataFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/src/main/java/org/onebusaway2/gtfs/impl/calendar/CalendarServiceImpl.java b/src/main/java/org/onebusaway2/gtfs/impl/calendar/CalendarServiceImpl.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onebusaway.gtfs.impl.calendar;
+package org.onebusaway2.gtfs.impl.calendar;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -26,14 +26,14 @@
 import java.util.Set;
 import java.util.TimeZone;
 
-import org.onebusaway.gtfs.model.AgencyAndId;
-import org.onebusaway.gtfs.model.calendar.CalendarServiceData;
-import org.onebusaway.gtfs.model.calendar.LocalizedServiceId;
-import org.onebusaway.gtfs.model.calendar.ServiceDate;
-import org.onebusaway.gtfs.model.calendar.ServiceIdIntervals;
-import org.onebusaway.gtfs.model.calendar.ServiceInterval;
-import org.onebusaway.gtfs.services.calendar.CalendarService;
-import org.onebusaway.gtfs.services.calendar.CalendarServiceDataFactory;
+import org.onebusaway2.gtfs.model.AgencyAndId;
+import org.onebusaway2.gtfs.model.calendar.CalendarServiceData;
+import org.onebusaway2.gtfs.model.calendar.LocalizedServiceId;
+import org.onebusaway2.gtfs.model.calendar.ServiceDate;
+import org.onebusaway2.gtfs.model.calendar.ServiceIdIntervals;
+import org.onebusaway2.gtfs.model.calendar.ServiceInterval;
+import org.onebusaway2.gtfs.services.calendar.CalendarService;
+import org.onebusaway2.gtfs.services.calendar.CalendarServiceDataFactory;
 
 /**
  * An implementation of {@link CalendarService}. Requires a pre-computed

diff --git a/src/main/java/org/onebusaway2/gtfs/impl/calendar/ServiceIdOp.java b/src/main/java/org/onebusaway2/gtfs/impl/calendar/ServiceIdOp.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onebusaway.gtfs.impl.calendar;
+package org.onebusaway2.gtfs.impl.calendar;
 
 import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
 
-import org.onebusaway.gtfs.model.calendar.ServiceInterval;
+import org.onebusaway2.gtfs.model.calendar.ServiceInterval;
 
 public abstract class ServiceIdOp implements Comparator<Date> {
 

diff --git a/src/main/java/org/onebusaway2/gtfs/impl/calendar/UnknownAgencyTimezoneException.java b/src/main/java/org/onebusaway2/gtfs/impl/calendar/UnknownAgencyTimezoneException.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onebusaway.gtfs.impl.calendar;
+package org.onebusaway2.gtfs.impl.calendar;
 
 import java.util.TimeZone;
 
 import org.onebusaway.csv_entities.exceptions.CsvEntityException;
-import org.onebusaway.gtfs.model.Agency;
+import org.onebusaway2.gtfs.model.Agency;
 
 /**
  * Indicates that the {@link Agency#getTimezone()} string does not evaluate to a

diff --git a/src/main/java/org/onebusaway2/gtfs/model/Agency.java b/src/main/java/org/onebusaway2/gtfs/model/Agency.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onebusaway.gtfs.model;
+package org.onebusaway2.gtfs.model;
 
 import org.onebusaway.csv_entities.schema.annotations.CsvField;
 import org.onebusaway.csv_entities.schema.annotations.CsvFields;
-import org.onebusaway.gtfs.serialization.mappings.AgencyIdTranslationFieldMappingFactory;
+import org.onebusaway2.gtfs.serialization.mappings.AgencyIdTranslationFieldMappingFactory;
 
 @CsvFields(filename = "agency.txt", prefix = "agency_")
 public final class Agency extends IdentityBean<String> {

diff --git a/src/main/java/org/onebusaway2/gtfs/model/AgencyAndId.java b/src/main/java/org/onebusaway2/gtfs/model/AgencyAndId.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onebusaway.gtfs.model;
+package org.onebusaway2.gtfs.model;
 
 import java.io.Serializable;
 

diff --git a/src/main/java/org/onebusaway2/gtfs/model/AgencyAndIdInstance.java b/src/main/java/org/onebusaway2/gtfs/model/AgencyAndIdInstance.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onebusaway.gtfs.model;
+package org.onebusaway2.gtfs.model;
 
 import java.io.Serializable;
 
-import org.onebusaway.gtfs.model.calendar.ServiceDate;
+import org.onebusaway2.gtfs.model.calendar.ServiceDate;
 
 /**
  * An identifier class that combines a {@link AgencyAndId} id with a service

diff --git a/src/main/java/org/onebusaway2/gtfs/model/FareAttribute.java b/src/main/java/org/onebusaway2/gtfs/model/FareAttribute.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onebusaway.gtfs.model;
+package org.onebusaway2.gtfs.model;
 
 import org.onebusaway.csv_entities.schema.annotations.CsvField;
 import org.onebusaway.csv_entities.schema.annotations.CsvFields;
-import org.onebusaway.gtfs.serialization.mappings.DefaultAgencyIdFieldMappingFactory;
+import org.onebusaway2.gtfs.serialization.mappings.DefaultAgencyIdFieldMappingFactory;
 
 @CsvFields(filename = "fare_attributes.txt", required = false)
 public final class FareAttribute extends IdentityBean<AgencyAndId> {

diff --git a/src/main/java/org/onebusaway2/gtfs/model/FareRule.java b/src/main/java/org/onebusaway2/gtfs/model/FareRule.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onebusaway.gtfs.model;
+package org.onebusaway2.gtfs.model;
 
 import org.onebusaway.csv_entities.schema.annotations.CsvField;
 import org.onebusaway.csv_entities.schema.annotations.CsvFields;
-import org.onebusaway.gtfs.serialization.mappings.EntityFieldMappingFactory;
+import org.onebusaway2.gtfs.serialization.mappings.EntityFieldMappingFactory;
 
 @CsvFields(filename = "fare_rules.txt", required = false)
 public final class FareRule extends IdentityBean<Integer> {

diff --git a/src/main/java/org/onebusaway2/gtfs/model/FeedInfo.java b/src/main/java/org/onebusaway2/gtfs/model/FeedInfo.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onebusaway.gtfs.model;
+package org.onebusaway2.gtfs.model;
 
 import org.onebusaway.csv_entities.schema.annotations.CsvField;
 import org.onebusaway.csv_entities.schema.annotations.CsvFields;
-import org.onebusaway.gtfs.model.calendar.ServiceDate;
-import org.onebusaway.gtfs.serialization.mappings.ServiceDateFieldMappingFactory;
+import org.onebusaway2.gtfs.model.calendar.ServiceDate;
+import org.onebusaway2.gtfs.serialization.mappings.ServiceDateFieldMappingFactory;
 
 @CsvFields(filename = "feed_info.txt", required = false, prefix = "feed_")
 public final class FeedInfo extends IdentityBean<Integer> {

diff --git a/src/main/java/org/onebusaway2/gtfs/model/Frequency.java b/src/main/java/org/onebusaway2/gtfs/model/Frequency.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onebusaway.gtfs.model;
+package org.onebusaway2.gtfs.model;
 
 import org.onebusaway.csv_entities.schema.annotations.CsvField;
 import org.onebusaway.csv_entities.schema.annotations.CsvFields;
-import org.onebusaway.gtfs.serialization.mappings.EntityFieldMappingFactory;
-import org.onebusaway.gtfs.serialization.mappings.StopTimeFieldMappingFactory;
+import org.onebusaway2.gtfs.serialization.mappings.EntityFieldMappingFactory;
+import org.onebusaway2.gtfs.serialization.mappings.StopTimeFieldMappingFactory;
 
 @CsvFields(filename = "frequencies.txt", required = false)
 public final class Frequency extends IdentityBean<Integer> {

diff --git a/src/main/java/org/onebusaway2/gtfs/model/IdentityBean.java b/src/main/java/org/onebusaway2/gtfs/model/IdentityBean.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onebusaway.gtfs.model;
+package org.onebusaway2.gtfs.model;
 
 import java.io.Serializable;
 import java.util.HashMap;