Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

replace http with https for dtd file paths #2462

Closed
wants to merge 3 commits into from
Closed

replace http with https for dtd file paths #2462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b71fc01
replace http with https for dtd file paths
vsp-gleich Mar 22, 2023
0e876f1
Merge branch 'master' into httpsdtdpaths
vsp-gleich Apr 5, 2023
83bdfd2
Merge branch 'master' into httpsdtdpaths
vsp-gleich Apr 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions contribs/accessibility/examples/RunAccessibilityExample/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE config SYSTEM "http://www.matsim.org/files/dtd/config_v2.dtd">
<!DOCTYPE config SYSTEM "https://www.matsim.org/files/dtd/config_v2.dtd">
<config>
<!-- ====================================================================== -->
<module name="accessibility" >
Expand Down Expand Up @@ -44,4 +44,4 @@
<param name="routingRandomness" value="0" />
</module>
<!-- ====================================================================== -->
</config>
</config>
2 changes: 1 addition & 1 deletion contribs/accessibility/examples/RunAccessibilityExample/facilities.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE facilities SYSTEM "http://www.matsim.org/files/dtd/facilities_v1.dtd">
<!DOCTYPE facilities SYSTEM "https://www.matsim.org/files/dtd/facilities_v1.dtd">
<facilities>

<!-- ====================================================================== -->
Expand Down
2 changes: 1 addition & 1 deletion contribs/accessibility/examples/RunAccessibilityExample/network.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE network SYSTEM "http://www.matsim.org/files/dtd/network_v2.dtd">
<!DOCTYPE network SYSTEM "https://www.matsim.org/files/dtd/network_v2.dtd">
<network>

<!-- ====================================================================== -->
Expand Down
4 changes: 2 additions & 2 deletions ...test/input/org/matsim/contrib/accessibility/run/AccessibilityIntegrationTest/schedule.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE transitSchedule SYSTEM "http://www.matsim.org/files/dtd/transitSchedule_v1.dtd">
<!DOCTYPE transitSchedule SYSTEM "https://www.matsim.org/files/dtd/transitSchedule_v1.dtd">

<transitSchedule>
<transitStops>
Expand Down Expand Up @@ -60,4 +60,4 @@
</departures>
</transitRoute>
</transitLine>
</transitSchedule>
</transitSchedule>
4 changes: 2 additions & 2 deletions ...est/input/org/matsim/contrib/accessibility/run/AccessibilityIntegrationTest/schedule2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE transitSchedule SYSTEM "http://www.matsim.org/files/dtd/transitSchedule_v1.dtd">
<!DOCTYPE transitSchedule SYSTEM "https://www.matsim.org/files/dtd/transitSchedule_v1.dtd">

<transitSchedule>
<transitStops>
Expand Down Expand Up @@ -33,4 +33,4 @@
</departures>
</transitRoute>
</transitLine>
</transitSchedule>
</transitSchedule>
4 changes: 2 additions & 2 deletions ...b/accessibility/run/AccessibilityIntegrationTest/testWithBoundingBoxConfigFile/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE config SYSTEM "http://www.matsim.org/files/dtd/config_v2.dtd">
<!DOCTYPE config SYSTEM "https://www.matsim.org/files/dtd/config_v2.dtd">
<config>
<!-- ====================================================================== -->
<module name="accessibility" >
Expand Down Expand Up @@ -54,4 +54,4 @@
<param name="usingTravelTimesAndDistances" value="true" />
</module>
<!-- ====================================================================== -->
</config>
</config>
2 changes: 1 addition & 1 deletion ...cessibility/run/AccessibilityIntegrationTest/testWithBoundingBoxConfigFile/facilities.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE facilities SYSTEM "http://www.matsim.org/files/dtd/facilities_v1.dtd">
<!DOCTYPE facilities SYSTEM "https://www.matsim.org/files/dtd/facilities_v1.dtd">
<facilities>

<!-- ====================================================================== -->
Expand Down
2 changes: 1 addition & 1 deletion .../accessibility/run/AccessibilityIntegrationTest/testWithBoundingBoxConfigFile/network.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE network SYSTEM "http://www.matsim.org/files/dtd/network_v2.dtd">
<!DOCTYPE network SYSTEM "https://www.matsim.org/files/dtd/network_v2.dtd">
<network>

<!-- ====================================================================== -->
Expand Down
2 changes: 1 addition & 1 deletion ...ty/run/AccessibilityIntegrationTest/testWithPredefinedMeasuringPoints/measuringPoints.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE facilities SYSTEM "http://www.matsim.org/files/dtd/facilities_v1.dtd">
<!DOCTYPE facilities SYSTEM "https://www.matsim.org/files/dtd/facilities_v1.dtd">
<facilities>

<!-- ====================================================================== -->
Expand Down
8 changes: 4 additions & 4 deletions ...test/input/org/matsim/contrib/accessibility/run/AccessibilityIntegrationTest/vehicles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<vehicleDefinitions xmlns="http://www.matsim.org/files/dtd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.matsim.org/files/dtd http://www.matsim.org/files/dtd/vehicleDefinitions_v1.0.xsd">
<vehicleDefinitions xmlns="https://www.matsim.org/files/dtd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="https://www.matsim.org/files/dtd https://www.matsim.org/files/dtd/vehicleDefinitions_v1.0.xsd">

<vehicleType id="bus"> <description>bus</description>
<capacity>
<seats persons="50"/>
Expand All @@ -11,4 +11,4 @@
</vehicleType>
<vehicle id="bus_1" type="bus"/>
<vehicle id="bus_2" type="bus"/>
</vehicleDefinitions>
</vehicleDefinitions>
6 changes: 3 additions & 3 deletions contribs/accidents/test/input/org/matsim/contrib/accidents/equil_scenario/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" ?>
<!DOCTYPE config SYSTEM "http://www.matsim.org/files/dtd/config_v2.dtd">
<!DOCTYPE config SYSTEM "https://www.matsim.org/files/dtd/config_v2.dtd">
<config>

<module name="global">
Expand All @@ -25,7 +25,7 @@
<!-- "start/endTime" of MobSim (00:00:00 == take earliest activity time/ run as long as active vehicles exist) -->
<param name="startTime" value="00:00:00" />
<param name="endTime" value="00:00:00" />

<param name = "snapshotperiod" value = "00:00:00"/> <!-- 00:00:00 means NO snapshot writing -->
</module>

Expand Down Expand Up @@ -66,7 +66,7 @@
</parameterset>
</parameterset>
</module>

<module name="strategy">
<param name="maxAgentPlanMemorySize" value="5" /> <!-- 0 means unlimited -->

Expand Down
2 changes: 1 addition & 1 deletion contribs/accidents/test/input/org/matsim/contrib/accidents/equil_scenario/network.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE network SYSTEM "http://www.matsim.org/files/dtd/network_v1.dtd">
<!DOCTYPE network SYSTEM "https://www.matsim.org/files/dtd/network_v1.dtd">

<network name="equil test network">
<nodes>
Expand Down
4 changes: 2 additions & 2 deletions contribs/accidents/test/input/org/matsim/contrib/accidents/equil_scenario/plans100.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" ?>
<!DOCTYPE plans SYSTEM "http://www.matsim.org/files/dtd/plans_v4.dtd">
<!DOCTYPE plans SYSTEM "https://www.matsim.org/files/dtd/plans_v4.dtd">
<plans xml:lang="de-CH">
<person id="1">
<plan>
Expand All @@ -18,7 +18,7 @@
<act type="h" x="-25000" y="0" link="1" />
</plan>
</person>

<person id="2">
<plan>
<act type="h" x="-25000" y="0" link="1" end_time="05:59" />
Expand Down
12 changes: 6 additions & 6 deletions ...s/test/input/org/matsim/contrib/accidents/internalization_test/internalization_config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" ?>
<!DOCTYPE config SYSTEM "http://www.matsim.org/files/dtd/config_v1.dtd">
<!DOCTYPE config SYSTEM "https://www.matsim.org/files/dtd/config_v1.dtd">
<config>

<module name="global">
Expand All @@ -25,7 +25,7 @@
<!-- "start/endTime" of MobSim (00:00:00 == take earliest activity time/ run as long as active vehicles exist) -->
<param name="startTime" value="00:00:00" />
<param name="endTime" value="00:00:00" />

<param name = "snapshotperiod" value = "00:00:00"/> <!-- 00:00:00 means NO snapshot writing -->
</module>

Expand All @@ -38,12 +38,12 @@
<param name="performing" value="+6" />
<param name="traveling" value="-6" />
<param name="waiting" value="-0" />

<param name="activityType_0" value="home" /> <!-- home -->
<param name="activityPriority_0" value="1" />
<param name="activityTypicalDuration_0" value="12:00:00" />
<param name="activityMinimalDuration_0" value="08:00:00" />

<param name="activityType_1" value="work" /> <!-- work -->
<param name="activityPriority_1" value="1" />
<param name="activityTypicalDuration_1" value="08:00:00" />
Expand All @@ -53,7 +53,7 @@
<param name="activityEarliestEndTime_1" value="" />
<param name="activityClosingTime_1" value="18:00:00" />
</module>

<module name="strategy">
<param name="maxAgentPlanMemorySize" value="5" /> <!-- 0 means unlimited -->

Expand All @@ -64,4 +64,4 @@
<param name="Module_2" value="ReRoute" />
</module>

</config>
</config>
4 changes: 2 additions & 2 deletions .../test/input/org/matsim/contrib/accidents/internalization_test/internalization_network.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE network SYSTEM "http://www.matsim.org/files/dtd/network_v1.dtd">
<!DOCTYPE network SYSTEM "https://www.matsim.org/files/dtd/network_v1.dtd">

<network name="internalization network">
<nodes>
Expand All @@ -18,4 +18,4 @@
<link id="5" from="4" to="5" length="310.00" capacity="360" freespeed="27.77777777777778" permlanes="1" oneway="1" modes="car" />
<link id="6" from="5" to="6" length="200.00" capacity="36000" freespeed="27.77777777777778" permlanes="2" oneway="1" modes="car" />
</links>
</network>
</network>
6 changes: 3 additions & 3 deletions ...ts/test/input/org/matsim/contrib/accidents/internalization_test/internalization_plans.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" ?>
<!DOCTYPE plans SYSTEM "http://www.matsim.org/files/dtd/plans_v4.dtd">
<!DOCTYPE plans SYSTEM "https://www.matsim.org/files/dtd/plans_v4.dtd">
<plans xml:lang="de-CH">
<person id="1">
<plan>
Expand All @@ -10,7 +10,7 @@
<act type="work" x="500" y="0" link="6" dur="02:35" />
</plan>
</person>

<person id="2">
<plan>
<act type="home" x="-750" y="0" link="1" end_time="06:00:01" />
Expand Down Expand Up @@ -101,4 +101,4 @@
</plan>
</person>

</plans>
</plans>
12 changes: 6 additions & 6 deletions ...ccidents/test/input/org/matsim/contrib/accidents/trial_scenario/trial_scenario_config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" ?>
<!DOCTYPE config SYSTEM "http://www.matsim.org/files/dtd/config_v1.dtd">
<!DOCTYPE config SYSTEM "https://www.matsim.org/files/dtd/config_v1.dtd">
<config>

<module name="global">
Expand All @@ -25,7 +25,7 @@
<!-- "start/endTime" of MobSim (00:00:00 == take earliest activity time/ run as long as active vehicles exist) -->
<param name="startTime" value="00:00:00" />
<param name="endTime" value="00:00:00" />

<param name = "snapshotperiod" value = "00:00:00"/> <!-- 00:00:00 means NO snapshot writing -->
</module>

Expand All @@ -38,12 +38,12 @@
<param name="performing" value="+6" />
<param name="traveling" value="-6" />
<param name="waiting" value="-0" />

<param name="activityType_0" value="h" /> <!-- home -->
<param name="activityPriority_0" value="1" />
<param name="activityTypicalDuration_0" value="12:00:00" />
<param name="activityMinimalDuration_0" value="08:00:00" />

<param name="activityType_1" value="w" /> <!-- work -->
<param name="activityPriority_1" value="1" />
<param name="activityTypicalDuration_1" value="08:00:00" />
Expand All @@ -53,7 +53,7 @@
<param name="activityEarliestEndTime_1" value="" />
<param name="activityClosingTime_1" value="18:00:00" />
</module>

<module name="strategy">
<param name="maxAgentPlanMemorySize" value="5" /> <!-- 0 means unlimited -->

Expand All @@ -64,4 +64,4 @@
<param name="Module_2" value="ReRoute" />
</module>

</config>
</config>
4 changes: 2 additions & 2 deletions ...cidents/test/input/org/matsim/contrib/accidents/trial_scenario/trial_scenario_network.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE network SYSTEM "http://www.matsim.org/files/dtd/network_v1.dtd">
<!DOCTYPE network SYSTEM "https://www.matsim.org/files/dtd/network_v1.dtd">

<network name="trial scenario network">
<nodes>
Expand All @@ -12,4 +12,4 @@
<link id="2" from="2" to="3" length="4500.00" capacity="360" freespeed="13.88888888888889" permlanes="1" oneway="1" modes="car" />
<link id="3" from="3" to="1" length="6000.00" capacity="360" freespeed="27.77777777777778" permlanes="2" oneway="1" modes="car" />
</links>
</network>
</network>
6 changes: 3 additions & 3 deletions ...accidents/test/input/org/matsim/contrib/accidents/trial_scenario/trial_scenario_plans.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" ?>
<!DOCTYPE plans SYSTEM "http://www.matsim.org/files/dtd/plans_v4.dtd">
<!DOCTYPE plans SYSTEM "https://www.matsim.org/files/dtd/plans_v4.dtd">
<plans xml:lang="de-CH">
<person id="1">
<plan>
Expand All @@ -18,7 +18,7 @@
<act type="h" x="-2500" y="50" link="1" />
</plan>
</person>

<person id="2">
<plan>
<act type="h" x="2500" y="0" link="3" end_time="05:59" />
Expand Down Expand Up @@ -145,4 +145,4 @@
</plan>
</person>

</plans>
</plans>
4 changes: 2 additions & 2 deletions contribs/application/test/input/org/matsim/application/MATSimApplicationTest/persons.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE population SYSTEM "http://www.matsim.org/files/dtd/population_v6.dtd">
<!DOCTYPE population SYSTEM "https://www.matsim.org/files/dtd/population_v6.dtd">

<population desc="population written from streaming">

Expand Down Expand Up @@ -295,4 +295,4 @@

<!-- ====================================================================== -->

</population>
</population>
4 changes: 2 additions & 2 deletions contribs/application/test/input/org/matsim/application/prepare/population/persons.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE population SYSTEM "http://www.matsim.org/files/dtd/population_v6.dtd">
<!DOCTYPE population SYSTEM "https://www.matsim.org/files/dtd/population_v6.dtd">

<population desc="population written from streaming">

Expand Down Expand Up @@ -225,4 +225,4 @@

<!-- ====================================================================== -->

</population>
</population>
2 changes: 1 addition & 1 deletion contribs/application/test/input/org/matsim/freightDemandGeneration/testPopulation.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE plans SYSTEM "http://www.matsim.org/files/dtd/plans_v4.dtd">
<!DOCTYPE plans SYSTEM "https://www.matsim.org/files/dtd/plans_v4.dtd">

<plans>

Expand Down
4 changes: 2 additions & 2 deletions contribs/application/test/input/org/matsim/freightDemandGeneration/testVehicleTypes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<vehicleDefinitions xmlns="http://www.matsim.org/files/dtd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.matsim.org/files/dtd http://www.matsim.org/files/dtd/vehicleDefinitions_v2.0.xsd">
<vehicleDefinitions xmlns="https://www.matsim.org/files/dtd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://www.matsim.org/files/dtd https://www.matsim.org/files/dtd/vehicleDefinitions_v2.0.xsd">

<vehicleType id="testVehicle1">

Expand Down Expand Up @@ -45,4 +45,4 @@
<networkMode networkMode="car"/>
<flowEfficiencyFactor factor="1.0"/>
</vehicleType>
</vehicleDefinitions>
</vehicleDefinitions>
6 changes: 3 additions & 3 deletions contribs/av/test/input/org/matsim/contrib/av/flow/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" ?>
<!DOCTYPE config SYSTEM "http://www.matsim.org/files/dtd/config_v2.dtd">
<!DOCTYPE config SYSTEM "https://www.matsim.org/files/dtd/config_v2.dtd">
<config>

<module name="network">
<param name="inputNetworkFile" value="grid_network.xml" />
</module>
Expand All @@ -12,7 +12,7 @@
<!-- Options: maxOfStarttimeAndEarliestActivityEnd onlyUseStarttime -->
<param name="simStarttimeInterpretation" value="maxOfStarttimeAndEarliestActivityEnd" />
</module>

<module name="otfvis">
<param name="drawNonMovingItems" value="true" />
</module>
Expand Down
Loading