From 5c330f543394ac3aca498d57be1895c75a764544 Mon Sep 17 00:00:00 2001 From: Sean Barbeau Date: Fri, 13 Apr 2018 17:41:15 -0400 Subject: [PATCH 1/5] More WIP for About menu --- gtfs-realtime-validator-lib/pom.xml | 46 +++++++++++ .../usf/cutr/gtfsrtvalidator/VersionUtil.java | 33 ++++++++ .../usf/cutr/gtfsrtvalidator/lib/Main.java | 2 +- .../lib/batch/BatchProcessor.java | 2 +- .../lib/model/ErrorMessageModel.java | 2 +- .../lib/model/GtfsFeedIterationModel.java | 2 +- .../lib/model/GtfsFeedModel.java | 2 +- .../lib/model/GtfsRtFeedIterationModel.java | 2 +- .../lib/model/GtfsRtFeedIterationString.java | 2 +- .../lib/model/GtfsRtFeedModel.java | 2 +- .../lib/model/MessageLogModel.java | 2 +- .../lib/model/OccurrenceModel.java | 2 +- .../lib/model/SessionModel.java | 2 +- .../lib/model/ValidationRule.java | 2 +- .../lib/model/VersionModel.java | 80 +++++++++++++++++++ .../lib/model/ViewErrorLogModel.java | 2 +- .../lib/model/ViewErrorSummaryModel.java | 2 +- .../lib/model/ViewFeedIterationsCount.java | 2 +- .../lib/model/ViewFeedMessageModel.java | 2 +- .../model/ViewFeedUniqueResponseCount.java | 2 +- .../lib/model/ViewGtfsErrorCountModel.java | 2 +- .../model/ViewGtfsRtFeedErrorCountModel.java | 2 +- .../lib/model/ViewIterationErrorsModel.java | 2 +- .../lib/model/ViewMessageDetailsModel.java | 2 +- .../CombinedIterationMessageModel.java | 2 +- .../CombinedMessageOccurrenceModel.java | 2 +- .../model/helper/ErrorListHelperModel.java | 2 +- .../helper/IterationErrorListHelperModel.java | 2 +- .../lib/model/helper/MergeMonitorData.java | 2 +- .../gtfsrtvalidator/lib/util/GtfsUtils.java | 2 +- .../gtfsrtvalidator/lib/util/RuleUtils.java | 2 +- .../gtfsrtvalidator/lib/util/SortUtils.java | 2 +- .../lib/util/TimestampUtils.java | 2 +- .../lib/validation/GtfsMetadata.java | 2 +- .../lib/validation/IterationStatistics.java | 2 +- .../lib/validation/ValidationRules.java | 2 +- .../gtfs/StopLocationTypeValidator.java | 2 +- .../interfaces/FeedEntityValidator.java | 2 +- .../interfaces/GtfsFeedValidator.java | 2 +- .../rules/CrossFeedDescriptorValidator.java | 2 +- .../rules/FrequencyTypeOneValidator.java | 2 +- .../rules/FrequencyTypeZeroValidator.java | 2 +- .../lib/validation/rules/HeaderValidator.java | 2 +- .../rules/StopTimeUpdateValidator.java | 2 +- .../lib/validation/rules/StopValidator.java | 2 +- .../validation/rules/TimestampValidator.java | 2 +- .../rules/TripDescriptorValidator.java | 2 +- .../validation/rules/VehicleValidator.java | 2 +- .../gtfsrtvalidator/lib/test/BatchTest.java | 2 +- .../lib/test/FeedMessageTest.java | 2 +- .../gtfsrtvalidator/lib/test/UtilTest.java | 2 +- .../CrossFeedDescriptorValidatorTest.java | 2 +- .../rules/FrequencyTypeOneValidatorTest.java | 2 +- .../lib/test/rules/HeaderValidatorTest.java | 2 +- .../rules/StopLocationTypeValidatorTest.java | 2 +- .../rules/StopTimeUpdateValidatorTest.java | 2 +- .../lib/test/rules/StopValidatorTest.java | 2 +- .../test/rules/TimestampValidatorTest.java | 2 +- .../rules/TripDescriptorValidatorTest.java | 2 +- .../lib/test/rules/VehicleValidatorTest.java | 2 +- .../lib/test/util/TestUtils.java | 2 +- .../edu/usf/cutr/gtfsrtvalidator/Main.java | 2 +- .../api/resource/GtfsFeed.java | 2 +- .../api/resource/GtfsRtFeed.java | 2 +- .../api/resource/VersionApi.java | 43 ++++++++++ .../background/BackgroundTask.java | 2 +- .../usf/cutr/gtfsrtvalidator/db/GTFSDB.java | 2 +- .../cutr/gtfsrtvalidator/helper/DBHelper.java | 2 +- .../helper/HttpMessageHelper.java | 2 +- .../gtfsrtvalidator/helper/QueryHelper.java | 2 +- .../gtfsrtvalidator/servlets/GetFeedJSON.java | 2 +- .../cutr/gtfsrtvalidator/util/FileUtil.java | 2 +- .../gtfsrtvalidator/util/ProtoBufUtils.java | 2 +- .../main/resources/webroot/custom-js/index.js | 5 ++ .../src/main/resources/webroot/error.html | 2 +- .../src/main/resources/webroot/index.html | 2 +- .../src/main/resources/webroot/loading.html | 2 +- .../api/resource/GtfsFeedTest.java | 2 +- .../test/queries/QueryTest.java | 2 +- pom.xml | 5 ++ 80 files changed, 286 insertions(+), 74 deletions(-) create mode 100644 gtfs-realtime-validator-lib/src/main/java-templates/edu/usf/cutr/gtfsrtvalidator/VersionUtil.java create mode 100644 gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/VersionModel.java create mode 100644 gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/api/resource/VersionApi.java diff --git a/gtfs-realtime-validator-lib/pom.xml b/gtfs-realtime-validator-lib/pom.xml index d5225257..b5441c46 100644 --- a/gtfs-realtime-validator-lib/pom.xml +++ b/gtfs-realtime-validator-lib/pom.xml @@ -106,6 +106,24 @@ + + + + + org.codehaus.mojo + templating-maven-plugin + 1.0.0 + + + generate-version-class + + filter-sources + + + + + + org.apache.maven.plugins @@ -192,6 +210,34 @@ + + + + org.codehaus.mojo + templating-maven-plugin + 1.0.0 + + + + + org.codehaus.mojo + buildnumber-maven-plugin + 1.4 + + + validate + + create + + + + + false + false + UNKNOWN + true + + \ No newline at end of file diff --git a/gtfs-realtime-validator-lib/src/main/java-templates/edu/usf/cutr/gtfsrtvalidator/VersionUtil.java b/gtfs-realtime-validator-lib/src/main/java-templates/edu/usf/cutr/gtfsrtvalidator/VersionUtil.java new file mode 100644 index 00000000..eca890a5 --- /dev/null +++ b/gtfs-realtime-validator-lib/src/main/java-templates/edu/usf/cutr/gtfsrtvalidator/VersionUtil.java @@ -0,0 +1,33 @@ +/* + * Copyright (C) 2018 University of South Florida (sjbarbeau@gmail.com) + * + * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package edu.usf.cutr.gtfsrtvalidator; + +import edu.usf.cutr.gtfsrtvalidator.lib.model.VersionModel; + +/** + * Class used with the templating-maven-plugin to get Maven version numbers at runtime. See https://stackoverflow.com/a/36628755/937715 + */ +public class VersionUtil { + + private static final String VERSION = "${project.version}"; + private static final String GROUPID = "${project.groupId}"; + private static final String ARTIFACTID = "${project.artifactId}"; + private static final String REVISION = "${buildNumber}"; + + public static VersionModel getVersion() { + return new VersionModel(VERSION, GROUPID, ARTIFACTID, REVISION); + } +} \ No newline at end of file diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/Main.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/Main.java index 1624a592..bceaebdf 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/Main.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/Main.java @@ -2,7 +2,7 @@ * Copyright (C) 2015-2017 Nipuna Gunathilake, University of South Florida * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, VersionModel 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/batch/BatchProcessor.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/batch/BatchProcessor.java index 9b35826c..096dd7af 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/batch/BatchProcessor.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/batch/BatchProcessor.java @@ -3,7 +3,7 @@ * * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, VersionModel 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ErrorMessageModel.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ErrorMessageModel.java index 765d8724..046896b8 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ErrorMessageModel.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ErrorMessageModel.java @@ -2,7 +2,7 @@ * Copyright (C) 2011 Nipuna Gunathilake. * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, VersionModel 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/GtfsFeedIterationModel.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/GtfsFeedIterationModel.java index 3912a497..cea565c1 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/GtfsFeedIterationModel.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/GtfsFeedIterationModel.java @@ -2,7 +2,7 @@ * Copyright (C) 2011 Nipuna Gunathilake. * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, VersionModel 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/GtfsFeedModel.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/GtfsFeedModel.java index cb0e81a7..e7e71577 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/GtfsFeedModel.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/GtfsFeedModel.java @@ -2,7 +2,7 @@ * Copyright (C) 2011 Nipuna Gunathilake. * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, VersionModel 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/GtfsRtFeedIterationModel.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/GtfsRtFeedIterationModel.java index 92fa1947..4624b053 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/GtfsRtFeedIterationModel.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/GtfsRtFeedIterationModel.java @@ -2,7 +2,7 @@ * Copyright (C) 2011 Nipuna Gunathilake. * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, VersionModel 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/GtfsRtFeedIterationString.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/GtfsRtFeedIterationString.java index 7d034d7e..355b1e8d 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/GtfsRtFeedIterationString.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/GtfsRtFeedIterationString.java @@ -2,7 +2,7 @@ * Copyright (C) 2011 Nipuna Gunathilake. * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, VersionModel 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/GtfsRtFeedModel.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/GtfsRtFeedModel.java index c90d031e..5200eebf 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/GtfsRtFeedModel.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/GtfsRtFeedModel.java @@ -2,7 +2,7 @@ * Copyright (C) 2011 Nipuna Gunathilake. * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, VersionModel 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/MessageLogModel.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/MessageLogModel.java index c961b1f8..00f28082 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/MessageLogModel.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/MessageLogModel.java @@ -2,7 +2,7 @@ * Copyright (C) 2011 Nipuna Gunathilake. * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, VersionModel 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/OccurrenceModel.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/OccurrenceModel.java index ad7e6d70..4c27a904 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/OccurrenceModel.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/OccurrenceModel.java @@ -2,7 +2,7 @@ * Copyright (C) 2011 Nipuna Gunathilake. * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, VersionModel 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/SessionModel.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/SessionModel.java index da01b59e..f6db3b21 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/SessionModel.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/SessionModel.java @@ -2,7 +2,7 @@ * Copyright (C) 2017 University of South Florida. * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, VersionModel 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ValidationRule.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ValidationRule.java index fa4e1a30..8cb5fffe 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ValidationRule.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ValidationRule.java @@ -2,7 +2,7 @@ * Copyright (C) 2011 Nipuna Gunathilake. * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, VersionModel 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/VersionModel.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/VersionModel.java new file mode 100644 index 00000000..d48a53fa --- /dev/null +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/VersionModel.java @@ -0,0 +1,80 @@ +/* + * Copyright (C) 2018 University of South Florida (sjbarbeau@gmail.com) + * + * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package edu.usf.cutr.gtfsrtvalidator.lib.model; + +/** + * A model class to hold the information generated at build time in VersionUtil. See https://stackoverflow.com/a/36628755/937715 + */ +public class VersionModel { + + private String mVersion; + private String mGroupId; + private String mArtifactId; + private String mRevision; + + public VersionModel() { + + } + + public VersionModel(String version, String groupId, String artifactId, String revision) { + mVersion = version; + mGroupId = groupId; + mArtifactId = artifactId; + mRevision = revision; + } + + public String getVersion() { + return mVersion; + } + + public String getGroupId() { + return mGroupId; + } + + public String getArtifactId() { + return mArtifactId; + } + + public String getRevision() { + return mRevision; + } + + public void setVersion(String version) { + this.mVersion = version; + } + + public void setGroupId(String groupId) { + this.mGroupId = mGroupId; + } + + public void setArtifactId(String artifactId) { + this.mArtifactId = mArtifactId; + } + + public void setRevision(String revision) { + this.mRevision = revision; + } + + @Override + public String toString() { + return "VersionModel{" + + "version='" + mVersion + '\'' + + ", groupId='" + mGroupId + '\'' + + ", artifactId='" + mArtifactId + '\'' + + ", revision='" + mRevision + '\'' + + '}'; + } +} diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ViewErrorLogModel.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ViewErrorLogModel.java index 22aadc8a..cbbe89f4 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ViewErrorLogModel.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ViewErrorLogModel.java @@ -2,7 +2,7 @@ * Copyright (C) 2017 University of South Florida. * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, VersionModel 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ViewErrorSummaryModel.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ViewErrorSummaryModel.java index a18b3398..c69c1c48 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ViewErrorSummaryModel.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ViewErrorSummaryModel.java @@ -2,7 +2,7 @@ * Copyright (C) 2011 Nipuna Gunathilake. * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, VersionModel 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ViewFeedIterationsCount.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ViewFeedIterationsCount.java index 977d09bf..547f0bea 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ViewFeedIterationsCount.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ViewFeedIterationsCount.java @@ -2,7 +2,7 @@ * Copyright (C) 2017 University of South Florida. * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, VersionModel 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ViewFeedMessageModel.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ViewFeedMessageModel.java index 8ee90ad4..6803f932 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ViewFeedMessageModel.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ViewFeedMessageModel.java @@ -2,7 +2,7 @@ * Copyright (C) 2017 University of South Florida. * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, VersionModel 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ViewFeedUniqueResponseCount.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ViewFeedUniqueResponseCount.java index 0704b4b7..929c27b3 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ViewFeedUniqueResponseCount.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ViewFeedUniqueResponseCount.java @@ -2,7 +2,7 @@ * Copyright (C) 2017 University of South Florida. * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, VersionModel 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ViewGtfsErrorCountModel.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ViewGtfsErrorCountModel.java index c3e924fb..893fd001 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ViewGtfsErrorCountModel.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ViewGtfsErrorCountModel.java @@ -2,7 +2,7 @@ * Copyright (C) 2011 Nipuna Gunathilake. * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, VersionModel 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ViewGtfsRtFeedErrorCountModel.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ViewGtfsRtFeedErrorCountModel.java index 6fc0ee6c..44aef4a4 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ViewGtfsRtFeedErrorCountModel.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ViewGtfsRtFeedErrorCountModel.java @@ -2,7 +2,7 @@ * Copyright (C) 2017 University of South Florida. * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, VersionModel 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ViewIterationErrorsModel.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ViewIterationErrorsModel.java index e7f602fd..84aa9fb4 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ViewIterationErrorsModel.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ViewIterationErrorsModel.java @@ -2,7 +2,7 @@ * Copyright (C) 2017 University of South Florida. * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, VersionModel 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ViewMessageDetailsModel.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ViewMessageDetailsModel.java index fc3b5d4b..f9b7be10 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ViewMessageDetailsModel.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ViewMessageDetailsModel.java @@ -2,7 +2,7 @@ * Copyright (C) 2011 Nipuna Gunathilake. * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, VersionModel 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/combined/CombinedIterationMessageModel.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/combined/CombinedIterationMessageModel.java index b315a0aa..60d9dd12 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/combined/CombinedIterationMessageModel.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/combined/CombinedIterationMessageModel.java @@ -2,7 +2,7 @@ * Copyright (C) 2011 Nipuna Gunathilake. * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, VersionModel 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/combined/CombinedMessageOccurrenceModel.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/combined/CombinedMessageOccurrenceModel.java index 387d7f5d..bc5c71b9 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/combined/CombinedMessageOccurrenceModel.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/combined/CombinedMessageOccurrenceModel.java @@ -2,7 +2,7 @@ * Copyright (C) 2011 Nipuna Gunathilake. * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, VersionModel 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/helper/ErrorListHelperModel.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/helper/ErrorListHelperModel.java index dfd522a8..7b055bcc 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/helper/ErrorListHelperModel.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/helper/ErrorListHelperModel.java @@ -2,7 +2,7 @@ * Copyright (C) 2011 Nipuna Gunathilake. * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, VersionModel 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/helper/IterationErrorListHelperModel.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/helper/IterationErrorListHelperModel.java index e82cccf6..2a396103 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/helper/IterationErrorListHelperModel.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/helper/IterationErrorListHelperModel.java @@ -2,7 +2,7 @@ * Copyright (C) 2017 University of South Florida. * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, VersionModel 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/helper/MergeMonitorData.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/helper/MergeMonitorData.java index 15289b07..3a4e3eae 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/helper/MergeMonitorData.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/helper/MergeMonitorData.java @@ -2,7 +2,7 @@ * Copyright (C) 2017 University of South Florida. * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, VersionModel 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/util/GtfsUtils.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/util/GtfsUtils.java index f691f83d..25f5b4f9 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/util/GtfsUtils.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/util/GtfsUtils.java @@ -2,7 +2,7 @@ * Copyright (C) 2017 University of South Florida. * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, VersionModel 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/util/RuleUtils.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/util/RuleUtils.java index bc2b2cab..742dba81 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/util/RuleUtils.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/util/RuleUtils.java @@ -2,7 +2,7 @@ * Copyright (C) 2017 University of South Florida. * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, VersionModel 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/util/SortUtils.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/util/SortUtils.java index cc793cb3..3112e9d1 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/util/SortUtils.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/util/SortUtils.java @@ -3,7 +3,7 @@ * * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, VersionModel 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/util/TimestampUtils.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/util/TimestampUtils.java index 6a9c3b96..2cb91b4b 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/util/TimestampUtils.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/util/TimestampUtils.java @@ -2,7 +2,7 @@ * Copyright (C) 2017 University of South Florida. * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, VersionModel 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/GtfsMetadata.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/GtfsMetadata.java index 350dafd8..451e54cb 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/GtfsMetadata.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/GtfsMetadata.java @@ -2,7 +2,7 @@ * Copyright (C) 2017 University of South Florida * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, VersionModel 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/IterationStatistics.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/IterationStatistics.java index af87928f..2950ae4d 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/IterationStatistics.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/IterationStatistics.java @@ -3,7 +3,7 @@ * * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, VersionModel 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/ValidationRules.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/ValidationRules.java index 4e7b2a61..ee6f2ebd 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/ValidationRules.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/ValidationRules.java @@ -2,7 +2,7 @@ * Copyright (C) 2011-2017 Nipuna Gunathilake, University of South Florida. * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, VersionModel 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/gtfs/StopLocationTypeValidator.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/gtfs/StopLocationTypeValidator.java index 0844fb28..6798cf0d 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/gtfs/StopLocationTypeValidator.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/gtfs/StopLocationTypeValidator.java @@ -2,7 +2,7 @@ * Copyright (C) 2011 Nipuna Gunathilake. * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, VersionModel 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/interfaces/FeedEntityValidator.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/interfaces/FeedEntityValidator.java index 0e49279a..043f758a 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/interfaces/FeedEntityValidator.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/interfaces/FeedEntityValidator.java @@ -2,7 +2,7 @@ * Copyright (C) 2011 Nipuna Gunathilake. * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, VersionModel 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/interfaces/GtfsFeedValidator.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/interfaces/GtfsFeedValidator.java index 4bc498d9..e249f9cb 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/interfaces/GtfsFeedValidator.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/interfaces/GtfsFeedValidator.java @@ -2,7 +2,7 @@ * Copyright (C) 2011 Nipuna Gunathilake. * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, VersionModel 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/rules/CrossFeedDescriptorValidator.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/rules/CrossFeedDescriptorValidator.java index edd64612..c2d82954 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/rules/CrossFeedDescriptorValidator.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/rules/CrossFeedDescriptorValidator.java @@ -2,7 +2,7 @@ * Copyright (C) 2011 Nipuna Gunathilake. * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, VersionModel 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/rules/FrequencyTypeOneValidator.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/rules/FrequencyTypeOneValidator.java index f846d9ae..afdc620c 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/rules/FrequencyTypeOneValidator.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/rules/FrequencyTypeOneValidator.java @@ -2,7 +2,7 @@ * Copyright (C) 2017 University of South Florida * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, VersionModel 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/rules/FrequencyTypeZeroValidator.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/rules/FrequencyTypeZeroValidator.java index e9053388..8aa5c288 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/rules/FrequencyTypeZeroValidator.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/rules/FrequencyTypeZeroValidator.java @@ -2,7 +2,7 @@ * Copyright (C) 2017 University of South Florida * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, VersionModel 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/rules/HeaderValidator.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/rules/HeaderValidator.java index 5d931514..575368b0 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/rules/HeaderValidator.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/rules/HeaderValidator.java @@ -2,7 +2,7 @@ * Copyright (C) 2017 University of South Florida. * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, VersionModel 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/rules/StopTimeUpdateValidator.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/rules/StopTimeUpdateValidator.java index be407fae..07f2f3be 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/rules/StopTimeUpdateValidator.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/rules/StopTimeUpdateValidator.java @@ -2,7 +2,7 @@ * Copyright (C) 2011-2017 Nipuna Gunathilake, University of South Florida * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, VersionModel 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/rules/StopValidator.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/rules/StopValidator.java index 45cc0db1..5848b285 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/rules/StopValidator.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/rules/StopValidator.java @@ -2,7 +2,7 @@ * Copyright (C) 2011 Nipuna Gunathilake. * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, VersionModel 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/rules/TimestampValidator.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/rules/TimestampValidator.java index bef65efb..a6b1e5b6 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/rules/TimestampValidator.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/rules/TimestampValidator.java @@ -2,7 +2,7 @@ * Copyright (C) 2011-2017 Nipuna Gunathilake, University of South Florida. * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, VersionModel 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/rules/TripDescriptorValidator.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/rules/TripDescriptorValidator.java index 7228c3cb..14c121b3 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/rules/TripDescriptorValidator.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/rules/TripDescriptorValidator.java @@ -2,7 +2,7 @@ * Copyright (C) 2017 University of South Florida. * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, VersionModel 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/rules/VehicleValidator.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/rules/VehicleValidator.java index 5b37e337..e79578c2 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/rules/VehicleValidator.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/rules/VehicleValidator.java @@ -2,7 +2,7 @@ * Copyright (C) 2011 Nipuna Gunathilake. * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, VersionModel 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/BatchTest.java b/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/BatchTest.java index e2389b8f..b592c290 100644 --- a/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/BatchTest.java +++ b/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/BatchTest.java @@ -2,7 +2,7 @@ * Copyright (C) 2017 University of South Florida. * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, VersionModel 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/FeedMessageTest.java b/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/FeedMessageTest.java index ff013e7f..d8722b92 100644 --- a/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/FeedMessageTest.java +++ b/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/FeedMessageTest.java @@ -2,7 +2,7 @@ * Copyright (C) 2017 University of South Florida. * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, VersionModel 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/UtilTest.java b/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/UtilTest.java index a92c1443..69766a2b 100644 --- a/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/UtilTest.java +++ b/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/UtilTest.java @@ -2,7 +2,7 @@ * Copyright (C) 2017 University of South Florida. * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, VersionModel 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/rules/CrossFeedDescriptorValidatorTest.java b/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/rules/CrossFeedDescriptorValidatorTest.java index 75611dd3..2ed56dc1 100644 --- a/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/rules/CrossFeedDescriptorValidatorTest.java +++ b/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/rules/CrossFeedDescriptorValidatorTest.java @@ -2,7 +2,7 @@ * Copyright (C) 2017 University of South Florida. * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, VersionModel 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/rules/FrequencyTypeOneValidatorTest.java b/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/rules/FrequencyTypeOneValidatorTest.java index cae60315..6c8236e9 100644 --- a/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/rules/FrequencyTypeOneValidatorTest.java +++ b/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/rules/FrequencyTypeOneValidatorTest.java @@ -2,7 +2,7 @@ * Copyright (C) 2017 University of South Florida * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, VersionModel 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/rules/HeaderValidatorTest.java b/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/rules/HeaderValidatorTest.java index 1025dcdf..43cc8cb3 100644 --- a/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/rules/HeaderValidatorTest.java +++ b/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/rules/HeaderValidatorTest.java @@ -2,7 +2,7 @@ * Copyright (C) 2017 University of South Florida. * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, VersionModel 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/rules/StopLocationTypeValidatorTest.java b/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/rules/StopLocationTypeValidatorTest.java index d60bc484..3fa12aff 100644 --- a/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/rules/StopLocationTypeValidatorTest.java +++ b/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/rules/StopLocationTypeValidatorTest.java @@ -2,7 +2,7 @@ * Copyright (C) 2017 University of South Florida * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, VersionModel 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/rules/StopTimeUpdateValidatorTest.java b/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/rules/StopTimeUpdateValidatorTest.java index 4f6c30ce..55c82f1f 100644 --- a/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/rules/StopTimeUpdateValidatorTest.java +++ b/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/rules/StopTimeUpdateValidatorTest.java @@ -2,7 +2,7 @@ * Copyright (C) 2017 University of South Florida * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, VersionModel 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/rules/StopValidatorTest.java b/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/rules/StopValidatorTest.java index 8ec76646..dadf925c 100644 --- a/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/rules/StopValidatorTest.java +++ b/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/rules/StopValidatorTest.java @@ -2,7 +2,7 @@ * Copyright (C) 2017 University of South Florida. * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, VersionModel 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/rules/TimestampValidatorTest.java b/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/rules/TimestampValidatorTest.java index 86c763ef..faf93fe0 100644 --- a/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/rules/TimestampValidatorTest.java +++ b/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/rules/TimestampValidatorTest.java @@ -2,7 +2,7 @@ * Copyright (C) 2017 University of South Florida. * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, VersionModel 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/rules/TripDescriptorValidatorTest.java b/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/rules/TripDescriptorValidatorTest.java index 733a9c64..bd4c25bd 100644 --- a/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/rules/TripDescriptorValidatorTest.java +++ b/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/rules/TripDescriptorValidatorTest.java @@ -2,7 +2,7 @@ * Copyright (C) 2017 University of South Florida. * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, VersionModel 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/rules/VehicleValidatorTest.java b/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/rules/VehicleValidatorTest.java index f0959ed3..8b54cca9 100644 --- a/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/rules/VehicleValidatorTest.java +++ b/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/rules/VehicleValidatorTest.java @@ -2,7 +2,7 @@ * Copyright (C) 2017 University of South Florida. * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, VersionModel 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/util/TestUtils.java b/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/util/TestUtils.java index dd4ff47f..23156030 100644 --- a/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/util/TestUtils.java +++ b/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/util/TestUtils.java @@ -2,7 +2,7 @@ * Copyright (C) 2017 University of South Florida. * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, VersionModel 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/Main.java b/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/Main.java index e2f14437..7afc649f 100644 --- a/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/Main.java +++ b/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/Main.java @@ -2,7 +2,7 @@ * Copyright (C) 2015-2017 Nipuna Gunathilake, University of South Florida * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, VersionModel 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/api/resource/GtfsFeed.java b/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/api/resource/GtfsFeed.java index 5a70c459..ea65a288 100644 --- a/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/api/resource/GtfsFeed.java +++ b/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/api/resource/GtfsFeed.java @@ -2,7 +2,7 @@ * Copyright (C) 2011 Nipuna Gunathilake. * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, VersionModel 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/api/resource/GtfsRtFeed.java b/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/api/resource/GtfsRtFeed.java index d30e5745..7c279ba2 100644 --- a/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/api/resource/GtfsRtFeed.java +++ b/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/api/resource/GtfsRtFeed.java @@ -2,7 +2,7 @@ * Copyright (C) 2011 Nipuna Gunathilake. * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, VersionModel 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/api/resource/VersionApi.java b/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/api/resource/VersionApi.java new file mode 100644 index 00000000..35389070 --- /dev/null +++ b/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/api/resource/VersionApi.java @@ -0,0 +1,43 @@ +/* + * Copyright (C) 2011 Nipuna Gunathilake. + * All rights reserved. + * + * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package edu.usf.cutr.gtfsrtvalidator.api.resource; + +import com.fasterxml.jackson.core.JsonProcessingException; +import edu.usf.cutr.gtfsrtvalidator.VersionUtil; +import edu.usf.cutr.gtfsrtvalidator.lib.model.VersionModel; +import org.slf4j.LoggerFactory; + +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; + +@Path("/version") +public class VersionApi { + + private static final org.slf4j.Logger _log = LoggerFactory.getLogger(VersionApi.class); + + // A call to `/api/version` returns the Maven version information for this project + @GET + @Produces(MediaType.APPLICATION_JSON) + public VersionModel getVersion() throws JsonProcessingException { + _log.info(VersionUtil.getVersion().toString()); + //return mObjectMapper.writeValueAsString(VersionUtil.getVersion()); + return VersionUtil.getVersion(); + } +} diff --git a/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/background/BackgroundTask.java b/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/background/BackgroundTask.java index cede7c73..caf760e9 100644 --- a/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/background/BackgroundTask.java +++ b/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/background/BackgroundTask.java @@ -2,7 +2,7 @@ * Copyright (C) 2017 Nipuna Gunathilake, University of South Florida * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, VersionModel 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/db/GTFSDB.java b/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/db/GTFSDB.java index 67d6f679..e74e9e72 100644 --- a/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/db/GTFSDB.java +++ b/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/db/GTFSDB.java @@ -2,7 +2,7 @@ * Copyright (C) 2015 Nipuna Gunathilake. * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, VersionModel 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/helper/DBHelper.java b/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/helper/DBHelper.java index 78c5319f..73a192c2 100644 --- a/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/helper/DBHelper.java +++ b/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/helper/DBHelper.java @@ -2,7 +2,7 @@ * Copyright (C) 2011 Nipuna Gunathilake. * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, VersionModel 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/helper/HttpMessageHelper.java b/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/helper/HttpMessageHelper.java index 0cb2a1fc..dd821b01 100644 --- a/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/helper/HttpMessageHelper.java +++ b/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/helper/HttpMessageHelper.java @@ -2,7 +2,7 @@ * Copyright (C) 2011 Nipuna Gunathilake. * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, VersionModel 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/helper/QueryHelper.java b/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/helper/QueryHelper.java index 250917a2..e4bb2562 100644 --- a/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/helper/QueryHelper.java +++ b/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/helper/QueryHelper.java @@ -2,7 +2,7 @@ * Copyright (C) 2017 University of South Florida. * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, VersionModel 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/servlets/GetFeedJSON.java b/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/servlets/GetFeedJSON.java index d575be14..cc442e34 100644 --- a/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/servlets/GetFeedJSON.java +++ b/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/servlets/GetFeedJSON.java @@ -2,7 +2,7 @@ * Copyright (C) 2011 Nipuna Gunathilake. * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, VersionModel 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/util/FileUtil.java b/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/util/FileUtil.java index 32fd2f7f..27e529c4 100644 --- a/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/util/FileUtil.java +++ b/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/util/FileUtil.java @@ -2,7 +2,7 @@ * Copyright (C) 2011-2018 Nipuna Gunathilake, University of South Florida (sjbarbeau@gmail.com) * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, VersionModel 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/util/ProtoBufUtils.java b/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/util/ProtoBufUtils.java index 85b1ed0e..6cdb4ad8 100644 --- a/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/util/ProtoBufUtils.java +++ b/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/util/ProtoBufUtils.java @@ -2,7 +2,7 @@ * Copyright (C) 2011 Nipuna Gunathilake. * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, VersionModel 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-webapp/src/main/resources/webroot/custom-js/index.js b/gtfs-realtime-validator-webapp/src/main/resources/webroot/custom-js/index.js index 385f8899..6011a2ec 100644 --- a/gtfs-realtime-validator-webapp/src/main/resources/webroot/custom-js/index.js +++ b/gtfs-realtime-validator-webapp/src/main/resources/webroot/custom-js/index.js @@ -23,6 +23,11 @@ var enableShapes; var server = window.location.protocol + "//" + window.location.host; + +function about() { + +} + function addInput(){ if (counter == limit) { alert("You have reached the limit of adding " + counter + " inputs"); diff --git a/gtfs-realtime-validator-webapp/src/main/resources/webroot/error.html b/gtfs-realtime-validator-webapp/src/main/resources/webroot/error.html index 75df57b8..723ee92c 100644 --- a/gtfs-realtime-validator-webapp/src/main/resources/webroot/error.html +++ b/gtfs-realtime-validator-webapp/src/main/resources/webroot/error.html @@ -3,7 +3,7 @@ ~ Copyright (C) 2011 Nipuna Gunathilake. ~ All rights reserved. ~ - ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ Licensed under the Apache License, VersionModel 2.0 (the "License"); ~ you may not use this file except in compliance with the License. ~ You may obtain a copy of the License at ~ diff --git a/gtfs-realtime-validator-webapp/src/main/resources/webroot/index.html b/gtfs-realtime-validator-webapp/src/main/resources/webroot/index.html index aa3e5d2d..0b0faafc 100644 --- a/gtfs-realtime-validator-webapp/src/main/resources/webroot/index.html +++ b/gtfs-realtime-validator-webapp/src/main/resources/webroot/index.html @@ -24,7 +24,7 @@
diff --git a/gtfs-realtime-validator-webapp/src/main/resources/webroot/loading.html b/gtfs-realtime-validator-webapp/src/main/resources/webroot/loading.html index f74dec65..62a62f68 100644 --- a/gtfs-realtime-validator-webapp/src/main/resources/webroot/loading.html +++ b/gtfs-realtime-validator-webapp/src/main/resources/webroot/loading.html @@ -24,7 +24,7 @@
diff --git a/gtfs-realtime-validator-webapp/src/test/java/edu/usf/cutr/gtfsrtvalidator/api/resource/GtfsFeedTest.java b/gtfs-realtime-validator-webapp/src/test/java/edu/usf/cutr/gtfsrtvalidator/api/resource/GtfsFeedTest.java index 6e06fdcd..ae10b495 100644 --- a/gtfs-realtime-validator-webapp/src/test/java/edu/usf/cutr/gtfsrtvalidator/api/resource/GtfsFeedTest.java +++ b/gtfs-realtime-validator-webapp/src/test/java/edu/usf/cutr/gtfsrtvalidator/api/resource/GtfsFeedTest.java @@ -2,7 +2,7 @@ * Copyright (C) 2017 University of South Florida. * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, VersionModel 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-webapp/src/test/java/edu/usf/cutr/gtfsrtvalidator/test/queries/QueryTest.java b/gtfs-realtime-validator-webapp/src/test/java/edu/usf/cutr/gtfsrtvalidator/test/queries/QueryTest.java index 2d838ea5..fe3734c4 100644 --- a/gtfs-realtime-validator-webapp/src/test/java/edu/usf/cutr/gtfsrtvalidator/test/queries/QueryTest.java +++ b/gtfs-realtime-validator-webapp/src/test/java/edu/usf/cutr/gtfsrtvalidator/test/queries/QueryTest.java @@ -2,7 +2,7 @@ * Copyright (C) 2017 University of South Florida. * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, VersionModel 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/pom.xml b/pom.xml index e285f952..075007b8 100644 --- a/pom.xml +++ b/pom.xml @@ -20,4 +20,9 @@ http://nexus.onebusaway.org/content/groups/public/ + + + scm:git:https://github.com/CUTR-at-USF/gtfs-realtime-validator.git + https://github.com/CUTR-at-USF/gtfs-realtime-validator.git + \ No newline at end of file From ebbb9fb678986613bf0a98f8c5866bd921516a48 Mon Sep 17 00:00:00 2001 From: barbeau Date: Wed, 18 Apr 2018 14:05:25 -0400 Subject: [PATCH 2/5] Revert accidental change to license header comments --- .../src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/Main.java | 2 +- .../edu/usf/cutr/gtfsrtvalidator/lib/batch/BatchProcessor.java | 2 +- .../usf/cutr/gtfsrtvalidator/lib/model/ErrorMessageModel.java | 2 +- .../cutr/gtfsrtvalidator/lib/model/GtfsFeedIterationModel.java | 2 +- .../edu/usf/cutr/gtfsrtvalidator/lib/model/GtfsFeedModel.java | 2 +- .../gtfsrtvalidator/lib/model/GtfsRtFeedIterationModel.java | 2 +- .../gtfsrtvalidator/lib/model/GtfsRtFeedIterationString.java | 2 +- .../edu/usf/cutr/gtfsrtvalidator/lib/model/GtfsRtFeedModel.java | 2 +- .../edu/usf/cutr/gtfsrtvalidator/lib/model/MessageLogModel.java | 2 +- .../edu/usf/cutr/gtfsrtvalidator/lib/model/OccurrenceModel.java | 2 +- .../edu/usf/cutr/gtfsrtvalidator/lib/model/SessionModel.java | 2 +- .../edu/usf/cutr/gtfsrtvalidator/lib/model/ValidationRule.java | 2 +- .../edu/usf/cutr/gtfsrtvalidator/lib/model/VersionModel.java | 2 +- .../usf/cutr/gtfsrtvalidator/lib/model/ViewErrorLogModel.java | 2 +- .../cutr/gtfsrtvalidator/lib/model/ViewErrorSummaryModel.java | 2 +- .../cutr/gtfsrtvalidator/lib/model/ViewFeedIterationsCount.java | 2 +- .../cutr/gtfsrtvalidator/lib/model/ViewFeedMessageModel.java | 2 +- .../gtfsrtvalidator/lib/model/ViewFeedUniqueResponseCount.java | 2 +- .../cutr/gtfsrtvalidator/lib/model/ViewGtfsErrorCountModel.java | 2 +- .../lib/model/ViewGtfsRtFeedErrorCountModel.java | 2 +- .../gtfsrtvalidator/lib/model/ViewIterationErrorsModel.java | 2 +- .../cutr/gtfsrtvalidator/lib/model/ViewMessageDetailsModel.java | 2 +- .../lib/model/combined/CombinedIterationMessageModel.java | 2 +- .../lib/model/combined/CombinedMessageOccurrenceModel.java | 2 +- .../gtfsrtvalidator/lib/model/helper/ErrorListHelperModel.java | 2 +- .../lib/model/helper/IterationErrorListHelperModel.java | 2 +- .../cutr/gtfsrtvalidator/lib/model/helper/MergeMonitorData.java | 2 +- .../java/edu/usf/cutr/gtfsrtvalidator/lib/util/GtfsUtils.java | 2 +- .../java/edu/usf/cutr/gtfsrtvalidator/lib/util/RuleUtils.java | 2 +- .../java/edu/usf/cutr/gtfsrtvalidator/lib/util/SortUtils.java | 2 +- .../edu/usf/cutr/gtfsrtvalidator/lib/util/TimestampUtils.java | 2 +- .../usf/cutr/gtfsrtvalidator/lib/validation/GtfsMetadata.java | 2 +- .../gtfsrtvalidator/lib/validation/IterationStatistics.java | 2 +- .../cutr/gtfsrtvalidator/lib/validation/ValidationRules.java | 2 +- .../lib/validation/gtfs/StopLocationTypeValidator.java | 2 +- .../lib/validation/interfaces/FeedEntityValidator.java | 2 +- .../lib/validation/interfaces/GtfsFeedValidator.java | 2 +- .../lib/validation/rules/CrossFeedDescriptorValidator.java | 2 +- .../lib/validation/rules/FrequencyTypeOneValidator.java | 2 +- .../lib/validation/rules/FrequencyTypeZeroValidator.java | 2 +- .../gtfsrtvalidator/lib/validation/rules/HeaderValidator.java | 2 +- .../lib/validation/rules/StopTimeUpdateValidator.java | 2 +- .../gtfsrtvalidator/lib/validation/rules/StopValidator.java | 2 +- .../lib/validation/rules/TimestampValidator.java | 2 +- .../lib/validation/rules/TripDescriptorValidator.java | 2 +- .../gtfsrtvalidator/lib/validation/rules/VehicleValidator.java | 2 +- .../src/main/java/edu/usf/cutr/gtfsrtvalidator/Main.java | 2 +- 47 files changed, 47 insertions(+), 47 deletions(-) diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/Main.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/Main.java index bceaebdf..1624a592 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/Main.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/Main.java @@ -2,7 +2,7 @@ * Copyright (C) 2015-2017 Nipuna Gunathilake, University of South Florida * All rights reserved. * - * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/batch/BatchProcessor.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/batch/BatchProcessor.java index 096dd7af..9b35826c 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/batch/BatchProcessor.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/batch/BatchProcessor.java @@ -3,7 +3,7 @@ * * All rights reserved. * - * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ErrorMessageModel.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ErrorMessageModel.java index 046896b8..765d8724 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ErrorMessageModel.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ErrorMessageModel.java @@ -2,7 +2,7 @@ * Copyright (C) 2011 Nipuna Gunathilake. * All rights reserved. * - * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/GtfsFeedIterationModel.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/GtfsFeedIterationModel.java index cea565c1..3912a497 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/GtfsFeedIterationModel.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/GtfsFeedIterationModel.java @@ -2,7 +2,7 @@ * Copyright (C) 2011 Nipuna Gunathilake. * All rights reserved. * - * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/GtfsFeedModel.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/GtfsFeedModel.java index e7e71577..cb0e81a7 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/GtfsFeedModel.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/GtfsFeedModel.java @@ -2,7 +2,7 @@ * Copyright (C) 2011 Nipuna Gunathilake. * All rights reserved. * - * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/GtfsRtFeedIterationModel.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/GtfsRtFeedIterationModel.java index 4624b053..92fa1947 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/GtfsRtFeedIterationModel.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/GtfsRtFeedIterationModel.java @@ -2,7 +2,7 @@ * Copyright (C) 2011 Nipuna Gunathilake. * All rights reserved. * - * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/GtfsRtFeedIterationString.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/GtfsRtFeedIterationString.java index 355b1e8d..7d034d7e 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/GtfsRtFeedIterationString.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/GtfsRtFeedIterationString.java @@ -2,7 +2,7 @@ * Copyright (C) 2011 Nipuna Gunathilake. * All rights reserved. * - * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/GtfsRtFeedModel.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/GtfsRtFeedModel.java index 5200eebf..c90d031e 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/GtfsRtFeedModel.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/GtfsRtFeedModel.java @@ -2,7 +2,7 @@ * Copyright (C) 2011 Nipuna Gunathilake. * All rights reserved. * - * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/MessageLogModel.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/MessageLogModel.java index 00f28082..c961b1f8 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/MessageLogModel.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/MessageLogModel.java @@ -2,7 +2,7 @@ * Copyright (C) 2011 Nipuna Gunathilake. * All rights reserved. * - * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/OccurrenceModel.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/OccurrenceModel.java index 4c27a904..ad7e6d70 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/OccurrenceModel.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/OccurrenceModel.java @@ -2,7 +2,7 @@ * Copyright (C) 2011 Nipuna Gunathilake. * All rights reserved. * - * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/SessionModel.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/SessionModel.java index f6db3b21..da01b59e 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/SessionModel.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/SessionModel.java @@ -2,7 +2,7 @@ * Copyright (C) 2017 University of South Florida. * All rights reserved. * - * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ValidationRule.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ValidationRule.java index 8cb5fffe..fa4e1a30 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ValidationRule.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ValidationRule.java @@ -2,7 +2,7 @@ * Copyright (C) 2011 Nipuna Gunathilake. * All rights reserved. * - * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/VersionModel.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/VersionModel.java index d48a53fa..9876044f 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/VersionModel.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/VersionModel.java @@ -1,7 +1,7 @@ /* * Copyright (C) 2018 University of South Florida (sjbarbeau@gmail.com) * - * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ViewErrorLogModel.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ViewErrorLogModel.java index cbbe89f4..22aadc8a 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ViewErrorLogModel.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ViewErrorLogModel.java @@ -2,7 +2,7 @@ * Copyright (C) 2017 University of South Florida. * All rights reserved. * - * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ViewErrorSummaryModel.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ViewErrorSummaryModel.java index c69c1c48..a18b3398 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ViewErrorSummaryModel.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ViewErrorSummaryModel.java @@ -2,7 +2,7 @@ * Copyright (C) 2011 Nipuna Gunathilake. * All rights reserved. * - * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ViewFeedIterationsCount.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ViewFeedIterationsCount.java index 547f0bea..977d09bf 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ViewFeedIterationsCount.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ViewFeedIterationsCount.java @@ -2,7 +2,7 @@ * Copyright (C) 2017 University of South Florida. * All rights reserved. * - * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ViewFeedMessageModel.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ViewFeedMessageModel.java index 6803f932..8ee90ad4 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ViewFeedMessageModel.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ViewFeedMessageModel.java @@ -2,7 +2,7 @@ * Copyright (C) 2017 University of South Florida. * All rights reserved. * - * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ViewFeedUniqueResponseCount.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ViewFeedUniqueResponseCount.java index 929c27b3..0704b4b7 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ViewFeedUniqueResponseCount.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ViewFeedUniqueResponseCount.java @@ -2,7 +2,7 @@ * Copyright (C) 2017 University of South Florida. * All rights reserved. * - * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ViewGtfsErrorCountModel.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ViewGtfsErrorCountModel.java index 893fd001..c3e924fb 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ViewGtfsErrorCountModel.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ViewGtfsErrorCountModel.java @@ -2,7 +2,7 @@ * Copyright (C) 2011 Nipuna Gunathilake. * All rights reserved. * - * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ViewGtfsRtFeedErrorCountModel.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ViewGtfsRtFeedErrorCountModel.java index 44aef4a4..6fc0ee6c 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ViewGtfsRtFeedErrorCountModel.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ViewGtfsRtFeedErrorCountModel.java @@ -2,7 +2,7 @@ * Copyright (C) 2017 University of South Florida. * All rights reserved. * - * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ViewIterationErrorsModel.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ViewIterationErrorsModel.java index 84aa9fb4..e7f602fd 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ViewIterationErrorsModel.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ViewIterationErrorsModel.java @@ -2,7 +2,7 @@ * Copyright (C) 2017 University of South Florida. * All rights reserved. * - * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ViewMessageDetailsModel.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ViewMessageDetailsModel.java index f9b7be10..fc3b5d4b 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ViewMessageDetailsModel.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ViewMessageDetailsModel.java @@ -2,7 +2,7 @@ * Copyright (C) 2011 Nipuna Gunathilake. * All rights reserved. * - * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/combined/CombinedIterationMessageModel.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/combined/CombinedIterationMessageModel.java index 60d9dd12..b315a0aa 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/combined/CombinedIterationMessageModel.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/combined/CombinedIterationMessageModel.java @@ -2,7 +2,7 @@ * Copyright (C) 2011 Nipuna Gunathilake. * All rights reserved. * - * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/combined/CombinedMessageOccurrenceModel.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/combined/CombinedMessageOccurrenceModel.java index bc5c71b9..387d7f5d 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/combined/CombinedMessageOccurrenceModel.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/combined/CombinedMessageOccurrenceModel.java @@ -2,7 +2,7 @@ * Copyright (C) 2011 Nipuna Gunathilake. * All rights reserved. * - * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/helper/ErrorListHelperModel.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/helper/ErrorListHelperModel.java index 7b055bcc..dfd522a8 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/helper/ErrorListHelperModel.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/helper/ErrorListHelperModel.java @@ -2,7 +2,7 @@ * Copyright (C) 2011 Nipuna Gunathilake. * All rights reserved. * - * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/helper/IterationErrorListHelperModel.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/helper/IterationErrorListHelperModel.java index 2a396103..e82cccf6 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/helper/IterationErrorListHelperModel.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/helper/IterationErrorListHelperModel.java @@ -2,7 +2,7 @@ * Copyright (C) 2017 University of South Florida. * All rights reserved. * - * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/helper/MergeMonitorData.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/helper/MergeMonitorData.java index 3a4e3eae..15289b07 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/helper/MergeMonitorData.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/helper/MergeMonitorData.java @@ -2,7 +2,7 @@ * Copyright (C) 2017 University of South Florida. * All rights reserved. * - * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/util/GtfsUtils.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/util/GtfsUtils.java index 25f5b4f9..f691f83d 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/util/GtfsUtils.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/util/GtfsUtils.java @@ -2,7 +2,7 @@ * Copyright (C) 2017 University of South Florida. * All rights reserved. * - * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/util/RuleUtils.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/util/RuleUtils.java index 742dba81..bc2b2cab 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/util/RuleUtils.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/util/RuleUtils.java @@ -2,7 +2,7 @@ * Copyright (C) 2017 University of South Florida. * All rights reserved. * - * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/util/SortUtils.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/util/SortUtils.java index 3112e9d1..cc793cb3 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/util/SortUtils.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/util/SortUtils.java @@ -3,7 +3,7 @@ * * All rights reserved. * - * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/util/TimestampUtils.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/util/TimestampUtils.java index 2cb91b4b..6a9c3b96 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/util/TimestampUtils.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/util/TimestampUtils.java @@ -2,7 +2,7 @@ * Copyright (C) 2017 University of South Florida. * All rights reserved. * - * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/GtfsMetadata.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/GtfsMetadata.java index 451e54cb..350dafd8 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/GtfsMetadata.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/GtfsMetadata.java @@ -2,7 +2,7 @@ * Copyright (C) 2017 University of South Florida * All rights reserved. * - * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/IterationStatistics.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/IterationStatistics.java index 2950ae4d..af87928f 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/IterationStatistics.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/IterationStatistics.java @@ -3,7 +3,7 @@ * * All rights reserved. * - * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/ValidationRules.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/ValidationRules.java index ee6f2ebd..4e7b2a61 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/ValidationRules.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/ValidationRules.java @@ -2,7 +2,7 @@ * Copyright (C) 2011-2017 Nipuna Gunathilake, University of South Florida. * All rights reserved. * - * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/gtfs/StopLocationTypeValidator.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/gtfs/StopLocationTypeValidator.java index 6798cf0d..0844fb28 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/gtfs/StopLocationTypeValidator.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/gtfs/StopLocationTypeValidator.java @@ -2,7 +2,7 @@ * Copyright (C) 2011 Nipuna Gunathilake. * All rights reserved. * - * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/interfaces/FeedEntityValidator.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/interfaces/FeedEntityValidator.java index 043f758a..0e49279a 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/interfaces/FeedEntityValidator.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/interfaces/FeedEntityValidator.java @@ -2,7 +2,7 @@ * Copyright (C) 2011 Nipuna Gunathilake. * All rights reserved. * - * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/interfaces/GtfsFeedValidator.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/interfaces/GtfsFeedValidator.java index e249f9cb..4bc498d9 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/interfaces/GtfsFeedValidator.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/interfaces/GtfsFeedValidator.java @@ -2,7 +2,7 @@ * Copyright (C) 2011 Nipuna Gunathilake. * All rights reserved. * - * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/rules/CrossFeedDescriptorValidator.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/rules/CrossFeedDescriptorValidator.java index c2d82954..edd64612 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/rules/CrossFeedDescriptorValidator.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/rules/CrossFeedDescriptorValidator.java @@ -2,7 +2,7 @@ * Copyright (C) 2011 Nipuna Gunathilake. * All rights reserved. * - * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/rules/FrequencyTypeOneValidator.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/rules/FrequencyTypeOneValidator.java index afdc620c..f846d9ae 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/rules/FrequencyTypeOneValidator.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/rules/FrequencyTypeOneValidator.java @@ -2,7 +2,7 @@ * Copyright (C) 2017 University of South Florida * All rights reserved. * - * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/rules/FrequencyTypeZeroValidator.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/rules/FrequencyTypeZeroValidator.java index 8aa5c288..e9053388 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/rules/FrequencyTypeZeroValidator.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/rules/FrequencyTypeZeroValidator.java @@ -2,7 +2,7 @@ * Copyright (C) 2017 University of South Florida * All rights reserved. * - * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/rules/HeaderValidator.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/rules/HeaderValidator.java index 575368b0..5d931514 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/rules/HeaderValidator.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/rules/HeaderValidator.java @@ -2,7 +2,7 @@ * Copyright (C) 2017 University of South Florida. * All rights reserved. * - * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/rules/StopTimeUpdateValidator.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/rules/StopTimeUpdateValidator.java index 07f2f3be..be407fae 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/rules/StopTimeUpdateValidator.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/rules/StopTimeUpdateValidator.java @@ -2,7 +2,7 @@ * Copyright (C) 2011-2017 Nipuna Gunathilake, University of South Florida * All rights reserved. * - * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/rules/StopValidator.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/rules/StopValidator.java index 5848b285..45cc0db1 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/rules/StopValidator.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/rules/StopValidator.java @@ -2,7 +2,7 @@ * Copyright (C) 2011 Nipuna Gunathilake. * All rights reserved. * - * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/rules/TimestampValidator.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/rules/TimestampValidator.java index a6b1e5b6..bef65efb 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/rules/TimestampValidator.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/rules/TimestampValidator.java @@ -2,7 +2,7 @@ * Copyright (C) 2011-2017 Nipuna Gunathilake, University of South Florida. * All rights reserved. * - * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/rules/TripDescriptorValidator.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/rules/TripDescriptorValidator.java index 14c121b3..7228c3cb 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/rules/TripDescriptorValidator.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/rules/TripDescriptorValidator.java @@ -2,7 +2,7 @@ * Copyright (C) 2017 University of South Florida. * All rights reserved. * - * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/rules/VehicleValidator.java b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/rules/VehicleValidator.java index e79578c2..5b37e337 100644 --- a/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/rules/VehicleValidator.java +++ b/gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/validation/rules/VehicleValidator.java @@ -2,7 +2,7 @@ * Copyright (C) 2011 Nipuna Gunathilake. * All rights reserved. * - * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/Main.java b/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/Main.java index 7afc649f..e2f14437 100644 --- a/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/Main.java +++ b/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/Main.java @@ -2,7 +2,7 @@ * Copyright (C) 2015-2017 Nipuna Gunathilake, University of South Florida * All rights reserved. * - * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * From 669c1a736e0b722364b53f56bb9367801ca1264e Mon Sep 17 00:00:00 2001 From: barbeau Date: Wed, 18 Apr 2018 14:06:47 -0400 Subject: [PATCH 3/5] Revert accidental change to license header comments --- .../java/edu/usf/cutr/gtfsrtvalidator/lib/test/BatchTest.java | 2 +- .../edu/usf/cutr/gtfsrtvalidator/lib/test/FeedMessageTest.java | 2 +- .../java/edu/usf/cutr/gtfsrtvalidator/lib/test/UtilTest.java | 2 +- .../lib/test/rules/CrossFeedDescriptorValidatorTest.java | 2 +- .../lib/test/rules/FrequencyTypeOneValidatorTest.java | 2 +- .../gtfsrtvalidator/lib/test/rules/HeaderValidatorTest.java | 2 +- .../lib/test/rules/StopLocationTypeValidatorTest.java | 2 +- .../lib/test/rules/StopTimeUpdateValidatorTest.java | 2 +- .../cutr/gtfsrtvalidator/lib/test/rules/StopValidatorTest.java | 2 +- .../gtfsrtvalidator/lib/test/rules/TimestampValidatorTest.java | 2 +- .../lib/test/rules/TripDescriptorValidatorTest.java | 2 +- .../gtfsrtvalidator/lib/test/rules/VehicleValidatorTest.java | 2 +- .../edu/usf/cutr/gtfsrtvalidator/lib/test/util/TestUtils.java | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/BatchTest.java b/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/BatchTest.java index b592c290..e2389b8f 100644 --- a/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/BatchTest.java +++ b/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/BatchTest.java @@ -2,7 +2,7 @@ * Copyright (C) 2017 University of South Florida. * All rights reserved. * - * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/FeedMessageTest.java b/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/FeedMessageTest.java index d8722b92..ff013e7f 100644 --- a/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/FeedMessageTest.java +++ b/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/FeedMessageTest.java @@ -2,7 +2,7 @@ * Copyright (C) 2017 University of South Florida. * All rights reserved. * - * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/UtilTest.java b/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/UtilTest.java index 69766a2b..a92c1443 100644 --- a/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/UtilTest.java +++ b/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/UtilTest.java @@ -2,7 +2,7 @@ * Copyright (C) 2017 University of South Florida. * All rights reserved. * - * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/rules/CrossFeedDescriptorValidatorTest.java b/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/rules/CrossFeedDescriptorValidatorTest.java index 2ed56dc1..75611dd3 100644 --- a/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/rules/CrossFeedDescriptorValidatorTest.java +++ b/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/rules/CrossFeedDescriptorValidatorTest.java @@ -2,7 +2,7 @@ * Copyright (C) 2017 University of South Florida. * All rights reserved. * - * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/rules/FrequencyTypeOneValidatorTest.java b/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/rules/FrequencyTypeOneValidatorTest.java index 6c8236e9..cae60315 100644 --- a/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/rules/FrequencyTypeOneValidatorTest.java +++ b/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/rules/FrequencyTypeOneValidatorTest.java @@ -2,7 +2,7 @@ * Copyright (C) 2017 University of South Florida * All rights reserved. * - * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/rules/HeaderValidatorTest.java b/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/rules/HeaderValidatorTest.java index 43cc8cb3..1025dcdf 100644 --- a/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/rules/HeaderValidatorTest.java +++ b/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/rules/HeaderValidatorTest.java @@ -2,7 +2,7 @@ * Copyright (C) 2017 University of South Florida. * All rights reserved. * - * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/rules/StopLocationTypeValidatorTest.java b/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/rules/StopLocationTypeValidatorTest.java index 3fa12aff..d60bc484 100644 --- a/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/rules/StopLocationTypeValidatorTest.java +++ b/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/rules/StopLocationTypeValidatorTest.java @@ -2,7 +2,7 @@ * Copyright (C) 2017 University of South Florida * All rights reserved. * - * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/rules/StopTimeUpdateValidatorTest.java b/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/rules/StopTimeUpdateValidatorTest.java index 55c82f1f..4f6c30ce 100644 --- a/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/rules/StopTimeUpdateValidatorTest.java +++ b/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/rules/StopTimeUpdateValidatorTest.java @@ -2,7 +2,7 @@ * Copyright (C) 2017 University of South Florida * All rights reserved. * - * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/rules/StopValidatorTest.java b/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/rules/StopValidatorTest.java index dadf925c..8ec76646 100644 --- a/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/rules/StopValidatorTest.java +++ b/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/rules/StopValidatorTest.java @@ -2,7 +2,7 @@ * Copyright (C) 2017 University of South Florida. * All rights reserved. * - * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/rules/TimestampValidatorTest.java b/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/rules/TimestampValidatorTest.java index faf93fe0..86c763ef 100644 --- a/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/rules/TimestampValidatorTest.java +++ b/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/rules/TimestampValidatorTest.java @@ -2,7 +2,7 @@ * Copyright (C) 2017 University of South Florida. * All rights reserved. * - * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/rules/TripDescriptorValidatorTest.java b/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/rules/TripDescriptorValidatorTest.java index bd4c25bd..733a9c64 100644 --- a/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/rules/TripDescriptorValidatorTest.java +++ b/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/rules/TripDescriptorValidatorTest.java @@ -2,7 +2,7 @@ * Copyright (C) 2017 University of South Florida. * All rights reserved. * - * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/rules/VehicleValidatorTest.java b/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/rules/VehicleValidatorTest.java index 8b54cca9..f0959ed3 100644 --- a/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/rules/VehicleValidatorTest.java +++ b/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/rules/VehicleValidatorTest.java @@ -2,7 +2,7 @@ * Copyright (C) 2017 University of South Florida. * All rights reserved. * - * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/util/TestUtils.java b/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/util/TestUtils.java index 23156030..dd4ff47f 100644 --- a/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/util/TestUtils.java +++ b/gtfs-realtime-validator-lib/src/test/java/edu/usf/cutr/gtfsrtvalidator/lib/test/util/TestUtils.java @@ -2,7 +2,7 @@ * Copyright (C) 2017 University of South Florida. * All rights reserved. * - * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * From 43c4c40d61cba72073290130668f2ed89d34c2b4 Mon Sep 17 00:00:00 2001 From: barbeau Date: Wed, 18 Apr 2018 14:07:32 -0400 Subject: [PATCH 4/5] Revert accidental change to license header comments --- .../edu/usf/cutr/gtfsrtvalidator/api/resource/GtfsFeed.java | 2 +- .../edu/usf/cutr/gtfsrtvalidator/api/resource/GtfsRtFeed.java | 2 +- .../edu/usf/cutr/gtfsrtvalidator/api/resource/VersionApi.java | 2 +- .../edu/usf/cutr/gtfsrtvalidator/background/BackgroundTask.java | 2 +- .../src/main/java/edu/usf/cutr/gtfsrtvalidator/db/GTFSDB.java | 2 +- .../main/java/edu/usf/cutr/gtfsrtvalidator/helper/DBHelper.java | 2 +- .../edu/usf/cutr/gtfsrtvalidator/helper/HttpMessageHelper.java | 2 +- .../java/edu/usf/cutr/gtfsrtvalidator/helper/QueryHelper.java | 2 +- .../java/edu/usf/cutr/gtfsrtvalidator/servlets/GetFeedJSON.java | 2 +- .../main/java/edu/usf/cutr/gtfsrtvalidator/util/FileUtil.java | 2 +- .../java/edu/usf/cutr/gtfsrtvalidator/util/ProtoBufUtils.java | 2 +- .../src/main/resources/webroot/error.html | 2 +- .../edu/usf/cutr/gtfsrtvalidator/api/resource/GtfsFeedTest.java | 2 +- .../edu/usf/cutr/gtfsrtvalidator/test/queries/QueryTest.java | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/api/resource/GtfsFeed.java b/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/api/resource/GtfsFeed.java index ea65a288..5a70c459 100644 --- a/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/api/resource/GtfsFeed.java +++ b/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/api/resource/GtfsFeed.java @@ -2,7 +2,7 @@ * Copyright (C) 2011 Nipuna Gunathilake. * All rights reserved. * - * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/api/resource/GtfsRtFeed.java b/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/api/resource/GtfsRtFeed.java index 7c279ba2..d30e5745 100644 --- a/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/api/resource/GtfsRtFeed.java +++ b/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/api/resource/GtfsRtFeed.java @@ -2,7 +2,7 @@ * Copyright (C) 2011 Nipuna Gunathilake. * All rights reserved. * - * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/api/resource/VersionApi.java b/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/api/resource/VersionApi.java index 35389070..113e3b66 100644 --- a/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/api/resource/VersionApi.java +++ b/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/api/resource/VersionApi.java @@ -2,7 +2,7 @@ * Copyright (C) 2011 Nipuna Gunathilake. * All rights reserved. * - * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/background/BackgroundTask.java b/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/background/BackgroundTask.java index caf760e9..cede7c73 100644 --- a/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/background/BackgroundTask.java +++ b/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/background/BackgroundTask.java @@ -2,7 +2,7 @@ * Copyright (C) 2017 Nipuna Gunathilake, University of South Florida * All rights reserved. * - * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/db/GTFSDB.java b/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/db/GTFSDB.java index e74e9e72..67d6f679 100644 --- a/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/db/GTFSDB.java +++ b/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/db/GTFSDB.java @@ -2,7 +2,7 @@ * Copyright (C) 2015 Nipuna Gunathilake. * All rights reserved. * - * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/helper/DBHelper.java b/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/helper/DBHelper.java index 73a192c2..78c5319f 100644 --- a/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/helper/DBHelper.java +++ b/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/helper/DBHelper.java @@ -2,7 +2,7 @@ * Copyright (C) 2011 Nipuna Gunathilake. * All rights reserved. * - * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/helper/HttpMessageHelper.java b/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/helper/HttpMessageHelper.java index dd821b01..0cb2a1fc 100644 --- a/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/helper/HttpMessageHelper.java +++ b/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/helper/HttpMessageHelper.java @@ -2,7 +2,7 @@ * Copyright (C) 2011 Nipuna Gunathilake. * All rights reserved. * - * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/helper/QueryHelper.java b/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/helper/QueryHelper.java index e4bb2562..250917a2 100644 --- a/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/helper/QueryHelper.java +++ b/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/helper/QueryHelper.java @@ -2,7 +2,7 @@ * Copyright (C) 2017 University of South Florida. * All rights reserved. * - * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/servlets/GetFeedJSON.java b/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/servlets/GetFeedJSON.java index cc442e34..d575be14 100644 --- a/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/servlets/GetFeedJSON.java +++ b/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/servlets/GetFeedJSON.java @@ -2,7 +2,7 @@ * Copyright (C) 2011 Nipuna Gunathilake. * All rights reserved. * - * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/util/FileUtil.java b/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/util/FileUtil.java index 27e529c4..32fd2f7f 100644 --- a/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/util/FileUtil.java +++ b/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/util/FileUtil.java @@ -2,7 +2,7 @@ * Copyright (C) 2011-2018 Nipuna Gunathilake, University of South Florida (sjbarbeau@gmail.com) * All rights reserved. * - * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/util/ProtoBufUtils.java b/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/util/ProtoBufUtils.java index 6cdb4ad8..61ab2732 100644 --- a/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/util/ProtoBufUtils.java +++ b/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/util/ProtoBufUtils.java @@ -2,7 +2,7 @@ * Copyright (C) 2011 Nipuna Gunathilake. * All rights reserved. * - * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-webapp/src/main/resources/webroot/error.html b/gtfs-realtime-validator-webapp/src/main/resources/webroot/error.html index 723ee92c..75df57b8 100644 --- a/gtfs-realtime-validator-webapp/src/main/resources/webroot/error.html +++ b/gtfs-realtime-validator-webapp/src/main/resources/webroot/error.html @@ -3,7 +3,7 @@ ~ Copyright (C) 2011 Nipuna Gunathilake. ~ All rights reserved. ~ - ~ Licensed under the Apache License, VersionModel 2.0 (the "License"); + ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. ~ You may obtain a copy of the License at ~ diff --git a/gtfs-realtime-validator-webapp/src/test/java/edu/usf/cutr/gtfsrtvalidator/api/resource/GtfsFeedTest.java b/gtfs-realtime-validator-webapp/src/test/java/edu/usf/cutr/gtfsrtvalidator/api/resource/GtfsFeedTest.java index ae10b495..6e06fdcd 100644 --- a/gtfs-realtime-validator-webapp/src/test/java/edu/usf/cutr/gtfsrtvalidator/api/resource/GtfsFeedTest.java +++ b/gtfs-realtime-validator-webapp/src/test/java/edu/usf/cutr/gtfsrtvalidator/api/resource/GtfsFeedTest.java @@ -2,7 +2,7 @@ * Copyright (C) 2017 University of South Florida. * All rights reserved. * - * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/gtfs-realtime-validator-webapp/src/test/java/edu/usf/cutr/gtfsrtvalidator/test/queries/QueryTest.java b/gtfs-realtime-validator-webapp/src/test/java/edu/usf/cutr/gtfsrtvalidator/test/queries/QueryTest.java index fe3734c4..2d838ea5 100644 --- a/gtfs-realtime-validator-webapp/src/test/java/edu/usf/cutr/gtfsrtvalidator/test/queries/QueryTest.java +++ b/gtfs-realtime-validator-webapp/src/test/java/edu/usf/cutr/gtfsrtvalidator/test/queries/QueryTest.java @@ -2,7 +2,7 @@ * Copyright (C) 2017 University of South Florida. * All rights reserved. * - * Licensed under the Apache License, VersionModel 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * From e47935a5a9c4ef5b9c7998b416ab3976a422c6dc Mon Sep 17 00:00:00 2001 From: barbeau Date: Wed, 18 Apr 2018 14:09:12 -0400 Subject: [PATCH 5/5] Revert accidental change to license header comments --- .../java/edu/usf/cutr/gtfsrtvalidator/util/ProtoBufUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/util/ProtoBufUtils.java b/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/util/ProtoBufUtils.java index 61ab2732..85b1ed0e 100644 --- a/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/util/ProtoBufUtils.java +++ b/gtfs-realtime-validator-webapp/src/main/java/edu/usf/cutr/gtfsrtvalidator/util/ProtoBufUtils.java @@ -2,7 +2,7 @@ * Copyright (C) 2011 Nipuna Gunathilake. * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at *