You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by mi...@apache.org on 2016/11/07 22:23:22 UTC
[01/26] incubator-trafficcontrol git commit: merge master
Repository: incubator-trafficcontrol
Updated Branches:
refs/heads/psql 91021764b -> 0604f3699
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/shared/Certificate.java
----------------------------------------------------------------------
diff --git a/traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/shared/Certificate.java b/traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/shared/Certificate.java
index f65b64c..bc8712b 100644
--- a/traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/shared/Certificate.java
+++ b/traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/shared/Certificate.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2016 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/shared/CertificateData.java
----------------------------------------------------------------------
diff --git a/traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/shared/CertificateData.java b/traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/shared/CertificateData.java
index 339e7d6..202908f 100644
--- a/traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/shared/CertificateData.java
+++ b/traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/shared/CertificateData.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2016 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/shared/DeliveryServiceCertificates.java
----------------------------------------------------------------------
diff --git a/traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/shared/DeliveryServiceCertificates.java b/traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/shared/DeliveryServiceCertificates.java
index ae22348..99246c1 100644
--- a/traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/shared/DeliveryServiceCertificates.java
+++ b/traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/shared/DeliveryServiceCertificates.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2016 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/shared/DeliveryServiceCertificatesMBean.java
----------------------------------------------------------------------
diff --git a/traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/shared/DeliveryServiceCertificatesMBean.java b/traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/shared/DeliveryServiceCertificatesMBean.java
index b9f9b33..9586e6c 100644
--- a/traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/shared/DeliveryServiceCertificatesMBean.java
+++ b/traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/shared/DeliveryServiceCertificatesMBean.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2016 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/shared/src/test/java/shared/DeliveryServiceCertificatesTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/shared/src/test/java/shared/DeliveryServiceCertificatesTest.java b/traffic_router/shared/src/test/java/shared/DeliveryServiceCertificatesTest.java
index ef96d5c..d78af4a 100644
--- a/traffic_router/shared/src/test/java/shared/DeliveryServiceCertificatesTest.java
+++ b/traffic_router/shared/src/test/java/shared/DeliveryServiceCertificatesTest.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2016 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_stats/build/build_rpm.sh
----------------------------------------------------------------------
diff --git a/traffic_stats/build/build_rpm.sh b/traffic_stats/build/build_rpm.sh
index 1384528..5f9f81d 100755
--- a/traffic_stats/build/build_rpm.sh
+++ b/traffic_stats/build/build_rpm.sh
@@ -1,7 +1,6 @@
#!/bin/bash
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_stats/build/traffic_stats.spec
----------------------------------------------------------------------
diff --git a/traffic_stats/build/traffic_stats.spec b/traffic_stats/build/traffic_stats.spec
index 128efce..30ca284 100644
--- a/traffic_stats/build/traffic_stats.spec
+++ b/traffic_stats/build/traffic_stats.spec
@@ -1,5 +1,4 @@
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -22,10 +21,10 @@ Version: %{traffic_control_version}
Release: %{build_number}
Summary: Tool to pull data from traffic monitor and store in Influxdb
Packager: david_neuman2 at Cable dot Comcast dot com
-Vendor: Comcast Cable
+Vendor: Apache Software Foundation
Group: Applications/Communications
License: Apache License, Version 2.0
-URL: https://github.com/Comcast/traffic_control/
+URL: https://github.com/apache/incubator-trafficcontrol
Source: %{_sourcedir}/traffic_stats-%{traffic_control_version}.tgz
%description
@@ -53,7 +52,7 @@ go_get_version() {
}
# get traffic_ops client
-godir=src/github.com/Comcast/traffic_control/traffic_ops/client
+godir=src/github.com/apache/incubator-trafficcontrol/traffic_ops/client
( mkdir -p "$godir" && \
cd "$godir" && \
cp -r "$TC_DIR"/traffic_ops/client/* . && \
@@ -61,7 +60,7 @@ godir=src/github.com/Comcast/traffic_control/traffic_ops/client
) || { echo "Could not build go program at $(pwd): $!"; exit 1; }
#get traffic_stats client
-godir=src/github.com/Comcast/traffic_control/traffic_stats
+godir=src/github.com/apache/incubator-trafficcontrol/traffic_stats
oldpwd=$(pwd)
( mkdir -p "$godir" && \
cd "$godir" && \
@@ -72,7 +71,7 @@ oldpwd=$(pwd)
) || { echo "Could not build go program at $(pwd): $!"; exit 1; }
#build influxdb_tools
-godir=src/github.com/Comcast/traffic_control/traffic_stats/influxdb_tools
+godir=src/github.com/apache/incubator-trafficcontrol/traffic_stats/influxdb_tools
( mkdir -p "$godir" && \
cd "$godir" && \
cp -r "$TC_DIR"/traffic_stats/influxdb_tools/* . && \
@@ -92,7 +91,7 @@ mkdir -p "${RPM_BUILD_ROOT}"/etc/init.d
mkdir -p "${RPM_BUILD_ROOT}"/etc/logrotate.d
mkdir -p "${RPM_BUILD_ROOT}"/usr/share/grafana/public/dashboards/
-src=src/github.com/Comcast/traffic_control/traffic_stats
+src=src/github.com/apache/incubator-trafficcontrol/traffic_stats
cp -p bin/traffic_stats "${RPM_BUILD_ROOT}"/opt/traffic_stats/bin/traffic_stats
cp "$src"/traffic_stats.cfg "${RPM_BUILD_ROOT}"/opt/traffic_stats/conf/traffic_stats.cfg
cp "$src"/traffic_stats_seelog.xml "${RPM_BUILD_ROOT}"/opt/traffic_stats/conf/traffic_stats_seelog.xml
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_stats/grafana/traffic_ops_cachegroup.js
----------------------------------------------------------------------
diff --git a/traffic_stats/grafana/traffic_ops_cachegroup.js b/traffic_stats/grafana/traffic_ops_cachegroup.js
index 7a26197..a714a58 100644
--- a/traffic_stats/grafana/traffic_ops_cachegroup.js
+++ b/traffic_stats/grafana/traffic_ops_cachegroup.js
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_stats/grafana/traffic_ops_deliveryservice.js
----------------------------------------------------------------------
diff --git a/traffic_stats/grafana/traffic_ops_deliveryservice.js b/traffic_stats/grafana/traffic_ops_deliveryservice.js
index e51b68a..2508e3c 100644
--- a/traffic_stats/grafana/traffic_ops_deliveryservice.js
+++ b/traffic_stats/grafana/traffic_ops_deliveryservice.js
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_stats/grafana/traffic_ops_scripted.js
----------------------------------------------------------------------
diff --git a/traffic_stats/grafana/traffic_ops_scripted.js b/traffic_stats/grafana/traffic_ops_scripted.js
index ce5cf8d..78a5d87 100644
--- a/traffic_stats/grafana/traffic_ops_scripted.js
+++ b/traffic_stats/grafana/traffic_ops_scripted.js
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_stats/grafana/traffic_ops_server.js
----------------------------------------------------------------------
diff --git a/traffic_stats/grafana/traffic_ops_server.js b/traffic_stats/grafana/traffic_ops_server.js
index 10ef058..9efcfbd 100644
--- a/traffic_stats/grafana/traffic_ops_server.js
+++ b/traffic_stats/grafana/traffic_ops_server.js
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -60,8 +59,7 @@ dashboard.refresh = "30s";
{
- dashboard.rows.push(
- {
+ dashboard.rows.push( {
"height": "250px",
"panels": [
{
@@ -73,19 +71,7 @@ dashboard.refresh = "30s";
"id": 1,
"datasource": "cache_stats",
"renderer": "flot",
- "x-axis": true,
- "y-axis": true,
- "y_formats": [
- "bps",
- "short"
- ],
"grid": {
- "leftLogBase": 1,
- "leftMax": null,
- "rightMax": null,
- "leftMin": null,
- "rightMin": null,
- "rightLogBase": 1,
"threshold1": null,
"threshold2": null,
"threshold1Color": "rgba(216, 200, 27, 0.27)",
@@ -112,7 +98,9 @@ dashboard.refresh = "30s";
"steppedLine": false,
"tooltip": {
"value_type": "cumulative",
- "shared": true
+ "shared": true,
+ "sort": 0,
+ "msResolution": false
},
"timeFrom": null,
"timeShift": null,
@@ -120,13 +108,65 @@ dashboard.refresh = "30s";
{
"measurement": "bandwidth.1min",
"tags": {},
- "query": "SELECT mean(value)*1000 FROM \"monthly\".\"bandwidth.1min\" WHERE hostname='" + which + "' and $timeFilter GROUP BY time(60s)",
- "rawQuery": true
+ "query": "SELECT mean(value) FROM \"monthly\".\"bandwidth.1min\" WHERE hostname= '" + which + "' and $timeFilter GROUP BY time(60s)",
+ "rawQuery": true,
+ "refId": "A",
+ "policy": "default",
+ "dsType": "influxdb",
+ "resultFormat": "time_series",
+ "groupBy": [
+ {
+ "type": "time",
+ "params": [
+ "$interval"
+ ]
+ },
+ {
+ "type": "fill",
+ "params": [
+ "null"
+ ]
+ }
+ ],
+ "select": [
+ [
+ {
+ "type": "field",
+ "params": [
+ "value"
+ ]
+ },
+ {
+ "type": "mean",
+ "params": []
+ }
+ ]
+ ],
+ "alias": "bandwidth"
}
],
"aliasColors": {},
"seriesOverrides": [],
- "links": []
+ "links": [],
+ "yaxes": [
+ {
+ "show": true,
+ "min": null,
+ "max": null,
+ "logBase": 1,
+ "format": "Kbits"
+ },
+ {
+ "show": true,
+ "min": null,
+ "max": null,
+ "logBase": 1,
+ "format": "short"
+ }
+ ],
+ "xaxis": {
+ "show": true
+ }
}
],
"title": "Row",
@@ -145,18 +185,7 @@ dashboard.refresh = "30s";
"id": 2,
"datasource": "cache_stats",
"renderer": "flot",
- "x-axis": true,
- "y-axis": true,
- "y_formats": [
- "short"
- ],
"grid": {
- "leftLogBase": 1,
- "leftMax": null,
- "rightMax": null,
- "leftMin": null,
- "rightMin": null,
- "rightLogBase": 1,
"threshold1": null,
"threshold2": null,
"threshold1Color": "rgba(216, 200, 27, 0.27)",
@@ -183,7 +212,9 @@ dashboard.refresh = "30s";
"steppedLine": false,
"tooltip": {
"value_type": "cumulative",
- "shared": true
+ "shared": true,
+ "sort": 0,
+ "msResolution": false
},
"timeFrom": null,
"timeShift": null,
@@ -191,13 +222,64 @@ dashboard.refresh = "30s";
{
"measurement": "connections.1min",
"tags": {},
- "query": "SELECT mean(value) FROM \"monthly\".\"connections.1min\" WHERE hostname='" + which + "' and $timeFilter GROUP BY time(60s)",
- "rawQuery": true
+ "query": "SELECT mean(value) FROM \"monthly\".\"connections.1min\" WHERE hostname= '" + which + "' and $timeFilter GROUP BY time(60s)",
+ "rawQuery": true,
+ "refId": "A",
+ "policy": "default",
+ "dsType": "influxdb",
+ "resultFormat": "time_series",
+ "groupBy": [
+ {
+ "type": "time",
+ "params": [
+ "$interval"
+ ]
+ },
+ {
+ "type": "fill",
+ "params": [
+ "null"
+ ]
+ }
+ ],
+ "select": [
+ [
+ {
+ "type": "field",
+ "params": [
+ "value"
+ ]
+ },
+ {
+ "type": "mean",
+ "params": []
+ }
+ ]
+ ],
+ "alias": "connections"
}
],
"aliasColors": {},
"seriesOverrides": [],
- "links": []
+ "links": [],
+ "yaxes": [
+ {
+ "show": true,
+ "min": null,
+ "max": null,
+ "logBase": 1,
+ "format": "short"
+ },
+ {
+ "show": true,
+ "min": null,
+ "max": null,
+ "logBase": 1
+ }
+ ],
+ "xaxis": {
+ "show": true
+ }
}
],
"title": "Row",
@@ -299,9 +381,46 @@ dashboard.refresh = "30s";
"cpu_user"
]
}
+ ],
+ [
+ {
+ "type": "field",
+ "params": [
+ "usage_guest"
+ ]
+ },
+ {
+ "type": "mean",
+ "params": []
+ },
+ {
+ "type": "alias",
+ "params": [
+ "cpu_guest"
+ ]
+ }
+ ],
+ [
+ {
+ "type": "field",
+ "params": [
+ "usage_steal"
+ ]
+ },
+ {
+ "type": "mean",
+ "params": []
+ },
+ {
+ "type": "alias",
+ "params": [
+ "cpu_steal"
+ ]
+ }
]
],
- "measurement": "cpu"
+ "measurement": "cpu",
+ "alias": "$col"
}
],
"datasource": "telegraf",
@@ -355,7 +474,8 @@ dashboard.refresh = "30s";
"tooltip": {
"value_type": "individual",
"shared": true,
- "msResolution": true
+ "msResolution": true,
+ "sort": 2
},
"timeFrom": null,
"timeShift": null,
@@ -418,7 +538,8 @@ dashboard.refresh = "30s";
}
]
],
- "measurement": "mem"
+ "measurement": "mem",
+ "alias": "$col"
}
],
"datasource": "telegraf",
@@ -472,7 +593,8 @@ dashboard.refresh = "30s";
"tooltip": {
"value_type": "individual",
"shared": true,
- "msResolution": true
+ "msResolution": true,
+ "sort": 0
},
"timeFrom": null,
"timeShift": null,
@@ -579,7 +701,8 @@ dashboard.refresh = "30s";
}
]
],
- "measurement": "system"
+ "measurement": "system",
+ "alias": "$col"
}
],
"datasource": "telegraf",
@@ -633,7 +756,8 @@ dashboard.refresh = "30s";
"tooltip": {
"value_type": "cumulative",
"shared": true,
- "msResolution": true
+ "msResolution": true,
+ "sort": 0
},
"timeFrom": null,
"timeShift": null,
@@ -685,16 +809,53 @@ dashboard.refresh = "30s";
]
},
{
- "type": "mean",
+ "type": "sum",
"params": []
},
{
+ "type": "non_negative_derivative",
+ "params": [
+ "10s"
+ ]
+ },
+ {
"type": "alias",
"params": [
"read_time"
]
}
- ],
+ ]
+ ],
+ "measurement": "diskio",
+ "alias": "$col"
+ },
+ {
+ "refId": "B",
+ "policy": "default",
+ "dsType": "influxdb",
+ "resultFormat": "time_series",
+ "tags": [
+ {
+ "key": "host",
+ "operator": "=~",
+ "value": "/" + which + "/"
+ }
+ ],
+ "groupBy": [
+ {
+ "type": "time",
+ "params": [
+ "$interval"
+ ]
+ },
+ {
+ "type": "fill",
+ "params": [
+ "null"
+ ]
+ }
+ ],
+ "select": [
[
{
"type": "field",
@@ -703,10 +864,16 @@ dashboard.refresh = "30s";
]
},
{
- "type": "mean",
+ "type": "sum",
"params": []
},
{
+ "type": "non_negative_derivative",
+ "params": [
+ "10s"
+ ]
+ },
+ {
"type": "alias",
"params": [
"write_time"
@@ -714,7 +881,8 @@ dashboard.refresh = "30s";
}
]
],
- "measurement": "diskio"
+ "measurement": "diskio",
+ "alias": "$col"
}
],
"datasource": "telegraf",
@@ -768,6 +936,435 @@ dashboard.refresh = "30s";
"tooltip": {
"value_type": "cumulative",
"shared": true,
+ "msResolution": true,
+ "sort": 0
+ },
+ "timeFrom": null,
+ "timeShift": null,
+ "aliasColors": {},
+ "seriesOverrides": [],
+ "links": []
+ }
+ ]
+ },
+ {
+ "title": "Wrap Count and netstat",
+ "height": "250px",
+ "editable": true,
+ "collapse": false,
+ "panels": [
+ {
+ "title": "wrap count",
+ "error": false,
+ "span": 6,
+ "editable": true,
+ "type": "graph",
+ "isNew": true,
+ "id": 7,
+ "targets": [
+ {
+ "refId": "A",
+ "policy": "monthly",
+ "dsType": "influxdb",
+ "resultFormat": "time_series",
+ "tags": [
+ {
+ "key": "hostname",
+ "operator": "=~",
+ "value": "/" + which + "/"
+ }
+ ],
+ "groupBy": [
+ {
+ "type": "time",
+ "params": [
+ "$interval"
+ ]
+ },
+ {
+ "type": "fill",
+ "params": [
+ "null"
+ ]
+ }
+ ],
+ "select": [
+ [
+ {
+ "type": "field",
+ "params": [
+ "vol1_wrap_count"
+ ]
+ },
+ {
+ "type": "mean",
+ "params": []
+ },
+ {
+ "type": "alias",
+ "params": [
+ "vol1"
+ ]
+ }
+ ],
+ [
+ {
+ "type": "field",
+ "params": [
+ "vol2_wrap_count"
+ ]
+ },
+ {
+ "type": "mean",
+ "params": []
+ },
+ {
+ "type": "alias",
+ "params": [
+ "vol2"
+ ]
+ }
+ ]
+ ],
+ "measurement": "wrap_count.1min",
+ "alias": "$col"
+ }
+ ],
+ "datasource": "cache_stats",
+ "renderer": "flot",
+ "yaxes": [
+ {
+ "label": null,
+ "show": true,
+ "logBase": 1,
+ "min": null,
+ "max": null,
+ "format": "short"
+ },
+ {
+ "label": null,
+ "show": true,
+ "logBase": 1,
+ "min": null,
+ "max": null,
+ "format": "short"
+ }
+ ],
+ "xaxis": {
+ "show": true
+ },
+ "grid": {
+ "threshold1": null,
+ "threshold2": null,
+ "threshold1Color": "rgba(216, 200, 27, 0.27)",
+ "threshold2Color": "rgba(234, 112, 112, 0.22)"
+ },
+ "lines": true,
+ "fill": 1,
+ "linewidth": 2,
+ "points": false,
+ "pointradius": 5,
+ "bars": false,
+ "stack": false,
+ "percentage": false,
+ "legend": {
+ "show": true,
+ "values": false,
+ "min": false,
+ "max": false,
+ "current": false,
+ "total": false,
+ "avg": false
+ },
+ "nullPointMode": "connected",
+ "steppedLine": false,
+ "tooltip": {
+ "value_type": "cumulative",
+ "shared": true,
+ "sort": 0,
+ "msResolution": true
+ },
+ "timeFrom": null,
+ "timeShift": null,
+ "aliasColors": {},
+ "seriesOverrides": [],
+ "links": []
+ },
+ {
+ "title": "netstat",
+ "error": false,
+ "span": 6,
+ "editable": true,
+ "type": "graph",
+ "isNew": true,
+ "id": 8,
+ "targets": [
+ {
+ "refId": "A",
+ "policy": "default",
+ "dsType": "influxdb",
+ "resultFormat": "time_series",
+ "tags": [
+ {
+ "key": "host",
+ "operator": "=~",
+ "value": "/" + which + "/"
+ }
+ ],
+ "groupBy": [
+ {
+ "type": "time",
+ "params": [
+ "$interval"
+ ]
+ },
+ {
+ "type": "fill",
+ "params": [
+ "null"
+ ]
+ }
+ ],
+ "select": [
+ [
+ {
+ "type": "field",
+ "params": [
+ "tcp_close"
+ ]
+ },
+ {
+ "type": "mean",
+ "params": []
+ },
+ {
+ "type": "alias",
+ "params": [
+ "tcp_close"
+ ]
+ }
+ ],
+ [
+ {
+ "type": "field",
+ "params": [
+ "tcp_close_wait"
+ ]
+ },
+ {
+ "type": "mean",
+ "params": []
+ },
+ {
+ "type": "alias",
+ "params": [
+ "tcp_close_wait"
+ ]
+ }
+ ],
+ [
+ {
+ "type": "field",
+ "params": [
+ "tcp_established"
+ ]
+ },
+ {
+ "type": "mean",
+ "params": []
+ },
+ {
+ "type": "alias",
+ "params": [
+ "tcp_established"
+ ]
+ }
+ ],
+ [
+ {
+ "type": "field",
+ "params": [
+ "tcp_time_wait"
+ ]
+ },
+ {
+ "type": "mean",
+ "params": []
+ },
+ {
+ "type": "alias",
+ "params": [
+ "tcp_time_wait"
+ ]
+ }
+ ],
+ [
+ {
+ "type": "field",
+ "params": [
+ "tcp_closing"
+ ]
+ },
+ {
+ "type": "mean",
+ "params": []
+ },
+ {
+ "type": "alias",
+ "params": [
+ "tcp_closing"
+ ]
+ }
+ ],
+ [
+ {
+ "type": "field",
+ "params": [
+ "tcp_fin_wait1"
+ ]
+ },
+ {
+ "type": "mean",
+ "params": []
+ },
+ {
+ "type": "alias",
+ "params": [
+ "tcp_fin_wait1"
+ ]
+ }
+ ],
+ [
+ {
+ "type": "field",
+ "params": [
+ "tcp_fin_wait2"
+ ]
+ },
+ {
+ "type": "mean",
+ "params": []
+ },
+ {
+ "type": "alias",
+ "params": [
+ "tcp_fin_wait2"
+ ]
+ }
+ ],
+ [
+ {
+ "type": "field",
+ "params": [
+ "tcp_last_ack"
+ ]
+ },
+ {
+ "type": "mean",
+ "params": []
+ },
+ {
+ "type": "alias",
+ "params": [
+ "tcp_last_ack"
+ ]
+ }
+ ],
+ [
+ {
+ "type": "field",
+ "params": [
+ "tcp_syn_recv"
+ ]
+ },
+ {
+ "type": "mean",
+ "params": []
+ },
+ {
+ "type": "alias",
+ "params": [
+ "tcp_syn_recv"
+ ]
+ }
+ ],
+ [
+ {
+ "type": "field",
+ "params": [
+ "tcp_syn_sent"
+ ]
+ },
+ {
+ "type": "mean",
+ "params": []
+ },
+ {
+ "type": "alias",
+ "params": [
+ "tcp_syn_sent"
+ ]
+ }
+ ]
+ ],
+ "measurement": "netstat",
+ "alias": "$col"
+ }
+ ],
+ "datasource": "telegraf",
+ "renderer": "flot",
+ "yaxes": [
+ {
+ "label": null,
+ "show": true,
+ "logBase": 1,
+ "min": null,
+ "max": null,
+ "format": "short"
+ },
+ {
+ "label": null,
+ "show": true,
+ "logBase": 1,
+ "min": null,
+ "max": null,
+ "format": "short"
+ }
+ ],
+ "xaxis": {
+ "show": true
+ },
+ "grid": {
+ "threshold1": null,
+ "threshold2": null,
+ "threshold1Color": "rgba(216, 200, 27, 0.27)",
+ "threshold2Color": "rgba(234, 112, 112, 0.22)"
+ },
+ "lines": true,
+ "fill": 1,
+ "linewidth": 2,
+ "points": false,
+ "pointradius": 5,
+ "bars": false,
+ "stack": false,
+ "percentage": false,
+ "legend": {
+ "show": true,
+ "values": false,
+ "min": false,
+ "max": false,
+ "current": false,
+ "total": false,
+ "avg": false,
+ "hideEmpty": true,
+ "hideZero": true
+ },
+ "nullPointMode": "connected",
+ "steppedLine": false,
+ "tooltip": {
+ "value_type": "cumulative",
+ "shared": true,
+ "sort": 2,
"msResolution": true
},
"timeFrom": null,
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_stats/influxdb_tools/create_ts_databases.go
----------------------------------------------------------------------
diff --git a/traffic_stats/influxdb_tools/create_ts_databases.go b/traffic_stats/influxdb_tools/create_ts_databases.go
index 8e02220..e065b30 100644
--- a/traffic_stats/influxdb_tools/create_ts_databases.go
+++ b/traffic_stats/influxdb_tools/create_ts_databases.go
@@ -83,6 +83,8 @@ func createCacheStats(client influx.Client, replication *string) {
createContinuousQuery(client, "connections_cdn_type_1min", `CREATE CONTINUOUS QUERY connections_cdn_type_1min ON cache_stats RESAMPLE FOR 5m BEGIN SELECT sum(value) AS "value" INTO "cache_stats"."monthly"."connections.cdn.type.1min" FROM "cache_stats"."monthly"."connections.1min" GROUP BY time(1m), cdn, type END`)
createContinuousQuery(client, "maxKbps_1min", `CREATE CONTINUOUS QUERY maxKbps_1min ON cache_stats RESAMPLE FOR 2m BEGIN SELECT mean(value) AS value INTO cache_stats.monthly."maxkbps.1min" FROM cache_stats.daily.maxKbps GROUP BY time(1m), * END`)
createContinuousQuery(client, "maxkbps_cdn_1min", `CREATE CONTINUOUS QUERY maxkbps_cdn_1min ON cache_stats RESAMPLE FOR 5m BEGIN SELECT sum(value) AS value INTO cache_stats.monthly."maxkbps.cdn.1min" FROM cache_stats.monthly."maxkbps.1min" GROUP BY time(1m), cdn END`)
+ createContinuousQuery(client, "wrap_count_vol1_1m", `CREATE CONTINUOUS QUERY wrap_count_vol1_1m ON cache_stats RESAMPLE FOR 2m BEGIN SELECT mean(value) AS vol1_wrap_count INTO cache_stats.monthly."wrap_count.1min" FROM cache_stats.daily."ats.proxy.process.cache.volume_1.wrap_count" GROUP BY time(1m), * END`)
+ createContinuousQuery(client, "wrap_count_vol2_1m", `CREATE CONTINUOUS QUERY wrap_count_vol2_1m ON cache_stats RESAMPLE FOR 2m BEGIN SELECT mean(value) AS vol2_wrap_count INTO cache_stats.monthly."wrap_count.1min" FROM cache_stats.daily."ats.proxy.process.cache.volume_2.wrap_count" GROUP BY time(1m), * END`)
}
func createDeliveryServiceStats(client influx.Client, replication *string) {
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_stats/traffic_stats.go
----------------------------------------------------------------------
diff --git a/traffic_stats/traffic_stats.go b/traffic_stats/traffic_stats.go
index 8384cca..4f720c1 100644
--- a/traffic_stats/traffic_stats.go
+++ b/traffic_stats/traffic_stats.go
@@ -35,7 +35,7 @@ import (
"syscall"
"time"
- traffic_ops "github.com/Comcast/traffic_control/traffic_ops/client"
+ traffic_ops "github.com/apache/incubator-trafficcontrol/traffic_ops/client"
log "github.com/cihub/seelog"
influx "github.com/influxdata/influxdb/client/v2"
)
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_stats/traffic_stats_seelog.xml
----------------------------------------------------------------------
diff --git a/traffic_stats/traffic_stats_seelog.xml b/traffic_stats/traffic_stats_seelog.xml
index a9812cd..301016a 100644
--- a/traffic_stats/traffic_stats_seelog.xml
+++ b/traffic_stats/traffic_stats_seelog.xml
@@ -1,3 +1,23 @@
+<?xml version='1.0'?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<seelog minlevel="info">
<outputs formatid="std:debug-short">
<file path="/opt/traffic_stats/var/log/traffic_stats/traffic_stats.log" />
[10/26] incubator-trafficcontrol git commit: merge master
Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/region/edit/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/region/edit/index.js b/traffic_ops/experimental/ui/app/src/common/modules/form/region/edit/index.js
index 4eb3e35..1c81de9 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/region/edit/index.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/region/edit/index.js
@@ -1,2 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.form.region.edit', [])
.controller('FormEditRegionController', require('./FormEditRegionController'));
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/region/form.region.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/region/form.region.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/form/region/form.region.tpl.html
index d32f58f..4066d05 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/region/form.region.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/region/form.region.tpl.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<div class="x_panel">
<div class="x_title">
<ol class="breadcrumb">
@@ -33,4 +52,4 @@
</div>
</form>
</div>
-</div>
\ No newline at end of file
+</div>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/region/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/region/index.js b/traffic_ops/experimental/ui/app/src/common/modules/form/region/index.js
index 113acfd..907e9b5 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/region/index.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/region/index.js
@@ -1,2 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.form.region', [])
.controller('FormRegionController', require('./FormRegionController'));
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/region/new/FormNewRegionController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/region/new/FormNewRegionController.js b/traffic_ops/experimental/ui/app/src/common/modules/form/region/new/FormNewRegionController.js
index fb6d2da..2b39239 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/region/new/FormNewRegionController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/region/new/FormNewRegionController.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var FormNewRegionController = function(region, $scope, $controller, locationUtils, regionService) {
// extends the FormRegionController to inherit common methods
@@ -20,4 +39,4 @@ var FormNewRegionController = function(region, $scope, $controller, locationUtil
};
FormNewRegionController.$inject = ['region', '$scope', '$controller', 'locationUtils', 'regionService'];
-module.exports = FormNewRegionController;
\ No newline at end of file
+module.exports = FormNewRegionController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/region/new/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/region/new/index.js b/traffic_ops/experimental/ui/app/src/common/modules/form/region/new/index.js
index f0ae30b..4d21034 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/region/new/index.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/region/new/index.js
@@ -1,2 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.form.region.new', [])
.controller('FormNewRegionController', require('./FormNewRegionController'));
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/server/FormServerController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/server/FormServerController.js b/traffic_ops/experimental/ui/app/src/common/modules/form/server/FormServerController.js
index c0ae6d0..7af68fa 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/server/FormServerController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/server/FormServerController.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var FormServerController = function(server, $scope, formUtils, stringUtils, locationUtils, cacheGroupService, cdnService, locationService, profileService, statusService, typeService) {
var getLocations = function() {
@@ -101,4 +120,4 @@ var FormServerController = function(server, $scope, formUtils, stringUtils, loca
};
FormServerController.$inject = ['server', '$scope', 'formUtils', 'stringUtils', 'locationUtils', 'cacheGroupService', 'cdnService', 'locationService', 'profileService', 'statusService', 'typeService'];
-module.exports = FormServerController;
\ No newline at end of file
+module.exports = FormServerController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/server/edit/FormEditServerController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/server/edit/FormEditServerController.js b/traffic_ops/experimental/ui/app/src/common/modules/form/server/edit/FormEditServerController.js
index 8c1280c..b901651 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/server/edit/FormEditServerController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/server/edit/FormEditServerController.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var FormEditServerController = function(server, $scope, $controller, $uibModal, $anchorScroll, locationUtils, serverService) {
// extends the FormServerController to inherit common methods
@@ -50,4 +69,4 @@ var FormEditServerController = function(server, $scope, $controller, $uibModal,
};
FormEditServerController.$inject = ['server', '$scope', '$controller', '$uibModal', '$anchorScroll', 'locationUtils', 'serverService'];
-module.exports = FormEditServerController;
\ No newline at end of file
+module.exports = FormEditServerController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/server/edit/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/server/edit/index.js b/traffic_ops/experimental/ui/app/src/common/modules/form/server/edit/index.js
index 0d6ea89..556660b 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/server/edit/index.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/server/edit/index.js
@@ -1,2 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.form.server.edit', [])
.controller('FormEditServerController', require('./FormEditServerController'));
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/server/form.server.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/server/form.server.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/form/server/form.server.tpl.html
index 790ace8..c956f8d 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/server/form.server.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/server/form.server.tpl.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<div class="x_panel">
<div class="x_title">
<ol class="breadcrumb">
@@ -87,4 +106,4 @@
</div>
</form>
</div>
-</div>
\ No newline at end of file
+</div>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/server/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/server/index.js b/traffic_ops/experimental/ui/app/src/common/modules/form/server/index.js
index 05b59a5..44d35cb 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/server/index.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/server/index.js
@@ -1,2 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.form.server', [])
.controller('FormServerController', require('./FormServerController'));
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/server/new/FormNewServerController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/server/new/FormNewServerController.js b/traffic_ops/experimental/ui/app/src/common/modules/form/server/new/FormNewServerController.js
index 65c9d95..cbc72d5 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/server/new/FormNewServerController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/server/new/FormNewServerController.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var FormNewServerController = function(server, $scope, $controller, serverService) {
// extends the FormServerController to inherit common methods
@@ -17,4 +36,4 @@ var FormNewServerController = function(server, $scope, $controller, serverServic
};
FormNewServerController.$inject = ['server', '$scope', '$controller', 'serverService'];
-module.exports = FormNewServerController;
\ No newline at end of file
+module.exports = FormNewServerController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/server/new/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/server/new/index.js b/traffic_ops/experimental/ui/app/src/common/modules/form/server/new/index.js
index d7908f2..2773b11 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/server/new/index.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/server/new/index.js
@@ -1,2 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.form.server.new', [])
.controller('FormNewServerController', require('./FormNewServerController'));
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/status/FormStatusController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/status/FormStatusController.js b/traffic_ops/experimental/ui/app/src/common/modules/form/status/FormStatusController.js
index 57f1680..88697d9 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/status/FormStatusController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/status/FormStatusController.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var FormStatusController = function(status, $scope, formUtils, stringUtils, locationUtils) {
$scope.status = status;
@@ -17,4 +36,4 @@ var FormStatusController = function(status, $scope, formUtils, stringUtils, loca
};
FormStatusController.$inject = ['status', '$scope', 'formUtils', 'stringUtils', 'locationUtils'];
-module.exports = FormStatusController;
\ No newline at end of file
+module.exports = FormStatusController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/status/edit/FormEditStatusController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/status/edit/FormEditStatusController.js b/traffic_ops/experimental/ui/app/src/common/modules/form/status/edit/FormEditStatusController.js
index 8fb7ea9..6aef2a5 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/status/edit/FormEditStatusController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/status/edit/FormEditStatusController.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var FormEditStatusController = function(status, $scope, $controller, $uibModal, $anchorScroll, locationUtils, statusService) {
// extends the FormStatusController to inherit common methods
@@ -50,4 +69,4 @@ var FormEditStatusController = function(status, $scope, $controller, $uibModal,
};
FormEditStatusController.$inject = ['status', '$scope', '$controller', '$uibModal', '$anchorScroll', 'locationUtils', 'statusService'];
-module.exports = FormEditStatusController;
\ No newline at end of file
+module.exports = FormEditStatusController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/status/edit/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/status/edit/index.js b/traffic_ops/experimental/ui/app/src/common/modules/form/status/edit/index.js
index 185f103..39e1fc8 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/status/edit/index.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/status/edit/index.js
@@ -1,2 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.form.status.edit', [])
.controller('FormEditStatusController', require('./FormEditStatusController'));
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/status/form.status.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/status/form.status.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/form/status/form.status.tpl.html
index 565de1b..8d4ab9f 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/status/form.status.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/status/form.status.tpl.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<div class="x_panel">
<div class="x_title">
<ol class="breadcrumb">
@@ -30,4 +49,4 @@
</div>
</form>
</div>
-</div>
\ No newline at end of file
+</div>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/status/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/status/index.js b/traffic_ops/experimental/ui/app/src/common/modules/form/status/index.js
index 86e83b4..06ca1c5 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/status/index.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/status/index.js
@@ -1,2 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.form.status', [])
.controller('FormStatusController', require('./FormStatusController'));
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/status/new/FormNewStatusController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/status/new/FormNewStatusController.js b/traffic_ops/experimental/ui/app/src/common/modules/form/status/new/FormNewStatusController.js
index 1072854..039cf09 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/status/new/FormNewStatusController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/status/new/FormNewStatusController.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var FormNewStatusController = function(status, $scope, $controller, statusService) {
// extends the FormStatusController to inherit common methods
@@ -17,4 +36,4 @@ var FormNewStatusController = function(status, $scope, $controller, statusServic
};
FormNewStatusController.$inject = ['status', '$scope', '$controller', 'statusService'];
-module.exports = FormNewStatusController;
\ No newline at end of file
+module.exports = FormNewStatusController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/status/new/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/status/new/index.js b/traffic_ops/experimental/ui/app/src/common/modules/form/status/new/index.js
index 53a3d77..81d77f5 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/status/new/index.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/status/new/index.js
@@ -1,2 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.form.status.new', [])
.controller('FormNewStatusController', require('./FormNewStatusController'));
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/tenant/FormTenantController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/tenant/FormTenantController.js b/traffic_ops/experimental/ui/app/src/common/modules/form/tenant/FormTenantController.js
index 0e01f8c..0fc3096 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/tenant/FormTenantController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/tenant/FormTenantController.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var FormTenantController = function(tenant, $scope, formUtils, stringUtils, locationUtils) {
$scope.tenant = angular.copy(tenant);
@@ -17,4 +36,4 @@ var FormTenantController = function(tenant, $scope, formUtils, stringUtils, loca
};
FormTenantController.$inject = ['tenant', '$scope', 'formUtils', 'stringUtils', 'locationUtils'];
-module.exports = FormTenantController;
\ No newline at end of file
+module.exports = FormTenantController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/tenant/edit/FormEditTenantController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/tenant/edit/FormEditTenantController.js b/traffic_ops/experimental/ui/app/src/common/modules/form/tenant/edit/FormEditTenantController.js
index a0a3d14..1c1f2a4 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/tenant/edit/FormEditTenantController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/tenant/edit/FormEditTenantController.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var FormEditTenantController = function(tenant, $scope, $controller, $uibModal, $anchorScroll, locationUtils, tenantService) {
// extends the FormTenantController to inherit common methods
@@ -50,4 +69,4 @@ var FormEditTenantController = function(tenant, $scope, $controller, $uibModal,
};
FormEditTenantController.$inject = ['tenant', '$scope', '$controller', '$uibModal', '$anchorScroll', 'locationUtils', 'tenantService'];
-module.exports = FormEditTenantController;
\ No newline at end of file
+module.exports = FormEditTenantController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/tenant/edit/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/tenant/edit/index.js b/traffic_ops/experimental/ui/app/src/common/modules/form/tenant/edit/index.js
index 0ff0723..950f852 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/tenant/edit/index.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/tenant/edit/index.js
@@ -1,2 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.form.tenant.edit', [])
.controller('FormEditTenantController', require('./FormEditTenantController'));
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/tenant/form.tenant.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/tenant/form.tenant.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/form/tenant/form.tenant.tpl.html
index a591a81..70b9890 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/tenant/form.tenant.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/tenant/form.tenant.tpl.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<div class="x_panel">
<div class="x_title">
<ol class="breadcrumb">
@@ -24,4 +43,4 @@
</div>
</form>
</div>
-</div>
\ No newline at end of file
+</div>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/tenant/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/tenant/index.js b/traffic_ops/experimental/ui/app/src/common/modules/form/tenant/index.js
index b85c01a..320f109 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/tenant/index.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/tenant/index.js
@@ -1,2 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.form.tenant', [])
.controller('FormTenantController', require('./FormTenantController'));
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/tenant/new/FormNewTenantController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/tenant/new/FormNewTenantController.js b/traffic_ops/experimental/ui/app/src/common/modules/form/tenant/new/FormNewTenantController.js
index 96141dc..f07f679 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/tenant/new/FormNewTenantController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/tenant/new/FormNewTenantController.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var FormNewTenantController = function(tenant, $scope, $controller, locationUtils, tenantService) {
// extends the FormTenantController to inherit common methods
@@ -20,4 +39,4 @@ var FormNewTenantController = function(tenant, $scope, $controller, locationUtil
};
FormNewTenantController.$inject = ['tenant', '$scope', '$controller', 'locationUtils', 'tenantService'];
-module.exports = FormNewTenantController;
\ No newline at end of file
+module.exports = FormNewTenantController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/tenant/new/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/tenant/new/index.js b/traffic_ops/experimental/ui/app/src/common/modules/form/tenant/new/index.js
index 75d2028..4d2a00e 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/tenant/new/index.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/tenant/new/index.js
@@ -1,2 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.form.tenant.new', [])
.controller('FormNewTenantController', require('./FormNewTenantController'));
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/type/FormTypeController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/type/FormTypeController.js b/traffic_ops/experimental/ui/app/src/common/modules/form/type/FormTypeController.js
index 9e1a070..0bf7aeb 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/type/FormTypeController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/type/FormTypeController.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var FormTypeController = function(type, $scope, formUtils, stringUtils, locationUtils) {
$scope.type = type;
@@ -18,4 +37,4 @@ var FormTypeController = function(type, $scope, formUtils, stringUtils, location
};
FormTypeController.$inject = ['type', '$scope', 'formUtils', 'stringUtils', 'locationUtils'];
-module.exports = FormTypeController;
\ No newline at end of file
+module.exports = FormTypeController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/type/edit/FormEditTypeController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/type/edit/FormEditTypeController.js b/traffic_ops/experimental/ui/app/src/common/modules/form/type/edit/FormEditTypeController.js
index 88125aa..0142af3 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/type/edit/FormEditTypeController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/type/edit/FormEditTypeController.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var FormEditTypeController = function(type, $scope, $controller, $uibModal, $anchorScroll, locationUtils, typeService) {
// extends the FormTypeController to inherit common methods
@@ -50,4 +69,4 @@ var FormEditTypeController = function(type, $scope, $controller, $uibModal, $anc
};
FormEditTypeController.$inject = ['type', '$scope', '$controller', '$uibModal', '$anchorScroll', 'locationUtils', 'typeService'];
-module.exports = FormEditTypeController;
\ No newline at end of file
+module.exports = FormEditTypeController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/type/edit/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/type/edit/index.js b/traffic_ops/experimental/ui/app/src/common/modules/form/type/edit/index.js
index 1283d5c..c026d01 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/type/edit/index.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/type/edit/index.js
@@ -1,2 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.form.type.edit', [])
.controller('FormEditTypeController', require('./FormEditTypeController'));
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/type/form.type.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/type/form.type.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/form/type/form.type.tpl.html
index 9cab767..d6baec9 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/type/form.type.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/type/form.type.tpl.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<div class="x_panel">
<div class="x_title">
<ol class="breadcrumb">
@@ -30,4 +49,4 @@
</div>
</form>
</div>
-</div>
\ No newline at end of file
+</div>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/type/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/type/index.js b/traffic_ops/experimental/ui/app/src/common/modules/form/type/index.js
index 860ccc2..b553151 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/type/index.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/type/index.js
@@ -1,2 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.form.type', [])
.controller('FormTypeController', require('./FormTypeController'));
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/type/new/FormNewTypeController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/type/new/FormNewTypeController.js b/traffic_ops/experimental/ui/app/src/common/modules/form/type/new/FormNewTypeController.js
index 109f8f7..d141949 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/type/new/FormNewTypeController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/type/new/FormNewTypeController.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var FormNewTypeController = function(type, $scope, $controller, typeService) {
// extends the FormTypeController to inherit common methods
@@ -17,4 +36,4 @@ var FormNewTypeController = function(type, $scope, $controller, typeService) {
};
FormNewTypeController.$inject = ['type', '$scope', '$controller', 'typeService'];
-module.exports = FormNewTypeController;
\ No newline at end of file
+module.exports = FormNewTypeController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/type/new/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/type/new/index.js b/traffic_ops/experimental/ui/app/src/common/modules/form/type/new/index.js
index a6c3a9b..6a2894a 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/type/new/index.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/type/new/index.js
@@ -1,2 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.form.type.new', [])
.controller('FormNewTypeController', require('./FormNewTypeController'));
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/user/FormUserController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/user/FormUserController.js b/traffic_ops/experimental/ui/app/src/common/modules/form/user/FormUserController.js
index fc0e71d..29e8b59 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/user/FormUserController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/user/FormUserController.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var FormUserController = function(user, $scope, formUtils, stringUtils, locationUtils, roleService) {
var getRoles = function() {
@@ -25,4 +44,4 @@ var FormUserController = function(user, $scope, formUtils, stringUtils, location
};
FormUserController.$inject = ['user', '$scope', 'formUtils', 'stringUtils', 'locationUtils', 'roleService'];
-module.exports = FormUserController;
\ No newline at end of file
+module.exports = FormUserController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/user/edit/FormEditUserController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/user/edit/FormEditUserController.js b/traffic_ops/experimental/ui/app/src/common/modules/form/user/edit/FormEditUserController.js
index cb61454..dd0cd17 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/user/edit/FormEditUserController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/user/edit/FormEditUserController.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var FormEditUserController = function(user, $scope, $controller, $uibModal, $anchorScroll, locationUtils, userService) {
// extends the FormUserController to inherit common methods
@@ -54,4 +73,4 @@ var FormEditUserController = function(user, $scope, $controller, $uibModal, $anc
};
FormEditUserController.$inject = ['user', '$scope', '$controller', '$uibModal', '$anchorScroll', 'locationUtils', 'userService'];
-module.exports = FormEditUserController;
\ No newline at end of file
+module.exports = FormEditUserController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/user/edit/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/user/edit/index.js b/traffic_ops/experimental/ui/app/src/common/modules/form/user/edit/index.js
index 8d71f48..edd9768 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/user/edit/index.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/user/edit/index.js
@@ -1,2 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.form.user.edit', [])
.controller('FormEditUserController', require('./FormEditUserController'));
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/user/form.user.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/user/form.user.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/form/user/form.user.tpl.html
index 819a2b4..7500e61 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/user/form.user.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/user/form.user.tpl.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<div class="x_panel">
<div class="x_title">
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/user/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/user/index.js b/traffic_ops/experimental/ui/app/src/common/modules/form/user/index.js
index 9348f23..b0ec9d0 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/user/index.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/user/index.js
@@ -1,2 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.form.user', [])
.controller('FormUserController', require('./FormUserController'));
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/user/new/FormNewUserController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/user/new/FormNewUserController.js b/traffic_ops/experimental/ui/app/src/common/modules/form/user/new/FormNewUserController.js
index 9d6ea48..ab1b47b 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/user/new/FormNewUserController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/user/new/FormNewUserController.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var FormNewUserController = function(user, $scope, $controller, userService) {
// extends the FormUserController to inherit common methods
@@ -17,4 +36,4 @@ var FormNewUserController = function(user, $scope, $controller, userService) {
};
FormNewUserController.$inject = ['user', '$scope', '$controller', 'userService'];
-module.exports = FormNewUserController;
\ No newline at end of file
+module.exports = FormNewUserController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/user/new/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/user/new/index.js b/traffic_ops/experimental/ui/app/src/common/modules/form/user/new/index.js
index cce7a0d..1fe6ef0 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/user/new/index.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/user/new/index.js
@@ -1,2 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.form.user.new', [])
.controller('FormNewUserController', require('./FormNewUserController'));
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/header/HeaderController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/header/HeaderController.js b/traffic_ops/experimental/ui/app/src/common/modules/header/HeaderController.js
old mode 100755
new mode 100644
index 0f5e056..498ee9d
--- a/traffic_ops/experimental/ui/app/src/common/modules/header/HeaderController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/header/HeaderController.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var HeaderController = function($rootScope, $scope, $log, $state, $anchorScroll, authService, userModel) {
$scope.isCollapsed = true;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/header/header.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/header/header.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/header/header.tpl.html
old mode 100755
new mode 100644
index 87d5825..feb5ff7
--- a/traffic_ops/experimental/ui/app/src/common/modules/header/header.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/common/modules/header/header.tpl.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<div class="nav_menu">
<nav role="navigation">
<div class="nav toggle">
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/header/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/header/index.js b/traffic_ops/experimental/ui/app/src/common/modules/header/index.js
old mode 100755
new mode 100644
index b0dd2f3..5bc6dbe
--- a/traffic_ops/experimental/ui/app/src/common/modules/header/index.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/header/index.js
@@ -1,2 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.header', [])
- .controller('HeaderController', require('./HeaderController'));
\ No newline at end of file
+ .controller('HeaderController', require('./HeaderController'));
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/message/MessageController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/message/MessageController.js b/traffic_ops/experimental/ui/app/src/common/modules/message/MessageController.js
index dce8c17..fde0f6b 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/message/MessageController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/message/MessageController.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var MessageController = function($scope, messageModel) {
$scope.messageData = messageModel;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/message/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/message/index.js b/traffic_ops/experimental/ui/app/src/common/modules/message/index.js
index c696800..2b9d1ec 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/message/index.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/message/index.js
@@ -1,2 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.message', [])
.controller('MessageController', require('./MessageController'));
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/message/message.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/message/message.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/message/message.tpl.html
index 05e1609..b99b6cb 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/message/message.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/common/modules/message/message.tpl.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<div id="messageContainer">
<div ng-show="messageData.messages.loaded">
<div class="alert alert-dismissable alert-{{(message.level === 'error') ? 'danger' : message.level}}" ng-repeat="message in messageData.messages.content">
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/navigation/NavigationController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/navigation/NavigationController.js b/traffic_ops/experimental/ui/app/src/common/modules/navigation/NavigationController.js
index 6d5deed..c97ac1f 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/navigation/NavigationController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/navigation/NavigationController.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var NavigationController = function($scope, $log, $state, $location, $timeout, $uibModal, authService, trafficOpsService, userModel) {
$scope.userLoaded = userModel.loaded;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/navigation/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/navigation/index.js b/traffic_ops/experimental/ui/app/src/common/modules/navigation/index.js
index ae6d0e2..e39967e 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/navigation/index.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/navigation/index.js
@@ -1,2 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.navigation', [])
.controller('NavigationController', require('./NavigationController'));
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/navigation/navigation.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/navigation/navigation.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/navigation/navigation.tpl.html
index 5a7c1b3..b3e39f6 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/navigation/navigation.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/common/modules/navigation/navigation.tpl.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<div class="main-nav scroll-view">
<div class="navbar nav_title">
<span class="site_title">Traffic Ops</span>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/release/ReleaseController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/release/ReleaseController.js b/traffic_ops/experimental/ui/app/src/common/modules/release/ReleaseController.js
index 9e22ddb..36cc195 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/release/ReleaseController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/release/ReleaseController.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var ReleaseController = function(params, $scope, $uibModalInstance) {
$scope.params = params;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/release/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/release/index.js b/traffic_ops/experimental/ui/app/src/common/modules/release/index.js
index 519c408..62902ed 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/release/index.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/release/index.js
@@ -1,2 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.release', [])
.controller('ReleaseController', require('./ReleaseController'));
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/release/release.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/release/release.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/release/release.tpl.html
index 2d18f00..21a52eb 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/release/release.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/common/modules/release/release.tpl.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<div class="modal-header">
<button type="button" class="close" ng-click="dismiss()"><span aria-hidden="true">×</span><span class="sr-only">Close</span></button>
<h4 class="modal-title">Release Information</h4>
[24/26] incubator-trafficcontrol git commit: merge master
Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/.rat-excludes
----------------------------------------------------------------------
diff --git a/.rat-excludes b/.rat-excludes
new file mode 100644
index 0000000..1d2c80f
--- /dev/null
+++ b/.rat-excludes
@@ -0,0 +1 @@
+./docs/*
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/CONTRIBUTING.md
----------------------------------------------------------------------
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 6e6addf..8f5f66b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,15 +1,15 @@
How To Contribute
=================
-We love pull requests! We simply don't have the time or resources to add every feature and support every platform. If you have improvements for Traffic Control, we're more than happy to merge them in.
+We love pull requests! We simply don't have the time or resources to add every feature and support every platform. If you have improvements (enhancements or bug fixes) for Traffic Control, start by creating an [issue](https://issues.apache.org/jira/browse/TC) and discussing it with us first on the [users@trafficcontrol.incubator.apache.org](mailto:users@trafficcontrol.incubator.apache.org) mailing list. We might already be working on it, or there might be an existing way to do it.
-We have a few [guidelines](https://github.com/Comcast/traffic_control/blob/master/CONTRIBUTING.md#guidelines) to help maintain code quality and ensure the pull request process goes smoothly.
+Once your issue has been approved and you're ready to start slinging code, we have a few [guidelines](https://github.com/apache/incubator-trafficcontrol/blob/master/CONTRIBUTING.md#guidelines) to help maintain code quality and ensure the pull request process goes smoothly.
-Remember, it doesn't have to be perfect. If you want to help, hack it together and submit a [pull request](https://help.github.com/articles/using-pull-requests/). We'll work with you to make sure it fits properly into the project.
+Remember, your code doesn't have to be perfect. Hack it together and submit a [pull request](https://help.github.com/articles/using-pull-requests/). We'll work with you to make sure it fits properly into the project.
-Contributor License Agreement
+CONTRIBUTORS.md
-----------------------------
-First things first, we need you to sign the [Contributor License Agreement (CLA)](http://traffic-control-cdn.net/ComcastContributorLicenseAgreement_03-07-14.pdf) before we can accept your code. This protects us, you, and everyone else using and contributing to Traffic Control. Once you have signed the CLA and had your first pull request merged, your name will be added to the [list of contributors](https://github.com/Comcast/traffic_control/blob/master/CONTRIBUTORS.md).
+Please take the opportunity of submitting your first PR to additionally include your name alphabetically in CONTRIBUTORS.md.
Making a pull request
---------------------
@@ -21,9 +21,9 @@ Following the project conventions will make the pull request process go faster a
#### Create an issue
-If you want to add a new feature, make a [Github issue](https://github.com/Comcast/traffic_control/issues) and discuss it with us first at [Traffic Control Google Group](https://groups.google.com/forum/#!forum/traffic_control-discuss). We might already be working on it, or there might be an existing way to do it.
+If you want to add a new feature, make a [JIRA issue](https://issues.apache.org/jira/browse/TC) and discuss it with us first on the [users@trafficcontrol.incubator.apache.org](mailto:users@trafficcontrol.incubator.apache.org) mailing list. We might already be working on it, or there might be an existing way to do it.
-If it's a bug fix, we need to know what the problem is and how to reproduce it so please create a [Github issue](https://github.com/Comcast/traffic_control/issues) for that as well.
+If it's a bug fix, make a [JIRA issue](https://issues.apache.org/jira/browse/TC) and discuss it with us first on the [users@trafficcontrol.incubator.apache.org](mailto:users@trafficcontrol.incubator.apache.org) mailing list. We need to know what the problem is and how to reproduce it so please create a [JIRA issue](https://issues.apache.org/jira/browse/TC) for that as well.
#### Documentation
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/DISCLAIMER
----------------------------------------------------------------------
diff --git a/DISCLAIMER b/DISCLAIMER
new file mode 100644
index 0000000..0c91830
--- /dev/null
+++ b/DISCLAIMER
@@ -0,0 +1 @@
+Apache Traffic Control is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index f286598..607f549 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,4 +1,11 @@
-Traffic Control
-Copyright 2012-2015 Comcast Cable Communications Management, LLC
+Apache Traffic Control (incubating)
+Copyright 2016 The Apache Software Foundation
-This product includes software developed at Comcast (http://www.comcast.com/).
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+Portions of this software were developed at
+Comcast (http://www.comcast.com/).
+
+Portions of this software were developed at
+Cisco Systems, Inc. (http://www.cisco.com)
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index d24095c..9bd7e2e 100644
--- a/README.md
+++ b/README.md
@@ -1,20 +1,27 @@
-Traffic Control is an Open Source implementation of a Content Delivery Network.
+Apache Traffic Control (incubating) is an Open Source implementation of a Content Delivery Network.
#### Documentation
-* [Intro](http://traffic-control-cdn.net/docs/latest/index.html)
-* [CDN Basics](http://traffic-control-cdn.net/docs/latest/basics/index.html)
-* [Traffic Control Overview](http://traffic-control-cdn.net/docs/latest/overview/index.html)
-* [Administrator's Guide](http://traffic-control-cdn.net/docs/latest/admin/index.html)
-* [Developer's Guide](http://traffic-control-cdn.net/docs/latest/development/index.html)
+* [Intro](http://trafficcontrol.apache.org/docs/latest/index.html)
+* [CDN Basics](http://trafficcontrol.apache.org/docs/latest/basics/index.html)
+* [Traffic Control Overview](http://trafficcontrol.apache.org/docs/latest/overview/index.html)
+* [Administrator's Guide](http://trafficcontrol.apache.org/docs/latest/admin/index.html)
+* [Developer's Guide](http://trafficcontrol.apache.org/docs/latest/development/index.html)
####Questions, Comments, Bugs and More
-* [Frequently Asked Questions](http://traffic-control-cdn.net/docs/latest/faq/index.html)
-* [Found a bug or file a feature request](https://github.com/Comcast/traffic_control/issues)
-* [Ask a question about using Traffic Control](https://groups.google.com/forum/#!forum/traffic_control)
+* [Frequently Asked Questions](http://trafficcontrol.apache.org/docs/latest/faq/index.html)
+* [Found a bug or file a feature request](https://issues.apache.org/jira/browse/TC/?selectedTab=com.atlassian.jira.jira-projects-plugin:summary-panel)
+* [Subscribe to our users list](mailto:users-subscribe@trafficcontrol.incubator.apache.org)
+* [Subscribe to our dev list](mailto:dev-subscribe@trafficcontrol.incubator.apache.org)
+* [Search the email archives](https://lists.apache.org/list.html?dev@trafficcontrol.apache.org)
* [Check out the wiki](https://github.com/Comcast/traffic_control/wiki) for less formal documentation, design docs and roadmap discussions
##### News
+* 17-October 2016 Traffic Control is now Apache Traffic Control (incubating)!
+ Code has been moved to Apache, use the new repo https://github.com/apache/incubator-trafficcontrol to create PRs.
+ Mailing list have been updated, use the udpated links above. Website will be updated and moved soon.
+ Please bear with us as we move our project into the Apache incubator, and start aligning with the Apache
+ processes.
* 31-August 2016: Traffic Control 1.6.1 is released.
See https://github.com/Comcast/traffic_control/releases/tag/RELEASE-1.6.1 for the full change list.
* 29-July 2016: Traffic Control 1.6.0 is released.
@@ -48,5 +55,5 @@ Traffic Control is an Open Source implementation of a Content Delivery Network.
See https://github.com/Comcast/traffic_control/issues?utf8=%E2%9C%93&q=milestone%3A1.1.3 for the full change list.
* 16-April-2015: **Traffic Control is Open Source!**
- Certainly not perfect, but hopefully good enough to get going for an administrator using the rpms, and for brave developers to start looking in to helping the project move forward. Please see the **[Additional Install Notes for this release](http://traffic-control-cdn.net/docs/latest/faq/administration.html#why-is-my-crconfig-json-rejected)** when installing for the first time.
+ Certainly not perfect, but hopefully good enough to get going for an administrator using the rpms, and for brave developers to start looking in to helping the project move forward. Please see the **[Additional Install Notes for this release](http://trafficcontrol.apache.org/docs/latest/faq/administration.html#why-is-my-crconfig-json-rejected)** when installing for the first time.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/VERSION
----------------------------------------------------------------------
diff --git a/VERSION b/VERSION
index 27f9cd3..f8e233b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.8.0
+1.9.0
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/build/README.md
----------------------------------------------------------------------
diff --git a/build/README.md b/build/README.md
index cae71d9..8575572 100644
--- a/build/README.md
+++ b/build/README.md
@@ -1,6 +1,30 @@
# Rpm Build Instructions
+## Using `docker-compose`
+
+We are moving toward using a docker-based build system. This eliminates the need to maintain a local installation with all the
+build tools as well as ensuring that you are using the same versions as we use for testing.
+
+These are the versions of these tools we are using:
+* docker 1.12.2
+* docker-compose 1.8.1
+
+You can build from any repository/branch combination, but that repository must be available to `git clone ...`. Note that in the
+following `docker-compose` commands, you can limit building to one or more sub-projects by supplying arguments at the end. If none
+are supplied, then *all* will be run.
+
+Starting at the top-level of your trafficcontrol git clone (e.g. `~/src/incubator-trafficcontrol`):
+
+> cd infrastructure/docker/build
+> docker-compose build traffic_ops_build traffic_monitor_build ...
+> GITREPO=https://github.com/username/incubator-trafficcontrol BRANCH=mybranch docker-compose up traffic_ops_build traffic_monitor_build ...
+
+The resulting `.rpm` files will be created in the `artifacts` directory.
+
+
+## Building the old-fashioned way
+
rpm files for all sub-projects can be built using the file `build/build.sh`. If this script is given parameters, it will build only
those projects specified on the command line, e.g. `$ ./build/build.sh traffic_ops`. The prerequisites for each sub-project are
listed below.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/build/build.sh
----------------------------------------------------------------------
diff --git a/build/build.sh b/build/build.sh
index 5e19762..d82d249 100755
--- a/build/build.sh
+++ b/build/build.sh
@@ -1,7 +1,6 @@
#!/bin/bash
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/build/docker-build.sh
----------------------------------------------------------------------
diff --git a/build/docker-build.sh b/build/docker-build.sh
deleted file mode 100755
index 01005be..0000000
--- a/build/docker-build.sh
+++ /dev/null
@@ -1,94 +0,0 @@
-#!/bin/bash
-#
-# docker-build.sh creates containers for building each component of traffic_control with
-# all needed dependencies. Once the build is complete, all rpms are copied into the "dist"
-# directory in the current directory.
-#
-# Usage: docker-build.sh [<options>]
-# Options:
-# -r <gitrepo> git repository to clone from (defaults to value of GITREPO env variable or
-# `https://github.com/Comcast/traffic_control'). Can be a URI or local directory.
-# -b <branch> branch (or tag) in repository to checkout (defaults to value of BRANCH env variable or `master')
-# -d <dir> directory to copy build artifacts (default is ./dist)
-
-export GITREPO="${GITREPO:-https://github.com/Comcast/traffic_control}"
-export BRANCH="${BRANCH:-master}"
-
-Usage() {
- echo "Usage:"
- echo " $0 [<option>...] [<project name>...]"
- echo " One of -a or list of projects must be provided."
- echo " Options:"
- echo " -a build all subprojects"
- echo " -h show usage"
- echo " -r <repository path>: repository (local directory or https) to clone from"
- echo " -b <branch name>: branch within repository"
- echo ""
-}
-
-while getopts :hacr:b:d: opt
-do
- case $opt in
- h) Usage
- exit 1;
- ;;
- a) buildall=1
- ;;
- r)
- GITREPO="$OPTARG"
- ;;
- b)
- BRANCH="$OPTARG"
- ;;
- *)
- echo "Invalid option: $opt"
- Usage
- exit 1;
- ;;
- esac
-done
-shift $((OPTIND-1))
-
-# anything remaining is list of projects to build
-if [[ -n $buildall ]]
-then
- projects="traffic_ops traffic_monitor traffic_router traffic_stats traffic_portal"
-else
- projects="$@"
-fi
-
-if [[ -z $projects ]]
-then
- echo "One of -a or list of project names must be provided"
- Usage
- exit 1
-fi
-
-
-# if repo is local directory, get absolute path
-if [[ -d $GITREPO ]]
-then
- GITREPO=$(cd $GITREPO && pwd)
-fi
-
-DIR="$( cd "$(dirname $( dirname "${BASH_SOURCE[0]}" ))" && pwd )"
-
-cd $DIR/infrastructure/docker/build
-dist=$(pwd)/artifacts
-
-cat <<-ENDMSG
- ********************************************************
-
- Building from git repository '$GITREPO' branch '$BRANCH'
- Artifacts will be delivered to '$dist'
-
- Projects to build: $projects
- ********************************************************
-
-ENDMSG
-
-# GITREPO and BRANCH are exported, so this will pick them up..
-docker-compose up
-
-echo "rpms created in $dist: "
-ls -l "$dist/."
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/build/functions.sh
----------------------------------------------------------------------
diff --git a/build/functions.sh b/build/functions.sh
index 74944f9..bb63530 100755
--- a/build/functions.sh
+++ b/build/functions.sh
@@ -1,7 +1,6 @@
#!/bin/bash
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/_static/theme_overrides.css
----------------------------------------------------------------------
diff --git a/docs/source/_static/theme_overrides.css b/docs/source/_static/theme_overrides.css
index 00a730f..4fed1af 100644
--- a/docs/source/_static/theme_overrides.css
+++ b/docs/source/_static/theme_overrides.css
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
/* override table width restrictions */
.wy-table-responsive table td, .wy-table-responsive table th {
/* !important prevents the common CSS stylesheets from
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/admin/index.rst
----------------------------------------------------------------------
diff --git a/docs/source/admin/index.rst b/docs/source/admin/index.rst
index eaef3a9..e92f5e2 100644
--- a/docs/source/admin/index.rst
+++ b/docs/source/admin/index.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/admin/quick_howto/dnssec.rst
----------------------------------------------------------------------
diff --git a/docs/source/admin/quick_howto/dnssec.rst b/docs/source/admin/quick_howto/dnssec.rst
index 6e41fe9..d336057 100644
--- a/docs/source/admin/quick_howto/dnssec.rst
+++ b/docs/source/admin/quick_howto/dnssec.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/admin/quick_howto/federations.rst
----------------------------------------------------------------------
diff --git a/docs/source/admin/quick_howto/federations.rst b/docs/source/admin/quick_howto/federations.rst
index 5bcb387..a17122c 100644
--- a/docs/source/admin/quick_howto/federations.rst
+++ b/docs/source/admin/quick_howto/federations.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/admin/quick_howto/index.rst
----------------------------------------------------------------------
diff --git a/docs/source/admin/quick_howto/index.rst b/docs/source/admin/quick_howto/index.rst
index 57f5727..96f098f 100644
--- a/docs/source/admin/quick_howto/index.rst
+++ b/docs/source/admin/quick_howto/index.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/admin/quick_howto/multi_site.rst
----------------------------------------------------------------------
diff --git a/docs/source/admin/quick_howto/multi_site.rst b/docs/source/admin/quick_howto/multi_site.rst
index 0811056..32b5436 100644
--- a/docs/source/admin/quick_howto/multi_site.rst
+++ b/docs/source/admin/quick_howto/multi_site.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/admin/quick_howto/regionalgeo.rst
----------------------------------------------------------------------
diff --git a/docs/source/admin/quick_howto/regionalgeo.rst b/docs/source/admin/quick_howto/regionalgeo.rst
index 58f8851..a903c8a 100644
--- a/docs/source/admin/quick_howto/regionalgeo.rst
+++ b/docs/source/admin/quick_howto/regionalgeo.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Cisco Systems, Inc.
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/admin/quick_howto/steering.rst
----------------------------------------------------------------------
diff --git a/docs/source/admin/quick_howto/steering.rst b/docs/source/admin/quick_howto/steering.rst
index 03f6b1d..1060f29 100644
--- a/docs/source/admin/quick_howto/steering.rst
+++ b/docs/source/admin/quick_howto/steering.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/admin/traffic_monitor.rst
----------------------------------------------------------------------
diff --git a/docs/source/admin/traffic_monitor.rst b/docs/source/admin/traffic_monitor.rst
index b7615fb..3a06e78 100644
--- a/docs/source/admin/traffic_monitor.rst
+++ b/docs/source/admin/traffic_monitor.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
@@ -33,7 +32,7 @@ The following are requirements to ensure an accurate set up:
1. Enter the Traffic Monitor server into Traffic Ops
2. Make sure the FQDN of the Traffic Monitor is resolvable in DNS.
-3. Install Traffic Monitor and perl mods: ``sudo yum -y install traffic_monitor perl-JSON perl-WWW-Curl``
+3. Install Traffic Monitor and Perl mods: ``sudo yum -y install traffic_monitor perl-JSON perl-WWW-Curl``
4. Take the config from Traffic Ops - run : ``sudo /opt/traffic_monitor/bin/traffic_monitor_config.pl``
Sample output: ::
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/admin/traffic_ops_config.rst
----------------------------------------------------------------------
diff --git a/docs/source/admin/traffic_ops_config.rst b/docs/source/admin/traffic_ops_config.rst
index 10acb86..0ca57da 100644
--- a/docs/source/admin/traffic_ops_config.rst
+++ b/docs/source/admin/traffic_ops_config.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
@@ -108,9 +107,9 @@ Below is a list of Traffic Server plugins that need to be configured in the para
+------------------+---------------+------------------------------------------------------+------------------------------------------------------------------------------------------------------------+
| Name | Config file | Description | Details |
+==================+===============+======================================================+============================================================================================================+
-| astats_over_http | package | The package version for the astats_over_http plugin. | `astats_over_http <http://traffic-control-cdn.net/downloads/index.html>`_ |
+| astats_over_http | package | The package version for the astats_over_http plugin. | `astats_over_http <http://trafficcontrol.apache.org/downloads/index.html>`_ |
+------------------+---------------+------------------------------------------------------+------------------------------------------------------------------------------------------------------------+
-| trafficserver | package | The package version for the trafficserver plugin. | `trafficserver <http://traffic-control-cdn.net/downloads/index.html>`_ |
+| trafficserver | package | The package version for the trafficserver plugin. | `trafficserver <http://trafficcontrol.apache.org/downloads/index.html>`_ |
+------------------+---------------+------------------------------------------------------+------------------------------------------------------------------------------------------------------------+
| regex_revalidate | plugin.config | The config to be used for regex_revalidate. | `regex_revalidate <https://docs.trafficserver.apache.org/en/5.3.x/reference/plugins/regex_remap.en.html>`_ |
| | | For example: --config regex_revalidate.config | |
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/admin/traffic_ops_extensions.rst
----------------------------------------------------------------------
diff --git a/docs/source/admin/traffic_ops_extensions.rst b/docs/source/admin/traffic_ops_extensions.rst
index f57277d..4aceebb 100644
--- a/docs/source/admin/traffic_ops_extensions.rst
+++ b/docs/source/admin/traffic_ops_extensions.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/admin/traffic_ops_install.rst
----------------------------------------------------------------------
diff --git a/docs/source/admin/traffic_ops_install.rst b/docs/source/admin/traffic_ops_install.rst
index 784b696..ca49461 100644
--- a/docs/source/admin/traffic_ops_install.rst
+++ b/docs/source/admin/traffic_ops_install.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
@@ -76,7 +75,7 @@ To begin the install:
1. Install Traffic Ops:
- Download the traffic_ops rpm package from http://traffic-control-cdn.net/downloads/index.html
+ Download the traffic_ops rpm package from http://trafficcontrol.apache.org/downloads/index.html
``sudo rpm -ivh traffic_ops-1.*.*-****.x86_64.rpm``
@@ -98,7 +97,7 @@ To begin the install:
Hit ENTER to continue:
- The first thing the post install will do is install additional packages needed from the yum repo.
+ The first thing postinstall will do is install additional packages needed from the yum repo.
Ater that, it will automatically proceed to installing the required Perl packages from CPAN.
@@ -378,5 +377,5 @@ To upgrade:
1. Enter the following command:``service traffic_ops stop``
2. Enter the following command:``yum upgrade traffic_ops``
-3. See :ref:`rl-ps` to run the post install.
+3. See :ref:`rl-ps` to run postinstall.
4. Enter the following command:``service traffic_ops start``
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/admin/traffic_ops_using.rst
----------------------------------------------------------------------
diff --git a/docs/source/admin/traffic_ops_using.rst b/docs/source/admin/traffic_ops_using.rst
index 4a50742..5b8525d 100644
--- a/docs/source/admin/traffic_ops_using.rst
+++ b/docs/source/admin/traffic_ops_using.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
@@ -595,7 +594,7 @@ Parameters in the Mid (parent) profile that influence this feature:
Multi Site Origin
+++++++++++++++++
-.. Note:: The Multi Site Origin feature is based upon a feature n ATS that has yet to be submitted to Traffic Server upstream, until it is, set this to 0, or use the ATS rpm supplied on the traffic-control-cdn.net website.
+.. Note:: The Multi Site Origin feature is based upon a feature n ATS that has yet to be submitted to Traffic Server upstream, until it is, set this to 0, or use the ATS rpm supplied on the trafficcontrol.apache.org website.
Normally, the mid servers are not aware of any redundancy at the origin layer. With Multi Site Origin enabled this changes - Traffic Server (and Traffic Ops) are now made aware of the fact there are multiple origins, and can be configured to do more advanced failover and loadbalancing actions.
@@ -1026,7 +1025,7 @@ Fairly straight forward, this button set the **dnssec.enabled** param to either
**Generate Keys**
-Generate Keys will generate dnssec keys for the CDN TLD as well as for each Delivery Service in the CDN. It is important to note that this button will create a new KSK for the TLD and, therefore, a new DS Record. Any time a new DS Record is created, it will need to be added to the parent zone of the TLD in order for DNSSEC to work properly. When a user clicks the **Generate Keys** button, they will be presented with a screen with the following fields:
+Generate Keys will generate DNSSEC keys for the CDN TLD as well as for each Delivery Service in the CDN. It is important to note that this button will create a new KSK for the TLD and, therefore, a new DS Record. Any time a new DS Record is created, it will need to be added to the parent zone of the TLD in order for DNSSEC to work properly. When a user clicks the **Generate Keys** button, they will be presented with a screen with the following fields:
- **CDN:** This is not editable and displays the CDN for which keys will be generated
- **ZSK Expiration (Days):** Sets how long (in days) the Zone Signing Key will be valid for the CDN and associated Delivery Services. The default is 30 days.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/admin/traffic_portal.rst
----------------------------------------------------------------------
diff --git a/docs/source/admin/traffic_portal.rst b/docs/source/admin/traffic_portal.rst
index 0c5b5b0..9e761b8 100644
--- a/docs/source/admin/traffic_portal.rst
+++ b/docs/source/admin/traffic_portal.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
@@ -24,7 +23,7 @@ The following are requirements to ensure an accurate set up:
**Installing Traffic Portal**
- - Download the Traffic Portal RPM from the traffic control `downloads <http://traffic-control-cdn.net/downloads/index.html>`_ page or build from `source <https://github.com/Comcast/traffic_control/tree/master/traffic_portal/build>`_.
+ - Download the Traffic Portal RPM from the traffic control `downloads <https://trafficcontrol.apache.org/downloads/index.html>`_ page or build from `source <https://github.com/apache/incubator-trafficcontrol/traffic_portal/build>`_.
- Copy the Traffic Portal RPM to your server
- curl --silent --location https://rpm.nodesource.com/setup_6.x | sudo bash -
- sudo yum install -y nodejs
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/admin/traffic_router.rst
----------------------------------------------------------------------
diff --git a/docs/source/admin/traffic_router.rst b/docs/source/admin/traffic_router.rst
index 8f274a7..01ab6b3 100644
--- a/docs/source/admin/traffic_router.rst
+++ b/docs/source/admin/traffic_router.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/admin/traffic_server.rst
----------------------------------------------------------------------
diff --git a/docs/source/admin/traffic_server.rst b/docs/source/admin/traffic_server.rst
index 393fcc5..1b99ce0 100644
--- a/docs/source/admin/traffic_server.rst
+++ b/docs/source/admin/traffic_server.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/admin/traffic_stats.rst
----------------------------------------------------------------------
diff --git a/docs/source/admin/traffic_stats.rst b/docs/source/admin/traffic_stats.rst
index e8d9e78..ae9d91b 100644
--- a/docs/source/admin/traffic_stats.rst
+++ b/docs/source/admin/traffic_stats.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
@@ -25,7 +24,7 @@ Installation
**Installing Traffic Stats:**
- - Download the Traffic Stats RPM from the traffic control `downloads <http://traffic-control-cdn.net/downloads/index.html>`_ page.
+ - Download the Traffic Stats RPM from the traffic control `downloads <https://trafficcontrol.apache.org/downloads/index.html>`_ page.
- Copy the Traffic Stats RPM to your server
- sudo rpm -ivh <traffic_stats rpm>
@@ -89,7 +88,7 @@ Configuration
In order for Traffic Ops users to see Grafana graphs, Grafana will need to allow anonymous access. Information on how to configure anonymous access can be found on the configuration page of the `Grafana Website <http://docs.grafana.org/installation/configuration/#authanonymous>`_.
- Traffic Ops uses custom dashboards to display information about individual delivery services or cache groups. In order for the custom graphs to display correctly, the `traffic_ops_*.js <https://github.com/Comcast/traffic_control/blob/master/traffic_stats/grafana/>`_ files need to be in the ``/usr/share/grafana/public/dashboards/`` directory on the grafana server. If your Grafana server is the same as your Traffic Stats server the RPM install process will take care of putting the files in place. If your grafana server is different from your Traffic Stats server, you will need to manually copy the files to the correct directory.
+ Traffic Ops uses custom dashboards to display information about individual delivery services or cache groups. In order for the custom graphs to display correctly, the `traffic_ops_*.js <https://github.com/apache/incubator-trafficcontrol/blob/master/traffic_stats/grafana/>`_ files need to be in the ``/usr/share/grafana/public/dashboards/`` directory on the grafana server. If your Grafana server is the same as your Traffic Stats server the RPM install process will take care of putting the files in place. If your grafana server is different from your Traffic Stats server, you will need to manually copy the files to the correct directory.
More information on custom scripted graphs can be found in the `scripted dashboards <http://docs.grafana.org/reference/scripting/>`_ section of the Grafana documentation.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/admin/traffic_vault.rst
----------------------------------------------------------------------
diff --git a/docs/source/admin/traffic_vault.rst b/docs/source/admin/traffic_vault.rst
index cf37b35..35be160 100644
--- a/docs/source/admin/traffic_vault.rst
+++ b/docs/source/admin/traffic_vault.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
@@ -171,7 +170,7 @@ One time configuration:
``riak-admin security grant riak_core.set_bucket on any to admin``
2. Add the search schema to Riak. This schema is a simple Apache Solr configuration file which will index all records on cdn, hostname, and deliveryservice.
- * Get the schema file by either cloning the project and going to `traffic_ops/app/config/misc/riak_search` or from `github <https://github.com/Comcast/traffic_control/tree/master/traffic_ops/app/conf/misc/riak_search>`_.
+ * Get the schema file by either cloning the project and going to `traffic_ops/app/config/misc/riak_search` or from `github <https://github.com/apache/incubator-trafficcontrol/tree/master/traffic_ops/app/conf/misc/riak_search>`_.
* Use curl to add the schema to riak: ``curl -kvs -XPUT "https://admin:pass@riakserver:8088/search/schema/sslkeys" -H 'Content-Type:application/xml' -d @sslkeys.xml``
3. Add search index to Riak
@@ -182,7 +181,7 @@ One time configuration:
Riak Search (using Apache Solr) will now index all NEW records that are added to the "ssl" bucket. The cdn, deliveryservice, and hostname fields are indexed and when a search is performed riak will return the indexed fields along with the crt and key values for a ssl record. In order to add the indexed fields to current records and to get the current records added, a standalone script needs to be run. The following explains how to run the script.
-1. Get script from github either by cloning the project and going to `traffic_ops/app/script` or from `here <https://github.com/Comcast/traffic_control/blob/master/traffic_ops/app/script/update_riak_for_search.pl>`_
+1. Get script from github either by cloning the project and going to `traffic_ops/app/script` or from `here <https://github.com/apache/incubator-trafficcontrol/blob/master/traffic_ops/app/script/update_riak_for_search.pl>`_
2. Run the script by performing the following command ``./update_riak_for_search.pl -to_url=https://traffic-ops.kabletown.net -to_un=user -to_pw=password``
Validate the search is working by querying against Riak directly:
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/basics/cache_revalidation.rst
----------------------------------------------------------------------
diff --git a/docs/source/basics/cache_revalidation.rst b/docs/source/basics/cache_revalidation.rst
index 70f7508..dc57346 100644
--- a/docs/source/basics/cache_revalidation.rst
+++ b/docs/source/basics/cache_revalidation.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/basics/caching_proxies.rst
----------------------------------------------------------------------
diff --git a/docs/source/basics/caching_proxies.rst b/docs/source/basics/caching_proxies.rst
index 624dbc1..af93730 100644
--- a/docs/source/basics/caching_proxies.rst
+++ b/docs/source/basics/caching_proxies.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/basics/content_delivery_networks.rst
----------------------------------------------------------------------
diff --git a/docs/source/basics/content_delivery_networks.rst b/docs/source/basics/content_delivery_networks.rst
index c696e9c..872018e 100644
--- a/docs/source/basics/content_delivery_networks.rst
+++ b/docs/source/basics/content_delivery_networks.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/basics/http_11.rst
----------------------------------------------------------------------
diff --git a/docs/source/basics/http_11.rst b/docs/source/basics/http_11.rst
index d53e91a..65d6d71 100644
--- a/docs/source/basics/http_11.rst
+++ b/docs/source/basics/http_11.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/basics/index.rst
----------------------------------------------------------------------
diff --git a/docs/source/basics/index.rst b/docs/source/basics/index.rst
index 0dae70f..23ee1da 100644
--- a/docs/source/basics/index.rst
+++ b/docs/source/basics/index.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/conf.py
----------------------------------------------------------------------
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 0bf12b7..d98a734 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -1,5 +1,4 @@
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -66,7 +65,7 @@ project = u'Traffic Control'
# The short X.Y version.
# version = '2_19_15 11:44'
# The full version, including alpha/beta/rc tags.
-release = '1.7-dev'
+release = '1.8-dev'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
@@ -203,7 +202,7 @@ latex_elements = {
# Grouping the document tree into LaTeX files. List of tuples
# (source start file, target name, title, author, documentclass [howto/manual]).
latex_documents = [
- ('index', 'TrafficControl.tex', u'Traffic Control Documentation', 'Comcast Cable', 'manual'),
+ ('index', 'TrafficControl.tex', u'Traffic Control Documentation', 'Apache Software Foundation', 'manual'),
]
# The name of an image file (relative to this directory) to place at the top of
# the title page.
@@ -244,7 +243,7 @@ man_pages = [
# dir menu entry, description, category)
texinfo_documents = [
('index', 'Traffic Control', u'Traffic Control Documentation',
- u'Comcast Cable', 'Traffic Control', 'One line description of project.',
+ u'Apache Software Foundation', 'Traffic Control', 'One line description of project.',
'Miscellaneous'),
]
@@ -262,8 +261,8 @@ texinfo_documents = [
# Bibliographic Dublin Core info.
epub_title = u'Traffic Control'
-epub_author = u'Comcast Cable'
-epub_publisher = u'Comcast Cable'
+epub_author = u'Apache Software Foundation'
+epub_publisher = u'Apache Software Foundation'
# The language of the text. It defaults to the language option
# or en if the language is not set.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/index.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/index.rst b/docs/source/development/index.rst
index 70b05f4..851e463 100644
--- a/docs/source/development/index.rst
+++ b/docs/source/development/index.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_monitor.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_monitor.rst b/docs/source/development/traffic_monitor.rst
index 4a801bb..012cbb3 100644
--- a/docs/source/development/traffic_monitor.rst
+++ b/docs/source/development/traffic_monitor.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_monitor/traffic_monitor_api.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_monitor/traffic_monitor_api.rst b/docs/source/development/traffic_monitor/traffic_monitor_api.rst
index 5fbc422..0240fd4 100644
--- a/docs/source/development/traffic_monitor/traffic_monitor_api.rst
+++ b/docs/source/development/traffic_monitor/traffic_monitor_api.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_ops.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops.rst b/docs/source/development/traffic_ops.rst
index c2957a5..5ec31e4 100644
--- a/docs/source/development/traffic_ops.rst
+++ b/docs/source/development/traffic_ops.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
@@ -164,7 +163,7 @@ Installing The Developer Environment
====================================
To install the Traffic Ops Developer environment:
-1. Clone the traffic_control repository from `github.com <https://github.com/Comcast/traffic_control>`_.
+1. Clone the traffic_control repository from `github.com <https://github.com/apache/incubator-trafficcontrol>`_.
2. Install the local dependencies using Carton (cpanfile).
::
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_ops_api/routes.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/routes.rst b/docs/source/development/traffic_ops_api/routes.rst
index e378903..ec90963 100644
--- a/docs/source/development/traffic_ops_api/routes.rst
+++ b/docs/source/development/traffic_ops_api/routes.rst
@@ -25,7 +25,6 @@
</style>
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_ops_api/v11/asn.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v11/asn.rst b/docs/source/development/traffic_ops_api/v11/asn.rst
index bd10bb7..b6960d7 100644
--- a/docs/source/development/traffic_ops_api/v11/asn.rst
+++ b/docs/source/development/traffic_ops_api/v11/asn.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_ops_api/v11/cachegroup.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v11/cachegroup.rst b/docs/source/development/traffic_ops_api/v11/cachegroup.rst
index 30a5732..5278645 100644
--- a/docs/source/development/traffic_ops_api/v11/cachegroup.rst
+++ b/docs/source/development/traffic_ops_api/v11/cachegroup.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_ops_api/v11/cdn.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v11/cdn.rst b/docs/source/development/traffic_ops_api/v11/cdn.rst
index 1173c84..d2f742e 100644
--- a/docs/source/development/traffic_ops_api/v11/cdn.rst
+++ b/docs/source/development/traffic_ops_api/v11/cdn.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_ops_api/v11/changelog.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v11/changelog.rst b/docs/source/development/traffic_ops_api/v11/changelog.rst
index db73928..22b1ff1 100644
--- a/docs/source/development/traffic_ops_api/v11/changelog.rst
+++ b/docs/source/development/traffic_ops_api/v11/changelog.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_ops_api/v11/deliveryservice.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v11/deliveryservice.rst b/docs/source/development/traffic_ops_api/v11/deliveryservice.rst
index 73d8ffd..373c7ec 100644
--- a/docs/source/development/traffic_ops_api/v11/deliveryservice.rst
+++ b/docs/source/development/traffic_ops_api/v11/deliveryservice.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
@@ -27,7 +26,7 @@ Delivery Service
**GET /api/1.1/deliveryservices**
- Retrieves all delivery services. See also `Using Traffic Ops - Delivery Service <http://traffic-control-cdn.net/docs/latest/admin/traffic_ops_using.html#delivery-service>`_.
+ Retrieves all delivery services. See also `Using Traffic Ops - Delivery Service <http://trafficcontrol.apache.org/docs/latest/admin/traffic_ops_using.html#delivery-service>`_.
Authentication Required: Yes
@@ -64,8 +63,6 @@ Delivery Service
+--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
| ``edgeHeaderRewrite`` | string | The EDGE header rewrite actions to perform. |
+--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
- | ``exampleURLs`` | array | Entry points into the CDN for this deliveryservice. |
- +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
| ``geoLimitRedirectUrl`` | string | |
+--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
| ``geoLimit`` | string | - 0: None - no limitations |
@@ -107,8 +104,6 @@ Delivery Service
+--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
| ``longDesc2`` | string | Description field 2. |
+--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
- | ``matchList`` | array | Array of matchList hashes. |
- +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
| ``>>type`` | string | The type of MatchList (one of :ref:to-api-v11-types use_in_table='regex'). |
+--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
| ``>>setNumber`` | string | The set Number of the matchList. |
@@ -254,7 +249,7 @@ Delivery Service
**GET /api/1.1/deliveryservices/:id**
- Retrieves a specific delivery service. See also `Using Traffic Ops - Delivery Service <http://traffic-control-cdn.net/docs/latest/admin/traffic_ops_using.html#delivery-service>`_.
+ Retrieves a specific delivery service. See also `Using Traffic Ops - Delivery Service <http://trafficcontrol.apache.org/docs/latest/admin/traffic_ops_using.html#delivery-service>`_.
Authentication Required: Yes
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_ops_api/v11/hwinfo.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v11/hwinfo.rst b/docs/source/development/traffic_ops_api/v11/hwinfo.rst
index 8c5a9f3..cc45b38 100644
--- a/docs/source/development/traffic_ops_api/v11/hwinfo.rst
+++ b/docs/source/development/traffic_ops_api/v11/hwinfo.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_ops_api/v11/parameter.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v11/parameter.rst b/docs/source/development/traffic_ops_api/v11/parameter.rst
index db3a8d1..1b83d01 100644
--- a/docs/source/development/traffic_ops_api/v11/parameter.rst
+++ b/docs/source/development/traffic_ops_api/v11/parameter.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_ops_api/v11/phys_location.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v11/phys_location.rst b/docs/source/development/traffic_ops_api/v11/phys_location.rst
index 61d6c0b..6ebaff0 100644
--- a/docs/source/development/traffic_ops_api/v11/phys_location.rst
+++ b/docs/source/development/traffic_ops_api/v11/phys_location.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_ops_api/v11/profile.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v11/profile.rst b/docs/source/development/traffic_ops_api/v11/profile.rst
index 97075d8..5c37690 100644
--- a/docs/source/development/traffic_ops_api/v11/profile.rst
+++ b/docs/source/development/traffic_ops_api/v11/profile.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_ops_api/v11/region.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v11/region.rst b/docs/source/development/traffic_ops_api/v11/region.rst
index 7eda251..faddbb1 100644
--- a/docs/source/development/traffic_ops_api/v11/region.rst
+++ b/docs/source/development/traffic_ops_api/v11/region.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_ops_api/v11/role.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v11/role.rst b/docs/source/development/traffic_ops_api/v11/role.rst
index bd02f05..bf3337c 100644
--- a/docs/source/development/traffic_ops_api/v11/role.rst
+++ b/docs/source/development/traffic_ops_api/v11/role.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_ops_api/v11/server.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v11/server.rst b/docs/source/development/traffic_ops_api/v11/server.rst
index 61184f9..44f1292 100644
--- a/docs/source/development/traffic_ops_api/v11/server.rst
+++ b/docs/source/development/traffic_ops_api/v11/server.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_ops_api/v11/static_dns.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v11/static_dns.rst b/docs/source/development/traffic_ops_api/v11/static_dns.rst
index b840b90..c9d3a3d 100644
--- a/docs/source/development/traffic_ops_api/v11/static_dns.rst
+++ b/docs/source/development/traffic_ops_api/v11/static_dns.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_ops_api/v11/status.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v11/status.rst b/docs/source/development/traffic_ops_api/v11/status.rst
index 853f276..6a8c92a 100644
--- a/docs/source/development/traffic_ops_api/v11/status.rst
+++ b/docs/source/development/traffic_ops_api/v11/status.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_ops_api/v11/system.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v11/system.rst b/docs/source/development/traffic_ops_api/v11/system.rst
index ba3edbb..c4e53df 100644
--- a/docs/source/development/traffic_ops_api/v11/system.rst
+++ b/docs/source/development/traffic_ops_api/v11/system.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_ops_api/v11/to_extension.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v11/to_extension.rst b/docs/source/development/traffic_ops_api/v11/to_extension.rst
index 676a457..5ed2654 100644
--- a/docs/source/development/traffic_ops_api/v11/to_extension.rst
+++ b/docs/source/development/traffic_ops_api/v11/to_extension.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_ops_api/v11/type.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v11/type.rst b/docs/source/development/traffic_ops_api/v11/type.rst
index 2430b97..6c7806b 100644
--- a/docs/source/development/traffic_ops_api/v11/type.rst
+++ b/docs/source/development/traffic_ops_api/v11/type.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_ops_api/v11/user.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v11/user.rst b/docs/source/development/traffic_ops_api/v11/user.rst
index 5b06ccc..2ef5012 100644
--- a/docs/source/development/traffic_ops_api/v11/user.rst
+++ b/docs/source/development/traffic_ops_api/v11/user.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_ops_api/v12/asn.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v12/asn.rst b/docs/source/development/traffic_ops_api/v12/asn.rst
index fb45a07..d3ae765 100644
--- a/docs/source/development/traffic_ops_api/v12/asn.rst
+++ b/docs/source/development/traffic_ops_api/v12/asn.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_ops_api/v12/cache_stats.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v12/cache_stats.rst b/docs/source/development/traffic_ops_api/v12/cache_stats.rst
index d959c2b..dffc9a4 100644
--- a/docs/source/development/traffic_ops_api/v12/cache_stats.rst
+++ b/docs/source/development/traffic_ops_api/v12/cache_stats.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_ops_api/v12/cachegroup.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v12/cachegroup.rst b/docs/source/development/traffic_ops_api/v12/cachegroup.rst
index 5e6dc06..2d9f08d 100644
--- a/docs/source/development/traffic_ops_api/v12/cachegroup.rst
+++ b/docs/source/development/traffic_ops_api/v12/cachegroup.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_ops_api/v12/cdn.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v12/cdn.rst b/docs/source/development/traffic_ops_api/v12/cdn.rst
index 9a4daac..1819c69 100644
--- a/docs/source/development/traffic_ops_api/v12/cdn.rst
+++ b/docs/source/development/traffic_ops_api/v12/cdn.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_ops_api/v12/changelog.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v12/changelog.rst b/docs/source/development/traffic_ops_api/v12/changelog.rst
index edb4ff3..5cedbe0 100644
--- a/docs/source/development/traffic_ops_api/v12/changelog.rst
+++ b/docs/source/development/traffic_ops_api/v12/changelog.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
[19/26] incubator-trafficcontrol git commit: merge master
Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/experimental/traffic_monitor/traffic_monitor.go
----------------------------------------------------------------------
diff --git a/traffic_monitor/experimental/traffic_monitor/traffic_monitor.go b/traffic_monitor/experimental/traffic_monitor/traffic_monitor.go
index 2a96c9d..1b726d2 100644
--- a/traffic_monitor/experimental/traffic_monitor/traffic_monitor.go
+++ b/traffic_monitor/experimental/traffic_monitor/traffic_monitor.go
@@ -1,5 +1,25 @@
package main
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
import (
"bytes"
"flag"
@@ -12,14 +32,17 @@ import (
"runtime"
"time"
- _ "github.com/Comcast/traffic_control/traffic_monitor/experimental/common/instrumentation"
- "github.com/Comcast/traffic_control/traffic_monitor/experimental/common/log"
- "github.com/Comcast/traffic_control/traffic_monitor/experimental/traffic_monitor/config"
- "github.com/Comcast/traffic_control/traffic_monitor/experimental/traffic_monitor/manager"
+ _ "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/common/instrumentation"
+ "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/common/log"
+ "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/traffic_monitor/config"
+ "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/traffic_monitor/manager"
_ "github.com/davecheney/gmx"
)
+// GitRevision is the git revision of the app. The app SHOULD always be built with this set via the `-X` flag.
var GitRevision = "No Git Revision Specified. Please build with '-X main.GitRevision=${git rev-parse HEAD}'"
+
+// BuildTimestamp is the time the app was built. The app SHOULD always be built with this set via the `-X` flag.
var BuildTimestamp = "No Build Timestamp Specified. Please build with '-X main.BuildTimestamp=`date +'%Y-%M-%dT%H:%M:%S'`"
// getHostNameWithoutDomain returns the machine hostname, without domain information.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/experimental/traffic_monitor/trafficopsdata/trafficopsdata.go
----------------------------------------------------------------------
diff --git a/traffic_monitor/experimental/traffic_monitor/trafficopsdata/trafficopsdata.go b/traffic_monitor/experimental/traffic_monitor/trafficopsdata/trafficopsdata.go
index 08d3031..e12818c 100644
--- a/traffic_monitor/experimental/traffic_monitor/trafficopsdata/trafficopsdata.go
+++ b/traffic_monitor/experimental/traffic_monitor/trafficopsdata/trafficopsdata.go
@@ -1,16 +1,36 @@
package trafficopsdata
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
import (
"encoding/json"
"fmt"
- "github.com/Comcast/traffic_control/traffic_monitor/experimental/traffic_monitor/enum"
- towrap "github.com/Comcast/traffic_control/traffic_monitor/experimental/traffic_monitor/trafficopswrapper"
+ "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/traffic_monitor/enum"
+ towrap "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/traffic_monitor/trafficopswrapper"
"regexp"
"strings"
"sync"
)
-// DsRegexes maps Delivery Service Regular Expressions to delivery services.
+// Regexes maps Delivery Service Regular Expressions to delivery services.
// For performance, we categorize Regular Expressions into 3 categories:
// 1. Direct string matches, with no regular expression matching characters
// 2. .*\.foo\..* expressions, where foo is a direct string match with no regular expression matching characters
@@ -41,10 +61,12 @@ func (d Regexes) DeliveryService(fqdn string) (enum.DeliveryServiceName, bool) {
return "", false
}
+// NewRegexes constructs a new Regexes object, initializing internal pointer members.
func NewRegexes() Regexes {
return Regexes{DirectMatches: map[string]enum.DeliveryServiceName{}, DotStartSlashDotFooSlashDotDotStar: map[string]enum.DeliveryServiceName{}, RegexMatch: map[*regexp.Regexp]enum.DeliveryServiceName{}}
}
+// TOData holds CDN data fetched from Traffic Ops.
type TOData struct {
DeliveryServiceServers map[enum.DeliveryServiceName][]enum.CacheName
ServerDeliveryServices map[enum.CacheName][]enum.DeliveryServiceName
@@ -54,6 +76,7 @@ type TOData struct {
ServerCachegroups map[enum.CacheName]enum.CacheGroupName
}
+// New returns a new empty TOData object, initializing pointer members.
func New() *TOData {
return &TOData{
DeliveryServiceServers: map[enum.DeliveryServiceName][]enum.CacheName{},
@@ -65,12 +88,14 @@ func New() *TOData {
}
}
+// TODataThreadsafe provides safe access for multiple goroutine writers and one goroutine reader, to the encapsulated TOData object.
// This could be made lock-free, if the performance was necessary
type TODataThreadsafe struct {
toData *TOData
m *sync.RWMutex
}
+// NewThreadsafe returns a new TOData object, wrapped to be safe for multiple goroutine readers and a single writer.
func NewThreadsafe() TODataThreadsafe {
return TODataThreadsafe{m: &sync.RWMutex{}, toData: New()}
}
@@ -118,7 +143,8 @@ func (d TODataThreadsafe) Fetch(to towrap.ITrafficOpsSession, cdn string) error
return fmt.Errorf("Error getting CRconfig from Traffic Ops: %v", err)
}
var crConfig CRConfig
- if err := json.Unmarshal(crConfigBytes, &crConfig); err != nil {
+ err = json.Unmarshal(crConfigBytes, &crConfig)
+ if err != nil {
return fmt.Errorf("Error unmarshalling CRconfig: %v", err)
}
@@ -157,7 +183,7 @@ func getDeliveryServiceServers(crc CRConfig) (map[enum.DeliveryServiceName][]enu
serverDses := map[enum.CacheName][]enum.DeliveryServiceName{}
for serverName, serverData := range crc.ContentServers {
- for deliveryServiceName, _ := range serverData.DeliveryServices {
+ for deliveryServiceName := range serverData.DeliveryServices {
dsServers[deliveryServiceName] = append(dsServers[deliveryServiceName], serverName)
serverDses[serverName] = append(serverDses[serverName], deliveryServiceName)
}
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/experimental/traffic_monitor/trafficopswrapper/trafficopswrapper.go
----------------------------------------------------------------------
diff --git a/traffic_monitor/experimental/traffic_monitor/trafficopswrapper/trafficopswrapper.go b/traffic_monitor/experimental/traffic_monitor/trafficopswrapper/trafficopswrapper.go
index 5250039..d8be7cc 100644
--- a/traffic_monitor/experimental/traffic_monitor/trafficopswrapper/trafficopswrapper.go
+++ b/traffic_monitor/experimental/traffic_monitor/trafficopswrapper/trafficopswrapper.go
@@ -1,27 +1,51 @@
package trafficopswrapper
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
import (
"fmt"
"sync"
- to "github.com/Comcast/traffic_control/traffic_ops/client"
+ to "github.com/apache/incubator-trafficcontrol/traffic_ops/client"
)
+// ITrafficOpsSession provides an interface to the Traffic Ops client, so it may be wrapped or mocked.
type ITrafficOpsSession interface {
CRConfigRaw(cdn string) ([]byte, error)
TrafficMonitorConfigMap(cdn string) (*to.TrafficMonitorConfigMap, error)
Set(session *to.Session)
}
+// TrafficOpsSessionThreadsafe provides access to the Traffic Ops client safe for multiple goroutines. This fulfills the ITrafficOpsSession interface.
type TrafficOpsSessionThreadsafe struct {
session **to.Session // pointer-to-pointer, because we're given a pointer from the Traffic Ops package, and we don't want to copy it.
m *sync.Mutex
}
+// NewTrafficOpsSessionThreadsafe returns a new threadsafe TrafficOpsSessionThreadsafe wrapping the given `Session`.
func NewTrafficOpsSessionThreadsafe(s *to.Session) TrafficOpsSessionThreadsafe {
return TrafficOpsSessionThreadsafe{&s, &sync.Mutex{}}
}
+// CRConfigRaw returns the CRConfig from the Traffic Ops. This is safe for multiple goroutines.
func (s TrafficOpsSessionThreadsafe) CRConfigRaw(cdn string) ([]byte, error) {
s.m.Lock()
if s.session == nil || *s.session == nil {
@@ -32,6 +56,7 @@ func (s TrafficOpsSessionThreadsafe) CRConfigRaw(cdn string) ([]byte, error) {
return b, e
}
+// TrafficMonitorConfigMap returns the Traffic Monitor config map from the Traffic Ops. This is safe for multiple goroutines.
func (s TrafficOpsSessionThreadsafe) TrafficMonitorConfigMap(cdn string) (*to.TrafficMonitorConfigMap, error) {
s.m.Lock()
if s.session == nil || *s.session == nil {
@@ -42,6 +67,7 @@ func (s TrafficOpsSessionThreadsafe) TrafficMonitorConfigMap(cdn string) (*to.Tr
return d, e
}
+// Set sets the internal Traffic Ops session. This is safe for multiple goroutines, being aware they will race.
func (s TrafficOpsSessionThreadsafe) Set(session *to.Session) {
s.m.Lock()
*s.session = session
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/experimental/traffic_monitor/version.go
----------------------------------------------------------------------
diff --git a/traffic_monitor/experimental/traffic_monitor/version.go b/traffic_monitor/experimental/traffic_monitor/version.go
index bc6309a..3f22073 100644
--- a/traffic_monitor/experimental/traffic_monitor/version.go
+++ b/traffic_monitor/experimental/traffic_monitor/version.go
@@ -1,3 +1,24 @@
package main
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
+// Version is the current version of the app, in string form.
var Version = "2.2"
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/pom.xml
----------------------------------------------------------------------
diff --git a/traffic_monitor/pom.xml b/traffic_monitor/pom.xml
index eae7e46..b6887c7 100644
--- a/traffic_monitor/pom.xml
+++ b/traffic_monitor/pom.xml
@@ -1,4 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
@@ -6,7 +26,7 @@
<groupId>com.comcast.cdn.traffic_control</groupId>
<artifactId>traffic_monitor</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0</version>
<packaging>war</packaging>
<scm>
@@ -317,7 +337,6 @@
</execution>
</executions>
<configuration>
- <copyright>2011-2014, Comcast Converged Products</copyright>
<group>Applications/Internet</group>
<release>${env.GIT_REV_COUNT}.${buildNumber}.el6</release>
<needarch>x86_64</needarch>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/bin/config-doc.sh
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/bin/config-doc.sh b/traffic_monitor/src/main/bin/config-doc.sh
index 5d57a00..06425e1 100644
--- a/traffic_monitor/src/main/bin/config-doc.sh
+++ b/traffic_monitor/src/main/bin/config-doc.sh
@@ -1,6 +1,5 @@
#!/bin/bash
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/bin/traffic_monitor_config.pl
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/bin/traffic_monitor_config.pl b/traffic_monitor/src/main/bin/traffic_monitor_config.pl
index 0bcc302..b39a65d 100755
--- a/traffic_monitor/src/main/bin/traffic_monitor_config.pl
+++ b/traffic_monitor/src/main/bin/traffic_monitor_config.pl
@@ -1,6 +1,5 @@
#!/usr/bin/perl
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/conf/log4j.properties
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/conf/log4j.properties b/traffic_monitor/src/main/conf/log4j.properties
index 152daac..17c0cc4 100644
--- a/traffic_monitor/src/main/conf/log4j.properties
+++ b/traffic_monitor/src/main/conf/log4j.properties
@@ -1,5 +1,4 @@
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/Index.html
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/Index.html b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/Index.html
index faf6527..95a85c9 100644
--- a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/Index.html
+++ b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/Index.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<html>
<head>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/Index.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/Index.java b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/Index.java
index f32ce2b..c3212c0 100644
--- a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/Index.java
+++ b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/Index.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/MonitorApplication.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/MonitorApplication.java b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/MonitorApplication.java
index 1253e8b..edd65a2 100644
--- a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/MonitorApplication.java
+++ b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/MonitorApplication.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/MonitorPage.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/MonitorPage.java b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/MonitorPage.java
index 12bcd58..5eb78de 100644
--- a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/MonitorPage.java
+++ b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/MonitorPage.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/MonitorSession.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/MonitorSession.java b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/MonitorSession.java
index 5b01f9f..4222f82 100644
--- a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/MonitorSession.java
+++ b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/MonitorSession.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/StatisticModel.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/StatisticModel.java b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/StatisticModel.java
index 3182ace..9e0b46e 100644
--- a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/StatisticModel.java
+++ b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/StatisticModel.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/config/Cache.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/config/Cache.java b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/config/Cache.java
index 6b2b620..8372277 100644
--- a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/config/Cache.java
+++ b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/config/Cache.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/config/Config.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/config/Config.java b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/config/Config.java
index 6ae8dd9..0e1d099 100644
--- a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/config/Config.java
+++ b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/config/Config.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/config/ConfigHandler.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/config/ConfigHandler.java b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/config/ConfigHandler.java
index b2183c3..f825bbd 100644
--- a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/config/ConfigHandler.java
+++ b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/config/ConfigHandler.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/config/MonitorConfig.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/config/MonitorConfig.java b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/config/MonitorConfig.java
index 0a62cce..a8d2def 100644
--- a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/config/MonitorConfig.java
+++ b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/config/MonitorConfig.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/config/Peer.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/config/Peer.java b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/config/Peer.java
index 687d27d..898e2c8 100644
--- a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/config/Peer.java
+++ b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/config/Peer.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/config/RouterConfig.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/config/RouterConfig.java b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/config/RouterConfig.java
index 4593ff4..344e4bd 100644
--- a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/config/RouterConfig.java
+++ b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/config/RouterConfig.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/data/DataPoint.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/data/DataPoint.java b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/data/DataPoint.java
index f41ca28..9ac465d 100644
--- a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/data/DataPoint.java
+++ b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/data/DataPoint.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/data/DataSummary.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/data/DataSummary.java b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/data/DataSummary.java
index 32b3078..820b19f 100644
--- a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/data/DataSummary.java
+++ b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/data/DataSummary.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/data/StatisticsLog.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/data/StatisticsLog.java b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/data/StatisticsLog.java
index 6bf3995..5645532 100644
--- a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/data/StatisticsLog.java
+++ b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/data/StatisticsLog.java
@@ -1,5 +1,25 @@
package com.comcast.cdn.traffic_control.traffic_monitor.data;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
import org.apache.log4j.Logger;
import java.util.Arrays;
@@ -259,4 +279,4 @@ public class StatisticsLog {
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/AbstractState.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/AbstractState.java b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/AbstractState.java
index cbae776..47fb607 100644
--- a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/AbstractState.java
+++ b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/AbstractState.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/Bandwidth.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/Bandwidth.java b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/Bandwidth.java
index a86c4ee..0aea900 100644
--- a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/Bandwidth.java
+++ b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/Bandwidth.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/CacheState.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/CacheState.java b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/CacheState.java
index 831473a..4d10f4a 100644
--- a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/CacheState.java
+++ b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/CacheState.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/CacheStateRegistry.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/CacheStateRegistry.java b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/CacheStateRegistry.java
index d12dc19..dd63356 100644
--- a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/CacheStateRegistry.java
+++ b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/CacheStateRegistry.java
@@ -1,5 +1,25 @@
package com.comcast.cdn.traffic_control.traffic_monitor.health;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
import com.comcast.cdn.traffic_control.traffic_monitor.config.Cache;
import static com.comcast.cdn.traffic_control.traffic_monitor.health.HealthDeterminer.AdminStatus.ADMIN_DOWN;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/CacheStateUpdater.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/CacheStateUpdater.java b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/CacheStateUpdater.java
index db1fa8a..5ed444e 100644
--- a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/CacheStateUpdater.java
+++ b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/CacheStateUpdater.java
@@ -1,5 +1,25 @@
package com.comcast.cdn.traffic_control.traffic_monitor.health;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
import com.comcast.cdn.traffic_control.traffic_monitor.wicket.models.CacheDataModel;
import com.ning.http.client.AsyncCompletionHandler;
import com.ning.http.client.Response;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/CacheStatisticsClient.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/CacheStatisticsClient.java b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/CacheStatisticsClient.java
index 703413c..206226d 100644
--- a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/CacheStatisticsClient.java
+++ b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/CacheStatisticsClient.java
@@ -1,5 +1,25 @@
package com.comcast.cdn.traffic_control.traffic_monitor.health;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
import com.comcast.cdn.traffic_control.traffic_monitor.config.Cache;
import com.ning.http.client.AsyncHttpClient;
import com.ning.http.client.AsyncHttpClientConfig;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/CacheWatcher.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/CacheWatcher.java b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/CacheWatcher.java
index 4c83d8d..7213465 100644
--- a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/CacheWatcher.java
+++ b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/CacheWatcher.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/DeliveryServiceStateRegistry.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/DeliveryServiceStateRegistry.java b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/DeliveryServiceStateRegistry.java
index 9445b17..c73906c 100644
--- a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/DeliveryServiceStateRegistry.java
+++ b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/DeliveryServiceStateRegistry.java
@@ -1,5 +1,25 @@
package com.comcast.cdn.traffic_control.traffic_monitor.health;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
import com.comcast.cdn.traffic_control.traffic_monitor.config.Cache;
import com.comcast.cdn.traffic_control.traffic_monitor.data.DataPoint;
import org.apache.log4j.Logger;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/DsState.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/DsState.java b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/DsState.java
index d5e18ab..51057b5 100644
--- a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/DsState.java
+++ b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/DsState.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/DsStati.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/DsStati.java b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/DsStati.java
index dea0dfd..016ab5e 100644
--- a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/DsStati.java
+++ b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/DsStati.java
@@ -1,5 +1,25 @@
package com.comcast.cdn.traffic_control.traffic_monitor.health;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
import org.apache.log4j.Logger;
import java.text.DecimalFormat;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/DsWatcher.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/DsWatcher.java b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/DsWatcher.java
index bc6d37a..a3517f0 100644
--- a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/DsWatcher.java
+++ b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/DsWatcher.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/EmbeddedStati.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/EmbeddedStati.java b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/EmbeddedStati.java
index e9e98aa..22ad81d 100644
--- a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/EmbeddedStati.java
+++ b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/EmbeddedStati.java
@@ -1,5 +1,25 @@
package com.comcast.cdn.traffic_control.traffic_monitor.health;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
import java.util.HashMap;
import java.util.Map;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/Event.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/Event.java b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/Event.java
index a1da815..0b9155d 100644
--- a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/Event.java
+++ b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/Event.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/HealthDeterminer.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/HealthDeterminer.java b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/HealthDeterminer.java
index 09b5ea8..072380e 100644
--- a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/HealthDeterminer.java
+++ b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/HealthDeterminer.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/PeerState.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/PeerState.java b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/PeerState.java
index 8ac164a..32a0988 100644
--- a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/PeerState.java
+++ b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/PeerState.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/PeerWatcher.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/PeerWatcher.java b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/PeerWatcher.java
index 8ecd91f..377d497 100644
--- a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/PeerWatcher.java
+++ b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/PeerWatcher.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/StateRegistry.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/StateRegistry.java b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/StateRegistry.java
index 9e07aff..9206bdd 100644
--- a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/StateRegistry.java
+++ b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/StateRegistry.java
@@ -1,5 +1,25 @@
package com.comcast.cdn.traffic_control.traffic_monitor.health;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/TmListener.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/TmListener.java b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/TmListener.java
index e014c16..d74cd01 100644
--- a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/TmListener.java
+++ b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/TmListener.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/TmWatcher.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/TmWatcher.java b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/TmWatcher.java
index bfc545b..57819d4 100644
--- a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/TmWatcher.java
+++ b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/health/TmWatcher.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/publish/CacheStats.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/publish/CacheStats.java b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/publish/CacheStats.java
index 67a9787..74fac99 100644
--- a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/publish/CacheStats.java
+++ b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/publish/CacheStats.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/publish/ConfigDoc.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/publish/ConfigDoc.java b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/publish/ConfigDoc.java
index 8eca7af..7462b31 100644
--- a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/publish/ConfigDoc.java
+++ b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/publish/ConfigDoc.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/publish/CrConfig.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/publish/CrConfig.java b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/publish/CrConfig.java
index 27595ff..f59ca34 100644
--- a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/publish/CrConfig.java
+++ b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/publish/CrConfig.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/publish/CrStates.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/publish/CrStates.java b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/publish/CrStates.java
index c554e0d..8bac0ae 100644
--- a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/publish/CrStates.java
+++ b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/publish/CrStates.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/publish/DsStats.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/publish/DsStats.java b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/publish/DsStats.java
index 1299c55..8506185 100644
--- a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/publish/DsStats.java
+++ b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/publish/DsStats.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/publish/EventLog.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/publish/EventLog.java b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/publish/EventLog.java
index c766371..1bb3f6e 100644
--- a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/publish/EventLog.java
+++ b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/publish/EventLog.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/publish/JsonPage.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/publish/JsonPage.java b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/publish/JsonPage.java
index 05b21c9..4f6b0f6 100644
--- a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/publish/JsonPage.java
+++ b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/publish/JsonPage.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/publish/PeerStates.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/publish/PeerStates.java b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/publish/PeerStates.java
index fc54c50..eaca64c 100644
--- a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/publish/PeerStates.java
+++ b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/publish/PeerStates.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/publish/StatSummary.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/publish/StatSummary.java b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/publish/StatSummary.java
index 9936dd1..652d95f 100644
--- a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/publish/StatSummary.java
+++ b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/publish/StatSummary.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/publish/Stats.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/publish/Stats.java b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/publish/Stats.java
index ab6096f..f85941b 100644
--- a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/publish/Stats.java
+++ b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/publish/Stats.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/util/Fetcher.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/util/Fetcher.java b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/util/Fetcher.java
index 590a083..ee38261 100644
--- a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/util/Fetcher.java
+++ b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/util/Fetcher.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/util/Network.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/util/Network.java b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/util/Network.java
index 39cdfa1..0456c0a 100644
--- a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/util/Network.java
+++ b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/util/Network.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/util/PeriodicResourceUpdater.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/util/PeriodicResourceUpdater.java b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/util/PeriodicResourceUpdater.java
index 6b01f5e..bfd9265 100644
--- a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/util/PeriodicResourceUpdater.java
+++ b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/util/PeriodicResourceUpdater.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/util/StableBloomFilter.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/util/StableBloomFilter.java b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/util/StableBloomFilter.java
index 4aebf2d..bde7dc5 100644
--- a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/util/StableBloomFilter.java
+++ b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/util/StableBloomFilter.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/util/Updatable.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/util/Updatable.java b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/util/Updatable.java
index 15b59cf..fbaae70 100644
--- a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/util/Updatable.java
+++ b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/util/Updatable.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/behaviors/AbstractMultiAjaxBehavior.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/behaviors/AbstractMultiAjaxBehavior.java b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/behaviors/AbstractMultiAjaxBehavior.java
index 33ff0dd..60d3fa9 100644
--- a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/behaviors/AbstractMultiAjaxBehavior.java
+++ b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/behaviors/AbstractMultiAjaxBehavior.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/behaviors/MultiUpdatingTimerBehavior.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/behaviors/MultiUpdatingTimerBehavior.java b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/behaviors/MultiUpdatingTimerBehavior.java
index 5ddf467..6101faf 100644
--- a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/behaviors/MultiUpdatingTimerBehavior.java
+++ b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/behaviors/MultiUpdatingTimerBehavior.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/behaviors/UpdatingAttributeAppender.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/behaviors/UpdatingAttributeAppender.java b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/behaviors/UpdatingAttributeAppender.java
index 07b21d8..97f42d9 100644
--- a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/behaviors/UpdatingAttributeAppender.java
+++ b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/behaviors/UpdatingAttributeAppender.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/components/CacheDetailsPage.html
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/components/CacheDetailsPage.html b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/components/CacheDetailsPage.html
index 1617879..11d10ff 100644
--- a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/components/CacheDetailsPage.html
+++ b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/components/CacheDetailsPage.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<html>
<head>
<title wicket:id="hostname">>Traffic Monitor - Details Page</title>
@@ -18,4 +37,4 @@
</div>
</div>
</body>
-</html>
\ No newline at end of file
+</html>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/components/CacheDetailsPage.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/components/CacheDetailsPage.java b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/components/CacheDetailsPage.java
index 17a4f3b..ed77dda 100644
--- a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/components/CacheDetailsPage.java
+++ b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/components/CacheDetailsPage.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/components/CacheListPanel.html
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/components/CacheListPanel.html b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/components/CacheListPanel.html
index 24405c6..69f152a 100644
--- a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/components/CacheListPanel.html
+++ b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/components/CacheListPanel.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<html>
<body>
<wicket:head>
@@ -30,4 +49,4 @@
</table>
</wicket:panel>
</body>
-</html>
\ No newline at end of file
+</html>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/components/CacheListPanel.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/components/CacheListPanel.java b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/components/CacheListPanel.java
index a13cdac..4e42dad 100644
--- a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/components/CacheListPanel.java
+++ b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/components/CacheListPanel.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/components/DsDetailsPage.html
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/components/DsDetailsPage.html b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/components/DsDetailsPage.html
index dd7c7bb..33d9428 100644
--- a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/components/DsDetailsPage.html
+++ b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/components/DsDetailsPage.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<html>
<head>
<title wicket:id="id">>Traffic Monitor - Details Page</title>
@@ -18,4 +37,4 @@
</div>
</div>
</body>
-</html>
\ No newline at end of file
+</html>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/components/DsDetailsPage.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/components/DsDetailsPage.java b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/components/DsDetailsPage.java
index 99b0459..28d946a 100644
--- a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/components/DsDetailsPage.java
+++ b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/components/DsDetailsPage.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/components/DsListPanel.html
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/components/DsListPanel.html b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/components/DsListPanel.html
index 66fe395..2320f76 100644
--- a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/components/DsListPanel.html
+++ b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/components/DsListPanel.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<html>
<body>
<wicket:head>
@@ -38,4 +57,4 @@
</table>
</wicket:panel>
</body>
-</html>
\ No newline at end of file
+</html>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/components/DsListPanel.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/components/DsListPanel.java b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/components/DsListPanel.java
index a366cae..a8a4069 100644
--- a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/components/DsListPanel.java
+++ b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/components/DsListPanel.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/components/EventLogPanel.html
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/components/EventLogPanel.html b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/components/EventLogPanel.html
index 11e88e1..7980481 100644
--- a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/components/EventLogPanel.html
+++ b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/components/EventLogPanel.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<html>
<body>
<wicket:head>
@@ -37,4 +56,4 @@
</table>
</wicket:panel>
</body>
-</html>
\ No newline at end of file
+</html>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/components/EventLogPanel.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/components/EventLogPanel.java b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/components/EventLogPanel.java
index f01de5e..129fd86 100644
--- a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/components/EventLogPanel.java
+++ b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/components/EventLogPanel.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/components/StateDetailsPage.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/components/StateDetailsPage.java b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/components/StateDetailsPage.java
index f16de4a..24bb233 100644
--- a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/components/StateDetailsPage.java
+++ b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/components/StateDetailsPage.java
@@ -1,5 +1,25 @@
package com.comcast.cdn.traffic_control.traffic_monitor.wicket.components;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
import com.comcast.cdn.traffic_control.traffic_monitor.StatisticModel;
import com.comcast.cdn.traffic_control.traffic_monitor.MonitorPage;
import com.comcast.cdn.traffic_control.traffic_monitor.health.StateRegistry;
[20/26] incubator-trafficcontrol git commit: merge master
Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/experimental/traffic_monitor/manager/healthresult.go
----------------------------------------------------------------------
diff --git a/traffic_monitor/experimental/traffic_monitor/manager/healthresult.go b/traffic_monitor/experimental/traffic_monitor/manager/healthresult.go
index a2cc876..023c570 100644
--- a/traffic_monitor/experimental/traffic_monitor/manager/healthresult.go
+++ b/traffic_monitor/experimental/traffic_monitor/manager/healthresult.go
@@ -1,25 +1,48 @@
package manager
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
import (
"sync"
"time"
- "github.com/Comcast/traffic_control/traffic_monitor/experimental/common/log"
- "github.com/Comcast/traffic_control/traffic_monitor/experimental/traffic_monitor/cache"
- "github.com/Comcast/traffic_control/traffic_monitor/experimental/traffic_monitor/config"
- "github.com/Comcast/traffic_control/traffic_monitor/experimental/traffic_monitor/enum"
- "github.com/Comcast/traffic_control/traffic_monitor/experimental/traffic_monitor/health"
- "github.com/Comcast/traffic_control/traffic_monitor/experimental/traffic_monitor/peer"
- todata "github.com/Comcast/traffic_control/traffic_monitor/experimental/traffic_monitor/trafficopsdata"
+ "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/common/log"
+ "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/traffic_monitor/cache"
+ "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/traffic_monitor/config"
+ "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/traffic_monitor/enum"
+ "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/traffic_monitor/health"
+ "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/traffic_monitor/peer"
+ todata "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/traffic_monitor/trafficopsdata"
)
+// DurationMap represents a map of cache names to durations
type DurationMap map[enum.CacheName]time.Duration
+// DurationMapThreadsafe wraps a DurationMap in an object safe for a single writer and multiple readers
type DurationMapThreadsafe struct {
durationMap *DurationMap
m *sync.RWMutex
}
+// Copy copies this duration map.
func (a DurationMap) Copy() DurationMap {
b := DurationMap{}
for k, v := range a {
@@ -28,6 +51,7 @@ func (a DurationMap) Copy() DurationMap {
return b
}
+// NewDurationMapThreadsafe returns a new DurationMapThreadsafe safe for multiple readers and a single writer goroutine.
func NewDurationMapThreadsafe() DurationMapThreadsafe {
m := DurationMap{}
return DurationMapThreadsafe{m: &sync.RWMutex{}, durationMap: &m}
@@ -40,6 +64,7 @@ func (o *DurationMapThreadsafe) Get() DurationMap {
return *o.durationMap
}
+// Set sets the internal duration map. This MUST NOT be called by multiple goroutines.
func (o *DurationMapThreadsafe) Set(d DurationMap) {
o.m.Lock()
*o.durationMap = d
@@ -84,9 +109,6 @@ func StartHealthResultManager(
return lastHealthDurations, events, localCacheStatus
}
-// cacheAggregateSeconds is how often to aggregate stats, if the health chan is never empty. (Otherwise, we read from the chan until it's empty, then aggregate, continuously)
-const cacheAggregateSeconds = 1
-
func healthResultManagerListen(
cacheHealthChan <-chan cache.Result,
toData todata.TODataThreadsafe,
@@ -192,7 +214,7 @@ func processHealthResult(
log.Debugf("poll %v %v healthresultman start\n", healthResult.PollID, time.Now())
fetchCount.Inc()
var prevResult cache.Result
- healthResultHistory := healthHistory[enum.CacheName(healthResult.Id)]
+ healthResultHistory := healthHistory[healthResult.ID]
if len(healthResultHistory) != 0 {
prevResult = healthResultHistory[len(healthResultHistory)-1]
}
@@ -201,16 +223,17 @@ func processHealthResult(
health.GetVitals(&healthResult, &prevResult, &monitorConfigCopy)
}
- healthHistory[enum.CacheName(healthResult.Id)] = pruneHistory(append(healthHistory[enum.CacheName(healthResult.Id)], healthResult), cfg.MaxHealthHistory)
+ maxHistory := uint64(monitorConfigCopy.Profile[monitorConfigCopy.TrafficServer[string(healthResult.ID)].Profile].Parameters.HistoryCount)
+ healthHistory[healthResult.ID] = pruneHistory(append(healthHistory[healthResult.ID], healthResult), maxHistory)
isAvailable, whyAvailable := health.EvalCache(healthResult, &monitorConfigCopy)
- if localStates.Get().Caches[healthResult.Id].IsAvailable != isAvailable {
- log.Infof("Changing state for %s was: %t now: %t because %s error: %v", healthResult.Id, prevResult.Available, isAvailable, whyAvailable, healthResult.Error)
- events.Add(Event{Time: time.Now().Unix(), Description: whyAvailable, Name: healthResult.Id, Hostname: healthResult.Id, Type: toDataCopy.ServerTypes[healthResult.Id].String(), Available: isAvailable})
+ if localStates.Get().Caches[healthResult.ID].IsAvailable != isAvailable {
+ log.Infof("Changing state for %s was: %t now: %t because %s error: %v", healthResult.ID, prevResult.Available, isAvailable, whyAvailable, healthResult.Error)
+ events.Add(Event{Time: time.Now().Unix(), Description: whyAvailable, Name: healthResult.ID, Hostname: healthResult.ID, Type: toDataCopy.ServerTypes[healthResult.ID].String(), Available: isAvailable})
}
- localCacheStatus[healthResult.Id] = CacheAvailableStatus{Available: isAvailable, Status: monitorConfigCopy.TrafficServer[string(healthResult.Id)].Status} // TODO move within localStates?
- localStates.SetCache(healthResult.Id, peer.IsAvailable{IsAvailable: isAvailable})
+ localCacheStatus[healthResult.ID] = CacheAvailableStatus{Available: isAvailable, Status: monitorConfigCopy.TrafficServer[string(healthResult.ID)].Status} // TODO move within localStates?
+ localStates.SetCache(healthResult.ID, peer.IsAvailable{IsAvailable: isAvailable})
log.Debugf("poll %v %v calculateDeliveryServiceState start\n", healthResult.PollID, time.Now())
calculateDeliveryServiceState(toDataCopy.DeliveryServiceServers, localStates)
log.Debugf("poll %v %v calculateDeliveryServiceState end\n", healthResult.PollID, time.Now())
@@ -220,11 +243,11 @@ func processHealthResult(
lastHealthDurations := lastHealthDurationsThreadsafe.Get().Copy()
for _, healthResult := range results {
- if lastHealthStart, ok := lastHealthEndTimes[enum.CacheName(healthResult.Id)]; ok {
+ if lastHealthStart, ok := lastHealthEndTimes[healthResult.ID]; ok {
d := time.Since(lastHealthStart)
- lastHealthDurations[enum.CacheName(healthResult.Id)] = d
+ lastHealthDurations[healthResult.ID] = d
}
- lastHealthEndTimes[enum.CacheName(healthResult.Id)] = time.Now()
+ lastHealthEndTimes[healthResult.ID] = time.Now()
log.Debugf("poll %v %v finish\n", healthResult.PollID, time.Now())
healthResult.PollFinished <- healthResult.PollID
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/experimental/traffic_monitor/manager/lastkbpsstats.go
----------------------------------------------------------------------
diff --git a/traffic_monitor/experimental/traffic_monitor/manager/lastkbpsstats.go b/traffic_monitor/experimental/traffic_monitor/manager/lastkbpsstats.go
index 103ebd0..cb5811d 100644
--- a/traffic_monitor/experimental/traffic_monitor/manager/lastkbpsstats.go
+++ b/traffic_monitor/experimental/traffic_monitor/manager/lastkbpsstats.go
@@ -1,15 +1,37 @@
package manager
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
import (
- ds "github.com/Comcast/traffic_control/traffic_monitor/experimental/traffic_monitor/deliveryservice"
+ ds "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/traffic_monitor/deliveryservice"
"sync"
)
+// LastStatsThreadsafe wraps a deliveryservice.LastStats object to be safe for multiple readers and one writer.
type LastStatsThreadsafe struct {
stats *ds.LastStats
m *sync.RWMutex
}
+// NewLastStatsThreadsafe returns a wrapped a deliveryservice.LastStats object safe for multiple readers and one writer.
func NewLastStatsThreadsafe() LastStatsThreadsafe {
s := ds.NewLastStats()
return LastStatsThreadsafe{m: &sync.RWMutex{}, stats: &s}
@@ -22,6 +44,7 @@ func (o *LastStatsThreadsafe) Get() ds.LastStats {
return *o.stats
}
+// Set sets the internal LastStats object. This MUST NOT be called by multiple goroutines.
func (o *LastStatsThreadsafe) Set(s ds.LastStats) {
o.m.Lock()
*o.stats = s
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/experimental/traffic_monitor/manager/manager.go
----------------------------------------------------------------------
diff --git a/traffic_monitor/experimental/traffic_monitor/manager/manager.go b/traffic_monitor/experimental/traffic_monitor/manager/manager.go
index d86fad1..49fa13a 100644
--- a/traffic_monitor/experimental/traffic_monitor/manager/manager.go
+++ b/traffic_monitor/experimental/traffic_monitor/manager/manager.go
@@ -1,22 +1,43 @@
package manager
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
import (
"crypto/tls"
"net/http"
"time"
- "github.com/Comcast/traffic_control/traffic_monitor/experimental/common/fetcher"
- "github.com/Comcast/traffic_control/traffic_monitor/experimental/common/handler"
- "github.com/Comcast/traffic_control/traffic_monitor/experimental/common/poller"
- "github.com/Comcast/traffic_control/traffic_monitor/experimental/traffic_monitor/cache"
- "github.com/Comcast/traffic_control/traffic_monitor/experimental/traffic_monitor/config"
- "github.com/Comcast/traffic_control/traffic_monitor/experimental/traffic_monitor/peer"
- todata "github.com/Comcast/traffic_control/traffic_monitor/experimental/traffic_monitor/trafficopsdata"
- towrap "github.com/Comcast/traffic_control/traffic_monitor/experimental/traffic_monitor/trafficopswrapper"
- // to "github.com/Comcast/traffic_control/traffic_ops/client"
+ "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/common/fetcher"
+ "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/common/handler"
+ "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/common/poller"
+ "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/traffic_monitor/cache"
+ "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/traffic_monitor/config"
+ "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/traffic_monitor/peer"
+ todata "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/traffic_monitor/trafficopsdata"
+ towrap "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/traffic_monitor/trafficopswrapper"
+ // to "github.com/apache/incubator-trafficcontrol/traffic_ops/client"
"github.com/davecheney/gmx"
)
+// StaticAppData encapsulates data about the app available at startup
type StaticAppData struct {
StartTime time.Time
GitRevision string
@@ -29,7 +50,7 @@ type StaticAppData struct {
}
//
-// Kicks off the pollers and handlers
+// Start starts the poller and handler goroutines
//
func Start(opsConfigFile string, cfg config.Config, staticAppData StaticAppData) {
toSession := towrap.ITrafficOpsSession(towrap.NewTrafficOpsSessionThreadsafe(nil))
@@ -41,7 +62,6 @@ func Start(opsConfigFile string, cfg config.Config, staticAppData StaticAppData)
// TODO investigate whether a unique client per cache to be polled is faster
sharedClient := &http.Client{
- Timeout: cfg.HttpTimeout,
Transport: &http.Transport{TLSClientConfig: &tls.Config{InsecureSkipVerify: true}},
}
@@ -130,6 +150,8 @@ func Start(opsConfigFile string, cfg config.Config, staticAppData StaticAppData)
errorCount,
localCacheStatus,
unpolledCaches,
+ monitorConfig,
+ cfg,
)
healthTickListener(cacheHealthPoller.TickChan, healthIteration)
@@ -137,10 +159,7 @@ func Start(opsConfigFile string, cfg config.Config, staticAppData StaticAppData)
// healthTickListener listens for health ticks, and writes to the health iteration variable. Does not return.
func healthTickListener(cacheHealthTick <-chan uint64, healthIteration UintThreadsafe) {
- for {
- select {
- case i := <-cacheHealthTick:
- healthIteration.Set(i)
- }
+ for i := range cacheHealthTick {
+ healthIteration.Set(i)
}
}
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/experimental/traffic_monitor/manager/monitorconfig.go
----------------------------------------------------------------------
diff --git a/traffic_monitor/experimental/traffic_monitor/manager/monitorconfig.go b/traffic_monitor/experimental/traffic_monitor/manager/monitorconfig.go
index fe42dad..5c343ae 100644
--- a/traffic_monitor/experimental/traffic_monitor/manager/monitorconfig.go
+++ b/traffic_monitor/experimental/traffic_monitor/manager/monitorconfig.go
@@ -1,17 +1,40 @@
package manager
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
import (
"fmt"
- "github.com/Comcast/traffic_control/traffic_monitor/experimental/common/log"
- "github.com/Comcast/traffic_control/traffic_monitor/experimental/common/poller"
- "github.com/Comcast/traffic_control/traffic_monitor/experimental/traffic_monitor/config"
- "github.com/Comcast/traffic_control/traffic_monitor/experimental/traffic_monitor/enum"
- "github.com/Comcast/traffic_control/traffic_monitor/experimental/traffic_monitor/peer"
- to "github.com/Comcast/traffic_control/traffic_ops/client"
"strings"
"sync"
+ "time"
+
+ "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/common/log"
+ "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/common/poller"
+ "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/traffic_monitor/config"
+ "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/traffic_monitor/enum"
+ "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/traffic_monitor/peer"
+ to "github.com/apache/incubator-trafficcontrol/traffic_ops/client"
)
+// CopyTrafficMonitorConfigMap returns a deep copy of the given TrafficMonitorConfigMap
func CopyTrafficMonitorConfigMap(a *to.TrafficMonitorConfigMap) to.TrafficMonitorConfigMap {
b := to.TrafficMonitorConfigMap{}
b.TrafficServer = map[string]to.TrafficServer{}
@@ -41,11 +64,13 @@ func CopyTrafficMonitorConfigMap(a *to.TrafficMonitorConfigMap) to.TrafficMonito
return b
}
+// TrafficMonitorConfigMapThreadsafe encapsulates a TrafficMonitorConfigMap safe for multiple readers and a single writer.
type TrafficMonitorConfigMapThreadsafe struct {
monitorConfig *to.TrafficMonitorConfigMap
m *sync.RWMutex
}
+// NewTrafficMonitorConfigMapThreadsafe returns an encapsulated TrafficMonitorConfigMap safe for multiple readers and a single writer.
func NewTrafficMonitorConfigMapThreadsafe() TrafficMonitorConfigMapThreadsafe {
return TrafficMonitorConfigMapThreadsafe{monitorConfig: &to.TrafficMonitorConfigMap{}, m: &sync.RWMutex{}}
}
@@ -64,12 +89,13 @@ func (t *TrafficMonitorConfigMapThreadsafe) Set(c to.TrafficMonitorConfigMap) {
t.m.Unlock()
}
+// StartMonitorConfigManager runs the monitor config manager goroutine, and returns the threadsafe data which it sets.
func StartMonitorConfigManager(
monitorConfigPollChan <-chan to.TrafficMonitorConfigMap,
localStates peer.CRStatesThreadsafe,
- statUrlSubscriber chan<- poller.HttpPollerConfig,
- healthUrlSubscriber chan<- poller.HttpPollerConfig,
- peerUrlSubscriber chan<- poller.HttpPollerConfig,
+ statURLSubscriber chan<- poller.HttpPollerConfig,
+ healthURLSubscriber chan<- poller.HttpPollerConfig,
+ peerURLSubscriber chan<- poller.HttpPollerConfig,
cachesChangeSubscriber chan<- struct{},
cfg config.Config,
staticAppData StaticAppData,
@@ -78,9 +104,9 @@ func StartMonitorConfigManager(
go monitorConfigListen(monitorConfig,
monitorConfigPollChan,
localStates,
- statUrlSubscriber,
- healthUrlSubscriber,
- peerUrlSubscriber,
+ statURLSubscriber,
+ healthURLSubscriber,
+ peerURLSubscriber,
cachesChangeSubscriber,
cfg,
staticAppData,
@@ -88,96 +114,166 @@ func StartMonitorConfigManager(
return monitorConfig
}
+// trafficOpsHealthConnectionTimeoutToDuration takes the int from Traffic Ops, which is in milliseconds, and returns a time.Duration
+// TODO change Traffic Ops Client API to a time.Duration
+func trafficOpsHealthConnectionTimeoutToDuration(t int) time.Duration {
+ return time.Duration(t) * time.Millisecond
+}
+
+// trafficOpsPeerPollIntervalToDuration takes the int from Traffic Ops, which is in milliseconds, and returns a time.Duration
+// TODO change Traffic Ops Client API to a time.Duration
+func trafficOpsPeerPollIntervalToDuration(t int) time.Duration {
+ return time.Duration(t) * time.Millisecond
+}
+
+// trafficOpsStatPollIntervalToDuration takes the int from Traffic Ops, which is in milliseconds, and returns a time.Duration
+// TODO change Traffic Ops Client API to a time.Duration
+func trafficOpsStatPollIntervalToDuration(t int) time.Duration {
+ return time.Duration(t) * time.Millisecond
+}
+
+// trafficOpsHealthPollIntervalToDuration takes the int from Traffic Ops, which is in milliseconds, and returns a time.Duration
+// TODO change Traffic Ops Client API to a time.Duration
+func trafficOpsHealthPollIntervalToDuration(t int) time.Duration {
+ return time.Duration(t) * time.Millisecond
+}
+
+// getPollIntervals reads the Traffic Ops Client monitorConfig structure, and parses and returns the health, peer, and stat poll intervals
+func getHealthPeerStatPollIntervals(monitorConfig to.TrafficMonitorConfigMap, cfg config.Config) (time.Duration, time.Duration, time.Duration, error) {
+ healthPollIntervalI, healthPollIntervalExists := monitorConfig.Config["health.polling.interval"]
+ if !healthPollIntervalExists {
+ return 0, 0, 0, fmt.Errorf("Traffic Ops Monitor config missing 'health.polling.interval', not setting config changes.\n")
+ }
+ healthPollIntervalInt, healthPollIntervalIsInt := healthPollIntervalI.(float64)
+ if !healthPollIntervalIsInt {
+ return 0, 0, 0, fmt.Errorf("Traffic Ops Monitor config 'health.polling.interval' value '%v' type %T is not an integer, not setting config changes.\n", healthPollIntervalI, healthPollIntervalI)
+ }
+ healthPollInterval := trafficOpsHealthPollIntervalToDuration(int(healthPollIntervalInt))
+
+ peerPollIntervalI, peerPollIntervalExists := monitorConfig.Config["peers.polling.interval"]
+ if !peerPollIntervalExists {
+ return 0, 0, 0, fmt.Errorf("Traffic Ops Monitor config missing 'peers.polling.interval', not setting config changes.\n")
+ }
+ peerPollIntervalInt, peerPollIntervalIsInt := peerPollIntervalI.(float64)
+ if !peerPollIntervalIsInt {
+ return 0, 0, 0, fmt.Errorf("Traffic Ops Monitor config 'peers.polling.interval' value '%v' type %T is not an integer, not setting config changes.\n", peerPollIntervalI, peerPollIntervalI)
+ }
+ peerPollInterval := trafficOpsPeerPollIntervalToDuration(int(peerPollIntervalInt))
+
+ statPollIntervalI, statPollIntervalExists := monitorConfig.Config["stat.polling.interval"]
+ if !statPollIntervalExists {
+ log.Warnf("Traffic Ops Monitor config missing 'stat.polling.interval', using health for stat.\n")
+ statPollIntervalI = healthPollIntervalI
+ }
+ statPollIntervalInt, statPollIntervalIsInt := statPollIntervalI.(float64)
+ if !statPollIntervalIsInt {
+ log.Warnf("Traffic Ops Monitor config 'stat.polling.interval' value '%v' type %T is not an integer, using health for stat\n", statPollIntervalI, statPollIntervalI)
+ statPollIntervalInt = healthPollIntervalInt
+ }
+ statPollInterval := trafficOpsStatPollIntervalToDuration(int(statPollIntervalInt))
+
+ // Formerly, only 'health' polling existed. If TO still has old configuration and doesn't have a 'stat' parameter, this allows us to assume the 'health' poll is slow, and sets it to the stat poll (which used to be the only poll, getting all astats data) to the given presumed-slow health poll, and set the now-fast-and-small health poll to a short fraction of that.
+ if healthPollIntervalExists && !statPollIntervalExists {
+ healthPollInterval = time.Duration(float64(healthPollInterval) / float64(cfg.HealthToStatRatio))
+ }
+
+ return healthPollInterval, peerPollInterval, statPollInterval, nil
+}
+
// TODO timing, and determine if the case, or its internal `for`, should be put in a goroutine
// TODO determine if subscribers take action on change, and change to mutexed objects if not.
func monitorConfigListen(
monitorConfigTS TrafficMonitorConfigMapThreadsafe,
monitorConfigPollChan <-chan to.TrafficMonitorConfigMap,
localStates peer.CRStatesThreadsafe,
- statUrlSubscriber chan<- poller.HttpPollerConfig,
- healthUrlSubscriber chan<- poller.HttpPollerConfig,
- peerUrlSubscriber chan<- poller.HttpPollerConfig,
+ statURLSubscriber chan<- poller.HttpPollerConfig,
+ healthURLSubscriber chan<- poller.HttpPollerConfig,
+ peerURLSubscriber chan<- poller.HttpPollerConfig,
cachesChangeSubscriber chan<- struct{},
cfg config.Config,
staticAppData StaticAppData,
) {
- for {
- select {
- case monitorConfig := <-monitorConfigPollChan:
- monitorConfigTS.Set(monitorConfig)
- healthUrls := map[string]string{}
- statUrls := map[string]string{}
- peerUrls := map[string]string{}
- caches := map[string]string{}
-
- for _, srv := range monitorConfig.TrafficServer {
- caches[srv.HostName] = srv.Status
-
- cacheName := enum.CacheName(srv.HostName)
-
- if srv.Status == "ONLINE" {
- localStates.SetCache(cacheName, peer.IsAvailable{IsAvailable: true})
- continue
- }
- if srv.Status == "OFFLINE" {
- localStates.SetCache(cacheName, peer.IsAvailable{IsAvailable: false})
- continue
- }
- // seed states with available = false until our polling cycle picks up a result
- if _, exists := localStates.Get().Caches[cacheName]; !exists {
- localStates.SetCache(cacheName, peer.IsAvailable{IsAvailable: false})
- }
-
- url := monitorConfig.Profile[srv.Profile].Parameters.HealthPollingURL
- r := strings.NewReplacer(
- "${hostname}", srv.FQDN,
- "${interface_name}", srv.InterfaceName,
- "application=system", "application=plugin.remap",
- "application=", "application=plugin.remap",
- )
- url = r.Replace(url)
- healthUrls[srv.HostName] = url
- r = strings.NewReplacer("application=plugin.remap", "application=")
- url = r.Replace(url)
- statUrls[srv.HostName] = url
+ for monitorConfig := range monitorConfigPollChan {
+ monitorConfigTS.Set(monitorConfig)
+ healthURLs := map[string]poller.PollConfig{}
+ statURLs := map[string]poller.PollConfig{}
+ peerURLs := map[string]poller.PollConfig{}
+ caches := map[string]string{}
+
+ healthPollInterval, peerPollInterval, statPollInterval, err := getHealthPeerStatPollIntervals(monitorConfig, cfg)
+ if err != nil {
+ continue
+ }
+
+ for _, srv := range monitorConfig.TrafficServer {
+ caches[srv.HostName] = srv.Status
+
+ cacheName := enum.CacheName(srv.HostName)
+
+ srvStatus := enum.CacheStatusFromString(srv.Status)
+ if srvStatus == enum.CacheStatusOnline {
+ localStates.SetCache(cacheName, peer.IsAvailable{IsAvailable: true})
+ continue
}
+ if srvStatus == enum.CacheStatusOffline {
+ continue
+ }
+ // seed states with available = false until our polling cycle picks up a result
+ if _, exists := localStates.Get().Caches[cacheName]; !exists {
+ localStates.SetCache(cacheName, peer.IsAvailable{IsAvailable: false})
+ }
+
+ url := monitorConfig.Profile[srv.Profile].Parameters.HealthPollingURL
+ r := strings.NewReplacer(
+ "${hostname}", srv.IP,
+ "${interface_name}", srv.InterfaceName,
+ "application=system", "application=plugin.remap",
+ "application=", "application=plugin.remap",
+ )
+ url = r.Replace(url)
+
+ connTimeout := trafficOpsHealthConnectionTimeoutToDuration(monitorConfig.Profile[srv.Profile].Parameters.HealthConnectionTimeout)
+ healthURLs[srv.HostName] = poller.PollConfig{URL: url, Timeout: connTimeout}
+ r = strings.NewReplacer("application=plugin.remap", "application=")
+ statURL := r.Replace(url)
+ statURLs[srv.HostName] = poller.PollConfig{URL: statURL, Timeout: connTimeout}
+ }
- for _, srv := range monitorConfig.TrafficMonitor {
- if srv.HostName == staticAppData.Hostname {
- continue
- }
- if srv.Status != "ONLINE" {
- continue
- }
- // TODO: the URL should be config driven. -jse
- url := fmt.Sprintf("http://%s:%d/publish/CrStates?raw", srv.IP, srv.Port)
- peerUrls[srv.HostName] = url
+ for _, srv := range monitorConfig.TrafficMonitor {
+ if srv.HostName == staticAppData.Hostname {
+ continue
}
+ if enum.CacheStatusFromString(srv.Status) != enum.CacheStatusOnline {
+ continue
+ }
+ // TODO: the URL should be config driven. -jse
+ url := fmt.Sprintf("http://%s:%d/publish/CrStates?raw", srv.IP, srv.Port)
+ peerURLs[srv.HostName] = poller.PollConfig{URL: url} // TODO determine timeout.
+ }
- statUrlSubscriber <- poller.HttpPollerConfig{Urls: statUrls, Interval: cfg.CacheStatPollingInterval}
- healthUrlSubscriber <- poller.HttpPollerConfig{Urls: healthUrls, Interval: cfg.CacheHealthPollingInterval}
- peerUrlSubscriber <- poller.HttpPollerConfig{Urls: peerUrls, Interval: cfg.PeerPollingInterval}
+ statURLSubscriber <- poller.HttpPollerConfig{Urls: statURLs, Interval: statPollInterval}
+ healthURLSubscriber <- poller.HttpPollerConfig{Urls: healthURLs, Interval: healthPollInterval}
+ peerURLSubscriber <- poller.HttpPollerConfig{Urls: peerURLs, Interval: peerPollInterval}
- for cacheName := range localStates.GetCaches() {
- if _, exists := monitorConfig.TrafficServer[string(cacheName)]; !exists {
- log.Warnf("Removing %s from localStates", cacheName)
- localStates.DeleteCache(cacheName)
- }
+ for cacheName := range localStates.GetCaches() {
+ if _, exists := monitorConfig.TrafficServer[string(cacheName)]; !exists {
+ log.Warnf("Removing %s from localStates", cacheName)
+ localStates.DeleteCache(cacheName)
}
+ }
- cachesChangeSubscriber <- struct{}{}
+ cachesChangeSubscriber <- struct{}{}
- // TODO because there are multiple writers to localStates.DeliveryService, there is a race condition, where MonitorConfig (this func) and HealthResultManager could write at the same time, and the HealthResultManager could overwrite a delivery service addition or deletion here. Probably the simplest and most performant fix would be a lock-free algorithm using atomic compare-and-swaps.
- for _, ds := range monitorConfig.DeliveryService {
- // since caches default to unavailable, also default DS false
- if _, exists := localStates.Get().Deliveryservice[enum.DeliveryServiceName(ds.XMLID)]; !exists {
- localStates.SetDeliveryService(enum.DeliveryServiceName(ds.XMLID), peer.Deliveryservice{IsAvailable: false, DisabledLocations: []enum.CacheName{}}) // important to initialize DisabledLocations, so JSON is `[]` not `null`
- }
+ // TODO because there are multiple writers to localStates.DeliveryService, there is a race condition, where MonitorConfig (this func) and HealthResultManager could write at the same time, and the HealthResultManager could overwrite a delivery service addition or deletion here. Probably the simplest and most performant fix would be a lock-free algorithm using atomic compare-and-swaps.
+ for _, ds := range monitorConfig.DeliveryService {
+ // since caches default to unavailable, also default DS false
+ if _, exists := localStates.Get().Deliveryservice[enum.DeliveryServiceName(ds.XMLID)]; !exists {
+ localStates.SetDeliveryService(enum.DeliveryServiceName(ds.XMLID), peer.Deliveryservice{IsAvailable: false, DisabledLocations: []enum.CacheName{}}) // important to initialize DisabledLocations, so JSON is `[]` not `null`
}
- for ds, _ := range localStates.Get().Deliveryservice {
- if _, exists := monitorConfig.DeliveryService[string(ds)]; !exists {
- localStates.DeleteDeliveryService(ds)
- }
+ }
+ for ds := range localStates.Get().Deliveryservice {
+ if _, exists := monitorConfig.DeliveryService[string(ds)]; !exists {
+ localStates.DeleteDeliveryService(ds)
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/experimental/traffic_monitor/manager/opsconfig.go
----------------------------------------------------------------------
diff --git a/traffic_monitor/experimental/traffic_monitor/manager/opsconfig.go b/traffic_monitor/experimental/traffic_monitor/manager/opsconfig.go
index fd41a12..813399f 100644
--- a/traffic_monitor/experimental/traffic_monitor/manager/opsconfig.go
+++ b/traffic_monitor/experimental/traffic_monitor/manager/opsconfig.go
@@ -1,42 +1,68 @@
package manager
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
import (
"fmt"
"sync"
"time"
- "github.com/Comcast/traffic_control/traffic_monitor/experimental/common/handler"
- "github.com/Comcast/traffic_control/traffic_monitor/experimental/common/log"
- "github.com/Comcast/traffic_control/traffic_monitor/experimental/common/poller"
- "github.com/Comcast/traffic_control/traffic_monitor/experimental/traffic_monitor/http_server"
- "github.com/Comcast/traffic_control/traffic_monitor/experimental/traffic_monitor/peer"
- todata "github.com/Comcast/traffic_control/traffic_monitor/experimental/traffic_monitor/trafficopsdata"
- towrap "github.com/Comcast/traffic_control/traffic_monitor/experimental/traffic_monitor/trafficopswrapper"
- to "github.com/Comcast/traffic_control/traffic_ops/client"
+ "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/common/handler"
+ "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/common/log"
+ "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/common/poller"
+ "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/traffic_monitor/config"
+ "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/traffic_monitor/peer"
+ "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/traffic_monitor/srvhttp"
+ todata "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/traffic_monitor/trafficopsdata"
+ towrap "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/traffic_monitor/trafficopswrapper"
+ to "github.com/apache/incubator-trafficcontrol/traffic_ops/client"
)
+// OpsConfigThreadsafe provides safe access for multiple reader goroutines and a single writer to a stored OpsConfig object.
// This could be made lock-free, if the performance was necessary
type OpsConfigThreadsafe struct {
opsConfig *handler.OpsConfig
m *sync.RWMutex
}
+// NewOpsConfigThreadsafe returns a new single-writer-multiple-reader OpsConfig
func NewOpsConfigThreadsafe() OpsConfigThreadsafe {
return OpsConfigThreadsafe{m: &sync.RWMutex{}, opsConfig: &handler.OpsConfig{}}
}
+// Get gets the internal OpsConfig object. This MUST NOT be modified. If modification is necessary, copy the object.
func (o *OpsConfigThreadsafe) Get() handler.OpsConfig {
o.m.RLock()
defer o.m.RUnlock()
return *o.opsConfig
}
+// Set sets the internal OpsConfig object. This MUST NOT be called from multiple goroutines.
func (o *OpsConfigThreadsafe) Set(newOpsConfig handler.OpsConfig) {
o.m.Lock()
*o.opsConfig = newOpsConfig
o.m.Unlock()
}
+// StartOpsConfigManager starts the ops config manager goroutine, returning the (threadsafe) variables which it sets.
// Note the OpsConfigManager is in charge of the httpServer, because ops config changes trigger server changes. If other things needed to trigger server restarts, the server could be put in its own goroutine with signal channels
func StartOpsConfigManager(
opsConfigFile string,
@@ -49,7 +75,7 @@ func StartOpsConfigManager(
combinedStates peer.CRStatesThreadsafe,
statHistory StatHistoryThreadsafe,
lastStats LastStatsThreadsafe,
- dsStats DSStatsThreadsafe,
+ dsStats DSStatsReader,
events EventsThreadsafe,
staticAppData StaticAppData,
healthPollInterval time.Duration,
@@ -59,6 +85,8 @@ func StartOpsConfigManager(
errorCount UintThreadsafe,
localCacheStatus CacheAvailableStatusThreadsafe,
unpolledCaches UnpolledCachesThreadsafe,
+ monitorConfig TrafficMonitorConfigMapThreadsafe,
+ cfg config.Config,
) OpsConfigThreadsafe {
opsConfigFileChannel := make(chan interface{})
@@ -80,77 +108,71 @@ func StartOpsConfigManager(
// TODO remove change subscribers, give Threadsafes directly to the things that need them. If they only set vars, and don't actually do work on change.
go func() {
- httpServer := http_server.Server{}
-
- for {
- select {
- case newOpsConfig := <-opsConfigChannel:
- var err error
- opsConfig.Set(newOpsConfig)
-
- listenAddress := ":80" // default
-
- if newOpsConfig.HttpListener != "" {
- listenAddress = newOpsConfig.HttpListener
- }
-
- handleErr := func(err error) {
- errorCount.Inc()
- log.Errorf("OpsConfigManager: %v\n", err)
- }
-
- err = httpServer.Run(func(req http_server.DataRequest) ([]byte, int) {
- return DataRequest(
- req,
- opsConfig,
- toSession,
- localStates,
- peerStates,
- combinedStates,
- statHistory,
- dsStats,
- events,
- staticAppData,
- healthPollInterval,
- lastHealthDurations,
- fetchCount,
- healthIteration,
- errorCount,
- toData,
- localCacheStatus,
- lastStats,
- unpolledCaches,
- )
- }, listenAddress)
- if err != nil {
- handleErr(fmt.Errorf("MonitorConfigPoller: error creating HTTP server: %s\n", err))
- continue
- }
-
- realToSession, err := to.Login(newOpsConfig.Url, newOpsConfig.Username, newOpsConfig.Password, newOpsConfig.Insecure)
- if err != nil {
- handleErr(fmt.Errorf("MonitorConfigPoller: error instantiating Session with traffic_ops: %s\n", err))
- continue
- }
- toSession.Set(realToSession)
-
- if err := toData.Fetch(toSession, newOpsConfig.CdnName); err != nil {
- handleErr(fmt.Errorf("Error getting Traffic Ops data: %v\n", err))
- continue
- }
-
- // These must be in a goroutine, because the monitorConfigPoller tick sends to a channel this select listens for. Thus, if we block on sends to the monitorConfigPoller, we have a livelock race condition.
- // More generically, we're using goroutines as an infinite chan buffer, to avoid potential livelocks
- for _, subscriber := range opsConfigChangeSubscribers {
- go func() {
- subscriber <- newOpsConfig // this is needed for cdnName
- }()
- }
- for _, subscriber := range toChangeSubscribers {
- go func() {
- subscriber <- toSession
- }()
- }
+ httpServer := srvhttp.Server{}
+
+ for newOpsConfig := range opsConfigChannel {
+ var err error
+ opsConfig.Set(newOpsConfig)
+
+ listenAddress := ":80" // default
+
+ if newOpsConfig.HttpListener != "" {
+ listenAddress = newOpsConfig.HttpListener
+ }
+
+ handleErr := func(err error) {
+ errorCount.Inc()
+ log.Errorf("OpsConfigManager: %v\n", err)
+ }
+
+ err = httpServer.Run(func(req srvhttp.DataRequest) ([]byte, int) {
+ return DataRequest(
+ req,
+ opsConfig,
+ toSession,
+ localStates,
+ peerStates,
+ combinedStates,
+ statHistory,
+ dsStats,
+ events,
+ staticAppData,
+ healthPollInterval,
+ lastHealthDurations,
+ fetchCount,
+ healthIteration,
+ errorCount,
+ toData,
+ localCacheStatus,
+ lastStats,
+ unpolledCaches,
+ monitorConfig,
+ )
+ }, listenAddress, cfg.ServeReadTimeout, cfg.ServeWriteTimeout)
+ if err != nil {
+ handleErr(fmt.Errorf("MonitorConfigPoller: error creating HTTP server: %s\n", err))
+ continue
+ }
+
+ realToSession, err := to.Login(newOpsConfig.Url, newOpsConfig.Username, newOpsConfig.Password, newOpsConfig.Insecure)
+ if err != nil {
+ handleErr(fmt.Errorf("MonitorConfigPoller: error instantiating Session with traffic_ops: %s\n", err))
+ continue
+ }
+ toSession.Set(realToSession)
+
+ if err := toData.Fetch(toSession, newOpsConfig.CdnName); err != nil {
+ handleErr(fmt.Errorf("Error getting Traffic Ops data: %v\n", err))
+ continue
+ }
+
+ // These must be in a goroutine, because the monitorConfigPoller tick sends to a channel this select listens for. Thus, if we block on sends to the monitorConfigPoller, we have a livelock race condition.
+ // More generically, we're using goroutines as an infinite chan buffer, to avoid potential livelocks
+ for _, subscriber := range opsConfigChangeSubscribers {
+ go func(s chan<- handler.OpsConfig) { s <- newOpsConfig }(subscriber)
+ }
+ for _, subscriber := range toChangeSubscribers {
+ go func(s chan<- towrap.ITrafficOpsSession) { s <- toSession }(subscriber)
}
}
}()
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/experimental/traffic_monitor/manager/peer.go
----------------------------------------------------------------------
diff --git a/traffic_monitor/experimental/traffic_monitor/manager/peer.go b/traffic_monitor/experimental/traffic_monitor/manager/peer.go
index 2f1b783..7232919 100644
--- a/traffic_monitor/experimental/traffic_monitor/manager/peer.go
+++ b/traffic_monitor/experimental/traffic_monitor/manager/peer.go
@@ -1,11 +1,31 @@
package manager
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
import (
"sort"
- "github.com/Comcast/traffic_control/traffic_monitor/experimental/common/log"
- "github.com/Comcast/traffic_control/traffic_monitor/experimental/traffic_monitor/enum"
- "github.com/Comcast/traffic_control/traffic_monitor/experimental/traffic_monitor/peer"
+ "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/common/log"
+ "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/traffic_monitor/enum"
+ "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/traffic_monitor/peer"
)
// StartPeerManager listens for peer results, and when it gets one, it adds it to the peerStates list, and optimistically combines the good results into combinedStates
@@ -16,13 +36,10 @@ func StartPeerManager(
) peer.CRStatesThreadsafe {
combinedStates := peer.NewCRStatesThreadsafe()
go func() {
- for {
- select {
- case crStatesResult := <-peerChan:
- peerStates.Set(crStatesResult.Id, crStatesResult.PeerStats)
- combinedStates.Set(combineCrStates(peerStates.Get(), localStates.Get()))
- crStatesResult.PollFinished <- crStatesResult.PollID
- }
+ for crStatesResult := range peerChan {
+ peerStates.Set(crStatesResult.ID, crStatesResult.PeerStats)
+ combinedStates.Set(combineCrStates(peerStates.Get(), localStates.Get()))
+ crStatesResult.PollFinished <- crStatesResult.PollID
}
}()
return combinedStates
@@ -79,6 +96,7 @@ func combineCrStates(peerStates map[enum.TrafficMonitorName]peer.Crstates, local
return combinedStates
}
+// CacheNameSlice is a slice of cache names, which fulfills the `sort.Interface` interface.
type CacheNameSlice []enum.CacheName
func (p CacheNameSlice) Len() int { return len(p) }
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/experimental/traffic_monitor/manager/polledcaches.go
----------------------------------------------------------------------
diff --git a/traffic_monitor/experimental/traffic_monitor/manager/polledcaches.go b/traffic_monitor/experimental/traffic_monitor/manager/polledcaches.go
index c1cb999..3f353c4 100644
--- a/traffic_monitor/experimental/traffic_monitor/manager/polledcaches.go
+++ b/traffic_monitor/experimental/traffic_monitor/manager/polledcaches.go
@@ -1,9 +1,29 @@
package manager
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
import (
- "github.com/Comcast/traffic_control/traffic_monitor/experimental/common/log"
- "github.com/Comcast/traffic_control/traffic_monitor/experimental/traffic_monitor/cache"
- "github.com/Comcast/traffic_control/traffic_monitor/experimental/traffic_monitor/enum"
+ "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/common/log"
+ "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/traffic_monitor/cache"
+ "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/traffic_monitor/enum"
"sync"
)
@@ -14,7 +34,6 @@ type UnpolledCachesThreadsafe struct {
allCaches *map[enum.CacheName]struct{}
initialized *bool
m *sync.RWMutex
- max uint64
}
// NewUnpolledCachesThreadsafe returns a new UnpolledCachesThreadsafe object.
@@ -28,14 +47,14 @@ func NewUnpolledCachesThreadsafe() UnpolledCachesThreadsafe {
}
}
-// Get returns the caches. Callers MUST NOT modify. If mutation is necessary, copy the map
+// UnpolledCaches returns a map of caches not yet polled. Callers MUST NOT modify. If mutation is necessary, copy the map
func (t *UnpolledCachesThreadsafe) UnpolledCaches() map[enum.CacheName]struct{} {
t.m.RLock()
defer t.m.RUnlock()
return *t.unpolledCaches
}
-// Set sets the internal unpolled caches map. This is only safe for one thread of execution. This MUST NOT be called from multiple threads.
+// setUnpolledCaches sets the internal unpolled caches map. This is only safe for one thread of execution. This MUST NOT be called from multiple threads.
func (t *UnpolledCachesThreadsafe) setUnpolledCaches(v map[enum.CacheName]struct{}) {
t.m.Lock()
*t.initialized = true
@@ -47,17 +66,17 @@ func (t *UnpolledCachesThreadsafe) setUnpolledCaches(v map[enum.CacheName]struct
func (t *UnpolledCachesThreadsafe) SetNewCaches(newCaches map[enum.CacheName]struct{}) {
unpolledCaches := copyCaches(t.UnpolledCaches())
allCaches := copyCaches(*t.allCaches) // not necessary to lock `allCaches`, as the single-writer is the only thing that accesses it.
- for cache, _ := range unpolledCaches {
+ for cache := range unpolledCaches {
if _, ok := newCaches[cache]; !ok {
delete(unpolledCaches, cache)
}
}
- for cache, _ := range allCaches {
+ for cache := range allCaches {
if _, ok := newCaches[cache]; !ok {
delete(allCaches, cache)
}
}
- for cache, _ := range newCaches {
+ for cache := range newCaches {
if _, ok := allCaches[cache]; !ok {
unpolledCaches[cache] = struct{}{}
allCaches[cache] = struct{}{}
@@ -67,7 +86,7 @@ func (t *UnpolledCachesThreadsafe) SetNewCaches(newCaches map[enum.CacheName]str
t.setUnpolledCaches(unpolledCaches)
}
-// AnyCachesUnpolled returns whether there are any caches marked as not polled. Also returns true if SetNewCaches() has never been called (assuming there exist caches, if this hasn't been initialized, we couldn't have polled any of them).
+// Any returns whether there are any caches marked as not polled. Also returns true if SetNewCaches() has never been called (assuming there exist caches, if this hasn't been initialized, we couldn't have polled any of them).
func (t *UnpolledCachesThreadsafe) Any() bool {
t.m.Lock()
defer t.m.Unlock()
@@ -77,7 +96,7 @@ func (t *UnpolledCachesThreadsafe) Any() bool {
// copyCaches performs a deep copy of the given map.
func copyCaches(a map[enum.CacheName]struct{}) map[enum.CacheName]struct{} {
b := map[enum.CacheName]struct{}{}
- for k, _ := range a {
+ for k := range a {
b[k] = struct{}{}
}
return b
@@ -93,10 +112,10 @@ func (t *UnpolledCachesThreadsafe) SetPolled(results []cache.Result, lastStatsTh
return
}
lastStats := lastStatsThreadsafe.Get()
- for cache, _ := range unpolledCaches {
+ for cache := range unpolledCaches {
innerLoop:
for _, result := range results {
- if result.Id != cache {
+ if result.ID != cache {
continue
}
if !result.Available || len(result.Errors) > 0 {
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/experimental/traffic_monitor/manager/stathistory.go
----------------------------------------------------------------------
diff --git a/traffic_monitor/experimental/traffic_monitor/manager/stathistory.go b/traffic_monitor/experimental/traffic_monitor/manager/stathistory.go
index cb0c7c3..c938974 100644
--- a/traffic_monitor/experimental/traffic_monitor/manager/stathistory.go
+++ b/traffic_monitor/experimental/traffic_monitor/manager/stathistory.go
@@ -1,28 +1,49 @@
package manager
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
import (
"sync"
"time"
- "github.com/Comcast/traffic_control/traffic_monitor/experimental/common/log"
- "github.com/Comcast/traffic_control/traffic_monitor/experimental/traffic_monitor/cache"
- "github.com/Comcast/traffic_control/traffic_monitor/experimental/traffic_monitor/config"
- ds "github.com/Comcast/traffic_control/traffic_monitor/experimental/traffic_monitor/deliveryservice"
- "github.com/Comcast/traffic_control/traffic_monitor/experimental/traffic_monitor/enum"
- "github.com/Comcast/traffic_control/traffic_monitor/experimental/traffic_monitor/peer"
- todata "github.com/Comcast/traffic_control/traffic_monitor/experimental/traffic_monitor/trafficopsdata"
+ "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/common/log"
+ "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/traffic_monitor/cache"
+ "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/traffic_monitor/config"
+ ds "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/traffic_monitor/deliveryservice"
+ "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/traffic_monitor/enum"
+ "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/traffic_monitor/peer"
+ todata "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/traffic_monitor/trafficopsdata"
+ to "github.com/apache/incubator-trafficcontrol/traffic_ops/client"
)
+// StatHistory is a map of cache names, to an array of result history from each cache.
type StatHistory map[enum.CacheName][]cache.Result
func copyStat(a []cache.Result) []cache.Result {
b := make([]cache.Result, len(a), len(a))
- for i, v := range a {
- b[i] = v
- }
+ copy(b, a)
return b
}
+// Copy copies returns a deep copy of this StatHistory
func (a StatHistory) Copy() StatHistory {
b := StatHistory{}
for k, v := range a {
@@ -31,35 +52,32 @@ func (a StatHistory) Copy() StatHistory {
return b
}
+// StatHistoryThreadsafe provides safe access for multiple goroutines readers and a single writer to a stored StatHistory object.
// This could be made lock-free, if the performance was necessary
// TODO add separate locks for Caches and Deliveryservice maps?
type StatHistoryThreadsafe struct {
statHistory *StatHistory
m *sync.RWMutex
- max uint64
-}
-
-func (h StatHistoryThreadsafe) Max() uint64 {
- return h.max
}
-func NewStatHistoryThreadsafe(maxHistory uint64) StatHistoryThreadsafe {
+// NewStatHistoryThreadsafe returns a new StatHistory safe for multiple readers and a single writer.
+func NewStatHistoryThreadsafe() StatHistoryThreadsafe {
h := StatHistory{}
- return StatHistoryThreadsafe{m: &sync.RWMutex{}, statHistory: &h, max: maxHistory}
+ return StatHistoryThreadsafe{m: &sync.RWMutex{}, statHistory: &h}
}
// Get returns the StatHistory. Callers MUST NOT modify. If mutation is necessary, call StatHistory.Copy()
-func (t *StatHistoryThreadsafe) Get() StatHistory {
- t.m.RLock()
- defer t.m.RUnlock()
- return *t.statHistory
+func (h *StatHistoryThreadsafe) Get() StatHistory {
+ h.m.RLock()
+ defer h.m.RUnlock()
+ return *h.statHistory
}
// Set sets the internal StatHistory. This is only safe for one thread of execution. This MUST NOT be called from multiple threads.
-func (t *StatHistoryThreadsafe) Set(v StatHistory) {
- t.m.Lock()
- *t.statHistory = v
- t.m.Unlock()
+func (h *StatHistoryThreadsafe) Set(v StatHistory) {
+ h.m.Lock()
+ *h.statHistory = v
+ h.m.Unlock()
}
func pruneHistory(history []cache.Result, limit uint64) []cache.Result {
@@ -95,8 +113,8 @@ func StartStatHistoryManager(
errorCount UintThreadsafe,
cfg config.Config,
monitorConfig TrafficMonitorConfigMapThreadsafe,
-) (StatHistoryThreadsafe, DurationMapThreadsafe, LastStatsThreadsafe, DSStatsThreadsafe, UnpolledCachesThreadsafe) {
- statHistory := NewStatHistoryThreadsafe(cfg.MaxStatHistory)
+) (StatHistoryThreadsafe, DurationMapThreadsafe, LastStatsThreadsafe, DSStatsReader, UnpolledCachesThreadsafe) {
+ statHistory := NewStatHistoryThreadsafe()
lastStatDurations := NewDurationMapThreadsafe()
lastStatEndTimes := map[enum.CacheName]time.Time{}
lastStats := NewLastStatsThreadsafe()
@@ -119,21 +137,21 @@ func StartStatHistoryManager(
unpolledCaches.SetNewCaches(getNewCaches(localStates, monitorConfig))
case <-tick:
log.Warnf("StatHistoryManager flushing queued results\n")
- processStatResults(results, statHistory, combinedStates.Get(), lastStats, toData.Get(), errorCount, dsStats, lastStatEndTimes, lastStatDurations, unpolledCaches)
+ processStatResults(results, statHistory, combinedStates.Get(), lastStats, toData.Get(), errorCount, dsStats, lastStatEndTimes, lastStatDurations, unpolledCaches, monitorConfig.Get())
break innerLoop
default:
select {
case r := <-cacheStatChan:
results = append(results, r)
default:
- processStatResults(results, statHistory, combinedStates.Get(), lastStats, toData.Get(), errorCount, dsStats, lastStatEndTimes, lastStatDurations, unpolledCaches)
+ processStatResults(results, statHistory, combinedStates.Get(), lastStats, toData.Get(), errorCount, dsStats, lastStatEndTimes, lastStatDurations, unpolledCaches, monitorConfig.Get())
break innerLoop
}
}
}
}
}()
- return statHistory, lastStatDurations, lastStats, dsStats, unpolledCaches
+ return statHistory, lastStatDurations, lastStats, &dsStats, unpolledCaches
}
// processStatResults processes the given results, creating and setting DSStats, LastStats, and other stats. Note this is NOT threadsafe, and MUST NOT be called from multiple threads.
@@ -148,12 +166,13 @@ func processStatResults(
lastStatEndTimes map[enum.CacheName]time.Time,
lastStatDurationsThreadsafe DurationMapThreadsafe,
unpolledCaches UnpolledCachesThreadsafe,
+ mc to.TrafficMonitorConfigMap,
) {
statHistory := statHistoryThreadsafe.Get().Copy()
- maxStats := statHistoryThreadsafe.Max()
for _, result := range results {
+ maxStats := uint64(mc.Profile[mc.TrafficServer[string(result.ID)].Profile].Parameters.HistoryCount)
// TODO determine if we want to add results with errors, or just print the errors now and don't add them.
- statHistory[enum.CacheName(result.Id)] = pruneHistory(append(statHistory[enum.CacheName(result.Id)], result), maxStats)
+ statHistory[result.ID] = pruneHistory(append(statHistory[result.ID], result), maxStats)
}
statHistoryThreadsafe.Set(statHistory)
@@ -178,11 +197,11 @@ func processStatResults(
endTime := time.Now()
lastStatDurations := lastStatDurationsThreadsafe.Get().Copy()
for _, result := range results {
- if lastStatStart, ok := lastStatEndTimes[enum.CacheName(result.Id)]; ok {
+ if lastStatStart, ok := lastStatEndTimes[result.ID]; ok {
d := time.Since(lastStatStart)
- lastStatDurations[enum.CacheName(result.Id)] = d
+ lastStatDurations[result.ID] = d
}
- lastStatEndTimes[enum.CacheName(result.Id)] = endTime
+ lastStatEndTimes[result.ID] = endTime
// log.Debugf("poll %v %v statfinish\n", result.PollID, endTime)
result.PollFinished <- result.PollID
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/experimental/traffic_monitor/manager/uintman.go
----------------------------------------------------------------------
diff --git a/traffic_monitor/experimental/traffic_monitor/manager/uintman.go b/traffic_monitor/experimental/traffic_monitor/manager/uintman.go
index 81558d0..903229a 100644
--- a/traffic_monitor/experimental/traffic_monitor/manager/uintman.go
+++ b/traffic_monitor/experimental/traffic_monitor/manager/uintman.go
@@ -1,26 +1,51 @@
package manager
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
import (
"sync/atomic"
)
+// UintThreadsafe provides safe access for multiple goroutines readers and a single writer to a stored uint.
type UintThreadsafe struct {
val *uint64
}
+// NewUintThreadsafe returns a new single-writer-multiple-reader threadsafe uint
func NewUintThreadsafe() UintThreadsafe {
v := uint64(0)
return UintThreadsafe{val: &v}
}
+// Get gets the internal uint. This is safe for multiple readers
func (u *UintThreadsafe) Get() uint64 {
return atomic.LoadUint64(u.val)
}
+// Set sets the internal uint. This MUST NOT be called by multiple goroutines.
func (u *UintThreadsafe) Set(v uint64) {
atomic.StoreUint64(u.val, v)
}
+// Inc increments the internal uint64.
// TODO make sure everything using this uses the value it returns, not a separate Get
func (u *UintThreadsafe) Inc() uint64 {
return atomic.AddUint64(u.val, 1)
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/experimental/traffic_monitor/peer/crstates.go
----------------------------------------------------------------------
diff --git a/traffic_monitor/experimental/traffic_monitor/peer/crstates.go b/traffic_monitor/experimental/traffic_monitor/peer/crstates.go
index 7554043..3dc3667 100644
--- a/traffic_monitor/experimental/traffic_monitor/peer/crstates.go
+++ b/traffic_monitor/experimental/traffic_monitor/peer/crstates.go
@@ -1,17 +1,40 @@
package peer
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
import (
"encoding/json"
"sync"
- "github.com/Comcast/traffic_control/traffic_monitor/experimental/traffic_monitor/enum"
+ "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/traffic_monitor/enum"
)
+// Crstates includes availability data for caches and delivery services, as gathered and aggregated by this Traffic Monitor. It is designed to be served at an API endpoint primarily for Traffic Routers (Content Router) to consume.
+// TODO rename to `CRStates`
type Crstates struct {
Caches map[enum.CacheName]IsAvailable `json:"caches"`
Deliveryservice map[enum.DeliveryServiceName]Deliveryservice `json:"deliveryServices"`
}
+// NewCrstates creates a new CR states object, initializing pointer members.
func NewCrstates() Crstates {
return Crstates{
Caches: map[enum.CacheName]IsAvailable{},
@@ -19,6 +42,7 @@ func NewCrstates() Crstates {
}
}
+// Copy creates a deep copy of this object. It does not mutate, and is thus safe for multiple goroutines.
func (a Crstates) Copy() Crstates {
b := NewCrstates()
for k, v := range a.Caches {
@@ -30,6 +54,7 @@ func (a Crstates) Copy() Crstates {
return b
}
+// CopyDeliveryservices creates a deep copy of the delivery service availability data.. It does not mutate, and is thus safe for multiple goroutines.
func (a Crstates) CopyDeliveryservices() map[enum.DeliveryServiceName]Deliveryservice {
b := map[enum.DeliveryServiceName]Deliveryservice{}
for k, v := range a.Deliveryservice {
@@ -38,6 +63,7 @@ func (a Crstates) CopyDeliveryservices() map[enum.DeliveryServiceName]Deliveryse
return b
}
+// CopyCaches creates a deep copy of the cache availability data.. It does not mutate, and is thus safe for multiple goroutines.
func (a Crstates) CopyCaches() map[enum.CacheName]IsAvailable {
b := map[enum.CacheName]IsAvailable{}
for k, v := range a.Caches {
@@ -46,26 +72,30 @@ func (a Crstates) CopyCaches() map[enum.CacheName]IsAvailable {
return b
}
+// IsAvailable contains whether the given cache or delivery service is available. It is designed for JSON serialization, namely in the Traffic Monitor 1.0 API.
type IsAvailable struct {
IsAvailable bool `json:"isAvailable"`
}
+// Deliveryservice contains data about the availability of a particular delivery service, and which caches in that delivery service have been marked as unavailable.
type Deliveryservice struct {
DisabledLocations []enum.CacheName `json:"disabledLocations"`
IsAvailable bool `json:"isAvailable"`
}
+// CrstatesUnMarshall takes bytes of a JSON string, and unmarshals them into a Crstates object.
func CrstatesUnMarshall(body []byte) (Crstates, error) {
var crStates Crstates
-
err := json.Unmarshal(body, &crStates)
return crStates, err
}
+// CrstatesMarshall serializes the given Crstates into bytes.
func CrstatesMarshall(states Crstates) ([]byte, error) {
return json.Marshal(states)
}
+// CRStatesThreadsafe provides safe access for multiple goroutines to read a single Crstates object, with a single goroutine writer.
// This could be made lock-free, if the performance was necessary
// TODO add separate locks for Caches and Deliveryservice maps?
type CRStatesThreadsafe struct {
@@ -73,11 +103,13 @@ type CRStatesThreadsafe struct {
m *sync.RWMutex
}
+// NewCRStatesThreadsafe creates a new CRStatesThreadsafe object safe for multiple goroutine readers and a single writer.
func NewCRStatesThreadsafe() CRStatesThreadsafe {
crs := NewCrstates()
return CRStatesThreadsafe{m: &sync.RWMutex{}, crStates: &crs}
}
+// Get returns the internal Crstates object for reading.
// TODO add GetCaches, GetDeliveryservices?
func (t *CRStatesThreadsafe) Get() Crstates {
t.m.RLock()
@@ -85,6 +117,7 @@ func (t *CRStatesThreadsafe) Get() Crstates {
return t.crStates.Copy()
}
+// GetDeliveryServices returns the internal Crstates delivery services map for reading.
// TODO add GetCaches, GetDeliveryservices?
func (t *CRStatesThreadsafe) GetDeliveryServices() map[enum.DeliveryServiceName]Deliveryservice {
t.m.RLock()
@@ -92,70 +125,82 @@ func (t *CRStatesThreadsafe) GetDeliveryServices() map[enum.DeliveryServiceName]
return t.crStates.CopyDeliveryservices()
}
+// GetCache returns the availability data of the given cache. This does not mutate, and is thus safe for multiple goroutines to call.
func (t *CRStatesThreadsafe) GetCache(name enum.CacheName) IsAvailable {
t.m.RLock()
defer t.m.RUnlock()
return t.crStates.Caches[name]
}
+// GetCaches returns the availability data of all caches. This does not mutate, and is thus safe for multiple goroutines to call.
func (t *CRStatesThreadsafe) GetCaches() map[enum.CacheName]IsAvailable {
t.m.RLock()
defer t.m.RUnlock()
return t.crStates.CopyCaches()
}
+// GetDeliveryService returns the availability data of the given delivery service. This does not mutate, and is thus safe for multiple goroutines to call.
func (t *CRStatesThreadsafe) GetDeliveryService(name enum.DeliveryServiceName) Deliveryservice {
t.m.RLock()
defer t.m.RUnlock()
return t.crStates.Deliveryservice[name]
}
-func (o *CRStatesThreadsafe) Set(newCRStates Crstates) {
- o.m.Lock()
- *o.crStates = newCRStates
- o.m.Unlock()
+// Set sets the internal Crstates data. This MUST NOT be called by multiple goroutines.
+func (t *CRStatesThreadsafe) Set(newCRStates Crstates) {
+ t.m.Lock()
+ *t.crStates = newCRStates
+ t.m.Unlock()
}
-func (o *CRStatesThreadsafe) SetCache(cacheName enum.CacheName, available IsAvailable) {
- o.m.Lock()
- o.crStates.Caches[cacheName] = available
- o.m.Unlock()
+// SetCache sets the internal availability data for a particular cache. This MUST NOT be called by multiple goroutines.
+func (t *CRStatesThreadsafe) SetCache(cacheName enum.CacheName, available IsAvailable) {
+ t.m.Lock()
+ t.crStates.Caches[cacheName] = available
+ t.m.Unlock()
}
-func (o *CRStatesThreadsafe) DeleteCache(name enum.CacheName) {
- o.m.Lock()
- delete(o.crStates.Caches, name)
- o.m.Unlock()
+// DeleteCache deletes the given cache from the internal data. This MUST NOT be called by multiple goroutines.
+func (t *CRStatesThreadsafe) DeleteCache(name enum.CacheName) {
+ t.m.Lock()
+ delete(t.crStates.Caches, name)
+ t.m.Unlock()
}
-func (o *CRStatesThreadsafe) SetDeliveryService(name enum.DeliveryServiceName, ds Deliveryservice) {
- o.m.Lock()
- o.crStates.Deliveryservice[name] = ds
- o.m.Unlock()
+// SetDeliveryService sets the availability data for the given delivery service. This MUST NOT be called by multiple goroutines.
+func (t *CRStatesThreadsafe) SetDeliveryService(name enum.DeliveryServiceName, ds Deliveryservice) {
+ t.m.Lock()
+ t.crStates.Deliveryservice[name] = ds
+ t.m.Unlock()
}
-func (o *CRStatesThreadsafe) SetDeliveryServices(deliveryServices map[enum.DeliveryServiceName]Deliveryservice) {
- o.m.Lock()
- o.crStates.Deliveryservice = deliveryServices
- o.m.Unlock()
+// SetDeliveryServices sets the availability data for all delivery service. This MUST NOT be called by multiple goroutines.
+func (t *CRStatesThreadsafe) SetDeliveryServices(deliveryServices map[enum.DeliveryServiceName]Deliveryservice) {
+ t.m.Lock()
+ t.crStates.Deliveryservice = deliveryServices
+ t.m.Unlock()
}
-func (o *CRStatesThreadsafe) DeleteDeliveryService(name enum.DeliveryServiceName) {
- o.m.Lock()
- delete(o.crStates.Deliveryservice, name)
- o.m.Unlock()
+// DeleteDeliveryService deletes the given delivery service from the internal data. This MUST NOT be called by multiple goroutines.
+func (t *CRStatesThreadsafe) DeleteDeliveryService(name enum.DeliveryServiceName) {
+ t.m.Lock()
+ delete(t.crStates.Deliveryservice, name)
+ t.m.Unlock()
}
+// CRStatesPeersThreadsafe provides safe access for multiple goroutines to read a map of Traffic Monitor peers to their returned Crstates, with a single goroutine writer.
// This could be made lock-free, if the performance was necessary
type CRStatesPeersThreadsafe struct {
crStates map[enum.TrafficMonitorName]Crstates
m *sync.RWMutex
}
+// NewCRStatesPeersThreadsafe creates a new CRStatesPeers object safe for multiple goroutine readers and a single writer.
func NewCRStatesPeersThreadsafe() CRStatesPeersThreadsafe {
return CRStatesPeersThreadsafe{m: &sync.RWMutex{}, crStates: map[enum.TrafficMonitorName]Crstates{}}
}
+// Get returns the internal Traffic Monitor peer Crstates data. This MUST NOT be modified.
func (t *CRStatesPeersThreadsafe) Get() map[enum.TrafficMonitorName]Crstates {
t.m.RLock()
m := map[enum.TrafficMonitorName]Crstates{}
@@ -166,8 +211,9 @@ func (t *CRStatesPeersThreadsafe) Get() map[enum.TrafficMonitorName]Crstates {
return m
}
-func (o *CRStatesPeersThreadsafe) Set(peerName enum.TrafficMonitorName, peerState Crstates) {
- o.m.Lock()
- o.crStates[peerName] = peerState
- o.m.Unlock()
+// Set sets the internal Traffic Monitor peer Crstates data. This MUST NOT be called by multiple goroutines.
+func (t *CRStatesPeersThreadsafe) Set(peerName enum.TrafficMonitorName, peerState Crstates) {
+ t.m.Lock()
+ t.crStates[peerName] = peerState
+ t.m.Unlock()
}
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/experimental/traffic_monitor/peer/peer.go
----------------------------------------------------------------------
diff --git a/traffic_monitor/experimental/traffic_monitor/peer/peer.go b/traffic_monitor/experimental/traffic_monitor/peer/peer.go
index 5c9ca90..c8958c1 100644
--- a/traffic_monitor/experimental/traffic_monitor/peer/peer.go
+++ b/traffic_monitor/experimental/traffic_monitor/peer/peer.go
@@ -1,23 +1,47 @@
package peer
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
import (
"encoding/json"
"io"
+ "time"
- "github.com/Comcast/traffic_control/traffic_monitor/experimental/traffic_monitor/enum"
+ "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/traffic_monitor/enum"
)
+// Handler handles peer Traffic Monitor data, taking a raw reader, parsing the data, and passing a result object to the ResultChannel. This fulfills the common `Handler` interface.
type Handler struct {
ResultChannel chan Result
Notify int
}
+// NewHandler returns a new peer Handler.
func NewHandler() Handler {
return Handler{ResultChannel: make(chan Result)}
}
+// Result contains the data parsed from polling a peer Traffic Monitor.
type Result struct {
- Id enum.TrafficMonitorName
+ ID enum.TrafficMonitorName
Available bool
Errors []error
PeerStats Crstates
@@ -25,18 +49,13 @@ type Result struct {
PollFinished chan<- uint64
}
-const (
- NOTIFY_NEVER = iota
- NOTIFY_CHANGE
- NOTIFY_ALWAYS
-)
-
-func (handler Handler) Handle(id string, r io.Reader, err error, pollId uint64, pollFinished chan<- uint64) {
+// Handle handles a response from a polled Traffic Monitor peer, parsing the data and forwarding it to the ResultChannel.
+func (handler Handler) Handle(id string, r io.Reader, reqTime time.Duration, err error, pollID uint64, pollFinished chan<- uint64) {
result := Result{
- Id: enum.TrafficMonitorName(id),
+ ID: enum.TrafficMonitorName(id),
Available: false,
Errors: []error{},
- PollID: pollId,
+ PollID: pollID,
PollFinished: pollFinished,
}
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/experimental/traffic_monitor/peer/peer_test.go
----------------------------------------------------------------------
diff --git a/traffic_monitor/experimental/traffic_monitor/peer/peer_test.go b/traffic_monitor/experimental/traffic_monitor/peer/peer_test.go
index 416487f..627a825 100644
--- a/traffic_monitor/experimental/traffic_monitor/peer/peer_test.go
+++ b/traffic_monitor/experimental/traffic_monitor/peer/peer_test.go
@@ -1,5 +1,25 @@
package peer
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
import (
"fmt"
"io/ioutil"
@@ -13,7 +33,7 @@ func TestCrStates(t *testing.T) {
if err != nil {
t.Log(err)
}
- crStates, err := CrStatesUnMarshall(text)
+ crStates, err := CrstatesUnMarshall(text)
if err != nil {
t.Log(err)
}
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/experimental/traffic_monitor/srvhttp/srvhttp.go
----------------------------------------------------------------------
diff --git a/traffic_monitor/experimental/traffic_monitor/srvhttp/srvhttp.go b/traffic_monitor/experimental/traffic_monitor/srvhttp/srvhttp.go
new file mode 100644
index 0000000..0b93493
--- /dev/null
+++ b/traffic_monitor/experimental/traffic_monitor/srvhttp/srvhttp.go
@@ -0,0 +1,353 @@
+package srvhttp
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
+import (
+ "fmt"
+ "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/common/log"
+ "github.com/hydrogen18/stoppableListener"
+ "io/ioutil"
+ "net"
+ "net/http"
+ "net/url"
+ "sync"
+ "time"
+)
+
+// GetCommonAPIData calculates and returns API data common to most endpoints
+func GetCommonAPIData(params url.Values, t time.Time) CommonAPIData {
+ return CommonAPIData{
+ QueryParams: ParametersStr(params),
+ DateStr: DateStr(t),
+ }
+}
+
+// CommonAPIData contains generic data common to most endpoints.
+type CommonAPIData struct {
+ QueryParams string `json:"pp"`
+ DateStr string `json:"date"`
+}
+
+// Server is a re-runnable HTTP server. Server.Run() may be called repeatedly, and
+// each time the previous running server will be stopped, and the server will be
+// restarted with the new port address and data request channel.
+type Server struct {
+ getData GetDataFunc
+ stoppableListener *stoppableListener.StoppableListener
+ stoppableListenerWaitGroup sync.WaitGroup
+}
+
+// endpoints returns a map of HTTP paths to functions.
+// This is a function because Go doesn't have constant map literals.
+func (s Server) endpoints() (map[string]http.HandlerFunc, error) {
+ handleRoot, err := s.handleRootFunc()
+ handleSortableJs, err := s.handleSortableFunc()
+ if err != nil {
+ return nil, fmt.Errorf("Error getting root endpoint: %v", err)
+ }
+
+ // note: with the trailing slash, any non-trailing slash requests will get a 301 redirect
+ return map[string]http.HandlerFunc{
+ "/publish/CacheStats/": s.dataRequestFunc(CacheStats),
+ "/publish/CacheStats": s.dataRequestFunc(CacheStats),
+ "/publish/CrConfig/": s.dataRequestFunc(TRConfig),
+ "/publish/CrConfig": s.dataRequestFunc(TRConfig),
+ "/publish/CrStates/": s.handleCrStatesFunc(),
+ "/publish/CrStates": s.handleCrStatesFunc(),
+ "/publish/DsStats/": s.dataRequestFunc(DSStats),
+ "/publish/DsStats": s.dataRequestFunc(DSStats),
+ "/publish/EventLog/": s.dataRequestFunc(EventLog),
+ "/publish/EventLog": s.dataRequestFunc(EventLog),
+ "/publish/PeerStates/": s.dataRequestFunc(PeerStates),
+ "/publish/PeerStates": s.dataRequestFunc(PeerStates),
+ "/publish/StatSummary/": s.dataRequestFunc(StatSummary),
+ "/publish/StatSummary": s.dataRequestFunc(StatSummary),
+ "/publish/Stats/": s.dataRequestFunc(Stats),
+ "/publish/Stats": s.dataRequestFunc(Stats),
+ "/publish/ConfigDoc/": s.dataRequestFunc(ConfigDoc),
+ "/publish/ConfigDoc": s.dataRequestFunc(ConfigDoc),
+ "/api/cache-count/": s.dataRequestFunc(APICacheCount),
+ "/api/cache-count": s.dataRequestFunc(APICacheCount),
+ "/api/cache-available-count/": s.dataRequestFunc(APICacheAvailableCount),
+ "/api/cache-available-count": s.dataRequestFunc(APICacheAvailableCount),
+ "/api/cache-down-count/": s.dataRequestFunc(APICacheDownCount),
+ "/api/cache-down-count": s.dataRequestFunc(APICacheDownCount),
+ "/api/version/": s.dataRequestFunc(APIVersion),
+ "/api/version": s.dataRequestFunc(APIVersion),
+ "/api/traffic-ops-uri/": s.dataRequestFunc(APITrafficOpsURI),
+ "/api/traffic-ops-uri": s.dataRequestFunc(APITrafficOpsURI),
+ "/api/cache-statuses/": s.dataRequestFunc(APICacheStates),
+ "/api/cache-statuses": s.dataRequestFunc(APICacheStates),
+ "/api/bandwidth-kbps/": s.dataRequestFunc(APIBandwidthKbps),
+ "/api/bandwidth-kbps": s.dataRequestFunc(APIBandwidthKbps),
+ "/api/bandwidth-capacity-kbps/": s.dataRequestFunc(APIBandwidthCapacityKbps),
+ "/api/bandwidth-capacity-kbps": s.dataRequestFunc(APIBandwidthCapacityKbps),
+ "/": handleRoot,
+ "/sorttable.js": handleSortableJs,
+ }, nil
+}
+
+func (s Server) registerEndpoints(sm *http.ServeMux) error {
+ endpoints, err := s.endpoints()
+ if err != nil {
+ return err
+ }
+ for path, f := range endpoints {
+ sm.HandleFunc(path, f)
+ }
+ return nil
+}
+
+// Run runs a new HTTP service at the given addr, making data requests to the given c.
+// Run may be called repeatedly, and each time, will shut down any existing service first.
+// Run is NOT threadsafe, and MUST NOT be called concurrently by multiple goroutines.
+func (s Server) Run(f GetDataFunc, addr string, readTimeout time.Duration, writeTimeout time.Duration) error {
+ // TODO make an object, which itself is not threadsafe, but which encapsulates all data so multiple
+ // objects can be created and Run.
+
+ if s.stoppableListener != nil {
+ log.Infof("Stopping Web Server\n")
+ s.stoppableListener.Stop()
+ s.stoppableListenerWaitGroup.Wait()
+ }
+ log.Infof("Starting Web Server\n")
+
+ var err error
+ var originalListener net.Listener
+ if originalListener, err = net.Listen("tcp", addr); err != nil {
+ return err
+ }
+ if s.stoppableListener, err = stoppableListener.New(originalListener); err != nil {
+ return err
+ }
+
+ s.getData = f
+
+ sm := http.NewServeMux()
+ err = s.registerEndpoints(sm)
+ if err != nil {
+ return err
+ }
+ server := &http.Server{
+ Addr: addr,
+ Handler: sm,
+ ReadTimeout: readTimeout,
+ WriteTimeout: writeTimeout,
+ MaxHeaderBytes: 1 << 20,
+ }
+
+ s.stoppableListenerWaitGroup = sync.WaitGroup{}
+ s.stoppableListenerWaitGroup.Add(1)
+ go func() {
+ defer s.stoppableListenerWaitGroup.Done()
+ err := server.Serve(s.stoppableListener)
+ if err != nil {
+ log.Warnf("HTTP server stopped with error: %v\n", err)
+ }
+ }()
+
+ log.Infof("Web server listening on %s", addr)
+ return nil
+}
+
+// Type is the API request type which was received.
+type Type int
+
+const (
+ // TRConfig represents a data request for the Traffic Router config
+ TRConfig Type = (1 << iota)
+ // TRStateDerived represents a data request for the derived data, aggregated from all Traffic Monitor peers.
+ TRStateDerived
+ // TRStateSelf represents a data request for the cache health data only from this Traffic Monitor, not from its peers.
+ TRStateSelf
+ // CacheStats represents a data request for general cache stats
+ CacheStats
+ // DSStats represents a data request for delivery service stats
+ DSStats
+ // EventLog represents a data request for the event log
+ EventLog
+ // PeerStates represents a data request for the cache health data gathered from Traffic Monitor peers.
+ PeerStates
+ // StatSummary represents a data request for a summary of the gathered stats
+ StatSummary
+ // Stats represents a data request for stats
+ Stats
+ // ConfigDoc represents a data request for this app's configuration data.
+ ConfigDoc
+ // APICacheCount represents a data request for the total number of caches this Traffic Monitor polls, as received Traffic Ops.
+ APICacheCount
+ // APICacheAvailableCount represents a data request for the number of caches flagged as available by this Traffic Monitor
+ APICacheAvailableCount
+ // APICacheDownCount represents a data request for the number of caches flagged as unavailable by this Traffic Monitor
+ APICacheDownCount
+ // APIVersion represents a data request for this app's version
+ APIVersion
+ // APITrafficOpsURI represents a data request for the Traffic Ops URI this app is configured to query
+ APITrafficOpsURI
+ // APICacheStates represents a data request for a summary of the cache states
+ APICacheStates
+ // APIBandwidthKbps represents a data request for the total bandwidth of all caches polled
+ APIBandwidthKbps
+ // APIBandwidthCapacityKbps represents a data request for the total bandwidth capacity of all caches polled
+ APIBandwidthCapacityKbps
+)
+
+// String returns a string representation of the API request type.
+func (t Type) String() string {
+ switch t {
+ case TRConfig:
+ return "TRConfig"
+ case TRStateDerived:
+ return "TRStateDerived"
+ case TRStateSelf:
+ return "TRStateSelf"
+ case CacheStats:
+ return "CacheStats"
+ case DSStats:
+ return "DSStats"
+ case EventLog:
+ return "EventLog"
+ case PeerStates:
+ return "PeerStates"
+ case StatSummary:
+ return "StatSummary"
+ case Stats:
+ return "Stats"
+ case ConfigDoc:
+ return "ConfigDoc"
+ case APICacheCount:
+ return "APICacheCount"
+ case APICacheAvailableCount:
+ return "APICacheAvailableCount"
+ case APICacheDownCount:
+ return "APICacheDownCount"
+ case APIVersion:
+ return "APIVersion"
+ case APITrafficOpsURI:
+ return "APITrafficOpsURI"
+ case APICacheStates:
+ return "APICacheStates"
+ case APIBandwidthKbps:
+ return "APIBandwidthKbps"
+ case APIBandwidthCapacityKbps:
+ return "APIBandwidthCapacityKbps"
+ default:
+ return "Invalid"
+ }
+}
+
+// Format is the format protocol the API response will be.
+type Format int
+
+const (
+ // XML represents that data should be serialized to XML
+ XML Format = (1 << iota)
+ // JSON represents that data should be serialized to JSON
+ JSON
+)
+
+// DataRequest contains all the data about an API request necessary to form a response.
+type DataRequest struct {
+ Type
+ Format
+ Date string
+ Parameters map[string][]string
+}
+
+// GetDataFunc is a function which takes a DataRequest from a request made by a client, and returns the proper response to send to the client.
+type GetDataFunc func(DataRequest) ([]byte, int)
+
+// ParametersStr takes the URL query parameters, and returns a string as used by the Traffic Monitor 1.0 endpoints "pp" key.
+func ParametersStr(params url.Values) string {
+ pp := ""
+ for param, vals := range params {
+ for _, val := range vals {
+ pp += param + "=[" + val + "], "
+ }
+ }
+ if len(pp) > 2 {
+ pp = pp[:len(pp)-2]
+ }
+ return pp
+}
+
+// DateStr returns the given time in the format expected by Traffic Monitor 1.0 API users
+func DateStr(t time.Time) string {
+ return t.UTC().Format("Mon Jan 02 15:04:05 UTC 2006")
+}
+
+func (s Server) dataRequest(w http.ResponseWriter, req *http.Request, t Type, f Format) {
+ //pp: "0=[my-ats-edge-cache-0], hc=[1]",
+ //dateLayout := "Thu Oct 09 20:28:36 UTC 2014"
+ dateLayout := "Mon Jan 02 15:04:05 MST 2006"
+ data, responseCode := s.getData(DataRequest{
+ Type: t,
+ Format: f,
+ Date: time.Now().UTC().Format(dateLayout),
+ Parameters: req.URL.Query(),
+ })
+ if len(data) > 0 {
+ w.WriteHeader(responseCode)
+ if _, err := w.Write(data); err != nil {
+ log.Warnf("received error writing data request %v: %v\n", t, err)
+ }
+
+ } else {
+ w.WriteHeader(http.StatusInternalServerError)
+ if _, err := w.Write([]byte("Internal Server Error")); err != nil {
+ log.Warnf("received error writing data request %v: %v\n", t, err)
+ }
+ }
+}
+
+func (s Server) handleRootFunc() (http.HandlerFunc, error) {
+ return s.handleFile("index.html")
+}
+
+func (s Server) handleSortableFunc() (http.HandlerFunc, error) {
+ return s.handleFile("sorttable.js")
+}
+
+func (s Server) handleFile(name string) (http.HandlerFunc, error) {
+ index, err := ioutil.ReadFile(name)
+ if err != nil {
+ return nil, err
+ }
+ return func(w http.ResponseWriter, req *http.Request) {
+ fmt.Fprintf(w, "%s", index)
+ }, nil
+}
+
+func (s Server) handleCrStatesFunc() http.HandlerFunc {
+ return func(w http.ResponseWriter, req *http.Request) {
+ t := TRStateDerived
+ if req.URL.RawQuery == "raw" {
+ t = TRStateSelf
+ }
+ s.dataRequest(w, req, t, JSON)
+ }
+}
+
+func (s Server) dataRequestFunc(t Type) http.HandlerFunc {
+ return func(w http.ResponseWriter, r *http.Request) {
+ s.dataRequest(w, r, t, JSON)
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/experimental/traffic_monitor/traffic_monitor-example-config.json
----------------------------------------------------------------------
diff --git a/traffic_monitor/experimental/traffic_monitor/traffic_monitor-example-config.json b/traffic_monitor/experimental/traffic_monitor/traffic_monitor-example-config.json
index 9493dd2..d1b4613 100644
--- a/traffic_monitor/experimental/traffic_monitor/traffic_monitor-example-config.json
+++ b/traffic_monitor/experimental/traffic_monitor/traffic_monitor-example-config.json
@@ -7,10 +7,12 @@
"max_events": 200,
"max_stat_history": 5,
"max_health_history": 5,
- "health_flush_interval_ms": 200,
- "stat_flush_interval_ms": 200,
+ "health_flush_interval_ms": 20,
+ "stat_flush_interval_ms": 20,
"log_location_error": "stderr",
"log_location_warning": "stdout",
"log_location_info": "null",
- "log_location_debug": "null"
+ "log_location_debug": "null",
+ "serve_read_timeout_ms": 10000,
+ "serve_write_timeout_ms": 10000
}
[17/26] incubator-trafficcontrol git commit: merge master
Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/API/Status.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/API/Status.pm b/traffic_ops/app/lib/API/Status.pm
index 52d9665..2e26682 100644
--- a/traffic_ops/app/lib/API/Status.pm
+++ b/traffic_ops/app/lib/API/Status.pm
@@ -1,6 +1,5 @@
package API::Status;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/API/System.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/API/System.pm b/traffic_ops/app/lib/API/System.pm
index bd79d66..40044e7 100644
--- a/traffic_ops/app/lib/API/System.pm
+++ b/traffic_ops/app/lib/API/System.pm
@@ -1,6 +1,5 @@
package API::System;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/API/ToExtension.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/API/ToExtension.pm b/traffic_ops/app/lib/API/ToExtension.pm
index 34f16a5..ee7494f 100644
--- a/traffic_ops/app/lib/API/ToExtension.pm
+++ b/traffic_ops/app/lib/API/ToExtension.pm
@@ -1,6 +1,5 @@
package API::ToExtension;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/API/Topology.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/API/Topology.pm b/traffic_ops/app/lib/API/Topology.pm
index f07e875..fa4dcb7 100644
--- a/traffic_ops/app/lib/API/Topology.pm
+++ b/traffic_ops/app/lib/API/Topology.pm
@@ -1,6 +1,5 @@
package API::Topology;
#
-## Copyright 2016 Cisco, LLC
##
## Licensed under the Apache License, Version 2.0 (the "License");
## you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/API/TrafficMonitor.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/API/TrafficMonitor.pm b/traffic_ops/app/lib/API/TrafficMonitor.pm
index 65303ce..a0dcff1 100644
--- a/traffic_ops/app/lib/API/TrafficMonitor.pm
+++ b/traffic_ops/app/lib/API/TrafficMonitor.pm
@@ -1,6 +1,5 @@
package API::TrafficMonitor;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/API/Types.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/API/Types.pm b/traffic_ops/app/lib/API/Types.pm
index 8847bcb..8906b51 100644
--- a/traffic_ops/app/lib/API/Types.pm
+++ b/traffic_ops/app/lib/API/Types.pm
@@ -1,6 +1,5 @@
package API::Types;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/API/User.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/API/User.pm b/traffic_ops/app/lib/API/User.pm
index 0dac324..fab4b85 100644
--- a/traffic_ops/app/lib/API/User.pm
+++ b/traffic_ops/app/lib/API/User.pm
@@ -1,6 +1,5 @@
package API::User;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -286,6 +285,7 @@ sub current {
"email" => "",
"fullName" => "",
"newUser" => \0,
+ "localUser" => \0,
"addressLine1" => "",
"addressLine2" => "",
"city" => "",
@@ -313,6 +313,7 @@ sub current {
"email" => $row->email,
"fullName" => $row->full_name,
"newUser" => \$row->new_user,
+ "localUser" => \1,
"addressLine1" => $row->address_line1,
"addressLine2" => $row->address_line2,
"city" => $row->city,
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Common/ReturnCodes.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Common/ReturnCodes.pm b/traffic_ops/app/lib/Common/ReturnCodes.pm
index 56b15eb..8219efa 100644
--- a/traffic_ops/app/lib/Common/ReturnCodes.pm
+++ b/traffic_ops/app/lib/Common/ReturnCodes.pm
@@ -1,6 +1,5 @@
package Common::ReturnCodes;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Connection/RiakAdapter.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Connection/RiakAdapter.pm b/traffic_ops/app/lib/Connection/RiakAdapter.pm
index 58c648c..448619f 100755
--- a/traffic_ops/app/lib/Connection/RiakAdapter.pm
+++ b/traffic_ops/app/lib/Connection/RiakAdapter.pm
@@ -1,6 +1,5 @@
package Connection::RiakAdapter;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Extensions/Helper.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Extensions/Helper.pm b/traffic_ops/app/lib/Extensions/Helper.pm
index 9fd50c4..2f9c6fb 100644
--- a/traffic_ops/app/lib/Extensions/Helper.pm
+++ b/traffic_ops/app/lib/Extensions/Helper.pm
@@ -1,6 +1,5 @@
package Extensions::Helper;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Extensions/TrafficStats/API/CacheStats.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Extensions/TrafficStats/API/CacheStats.pm b/traffic_ops/app/lib/Extensions/TrafficStats/API/CacheStats.pm
index 8d51efe..a357a24 100644
--- a/traffic_ops/app/lib/Extensions/TrafficStats/API/CacheStats.pm
+++ b/traffic_ops/app/lib/Extensions/TrafficStats/API/CacheStats.pm
@@ -1,6 +1,5 @@
package Extensions::TrafficStats::API::CacheStats;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Extensions/TrafficStats/API/CdnStats.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Extensions/TrafficStats/API/CdnStats.pm b/traffic_ops/app/lib/Extensions/TrafficStats/API/CdnStats.pm
index feb032b..023e673 100644
--- a/traffic_ops/app/lib/Extensions/TrafficStats/API/CdnStats.pm
+++ b/traffic_ops/app/lib/Extensions/TrafficStats/API/CdnStats.pm
@@ -1,6 +1,5 @@
package Extensions::TrafficStats::API::CdnStats;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Extensions/TrafficStats/API/DeliveryServiceStats.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Extensions/TrafficStats/API/DeliveryServiceStats.pm b/traffic_ops/app/lib/Extensions/TrafficStats/API/DeliveryServiceStats.pm
index 4c13646..3f5bb1c 100644
--- a/traffic_ops/app/lib/Extensions/TrafficStats/API/DeliveryServiceStats.pm
+++ b/traffic_ops/app/lib/Extensions/TrafficStats/API/DeliveryServiceStats.pm
@@ -1,6 +1,5 @@
package Extensions::TrafficStats::API::DeliveryServiceStats;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Extensions/TrafficStats/Builder/BaseBuilder.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Extensions/TrafficStats/Builder/BaseBuilder.pm b/traffic_ops/app/lib/Extensions/TrafficStats/Builder/BaseBuilder.pm
index d899944..9707866 100755
--- a/traffic_ops/app/lib/Extensions/TrafficStats/Builder/BaseBuilder.pm
+++ b/traffic_ops/app/lib/Extensions/TrafficStats/Builder/BaseBuilder.pm
@@ -1,6 +1,5 @@
package Extensions::TrafficStats::Builder::BaseBuilder;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Extensions/TrafficStats/Builder/CacheStatsBuilder.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Extensions/TrafficStats/Builder/CacheStatsBuilder.pm b/traffic_ops/app/lib/Extensions/TrafficStats/Builder/CacheStatsBuilder.pm
index b018830..55f11f9 100755
--- a/traffic_ops/app/lib/Extensions/TrafficStats/Builder/CacheStatsBuilder.pm
+++ b/traffic_ops/app/lib/Extensions/TrafficStats/Builder/CacheStatsBuilder.pm
@@ -1,6 +1,5 @@
package Extensions::TrafficStats::Builder::CacheStatsBuilder;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Extensions/TrafficStats/Builder/DeliveryServiceStatsBuilder.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Extensions/TrafficStats/Builder/DeliveryServiceStatsBuilder.pm b/traffic_ops/app/lib/Extensions/TrafficStats/Builder/DeliveryServiceStatsBuilder.pm
index e6fcc8f..ccedbd2 100755
--- a/traffic_ops/app/lib/Extensions/TrafficStats/Builder/DeliveryServiceStatsBuilder.pm
+++ b/traffic_ops/app/lib/Extensions/TrafficStats/Builder/DeliveryServiceStatsBuilder.pm
@@ -1,6 +1,5 @@
package Extensions::TrafficStats::Builder::DeliveryServiceStatsBuilder;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Extensions/TrafficStats/Connection/InfluxDBAdapter.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Extensions/TrafficStats/Connection/InfluxDBAdapter.pm b/traffic_ops/app/lib/Extensions/TrafficStats/Connection/InfluxDBAdapter.pm
index b4b2c30..4d1e3ea 100755
--- a/traffic_ops/app/lib/Extensions/TrafficStats/Connection/InfluxDBAdapter.pm
+++ b/traffic_ops/app/lib/Extensions/TrafficStats/Connection/InfluxDBAdapter.pm
@@ -1,6 +1,5 @@
package Extensions::TrafficStats::Connection::InfluxDBAdapter;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Extensions/TrafficStats/Delegate/CacheStatistics.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Extensions/TrafficStats/Delegate/CacheStatistics.pm b/traffic_ops/app/lib/Extensions/TrafficStats/Delegate/CacheStatistics.pm
index b355c7a..3533c09 100644
--- a/traffic_ops/app/lib/Extensions/TrafficStats/Delegate/CacheStatistics.pm
+++ b/traffic_ops/app/lib/Extensions/TrafficStats/Delegate/CacheStatistics.pm
@@ -1,12 +1,20 @@
package Extensions::TrafficStats::Delegate::CacheStatistics;
+
+#
+# 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
+#
+# 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.
+#
#
-# Copyright 2011-2014, Comcast Corporation. This software and its contents are
-# Comcast confidential and proprietary. It cannot be used, disclosed, or
-# distributed without Comcast's prior written permission. Modification of this
-# software is only allowed at the direction of Comcast Corporation. All allowed
-# modifications must be provided to Comcast Corporation.
#
-
# JvD Note: you always want to put Utils as the first use.
use UI::Utils;
use Mojo::Base 'Mojolicious::Controller';
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Extensions/TrafficStats/Delegate/CdnStatistics.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Extensions/TrafficStats/Delegate/CdnStatistics.pm b/traffic_ops/app/lib/Extensions/TrafficStats/Delegate/CdnStatistics.pm
index 2e3c7d9..a9659c7 100644
--- a/traffic_ops/app/lib/Extensions/TrafficStats/Delegate/CdnStatistics.pm
+++ b/traffic_ops/app/lib/Extensions/TrafficStats/Delegate/CdnStatistics.pm
@@ -1,10 +1,17 @@
package Extensions::TrafficStats::Delegate::CdnStatistics;
+
+#
+# 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
+#
+# http://www.apache.org/licenses/LICENSE-2.0
#
-# Copyright 2011-2014, Comcast Corporation. This software and its contents are
-# Comcast confidential and proprietary. It cannot be used, disclosed, or
-# distributed without Comcast's prior written permission. Modification of this
-# software is only allowed at the direction of Comcast Corporation. All allowed
-# modifications must be provided to Comcast Corporation.
+# 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.
#
# JvD Note: you always want to put Utils as the first use.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Extensions/TrafficStats/Delegate/Statistics.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Extensions/TrafficStats/Delegate/Statistics.pm b/traffic_ops/app/lib/Extensions/TrafficStats/Delegate/Statistics.pm
index 990404a..33dc4bc 100644
--- a/traffic_ops/app/lib/Extensions/TrafficStats/Delegate/Statistics.pm
+++ b/traffic_ops/app/lib/Extensions/TrafficStats/Delegate/Statistics.pm
@@ -1,11 +1,19 @@
package Extensions::TrafficStats::Delegate::Statistics;
+
+#
+# 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
#
-# Copyright 2011-2014, Comcast Corporation. This software and its contents are
-# Comcast confidential and proprietary. It cannot be used, disclosed, or
-# distributed without Comcast's prior written permission. Modification of this
-# software is only allowed at the direction of Comcast Corporation. All allowed
-# modifications must be provided to Comcast Corporation.
+# 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.
+#
+
use Data::Dumper;
use Time::HiRes qw(gettimeofday tv_interval);
use Math::Round qw(nearest);
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Extensions/TrafficStats/Helper/InfluxResponse.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Extensions/TrafficStats/Helper/InfluxResponse.pm b/traffic_ops/app/lib/Extensions/TrafficStats/Helper/InfluxResponse.pm
index 640417f..f4aaf5c 100644
--- a/traffic_ops/app/lib/Extensions/TrafficStats/Helper/InfluxResponse.pm
+++ b/traffic_ops/app/lib/Extensions/TrafficStats/Helper/InfluxResponse.pm
@@ -1,10 +1,16 @@
package Extensions::TrafficStats::Helper::InfluxResponse;
#
-# Copyright 2011-2014, Comcast Corporation. This software and its contents are
-# Comcast confidential and proprietary. It cannot be used, disclosed, or
-# distributed without Comcast's prior written permission. Modification of this
-# software is only allowed at the direction of Comcast Corporation. All allowed
-# modifications must be provided to Comcast Corporation.
+# 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
+#
+# 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.
#
use UI::Utils;
use constant FIVE_MINUTES => 5;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Fixtures/Asn.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/Asn.pm b/traffic_ops/app/lib/Fixtures/Asn.pm
index 7910d99..450b538 100644
--- a/traffic_ops/app/lib/Fixtures/Asn.pm
+++ b/traffic_ops/app/lib/Fixtures/Asn.pm
@@ -1,6 +1,5 @@
package Fixtures::Asn;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Fixtures/Cachegroup.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/Cachegroup.pm b/traffic_ops/app/lib/Fixtures/Cachegroup.pm
index 9313b76..207c4a1 100644
--- a/traffic_ops/app/lib/Fixtures/Cachegroup.pm
+++ b/traffic_ops/app/lib/Fixtures/Cachegroup.pm
@@ -1,6 +1,5 @@
package Fixtures::Cachegroup;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Fixtures/CachegroupParameter.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/CachegroupParameter.pm b/traffic_ops/app/lib/Fixtures/CachegroupParameter.pm
index 19e235f..3db65d0 100644
--- a/traffic_ops/app/lib/Fixtures/CachegroupParameter.pm
+++ b/traffic_ops/app/lib/Fixtures/CachegroupParameter.pm
@@ -1,6 +1,5 @@
package Fixtures::CachegroupParameter;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Fixtures/Cdn.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/Cdn.pm b/traffic_ops/app/lib/Fixtures/Cdn.pm
index c8d4937..c5f2acc 100644
--- a/traffic_ops/app/lib/Fixtures/Cdn.pm
+++ b/traffic_ops/app/lib/Fixtures/Cdn.pm
@@ -1,6 +1,5 @@
package Fixtures::Cdn;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Fixtures/Deliveryservice.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/Deliveryservice.pm b/traffic_ops/app/lib/Fixtures/Deliveryservice.pm
index 7641a0e..107d31f 100644
--- a/traffic_ops/app/lib/Fixtures/Deliveryservice.pm
+++ b/traffic_ops/app/lib/Fixtures/Deliveryservice.pm
@@ -1,7 +1,6 @@
package Fixtures::Deliveryservice;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Fixtures/DeliveryserviceRegex.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/DeliveryserviceRegex.pm b/traffic_ops/app/lib/Fixtures/DeliveryserviceRegex.pm
index 435f476..f1716b1 100644
--- a/traffic_ops/app/lib/Fixtures/DeliveryserviceRegex.pm
+++ b/traffic_ops/app/lib/Fixtures/DeliveryserviceRegex.pm
@@ -1,6 +1,5 @@
package Fixtures::DeliveryserviceRegex;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Fixtures/DeliveryserviceServer.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/DeliveryserviceServer.pm b/traffic_ops/app/lib/Fixtures/DeliveryserviceServer.pm
index c785934..874e538 100644
--- a/traffic_ops/app/lib/Fixtures/DeliveryserviceServer.pm
+++ b/traffic_ops/app/lib/Fixtures/DeliveryserviceServer.pm
@@ -1,6 +1,5 @@
package Fixtures::DeliveryserviceServer;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Fixtures/DeliveryserviceTmuser.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/DeliveryserviceTmuser.pm b/traffic_ops/app/lib/Fixtures/DeliveryserviceTmuser.pm
index da8dd78..f6116bc 100644
--- a/traffic_ops/app/lib/Fixtures/DeliveryserviceTmuser.pm
+++ b/traffic_ops/app/lib/Fixtures/DeliveryserviceTmuser.pm
@@ -1,6 +1,5 @@
package Fixtures::DeliveryserviceTmuser;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Fixtures/Division.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/Division.pm b/traffic_ops/app/lib/Fixtures/Division.pm
index bf1be45..984f556 100644
--- a/traffic_ops/app/lib/Fixtures/Division.pm
+++ b/traffic_ops/app/lib/Fixtures/Division.pm
@@ -1,6 +1,5 @@
package Fixtures::Division;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Fixtures/Federation.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/Federation.pm b/traffic_ops/app/lib/Fixtures/Federation.pm
index 0e6ee2b..e5c8b7f 100644
--- a/traffic_ops/app/lib/Fixtures/Federation.pm
+++ b/traffic_ops/app/lib/Fixtures/Federation.pm
@@ -1,6 +1,5 @@
package Fixtures::Federation;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Fixtures/FederationDeliveryservice.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/FederationDeliveryservice.pm b/traffic_ops/app/lib/Fixtures/FederationDeliveryservice.pm
index 8d3e59b..6b1c810 100644
--- a/traffic_ops/app/lib/Fixtures/FederationDeliveryservice.pm
+++ b/traffic_ops/app/lib/Fixtures/FederationDeliveryservice.pm
@@ -1,6 +1,5 @@
package Fixtures::FederationDeliveryservice;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Fixtures/FederationFederationResolver.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/FederationFederationResolver.pm b/traffic_ops/app/lib/Fixtures/FederationFederationResolver.pm
index 9f1dc81..b52a7d9 100644
--- a/traffic_ops/app/lib/Fixtures/FederationFederationResolver.pm
+++ b/traffic_ops/app/lib/Fixtures/FederationFederationResolver.pm
@@ -1,6 +1,5 @@
package Fixtures::FederationFederationResolver;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Fixtures/FederationResolver.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/FederationResolver.pm b/traffic_ops/app/lib/Fixtures/FederationResolver.pm
index 0200df1..6e879f6 100644
--- a/traffic_ops/app/lib/Fixtures/FederationResolver.pm
+++ b/traffic_ops/app/lib/Fixtures/FederationResolver.pm
@@ -1,6 +1,5 @@
package Fixtures::FederationResolver;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Fixtures/FederationTmuser.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/FederationTmuser.pm b/traffic_ops/app/lib/Fixtures/FederationTmuser.pm
index 7ad1de5..54f4999 100644
--- a/traffic_ops/app/lib/Fixtures/FederationTmuser.pm
+++ b/traffic_ops/app/lib/Fixtures/FederationTmuser.pm
@@ -1,6 +1,5 @@
package Fixtures::FederationTmuser;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Fixtures/Hwinfo.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/Hwinfo.pm b/traffic_ops/app/lib/Fixtures/Hwinfo.pm
index c4fb43e..4ba9cdb 100644
--- a/traffic_ops/app/lib/Fixtures/Hwinfo.pm
+++ b/traffic_ops/app/lib/Fixtures/Hwinfo.pm
@@ -1,6 +1,5 @@
package Fixtures::Hwinfo;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Fixtures/Integration/Asn.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/Integration/Asn.pm b/traffic_ops/app/lib/Fixtures/Integration/Asn.pm
index 22b6e02..522fa04 100644
--- a/traffic_ops/app/lib/Fixtures/Integration/Asn.pm
+++ b/traffic_ops/app/lib/Fixtures/Integration/Asn.pm
@@ -1,5 +1,23 @@
package Fixtures::Integration::Asn;
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
+
+
# Do not edit! Generated code.
# See https://github.com/Comcast/traffic_control/wiki/The%20Kabletown%20example
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Fixtures/Integration/Cachegroup.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/Integration/Cachegroup.pm b/traffic_ops/app/lib/Fixtures/Integration/Cachegroup.pm
index 0ffdb8a..6f0b094 100644
--- a/traffic_ops/app/lib/Fixtures/Integration/Cachegroup.pm
+++ b/traffic_ops/app/lib/Fixtures/Integration/Cachegroup.pm
@@ -1,5 +1,23 @@
package Fixtures::Integration::Cachegroup;
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
+
+
# Do not edit! Generated code.
# See https://github.com/Comcast/traffic_control/wiki/The%20Kabletown%20example
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Fixtures/Integration/CachegroupParameter.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/Integration/CachegroupParameter.pm b/traffic_ops/app/lib/Fixtures/Integration/CachegroupParameter.pm
index 933a459..4d15345 100644
--- a/traffic_ops/app/lib/Fixtures/Integration/CachegroupParameter.pm
+++ b/traffic_ops/app/lib/Fixtures/Integration/CachegroupParameter.pm
@@ -1,5 +1,23 @@
package Fixtures::Integration::CachegroupParameter;
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
+
+
# Do not edit! Generated code.
# See https://github.com/Comcast/traffic_control/wiki/The%20Kabletown%20example
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Fixtures/Integration/Cdn.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/Integration/Cdn.pm b/traffic_ops/app/lib/Fixtures/Integration/Cdn.pm
index 1c85a48..d3a7eef 100644
--- a/traffic_ops/app/lib/Fixtures/Integration/Cdn.pm
+++ b/traffic_ops/app/lib/Fixtures/Integration/Cdn.pm
@@ -1,5 +1,23 @@
package Fixtures::Integration::Cdn;
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
+
+
# Do not edit! Generated code.
# See https://github.com/Comcast/traffic_control/wiki/The%20Kabletown%20example
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Fixtures/Integration/Deliveryservice.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/Integration/Deliveryservice.pm b/traffic_ops/app/lib/Fixtures/Integration/Deliveryservice.pm
index 56a5590..65c9615 100644
--- a/traffic_ops/app/lib/Fixtures/Integration/Deliveryservice.pm
+++ b/traffic_ops/app/lib/Fixtures/Integration/Deliveryservice.pm
@@ -1,5 +1,23 @@
package Fixtures::Integration::Deliveryservice;
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
+
+
# Do not edit! Generated code.
# See https://github.com/Comcast/traffic_control/wiki/The%20Kabletown%20example
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Fixtures/Integration/DeliveryserviceRegex.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/Integration/DeliveryserviceRegex.pm b/traffic_ops/app/lib/Fixtures/Integration/DeliveryserviceRegex.pm
index 0423935..4f92009 100644
--- a/traffic_ops/app/lib/Fixtures/Integration/DeliveryserviceRegex.pm
+++ b/traffic_ops/app/lib/Fixtures/Integration/DeliveryserviceRegex.pm
@@ -1,5 +1,23 @@
package Fixtures::Integration::DeliveryserviceRegex;
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
+
+
# Do not edit! Generated code.
# See https://github.com/Comcast/traffic_control/wiki/The%20Kabletown%20example
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Fixtures/Integration/DeliveryserviceServer.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/Integration/DeliveryserviceServer.pm b/traffic_ops/app/lib/Fixtures/Integration/DeliveryserviceServer.pm
index 82c9925..dff84f4 100644
--- a/traffic_ops/app/lib/Fixtures/Integration/DeliveryserviceServer.pm
+++ b/traffic_ops/app/lib/Fixtures/Integration/DeliveryserviceServer.pm
@@ -1,5 +1,23 @@
package Fixtures::Integration::DeliveryserviceServer;
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
+
+
# Do not edit! Generated code.
# See https://github.com/Comcast/traffic_control/wiki/The%20Kabletown%20example
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Fixtures/Integration/DeliveryserviceTmuser.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/Integration/DeliveryserviceTmuser.pm b/traffic_ops/app/lib/Fixtures/Integration/DeliveryserviceTmuser.pm
index bb24852..66020fe 100644
--- a/traffic_ops/app/lib/Fixtures/Integration/DeliveryserviceTmuser.pm
+++ b/traffic_ops/app/lib/Fixtures/Integration/DeliveryserviceTmuser.pm
@@ -1,5 +1,23 @@
package Fixtures::Integration::DeliveryserviceTmuser;
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
+
+
# Do not edit! Generated code.
# See https://github.com/Comcast/traffic_control/wiki/The%20Kabletown%20example
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Fixtures/Integration/Division.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/Integration/Division.pm b/traffic_ops/app/lib/Fixtures/Integration/Division.pm
index deb1cee..4e48ba9 100644
--- a/traffic_ops/app/lib/Fixtures/Integration/Division.pm
+++ b/traffic_ops/app/lib/Fixtures/Integration/Division.pm
@@ -1,5 +1,23 @@
package Fixtures::Integration::Division;
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
+
+
# Do not edit! Generated code.
# See https://github.com/Comcast/traffic_control/wiki/The%20Kabletown%20example
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Fixtures/Integration/Federation.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/Integration/Federation.pm b/traffic_ops/app/lib/Fixtures/Integration/Federation.pm
index 80d0546..9b83395 100644
--- a/traffic_ops/app/lib/Fixtures/Integration/Federation.pm
+++ b/traffic_ops/app/lib/Fixtures/Integration/Federation.pm
@@ -1,5 +1,23 @@
package Fixtures::Integration::Federation;
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
+
+
# Do not edit! Generated code.
# See https://github.com/Comcast/traffic_control/wiki/The%20Kabletown%20example
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Fixtures/Integration/FederationDeliveryservice.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/Integration/FederationDeliveryservice.pm b/traffic_ops/app/lib/Fixtures/Integration/FederationDeliveryservice.pm
index 3cc7f23..a59703e 100644
--- a/traffic_ops/app/lib/Fixtures/Integration/FederationDeliveryservice.pm
+++ b/traffic_ops/app/lib/Fixtures/Integration/FederationDeliveryservice.pm
@@ -1,5 +1,23 @@
package Fixtures::Integration::FederationDeliveryservice;
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
+
+
# Do not edit! Generated code.
# See https://github.com/Comcast/traffic_control/wiki/The%20Kabletown%20example
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Fixtures/Integration/FederationFederationResolver.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/Integration/FederationFederationResolver.pm b/traffic_ops/app/lib/Fixtures/Integration/FederationFederationResolver.pm
index d4e812f..c14a4d6 100644
--- a/traffic_ops/app/lib/Fixtures/Integration/FederationFederationResolver.pm
+++ b/traffic_ops/app/lib/Fixtures/Integration/FederationFederationResolver.pm
@@ -1,5 +1,23 @@
package Fixtures::Integration::FederationFederationResolver;
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
+
+
# Do not edit! Generated code.
# See https://github.com/Comcast/traffic_control/wiki/The%20Kabletown%20example
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Fixtures/Integration/FederationResolver.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/Integration/FederationResolver.pm b/traffic_ops/app/lib/Fixtures/Integration/FederationResolver.pm
index 5d4d888..1e6e6bb 100644
--- a/traffic_ops/app/lib/Fixtures/Integration/FederationResolver.pm
+++ b/traffic_ops/app/lib/Fixtures/Integration/FederationResolver.pm
@@ -1,5 +1,23 @@
package Fixtures::Integration::FederationResolver;
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
+
+
# Do not edit! Generated code.
# See https://github.com/Comcast/traffic_control/wiki/The%20Kabletown%20example
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Fixtures/Integration/FederationTmuser.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/Integration/FederationTmuser.pm b/traffic_ops/app/lib/Fixtures/Integration/FederationTmuser.pm
index 78820bb..88934cc 100644
--- a/traffic_ops/app/lib/Fixtures/Integration/FederationTmuser.pm
+++ b/traffic_ops/app/lib/Fixtures/Integration/FederationTmuser.pm
@@ -1,5 +1,23 @@
package Fixtures::Integration::FederationTmuser;
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
+
+
# Do not edit! Generated code.
# See https://github.com/Comcast/traffic_control/wiki/The%20Kabletown%20example
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Fixtures/Integration/GooseDbVersion.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/Integration/GooseDbVersion.pm b/traffic_ops/app/lib/Fixtures/Integration/GooseDbVersion.pm
index fafa357..bfc025d 100644
--- a/traffic_ops/app/lib/Fixtures/Integration/GooseDbVersion.pm
+++ b/traffic_ops/app/lib/Fixtures/Integration/GooseDbVersion.pm
@@ -1,5 +1,23 @@
package Fixtures::Integration::GooseDbVersion;
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
+
+
# Do not edit! Generated code.
# See https://github.com/Comcast/traffic_control/wiki/The%20Kabletown%20example
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Fixtures/Integration/Hwinfo.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/Integration/Hwinfo.pm b/traffic_ops/app/lib/Fixtures/Integration/Hwinfo.pm
index 778455f..e90b7ce 100644
--- a/traffic_ops/app/lib/Fixtures/Integration/Hwinfo.pm
+++ b/traffic_ops/app/lib/Fixtures/Integration/Hwinfo.pm
@@ -1,5 +1,23 @@
package Fixtures::Integration::Hwinfo;
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
+
+
# Do not edit! Generated code.
# See https://github.com/Comcast/traffic_control/wiki/The%20Kabletown%20example
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Fixtures/Integration/Job.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/Integration/Job.pm b/traffic_ops/app/lib/Fixtures/Integration/Job.pm
index 849c5d6..8dae9ad 100644
--- a/traffic_ops/app/lib/Fixtures/Integration/Job.pm
+++ b/traffic_ops/app/lib/Fixtures/Integration/Job.pm
@@ -1,5 +1,23 @@
package Fixtures::Integration::Job;
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
+
+
# Do not edit! Generated code.
# See https://github.com/Comcast/traffic_control/wiki/The%20Kabletown%20example
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Fixtures/Integration/JobAgent.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/Integration/JobAgent.pm b/traffic_ops/app/lib/Fixtures/Integration/JobAgent.pm
index c86d1f1..ec671a6 100644
--- a/traffic_ops/app/lib/Fixtures/Integration/JobAgent.pm
+++ b/traffic_ops/app/lib/Fixtures/Integration/JobAgent.pm
@@ -1,5 +1,23 @@
package Fixtures::Integration::JobAgent;
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
+
+
# Do not edit! Generated code.
# See https://github.com/Comcast/traffic_control/wiki/The%20Kabletown%20example
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Fixtures/Integration/JobResult.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/Integration/JobResult.pm b/traffic_ops/app/lib/Fixtures/Integration/JobResult.pm
index 1c3dff2..488cfed 100644
--- a/traffic_ops/app/lib/Fixtures/Integration/JobResult.pm
+++ b/traffic_ops/app/lib/Fixtures/Integration/JobResult.pm
@@ -1,5 +1,23 @@
package Fixtures::Integration::JobResult;
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
+
+
# Do not edit! Generated code.
# See https://github.com/Comcast/traffic_control/wiki/The%20Kabletown%20example
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Fixtures/Integration/JobStatus.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/Integration/JobStatus.pm b/traffic_ops/app/lib/Fixtures/Integration/JobStatus.pm
index 2d55420..e32e1ce 100644
--- a/traffic_ops/app/lib/Fixtures/Integration/JobStatus.pm
+++ b/traffic_ops/app/lib/Fixtures/Integration/JobStatus.pm
@@ -1,5 +1,23 @@
package Fixtures::Integration::JobStatus;
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
+
+
# Do not edit! Generated code.
# See https://github.com/Comcast/traffic_control/wiki/The%20Kabletown%20example
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Fixtures/Integration/Log.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/Integration/Log.pm b/traffic_ops/app/lib/Fixtures/Integration/Log.pm
index 7a43a18..2f33f39 100644
--- a/traffic_ops/app/lib/Fixtures/Integration/Log.pm
+++ b/traffic_ops/app/lib/Fixtures/Integration/Log.pm
@@ -1,5 +1,23 @@
package Fixtures::Integration::Log;
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
+
+
# Do not edit! Generated code.
# See https://github.com/Comcast/traffic_control/wiki/The%20Kabletown%20example
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Fixtures/Integration/Parameter.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/Integration/Parameter.pm b/traffic_ops/app/lib/Fixtures/Integration/Parameter.pm
index 19bdf9f..77d7239 100644
--- a/traffic_ops/app/lib/Fixtures/Integration/Parameter.pm
+++ b/traffic_ops/app/lib/Fixtures/Integration/Parameter.pm
@@ -1,5 +1,23 @@
package Fixtures::Integration::Parameter;
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
+
+
# Do not edit! Generated code.
# See https://github.com/Comcast/traffic_control/wiki/The%20Kabletown%20example
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Fixtures/Integration/PhysLocation.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/Integration/PhysLocation.pm b/traffic_ops/app/lib/Fixtures/Integration/PhysLocation.pm
index 631955f..9022d85 100644
--- a/traffic_ops/app/lib/Fixtures/Integration/PhysLocation.pm
+++ b/traffic_ops/app/lib/Fixtures/Integration/PhysLocation.pm
@@ -1,5 +1,23 @@
package Fixtures::Integration::PhysLocation;
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
+
+
# Do not edit! Generated code.
# See https://github.com/Comcast/traffic_control/wiki/The%20Kabletown%20example
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Fixtures/Integration/Profile.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/Integration/Profile.pm b/traffic_ops/app/lib/Fixtures/Integration/Profile.pm
index 4127357..784f885 100644
--- a/traffic_ops/app/lib/Fixtures/Integration/Profile.pm
+++ b/traffic_ops/app/lib/Fixtures/Integration/Profile.pm
@@ -1,5 +1,23 @@
package Fixtures::Integration::Profile;
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
+
+
# Do not edit! Generated code.
# See https://github.com/Comcast/traffic_control/wiki/The%20Kabletown%20example
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Fixtures/Integration/ProfileParameter.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/Integration/ProfileParameter.pm b/traffic_ops/app/lib/Fixtures/Integration/ProfileParameter.pm
index 9ad326f..231a6de 100644
--- a/traffic_ops/app/lib/Fixtures/Integration/ProfileParameter.pm
+++ b/traffic_ops/app/lib/Fixtures/Integration/ProfileParameter.pm
@@ -1,5 +1,23 @@
package Fixtures::Integration::ProfileParameter;
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
+
+
# Do not edit! Generated code.
# See https://github.com/Comcast/traffic_control/wiki/The%20Kabletown%20example
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Fixtures/Integration/Regex.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/Integration/Regex.pm b/traffic_ops/app/lib/Fixtures/Integration/Regex.pm
index 8ac3ad1..1eac8b7 100644
--- a/traffic_ops/app/lib/Fixtures/Integration/Regex.pm
+++ b/traffic_ops/app/lib/Fixtures/Integration/Regex.pm
@@ -1,5 +1,23 @@
package Fixtures::Integration::Regex;
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
+
+
# Do not edit! Generated code.
# See https://github.com/Comcast/traffic_control/wiki/The%20Kabletown%20example
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Fixtures/Integration/Region.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/Integration/Region.pm b/traffic_ops/app/lib/Fixtures/Integration/Region.pm
index 7822574..d80ef59 100644
--- a/traffic_ops/app/lib/Fixtures/Integration/Region.pm
+++ b/traffic_ops/app/lib/Fixtures/Integration/Region.pm
@@ -1,5 +1,23 @@
package Fixtures::Integration::Region;
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
+
+
# Do not edit! Generated code.
# See https://github.com/Comcast/traffic_control/wiki/The%20Kabletown%20example
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Fixtures/Integration/Role.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/Integration/Role.pm b/traffic_ops/app/lib/Fixtures/Integration/Role.pm
index 859c61e..6510091 100644
--- a/traffic_ops/app/lib/Fixtures/Integration/Role.pm
+++ b/traffic_ops/app/lib/Fixtures/Integration/Role.pm
@@ -1,5 +1,23 @@
package Fixtures::Integration::Role;
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
+
+
# Do not edit! Generated code.
# See https://github.com/Comcast/traffic_control/wiki/The%20Kabletown%20example
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Fixtures/Integration/Server.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/Integration/Server.pm b/traffic_ops/app/lib/Fixtures/Integration/Server.pm
index a0e8cd6..2f21127 100644
--- a/traffic_ops/app/lib/Fixtures/Integration/Server.pm
+++ b/traffic_ops/app/lib/Fixtures/Integration/Server.pm
@@ -1,5 +1,23 @@
package Fixtures::Integration::Server;
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
+
+
# Do not edit! Generated code.
# See https://github.com/Comcast/traffic_control/wiki/The%20Kabletown%20example
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Fixtures/Integration/Servercheck.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/Integration/Servercheck.pm b/traffic_ops/app/lib/Fixtures/Integration/Servercheck.pm
index 91b8ec0..aee5f68 100644
--- a/traffic_ops/app/lib/Fixtures/Integration/Servercheck.pm
+++ b/traffic_ops/app/lib/Fixtures/Integration/Servercheck.pm
@@ -1,5 +1,23 @@
package Fixtures::Integration::Servercheck;
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
+
+
# Do not edit! Generated code.
# See https://github.com/Comcast/traffic_control/wiki/The%20Kabletown%20example
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Fixtures/Integration/Staticdnsentry.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/Integration/Staticdnsentry.pm b/traffic_ops/app/lib/Fixtures/Integration/Staticdnsentry.pm
index 418aa8c..f1f8c15 100644
--- a/traffic_ops/app/lib/Fixtures/Integration/Staticdnsentry.pm
+++ b/traffic_ops/app/lib/Fixtures/Integration/Staticdnsentry.pm
@@ -1,5 +1,23 @@
package Fixtures::Integration::Staticdnsentry;
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
+
+
# Do not edit! Generated code.
# See https://github.com/Comcast/traffic_control/wiki/The%20Kabletown%20example
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Fixtures/Integration/StatsSummary.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/Integration/StatsSummary.pm b/traffic_ops/app/lib/Fixtures/Integration/StatsSummary.pm
index ffa32df..9874177 100644
--- a/traffic_ops/app/lib/Fixtures/Integration/StatsSummary.pm
+++ b/traffic_ops/app/lib/Fixtures/Integration/StatsSummary.pm
@@ -1,5 +1,23 @@
package Fixtures::Integration::StatsSummary;
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
+
+
# Do not edit! Generated code.
# See https://github.com/Comcast/traffic_control/wiki/The%20Kabletown%20example
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Fixtures/Integration/Status.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/Integration/Status.pm b/traffic_ops/app/lib/Fixtures/Integration/Status.pm
index a76d4b1..de46821 100644
--- a/traffic_ops/app/lib/Fixtures/Integration/Status.pm
+++ b/traffic_ops/app/lib/Fixtures/Integration/Status.pm
@@ -1,5 +1,23 @@
package Fixtures::Integration::Status;
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
+
+
# Do not edit! Generated code.
# See https://github.com/Comcast/traffic_control/wiki/The%20Kabletown%20example
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Fixtures/Integration/TmUser.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/Integration/TmUser.pm b/traffic_ops/app/lib/Fixtures/Integration/TmUser.pm
index b45a215..0aa637a 100644
--- a/traffic_ops/app/lib/Fixtures/Integration/TmUser.pm
+++ b/traffic_ops/app/lib/Fixtures/Integration/TmUser.pm
@@ -1,5 +1,23 @@
package Fixtures::Integration::TmUser;
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
+
+
# Do not edit! Generated code.
# See https://github.com/Comcast/traffic_control/wiki/The%20Kabletown%20example
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Fixtures/Integration/ToExtension.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/Integration/ToExtension.pm b/traffic_ops/app/lib/Fixtures/Integration/ToExtension.pm
index 9333210..acea9df 100644
--- a/traffic_ops/app/lib/Fixtures/Integration/ToExtension.pm
+++ b/traffic_ops/app/lib/Fixtures/Integration/ToExtension.pm
@@ -1,5 +1,23 @@
package Fixtures::Integration::ToExtension;
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
+
+
# Do not edit! Generated code.
# See https://github.com/Comcast/traffic_control/wiki/The%20Kabletown%20example
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Fixtures/Integration/Type.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/Integration/Type.pm b/traffic_ops/app/lib/Fixtures/Integration/Type.pm
index fd2a1e8..27e52fb 100644
--- a/traffic_ops/app/lib/Fixtures/Integration/Type.pm
+++ b/traffic_ops/app/lib/Fixtures/Integration/Type.pm
@@ -1,5 +1,23 @@
package Fixtures::Integration::Type;
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
+
+
# Do not edit! Generated code.
# See https://github.com/Comcast/traffic_control/wiki/The%20Kabletown%20example
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Fixtures/Integration/gen_fixtures.pl
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/Integration/gen_fixtures.pl b/traffic_ops/app/lib/Fixtures/Integration/gen_fixtures.pl
index 936349a..79c8d77 100755
--- a/traffic_ops/app/lib/Fixtures/Integration/gen_fixtures.pl
+++ b/traffic_ops/app/lib/Fixtures/Integration/gen_fixtures.pl
@@ -1,4 +1,20 @@
#!/usr/bin/perl
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
use LWP::Simple;
use JSON qw( decode_json );
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Fixtures/Job.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/Job.pm b/traffic_ops/app/lib/Fixtures/Job.pm
index b147ca5..d64aed1 100644
--- a/traffic_ops/app/lib/Fixtures/Job.pm
+++ b/traffic_ops/app/lib/Fixtures/Job.pm
@@ -1,6 +1,5 @@
package Fixtures::Job;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Fixtures/JobAgent.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/JobAgent.pm b/traffic_ops/app/lib/Fixtures/JobAgent.pm
index 9b021f2..8ad3d7b 100644
--- a/traffic_ops/app/lib/Fixtures/JobAgent.pm
+++ b/traffic_ops/app/lib/Fixtures/JobAgent.pm
@@ -1,6 +1,5 @@
package Fixtures::JobAgent;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Fixtures/JobStatus.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/JobStatus.pm b/traffic_ops/app/lib/Fixtures/JobStatus.pm
index 67c6024..bb30cf6 100644
--- a/traffic_ops/app/lib/Fixtures/JobStatus.pm
+++ b/traffic_ops/app/lib/Fixtures/JobStatus.pm
@@ -1,6 +1,5 @@
package Fixtures::JobStatus;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Fixtures/Log.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/Log.pm b/traffic_ops/app/lib/Fixtures/Log.pm
index 544fa81..cc2d5e1 100644
--- a/traffic_ops/app/lib/Fixtures/Log.pm
+++ b/traffic_ops/app/lib/Fixtures/Log.pm
@@ -1,6 +1,5 @@
package Fixtures::Log;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Fixtures/Parameter.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/Parameter.pm b/traffic_ops/app/lib/Fixtures/Parameter.pm
index 6599529..202a8c4 100644
--- a/traffic_ops/app/lib/Fixtures/Parameter.pm
+++ b/traffic_ops/app/lib/Fixtures/Parameter.pm
@@ -1,6 +1,5 @@
package Fixtures::Parameter;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Fixtures/PhysLocation.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/PhysLocation.pm b/traffic_ops/app/lib/Fixtures/PhysLocation.pm
index 76da67b..11c191f 100644
--- a/traffic_ops/app/lib/Fixtures/PhysLocation.pm
+++ b/traffic_ops/app/lib/Fixtures/PhysLocation.pm
@@ -1,6 +1,5 @@
package Fixtures::PhysLocation;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Fixtures/Profile.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/Profile.pm b/traffic_ops/app/lib/Fixtures/Profile.pm
index da79bd4..cea8182 100644
--- a/traffic_ops/app/lib/Fixtures/Profile.pm
+++ b/traffic_ops/app/lib/Fixtures/Profile.pm
@@ -1,6 +1,5 @@
package Fixtures::Profile;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Fixtures/ProfileParameter.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/ProfileParameter.pm b/traffic_ops/app/lib/Fixtures/ProfileParameter.pm
index 20b675a..9969347 100644
--- a/traffic_ops/app/lib/Fixtures/ProfileParameter.pm
+++ b/traffic_ops/app/lib/Fixtures/ProfileParameter.pm
@@ -1,6 +1,5 @@
package Fixtures::ProfileParameter;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
[04/26] incubator-trafficcontrol git commit: merge master
Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/deliveryService/view/charts/index.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/deliveryService/view/charts/index.js b/traffic_portal/app/src/modules/private/deliveryService/view/charts/index.js
index 7e27fe7..f0856ea 100644
--- a/traffic_portal/app/src/modules/private/deliveryService/view/charts/index.js
+++ b/traffic_portal/app/src/modules/private/deliveryService/view/charts/index.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/deliveryService/view/charts/transactionsPerSecond/index.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/deliveryService/view/charts/transactionsPerSecond/index.js b/traffic_portal/app/src/modules/private/deliveryService/view/charts/transactionsPerSecond/index.js
index 60406e6..36be5f9 100644
--- a/traffic_portal/app/src/modules/private/deliveryService/view/charts/transactionsPerSecond/index.js
+++ b/traffic_portal/app/src/modules/private/deliveryService/view/charts/transactionsPerSecond/index.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/deliveryService/view/deliveryService.view.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/deliveryService/view/deliveryService.view.tpl.html b/traffic_portal/app/src/modules/private/deliveryService/view/deliveryService.view.tpl.html
index 1d92baa..9a51f63 100644
--- a/traffic_portal/app/src/modules/private/deliveryService/view/deliveryService.view.tpl.html
+++ b/traffic_portal/app/src/modules/private/deliveryService/view/deliveryService.view.tpl.html
@@ -1,6 +1,5 @@
<!--
-Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/deliveryService/view/index.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/deliveryService/view/index.js b/traffic_portal/app/src/modules/private/deliveryService/view/index.js
index 6813967..bb71dd4 100644
--- a/traffic_portal/app/src/modules/private/deliveryService/view/index.js
+++ b/traffic_portal/app/src/modules/private/deliveryService/view/index.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/deliveryService/view/overview/DeliveryServiceViewOverviewController.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/deliveryService/view/overview/DeliveryServiceViewOverviewController.js b/traffic_portal/app/src/modules/private/deliveryService/view/overview/DeliveryServiceViewOverviewController.js
index a69bf5e..e359557 100644
--- a/traffic_portal/app/src/modules/private/deliveryService/view/overview/DeliveryServiceViewOverviewController.js
+++ b/traffic_portal/app/src/modules/private/deliveryService/view/overview/DeliveryServiceViewOverviewController.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/deliveryService/view/overview/_deliveryService.view.overview.scss
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/deliveryService/view/overview/_deliveryService.view.overview.scss b/traffic_portal/app/src/modules/private/deliveryService/view/overview/_deliveryService.view.overview.scss
index 0c9af4c..cef58e6 100644
--- a/traffic_portal/app/src/modules/private/deliveryService/view/overview/_deliveryService.view.overview.scss
+++ b/traffic_portal/app/src/modules/private/deliveryService/view/overview/_deliveryService.view.overview.scss
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/deliveryService/view/overview/deliveryService.view.overview.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/deliveryService/view/overview/deliveryService.view.overview.tpl.html b/traffic_portal/app/src/modules/private/deliveryService/view/overview/deliveryService.view.overview.tpl.html
index 2c4d148..fbc3ea3 100644
--- a/traffic_portal/app/src/modules/private/deliveryService/view/overview/deliveryService.view.overview.tpl.html
+++ b/traffic_portal/app/src/modules/private/deliveryService/view/overview/deliveryService.view.overview.tpl.html
@@ -1,6 +1,5 @@
<!--
-Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/deliveryService/view/overview/detail/index.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/deliveryService/view/overview/detail/index.js b/traffic_portal/app/src/modules/private/deliveryService/view/overview/detail/index.js
index 8d8cc86..508dd00 100644
--- a/traffic_portal/app/src/modules/private/deliveryService/view/overview/detail/index.js
+++ b/traffic_portal/app/src/modules/private/deliveryService/view/overview/detail/index.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/deliveryService/view/overview/index.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/deliveryService/view/overview/index.js b/traffic_portal/app/src/modules/private/deliveryService/view/overview/index.js
index 3d7d6d6..452f37b 100644
--- a/traffic_portal/app/src/modules/private/deliveryService/view/overview/index.js
+++ b/traffic_portal/app/src/modules/private/deliveryService/view/overview/index.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/index.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/index.js b/traffic_portal/app/src/modules/private/index.js
index 44d8a98..9a71075 100644
--- a/traffic_portal/app/src/modules/private/index.js
+++ b/traffic_portal/app/src/modules/private/index.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/private.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/private.tpl.html b/traffic_portal/app/src/modules/private/private.tpl.html
index 9543121..95afc8f 100644
--- a/traffic_portal/app/src/modules/private/private.tpl.html
+++ b/traffic_portal/app/src/modules/private/private.tpl.html
@@ -1,6 +1,5 @@
<!--
-Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/user/UserController.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/user/UserController.js b/traffic_portal/app/src/modules/private/user/UserController.js
index 60717f0..34ca4e5 100644
--- a/traffic_portal/app/src/modules/private/user/UserController.js
+++ b/traffic_portal/app/src/modules/private/user/UserController.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/user/_user.scss
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/user/_user.scss b/traffic_portal/app/src/modules/private/user/_user.scss
index 640f637..ccc785b 100644
--- a/traffic_portal/app/src/modules/private/user/_user.scss
+++ b/traffic_portal/app/src/modules/private/user/_user.scss
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/user/edit/UserEditController.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/user/edit/UserEditController.js b/traffic_portal/app/src/modules/private/user/edit/UserEditController.js
index e8b30c4..4eb5cb8 100644
--- a/traffic_portal/app/src/modules/private/user/edit/UserEditController.js
+++ b/traffic_portal/app/src/modules/private/user/edit/UserEditController.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/user/edit/_user.edit.scss
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/user/edit/_user.edit.scss b/traffic_portal/app/src/modules/private/user/edit/_user.edit.scss
index 206a312..0d2d003 100644
--- a/traffic_portal/app/src/modules/private/user/edit/_user.edit.scss
+++ b/traffic_portal/app/src/modules/private/user/edit/_user.edit.scss
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/user/edit/index.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/user/edit/index.js b/traffic_portal/app/src/modules/private/user/edit/index.js
index 9b92155..9015f48 100644
--- a/traffic_portal/app/src/modules/private/user/edit/index.js
+++ b/traffic_portal/app/src/modules/private/user/edit/index.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/user/edit/user.edit.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/user/edit/user.edit.tpl.html b/traffic_portal/app/src/modules/private/user/edit/user.edit.tpl.html
index b85e45c..1687963 100644
--- a/traffic_portal/app/src/modules/private/user/edit/user.edit.tpl.html
+++ b/traffic_portal/app/src/modules/private/user/edit/user.edit.tpl.html
@@ -1,6 +1,5 @@
<!--
-Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/user/index.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/user/index.js b/traffic_portal/app/src/modules/private/user/index.js
index 8471341..934212e 100644
--- a/traffic_portal/app/src/modules/private/user/index.js
+++ b/traffic_portal/app/src/modules/private/user/index.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/user/register/UserRegisterController.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/user/register/UserRegisterController.js b/traffic_portal/app/src/modules/private/user/register/UserRegisterController.js
index e739a84..b9e4aa5 100644
--- a/traffic_portal/app/src/modules/private/user/register/UserRegisterController.js
+++ b/traffic_portal/app/src/modules/private/user/register/UserRegisterController.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/user/register/_user.register.scss
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/user/register/_user.register.scss b/traffic_portal/app/src/modules/private/user/register/_user.register.scss
index aa7787c..fff23b4 100644
--- a/traffic_portal/app/src/modules/private/user/register/_user.register.scss
+++ b/traffic_portal/app/src/modules/private/user/register/_user.register.scss
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/user/register/index.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/user/register/index.js b/traffic_portal/app/src/modules/private/user/register/index.js
index 38c6a8f..933a7ad 100644
--- a/traffic_portal/app/src/modules/private/user/register/index.js
+++ b/traffic_portal/app/src/modules/private/user/register/index.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/user/reset/UserResetController.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/user/reset/UserResetController.js b/traffic_portal/app/src/modules/private/user/reset/UserResetController.js
index d624001..24f5e12 100644
--- a/traffic_portal/app/src/modules/private/user/reset/UserResetController.js
+++ b/traffic_portal/app/src/modules/private/user/reset/UserResetController.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/user/reset/_user.reset.scss
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/user/reset/_user.reset.scss b/traffic_portal/app/src/modules/private/user/reset/_user.reset.scss
index aa7787c..fff23b4 100644
--- a/traffic_portal/app/src/modules/private/user/reset/_user.reset.scss
+++ b/traffic_portal/app/src/modules/private/user/reset/_user.reset.scss
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/user/reset/index.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/user/reset/index.js b/traffic_portal/app/src/modules/private/user/reset/index.js
index e16c357..3d4af61 100644
--- a/traffic_portal/app/src/modules/private/user/reset/index.js
+++ b/traffic_portal/app/src/modules/private/user/reset/index.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/user/user.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/user/user.tpl.html b/traffic_portal/app/src/modules/private/user/user.tpl.html
index eedf6d3..5fe0c27 100644
--- a/traffic_portal/app/src/modules/private/user/user.tpl.html
+++ b/traffic_portal/app/src/modules/private/user/user.tpl.html
@@ -1,6 +1,5 @@
<!--
-Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/public/about/AboutController.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/public/about/AboutController.js b/traffic_portal/app/src/modules/public/about/AboutController.js
index 6593a67..9fcddb1 100644
--- a/traffic_portal/app/src/modules/public/about/AboutController.js
+++ b/traffic_portal/app/src/modules/public/about/AboutController.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/public/about/_about.scss
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/public/about/_about.scss b/traffic_portal/app/src/modules/public/about/_about.scss
index c3a8f26..c372d2f 100644
--- a/traffic_portal/app/src/modules/public/about/_about.scss
+++ b/traffic_portal/app/src/modules/public/about/_about.scss
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/public/about/about.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/public/about/about.tpl.html b/traffic_portal/app/src/modules/public/about/about.tpl.html
index 159458e..16d02b7 100644
--- a/traffic_portal/app/src/modules/public/about/about.tpl.html
+++ b/traffic_portal/app/src/modules/public/about/about.tpl.html
@@ -1,6 +1,5 @@
<!--
-Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/public/about/index.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/public/about/index.js b/traffic_portal/app/src/modules/public/about/index.js
index 476fd26..3ce1f0d 100644
--- a/traffic_portal/app/src/modules/public/about/index.js
+++ b/traffic_portal/app/src/modules/public/about/index.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/public/home/HomeController.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/public/home/HomeController.js b/traffic_portal/app/src/modules/public/home/HomeController.js
index 989ced4..c4458a6 100644
--- a/traffic_portal/app/src/modules/public/home/HomeController.js
+++ b/traffic_portal/app/src/modules/public/home/HomeController.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/public/home/_home.scss
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/public/home/_home.scss b/traffic_portal/app/src/modules/public/home/_home.scss
index 23ee9fb..8e1e043 100644
--- a/traffic_portal/app/src/modules/public/home/_home.scss
+++ b/traffic_portal/app/src/modules/public/home/_home.scss
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/public/home/home.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/public/home/home.tpl.html b/traffic_portal/app/src/modules/public/home/home.tpl.html
index a270209..13c6cb0 100644
--- a/traffic_portal/app/src/modules/public/home/home.tpl.html
+++ b/traffic_portal/app/src/modules/public/home/home.tpl.html
@@ -1,6 +1,5 @@
<!--
-Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/public/home/index.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/public/home/index.js b/traffic_portal/app/src/modules/public/home/index.js
index 55c2572..75a33e0 100644
--- a/traffic_portal/app/src/modules/public/home/index.js
+++ b/traffic_portal/app/src/modules/public/home/index.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/public/home/landing/index.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/public/home/landing/index.js b/traffic_portal/app/src/modules/public/home/landing/index.js
index f8c8de9..0a90e0a 100644
--- a/traffic_portal/app/src/modules/public/home/landing/index.js
+++ b/traffic_portal/app/src/modules/public/home/landing/index.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/public/index.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/public/index.js b/traffic_portal/app/src/modules/public/index.js
index a236955..5bd8b70 100644
--- a/traffic_portal/app/src/modules/public/index.js
+++ b/traffic_portal/app/src/modules/public/index.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/public/public.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/public/public.tpl.html b/traffic_portal/app/src/modules/public/public.tpl.html
index 0dcda5d..cc9b0ef 100644
--- a/traffic_portal/app/src/modules/public/public.tpl.html
+++ b/traffic_portal/app/src/modules/public/public.tpl.html
@@ -1,6 +1,5 @@
<!--
-Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/scripts/shared-libs.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/scripts/shared-libs.js b/traffic_portal/app/src/scripts/shared-libs.js
index 6d9a81f..da55075 100755
--- a/traffic_portal/app/src/scripts/shared-libs.js
+++ b/traffic_portal/app/src/scripts/shared-libs.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/styles/main.scss
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/styles/main.scss b/traffic_portal/app/src/styles/main.scss
index e165080..64952d8 100755
--- a/traffic_portal/app/src/styles/main.scss
+++ b/traffic_portal/app/src/styles/main.scss
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/styles/variables.scss
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/styles/variables.scss b/traffic_portal/app/src/styles/variables.scss
index 8723140..3758dad 100755
--- a/traffic_portal/app/src/styles/variables.scss
+++ b/traffic_portal/app/src/styles/variables.scss
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/build/build_rpm.sh
----------------------------------------------------------------------
diff --git a/traffic_portal/build/build_rpm.sh b/traffic_portal/build/build_rpm.sh
index 1bc7681..2ce3c97 100755
--- a/traffic_portal/build/build_rpm.sh
+++ b/traffic_portal/build/build_rpm.sh
@@ -1,7 +1,6 @@
#!/bin/bash
#
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/build/traffic_portal.spec
----------------------------------------------------------------------
diff --git a/traffic_portal/build/traffic_portal.spec b/traffic_portal/build/traffic_portal.spec
index 423bc69..e0a099f 100644
--- a/traffic_portal/build/traffic_portal.spec
+++ b/traffic_portal/build/traffic_portal.spec
@@ -1,5 +1,4 @@
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/conf/config-template.js
----------------------------------------------------------------------
diff --git a/traffic_portal/conf/config-template.js b/traffic_portal/conf/config-template.js
index e4ade31..b7a715b 100644
--- a/traffic_portal/conf/config-template.js
+++ b/traffic_portal/conf/config-template.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/conf/config.js
----------------------------------------------------------------------
diff --git a/traffic_portal/conf/config.js b/traffic_portal/conf/config.js
index ed12b86..20b2c64 100644
--- a/traffic_portal/conf/config.js
+++ b/traffic_portal/conf/config.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/grunt/browserify2.js
----------------------------------------------------------------------
diff --git a/traffic_portal/grunt/browserify2.js b/traffic_portal/grunt/browserify2.js
index 1d79a52..122651d 100755
--- a/traffic_portal/grunt/browserify2.js
+++ b/traffic_portal/grunt/browserify2.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/grunt/clean.js
----------------------------------------------------------------------
diff --git a/traffic_portal/grunt/clean.js b/traffic_portal/grunt/clean.js
index 1cbcbc6..fead1ce 100755
--- a/traffic_portal/grunt/clean.js
+++ b/traffic_portal/grunt/clean.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/grunt/compass.js
----------------------------------------------------------------------
diff --git a/traffic_portal/grunt/compass.js b/traffic_portal/grunt/compass.js
index 443d271..5ec79fd 100755
--- a/traffic_portal/grunt/compass.js
+++ b/traffic_portal/grunt/compass.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/grunt/copy.js
----------------------------------------------------------------------
diff --git a/traffic_portal/grunt/copy.js b/traffic_portal/grunt/copy.js
index 5b1114b..4bee643 100755
--- a/traffic_portal/grunt/copy.js
+++ b/traffic_portal/grunt/copy.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/grunt/express.js
----------------------------------------------------------------------
diff --git a/traffic_portal/grunt/express.js b/traffic_portal/grunt/express.js
index 5d84eaf..aa76337 100644
--- a/traffic_portal/grunt/express.js
+++ b/traffic_portal/grunt/express.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/grunt/globalConfig.js
----------------------------------------------------------------------
diff --git a/traffic_portal/grunt/globalConfig.js b/traffic_portal/grunt/globalConfig.js
index 9c6bae7..9d76412 100755
--- a/traffic_portal/grunt/globalConfig.js
+++ b/traffic_portal/grunt/globalConfig.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/grunt/html2js.js
----------------------------------------------------------------------
diff --git a/traffic_portal/grunt/html2js.js b/traffic_portal/grunt/html2js.js
index 92c0a83..65760e5 100755
--- a/traffic_portal/grunt/html2js.js
+++ b/traffic_portal/grunt/html2js.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/grunt/install-dependencies.js
----------------------------------------------------------------------
diff --git a/traffic_portal/grunt/install-dependencies.js b/traffic_portal/grunt/install-dependencies.js
index 1c07426..8af5b3c 100644
--- a/traffic_portal/grunt/install-dependencies.js
+++ b/traffic_portal/grunt/install-dependencies.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/grunt/jshint.js
----------------------------------------------------------------------
diff --git a/traffic_portal/grunt/jshint.js b/traffic_portal/grunt/jshint.js
index c91195a..aa7be4a 100755
--- a/traffic_portal/grunt/jshint.js
+++ b/traffic_portal/grunt/jshint.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/grunt/ngconstant.js
----------------------------------------------------------------------
diff --git a/traffic_portal/grunt/ngconstant.js b/traffic_portal/grunt/ngconstant.js
index e042c55..356d43e 100644
--- a/traffic_portal/grunt/ngconstant.js
+++ b/traffic_portal/grunt/ngconstant.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/grunt/uglify.js
----------------------------------------------------------------------
diff --git a/traffic_portal/grunt/uglify.js b/traffic_portal/grunt/uglify.js
index b0bfb31..1150381 100755
--- a/traffic_portal/grunt/uglify.js
+++ b/traffic_portal/grunt/uglify.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/grunt/watch.js
----------------------------------------------------------------------
diff --git a/traffic_portal/grunt/watch.js b/traffic_portal/grunt/watch.js
index c9146e5..971b472 100755
--- a/traffic_portal/grunt/watch.js
+++ b/traffic_portal/grunt/watch.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/server/server.js
----------------------------------------------------------------------
diff --git a/traffic_portal/server/server.js b/traffic_portal/server/server.js
index 476c848..34789e0 100644
--- a/traffic_portal/server/server.js
+++ b/traffic_portal/server/server.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/build/build_rpm.sh
----------------------------------------------------------------------
diff --git a/traffic_router/build/build_rpm.sh b/traffic_router/build/build_rpm.sh
index 8ce156a..a7fc5ff 100755
--- a/traffic_router/build/build_rpm.sh
+++ b/traffic_router/build/build_rpm.sh
@@ -1,7 +1,6 @@
#!/bin/bash
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/build/pom.xml
----------------------------------------------------------------------
diff --git a/traffic_router/build/pom.xml b/traffic_router/build/pom.xml
index 53781fd..fc30608 100644
--- a/traffic_router/build/pom.xml
+++ b/traffic_router/build/pom.xml
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -124,7 +123,6 @@
</execution>
</executions>
<configuration>
- <copyright>2011, Comcast Converged Products</copyright>
<group>Applications/Internet</group>
<name>${project.parent.artifactId}</name>
<release>${env.GIT_REV_COUNT}.${buildNumber}.el6</release>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/configuration/pom.xml
----------------------------------------------------------------------
diff --git a/traffic_router/configuration/pom.xml b/traffic_router/configuration/pom.xml
index 7d40041..5f80e15 100644
--- a/traffic_router/configuration/pom.xml
+++ b/traffic_router/configuration/pom.xml
@@ -1,4 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/configuration/src/main/java/com/comcast/cdn/traffic_control/traffic_router/configuration/ConfigurationListener.java
----------------------------------------------------------------------
diff --git a/traffic_router/configuration/src/main/java/com/comcast/cdn/traffic_control/traffic_router/configuration/ConfigurationListener.java b/traffic_router/configuration/src/main/java/com/comcast/cdn/traffic_control/traffic_router/configuration/ConfigurationListener.java
index f0a96ea..018f7d3 100644
--- a/traffic_router/configuration/src/main/java/com/comcast/cdn/traffic_control/traffic_router/configuration/ConfigurationListener.java
+++ b/traffic_router/configuration/src/main/java/com/comcast/cdn/traffic_control/traffic_router/configuration/ConfigurationListener.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/connector/.classpath
----------------------------------------------------------------------
diff --git a/traffic_router/connector/.classpath b/traffic_router/connector/.classpath
index d09263d..1b128d7 100644
--- a/traffic_router/connector/.classpath
+++ b/traffic_router/connector/.classpath
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/connector/build/pmd/ruleset.xml
----------------------------------------------------------------------
diff --git a/traffic_router/connector/build/pmd/ruleset.xml b/traffic_router/connector/build/pmd/ruleset.xml
index b2bdf22..2ecc748 100644
--- a/traffic_router/connector/build/pmd/ruleset.xml
+++ b/traffic_router/connector/build/pmd/ruleset.xml
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/connector/pom.xml
----------------------------------------------------------------------
diff --git a/traffic_router/connector/pom.xml b/traffic_router/connector/pom.xml
index 224e630..74e0a07 100644
--- a/traffic_router/connector/pom.xml
+++ b/traffic_router/connector/pom.xml
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/LanguidPoller.java
----------------------------------------------------------------------
diff --git a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/LanguidPoller.java b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/LanguidPoller.java
index 4e366f2..cf07128 100644
--- a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/LanguidPoller.java
+++ b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/LanguidPoller.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/LanguidProtocol.java
----------------------------------------------------------------------
diff --git a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/LanguidProtocol.java b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/LanguidProtocol.java
index 1a81e54..cb624b2 100644
--- a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/LanguidProtocol.java
+++ b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/LanguidProtocol.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/RouterJsseFactory.java
----------------------------------------------------------------------
diff --git a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/RouterJsseFactory.java b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/RouterJsseFactory.java
index 22396f1..56f9dcc 100644
--- a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/RouterJsseFactory.java
+++ b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/RouterJsseFactory.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2016 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/RouterSslImplementation.java
----------------------------------------------------------------------
diff --git a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/RouterSslImplementation.java b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/RouterSslImplementation.java
index 7dc5015..a5a17c7 100644
--- a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/RouterSslImplementation.java
+++ b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/RouterSslImplementation.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2016 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/RouterSslServerSocketFactory.java
----------------------------------------------------------------------
diff --git a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/RouterSslServerSocketFactory.java b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/RouterSslServerSocketFactory.java
index a9b17e8..be6560e 100644
--- a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/RouterSslServerSocketFactory.java
+++ b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/RouterSslServerSocketFactory.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2016 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/CertificateDataConverter.java
----------------------------------------------------------------------
diff --git a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/CertificateDataConverter.java b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/CertificateDataConverter.java
index b867613..6139c82 100644
--- a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/CertificateDataConverter.java
+++ b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/CertificateDataConverter.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2016 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/CertificateDataListener.java
----------------------------------------------------------------------
diff --git a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/CertificateDataListener.java b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/CertificateDataListener.java
index 918d216..336acf7 100644
--- a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/CertificateDataListener.java
+++ b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/CertificateDataListener.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2016 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/CertificateDecoder.java
----------------------------------------------------------------------
diff --git a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/CertificateDecoder.java b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/CertificateDecoder.java
index 4a15bec..5694045 100644
--- a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/CertificateDecoder.java
+++ b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/CertificateDecoder.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2016 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/CertificateRegistry.java
----------------------------------------------------------------------
diff --git a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/CertificateRegistry.java b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/CertificateRegistry.java
index 7e2b13e..c3c7470 100644
--- a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/CertificateRegistry.java
+++ b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/CertificateRegistry.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2016 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/HandshakeData.java
----------------------------------------------------------------------
diff --git a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/HandshakeData.java b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/HandshakeData.java
index 0d60578..3e85d60 100644
--- a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/HandshakeData.java
+++ b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/HandshakeData.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2016 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/KeyManager.java
----------------------------------------------------------------------
diff --git a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/KeyManager.java b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/KeyManager.java
index 2073f1f..2eeb222 100644
--- a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/KeyManager.java
+++ b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/KeyManager.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2016 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/Pkcs.java
----------------------------------------------------------------------
diff --git a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/Pkcs.java b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/Pkcs.java
index f8683c8..7625dff 100644
--- a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/Pkcs.java
+++ b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/Pkcs.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2016 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/Pkcs1.java
----------------------------------------------------------------------
diff --git a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/Pkcs1.java b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/Pkcs1.java
index 6d8d84b..b652d92 100644
--- a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/Pkcs1.java
+++ b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/Pkcs1.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2016 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/Pkcs8.java
----------------------------------------------------------------------
diff --git a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/Pkcs8.java b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/Pkcs8.java
index a923cce..b65a826 100644
--- a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/Pkcs8.java
+++ b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/Pkcs8.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2016 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/PrivateKeyDecoder.java
----------------------------------------------------------------------
diff --git a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/PrivateKeyDecoder.java b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/PrivateKeyDecoder.java
index 29f2027..3792d85 100644
--- a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/PrivateKeyDecoder.java
+++ b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/PrivateKeyDecoder.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2016 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/tomcat/TomcatLifecycleListener.java
----------------------------------------------------------------------
diff --git a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/tomcat/TomcatLifecycleListener.java b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/tomcat/TomcatLifecycleListener.java
index 2b7851e..0abd45f 100644
--- a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/tomcat/TomcatLifecycleListener.java
+++ b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/tomcat/TomcatLifecycleListener.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2016 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/connector/src/test/java/protocol/RouterSslImplementationTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/connector/src/test/java/protocol/RouterSslImplementationTest.java b/traffic_router/connector/src/test/java/protocol/RouterSslImplementationTest.java
index 44bd224..438096a 100644
--- a/traffic_router/connector/src/test/java/protocol/RouterSslImplementationTest.java
+++ b/traffic_router/connector/src/test/java/protocol/RouterSslImplementationTest.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2016 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/connector/src/test/java/protocol/RouterSslServerSocketFactoryTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/connector/src/test/java/protocol/RouterSslServerSocketFactoryTest.java b/traffic_router/connector/src/test/java/protocol/RouterSslServerSocketFactoryTest.java
index ab9f81e..641f5d3 100644
--- a/traffic_router/connector/src/test/java/protocol/RouterSslServerSocketFactoryTest.java
+++ b/traffic_router/connector/src/test/java/protocol/RouterSslServerSocketFactoryTest.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2016 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/connector/src/test/java/secure/CertificateDataConverterTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/connector/src/test/java/secure/CertificateDataConverterTest.java b/traffic_router/connector/src/test/java/secure/CertificateDataConverterTest.java
index fa74847..6de4ae9 100644
--- a/traffic_router/connector/src/test/java/secure/CertificateDataConverterTest.java
+++ b/traffic_router/connector/src/test/java/secure/CertificateDataConverterTest.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2016 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/connector/src/test/java/secure/CertificateDataListenerTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/connector/src/test/java/secure/CertificateDataListenerTest.java b/traffic_router/connector/src/test/java/secure/CertificateDataListenerTest.java
index d71799c..f08f53d 100644
--- a/traffic_router/connector/src/test/java/secure/CertificateDataListenerTest.java
+++ b/traffic_router/connector/src/test/java/secure/CertificateDataListenerTest.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2016 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/connector/src/test/java/secure/CertificateRegistryTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/connector/src/test/java/secure/CertificateRegistryTest.java b/traffic_router/connector/src/test/java/secure/CertificateRegistryTest.java
index f83f649..555e4ab 100644
--- a/traffic_router/connector/src/test/java/secure/CertificateRegistryTest.java
+++ b/traffic_router/connector/src/test/java/secure/CertificateRegistryTest.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2016 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/connector/src/test/java/secure/KeyManagerTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/connector/src/test/java/secure/KeyManagerTest.java b/traffic_router/connector/src/test/java/secure/KeyManagerTest.java
index 3eb20f7..498b49a 100644
--- a/traffic_router/connector/src/test/java/secure/KeyManagerTest.java
+++ b/traffic_router/connector/src/test/java/secure/KeyManagerTest.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2016 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/connector/src/test/java/secure/TomcatLifecycleListenerTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/connector/src/test/java/secure/TomcatLifecycleListenerTest.java b/traffic_router/connector/src/test/java/secure/TomcatLifecycleListenerTest.java
index 6b1aa51..b20e1b5 100644
--- a/traffic_router/connector/src/test/java/secure/TomcatLifecycleListenerTest.java
+++ b/traffic_router/connector/src/test/java/secure/TomcatLifecycleListenerTest.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2016 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/build/pmd/ruleset.xml
----------------------------------------------------------------------
diff --git a/traffic_router/core/build/pmd/ruleset.xml b/traffic_router/core/build/pmd/ruleset.xml
index b72b217..dcbc791 100644
--- a/traffic_router/core/build/pmd/ruleset.xml
+++ b/traffic_router/core/build/pmd/ruleset.xml
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/pom.xml
----------------------------------------------------------------------
diff --git a/traffic_router/core/pom.xml b/traffic_router/core/pom.xml
index ea99102..f2ec0cd 100644
--- a/traffic_router/core/pom.xml
+++ b/traffic_router/core/pom.xml
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/conf/cache.properties
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/conf/cache.properties b/traffic_router/core/src/main/conf/cache.properties
index 3fca1f1..2175fb0 100644
--- a/traffic_router/core/src/main/conf/cache.properties
+++ b/traffic_router/core/src/main/conf/cache.properties
@@ -1,5 +1,4 @@
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/conf/dns.properties
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/conf/dns.properties b/traffic_router/core/src/main/conf/dns.properties
index fa5bb5b..19f06be 100644
--- a/traffic_router/core/src/main/conf/dns.properties
+++ b/traffic_router/core/src/main/conf/dns.properties
@@ -1,5 +1,4 @@
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/conf/http.properties
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/conf/http.properties b/traffic_router/core/src/main/conf/http.properties
index 8d644b5..366d566 100644
--- a/traffic_router/core/src/main/conf/http.properties
+++ b/traffic_router/core/src/main/conf/http.properties
@@ -1,5 +1,4 @@
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/conf/log4j.properties
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/conf/log4j.properties b/traffic_router/core/src/main/conf/log4j.properties
index b6d65fa..60bd5d3 100644
--- a/traffic_router/core/src/main/conf/log4j.properties
+++ b/traffic_router/core/src/main/conf/log4j.properties
@@ -1,5 +1,4 @@
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/conf/traffic_monitor.properties
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/conf/traffic_monitor.properties b/traffic_router/core/src/main/conf/traffic_monitor.properties
index d60dbd7..e044ddd 100644
--- a/traffic_router/core/src/main/conf/traffic_monitor.properties
+++ b/traffic_router/core/src/main/conf/traffic_monitor.properties
@@ -1,5 +1,4 @@
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/conf/traffic_ops.properties
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/conf/traffic_ops.properties b/traffic_router/core/src/main/conf/traffic_ops.properties
index e4e6730..1118538 100644
--- a/traffic_router/core/src/main/conf/traffic_ops.properties
+++ b/traffic_router/core/src/main/conf/traffic_ops.properties
@@ -1,5 +1,4 @@
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/etc/init.d/tomcat
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/etc/init.d/tomcat b/traffic_router/core/src/main/etc/init.d/tomcat
index 70428bf..caaff69 100644
--- a/traffic_router/core/src/main/etc/init.d/tomcat
+++ b/traffic_router/core/src/main/etc/init.d/tomcat
@@ -1,6 +1,5 @@
#!/bin/sh
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/ConsistentHashController.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/ConsistentHashController.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/ConsistentHashController.java
index d9d4c6f..42e2108 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/ConsistentHashController.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/ConsistentHashController.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2016 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/CoverageZoneController.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/CoverageZoneController.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/CoverageZoneController.java
index 9bf2840..b47743f 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/CoverageZoneController.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/CoverageZoneController.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2016 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/DeliveryServicesController.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/DeliveryServicesController.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/DeliveryServicesController.java
index 9eb2aec..4e5213b 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/DeliveryServicesController.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/DeliveryServicesController.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2016 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/LocationController.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/LocationController.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/LocationController.java
index c613d7b..78acfe9 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/LocationController.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/LocationController.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/StatsController.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/StatsController.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/StatsController.java
index 3ada1df..ed1e4c7 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/StatsController.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/StatsController.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/SteeringController.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/SteeringController.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/SteeringController.java
index e7e160c..60fbb67 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/SteeringController.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/SteeringController.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/ZonesController.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/ZonesController.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/ZonesController.java
index a2abc8f..c7f5633 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/ZonesController.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/ZonesController.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/cache/Cache.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/cache/Cache.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/cache/Cache.java
index c232a30..27a75c4 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/cache/Cache.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/cache/Cache.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/cache/CacheLocation.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/cache/CacheLocation.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/cache/CacheLocation.java
index be9942a..e2bf78d 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/cache/CacheLocation.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/cache/CacheLocation.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/cache/CacheLocationManager.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/cache/CacheLocationManager.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/cache/CacheLocationManager.java
index 2f92f56..e3de4f1 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/cache/CacheLocationManager.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/cache/CacheLocationManager.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/cache/CacheRegister.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/cache/CacheRegister.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/cache/CacheRegister.java
index ed6a963..cf13778 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/cache/CacheRegister.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/cache/CacheRegister.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/cache/InetRecord.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/cache/InetRecord.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/cache/InetRecord.java
index 2ca799a..f30dd85 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/cache/InetRecord.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/cache/InetRecord.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/cache/Resolver.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/cache/Resolver.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/cache/Resolver.java
index 98a8b65..56c25a1 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/cache/Resolver.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/cache/Resolver.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/config/CertificateChecker.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/config/CertificateChecker.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/config/CertificateChecker.java
index eb775a7..f6601c9 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/config/CertificateChecker.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/config/CertificateChecker.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2016 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/config/ConfigHandler.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/config/ConfigHandler.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/config/ConfigHandler.java
index cc84b71..ed61c56 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/config/ConfigHandler.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/config/ConfigHandler.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/config/ParseException.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/config/ParseException.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/config/ParseException.java
index 90756fc..12e7de9 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/config/ParseException.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/config/ParseException.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
[13/26] incubator-trafficcontrol git commit: merge master
Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/client/delivery_service_resources.go
----------------------------------------------------------------------
diff --git a/traffic_ops/client/delivery_service_resources.go b/traffic_ops/client/delivery_service_resources.go
new file mode 100644
index 0000000..9bccd2e
--- /dev/null
+++ b/traffic_ops/client/delivery_service_resources.go
@@ -0,0 +1,206 @@
+/*
+ Copyright 2015 Comcast Cable Communications Management, LLC
+
+ 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
+
+ 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 client
+
+// DeliveryServiceResponse ...
+type DeliveryServiceResponse struct {
+ Version string `json:"version"`
+ Response []DeliveryService `json:"response"`
+}
+
+// CreateDeliveryServiceResponse ...
+type CreateDeliveryServiceResponse struct {
+ Response DeliveryService `json:"response"`
+ Alerts []DeliveryServiceAlert `json:"alerts"`
+}
+
+// DeliveryService ...
+type DeliveryService struct {
+ ID string `json:"id"`
+ XMLID string `json:"xmlId"`
+ Active bool `json:"active"`
+ DSCP string `json:"dscp"`
+ Signed bool `json:"signed"`
+ QStringIgnore string `json:"qstringIgnore"`
+ GeoLimit string `json:"geoLimit"`
+ GeoProvider string `json:"geoProvider"`
+ HTTPBypassFQDN string `json:"httpBypassFqdn"`
+ DNSBypassIP string `json:"dnsBypassIp"`
+ DNSBypassIP6 string `json:"dnsBypassIp6"`
+ DNSBypassCname string `json:"dnsBypassCname"`
+ DNSBypassTTL string `json:"dnsBypassTtl"`
+ OrgServerFQDN string `json:"orgServerFqdn"`
+ Type string `json:"type"`
+ ProfileName string `json:"profileName"`
+ ProfileDesc string `json:"profileDescription"`
+ CDNName string `json:"cdnName"`
+ CCRDNSTTL string `json:"ccrDnsTtl"`
+ GlobalMaxMBPS string `json:"globalMaxMbps"`
+ GlobalMaxTPS string `json:"globalMaxTps"`
+ LongDesc string `json:"longDesc"`
+ LongDesc1 string `json:"longDesc1"`
+ LongDesc2 string `json:"longDesc2"`
+ MaxDNSAnswers string `json:"maxDnsAnswers"`
+ InfoURL string `json:"infoUrl"`
+ MissLat string `json:"missLat"`
+ MissLong string `json:"missLong"`
+ CheckPath string `json:"checkPath"`
+ LastUpdated string `json:"lastUpdated"`
+ Protocol string `json:"protocol"`
+ IPV6RoutingEnabled bool `json:"ipv6RoutingEnabled"`
+ RangeRequestHandling string `json:"rangeRequestHandling"`
+ HeaderRewrite string `json:"headerRewrite"`
+ EdgeHeaderRewrite string `json:"edgeHeaderRewrite"`
+ MidHeaderRewrite string `json:"midHeaderRewrite"`
+ TRResponseHeaders string `json:"trResponseHeaders"`
+ RegexRemap string `json:"regexRemap"`
+ CacheURL string `json:"cacheurl"`
+ RemapText string `json:"remapText"`
+ MultiSiteOrigin string `json:"multiSiteOrigin"`
+ DisplayName string `json:"displayName"`
+ InitialDispersion string `json:"initialDispersion"`
+ MatchList []DeliveryServiceMatch `json:"matchList,omitempty"`
+}
+
+// DeliveryServiceMatch ...
+type DeliveryServiceMatch struct {
+ Type string `json:"type"`
+ SetNumber string `json:"setNumber"`
+ Pattern string `json:"pattern"`
+}
+
+// DeliveryServiceAlert ...
+type DeliveryServiceAlert struct {
+ Level string `json:"level"`
+ Text string `json:"text"`
+}
+
+// DeliveryServiceStateResponse ...
+type DeliveryServiceStateResponse struct {
+ Response DeliveryServiceState `json:"response"`
+}
+
+// DeliveryServiceState ...
+type DeliveryServiceState struct {
+ Enabled bool `json:"enabled"`
+ Failover DeliveryServiceFailover `json:"failover"`
+}
+
+// DeliveryServiceFailover ...
+type DeliveryServiceFailover struct {
+ Locations []string `json:"locations"`
+ Destination DeliveryServiceDestination `json:"destination"`
+ Configured bool `json:"configured"`
+ Enabled bool `json:"enabled"`
+}
+
+// DeliveryServiceDestination ...
+type DeliveryServiceDestination struct {
+ Location string `json:"location"`
+ Type string `json:"type"`
+}
+
+// DeliveryServiceHealthResponse ...
+type DeliveryServiceHealthResponse struct {
+ Response DeliveryServiceHealth `json:"response"`
+}
+
+// DeliveryServiceHealth ...
+type DeliveryServiceHealth struct {
+ TotalOnline int `json:"totalOnline"`
+ TotalOffline int `json:"totalOffline"`
+ CacheGroups []DeliveryServiceCacheGroup `json:"cacheGroups"`
+}
+
+// DeliveryServiceCacheGroup ...
+type DeliveryServiceCacheGroup struct {
+ Online int `json:"online"`
+ Offline int `json:"offline"`
+ Name string `json:"name"`
+}
+
+// DeliveryServiceCapacityResponse ...
+type DeliveryServiceCapacityResponse struct {
+ Response DeliveryServiceCapacity `json:"response"`
+}
+
+// DeliveryServiceCapacity ...
+type DeliveryServiceCapacity struct {
+ AvailablePercent float64 `json:"availablePercent"`
+ UnavailablePercent float64 `json:"unavailablePercent"`
+ UtilizedPercent float64 `json:"utilizedPercent"`
+ MaintenancePercent float64 `json:"maintenancePercent"`
+}
+
+// DeliveryServiceRoutingResponse ...
+type DeliveryServiceRoutingResponse struct {
+ Response DeliveryServiceRouting `json:"response"`
+}
+
+// DeliveryServiceRouting ...
+type DeliveryServiceRouting struct {
+ StaticRoute int `json:"staticRoute"`
+ Miss int `json:"miss"`
+ Geo float64 `json:"geo"`
+ Err int `json:"err"`
+ CZ float64 `json:"cz"`
+ DSR float64 `json:"dsr"`
+ Fed int `json:"fed"`
+ RegionalAlternate int `json:"regionalAlternate"`
+ RegionalDenied int `json:"regionalDenied"`
+}
+
+// DeliveryServiceServerResponse ...
+type DeliveryServiceServerResponse struct {
+ Response []DeliveryServiceServer `json:"response"`
+ Page int `json:"page"`
+ OrderBy string `json:"orderby"`
+ Limit int `json:"limit"`
+}
+
+// DeliveryServiceServer ...
+type DeliveryServiceServer struct {
+ LastUpdated string `json:"lastUpdated"`
+ Server string `json:"server"`
+ DeliveryService string `json:"deliveryService"`
+}
+
+// DeliveryServiceSSLKeysResponse ...
+type DeliveryServiceSSLKeysResponse struct {
+ Response DeliveryServiceSSLKeys `json:"response"`
+}
+
+// DeliveryServiceSSLKeys ...
+type DeliveryServiceSSLKeys struct {
+ CDN string `json:"cdn"`
+ DeliveryService string `json:"DeliveryService"`
+ BusinessUnit string `json:"businessUnit"`
+ City string `json:"city"`
+ Organization string `json:"organization"`
+ Hostname string `json:"hostname"`
+ Country string `json:"country"`
+ State string `json:"state"`
+ Version string `json:"version"`
+ Certificate DeliveryServiceSSLKeysCertificate `json:"certificate"`
+}
+
+// DeliveryServiceSSLKeysCertificate ...
+type DeliveryServiceSSLKeysCertificate struct {
+ Crt string `json:"crt"`
+ Key string `json:"key"`
+ CSR string `json:"csr"`
+}
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/client/fixtures/cachegroup.go
----------------------------------------------------------------------
diff --git a/traffic_ops/client/fixtures/cachegroup.go b/traffic_ops/client/fixtures/cachegroup.go
index 2adb749..e6bcfd6 100644
--- a/traffic_ops/client/fixtures/cachegroup.go
+++ b/traffic_ops/client/fixtures/cachegroup.go
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -16,7 +15,7 @@
package fixtures
-import "github.com/Comcast/traffic_control/traffic_ops/client"
+import "github.com/apache/incubator-trafficcontrol/traffic_ops/client"
// Cachegroups returns a default CacheGroupResponse to be used for testing.
func Cachegroups() *client.CacheGroupResponse {
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/client/fixtures/cdn.go
----------------------------------------------------------------------
diff --git a/traffic_ops/client/fixtures/cdn.go b/traffic_ops/client/fixtures/cdn.go
index 497919f..e322ac5 100644
--- a/traffic_ops/client/fixtures/cdn.go
+++ b/traffic_ops/client/fixtures/cdn.go
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -16,7 +15,7 @@
package fixtures
-import "github.com/Comcast/traffic_control/traffic_ops/client"
+import "github.com/apache/incubator-trafficcontrol/traffic_ops/client"
// CDNs returns a default CDNResponse to be used for testing.
func CDNs() *client.CDNResponse {
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/client/fixtures/delivery_service.go
----------------------------------------------------------------------
diff --git a/traffic_ops/client/fixtures/delivery_service.go b/traffic_ops/client/fixtures/delivery_service.go
index c09ed6a..c7be07c 100644
--- a/traffic_ops/client/fixtures/delivery_service.go
+++ b/traffic_ops/client/fixtures/delivery_service.go
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -16,7 +15,7 @@
package fixtures
-import "github.com/Comcast/traffic_control/traffic_ops/client"
+import "github.com/apache/incubator-trafficcontrol/traffic_ops/client"
// DeliveryServices returns a default DeliveryServiceResponse to be used for testing.
func DeliveryServices() *client.DeliveryServiceResponse {
@@ -52,6 +51,19 @@ func DeliveryServices() *client.DeliveryServiceResponse {
}
}
+// CreateDeliveryService returns a default CreateDeliveryServiceResponse to be used for testing.
+func CreateDeliveryService() *client.CreateDeliveryServiceResponse {
+ return &client.CreateDeliveryServiceResponse{
+ Response: DeliveryServices().Response[0],
+ Alerts: []client.DeliveryServiceAlert{
+ client.DeliveryServiceAlert{
+ Level: "level",
+ Text: "text",
+ },
+ },
+ }
+}
+
// DeliveryServiceState returns a default DeliveryServiceStateResponse to be used for testing.
func DeliveryServiceState() *client.DeliveryServiceStateResponse {
dest := client.DeliveryServiceDestination{
@@ -111,7 +123,7 @@ func DeliveryServiceCapacity() *client.DeliveryServiceCapacityResponse {
// DeliveryServiceRouting returns a default DeliveryServiceRoutingResponse to be used for testing.
func DeliveryServiceRouting() *client.DeliveryServiceRoutingResponse {
- dsc := client.DeliveryServiceRouting{
+ dsr := client.DeliveryServiceRouting{
StaticRoute: 1,
Miss: 2,
Geo: 3.33,
@@ -124,6 +136,48 @@ func DeliveryServiceRouting() *client.DeliveryServiceRoutingResponse {
}
return &client.DeliveryServiceRoutingResponse{
- Response: dsc,
+ Response: dsr,
+ }
+}
+
+// DeliveryServiceServer returns a default DeliveryServiceServerResponse to be used for testing.
+func DeliveryServiceServer() *client.DeliveryServiceServerResponse {
+ dss := client.DeliveryServiceServer{
+ LastUpdated: "lastUpdated",
+ Server: "someServer",
+ DeliveryService: "someService",
+ }
+
+ return &client.DeliveryServiceServerResponse{
+ Response: []client.DeliveryServiceServer{dss},
+ Page: 1,
+ OrderBy: "foo",
+ Limit: 1,
+ }
+}
+
+// DeliveryServiceSSLKeys returns a default DeliveryServiceSSLKeysResponse to be used for testing.
+func DeliveryServiceSSLKeys() *client.DeliveryServiceSSLKeysResponse {
+ crt := client.DeliveryServiceSSLKeysCertificate{
+ Crt: "crt",
+ Key: "key",
+ CSR: "someService",
+ }
+
+ sslKeys := client.DeliveryServiceSSLKeys{
+ CDN: "cdn",
+ DeliveryService: "deliveryService",
+ Certificate: crt,
+ BusinessUnit: "businessUnit",
+ City: "city",
+ Organization: "Kabletown",
+ Hostname: "hostname",
+ Country: "country",
+ State: "state",
+ Version: "version",
+ }
+
+ return &client.DeliveryServiceSSLKeysResponse{
+ Response: sslKeys,
}
}
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/client/fixtures/hardware.go
----------------------------------------------------------------------
diff --git a/traffic_ops/client/fixtures/hardware.go b/traffic_ops/client/fixtures/hardware.go
index 7e571b6..a7069a2 100644
--- a/traffic_ops/client/fixtures/hardware.go
+++ b/traffic_ops/client/fixtures/hardware.go
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -16,7 +15,7 @@
package fixtures
-import "github.com/Comcast/traffic_control/traffic_ops/client"
+import "github.com/apache/incubator-trafficcontrol/traffic_ops/client"
// Hardware returns a default HardwareResponse to be used for testing.
func Hardware() *client.HardwareResponse {
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/client/fixtures/parameter.go
----------------------------------------------------------------------
diff --git a/traffic_ops/client/fixtures/parameter.go b/traffic_ops/client/fixtures/parameter.go
index d92621b..f946790 100644
--- a/traffic_ops/client/fixtures/parameter.go
+++ b/traffic_ops/client/fixtures/parameter.go
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -16,7 +15,7 @@
package fixtures
-import "github.com/Comcast/traffic_control/traffic_ops/client"
+import "github.com/apache/incubator-trafficcontrol/traffic_ops/client"
// Parameters returns a default ParamResponse to be used for testing.
func Parameters() *client.ParamResponse {
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/client/fixtures/profile.go
----------------------------------------------------------------------
diff --git a/traffic_ops/client/fixtures/profile.go b/traffic_ops/client/fixtures/profile.go
index 3773534..6ef2da5 100644
--- a/traffic_ops/client/fixtures/profile.go
+++ b/traffic_ops/client/fixtures/profile.go
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -16,7 +15,7 @@
package fixtures
-import "github.com/Comcast/traffic_control/traffic_ops/client"
+import "github.com/apache/incubator-trafficcontrol/traffic_ops/client"
// Profiles returns a default ProfileResponse to be used for testing.
func Profiles() *client.ProfileResponse {
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/client/fixtures/server.go
----------------------------------------------------------------------
diff --git a/traffic_ops/client/fixtures/server.go b/traffic_ops/client/fixtures/server.go
index e78e1b0..07c541a 100644
--- a/traffic_ops/client/fixtures/server.go
+++ b/traffic_ops/client/fixtures/server.go
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -16,7 +15,7 @@
package fixtures
-import "github.com/Comcast/traffic_control/traffic_ops/client"
+import "github.com/apache/incubator-trafficcontrol/traffic_ops/client"
// Servers returns a default ServerResponse to be used for testing.
func Servers() *client.ServerResponse {
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/client/fixtures/stats_summary.go
----------------------------------------------------------------------
diff --git a/traffic_ops/client/fixtures/stats_summary.go b/traffic_ops/client/fixtures/stats_summary.go
index c6997f1..bcc7470 100644
--- a/traffic_ops/client/fixtures/stats_summary.go
+++ b/traffic_ops/client/fixtures/stats_summary.go
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -16,7 +15,7 @@
package fixtures
-import "github.com/Comcast/traffic_control/traffic_ops/client"
+import "github.com/apache/incubator-trafficcontrol/traffic_ops/client"
// StatsSummary returns a default StatsSummaryResponse to be used for testing.
func StatsSummary() *client.StatsSummaryResponse {
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/client/fixtures/traffic_monitor_config.go
----------------------------------------------------------------------
diff --git a/traffic_ops/client/fixtures/traffic_monitor_config.go b/traffic_ops/client/fixtures/traffic_monitor_config.go
index 4af5f65..76efc3d 100644
--- a/traffic_ops/client/fixtures/traffic_monitor_config.go
+++ b/traffic_ops/client/fixtures/traffic_monitor_config.go
@@ -1,6 +1,26 @@
package fixtures
-import "github.com/Comcast/traffic_control/traffic_ops/client"
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
+import "github.com/apache/incubator-trafficcontrol/traffic_ops/client"
// TrafficMonitorConfig returns a default TMConfigResponse to be used for testing.
func TrafficMonitorConfig() *client.TMConfigResponse {
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/client/fixtures/traffic_router_config.go
----------------------------------------------------------------------
diff --git a/traffic_ops/client/fixtures/traffic_router_config.go b/traffic_ops/client/fixtures/traffic_router_config.go
index efb8f04..b0cac6d 100644
--- a/traffic_ops/client/fixtures/traffic_router_config.go
+++ b/traffic_ops/client/fixtures/traffic_router_config.go
@@ -1,6 +1,26 @@
package fixtures
-import "github.com/Comcast/traffic_control/traffic_ops/client"
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
+import "github.com/apache/incubator-trafficcontrol/traffic_ops/client"
// TrafficRouterConfig returns a default TRConfigResponse to be used for testing.
func TrafficRouterConfig() *client.TRConfigResponse {
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/client/fixtures/types.go
----------------------------------------------------------------------
diff --git a/traffic_ops/client/fixtures/types.go b/traffic_ops/client/fixtures/types.go
index 11160d7..9f74c59 100644
--- a/traffic_ops/client/fixtures/types.go
+++ b/traffic_ops/client/fixtures/types.go
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -16,7 +15,7 @@
package fixtures
-import "github.com/Comcast/traffic_control/traffic_ops/client"
+import "github.com/apache/incubator-trafficcontrol/traffic_ops/client"
// Types returns a default TypeResponse to be used for testing.
func Types() *client.TypeResponse {
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/client/fixtures/user.go
----------------------------------------------------------------------
diff --git a/traffic_ops/client/fixtures/user.go b/traffic_ops/client/fixtures/user.go
index 2575ca0..39bf775 100644
--- a/traffic_ops/client/fixtures/user.go
+++ b/traffic_ops/client/fixtures/user.go
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -16,7 +15,7 @@
package fixtures
-import "github.com/Comcast/traffic_control/traffic_ops/client"
+import "github.com/apache/incubator-trafficcontrol/traffic_ops/client"
// Users returns a default UserResponse to be used for testing.
func Users() *client.UserResponse {
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/client/hardware.go
----------------------------------------------------------------------
diff --git a/traffic_ops/client/hardware.go b/traffic_ops/client/hardware.go
index 8fbc01a..4bdf124 100644
--- a/traffic_ops/client/hardware.go
+++ b/traffic_ops/client/hardware.go
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/client/parameter.go
----------------------------------------------------------------------
diff --git a/traffic_ops/client/parameter.go b/traffic_ops/client/parameter.go
index e55fe2b..72b2f16 100644
--- a/traffic_ops/client/parameter.go
+++ b/traffic_ops/client/parameter.go
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/client/profile.go
----------------------------------------------------------------------
diff --git a/traffic_ops/client/profile.go b/traffic_ops/client/profile.go
index f4df1ed..4ef640c 100644
--- a/traffic_ops/client/profile.go
+++ b/traffic_ops/client/profile.go
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/client/server.go
----------------------------------------------------------------------
diff --git a/traffic_ops/client/server.go b/traffic_ops/client/server.go
index 1f4d12b..227f9d2 100644
--- a/traffic_ops/client/server.go
+++ b/traffic_ops/client/server.go
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/client/stats_summary.go
----------------------------------------------------------------------
diff --git a/traffic_ops/client/stats_summary.go b/traffic_ops/client/stats_summary.go
index 54dabed..1c5df48 100644
--- a/traffic_ops/client/stats_summary.go
+++ b/traffic_ops/client/stats_summary.go
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
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
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/client/tests/cachegroup_test.go
----------------------------------------------------------------------
diff --git a/traffic_ops/client/tests/cachegroup_test.go b/traffic_ops/client/tests/cachegroup_test.go
index 10cac61..aa343a4 100644
--- a/traffic_ops/client/tests/cachegroup_test.go
+++ b/traffic_ops/client/tests/cachegroup_test.go
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -20,8 +19,8 @@ import (
"net/http"
"testing"
- "github.com/Comcast/traffic_control/traffic_ops/client"
- "github.com/Comcast/traffic_control/traffic_ops/client/fixtures"
+ "github.com/apache/incubator-trafficcontrol/traffic_ops/client"
+ "github.com/apache/incubator-trafficcontrol/traffic_ops/client/fixtures"
"github.com/jheitz200/test_helper"
)
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/client/tests/cdn_test.go
----------------------------------------------------------------------
diff --git a/traffic_ops/client/tests/cdn_test.go b/traffic_ops/client/tests/cdn_test.go
index 977fbbc..bec59a0 100644
--- a/traffic_ops/client/tests/cdn_test.go
+++ b/traffic_ops/client/tests/cdn_test.go
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -20,8 +19,8 @@ import (
"net/http"
"testing"
- "github.com/Comcast/traffic_control/traffic_ops/client"
- "github.com/Comcast/traffic_control/traffic_ops/client/fixtures"
+ "github.com/apache/incubator-trafficcontrol/traffic_ops/client"
+ "github.com/apache/incubator-trafficcontrol/traffic_ops/client/fixtures"
"github.com/jheitz200/test_helper"
)
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/client/tests/delivery_service_test.go
----------------------------------------------------------------------
diff --git a/traffic_ops/client/tests/delivery_service_test.go b/traffic_ops/client/tests/delivery_service_test.go
index 595639d..45336b1 100644
--- a/traffic_ops/client/tests/delivery_service_test.go
+++ b/traffic_ops/client/tests/delivery_service_test.go
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -20,8 +19,8 @@ import (
"net/http"
"testing"
- "github.com/Comcast/traffic_control/traffic_ops/client"
- "github.com/Comcast/traffic_control/traffic_ops/client/fixtures"
+ "github.com/apache/incubator-trafficcontrol/traffic_ops/client"
+ "github.com/apache/incubator-trafficcontrol/traffic_ops/client/fixtures"
"github.com/jheitz200/test_helper"
)
@@ -139,6 +138,54 @@ func TestDeliveryServiceUnauthorized(t *testing.T) {
}
}
+func TestCreateDeliveryService(t *testing.T) {
+ resp := fixtures.CreateDeliveryService()
+ server := testHelper.ValidHTTPServer(resp)
+ defer server.Close()
+
+ var httpClient http.Client
+ to := client.Session{
+ URL: server.URL,
+ UserAgent: &httpClient,
+ }
+
+ testHelper.Context(t, "Given the need to test a successful Traffic Ops request to create a DeliveryService")
+
+ ds, err := to.CreateDeliveryService(&client.DeliveryService{})
+ if err != nil {
+ testHelper.Error(t, "Should be able to make a request to Traffic Ops")
+ } else {
+ testHelper.Success(t, "Should be able to make a request to Traffic Ops")
+ }
+
+ actual := ds.Response.ID
+ if actual != "001" {
+ testHelper.Error(t, "Should get back \"001\" for \"Response.ID\", got: %s", actual)
+ } else {
+ testHelper.Success(t, "Should get back \"0001\" for \"Response.ID\"")
+ }
+}
+
+func TestCreateDeliveryServiceUnauthorized(t *testing.T) {
+ server := testHelper.InvalidHTTPServer(http.StatusUnauthorized)
+ defer server.Close()
+
+ var httpClient http.Client
+ to := client.Session{
+ URL: server.URL,
+ UserAgent: &httpClient,
+ }
+
+ testHelper.Context(t, "Given the need to test a failed Traffic Ops request to create a DeliveryService")
+
+ _, err := to.CreateDeliveryService(&client.DeliveryService{})
+ if err == nil {
+ testHelper.Error(t, "Should not be able to make a request to Traffic Ops")
+ } else {
+ testHelper.Success(t, "Should not be able to make a request to Traffic Ops")
+ }
+}
+
func TestDeliveryServiceState(t *testing.T) {
resp := fixtures.DeliveryServiceState()
server := testHelper.ValidHTTPServer(resp)
@@ -356,3 +403,168 @@ func TestDeliveryServiceRoutingUnauthorized(t *testing.T) {
testHelper.Success(t, "Should not be able to make a request to Traffic Ops")
}
}
+
+func TestDeliveryServiceServer(t *testing.T) {
+ resp := fixtures.DeliveryServiceServer()
+ server := testHelper.ValidHTTPServer(resp)
+ defer server.Close()
+
+ var httpClient http.Client
+ to := client.Session{
+ URL: server.URL,
+ UserAgent: &httpClient,
+ }
+
+ testHelper.Context(t, "Given the need to test a successful Traffic Ops request for a DeliveryServiceServer")
+
+ s, err := to.DeliveryServiceServer("1", "1")
+ if err != nil {
+ testHelper.Error(t, "Should be able to make a request to Traffic Ops")
+ } else {
+ testHelper.Success(t, "Should be able to make a request to Traffic Ops")
+ }
+
+ if s[0].LastUpdated != "lastUpdated" {
+ testHelper.Error(t, "Should get back \"lastUpdated\" for \"LastUpdated\", got: %s", s[0].LastUpdated)
+ } else {
+ testHelper.Success(t, "Should get back \"lastUpdated\" for \"LastUpdated\"")
+ }
+
+ if s[0].Server != "someServer" {
+ testHelper.Error(t, "Should get back \"someServer\" for \"Server\", got: %s", s[0].Server)
+ } else {
+ testHelper.Success(t, "Should get back \"someServer\" for \"Server\"")
+ }
+
+ if s[0].DeliveryService != "someService" {
+ testHelper.Error(t, "Should get back \"someService\" for \"DeliveryService\", got: %s", s[0].DeliveryService)
+ } else {
+ testHelper.Success(t, "Should get back \"someService\" for \"DeliveryService\"")
+ }
+}
+
+func TestDeliveryServiceServerUnauthorized(t *testing.T) {
+ server := testHelper.InvalidHTTPServer(http.StatusUnauthorized)
+ defer server.Close()
+
+ var httpClient http.Client
+ to := client.Session{
+ URL: server.URL,
+ UserAgent: &httpClient,
+ }
+
+ testHelper.Context(t, "Given the need to test a failed Traffic Ops request for a DeliveryServiceServer")
+
+ _, err := to.DeliveryServiceServer("1", "1")
+ if err == nil {
+ testHelper.Error(t, "Should not be able to make a request to Traffic Ops")
+ } else {
+ testHelper.Success(t, "Should not be able to make a request to Traffic Ops")
+ }
+}
+
+func TestDeliveryServiceSSLKeysByID(t *testing.T) {
+ resp := fixtures.DeliveryServiceSSLKeys()
+ server := testHelper.ValidHTTPServer(resp)
+ defer server.Close()
+
+ var httpClient http.Client
+ to := client.Session{
+ URL: server.URL,
+ UserAgent: &httpClient,
+ }
+
+ testHelper.Context(t, "Given the need to test a successful Traffic Ops request for a DeliveryServiceSSLKeysByID")
+
+ ssl, err := to.DeliveryServiceSSLKeysByID("123")
+ if err != nil {
+ testHelper.Error(t, "Should be able to make a request to Traffic Ops")
+ } else {
+ testHelper.Success(t, "Should be able to make a request to Traffic Ops")
+ }
+
+ if ssl.Certificate.Crt != "crt" {
+ testHelper.Error(t, "Should get back \"crt\" for \"Certificte.Crt\", got: %s", ssl.Certificate.Crt)
+ } else {
+ testHelper.Success(t, "Should get back \"crt\" for \"Certificate.Crt\"")
+ }
+
+ if ssl.Organization != "Kabletown" {
+ testHelper.Error(t, "Should get back \"Kabletown\" for \"Organization\", got: %s", ssl.Organization)
+ } else {
+ testHelper.Success(t, "Should get back \"Kabletown\" for \"Organization\"")
+ }
+}
+
+func TestDeliveryServiceSSLKeysByIDUnauthorized(t *testing.T) {
+ server := testHelper.InvalidHTTPServer(http.StatusUnauthorized)
+ defer server.Close()
+
+ var httpClient http.Client
+ to := client.Session{
+ URL: server.URL,
+ UserAgent: &httpClient,
+ }
+
+ testHelper.Context(t, "Given the need to test a failed Traffic Ops request for a DeliveryServiceSSLKeysByID")
+
+ _, err := to.DeliveryServiceSSLKeysByID("123")
+ if err == nil {
+ testHelper.Error(t, "Should not be able to make a request to Traffic Ops")
+ } else {
+ testHelper.Success(t, "Should not be able to make a request to Traffic Ops")
+ }
+}
+
+func TestDeliveryServiceSSLKeysByHostname(t *testing.T) {
+ resp := fixtures.DeliveryServiceSSLKeys()
+ server := testHelper.ValidHTTPServer(resp)
+ defer server.Close()
+
+ var httpClient http.Client
+ to := client.Session{
+ URL: server.URL,
+ UserAgent: &httpClient,
+ }
+
+ testHelper.Context(t, "Given the need to test a successful Traffic Ops request for a DeliveryServiceSSLKeysByHostname")
+
+ ssl, err := to.DeliveryServiceSSLKeysByHostname("hostname")
+ if err != nil {
+ testHelper.Error(t, "Should be able to make a request to Traffic Ops")
+ } else {
+ testHelper.Success(t, "Should be able to make a request to Traffic Ops")
+ }
+
+ if ssl.Certificate.Crt != "crt" {
+ testHelper.Error(t, "Should get back \"crt\" for \"Certificte.Crt\", got: %s", ssl.Certificate.Crt)
+ } else {
+ testHelper.Success(t, "Should get back \"crt\" for \"Certificate.Crt\"")
+ }
+
+ if ssl.Organization != "Kabletown" {
+ testHelper.Error(t, "Should get back \"Kabletown\" for \"Organization\", got: %s", ssl.Organization)
+ } else {
+ testHelper.Success(t, "Should get back \"Kabletown\" for \"Organization\"")
+ }
+}
+
+func TestDeliveryServiceSSLKeysByHostnameUnauthorized(t *testing.T) {
+ server := testHelper.InvalidHTTPServer(http.StatusUnauthorized)
+ defer server.Close()
+
+ var httpClient http.Client
+ to := client.Session{
+ URL: server.URL,
+ UserAgent: &httpClient,
+ }
+
+ testHelper.Context(t, "Given the need to test a failed Traffic Ops request for a DeliveryServiceSSLKeysByHostname")
+
+ _, err := to.DeliveryServiceSSLKeysByHostname("hostname")
+ if err == nil {
+ testHelper.Error(t, "Should not be able to make a request to Traffic Ops")
+ } else {
+ testHelper.Success(t, "Should not be able to make a request to Traffic Ops")
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/client/tests/hardware_test.go
----------------------------------------------------------------------
diff --git a/traffic_ops/client/tests/hardware_test.go b/traffic_ops/client/tests/hardware_test.go
index 3b85ff6..140601a 100644
--- a/traffic_ops/client/tests/hardware_test.go
+++ b/traffic_ops/client/tests/hardware_test.go
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -20,8 +19,8 @@ import (
"net/http"
"testing"
- "github.com/Comcast/traffic_control/traffic_ops/client"
- "github.com/Comcast/traffic_control/traffic_ops/client/fixtures"
+ "github.com/apache/incubator-trafficcontrol/traffic_ops/client"
+ "github.com/apache/incubator-trafficcontrol/traffic_ops/client/fixtures"
"github.com/jheitz200/test_helper"
)
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/client/tests/parameter_test.go
----------------------------------------------------------------------
diff --git a/traffic_ops/client/tests/parameter_test.go b/traffic_ops/client/tests/parameter_test.go
index 78de24e..f837445 100644
--- a/traffic_ops/client/tests/parameter_test.go
+++ b/traffic_ops/client/tests/parameter_test.go
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -20,8 +19,8 @@ import (
"net/http"
"testing"
- "github.com/Comcast/traffic_control/traffic_ops/client"
- "github.com/Comcast/traffic_control/traffic_ops/client/fixtures"
+ "github.com/apache/incubator-trafficcontrol/traffic_ops/client"
+ "github.com/apache/incubator-trafficcontrol/traffic_ops/client/fixtures"
"github.com/jheitz200/test_helper"
)
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/client/tests/profile_test.go
----------------------------------------------------------------------
diff --git a/traffic_ops/client/tests/profile_test.go b/traffic_ops/client/tests/profile_test.go
index 600f97e..3b9cc7f 100644
--- a/traffic_ops/client/tests/profile_test.go
+++ b/traffic_ops/client/tests/profile_test.go
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -20,8 +19,8 @@ import (
"net/http"
"testing"
- "github.com/Comcast/traffic_control/traffic_ops/client"
- "github.com/Comcast/traffic_control/traffic_ops/client/fixtures"
+ "github.com/apache/incubator-trafficcontrol/traffic_ops/client"
+ "github.com/apache/incubator-trafficcontrol/traffic_ops/client/fixtures"
"github.com/jheitz200/test_helper"
)
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/client/tests/server_test.go
----------------------------------------------------------------------
diff --git a/traffic_ops/client/tests/server_test.go b/traffic_ops/client/tests/server_test.go
index 76e355c..793c34c 100644
--- a/traffic_ops/client/tests/server_test.go
+++ b/traffic_ops/client/tests/server_test.go
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -21,8 +20,8 @@ import (
"net/url"
"testing"
- "github.com/Comcast/traffic_control/traffic_ops/client"
- "github.com/Comcast/traffic_control/traffic_ops/client/fixtures"
+ "github.com/apache/incubator-trafficcontrol/traffic_ops/client"
+ "github.com/apache/incubator-trafficcontrol/traffic_ops/client/fixtures"
"github.com/jheitz200/test_helper"
)
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/client/tests/stats_summary_test.go
----------------------------------------------------------------------
diff --git a/traffic_ops/client/tests/stats_summary_test.go b/traffic_ops/client/tests/stats_summary_test.go
index 35d5ff6..7e677a3 100644
--- a/traffic_ops/client/tests/stats_summary_test.go
+++ b/traffic_ops/client/tests/stats_summary_test.go
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -20,8 +19,8 @@ import (
"net/http"
"testing"
- "github.com/Comcast/traffic_control/traffic_ops/client"
- "github.com/Comcast/traffic_control/traffic_ops/client/fixtures"
+ "github.com/apache/incubator-trafficcontrol/traffic_ops/client"
+ "github.com/apache/incubator-trafficcontrol/traffic_ops/client/fixtures"
"github.com/jheitz200/test_helper"
)
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/client/tests/traffic_monitor_config_test.go
----------------------------------------------------------------------
diff --git a/traffic_ops/client/tests/traffic_monitor_config_test.go b/traffic_ops/client/tests/traffic_monitor_config_test.go
index c6d2b99..fd792a8 100644
--- a/traffic_ops/client/tests/traffic_monitor_config_test.go
+++ b/traffic_ops/client/tests/traffic_monitor_config_test.go
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -20,8 +19,8 @@ import (
"net/http"
"testing"
- "github.com/Comcast/traffic_control/traffic_ops/client"
- "github.com/Comcast/traffic_control/traffic_ops/client/fixtures"
+ "github.com/apache/incubator-trafficcontrol/traffic_ops/client"
+ "github.com/apache/incubator-trafficcontrol/traffic_ops/client/fixtures"
"github.com/jheitz200/test_helper"
)
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/client/tests/traffic_ops_test.go
----------------------------------------------------------------------
diff --git a/traffic_ops/client/tests/traffic_ops_test.go b/traffic_ops/client/tests/traffic_ops_test.go
index 92ff73e..a9dae06 100644
--- a/traffic_ops/client/tests/traffic_ops_test.go
+++ b/traffic_ops/client/tests/traffic_ops_test.go
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -20,7 +19,7 @@ import (
"net/http"
"testing"
- "github.com/Comcast/traffic_control/traffic_ops/client"
+ "github.com/apache/incubator-trafficcontrol/traffic_ops/client"
"github.com/jheitz200/test_helper"
)
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/client/tests/traffic_router_config_test.go
----------------------------------------------------------------------
diff --git a/traffic_ops/client/tests/traffic_router_config_test.go b/traffic_ops/client/tests/traffic_router_config_test.go
index 8784836..ea34581 100644
--- a/traffic_ops/client/tests/traffic_router_config_test.go
+++ b/traffic_ops/client/tests/traffic_router_config_test.go
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -20,8 +19,8 @@ import (
"net/http"
"testing"
- "github.com/Comcast/traffic_control/traffic_ops/client"
- "github.com/Comcast/traffic_control/traffic_ops/client/fixtures"
+ "github.com/apache/incubator-trafficcontrol/traffic_ops/client"
+ "github.com/apache/incubator-trafficcontrol/traffic_ops/client/fixtures"
"github.com/jheitz200/test_helper"
)
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/client/tests/type_test.go
----------------------------------------------------------------------
diff --git a/traffic_ops/client/tests/type_test.go b/traffic_ops/client/tests/type_test.go
index 13b0f8c..e4d8a43 100644
--- a/traffic_ops/client/tests/type_test.go
+++ b/traffic_ops/client/tests/type_test.go
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -20,8 +19,8 @@ import (
"net/http"
"testing"
- "github.com/Comcast/traffic_control/traffic_ops/client"
- "github.com/Comcast/traffic_control/traffic_ops/client/fixtures"
+ "github.com/apache/incubator-trafficcontrol/traffic_ops/client"
+ "github.com/apache/incubator-trafficcontrol/traffic_ops/client/fixtures"
"github.com/jheitz200/test_helper"
)
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/client/tests/user_test.go
----------------------------------------------------------------------
diff --git a/traffic_ops/client/tests/user_test.go b/traffic_ops/client/tests/user_test.go
index c9c92d6..d684770 100644
--- a/traffic_ops/client/tests/user_test.go
+++ b/traffic_ops/client/tests/user_test.go
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -20,8 +19,8 @@ import (
"net/http"
"testing"
- "github.com/Comcast/traffic_control/traffic_ops/client"
- "github.com/Comcast/traffic_control/traffic_ops/client/fixtures"
+ "github.com/apache/incubator-trafficcontrol/traffic_ops/client"
+ "github.com/apache/incubator-trafficcontrol/traffic_ops/client/fixtures"
"github.com/jheitz200/test_helper"
)
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/client/traffic_monitor_config.go
----------------------------------------------------------------------
diff --git a/traffic_ops/client/traffic_monitor_config.go b/traffic_ops/client/traffic_monitor_config.go
index b7c5e1e..04e7a8a 100644
--- a/traffic_ops/client/traffic_monitor_config.go
+++ b/traffic_ops/client/traffic_monitor_config.go
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/client/traffic_ops.go
----------------------------------------------------------------------
diff --git a/traffic_ops/client/traffic_ops.go b/traffic_ops/client/traffic_ops.go
index d834493..9095481 100644
--- a/traffic_ops/client/traffic_ops.go
+++ b/traffic_ops/client/traffic_ops.go
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/client/traffic_router_config.go
----------------------------------------------------------------------
diff --git a/traffic_ops/client/traffic_router_config.go b/traffic_ops/client/traffic_router_config.go
index d68888b..aecd72d 100644
--- a/traffic_ops/client/traffic_router_config.go
+++ b/traffic_ops/client/traffic_router_config.go
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/client/type.go
----------------------------------------------------------------------
diff --git a/traffic_ops/client/type.go b/traffic_ops/client/type.go
index e463148..288952c 100644
--- a/traffic_ops/client/type.go
+++ b/traffic_ops/client/type.go
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/client/user.go
----------------------------------------------------------------------
diff --git a/traffic_ops/client/user.go b/traffic_ops/client/user.go
index 6c1f397..2d508c3 100644
--- a/traffic_ops/client/user.go
+++ b/traffic_ops/client/user.go
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/etc/init.d/traffic_ops
----------------------------------------------------------------------
diff --git a/traffic_ops/etc/init.d/traffic_ops b/traffic_ops/etc/init.d/traffic_ops
index eae3772..d3090d5 100755
--- a/traffic_ops/etc/init.d/traffic_ops
+++ b/traffic_ops/etc/init.d/traffic_ops
@@ -1,6 +1,5 @@
#!/bin/bash
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/etc/logrotate.d/traffic_ops
----------------------------------------------------------------------
diff --git a/traffic_ops/etc/logrotate.d/traffic_ops b/traffic_ops/etc/logrotate.d/traffic_ops
index a34531c..f087f92 100644
--- a/traffic_ops/etc/logrotate.d/traffic_ops
+++ b/traffic_ops/etc/logrotate.d/traffic_ops
@@ -1,5 +1,4 @@
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/etc/logrotate.d/traffic_ops_access
----------------------------------------------------------------------
diff --git a/traffic_ops/etc/logrotate.d/traffic_ops_access b/traffic_ops/etc/logrotate.d/traffic_ops_access
index 046b395..658e3ea 100644
--- a/traffic_ops/etc/logrotate.d/traffic_ops_access
+++ b/traffic_ops/etc/logrotate.d/traffic_ops_access
@@ -1,5 +1,4 @@
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ats_config/ats_config.go
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ats_config/ats_config.go b/traffic_ops/experimental/ats_config/ats_config.go
index 00175a9..f15d16d 100644
--- a/traffic_ops/experimental/ats_config/ats_config.go
+++ b/traffic_ops/experimental/ats_config/ats_config.go
@@ -1,4 +1,3 @@
-// Copyright 2015 Comcast Cable Communications Management, LLC
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ats_config/ats_config_cli.go
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ats_config/ats_config_cli.go b/traffic_ops/experimental/ats_config/ats_config_cli.go
index 1532b95..410c8f6 100644
--- a/traffic_ops/experimental/ats_config/ats_config_cli.go
+++ b/traffic_ops/experimental/ats_config/ats_config_cli.go
@@ -1,4 +1,3 @@
-// Copyright 2015 Comcast Cable Communications Management, LLC
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ats_config/config_files/config_files.go
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ats_config/config_files/config_files.go b/traffic_ops/experimental/ats_config/config_files/config_files.go
index 8925a6c..4f5878c 100644
--- a/traffic_ops/experimental/ats_config/config_files/config_files.go
+++ b/traffic_ops/experimental/ats_config/config_files/config_files.go
@@ -1,4 +1,3 @@
-// Copyright 2015 Comcast Cable Communications Management, LLC
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ats_config/traffic_ops/traffic_ops.go
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ats_config/traffic_ops/traffic_ops.go b/traffic_ops/experimental/ats_config/traffic_ops/traffic_ops.go
index 4b3cbe7..e970e40 100644
--- a/traffic_ops/experimental/ats_config/traffic_ops/traffic_ops.go
+++ b/traffic_ops/experimental/ats_config/traffic_ops/traffic_ops.go
@@ -1,4 +1,3 @@
-// Copyright 2015 Comcast Cable Communications Management, LLC
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/postgrest/Postgrest_Dockerfile_run.sh
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/postgrest/Postgrest_Dockerfile_run.sh b/traffic_ops/experimental/postgrest/Postgrest_Dockerfile_run.sh
index 9444f00..d69a525 100755
--- a/traffic_ops/experimental/postgrest/Postgrest_Dockerfile_run.sh
+++ b/traffic_ops/experimental/postgrest/Postgrest_Dockerfile_run.sh
@@ -1,4 +1,20 @@
#!/bin/bash
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
# Script for running the Dockerfile for Traffic Ops PostgREST
# The Dockerfile sets up a Docker image which can be used for any new Traffic Ops PostgREST container;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/server/api/api.go
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/server/api/api.go b/traffic_ops/experimental/server/api/api.go
index f9852ed..db78c2f 100644
--- a/traffic_ops/experimental/server/api/api.go
+++ b/traffic_ops/experimental/server/api/api.go
@@ -1,4 +1,3 @@
-// Copyright 2015 Comcast Cable Communications Management, LLC
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/server/api/asn_test.go
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/server/api/asn_test.go b/traffic_ops/experimental/server/api/asn_test.go
index 2db1eb1..893c6b5 100644
--- a/traffic_ops/experimental/server/api/asn_test.go
+++ b/traffic_ops/experimental/server/api/asn_test.go
@@ -1,4 +1,3 @@
-// Copyright 2015 Comcast Cable Communications Management, LLC
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/server/api/asns.go
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/server/api/asns.go b/traffic_ops/experimental/server/api/asns.go
index 991718f..a576c18 100644
--- a/traffic_ops/experimental/server/api/asns.go
+++ b/traffic_ops/experimental/server/api/asns.go
@@ -1,4 +1,3 @@
-// Copyright 2015 Comcast Cable Communications Management, LLC
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/server/api/cachegroups.go
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/server/api/cachegroups.go b/traffic_ops/experimental/server/api/cachegroups.go
index c735ecd..0e30008 100644
--- a/traffic_ops/experimental/server/api/cachegroups.go
+++ b/traffic_ops/experimental/server/api/cachegroups.go
@@ -1,4 +1,3 @@
-// Copyright 2015 Comcast Cable Communications Management, LLC
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/server/api/cachegroups_parameters.go
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/server/api/cachegroups_parameters.go b/traffic_ops/experimental/server/api/cachegroups_parameters.go
index 518c0aa..62c3694 100644
--- a/traffic_ops/experimental/server/api/cachegroups_parameters.go
+++ b/traffic_ops/experimental/server/api/cachegroups_parameters.go
@@ -1,4 +1,3 @@
-// Copyright 2015 Comcast Cable Communications Management, LLC
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/server/api/cachegroups_types.go
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/server/api/cachegroups_types.go b/traffic_ops/experimental/server/api/cachegroups_types.go
index 3fa53b2..5f7c0f8 100644
--- a/traffic_ops/experimental/server/api/cachegroups_types.go
+++ b/traffic_ops/experimental/server/api/cachegroups_types.go
@@ -1,4 +1,3 @@
-// Copyright 2015 Comcast Cable Communications Management, LLC
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/server/api/cdns.go
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/server/api/cdns.go b/traffic_ops/experimental/server/api/cdns.go
index edfa29c..408f200 100644
--- a/traffic_ops/experimental/server/api/cdns.go
+++ b/traffic_ops/experimental/server/api/cdns.go
@@ -1,4 +1,3 @@
-// Copyright 2015 Comcast Cable Communications Management, LLC
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/server/api/crconfig_snapshots.go
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/server/api/crconfig_snapshots.go b/traffic_ops/experimental/server/api/crconfig_snapshots.go
index b4f43be..f0ad8c8 100644
--- a/traffic_ops/experimental/server/api/crconfig_snapshots.go
+++ b/traffic_ops/experimental/server/api/crconfig_snapshots.go
@@ -1,4 +1,3 @@
-// Copyright 2015 Comcast Cable Communications Management, LLC
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/server/api/deliveryservices.go
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/server/api/deliveryservices.go b/traffic_ops/experimental/server/api/deliveryservices.go
index 517bbe0..fdb19a6 100644
--- a/traffic_ops/experimental/server/api/deliveryservices.go
+++ b/traffic_ops/experimental/server/api/deliveryservices.go
@@ -1,4 +1,3 @@
-// Copyright 2015 Comcast Cable Communications Management, LLC
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/server/api/deliveryservices_regexes.go
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/server/api/deliveryservices_regexes.go b/traffic_ops/experimental/server/api/deliveryservices_regexes.go
index 13ca65b..1e899cd 100644
--- a/traffic_ops/experimental/server/api/deliveryservices_regexes.go
+++ b/traffic_ops/experimental/server/api/deliveryservices_regexes.go
@@ -1,4 +1,3 @@
-// Copyright 2015 Comcast Cable Communications Management, LLC
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/server/api/deliveryservices_servers.go
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/server/api/deliveryservices_servers.go b/traffic_ops/experimental/server/api/deliveryservices_servers.go
index c0697a8..8aff5e1 100644
--- a/traffic_ops/experimental/server/api/deliveryservices_servers.go
+++ b/traffic_ops/experimental/server/api/deliveryservices_servers.go
@@ -1,4 +1,3 @@
-// Copyright 2015 Comcast Cable Communications Management, LLC
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/server/api/deliveryservices_types.go
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/server/api/deliveryservices_types.go b/traffic_ops/experimental/server/api/deliveryservices_types.go
index d41ed00..6c20202 100644
--- a/traffic_ops/experimental/server/api/deliveryservices_types.go
+++ b/traffic_ops/experimental/server/api/deliveryservices_types.go
@@ -1,4 +1,3 @@
-// Copyright 2015 Comcast Cable Communications Management, LLC
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/server/api/deliveryservices_users.go
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/server/api/deliveryservices_users.go b/traffic_ops/experimental/server/api/deliveryservices_users.go
index 7794ffb..41fe3d8 100644
--- a/traffic_ops/experimental/server/api/deliveryservices_users.go
+++ b/traffic_ops/experimental/server/api/deliveryservices_users.go
@@ -1,4 +1,3 @@
-// Copyright 2015 Comcast Cable Communications Management, LLC
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/server/api/divisions.go
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/server/api/divisions.go b/traffic_ops/experimental/server/api/divisions.go
index ca5dc52..241485d 100644
--- a/traffic_ops/experimental/server/api/divisions.go
+++ b/traffic_ops/experimental/server/api/divisions.go
@@ -1,4 +1,3 @@
-// Copyright 2015 Comcast Cable Communications Management, LLC
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/server/api/domains.go
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/server/api/domains.go b/traffic_ops/experimental/server/api/domains.go
index b515a35..58c688d 100644
--- a/traffic_ops/experimental/server/api/domains.go
+++ b/traffic_ops/experimental/server/api/domains.go
@@ -1,4 +1,3 @@
-// Copyright 2015 Comcast Cable Communications Management, LLC
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/server/api/extensions.go
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/server/api/extensions.go b/traffic_ops/experimental/server/api/extensions.go
index 456e928..9785777 100644
--- a/traffic_ops/experimental/server/api/extensions.go
+++ b/traffic_ops/experimental/server/api/extensions.go
@@ -1,4 +1,3 @@
-// Copyright 2015 Comcast Cable Communications Management, LLC
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/server/api/extensions_types.go
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/server/api/extensions_types.go b/traffic_ops/experimental/server/api/extensions_types.go
index 03064ac..384ea13 100644
--- a/traffic_ops/experimental/server/api/extensions_types.go
+++ b/traffic_ops/experimental/server/api/extensions_types.go
@@ -1,4 +1,3 @@
-// Copyright 2015 Comcast Cable Communications Management, LLC
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/server/api/federation_resolvers.go
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/server/api/federation_resolvers.go b/traffic_ops/experimental/server/api/federation_resolvers.go
index 8df552f..983888c 100644
--- a/traffic_ops/experimental/server/api/federation_resolvers.go
+++ b/traffic_ops/experimental/server/api/federation_resolvers.go
@@ -1,4 +1,3 @@
-// Copyright 2015 Comcast Cable Communications Management, LLC
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/server/api/federation_users.go
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/server/api/federation_users.go b/traffic_ops/experimental/server/api/federation_users.go
index d0792ab..8f1d32b 100644
--- a/traffic_ops/experimental/server/api/federation_users.go
+++ b/traffic_ops/experimental/server/api/federation_users.go
@@ -1,4 +1,3 @@
-// Copyright 2015 Comcast Cable Communications Management, LLC
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/server/api/federations.go
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/server/api/federations.go b/traffic_ops/experimental/server/api/federations.go
index 7bb832f..f8433a8 100644
--- a/traffic_ops/experimental/server/api/federations.go
+++ b/traffic_ops/experimental/server/api/federations.go
@@ -1,4 +1,3 @@
-// Copyright 2015 Comcast Cable Communications Management, LLC
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/server/api/federations_deliveryservices.go
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/server/api/federations_deliveryservices.go b/traffic_ops/experimental/server/api/federations_deliveryservices.go
index 5a83861..4e2df94 100644
--- a/traffic_ops/experimental/server/api/federations_deliveryservices.go
+++ b/traffic_ops/experimental/server/api/federations_deliveryservices.go
@@ -1,4 +1,3 @@
-// Copyright 2015 Comcast Cable Communications Management, LLC
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/server/api/federations_federation_resolvers.go
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/server/api/federations_federation_resolvers.go b/traffic_ops/experimental/server/api/federations_federation_resolvers.go
index 74deb92..dd24ce4 100644
--- a/traffic_ops/experimental/server/api/federations_federation_resolvers.go
+++ b/traffic_ops/experimental/server/api/federations_federation_resolvers.go
@@ -1,4 +1,3 @@
-// Copyright 2015 Comcast Cable Communications Management, LLC
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/server/api/goose_db_version.go
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/server/api/goose_db_version.go b/traffic_ops/experimental/server/api/goose_db_version.go
index f7470cd..1b76890 100644
--- a/traffic_ops/experimental/server/api/goose_db_version.go
+++ b/traffic_ops/experimental/server/api/goose_db_version.go
@@ -1,4 +1,3 @@
-// Copyright 2015 Comcast Cable Communications Management, LLC
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/server/api/log.go
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/server/api/log.go b/traffic_ops/experimental/server/api/log.go
index 6dce712..8975238 100644
--- a/traffic_ops/experimental/server/api/log.go
+++ b/traffic_ops/experimental/server/api/log.go
@@ -1,4 +1,3 @@
-// Copyright 2015 Comcast Cable Communications Management, LLC
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/server/api/parameters.go
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/server/api/parameters.go b/traffic_ops/experimental/server/api/parameters.go
index 2b2f360..57abe34 100644
--- a/traffic_ops/experimental/server/api/parameters.go
+++ b/traffic_ops/experimental/server/api/parameters.go
@@ -1,4 +1,3 @@
-// Copyright 2015 Comcast Cable Communications Management, LLC
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/server/api/phys_locations.go
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/server/api/phys_locations.go b/traffic_ops/experimental/server/api/phys_locations.go
index 3151d16..a5c6ef8 100644
--- a/traffic_ops/experimental/server/api/phys_locations.go
+++ b/traffic_ops/experimental/server/api/phys_locations.go
@@ -1,4 +1,3 @@
-// Copyright 2015 Comcast Cable Communications Management, LLC
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/server/api/profiles.go
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/server/api/profiles.go b/traffic_ops/experimental/server/api/profiles.go
index 653ed09..c380a05 100644
--- a/traffic_ops/experimental/server/api/profiles.go
+++ b/traffic_ops/experimental/server/api/profiles.go
@@ -1,4 +1,3 @@
-// Copyright 2015 Comcast Cable Communications Management, LLC
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/server/api/profiles_parameters.go
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/server/api/profiles_parameters.go b/traffic_ops/experimental/server/api/profiles_parameters.go
index 1551450..d90bd35 100644
--- a/traffic_ops/experimental/server/api/profiles_parameters.go
+++ b/traffic_ops/experimental/server/api/profiles_parameters.go
@@ -1,4 +1,3 @@
-// Copyright 2015 Comcast Cable Communications Management, LLC
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/server/api/regexes.go
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/server/api/regexes.go b/traffic_ops/experimental/server/api/regexes.go
index 701a3c0..e64baea 100644
--- a/traffic_ops/experimental/server/api/regexes.go
+++ b/traffic_ops/experimental/server/api/regexes.go
@@ -1,4 +1,3 @@
-// Copyright 2015 Comcast Cable Communications Management, LLC
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/server/api/regexes_types.go
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/server/api/regexes_types.go b/traffic_ops/experimental/server/api/regexes_types.go
index 3f4d064..beddf27 100644
--- a/traffic_ops/experimental/server/api/regexes_types.go
+++ b/traffic_ops/experimental/server/api/regexes_types.go
@@ -1,4 +1,3 @@
-// Copyright 2015 Comcast Cable Communications Management, LLC
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/server/api/regions.go
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/server/api/regions.go b/traffic_ops/experimental/server/api/regions.go
index f168683..49ce66a 100644
--- a/traffic_ops/experimental/server/api/regions.go
+++ b/traffic_ops/experimental/server/api/regions.go
@@ -1,4 +1,3 @@
-// Copyright 2015 Comcast Cable Communications Management, LLC
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/server/api/roles.go
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/server/api/roles.go b/traffic_ops/experimental/server/api/roles.go
index e857a0a..396a718 100644
--- a/traffic_ops/experimental/server/api/roles.go
+++ b/traffic_ops/experimental/server/api/roles.go
@@ -1,4 +1,3 @@
-// Copyright 2015 Comcast Cable Communications Management, LLC
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/server/api/server_byname.go
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/server/api/server_byname.go b/traffic_ops/experimental/server/api/server_byname.go
index 3d219e2..cb082aa 100644
--- a/traffic_ops/experimental/server/api/server_byname.go
+++ b/traffic_ops/experimental/server/api/server_byname.go
@@ -1,4 +1,3 @@
-// Copyright 2015 Comcast Cable Communications Management, LLC
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/server/api/servers.go
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/server/api/servers.go b/traffic_ops/experimental/server/api/servers.go
index 20580f9..5a7c409 100644
--- a/traffic_ops/experimental/server/api/servers.go
+++ b/traffic_ops/experimental/server/api/servers.go
@@ -1,4 +1,3 @@
-// Copyright 2015 Comcast Cable Communications Management, LLC
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/server/api/servers_types.go
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/server/api/servers_types.go b/traffic_ops/experimental/server/api/servers_types.go
index 1fdebda..f3663f0 100644
--- a/traffic_ops/experimental/server/api/servers_types.go
+++ b/traffic_ops/experimental/server/api/servers_types.go
@@ -1,4 +1,3 @@
-// Copyright 2015 Comcast Cable Communications Management, LLC
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/server/api/snapshot_crconfig.go
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/server/api/snapshot_crconfig.go b/traffic_ops/experimental/server/api/snapshot_crconfig.go
index 8de0a2e..a888506 100644
--- a/traffic_ops/experimental/server/api/snapshot_crconfig.go
+++ b/traffic_ops/experimental/server/api/snapshot_crconfig.go
@@ -1,4 +1,3 @@
-// Copyright 2015 Comcast Cable Communications Management, LLC
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/server/api/staticdnsentries.go
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/server/api/staticdnsentries.go b/traffic_ops/experimental/server/api/staticdnsentries.go
index b1628bd..4acab90 100644
--- a/traffic_ops/experimental/server/api/staticdnsentries.go
+++ b/traffic_ops/experimental/server/api/staticdnsentries.go
@@ -1,4 +1,3 @@
-// Copyright 2015 Comcast Cable Communications Management, LLC
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/server/api/staticdnsentries_types.go
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/server/api/staticdnsentries_types.go b/traffic_ops/experimental/server/api/staticdnsentries_types.go
index 6dfada8..f8547a2 100644
--- a/traffic_ops/experimental/server/api/staticdnsentries_types.go
+++ b/traffic_ops/experimental/server/api/staticdnsentries_types.go
@@ -1,4 +1,3 @@
-// Copyright 2015 Comcast Cable Communications Management, LLC
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/server/api/stats_summary.go
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/server/api/stats_summary.go b/traffic_ops/experimental/server/api/stats_summary.go
index 40e840b..20d7fcd 100644
--- a/traffic_ops/experimental/server/api/stats_summary.go
+++ b/traffic_ops/experimental/server/api/stats_summary.go
@@ -1,4 +1,3 @@
-// Copyright 2015 Comcast Cable Communications Management, LLC
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/server/api/statuses.go
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/server/api/statuses.go b/traffic_ops/experimental/server/api/statuses.go
index 592661a..7a6d260 100644
--- a/traffic_ops/experimental/server/api/statuses.go
+++ b/traffic_ops/experimental/server/api/statuses.go
@@ -1,4 +1,3 @@
-// Copyright 2015 Comcast Cable Communications Management, LLC
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/server/api/users.go
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/server/api/users.go b/traffic_ops/experimental/server/api/users.go
index 92b454e..5adf3c5 100644
--- a/traffic_ops/experimental/server/api/users.go
+++ b/traffic_ops/experimental/server/api/users.go
@@ -1,4 +1,3 @@
-// Copyright 2015 Comcast Cable Communications Management, LLC
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/server/auth/auth.go
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/server/auth/auth.go b/traffic_ops/experimental/server/auth/auth.go
index c0c48db..157c968 100644
--- a/traffic_ops/experimental/server/auth/auth.go
+++ b/traffic_ops/experimental/server/auth/auth.go
@@ -1,4 +1,3 @@
-// Copyright 2015 Comcast Cable Communications Management, LLC
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/server/client/client/client.go
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/server/client/client/client.go b/traffic_ops/experimental/server/client/client/client.go
index 038293a..71dfac8 100644
--- a/traffic_ops/experimental/server/client/client/client.go
+++ b/traffic_ops/experimental/server/client/client/client.go
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/server/client/main.go
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/server/client/main.go b/traffic_ops/experimental/server/client/main.go
index c648713..48d5620 100644
--- a/traffic_ops/experimental/server/client/main.go
+++ b/traffic_ops/experimental/server/client/main.go
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/server/crconfig/crconfig.go
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/server/crconfig/crconfig.go b/traffic_ops/experimental/server/crconfig/crconfig.go
index 5dcf8a3..b49e957 100644
--- a/traffic_ops/experimental/server/crconfig/crconfig.go
+++ b/traffic_ops/experimental/server/crconfig/crconfig.go
@@ -1,4 +1,3 @@
-// Copyright 2015 Comcast Cable Communications Management, LLC
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/server/csconfig/csconfig.go
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/server/csconfig/csconfig.go b/traffic_ops/experimental/server/csconfig/csconfig.go
index cda2115..cf24527 100644
--- a/traffic_ops/experimental/server/csconfig/csconfig.go
+++ b/traffic_ops/experimental/server/csconfig/csconfig.go
@@ -1,4 +1,3 @@
-// Copyright 2015 Comcast Cable Communications Management, LLC
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/server/db/init.go
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/server/db/init.go b/traffic_ops/experimental/server/db/init.go
index dfa53ad..06aa530 100644
--- a/traffic_ops/experimental/server/db/init.go
+++ b/traffic_ops/experimental/server/db/init.go
@@ -1,4 +1,3 @@
-// Copyright 2015 Comcast Cable Communications Management, LLC
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/server/main.go
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/server/main.go b/traffic_ops/experimental/server/main.go
index 1ce9719..8b3f284 100644
--- a/traffic_ops/experimental/server/main.go
+++ b/traffic_ops/experimental/server/main.go
@@ -1,4 +1,3 @@
-// Copyright 2015 Comcast Cable Communications Management, LLC
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
[02/26] incubator-trafficcontrol git commit: merge master
Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/scripts/preinstall.sh
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/scripts/preinstall.sh b/traffic_router/core/src/main/scripts/preinstall.sh
index c990231..1bbc476 100644
--- a/traffic_router/core/src/main/scripts/preinstall.sh
+++ b/traffic_router/core/src/main/scripts/preinstall.sh
@@ -1,6 +1,5 @@
#!/bin/bash#
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/scripts/preremove.sh
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/scripts/preremove.sh b/traffic_router/core/src/main/scripts/preremove.sh
index 5cc1813..7a19bfa 100644
--- a/traffic_router/core/src/main/scripts/preremove.sh
+++ b/traffic_router/core/src/main/scripts/preremove.sh
@@ -1,6 +1,5 @@
#
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/webapp/WEB-INF/applicationContext.xml
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/webapp/WEB-INF/applicationContext.xml b/traffic_router/core/src/main/webapp/WEB-INF/applicationContext.xml
index 6374bc1..b8d8824 100644
--- a/traffic_router/core/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/traffic_router/core/src/main/webapp/WEB-INF/applicationContext.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/webapp/WEB-INF/status-servlet.xml
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/webapp/WEB-INF/status-servlet.xml b/traffic_router/core/src/main/webapp/WEB-INF/status-servlet.xml
index a096e53..ecbc51f 100644
--- a/traffic_router/core/src/main/webapp/WEB-INF/status-servlet.xml
+++ b/traffic_router/core/src/main/webapp/WEB-INF/status-servlet.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/webapp/WEB-INF/web.xml b/traffic_router/core/src/main/webapp/WEB-INF/web.xml
index cd2af36..0373a27 100644
--- a/traffic_router/core/src/main/webapp/WEB-INF/web.xml
+++ b/traffic_router/core/src/main/webapp/WEB-INF/web.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/webapp/clientaccesspolicy.xml
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/webapp/clientaccesspolicy.xml b/traffic_router/core/src/main/webapp/clientaccesspolicy.xml
index 9ce5a29..ea7d6a1 100644
--- a/traffic_router/core/src/main/webapp/clientaccesspolicy.xml
+++ b/traffic_router/core/src/main/webapp/clientaccesspolicy.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/webapp/crossdomain.xml
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/webapp/crossdomain.xml b/traffic_router/core/src/main/webapp/crossdomain.xml
index 1d41f31..5410adf 100644
--- a/traffic_router/core/src/main/webapp/crossdomain.xml
+++ b/traffic_router/core/src/main/webapp/crossdomain.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/webapp/index.html
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/webapp/index.html b/traffic_router/core/src/main/webapp/index.html
index 0d8de48..4e35356 100644
--- a/traffic_router/core/src/main/webapp/index.html
+++ b/traffic_router/core/src/main/webapp/index.html
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/test/conf/cache.properties
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/test/conf/cache.properties b/traffic_router/core/src/test/conf/cache.properties
index 7ee785d..7803dfc 100644
--- a/traffic_router/core/src/test/conf/cache.properties
+++ b/traffic_router/core/src/test/conf/cache.properties
@@ -1,5 +1,4 @@
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/CatalinaTrafficRouter.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/CatalinaTrafficRouter.java b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/CatalinaTrafficRouter.java
index 9de9f33..e9f0a4f 100644
--- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/CatalinaTrafficRouter.java
+++ b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/CatalinaTrafficRouter.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/TestBase.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/TestBase.java b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/TestBase.java
index eca396c..11953b5 100644
--- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/TestBase.java
+++ b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/TestBase.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/TrafficRouterStart.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/TrafficRouterStart.java b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/TrafficRouterStart.java
index ad336e9..9340da7 100644
--- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/TrafficRouterStart.java
+++ b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/TrafficRouterStart.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/cache/CacheRegisterTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/cache/CacheRegisterTest.java b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/cache/CacheRegisterTest.java
index d39a147..72100f8 100644
--- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/cache/CacheRegisterTest.java
+++ b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/cache/CacheRegisterTest.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/config/CertificateCheckerTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/config/CertificateCheckerTest.java b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/config/CertificateCheckerTest.java
index 076bb20..7e4e27e 100644
--- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/config/CertificateCheckerTest.java
+++ b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/config/CertificateCheckerTest.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2016 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/config/ConfigHandlerTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/config/ConfigHandlerTest.java b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/config/ConfigHandlerTest.java
index 2eb3bad..0fde4a5 100644
--- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/config/ConfigHandlerTest.java
+++ b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/config/ConfigHandlerTest.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/DNSAccessEventBuilderTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/DNSAccessEventBuilderTest.java b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/DNSAccessEventBuilderTest.java
index d177efd..ad757c8 100644
--- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/DNSAccessEventBuilderTest.java
+++ b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/DNSAccessEventBuilderTest.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/DNSExceptionTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/DNSExceptionTest.java b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/DNSExceptionTest.java
index 5972fad..83fd67a 100644
--- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/DNSExceptionTest.java
+++ b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/DNSExceptionTest.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/NameServerMainTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/NameServerMainTest.java b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/NameServerMainTest.java
index e75069f..40d5ba6 100644
--- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/NameServerMainTest.java
+++ b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/NameServerMainTest.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/ZoneManagerTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/ZoneManagerTest.java b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/ZoneManagerTest.java
index 4c8fcbc..ac097ed 100644
--- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/ZoneManagerTest.java
+++ b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/ZoneManagerTest.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/ZoneManagerUnitTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/ZoneManagerUnitTest.java b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/ZoneManagerUnitTest.java
index 3cb2a94..9183180 100644
--- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/ZoneManagerUnitTest.java
+++ b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/ZoneManagerUnitTest.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/protocol/AbstractProtocolTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/protocol/AbstractProtocolTest.java b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/protocol/AbstractProtocolTest.java
index b5ab55e..cdb7691 100644
--- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/protocol/AbstractProtocolTest.java
+++ b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/protocol/AbstractProtocolTest.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/protocol/TCPTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/protocol/TCPTest.java b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/protocol/TCPTest.java
index 5e03927..af35f4f 100644
--- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/protocol/TCPTest.java
+++ b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/protocol/TCPTest.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/protocol/UDPTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/protocol/UDPTest.java b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/protocol/UDPTest.java
index 8bd9d6f..10a172d 100644
--- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/protocol/UDPTest.java
+++ b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/protocol/UDPTest.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/DeliveryServiceMatcherTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/DeliveryServiceMatcherTest.java b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/DeliveryServiceMatcherTest.java
index 8272fd5..71d589b 100644
--- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/DeliveryServiceMatcherTest.java
+++ b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/DeliveryServiceMatcherTest.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/DeliveryServiceTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/DeliveryServiceTest.java b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/DeliveryServiceTest.java
index caf6d73..12eb15c 100644
--- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/DeliveryServiceTest.java
+++ b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/DeliveryServiceTest.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/SteeringRegistryTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/SteeringRegistryTest.java b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/SteeringRegistryTest.java
index 43ecabe..2cd38d2 100644
--- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/SteeringRegistryTest.java
+++ b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/SteeringRegistryTest.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/ConsistentHashTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/ConsistentHashTest.java b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/ConsistentHashTest.java
index a42efaa..e6b6859 100644
--- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/ConsistentHashTest.java
+++ b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/ConsistentHashTest.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2016 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/CoverageZoneTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/CoverageZoneTest.java b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/CoverageZoneTest.java
index e435edb..6b6c01d 100644
--- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/CoverageZoneTest.java
+++ b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/CoverageZoneTest.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2016 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/DeliveryServicesTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/DeliveryServicesTest.java b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/DeliveryServicesTest.java
index 57c5521..54adfb9 100644
--- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/DeliveryServicesTest.java
+++ b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/DeliveryServicesTest.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2016 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/ExternalTestSuite.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/ExternalTestSuite.java b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/ExternalTestSuite.java
index 1d861f3..6b6956c 100644
--- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/ExternalTestSuite.java
+++ b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/ExternalTestSuite.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/HttpDataServer.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/HttpDataServer.java b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/HttpDataServer.java
index ff0698b..3929a7a 100644
--- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/HttpDataServer.java
+++ b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/HttpDataServer.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/LocationsTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/LocationsTest.java b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/LocationsTest.java
index d71b68f..6bc7a52 100644
--- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/LocationsTest.java
+++ b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/LocationsTest.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/RouterTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/RouterTest.java b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/RouterTest.java
index d889a3e..0e504ae 100644
--- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/RouterTest.java
+++ b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/RouterTest.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/StatsTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/StatsTest.java b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/StatsTest.java
index 8be685e..006419d 100644
--- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/StatsTest.java
+++ b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/StatsTest.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/SteeringTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/SteeringTest.java b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/SteeringTest.java
index 32e68bf..c5240d4 100644
--- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/SteeringTest.java
+++ b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/SteeringTest.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2016 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/ZonesTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/ZonesTest.java b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/ZonesTest.java
index 97ea347..615ad00 100644
--- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/ZonesTest.java
+++ b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/ZonesTest.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/hashing/BinarySearchTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/hashing/BinarySearchTest.java b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/hashing/BinarySearchTest.java
index c6760ee..e4b4e7a 100644
--- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/hashing/BinarySearchTest.java
+++ b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/hashing/BinarySearchTest.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2016 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/hashing/ConsistentHasherTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/hashing/ConsistentHasherTest.java b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/hashing/ConsistentHasherTest.java
index 8e4a4d1..7e4dc60 100644
--- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/hashing/ConsistentHasherTest.java
+++ b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/hashing/ConsistentHasherTest.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2016 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/hashing/HashableTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/hashing/HashableTest.java b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/hashing/HashableTest.java
index bdf402c..5213c01 100644
--- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/hashing/HashableTest.java
+++ b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/hashing/HashableTest.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2016 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/hashing/NumberSearcherTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/hashing/NumberSearcherTest.java b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/hashing/NumberSearcherTest.java
index abf9ea1..8d83522 100644
--- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/hashing/NumberSearcherTest.java
+++ b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/hashing/NumberSearcherTest.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2016 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/http/HTTPAccessEventBuilderTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/http/HTTPAccessEventBuilderTest.java b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/http/HTTPAccessEventBuilderTest.java
index c023325..4a4d9d2 100644
--- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/http/HTTPAccessEventBuilderTest.java
+++ b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/http/HTTPAccessEventBuilderTest.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/CoverageZoneTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/CoverageZoneTest.java b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/CoverageZoneTest.java
index 135c557..1e7523a 100644
--- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/CoverageZoneTest.java
+++ b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/CoverageZoneTest.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2016 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/FederationMappingBuilderTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/FederationMappingBuilderTest.java b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/FederationMappingBuilderTest.java
index 9720cb8..e2a529c 100644
--- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/FederationMappingBuilderTest.java
+++ b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/FederationMappingBuilderTest.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/FederationRegistryTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/FederationRegistryTest.java b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/FederationRegistryTest.java
index 47a6c3e..63e67b7 100644
--- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/FederationRegistryTest.java
+++ b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/FederationRegistryTest.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/FederationsBuilderTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/FederationsBuilderTest.java b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/FederationsBuilderTest.java
index 38f4d84..841b36a 100644
--- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/FederationsBuilderTest.java
+++ b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/FederationsBuilderTest.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/GeoTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/GeoTest.java b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/GeoTest.java
index 130d6df..3ef4ccc 100644
--- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/GeoTest.java
+++ b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/GeoTest.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/MaxmindGeoIP2Test.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/MaxmindGeoIP2Test.java b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/MaxmindGeoIP2Test.java
index 4378814..b307f4c 100644
--- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/MaxmindGeoIP2Test.java
+++ b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/MaxmindGeoIP2Test.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/MaxmindGeolocationServiceTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/MaxmindGeolocationServiceTest.java b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/MaxmindGeolocationServiceTest.java
index d84a956..15c7ef1 100644
--- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/MaxmindGeolocationServiceTest.java
+++ b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/MaxmindGeolocationServiceTest.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/NetworkNodeTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/NetworkNodeTest.java b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/NetworkNodeTest.java
index 625640d..a84728c 100644
--- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/NetworkNodeTest.java
+++ b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/NetworkNodeTest.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/NetworkNodeUnitTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/NetworkNodeUnitTest.java b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/NetworkNodeUnitTest.java
index bfdfed2..5947d4e 100644
--- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/NetworkNodeUnitTest.java
+++ b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/NetworkNodeUnitTest.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoRuleTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoRuleTest.java b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoRuleTest.java
index 09c0c46..2be1a8f 100644
--- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoRuleTest.java
+++ b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoRuleTest.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Cisco Systems, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoTest.java b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoTest.java
index eede364..900fd1c 100644
--- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoTest.java
+++ b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoTest.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Cisco Systems, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/request/RequestMatcherTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/request/RequestMatcherTest.java b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/request/RequestMatcherTest.java
index 1fc7f6d..6fb7b1a 100644
--- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/request/RequestMatcherTest.java
+++ b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/request/RequestMatcherTest.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/router/CacheLocationComparatorTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/router/CacheLocationComparatorTest.java b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/router/CacheLocationComparatorTest.java
index b7650e3..9dd3389 100644
--- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/router/CacheLocationComparatorTest.java
+++ b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/router/CacheLocationComparatorTest.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/router/CacheRegisterBuilder.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/router/CacheRegisterBuilder.java b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/router/CacheRegisterBuilder.java
index e6ceeb4..75982ce 100644
--- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/router/CacheRegisterBuilder.java
+++ b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/router/CacheRegisterBuilder.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/router/DNSRoutingMissesTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/router/DNSRoutingMissesTest.java b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/router/DNSRoutingMissesTest.java
index 92483b9..defb056 100644
--- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/router/DNSRoutingMissesTest.java
+++ b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/router/DNSRoutingMissesTest.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/router/DeliveryServiceHTTPRoutingMissesTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/router/DeliveryServiceHTTPRoutingMissesTest.java b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/router/DeliveryServiceHTTPRoutingMissesTest.java
index b5de3fd..afd9115 100644
--- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/router/DeliveryServiceHTTPRoutingMissesTest.java
+++ b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/router/DeliveryServiceHTTPRoutingMissesTest.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/router/DnsNameGenerator.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/router/DnsNameGenerator.java b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/router/DnsNameGenerator.java
index 2123742..16b7edd 100644
--- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/router/DnsNameGenerator.java
+++ b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/router/DnsNameGenerator.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/router/StatelessTrafficRouterTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/router/StatelessTrafficRouterTest.java b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/router/StatelessTrafficRouterTest.java
index 8482b7e..704b4d1 100644
--- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/router/StatelessTrafficRouterTest.java
+++ b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/router/StatelessTrafficRouterTest.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/router/TrafficRouterHTTPRoutingMissesTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/router/TrafficRouterHTTPRoutingMissesTest.java b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/router/TrafficRouterHTTPRoutingMissesTest.java
index 1b8a97a..2ca2394 100644
--- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/router/TrafficRouterHTTPRoutingMissesTest.java
+++ b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/router/TrafficRouterHTTPRoutingMissesTest.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/router/TrafficRouterTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/router/TrafficRouterTest.java b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/router/TrafficRouterTest.java
index 8ce77f8..345db17 100644
--- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/router/TrafficRouterTest.java
+++ b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/router/TrafficRouterTest.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/secure/CertificatesClientTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/secure/CertificatesClientTest.java b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/secure/CertificatesClientTest.java
index a4361ca..68f277a 100644
--- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/secure/CertificatesClientTest.java
+++ b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/secure/CertificatesClientTest.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2016 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/secure/Pkcs1Test.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/secure/Pkcs1Test.java b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/secure/Pkcs1Test.java
index 780105b..d86f228 100644
--- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/secure/Pkcs1Test.java
+++ b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/secure/Pkcs1Test.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2016 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/util/ComparableStringByLengthTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/util/ComparableStringByLengthTest.java b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/util/ComparableStringByLengthTest.java
index 37b241a..0be1f6a 100644
--- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/util/ComparableStringByLengthTest.java
+++ b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/util/ComparableStringByLengthTest.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/util/ExternalTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/util/ExternalTest.java b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/util/ExternalTest.java
index 1071818..ae6cdea 100644
--- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/util/ExternalTest.java
+++ b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/util/ExternalTest.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/util/FetcherTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/util/FetcherTest.java b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/util/FetcherTest.java
index 4ccde29..452709d 100644
--- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/util/FetcherTest.java
+++ b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/util/FetcherTest.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/util/IntegrationTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/util/IntegrationTest.java b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/util/IntegrationTest.java
index 4f5dc3a..a3dcc1b 100644
--- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/util/IntegrationTest.java
+++ b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/util/IntegrationTest.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/geolocation/pom.xml
----------------------------------------------------------------------
diff --git a/traffic_router/geolocation/pom.xml b/traffic_router/geolocation/pom.xml
index ea7ff27..c2d6224 100644
--- a/traffic_router/geolocation/pom.xml
+++ b/traffic_router/geolocation/pom.xml
@@ -1,4 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/geolocation/src/main/java/com/comcast/cdn/traffic_control/traffic_router/geolocation/Geolocation.java
----------------------------------------------------------------------
diff --git a/traffic_router/geolocation/src/main/java/com/comcast/cdn/traffic_control/traffic_router/geolocation/Geolocation.java b/traffic_router/geolocation/src/main/java/com/comcast/cdn/traffic_control/traffic_router/geolocation/Geolocation.java
index 5eb0e85..a2f5ffa 100644
--- a/traffic_router/geolocation/src/main/java/com/comcast/cdn/traffic_control/traffic_router/geolocation/Geolocation.java
+++ b/traffic_router/geolocation/src/main/java/com/comcast/cdn/traffic_control/traffic_router/geolocation/Geolocation.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/geolocation/src/main/java/com/comcast/cdn/traffic_control/traffic_router/geolocation/GeolocationException.java
----------------------------------------------------------------------
diff --git a/traffic_router/geolocation/src/main/java/com/comcast/cdn/traffic_control/traffic_router/geolocation/GeolocationException.java b/traffic_router/geolocation/src/main/java/com/comcast/cdn/traffic_control/traffic_router/geolocation/GeolocationException.java
index a5c53d9..cc22ef5 100644
--- a/traffic_router/geolocation/src/main/java/com/comcast/cdn/traffic_control/traffic_router/geolocation/GeolocationException.java
+++ b/traffic_router/geolocation/src/main/java/com/comcast/cdn/traffic_control/traffic_router/geolocation/GeolocationException.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/geolocation/src/main/java/com/comcast/cdn/traffic_control/traffic_router/geolocation/GeolocationService.java
----------------------------------------------------------------------
diff --git a/traffic_router/geolocation/src/main/java/com/comcast/cdn/traffic_control/traffic_router/geolocation/GeolocationService.java b/traffic_router/geolocation/src/main/java/com/comcast/cdn/traffic_control/traffic_router/geolocation/GeolocationService.java
index 1e7b1a5..5aa3bfa 100644
--- a/traffic_router/geolocation/src/main/java/com/comcast/cdn/traffic_control/traffic_router/geolocation/GeolocationService.java
+++ b/traffic_router/geolocation/src/main/java/com/comcast/cdn/traffic_control/traffic_router/geolocation/GeolocationService.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/geolocation/src/test/java/geolocation/GeolocationTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/geolocation/src/test/java/geolocation/GeolocationTest.java b/traffic_router/geolocation/src/test/java/geolocation/GeolocationTest.java
index f26c6df..2f639c0 100644
--- a/traffic_router/geolocation/src/test/java/geolocation/GeolocationTest.java
+++ b/traffic_router/geolocation/src/test/java/geolocation/GeolocationTest.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/neustar/pom.xml
----------------------------------------------------------------------
diff --git a/traffic_router/neustar/pom.xml b/traffic_router/neustar/pom.xml
index 4a6d54f..002467c 100644
--- a/traffic_router/neustar/pom.xml
+++ b/traffic_router/neustar/pom.xml
@@ -1,4 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/neustar/src/main/java/com/comcast/cdn/traffic_control/traffic_router/neustar/NeustarGeolocationService.java
----------------------------------------------------------------------
diff --git a/traffic_router/neustar/src/main/java/com/comcast/cdn/traffic_control/traffic_router/neustar/NeustarGeolocationService.java b/traffic_router/neustar/src/main/java/com/comcast/cdn/traffic_control/traffic_router/neustar/NeustarGeolocationService.java
index 36621a8..d9bd537 100644
--- a/traffic_router/neustar/src/main/java/com/comcast/cdn/traffic_control/traffic_router/neustar/NeustarGeolocationService.java
+++ b/traffic_router/neustar/src/main/java/com/comcast/cdn/traffic_control/traffic_router/neustar/NeustarGeolocationService.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/neustar/src/main/java/com/comcast/cdn/traffic_control/traffic_router/neustar/configuration/NeustarConfiguration.java
----------------------------------------------------------------------
diff --git a/traffic_router/neustar/src/main/java/com/comcast/cdn/traffic_control/traffic_router/neustar/configuration/NeustarConfiguration.java b/traffic_router/neustar/src/main/java/com/comcast/cdn/traffic_control/traffic_router/neustar/configuration/NeustarConfiguration.java
index 3911fd7..7c6a8fc 100644
--- a/traffic_router/neustar/src/main/java/com/comcast/cdn/traffic_control/traffic_router/neustar/configuration/NeustarConfiguration.java
+++ b/traffic_router/neustar/src/main/java/com/comcast/cdn/traffic_control/traffic_router/neustar/configuration/NeustarConfiguration.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/neustar/src/main/java/com/comcast/cdn/traffic_control/traffic_router/neustar/configuration/ServiceRefresher.java
----------------------------------------------------------------------
diff --git a/traffic_router/neustar/src/main/java/com/comcast/cdn/traffic_control/traffic_router/neustar/configuration/ServiceRefresher.java b/traffic_router/neustar/src/main/java/com/comcast/cdn/traffic_control/traffic_router/neustar/configuration/ServiceRefresher.java
index d503b56..5638634 100644
--- a/traffic_router/neustar/src/main/java/com/comcast/cdn/traffic_control/traffic_router/neustar/configuration/ServiceRefresher.java
+++ b/traffic_router/neustar/src/main/java/com/comcast/cdn/traffic_control/traffic_router/neustar/configuration/ServiceRefresher.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/neustar/src/main/java/com/comcast/cdn/traffic_control/traffic_router/neustar/configuration/TrafficRouterConfigurationListener.java
----------------------------------------------------------------------
diff --git a/traffic_router/neustar/src/main/java/com/comcast/cdn/traffic_control/traffic_router/neustar/configuration/TrafficRouterConfigurationListener.java b/traffic_router/neustar/src/main/java/com/comcast/cdn/traffic_control/traffic_router/neustar/configuration/TrafficRouterConfigurationListener.java
index deda62d..e786d04 100644
--- a/traffic_router/neustar/src/main/java/com/comcast/cdn/traffic_control/traffic_router/neustar/configuration/TrafficRouterConfigurationListener.java
+++ b/traffic_router/neustar/src/main/java/com/comcast/cdn/traffic_control/traffic_router/neustar/configuration/TrafficRouterConfigurationListener.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/neustar/src/main/java/com/comcast/cdn/traffic_control/traffic_router/neustar/data/HttpClient.java
----------------------------------------------------------------------
diff --git a/traffic_router/neustar/src/main/java/com/comcast/cdn/traffic_control/traffic_router/neustar/data/HttpClient.java b/traffic_router/neustar/src/main/java/com/comcast/cdn/traffic_control/traffic_router/neustar/data/HttpClient.java
index 39b698d..a597bb9 100644
--- a/traffic_router/neustar/src/main/java/com/comcast/cdn/traffic_control/traffic_router/neustar/data/HttpClient.java
+++ b/traffic_router/neustar/src/main/java/com/comcast/cdn/traffic_control/traffic_router/neustar/data/HttpClient.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/neustar/src/main/java/com/comcast/cdn/traffic_control/traffic_router/neustar/data/NeustarDatabaseUpdater.java
----------------------------------------------------------------------
diff --git a/traffic_router/neustar/src/main/java/com/comcast/cdn/traffic_control/traffic_router/neustar/data/NeustarDatabaseUpdater.java b/traffic_router/neustar/src/main/java/com/comcast/cdn/traffic_control/traffic_router/neustar/data/NeustarDatabaseUpdater.java
index c8ffa49..8291f9f 100644
--- a/traffic_router/neustar/src/main/java/com/comcast/cdn/traffic_control/traffic_router/neustar/data/NeustarDatabaseUpdater.java
+++ b/traffic_router/neustar/src/main/java/com/comcast/cdn/traffic_control/traffic_router/neustar/data/NeustarDatabaseUpdater.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/neustar/src/main/java/com/comcast/cdn/traffic_control/traffic_router/neustar/data/TarExtractor.java
----------------------------------------------------------------------
diff --git a/traffic_router/neustar/src/main/java/com/comcast/cdn/traffic_control/traffic_router/neustar/data/TarExtractor.java b/traffic_router/neustar/src/main/java/com/comcast/cdn/traffic_control/traffic_router/neustar/data/TarExtractor.java
index 2bc8107..08d2669 100644
--- a/traffic_router/neustar/src/main/java/com/comcast/cdn/traffic_control/traffic_router/neustar/data/TarExtractor.java
+++ b/traffic_router/neustar/src/main/java/com/comcast/cdn/traffic_control/traffic_router/neustar/data/TarExtractor.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/neustar/src/main/java/com/comcast/cdn/traffic_control/traffic_router/neustar/files/FilesMover.java
----------------------------------------------------------------------
diff --git a/traffic_router/neustar/src/main/java/com/comcast/cdn/traffic_control/traffic_router/neustar/files/FilesMover.java b/traffic_router/neustar/src/main/java/com/comcast/cdn/traffic_control/traffic_router/neustar/files/FilesMover.java
index 86ffa74..3834a1c 100644
--- a/traffic_router/neustar/src/main/java/com/comcast/cdn/traffic_control/traffic_router/neustar/files/FilesMover.java
+++ b/traffic_router/neustar/src/main/java/com/comcast/cdn/traffic_control/traffic_router/neustar/files/FilesMover.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/neustar/src/test/java/configuration/PeriodicUpdateConfigurationTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/neustar/src/test/java/configuration/PeriodicUpdateConfigurationTest.java b/traffic_router/neustar/src/test/java/configuration/PeriodicUpdateConfigurationTest.java
index b1a162a..ea418a7 100644
--- a/traffic_router/neustar/src/test/java/configuration/PeriodicUpdateConfigurationTest.java
+++ b/traffic_router/neustar/src/test/java/configuration/PeriodicUpdateConfigurationTest.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/neustar/src/test/java/configuration/ServiceRefresherTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/neustar/src/test/java/configuration/ServiceRefresherTest.java b/traffic_router/neustar/src/test/java/configuration/ServiceRefresherTest.java
index fc06802..03b8f06 100644
--- a/traffic_router/neustar/src/test/java/configuration/ServiceRefresherTest.java
+++ b/traffic_router/neustar/src/test/java/configuration/ServiceRefresherTest.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/neustar/src/test/java/configuration/TrafficRouterConfigurationListenerTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/neustar/src/test/java/configuration/TrafficRouterConfigurationListenerTest.java b/traffic_router/neustar/src/test/java/configuration/TrafficRouterConfigurationListenerTest.java
index 077dbb0..198e34a 100644
--- a/traffic_router/neustar/src/test/java/configuration/TrafficRouterConfigurationListenerTest.java
+++ b/traffic_router/neustar/src/test/java/configuration/TrafficRouterConfigurationListenerTest.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/neustar/src/test/java/data/NeustarDatabaseUpdaterTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/neustar/src/test/java/data/NeustarDatabaseUpdaterTest.java b/traffic_router/neustar/src/test/java/data/NeustarDatabaseUpdaterTest.java
index 7ed666d..5b6e2d6 100644
--- a/traffic_router/neustar/src/test/java/data/NeustarDatabaseUpdaterTest.java
+++ b/traffic_router/neustar/src/test/java/data/NeustarDatabaseUpdaterTest.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/neustar/src/test/java/data/TarExtractorTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/neustar/src/test/java/data/TarExtractorTest.java b/traffic_router/neustar/src/test/java/data/TarExtractorTest.java
index d9014ca..2be9efc 100644
--- a/traffic_router/neustar/src/test/java/data/TarExtractorTest.java
+++ b/traffic_router/neustar/src/test/java/data/TarExtractorTest.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/neustar/src/test/java/files/FilesMoverTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/neustar/src/test/java/files/FilesMoverTest.java b/traffic_router/neustar/src/test/java/files/FilesMoverTest.java
index 2f2664a..b2f4fbd 100644
--- a/traffic_router/neustar/src/test/java/files/FilesMoverTest.java
+++ b/traffic_router/neustar/src/test/java/files/FilesMoverTest.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/neustar/src/test/java/geolocation/NeustarGeolocationServiceTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/neustar/src/test/java/geolocation/NeustarGeolocationServiceTest.java b/traffic_router/neustar/src/test/java/geolocation/NeustarGeolocationServiceTest.java
index 3365c58..78eb1ef 100644
--- a/traffic_router/neustar/src/test/java/geolocation/NeustarGeolocationServiceTest.java
+++ b/traffic_router/neustar/src/test/java/geolocation/NeustarGeolocationServiceTest.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/neustar/src/test/java/neustar/GPDatabaseReaderBuilderTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/neustar/src/test/java/neustar/GPDatabaseReaderBuilderTest.java b/traffic_router/neustar/src/test/java/neustar/GPDatabaseReaderBuilderTest.java
index 3a8cf6f..157ce42 100644
--- a/traffic_router/neustar/src/test/java/neustar/GPDatabaseReaderBuilderTest.java
+++ b/traffic_router/neustar/src/test/java/neustar/GPDatabaseReaderBuilderTest.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/pom.xml
----------------------------------------------------------------------
diff --git a/traffic_router/pom.xml b/traffic_router/pom.xml
index 0bf8638..78badf3 100644
--- a/traffic_router/pom.xml
+++ b/traffic_router/pom.xml
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/shared/build/pmd/ruleset.xml
----------------------------------------------------------------------
diff --git a/traffic_router/shared/build/pmd/ruleset.xml b/traffic_router/shared/build/pmd/ruleset.xml
index b72b217..dcbc791 100644
--- a/traffic_router/shared/build/pmd/ruleset.xml
+++ b/traffic_router/shared/build/pmd/ruleset.xml
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/shared/pom.xml
----------------------------------------------------------------------
diff --git a/traffic_router/shared/pom.xml b/traffic_router/shared/pom.xml
index 5133066..d9cd43a 100644
--- a/traffic_router/shared/pom.xml
+++ b/traffic_router/shared/pom.xml
@@ -1,4 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -78,4 +98,4 @@
</dependencies>
-</project>
\ No newline at end of file
+</project>
[06/26] incubator-trafficcontrol git commit: merge master
Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/public/login/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/public/login/index.js b/traffic_ops/experimental/ui/app/src/modules/public/login/index.js
index 3e8fa2c..ab8aa0f 100644
--- a/traffic_ops/experimental/ui/app/src/modules/public/login/index.js
+++ b/traffic_ops/experimental/ui/app/src/modules/public/login/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.public.login', [])
.controller('LoginController', require('./LoginController'))
.config(function($stateProvider, $urlRouterProvider) {
@@ -13,4 +32,4 @@ module.exports = angular.module('trafficOps.public.login', [])
})
;
$urlRouterProvider.otherwise('/');
- });
\ No newline at end of file
+ });
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/public/login/login.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/public/login/login.tpl.html b/traffic_ops/experimental/ui/app/src/modules/public/login/login.tpl.html
index 5b1efa5..7dfa69c 100644
--- a/traffic_ops/experimental/ui/app/src/modules/public/login/login.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/modules/public/login/login.tpl.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<section id="loginContainer">
<div class="panelForm">
<h4>Login</h4>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/public/public.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/public/public.tpl.html b/traffic_ops/experimental/ui/app/src/modules/public/public.tpl.html
index 25583de..254b9e4 100644
--- a/traffic_ops/experimental/ui/app/src/modules/public/public.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/modules/public/public.tpl.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<div id="publicContainer">
<div ui-view="publicContent"></div>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/package.json
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/package.json b/traffic_ops/experimental/ui/app/src/package.json
index 7acf5ca..9527500 100644
--- a/traffic_ops/experimental/ui/app/src/package.json
+++ b/traffic_ops/experimental/ui/app/src/package.json
@@ -8,6 +8,7 @@
},
"dependencies": {
"forever": "0.15.1",
+ "morgan": "1.7.0",
"errorhandler": "1.4.3",
"connect-modrewrite": "0.8.5",
"connect-timeout": "1.7.0",
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/scripts/config.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/scripts/config.js b/traffic_ops/experimental/ui/app/src/scripts/config.js
index 13cc002..46606c9 100644
--- a/traffic_ops/experimental/ui/app/src/scripts/config.js
+++ b/traffic_ops/experimental/ui/app/src/scripts/config.js
@@ -1,7 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
"use strict";
angular.module('config', [])
.constant('ENV', {api:{root:'/api/1.2/'}})
-;
\ No newline at end of file
+;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/scripts/shared-libs.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/scripts/shared-libs.js b/traffic_ops/experimental/ui/app/src/scripts/shared-libs.js
old mode 100755
new mode 100644
index a892045..87e28cb
--- a/traffic_ops/experimental/ui/app/src/scripts/shared-libs.js
+++ b/traffic_ops/experimental/ui/app/src/scripts/shared-libs.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
/**
* Define the required js libraries needed for this application. The compiler will merge them all into a single download. Order is important!
*/
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/styles/main.scss
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/styles/main.scss b/traffic_ops/experimental/ui/app/src/styles/main.scss
index c2adf60..5ad33ec 100755
--- a/traffic_ops/experimental/ui/app/src/styles/main.scss
+++ b/traffic_ops/experimental/ui/app/src/styles/main.scss
@@ -1,3 +1,5 @@
+@charset "utf-8";
+
$fa-font-path: "../assets/fonts";
@import url(//fonts.googleapis.com/css?family=Lato:300,400,700,900,400italic);
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/trafficOps_release.json
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/trafficOps_release.json b/traffic_ops/experimental/ui/app/src/trafficOps_release.json
deleted file mode 100644
index 78fc5f3..0000000
--- a/traffic_ops/experimental/ui/app/src/trafficOps_release.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "Version":"0.1",
- "Build Number":"1",
- "Build Date":"2016-01-01 16:25:27"
-}
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/traffic_ops_release.json
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/traffic_ops_release.json b/traffic_ops/experimental/ui/app/src/traffic_ops_release.json
new file mode 100644
index 0000000..78fc5f3
--- /dev/null
+++ b/traffic_ops/experimental/ui/app/src/traffic_ops_release.json
@@ -0,0 +1,5 @@
+{
+ "Version":"0.1",
+ "Build Number":"1",
+ "Build Date":"2016-01-01 16:25:27"
+}
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/build/Dockerfile
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/build/Dockerfile b/traffic_ops/experimental/ui/build/Dockerfile
new file mode 100644
index 0000000..ccaebc7
--- /dev/null
+++ b/traffic_ops/experimental/ui/build/Dockerfile
@@ -0,0 +1,56 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
+
+FROM centos:7
+MAINTAINER Dan Kirkwood
+
+RUN yum -y install \
+ epel-release \
+ git \
+ rpm-build && \
+ yum -y clean all
+
+ENV GITREPO https://github.com/apache/incubator-trafficcontrol.git
+ENV BRANCH master
+
+WORKDIR /repo
+
+# traffic_ops_v2 specific
+RUN yum -y install \
+ gcc \
+ libffi-devel \
+ make \
+ nodejs \
+ npm \
+ ruby-devel \
+ rubygems
+
+RUN gem install compass
+RUN npm -g install bower grunt-cli
+
+# bower will not run as root by default
+RUN echo '{ "allow_root": true }' > /root/.bowerrc
+
+###
+
+VOLUME ./artifacts:/artifacts
+
+ADD run-build.sh .
+
+CMD ./run-build.sh traffic_ops_v2 2>&1 | tee /artifacts/build-traffic_ops_v2.log
+
+# vi:syntax=Dockerfile
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/build/README.md
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/build/README.md b/traffic_ops/experimental/ui/build/README.md
new file mode 100644
index 0000000..7492cd4
--- /dev/null
+++ b/traffic_ops/experimental/ui/build/README.md
@@ -0,0 +1,63 @@
+# Traffic Ops v2 Installation
+
+### 1. Build w/ Docker
+
+* Download Traffic Control repo
+
+ ```
+ $ git clone https://github.com/apache/incubator-trafficcontrol.git
+ ```
+
+* Build the RPM
+
+ ```
+ $ cd incubator-trafficcontrol/traffic_ops/experimental/ui/build
+ $ sudo docker build -t tov2-image .
+ $ sudo docker run -v $(pwd)/artifacts:/artifacts -e GITREPO=https://github.com/apache/incubator-trafficcontrol.git -e BRANCH=master tov2-image
+ ```
+
+ The rpm will be created the `artifacts` directory.
+
+### 2. Install
+
+* Install the Node.js JavaScript runtime
+
+ ```
+ $ curl --silent --location https://rpm.nodesource.com/setup_6.x | sudo bash -
+ $ sudo yum install -y nodejs
+ ```
+
+* Install the Traffic Ops v2 RPM
+
+ ```
+ $ sudo yum install -y ./artifacts/traffic_ops_v2-[version]-[commits].[sha].x86_64.rpm
+ ```
+
+### 3. Configure
+
+* Configure Traffic Ops v2
+
+ ```
+ $ cd /etc/traffic_ops_v2/conf
+ $ sudo cp config-template.js config.js
+ $ sudo vi config.js (read the inline comments)
+ ```
+
+### 4. Run
+
+* Start Traffic Ops v2
+
+ ```
+ $ sudo service traffic_ops_v2 start
+ ```
+
+* Navigate to Traffic Ops v2
+
+ ```
+ $ http://localhost[:port]
+ ```
+
+#### Notes
+
+ - Traffic Ops v2 consumes the Traffic Ops API, therefore, an instance of Traffic Ops must be running.
+ - This is known to work with CentOS 6.7 and Centos 7 as the host environment.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/build/build_rpm.sh
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/build/build_rpm.sh b/traffic_ops/experimental/ui/build/build_rpm.sh
new file mode 100755
index 0000000..60a8d35
--- /dev/null
+++ b/traffic_ops/experimental/ui/build/build_rpm.sh
@@ -0,0 +1,57 @@
+#!/bin/bash
+#
+#
+#
+# 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
+#
+# 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.
+
+function importFunctions() {
+ local script=$(readlink -f "$0")
+ local suff=${script##*control/}
+ local tcdirlen=$[${#script} - ${#suff}]
+ export TC_DIR=${script:0:$tcdirlen}
+ local scriptdir=$(dirname "$script")
+ export TS_DIR=$(dirname "$scriptdir")
+
+ functions_sh="$TC_DIR/build/functions.sh"
+ if [[ ! -r $functions_sh ]]; then
+ echo "error: can't find $functions_sh"
+ exit 1
+ fi
+ . "$functions_sh"
+}
+
+#----------------------------------------
+function initBuildArea() {
+ echo "Initializing the build area."
+ mkdir -p "$RPMBUILD"/{SPECS,SOURCES,RPMS,SRPMS,BUILD,BUILDROOT} || { echo "Could not create $RPMBUILD: $?"; exit 1; }
+
+ # tar/gzip the source
+ local ts_dest=$(createSourceDir traffic_ops_v2)
+ cd "$TS_DIR" || \
+ { echo "Could not cd to $TS_DIR: $?"; exit 1; }
+ rsync -av ./ "$ts_dest"/ || \
+ { echo "Could not copy to $to_dest: $?"; exit 1; }
+ cp -r "$TS_DIR"/ "$ts_dest" || { echo "Could not copy $TS_DIR to $ts_dest: $?"; exit 1; }
+
+ tar -czvf "$ts_dest".tgz -C "$RPMBUILD"/SOURCES $(basename $ts_dest) || { echo "Could not create tar archive $ts_dest.tgz: $?"; exit 1; }
+ cp "$TS_DIR"/build/*.spec "$RPMBUILD"/SPECS/. || { echo "Could not copy spec files: $?"; exit 1; }
+
+ echo "The build area has been initialized."
+}
+
+# ---------------------------------------
+
+importFunctions
+checkEnvironment npm node
+initBuildArea
+buildRpm traffic_ops_v2
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/build/etc/init.d/traffic_ops_v2
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/build/etc/init.d/traffic_ops_v2 b/traffic_ops/experimental/ui/build/etc/init.d/traffic_ops_v2
new file mode 100755
index 0000000..de0ded5
--- /dev/null
+++ b/traffic_ops/experimental/ui/build/etc/init.d/traffic_ops_v2
@@ -0,0 +1,135 @@
+#!/bin/bash
+#
+# An init.d script for running a Node.js process as a service using Forever as
+# the process monitor. For more configuration options associated with Forever,
+# see: https://github.com/nodejitsu/forever
+#
+# This was written for Debian distributions such as Ubuntu, but should still
+# work on RedHat, Fedora, or other RPM-based distributions, since none of the
+# built-in service functions are used. So information is provided for both.
+#
+### BEGIN INIT INFO
+# Provides: my-application
+# Required-Start: $syslog $remote_fs
+# Required-Stop: $syslog $remote_fs
+# Should-Start: $local_fs
+# Should-Stop: $local_fs
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: My Application
+# Description: My Application
+### END INIT INFO
+#
+### BEGIN CHKCONFIG INFO
+# chkconfig: 2345 55 25
+# description: My Application
+### END CHKCONFIG INFO
+#
+# An application name to display in echo text.
+# NAME="Traffic Ops v2 Application"
+# The full path to the directory containing the node and forever binaries.
+# Set the NODE_PATH to the Node.js main node_modules directory.
+# The application startup Javascript file path.
+
+# Process ID file path.
+# Log file path.
+# Forever settings to prevent the application spinning if it fails on launch.
+# MIN_UPTIME="5000"
+# SPIN_SLEEP_TIME="2000"
+
+NAME="Traffic Ops v2 Application"
+NODE_BIN_DIR="/usr/bin"
+NODE_PATH="/opt/traffic_ops_v2/node_modules"
+FOREVER_BIN_DIR="/opt/traffic_ops_v2/node_modules/forever/bin"
+APPLICATION_PATH="/opt/traffic_ops_v2/server/server.js"
+PIDFILE="/var/run/traffic_ops_v2.pid"
+LOGFILE="/var/log/traffic_ops_v2/traffic_ops_v2.log"
+MIN_UPTIME="5000"
+SPIN_SLEEP_TIME="2000"
+
+# Add node to the path for situations in which the environment is passed.
+PATH=$FOREVER_BIN_DIR:$NODE_BIN_DIR:$PATH
+# Export all environment variables that must be visible for the Node.js
+# application process forked by Forever. It will not see any of the other
+# variables defined in this script.
+export NODE_PATH=$NODE_PATH
+
+start() {
+ echo "Starting $NAME"
+ # We're calling forever directly without using start-stop-daemon for the
+ # sake of simplicity when it comes to environment, and because this way
+ # the script will work whether it is executed directly or via the service
+ # utility.
+ #
+ # The minUptime and spinSleepTime settings stop Forever from thrashing if
+ # the application fails immediately on launch. This is generally necessary to
+ # avoid loading development servers to the point of failure every time
+ # someone makes an error in application initialization code, or bringing down
+ # production servers the same way if a database or other critical service
+ # suddenly becomes inaccessible.
+ #
+ # The pidfile contains the child process pid, not the forever process pid.
+ # We're only using it as a marker for whether or not the process is
+ # running.
+ #
+ # Note that redirecting the output to /dev/null (or anywhere) is necessary
+ # to make this script work if provisioning the service via Chef.
+ forever \
+ --pidFile $PIDFILE \
+ -a \
+ -l $LOGFILE \
+ --minUptime $MIN_UPTIME \
+ --spinSleepTime $SPIN_SLEEP_TIME \
+ start $APPLICATION_PATH 2>&1 > /dev/null &
+ RETVAL=$?
+}
+
+stop() {
+ if [ -f $PIDFILE ]; then
+ echo "Shutting down $NAME"
+ # Tell Forever to stop the process.
+ forever stop $APPLICATION_PATH 2>&1 > /dev/null
+ # Get rid of the pidfile, since Forever won't do that.
+ rm -f $PIDFILE
+ RETVAL=$?
+ else
+ echo "$NAME is not running."
+ RETVAL=0
+ fi
+}
+
+restart() {
+ stop
+ start
+}
+
+status() {
+ echo `forever list` | grep -q "$APPLICATION_PATH"
+ if [ "$?" -eq "0" ]; then
+ echo "$NAME is running."
+ RETVAL=0
+ else
+ echo "$NAME is not running."
+ RETVAL=3
+ fi
+}
+
+case "$1" in
+ start)
+ start
+ ;;
+ stop)
+ stop
+ ;;
+ status)
+ status
+ ;;
+ restart)
+ restart
+ ;;
+ *)
+ echo "Usage: {start|stop|status|restart}"
+ exit 1
+ ;;
+esac
+exit $RETVAL
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/build/etc/logrotate.d/traffic_ops_v2
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/build/etc/logrotate.d/traffic_ops_v2 b/traffic_ops/experimental/ui/build/etc/logrotate.d/traffic_ops_v2
new file mode 100644
index 0000000..229b500
--- /dev/null
+++ b/traffic_ops/experimental/ui/build/etc/logrotate.d/traffic_ops_v2
@@ -0,0 +1,8 @@
+/var/log/traffic_ops_v2/traffic_ops_v2.log {
+ daily
+ copytruncate
+ missingok
+ compress
+ maxage 30
+ dateext
+}
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/build/etc/logrotate.d/traffic_ops_v2-access
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/build/etc/logrotate.d/traffic_ops_v2-access b/traffic_ops/experimental/ui/build/etc/logrotate.d/traffic_ops_v2-access
new file mode 100644
index 0000000..89eb341
--- /dev/null
+++ b/traffic_ops/experimental/ui/build/etc/logrotate.d/traffic_ops_v2-access
@@ -0,0 +1,8 @@
+/var/log/traffic_ops_v2/access.log {
+ daily
+ copytruncate
+ missingok
+ compress
+ maxage 30
+ dateext
+}
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/build/run-build.sh
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/build/run-build.sh b/traffic_ops/experimental/ui/build/run-build.sh
new file mode 100755
index 0000000..f0467a6
--- /dev/null
+++ b/traffic_ops/experimental/ui/build/run-build.sh
@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
+
+target=$1
+[[ -z $target ]] && echo "No target specified"
+echo "Building $target"
+
+echo "GITREPO=${GITREPO:=https://github.com/apache/incubator-trafficcontrol}"
+echo "BRANCH=${BRANCH:=master}"
+
+set -x
+git clone $GITREPO -b $BRANCH traffic_control
+distdir=$(pwd)/traffic_control/dist
+
+cd traffic_control/traffic_ops/experimental/ui
+./build/build_rpm.sh
+mkdir -p /artifacts
+cp $distdir/* /artifacts/.
+
+# Clean up for next build
+cd -
+rm -r traffic_control
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/build/traffic_ops_v2.spec
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/build/traffic_ops_v2.spec b/traffic_ops/experimental/ui/build/traffic_ops_v2.spec
new file mode 100644
index 0000000..651d6c9
--- /dev/null
+++ b/traffic_ops/experimental/ui/build/traffic_ops_v2.spec
@@ -0,0 +1,89 @@
+#
+#
+# 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
+#
+# 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.
+#
+#
+# RPM spec file for the Traffic Ops v2
+#
+%define debug_package %{nil}
+Name: traffic_ops_v2
+Version: %{traffic_control_version}
+Release: %{build_number}
+Summary: Traffic Ops v2
+Group: Applications/Communications
+License: Apache License, Version 2.0
+URL: https://github.com/Comcast/traffic_control/
+Source: %{_sourcedir}/traffic_ops_v2-%{traffic_control_version}.tgz
+AutoReqProv: no
+Requires: nodejs
+
+%define traffic_ops_v2_home /opt/traffic_ops_v2
+%description
+Installs Traffic Ops v2
+
+Built: @BUILT@
+
+%prep
+rm -rf $RPM_BUILD_DIR/traffic_ops_v2-%{version}
+tar -xzvf $RPM_SOURCE_DIR/traffic_ops_v2-%{version}.tgz
+
+%setup
+
+%build
+ /usr/bin/npm install
+ /usr/bin/bower install
+ /usr/bin/grunt dist
+
+%install
+ %__mkdir -p ${RPM_BUILD_ROOT}/etc/init.d
+ %__mkdir -p ${RPM_BUILD_ROOT}/etc/logrotate.d
+ %__mkdir -p ${RPM_BUILD_ROOT}/etc/traffic_ops_v2
+ %__mkdir -p ${RPM_BUILD_ROOT}%{traffic_ops_v2_home}/public
+ %__mkdir -p ${RPM_BUILD_ROOT}%{traffic_ops_v2_home}/server
+ %__mkdir -p ${RPM_BUILD_ROOT}/var/log/traffic_ops_v2
+
+ # creates dynamic json file needed at runtime for traffic ops v2 to display release info
+ BUILD_DATE=$(date +'%Y-%m-%d %H:%M:%S')
+ VERSION="\"Version\":\"$VERSION\""
+ BUILD_NUMBER="\"Build Number\":\"$BUILD_NUMBER\""
+ BUILD_DATE="\"Build Date\":\"$BUILD_DATE\""
+ JSON_VERSION="{\n$VERSION,\n$BUILD_NUMBER,\n$BUILD_DATE\n}"
+ echo -e $JSON_VERSION > ${RPM_BUILD_ROOT}%{traffic_ops_v2_home}/public/traffic_ops_release.json
+
+ %__cp ${RPM_BUILD_DIR}/traffic_ops_v2-%{version}/server/server.js ${RPM_BUILD_ROOT}%{traffic_ops_v2_home}/server/.
+ %__cp -r ${RPM_BUILD_DIR}/traffic_ops_v2-%{version}/conf ${RPM_BUILD_ROOT}/etc/traffic_ops_v2/.
+ %__cp ${RPM_BUILD_DIR}/traffic_ops_v2-%{version}/build/etc/init.d/traffic_ops_v2 ${RPM_BUILD_ROOT}/etc/init.d/.
+ %__cp ${RPM_BUILD_DIR}/traffic_ops_v2-%{version}/build/etc/logrotate.d/traffic_ops_v2 ${RPM_BUILD_ROOT}/etc/logrotate.d/.
+ %__cp ${RPM_BUILD_DIR}/traffic_ops_v2-%{version}/build/etc/logrotate.d/traffic_ops_v2-access ${RPM_BUILD_ROOT}/etc/logrotate.d/.
+ %__cp -r ${RPM_BUILD_DIR}/traffic_ops_v2-%{version}/app/dist/* ${RPM_BUILD_ROOT}%{traffic_ops_v2_home}/.
+
+%post
+ echo "Successfully installed the traffic_ops_v2 assets to " %{traffic_ops_v2_home}
+ %__chmod +x %{traffic_ops_v2_home}/node_modules/forever/bin/forever
+ %__chmod +x /etc/init.d/traffic_ops_v2
+ echo "Successfully installed the 'traffic_ops_v2' service"
+ /sbin/chkconfig traffic_ops_v2 on
+ echo ""
+ echo "Start with 'service traffic_ops_v2 start'"
+
+%files
+%defattr(644,root,root,755)
+%attr(755,root,root) /etc/init.d/traffic_ops_v2
+%attr(755,root,root) %{traffic_ops_v2_home}/node_modules/forever/bin/*
+%config(noreplace)/etc/traffic_ops_v2/conf/config.js
+%dir /var/log/traffic_ops_v2
+/etc/traffic_ops_v2/conf/config-template.js
+%{traffic_ops_v2_home}/*
+/etc/logrotate.d/traffic_ops_v2
+/etc/logrotate.d/traffic_ops_v2-access
+/etc/init.d/traffic_ops_v2
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/conf/config-template.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/conf/config-template.js b/traffic_ops/experimental/ui/conf/config-template.js
new file mode 100644
index 0000000..1a401cc
--- /dev/null
+++ b/traffic_ops/experimental/ui/conf/config-template.js
@@ -0,0 +1,49 @@
+/*
+
+
+ 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
+
+ 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.
+
+ */
+
+// this is the config for /opt/traffic_ops/server/server.js and is consumed when 'sudo service traffic_ops_v2 start'
+module.exports = {
+ timeout: '120s',
+ useSSL: false, // set to true if you plan to use https (self-signed or trusted certs).
+ port: 8080,
+ sslPort: 8443,
+ proxyPort: 8009,
+ // if useSSL is true, generate ssl certs and provide the proper locations.
+ ssl: {
+ key: '/path/to/ssl.key',
+ cert: '/path/to/ssl.crt',
+ ca: [
+ '/path/to/ssl-bundle.crt'
+ ]
+ },
+ // set api 'base_url' to the traffic ops url (all api calls made from the traffic ops ui will be proxied to the api base_url)
+ // enter value for api 'key' if you want to append ?API_KEY=value to all api calls. It is suggested to leave blank.
+ api: {
+ base_url: 'http(s)://where-traffic-ops-is.com',
+ key: ''
+ },
+ // default files location (this is where the traffic ops html, css and javascript was installed)
+ files: {
+ static: '/opt/traffic_ops_v2/public'
+ },
+ // default log location (this is where traffic_ops logs are written)
+ log: {
+ stream: '/var/log/traffic_ops_v2/access.log'
+ },
+ reject_unauthorized: 0 // 0 if using self-signed certs, 1 if trusted certs
+};
+
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/conf/config.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/conf/config.js b/traffic_ops/experimental/ui/conf/config.js
index ed56bfd..0db192b 100644
--- a/traffic_ops/experimental/ui/conf/config.js
+++ b/traffic_ops/experimental/ui/conf/config.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = {
timeout: '120s',
useSSL: false, // set to true if using ssl
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/grunt/browserify2.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/grunt/browserify2.js b/traffic_ops/experimental/ui/grunt/browserify2.js
old mode 100755
new mode 100644
index 4be0743..9bb4376
--- a/traffic_ops/experimental/ui/grunt/browserify2.js
+++ b/traffic_ops/experimental/ui/grunt/browserify2.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = {
'shared-libs-prod': {
entry: './<%= globalConfig.srcdir %>/scripts/shared-libs.js',
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/grunt/clean.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/grunt/clean.js b/traffic_ops/experimental/ui/grunt/clean.js
old mode 100755
new mode 100644
index a46048c..cb999b8
--- a/traffic_ops/experimental/ui/grunt/clean.js
+++ b/traffic_ops/experimental/ui/grunt/clean.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = {
all: [
@@ -7,4 +26,4 @@ module.exports = {
options: {
force: true
}
-};
\ No newline at end of file
+};
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/grunt/compass.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/grunt/compass.js b/traffic_ops/experimental/ui/grunt/compass.js
old mode 100755
new mode 100644
index a2c6791..2aed889
--- a/traffic_ops/experimental/ui/grunt/compass.js
+++ b/traffic_ops/experimental/ui/grunt/compass.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = {
options: {
@@ -25,4 +44,4 @@ module.exports = {
environment: 'development'
}
}
-};
\ No newline at end of file
+};
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/grunt/copy.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/grunt/copy.js b/traffic_ops/experimental/ui/grunt/copy.js
old mode 100755
new mode 100644
index c8cd42b..34a0f66
--- a/traffic_ops/experimental/ui/grunt/copy.js
+++ b/traffic_ops/experimental/ui/grunt/copy.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = {
dev: {
files: [
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/grunt/express.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/grunt/express.js b/traffic_ops/experimental/ui/grunt/express.js
index 9684b14..b6be794 100644
--- a/traffic_ops/experimental/ui/grunt/express.js
+++ b/traffic_ops/experimental/ui/grunt/express.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = {
dev: {
options: {
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/grunt/globalConfig.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/grunt/globalConfig.js b/traffic_ops/experimental/ui/grunt/globalConfig.js
old mode 100755
new mode 100644
index 5dfebc8..71ab1b4
--- a/traffic_ops/experimental/ui/grunt/globalConfig.js
+++ b/traffic_ops/experimental/ui/grunt/globalConfig.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = function() {
var globalConfig = {
app: 'app',
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/grunt/html2js.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/grunt/html2js.js b/traffic_ops/experimental/ui/grunt/html2js.js
old mode 100755
new mode 100644
index fb6a01b..8cd52af
--- a/traffic_ops/experimental/ui/grunt/html2js.js
+++ b/traffic_ops/experimental/ui/grunt/html2js.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = {
options: {
@@ -8,4 +27,4 @@ module.exports = {
dest: '<%= globalConfig.tmpdir %>/app-templates.js',
module: 'app.templates'
}
-};
\ No newline at end of file
+};
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/grunt/install-dependencies.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/grunt/install-dependencies.js b/traffic_ops/experimental/ui/grunt/install-dependencies.js
index 5306892..14e96ac 100644
--- a/traffic_ops/experimental/ui/grunt/install-dependencies.js
+++ b/traffic_ops/experimental/ui/grunt/install-dependencies.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = {
options: {
cwd: '<%= globalConfig.distdir %>',
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/grunt/jshint.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/grunt/jshint.js b/traffic_ops/experimental/ui/grunt/jshint.js
old mode 100755
new mode 100644
index 2118c72..f95dfa1
--- a/traffic_ops/experimental/ui/grunt/jshint.js
+++ b/traffic_ops/experimental/ui/grunt/jshint.js
@@ -1,7 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = {
files: ['Gruntfile.js', '<%= globalConfig.srcfiles.js %>'],
options: {
jshintrc:true
}
-};
\ No newline at end of file
+};
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/grunt/ngconstant.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/grunt/ngconstant.js b/traffic_ops/experimental/ui/grunt/ngconstant.js
index b8cf6f6..f8f0023 100644
--- a/traffic_ops/experimental/ui/grunt/ngconstant.js
+++ b/traffic_ops/experimental/ui/grunt/ngconstant.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = {
options: {
space: ' ',
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/grunt/uglify.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/grunt/uglify.js b/traffic_ops/experimental/ui/grunt/uglify.js
old mode 100755
new mode 100644
index b8ee5a1..5f124ce
--- a/traffic_ops/experimental/ui/grunt/uglify.js
+++ b/traffic_ops/experimental/ui/grunt/uglify.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = {
dist: {
files: {
@@ -6,4 +25,4 @@ module.exports = {
]
}
}
-};
\ No newline at end of file
+};
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/grunt/watch.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/grunt/watch.js b/traffic_ops/experimental/ui/grunt/watch.js
old mode 100755
new mode 100644
index 359024a..bc72b39
--- a/traffic_ops/experimental/ui/grunt/watch.js
+++ b/traffic_ops/experimental/ui/grunt/watch.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = {
options: {
@@ -15,4 +34,4 @@ module.exports = {
files: ['app/**/*.tpl.html', 'app/**/index.html'],
tasks: ['copy:dist', 'build-dev']
}
-};
\ No newline at end of file
+};
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/server/server.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/server/server.js b/traffic_ops/experimental/ui/server/server.js
index 8514cde..c6d3b38 100644
--- a/traffic_ops/experimental/ui/server/server.js
+++ b/traffic_ops/experimental/ui/server/server.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var constants = require('constants'),
express = require('express'),
http = require('http'),
@@ -13,7 +32,7 @@ var config;
try {
// this should exist in prod environment. no need to create this file in dev as it will use the fallback (see catch)
- config = require('/etc/trafficops/conf/config');
+ config = require('/etc/traffic_ops_v2/conf/config');
}
catch(e) {
// this is used for dev environment
@@ -93,6 +112,6 @@ if (useSSL) {
sslOptions.agent = new https.Agent(sslOptions);
}
-console.log("Traffic Portal Port : %s", config.port);
-console.log("Traffic Portal Proxy Port : %s", config.proxyPort);
-console.log("Traffic Portal SSL Port : %s", config.sslPort);
+console.log("Traffic Ops Port : %s", config.port);
+console.log("Traffic Ops Proxy Port : %s", config.proxyPort);
+console.log("Traffic Ops SSL Port : %s", config.sslPort);
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/goto/README.md
----------------------------------------------------------------------
diff --git a/traffic_ops/goto/README.md b/traffic_ops/goto/README.md
index d8ce7ad..523650c 100644
--- a/traffic_ops/goto/README.md
+++ b/traffic_ops/goto/README.md
@@ -3,7 +3,7 @@
GoTO is a server/some other stuff written in Go that allows for RESTful interaction with SQL databases through an Angular web API.
-This is written for the Comcast [Traffic Ops](http://traffic-control-cdn.net/docs/latest/development/traffic_ops.html) database, but I'm pretty sure it should probably work for all databases.
+This is written for the Comcast [Traffic Ops](http://trafficcontrol.apache.org/docs/latest/development/traffic_ops.html) database, but I'm pretty sure it should probably work for all databases.
## Install
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/goto/api.go
----------------------------------------------------------------------
diff --git a/traffic_ops/goto/api.go b/traffic_ops/goto/api.go
index 3567fb9..346dc53 100644
--- a/traffic_ops/goto/api.go
+++ b/traffic_ops/goto/api.go
@@ -1,4 +1,3 @@
-// Copyright 2015 Comcast Cable Communications Management, LLC
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/goto/index.html
----------------------------------------------------------------------
diff --git a/traffic_ops/goto/index.html b/traffic_ops/goto/index.html
index 833d08e..107e5dd 100644
--- a/traffic_ops/goto/index.html
+++ b/traffic_ops/goto/index.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<!DOCTYPE html>
<html lang="en-US">
<head>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/goto/js/main.js
----------------------------------------------------------------------
diff --git a/traffic_ops/goto/js/main.js b/traffic_ops/goto/js/main.js
index 4fcfe33..d4a1555 100644
--- a/traffic_ops/goto/js/main.js
+++ b/traffic_ops/goto/js/main.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
angular.module('app', ['ngReactGrid'])
.controller('InitCtrl', function($scope, $http, $log, ngReactGridCheckbox) {
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/goto/mooseFixture/mooseFixture.go
----------------------------------------------------------------------
diff --git a/traffic_ops/goto/mooseFixture/mooseFixture.go b/traffic_ops/goto/mooseFixture/mooseFixture.go
index 6074d87..6bbd719 100644
--- a/traffic_ops/goto/mooseFixture/mooseFixture.go
+++ b/traffic_ops/goto/mooseFixture/mooseFixture.go
@@ -1,4 +1,3 @@
-// Copyright 2015 Comcast Cable Communications Management, LLC
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/goto/outputFormatter/outputFormatter.go
----------------------------------------------------------------------
diff --git a/traffic_ops/goto/outputFormatter/outputFormatter.go b/traffic_ops/goto/outputFormatter/outputFormatter.go
index 9b3496f..85eba62 100644
--- a/traffic_ops/goto/outputFormatter/outputFormatter.go
+++ b/traffic_ops/goto/outputFormatter/outputFormatter.go
@@ -1,4 +1,3 @@
-// Copyright 2015 Comcast Cable Communications Management, LLC
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/goto/sqlParser/sqlMapInit.go
----------------------------------------------------------------------
diff --git a/traffic_ops/goto/sqlParser/sqlMapInit.go b/traffic_ops/goto/sqlParser/sqlMapInit.go
index 90ca5e7..a53baf2 100644
--- a/traffic_ops/goto/sqlParser/sqlMapInit.go
+++ b/traffic_ops/goto/sqlParser/sqlMapInit.go
@@ -1,5 +1,25 @@
package sqlParser
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
import (
"fmt"
"strings"
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/goto/sqlParser/sqlParser.go
----------------------------------------------------------------------
diff --git a/traffic_ops/goto/sqlParser/sqlParser.go b/traffic_ops/goto/sqlParser/sqlParser.go
index 78308f5..1f16efb 100644
--- a/traffic_ops/goto/sqlParser/sqlParser.go
+++ b/traffic_ops/goto/sqlParser/sqlParser.go
@@ -1,4 +1,3 @@
-// Copyright 2015 Comcast Cable Communications Management, LLC
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/goto/sqlParser/sqlTypeMap.go
----------------------------------------------------------------------
diff --git a/traffic_ops/goto/sqlParser/sqlTypeMap.go b/traffic_ops/goto/sqlParser/sqlTypeMap.go
index dcbf54e..3493015 100644
--- a/traffic_ops/goto/sqlParser/sqlTypeMap.go
+++ b/traffic_ops/goto/sqlParser/sqlTypeMap.go
@@ -1,4 +1,3 @@
-// Copyright 2015 Comcast Cable Communications Management, LLC
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/goto/urlParser/urlParser.go
----------------------------------------------------------------------
diff --git a/traffic_ops/goto/urlParser/urlParser.go b/traffic_ops/goto/urlParser/urlParser.go
index f3cc6ea..dc24e3a 100644
--- a/traffic_ops/goto/urlParser/urlParser.go
+++ b/traffic_ops/goto/urlParser/urlParser.go
@@ -1,4 +1,3 @@
-// Copyright 2015 Comcast Cable Communications Management, LLC
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/install/README
----------------------------------------------------------------------
diff --git a/traffic_ops/install/README b/traffic_ops/install/README
index 842d589..253d46c 100644
--- a/traffic_ops/install/README
+++ b/traffic_ops/install/README
@@ -1,5 +1,4 @@
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/install/bin/build_trafficops_perl_library
----------------------------------------------------------------------
diff --git a/traffic_ops/install/bin/build_trafficops_perl_library b/traffic_ops/install/bin/build_trafficops_perl_library
index b31a3d0..684916d 100755
--- a/traffic_ops/install/bin/build_trafficops_perl_library
+++ b/traffic_ops/install/bin/build_trafficops_perl_library
@@ -1,6 +1,5 @@
#!/usr/bin/perl
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/install/bin/download_web_deps
----------------------------------------------------------------------
diff --git a/traffic_ops/install/bin/download_web_deps b/traffic_ops/install/bin/download_web_deps
index b21bc8f..8c20eb3 100755
--- a/traffic_ops/install/bin/download_web_deps
+++ b/traffic_ops/install/bin/download_web_deps
@@ -1,7 +1,6 @@
#!/usr/bin/perl
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/install/bin/generateCert
----------------------------------------------------------------------
diff --git a/traffic_ops/install/bin/generateCert b/traffic_ops/install/bin/generateCert
index 6bd2639..f22688a 100755
--- a/traffic_ops/install/bin/generateCert
+++ b/traffic_ops/install/bin/generateCert
@@ -1,7 +1,6 @@
#!/usr/bin/perl
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/install/bin/get_parameters.go
----------------------------------------------------------------------
diff --git a/traffic_ops/install/bin/get_parameters.go b/traffic_ops/install/bin/get_parameters.go
index 7d5f0f3..3e05864 100644
--- a/traffic_ops/install/bin/get_parameters.go
+++ b/traffic_ops/install/bin/get_parameters.go
@@ -1,4 +1,3 @@
-// Copyright 2016 Comcast Cable Communications Management, LLC
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/install/bin/migratedb
----------------------------------------------------------------------
diff --git a/traffic_ops/install/bin/migratedb b/traffic_ops/install/bin/migratedb
index 2c76329..9a9c192 100755
--- a/traffic_ops/install/bin/migratedb
+++ b/traffic_ops/install/bin/migratedb
@@ -1,7 +1,6 @@
#!/usr/bin/perl
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/install/bin/postinstall
----------------------------------------------------------------------
diff --git a/traffic_ops/install/bin/postinstall b/traffic_ops/install/bin/postinstall
index 5aee102..6a747da 100755
--- a/traffic_ops/install/bin/postinstall
+++ b/traffic_ops/install/bin/postinstall
@@ -1,7 +1,6 @@
#!/usr/bin/perl
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/install/bin/web_deps.txt
----------------------------------------------------------------------
diff --git a/traffic_ops/install/bin/web_deps.txt b/traffic_ops/install/bin/web_deps.txt
index 38a75c4..44f4d49 100644
--- a/traffic_ops/install/bin/web_deps.txt
+++ b/traffic_ops/install/bin/web_deps.txt
@@ -1,5 +1,4 @@
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/install/data/perl/osversions.cfg
----------------------------------------------------------------------
diff --git a/traffic_ops/install/data/perl/osversions.cfg b/traffic_ops/install/data/perl/osversions.cfg
index 36660b1..07636ea 100644
--- a/traffic_ops/install/data/perl/osversions.cfg
+++ b/traffic_ops/install/data/perl/osversions.cfg
@@ -1,5 +1,4 @@
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/install/etc/README
----------------------------------------------------------------------
diff --git a/traffic_ops/install/etc/README b/traffic_ops/install/etc/README
index 842d589..253d46c 100644
--- a/traffic_ops/install/etc/README
+++ b/traffic_ops/install/etc/README
@@ -1,5 +1,4 @@
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/install/go/src/comcast.com/create_db/create_db.go
----------------------------------------------------------------------
diff --git a/traffic_ops/install/go/src/comcast.com/create_db/create_db.go b/traffic_ops/install/go/src/comcast.com/create_db/create_db.go
index 4dad1e7..b239a4d 100644
--- a/traffic_ops/install/go/src/comcast.com/create_db/create_db.go
+++ b/traffic_ops/install/go/src/comcast.com/create_db/create_db.go
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/install/go/src/comcast.com/csv2json/csv2json.go
----------------------------------------------------------------------
diff --git a/traffic_ops/install/go/src/comcast.com/csv2json/csv2json.go b/traffic_ops/install/go/src/comcast.com/csv2json/csv2json.go
index c716903..7287467 100755
--- a/traffic_ops/install/go/src/comcast.com/csv2json/csv2json.go
+++ b/traffic_ops/install/go/src/comcast.com/csv2json/csv2json.go
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/install/go/src/comcast.com/dataload/dataload.go
----------------------------------------------------------------------
diff --git a/traffic_ops/install/go/src/comcast.com/dataload/dataload.go b/traffic_ops/install/go/src/comcast.com/dataload/dataload.go
index c94e798..15549b5 100644
--- a/traffic_ops/install/go/src/comcast.com/dataload/dataload.go
+++ b/traffic_ops/install/go/src/comcast.com/dataload/dataload.go
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/install/go/src/comcast.com/systemtest/systemtest.go
----------------------------------------------------------------------
diff --git a/traffic_ops/install/go/src/comcast.com/systemtest/systemtest.go b/traffic_ops/install/go/src/comcast.com/systemtest/systemtest.go
index d34b172..d3cc480 100644
--- a/traffic_ops/install/go/src/comcast.com/systemtest/systemtest.go
+++ b/traffic_ops/install/go/src/comcast.com/systemtest/systemtest.go
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/install/lib/InstallUtils.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/install/lib/InstallUtils.pm b/traffic_ops/install/lib/InstallUtils.pm
index adc0566..0574468 100644
--- a/traffic_ops/install/lib/InstallUtils.pm
+++ b/traffic_ops/install/lib/InstallUtils.pm
@@ -5,6 +5,24 @@
package InstallUtils;
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
+
+
use Term::ReadPassword;
use base qw{ Exporter };
our @EXPORT_OK = qw{ execCommand randomWord promptUser promptRequired promptPassword promptPasswordVerify trim};
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/install/lib/WebDep.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/install/lib/WebDep.pm b/traffic_ops/install/lib/WebDep.pm
index 7ad4bf6..e7db9b6 100644
--- a/traffic_ops/install/lib/WebDep.pm
+++ b/traffic_ops/install/lib/WebDep.pm
@@ -1,7 +1,6 @@
package WebDep;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/Gruntfile.js
----------------------------------------------------------------------
diff --git a/traffic_portal/Gruntfile.js b/traffic_portal/Gruntfile.js
index ad8b138..f86d919 100755
--- a/traffic_portal/Gruntfile.js
+++ b/traffic_portal/Gruntfile.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/AppController.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/AppController.js b/traffic_portal/app/src/AppController.js
index 4bbd426..b9e87d7 100644
--- a/traffic_portal/app/src/AppController.js
+++ b/traffic_portal/app/src/AppController.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/app.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/app.js b/traffic_portal/app/src/app.js
index a7efc67..9d7ac4a 100755
--- a/traffic_portal/app/src/app.js
+++ b/traffic_portal/app/src/app.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/assets/css/custom.css
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/assets/css/custom.css b/traffic_portal/app/src/assets/css/custom.css
index 5ab9f5a..c0c95c3 100644
--- a/traffic_portal/app/src/assets/css/custom.css
+++ b/traffic_portal/app/src/assets/css/custom.css
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/api/AuthService.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/api/AuthService.js b/traffic_portal/app/src/common/api/AuthService.js
index 7d95c77..c3fea82 100644
--- a/traffic_portal/app/src/common/api/AuthService.js
+++ b/traffic_portal/app/src/common/api/AuthService.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/api/DeliveryServiceService.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/api/DeliveryServiceService.js b/traffic_portal/app/src/common/api/DeliveryServiceService.js
index e75e25d..e2f2976 100644
--- a/traffic_portal/app/src/common/api/DeliveryServiceService.js
+++ b/traffic_portal/app/src/common/api/DeliveryServiceService.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/api/HealthService.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/api/HealthService.js b/traffic_portal/app/src/common/api/HealthService.js
index 16c0b4c..a7948cd 100644
--- a/traffic_portal/app/src/common/api/HealthService.js
+++ b/traffic_portal/app/src/common/api/HealthService.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/api/PortalService.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/api/PortalService.js b/traffic_portal/app/src/common/api/PortalService.js
index 083a2b0..baadf8e 100644
--- a/traffic_portal/app/src/common/api/PortalService.js
+++ b/traffic_portal/app/src/common/api/PortalService.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/api/StatsService.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/api/StatsService.js b/traffic_portal/app/src/common/api/StatsService.js
index a7b972f..98ab370 100644
--- a/traffic_portal/app/src/common/api/StatsService.js
+++ b/traffic_portal/app/src/common/api/StatsService.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/api/UserService.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/api/UserService.js b/traffic_portal/app/src/common/api/UserService.js
index b0be1b9..e393dfa 100755
--- a/traffic_portal/app/src/common/api/UserService.js
+++ b/traffic_portal/app/src/common/api/UserService.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/api/index.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/api/index.js b/traffic_portal/app/src/common/api/index.js
index 905de93..8d8effe 100755
--- a/traffic_portal/app/src/common/api/index.js
+++ b/traffic_portal/app/src/common/api/index.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/directives/enter/EnterDirective.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/directives/enter/EnterDirective.js b/traffic_portal/app/src/common/directives/enter/EnterDirective.js
index edd3104..a2b49e3 100644
--- a/traffic_portal/app/src/common/directives/enter/EnterDirective.js
+++ b/traffic_portal/app/src/common/directives/enter/EnterDirective.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/directives/enter/index.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/directives/enter/index.js b/traffic_portal/app/src/common/directives/enter/index.js
index 16424d4..d141390 100644
--- a/traffic_portal/app/src/common/directives/enter/index.js
+++ b/traffic_portal/app/src/common/directives/enter/index.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/directives/formattedDate/FormattedDateDirective.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/directives/formattedDate/FormattedDateDirective.js b/traffic_portal/app/src/common/directives/formattedDate/FormattedDateDirective.js
index 7984320..0d77baa 100644
--- a/traffic_portal/app/src/common/directives/formattedDate/FormattedDateDirective.js
+++ b/traffic_portal/app/src/common/directives/formattedDate/FormattedDateDirective.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/directives/formattedDate/index.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/directives/formattedDate/index.js b/traffic_portal/app/src/common/directives/formattedDate/index.js
index 8bda004..d2c25ac 100644
--- a/traffic_portal/app/src/common/directives/formattedDate/index.js
+++ b/traffic_portal/app/src/common/directives/formattedDate/index.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/directives/match/MatchDirective.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/directives/match/MatchDirective.js b/traffic_portal/app/src/common/directives/match/MatchDirective.js
index 56d3469..5b4aac7 100644
--- a/traffic_portal/app/src/common/directives/match/MatchDirective.js
+++ b/traffic_portal/app/src/common/directives/match/MatchDirective.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/directives/match/index.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/directives/match/index.js b/traffic_portal/app/src/common/directives/match/index.js
index a40eb9d..2abd130 100644
--- a/traffic_portal/app/src/common/directives/match/index.js
+++ b/traffic_portal/app/src/common/directives/match/index.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/directives/rcSubmit/RCSubmitDirective.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/directives/rcSubmit/RCSubmitDirective.js b/traffic_portal/app/src/common/directives/rcSubmit/RCSubmitDirective.js
index aafc88a..be42077 100644
--- a/traffic_portal/app/src/common/directives/rcSubmit/RCSubmitDirective.js
+++ b/traffic_portal/app/src/common/directives/rcSubmit/RCSubmitDirective.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/directives/rcSubmit/index.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/directives/rcSubmit/index.js b/traffic_portal/app/src/common/directives/rcSubmit/index.js
index eecfd02..a5ca41c 100644
--- a/traffic_portal/app/src/common/directives/rcSubmit/index.js
+++ b/traffic_portal/app/src/common/directives/rcSubmit/index.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/directives/rcVerifySet/RCVerifySetDirective.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/directives/rcVerifySet/RCVerifySetDirective.js b/traffic_portal/app/src/common/directives/rcVerifySet/RCVerifySetDirective.js
index 7d8ae69..ae9f86a 100644
--- a/traffic_portal/app/src/common/directives/rcVerifySet/RCVerifySetDirective.js
+++ b/traffic_portal/app/src/common/directives/rcVerifySet/RCVerifySetDirective.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/directives/rcVerifySet/index.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/directives/rcVerifySet/index.js b/traffic_portal/app/src/common/directives/rcVerifySet/index.js
index b1d89ee..d9131f1 100644
--- a/traffic_portal/app/src/common/directives/rcVerifySet/index.js
+++ b/traffic_portal/app/src/common/directives/rcVerifySet/index.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/directives/selectOnClick/SelectOnClickDirective.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/directives/selectOnClick/SelectOnClickDirective.js b/traffic_portal/app/src/common/directives/selectOnClick/SelectOnClickDirective.js
index 26fa64d..fdd154b 100644
--- a/traffic_portal/app/src/common/directives/selectOnClick/SelectOnClickDirective.js
+++ b/traffic_portal/app/src/common/directives/selectOnClick/SelectOnClickDirective.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/directives/selectOnClick/index.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/directives/selectOnClick/index.js b/traffic_portal/app/src/common/directives/selectOnClick/index.js
index 2e29c79..ad45830 100644
--- a/traffic_portal/app/src/common/directives/selectOnClick/index.js
+++ b/traffic_portal/app/src/common/directives/selectOnClick/index.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/filters/DateRangeFilter.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/filters/DateRangeFilter.js b/traffic_portal/app/src/common/filters/DateRangeFilter.js
index 05cb3b8..b5f9d1c 100644
--- a/traffic_portal/app/src/common/filters/DateRangeFilter.js
+++ b/traffic_portal/app/src/common/filters/DateRangeFilter.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/filters/OffsetFilter.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/filters/OffsetFilter.js b/traffic_portal/app/src/common/filters/OffsetFilter.js
index 8f9dd1c..0e0e9c0 100644
--- a/traffic_portal/app/src/common/filters/OffsetFilter.js
+++ b/traffic_portal/app/src/common/filters/OffsetFilter.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/filters/PartitionFilter.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/filters/PartitionFilter.js b/traffic_portal/app/src/common/filters/PartitionFilter.js
index d7703a3..d3f03af 100644
--- a/traffic_portal/app/src/common/filters/PartitionFilter.js
+++ b/traffic_portal/app/src/common/filters/PartitionFilter.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
[12/26] incubator-trafficcontrol git commit: merge master
Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/server/output_format/output_format.go
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/server/output_format/output_format.go b/traffic_ops/experimental/server/output_format/output_format.go
index 2c1d0c2..464d38b 100644
--- a/traffic_ops/experimental/server/output_format/output_format.go
+++ b/traffic_ops/experimental/server/output_format/output_format.go
@@ -1,4 +1,3 @@
-// Copyright 2015 Comcast Cable Communications Management, LLC
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/server/routes/routes.go
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/server/routes/routes.go b/traffic_ops/experimental/server/routes/routes.go
index 70571a1..cc7ae37 100644
--- a/traffic_ops/experimental/server/routes/routes.go
+++ b/traffic_ops/experimental/server/routes/routes.go
@@ -1,4 +1,3 @@
-// Copyright 2015 Comcast Cable Communications Management, LLC
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/server/tools/gen_goto2.go
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/server/tools/gen_goto2.go b/traffic_ops/experimental/server/tools/gen_goto2.go
index aebcad5..47b2be0 100644
--- a/traffic_ops/experimental/server/tools/gen_goto2.go
+++ b/traffic_ops/experimental/server/tools/gen_goto2.go
@@ -1,4 +1,3 @@
-// Copyright 2015 Comcast Cable Communications Management, LLC
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -113,8 +112,7 @@ func writeFile(schemas []ColumnSchema, table string) (int, error) {
}
defer file.Close()
- license := "// Copyright 2015 Comcast Cable Communications Management, LLC\n\n"
- license += "// Licensed under the Apache License, Version 2.0 (the \"License\");\n"
+ license := "// Licensed under the Apache License, Version 2.0 (the \"License\");\n"
license += "// you may not use this file except in compliance with the License.\n"
license += "// You may obtain a copy of the License at\n\n"
license += "// http://www.apache.org/licenses/LICENSE-2.0\n\n"
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/server/tools/get_structs.go
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/server/tools/get_structs.go b/traffic_ops/experimental/server/tools/get_structs.go
index 660031b..5aad103 100644
--- a/traffic_ops/experimental/server/tools/get_structs.go
+++ b/traffic_ops/experimental/server/tools/get_structs.go
@@ -1,4 +1,3 @@
-// Copyright 2015 Comcast Cable Communications Management, LLC
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/traffic_ops_auth/traffic_ops_auth.go
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/traffic_ops_auth/traffic_ops_auth.go b/traffic_ops/experimental/traffic_ops_auth/traffic_ops_auth.go
index 0220f12..86a61c1 100644
--- a/traffic_ops/experimental/traffic_ops_auth/traffic_ops_auth.go
+++ b/traffic_ops/experimental/traffic_ops_auth/traffic_ops_auth.go
@@ -1,5 +1,25 @@
package main
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
import (
"crypto/rand"
"crypto/sha512"
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/Gruntfile.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/Gruntfile.js b/traffic_ops/experimental/ui/Gruntfile.js
old mode 100755
new mode 100644
index 27f7a08..daeb4a0
--- a/traffic_ops/experimental/ui/Gruntfile.js
+++ b/traffic_ops/experimental/ui/Gruntfile.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
'use strict';
module.exports = function (grunt) {
@@ -76,4 +95,4 @@ module.exports = function (grunt) {
'browserify2:shared-libs-dev'
]);
-};
\ No newline at end of file
+};
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/app.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/app.js b/traffic_ops/experimental/ui/app/src/app.js
old mode 100755
new mode 100644
index 3a02446..30097cb
--- a/traffic_ops/experimental/ui/app/src/app.js
+++ b/traffic_ops/experimental/ui/app/src/app.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
'use strict';
require('app-templates');
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/assets/css/custom.css
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/assets/css/custom.css b/traffic_ops/experimental/ui/app/src/assets/css/custom.css
index 966097c..6759bab 100644
--- a/traffic_ops/experimental/ui/app/src/assets/css/custom.css
+++ b/traffic_ops/experimental/ui/app/src/assets/css/custom.css
@@ -1 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
/* override styles here */
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/api/ASNService.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/api/ASNService.js b/traffic_ops/experimental/ui/app/src/common/api/ASNService.js
index 514bed4..51706cf 100644
--- a/traffic_ops/experimental/ui/app/src/common/api/ASNService.js
+++ b/traffic_ops/experimental/ui/app/src/common/api/ASNService.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var ASNService = function(Restangular, locationUtils, messageModel) {
this.getASNs = function() {
@@ -48,4 +67,4 @@ var ASNService = function(Restangular, locationUtils, messageModel) {
};
ASNService.$inject = ['Restangular', 'locationUtils', 'messageModel'];
-module.exports = ASNService;
\ No newline at end of file
+module.exports = ASNService;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/api/AuthService.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/api/AuthService.js b/traffic_ops/experimental/ui/app/src/common/api/AuthService.js
index efb2a76..c2168e9 100644
--- a/traffic_ops/experimental/ui/app/src/common/api/AuthService.js
+++ b/traffic_ops/experimental/ui/app/src/common/api/AuthService.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var AuthService = function($http, $state, $location, $q, $state, httpService, userModel, messageModel, ENV) {
this.login = function(username, password) {
@@ -47,4 +66,4 @@ var AuthService = function($http, $state, $location, $q, $state, httpService, us
};
AuthService.$inject = ['$http', '$state', '$location', '$q', '$state', 'httpService', 'userModel', 'messageModel', 'ENV'];
-module.exports = AuthService;
\ No newline at end of file
+module.exports = AuthService;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/api/CDNService.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/api/CDNService.js b/traffic_ops/experimental/ui/app/src/common/api/CDNService.js
index 53f977e..e446eb6 100644
--- a/traffic_ops/experimental/ui/app/src/common/api/CDNService.js
+++ b/traffic_ops/experimental/ui/app/src/common/api/CDNService.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var CDNService = function(Restangular, locationUtils, messageModel) {
this.getCDNs = function() {
@@ -48,4 +67,4 @@ var CDNService = function(Restangular, locationUtils, messageModel) {
};
CDNService.$inject = ['Restangular', 'locationUtils', 'messageModel'];
-module.exports = CDNService;
\ No newline at end of file
+module.exports = CDNService;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/api/CacheGroupService.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/api/CacheGroupService.js b/traffic_ops/experimental/ui/app/src/common/api/CacheGroupService.js
index f52315b..cff779b 100644
--- a/traffic_ops/experimental/ui/app/src/common/api/CacheGroupService.js
+++ b/traffic_ops/experimental/ui/app/src/common/api/CacheGroupService.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var CacheGroupService = function(Restangular, locationUtils, messageModel) {
this.getCacheGroups = function() {
@@ -48,4 +67,4 @@ var CacheGroupService = function(Restangular, locationUtils, messageModel) {
};
CacheGroupService.$inject = ['Restangular', 'locationUtils', 'messageModel'];
-module.exports = CacheGroupService;
\ No newline at end of file
+module.exports = CacheGroupService;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/api/DeliveryServiceService.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/api/DeliveryServiceService.js b/traffic_ops/experimental/ui/app/src/common/api/DeliveryServiceService.js
index 4c2fc72..4f9cd72 100644
--- a/traffic_ops/experimental/ui/app/src/common/api/DeliveryServiceService.js
+++ b/traffic_ops/experimental/ui/app/src/common/api/DeliveryServiceService.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var DeliveryServiceService = function(Restangular, locationUtils, messageModel) {
this.getDeliveryServices = function() {
@@ -48,4 +67,4 @@ var DeliveryServiceService = function(Restangular, locationUtils, messageModel)
};
DeliveryServiceService.$inject = ['Restangular', 'locationUtils', 'messageModel'];
-module.exports = DeliveryServiceService;
\ No newline at end of file
+module.exports = DeliveryServiceService;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/api/DivisionService.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/api/DivisionService.js b/traffic_ops/experimental/ui/app/src/common/api/DivisionService.js
index 3181116..d10312e 100644
--- a/traffic_ops/experimental/ui/app/src/common/api/DivisionService.js
+++ b/traffic_ops/experimental/ui/app/src/common/api/DivisionService.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var DivisionService = function(Restangular, locationUtils, messageModel) {
this.getDivisions = function() {
@@ -48,4 +67,4 @@ var DivisionService = function(Restangular, locationUtils, messageModel) {
};
DivisionService.$inject = ['Restangular', 'locationUtils', 'messageModel'];
-module.exports = DivisionService;
\ No newline at end of file
+module.exports = DivisionService;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/api/HttpService.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/api/HttpService.js b/traffic_ops/experimental/ui/app/src/common/api/HttpService.js
index 5adf1fa..ab01b9d 100644
--- a/traffic_ops/experimental/ui/app/src/common/api/HttpService.js
+++ b/traffic_ops/experimental/ui/app/src/common/api/HttpService.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var HttpService = function($http, $q) {
this.get = function(resource) {
@@ -59,4 +78,4 @@ var HttpService = function($http, $q) {
};
HttpService.$inject = ['$http', '$q'];
-module.exports = HttpService;
\ No newline at end of file
+module.exports = HttpService;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/api/LocationService.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/api/LocationService.js b/traffic_ops/experimental/ui/app/src/common/api/LocationService.js
index 111cca6..81f94db 100644
--- a/traffic_ops/experimental/ui/app/src/common/api/LocationService.js
+++ b/traffic_ops/experimental/ui/app/src/common/api/LocationService.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var LocationService = function(Restangular, locationUtils, messageModel) {
this.getLocations = function() {
@@ -49,4 +68,4 @@ var LocationService = function(Restangular, locationUtils, messageModel) {
};
LocationService.$inject = ['Restangular', 'locationUtils', 'messageModel'];
-module.exports = LocationService;
\ No newline at end of file
+module.exports = LocationService;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/api/ParameterService.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/api/ParameterService.js b/traffic_ops/experimental/ui/app/src/common/api/ParameterService.js
index 5619add..8fccc22 100644
--- a/traffic_ops/experimental/ui/app/src/common/api/ParameterService.js
+++ b/traffic_ops/experimental/ui/app/src/common/api/ParameterService.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var ParameterService = function(Restangular, locationUtils, messageModel) {
this.getParameters = function() {
@@ -48,4 +67,4 @@ var ParameterService = function(Restangular, locationUtils, messageModel) {
};
ParameterService.$inject = ['Restangular', 'locationUtils', 'messageModel'];
-module.exports = ParameterService;
\ No newline at end of file
+module.exports = ParameterService;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/api/ProfileService.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/api/ProfileService.js b/traffic_ops/experimental/ui/app/src/common/api/ProfileService.js
index 545fe4b..67b322d 100644
--- a/traffic_ops/experimental/ui/app/src/common/api/ProfileService.js
+++ b/traffic_ops/experimental/ui/app/src/common/api/ProfileService.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var ProfileService = function(Restangular, locationUtils, messageModel) {
this.getProfiles = function() {
@@ -48,4 +67,4 @@ var ProfileService = function(Restangular, locationUtils, messageModel) {
};
ProfileService.$inject = ['Restangular', 'locationUtils', 'messageModel'];
-module.exports = ProfileService;
\ No newline at end of file
+module.exports = ProfileService;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/api/RegionService.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/api/RegionService.js b/traffic_ops/experimental/ui/app/src/common/api/RegionService.js
index f8795ce..1fbe78a 100644
--- a/traffic_ops/experimental/ui/app/src/common/api/RegionService.js
+++ b/traffic_ops/experimental/ui/app/src/common/api/RegionService.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var RegionService = function(Restangular, messageModel) {
this.getRegions = function() {
@@ -47,4 +66,4 @@ var RegionService = function(Restangular, messageModel) {
};
RegionService.$inject = ['Restangular', 'messageModel'];
-module.exports = RegionService;
\ No newline at end of file
+module.exports = RegionService;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/api/RoleService.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/api/RoleService.js b/traffic_ops/experimental/ui/app/src/common/api/RoleService.js
index 03b1c7a..26f283e 100644
--- a/traffic_ops/experimental/ui/app/src/common/api/RoleService.js
+++ b/traffic_ops/experimental/ui/app/src/common/api/RoleService.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var RoleService = function(Restangular, messageModel) {
this.getRoles = function() {
@@ -35,4 +54,4 @@ var RoleService = function(Restangular, messageModel) {
};
RoleService.$inject = ['Restangular', 'messageModel'];
-module.exports = RoleService;
\ No newline at end of file
+module.exports = RoleService;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/api/ServerService.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/api/ServerService.js b/traffic_ops/experimental/ui/app/src/common/api/ServerService.js
index 9b77c02..1ec7ce6 100644
--- a/traffic_ops/experimental/ui/app/src/common/api/ServerService.js
+++ b/traffic_ops/experimental/ui/app/src/common/api/ServerService.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var ServerService = function(Restangular, locationUtils, messageModel) {
this.getServers = function() {
@@ -48,4 +67,4 @@ var ServerService = function(Restangular, locationUtils, messageModel) {
};
ServerService.$inject = ['Restangular', 'locationUtils', 'messageModel'];
-module.exports = ServerService;
\ No newline at end of file
+module.exports = ServerService;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/api/StatusService.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/api/StatusService.js b/traffic_ops/experimental/ui/app/src/common/api/StatusService.js
index 7bc58e3..d648620 100644
--- a/traffic_ops/experimental/ui/app/src/common/api/StatusService.js
+++ b/traffic_ops/experimental/ui/app/src/common/api/StatusService.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var StatusService = function(Restangular, locationUtils, messageModel) {
this.getStatuses = function() {
@@ -48,4 +67,4 @@ var StatusService = function(Restangular, locationUtils, messageModel) {
};
StatusService.$inject = ['Restangular', 'locationUtils', 'messageModel'];
-module.exports = StatusService;
\ No newline at end of file
+module.exports = StatusService;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/api/TenantService.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/api/TenantService.js b/traffic_ops/experimental/ui/app/src/common/api/TenantService.js
index 287fa9f..1541e9a 100644
--- a/traffic_ops/experimental/ui/app/src/common/api/TenantService.js
+++ b/traffic_ops/experimental/ui/app/src/common/api/TenantService.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var TenantService = function(Restangular, messageModel) {
this.getTenants = function() {
@@ -47,4 +66,4 @@ var TenantService = function(Restangular, messageModel) {
};
TenantService.$inject = ['Restangular', 'messageModel'];
-module.exports = TenantService;
\ No newline at end of file
+module.exports = TenantService;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/api/TrafficOpsService.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/api/TrafficOpsService.js b/traffic_ops/experimental/ui/app/src/common/api/TrafficOpsService.js
index 1a0115f..63966f1 100644
--- a/traffic_ops/experimental/ui/app/src/common/api/TrafficOpsService.js
+++ b/traffic_ops/experimental/ui/app/src/common/api/TrafficOpsService.js
@@ -1,8 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var TrafficOpsService = function($http, $q) {
this.getReleaseVersionInfo = function() {
var deferred = $q.defer();
- $http.get('trafficOps_release.json')
+ $http.get('traffic_ops_release.json')
.success(function(result) {
deferred.resolve(result);
})
@@ -16,4 +35,4 @@ var TrafficOpsService = function($http, $q) {
};
TrafficOpsService.$inject = ['$http', '$q'];
-module.exports = TrafficOpsService;
\ No newline at end of file
+module.exports = TrafficOpsService;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/api/TypeService.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/api/TypeService.js b/traffic_ops/experimental/ui/app/src/common/api/TypeService.js
index e2aa43e..dd55d59 100644
--- a/traffic_ops/experimental/ui/app/src/common/api/TypeService.js
+++ b/traffic_ops/experimental/ui/app/src/common/api/TypeService.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var TypeService = function(Restangular, locationUtils, messageModel) {
this.getTypes = function(useInTable) {
@@ -48,4 +67,4 @@ var TypeService = function(Restangular, locationUtils, messageModel) {
};
TypeService.$inject = ['Restangular', 'locationUtils', 'messageModel'];
-module.exports = TypeService;
\ No newline at end of file
+module.exports = TypeService;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/api/UserService.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/api/UserService.js b/traffic_ops/experimental/ui/app/src/common/api/UserService.js
old mode 100755
new mode 100644
index 2f192ec..8fc8fb7
--- a/traffic_ops/experimental/ui/app/src/common/api/UserService.js
+++ b/traffic_ops/experimental/ui/app/src/common/api/UserService.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var UserService = function(Restangular, $http, $location, $q, authService, locationUtils, userModel, messageModel, ENV) {
var service = this;
@@ -90,4 +109,4 @@ var UserService = function(Restangular, $http, $location, $q, authService, locat
};
UserService.$inject = ['Restangular', '$http', '$location', '$q', 'authService', 'locationUtils', 'userModel', 'messageModel', 'ENV'];
-module.exports = UserService;
\ No newline at end of file
+module.exports = UserService;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/api/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/api/index.js b/traffic_ops/experimental/ui/app/src/common/api/index.js
old mode 100755
new mode 100644
index fcdefbd..857e598
--- a/traffic_ops/experimental/ui/app/src/common/api/index.js
+++ b/traffic_ops/experimental/ui/app/src/common/api/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.api', [])
.service('authService', require('./AuthService'))
.service('asnService', require('./ASNService'))
@@ -18,4 +37,4 @@ module.exports = angular.module('trafficOps.api', [])
.service('typeService', require('./TypeService'))
.service('trafficOpsService', require('./TrafficOpsService'))
.service('userService', require('./UserService'))
-;
\ No newline at end of file
+;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/directives/match/MatchDirective.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/directives/match/MatchDirective.js b/traffic_ops/experimental/ui/app/src/common/directives/match/MatchDirective.js
index 8548d14..e174d30 100644
--- a/traffic_ops/experimental/ui/app/src/common/directives/match/MatchDirective.js
+++ b/traffic_ops/experimental/ui/app/src/common/directives/match/MatchDirective.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var MatchDirective = function() {
return {
require: 'ngModel',
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/directives/match/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/directives/match/index.js b/traffic_ops/experimental/ui/app/src/common/directives/match/index.js
index c43d13b..340c064 100644
--- a/traffic_ops/experimental/ui/app/src/common/directives/match/index.js
+++ b/traffic_ops/experimental/ui/app/src/common/directives/match/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
//application directives
module.exports = angular.module('trafficOps.directives.match',[])
.directive('match', require('./MatchDirective'))
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/filters/OffsetFilter.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/filters/OffsetFilter.js b/traffic_ops/experimental/ui/app/src/common/filters/OffsetFilter.js
index 4c8bc0b..8f9a5a8 100644
--- a/traffic_ops/experimental/ui/app/src/common/filters/OffsetFilter.js
+++ b/traffic_ops/experimental/ui/app/src/common/filters/OffsetFilter.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var OffsetFilter = function() {
return function(input, start) {
if($.isArray(input)) {
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/filters/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/filters/index.js b/traffic_ops/experimental/ui/app/src/common/filters/index.js
index 86e8455..93c6a6c 100644
--- a/traffic_ops/experimental/ui/app/src/common/filters/index.js
+++ b/traffic_ops/experimental/ui/app/src/common/filters/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.filters', [])
.filter('offsetFilter', require('./OffsetFilter'))
;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/models/MessageModel.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/models/MessageModel.js b/traffic_ops/experimental/ui/app/src/common/models/MessageModel.js
index f1dcaf3..279602b 100644
--- a/traffic_ops/experimental/ui/app/src/common/models/MessageModel.js
+++ b/traffic_ops/experimental/ui/app/src/common/models/MessageModel.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var MessageModel = function($rootScope) {
var model = this;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/models/UserModel.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/models/UserModel.js b/traffic_ops/experimental/ui/app/src/common/models/UserModel.js
old mode 100755
new mode 100644
index d3effdf..bf1c624
--- a/traffic_ops/experimental/ui/app/src/common/models/UserModel.js
+++ b/traffic_ops/experimental/ui/app/src/common/models/UserModel.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var UserModel = function($rootScope) {
this.loaded = false;
@@ -20,4 +39,4 @@ var UserModel = function($rootScope) {
};
UserModel.$inject = ['$rootScope'];
-module.exports = UserModel;
\ No newline at end of file
+module.exports = UserModel;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/models/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/models/index.js b/traffic_ops/experimental/ui/app/src/common/models/index.js
old mode 100755
new mode 100644
index 330b916..de009a7
--- a/traffic_ops/experimental/ui/app/src/common/models/index.js
+++ b/traffic_ops/experimental/ui/app/src/common/models/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.models', [])
.service('messageModel', require('./MessageModel'))
.service('userModel', require('./UserModel'));
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/dialog/confirm/DialogConfirmController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/dialog/confirm/DialogConfirmController.js b/traffic_ops/experimental/ui/app/src/common/modules/dialog/confirm/DialogConfirmController.js
index a018ada..c936647 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/dialog/confirm/DialogConfirmController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/dialog/confirm/DialogConfirmController.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var DialogConfirmController = function(params, $scope, $uibModalInstance) {
$scope.params = params;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/dialog/confirm/dialog.confirm.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/dialog/confirm/dialog.confirm.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/dialog/confirm/dialog.confirm.tpl.html
index e3791ec..ba48140 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/dialog/confirm/dialog.confirm.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/common/modules/dialog/confirm/dialog.confirm.tpl.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<div class="modal-header">
<button type="button" class="close" ng-click="no()"><span aria-hidden="true">×</span><span class="sr-only">Close</span></button>
<h4 class="modal-title">{{params.title}}</h4>
@@ -8,4 +27,4 @@
<div class="modal-footer">
<button class="btn action-btn" ng-click="no()">No</button>
<button class="btn btn-link" ng-click="yes()">Yes</button>
-</div>
\ No newline at end of file
+</div>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/dialog/confirm/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/dialog/confirm/index.js b/traffic_ops/experimental/ui/app/src/common/modules/dialog/confirm/index.js
index cb43316..1c4d8de 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/dialog/confirm/index.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/dialog/confirm/index.js
@@ -1,2 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.dialog.confirm', [])
.controller('DialogConfirmController', require('./DialogConfirmController'));
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/dialog/delete/DialogDeleteController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/dialog/delete/DialogDeleteController.js b/traffic_ops/experimental/ui/app/src/common/modules/dialog/delete/DialogDeleteController.js
index f06d0a2..f3633cd 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/dialog/delete/DialogDeleteController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/dialog/delete/DialogDeleteController.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var DialogDeleteController = function(params, $scope, $uibModalInstance) {
$scope.params = params;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/dialog/delete/dialog.delete.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/dialog/delete/dialog.delete.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/dialog/delete/dialog.delete.tpl.html
index a1d3d1c..9a89124 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/dialog/delete/dialog.delete.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/common/modules/dialog/delete/dialog.delete.tpl.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<div class="modal-header">
<button type="button" class="close" ng-click="cancel()"><span aria-hidden="true">×</span><span class="sr-only">Cancel</span></button>
<h4 class="modal-title">{{params.title}}</h4>
@@ -10,4 +29,4 @@
</div>
<div class="modal-footer">
<button type="button" class="btn btn-danger" ng-disabled="deleteForm.$pristine || deleteForm.$invalid" ng-click="delete()">Delete Permanently</button>
-</div>
\ No newline at end of file
+</div>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/dialog/delete/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/dialog/delete/index.js b/traffic_ops/experimental/ui/app/src/common/modules/dialog/delete/index.js
index ed9c108..5cc5624 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/dialog/delete/index.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/dialog/delete/index.js
@@ -1,2 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.dialog.delete', [])
.controller('DialogDeleteController', require('./DialogDeleteController'));
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/dialog/reset/DialogResetController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/dialog/reset/DialogResetController.js b/traffic_ops/experimental/ui/app/src/common/modules/dialog/reset/DialogResetController.js
index 14e7d94..2b0c6c7 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/dialog/reset/DialogResetController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/dialog/reset/DialogResetController.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var DialogResetController = function($scope, $uibModalInstance) {
$scope.userData = {
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/dialog/reset/dialog.reset.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/dialog/reset/dialog.reset.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/dialog/reset/dialog.reset.tpl.html
index 84f0ed2..dd541f7 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/dialog/reset/dialog.reset.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/common/modules/dialog/reset/dialog.reset.tpl.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<div class="modal-header">
<button type="button" class="close" ng-click="cancel()"><span aria-hidden="true">×</span><span class="sr-only">Close</span></button>
<h5 class="modal-title">Reset User Password</h5>
@@ -18,4 +37,4 @@
<div class="modal-footer">
<button class="btn btn-default" ng-click="cancel()">Cancel</button>
<button class="btn btn-primary" ng-disabled="resetPasswordForm.$pristine || resetPasswordForm.$invalid" ng-click="reset(userData.email)">Reset</button>
-</div>
\ No newline at end of file
+</div>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/dialog/reset/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/dialog/reset/index.js b/traffic_ops/experimental/ui/app/src/common/modules/dialog/reset/index.js
index 30ec1b2..89fce16 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/dialog/reset/index.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/dialog/reset/index.js
@@ -1,2 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.dialog.reset', [])
.controller('DialogResetController', require('./DialogResetController'));
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/asn/FormASNController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/asn/FormASNController.js b/traffic_ops/experimental/ui/app/src/common/modules/form/asn/FormASNController.js
index 3b57f13..85f1475 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/asn/FormASNController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/asn/FormASNController.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var FormASNController = function(asn, $scope, formUtils, locationUtils, cacheGroupService) {
var getCacheGroups = function() {
@@ -23,4 +42,4 @@ var FormASNController = function(asn, $scope, formUtils, locationUtils, cacheGro
};
FormASNController.$inject = ['asn', '$scope', 'formUtils', 'locationUtils', 'cacheGroupService'];
-module.exports = FormASNController;
\ No newline at end of file
+module.exports = FormASNController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/asn/edit/FormEditASNController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/asn/edit/FormEditASNController.js b/traffic_ops/experimental/ui/app/src/common/modules/form/asn/edit/FormEditASNController.js
index 69d4ffc..bd13129 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/asn/edit/FormEditASNController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/asn/edit/FormEditASNController.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var FormEditASNController = function(asn, $scope, $controller, $uibModal, $anchorScroll, locationUtils, asnService) {
// extends the FormASNController to inherit common methods
@@ -50,4 +69,4 @@ var FormEditASNController = function(asn, $scope, $controller, $uibModal, $ancho
};
FormEditASNController.$inject = ['asn', '$scope', '$controller', '$uibModal', '$anchorScroll', 'locationUtils', 'asnService'];
-module.exports = FormEditASNController;
\ No newline at end of file
+module.exports = FormEditASNController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/asn/edit/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/asn/edit/index.js b/traffic_ops/experimental/ui/app/src/common/modules/form/asn/edit/index.js
index b5e864d..1635d87 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/asn/edit/index.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/asn/edit/index.js
@@ -1,2 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.form.asn.edit', [])
.controller('FormEditASNController', require('./FormEditASNController'));
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/asn/form.asn.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/asn/form.asn.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/form/asn/form.asn.tpl.html
index c6603a1..e89b19a 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/asn/form.asn.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/asn/form.asn.tpl.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<div class="x_panel">
<div class="x_title">
<ol class="breadcrumb">
@@ -34,4 +53,4 @@
</div>
</form>
</div>
-</div>
\ No newline at end of file
+</div>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/asn/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/asn/index.js b/traffic_ops/experimental/ui/app/src/common/modules/form/asn/index.js
index 7fa8c41..7bd408e 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/asn/index.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/asn/index.js
@@ -1,2 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.form.asn', [])
.controller('FormASNController', require('./FormASNController'));
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/asn/new/FormNewASNController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/asn/new/FormNewASNController.js b/traffic_ops/experimental/ui/app/src/common/modules/form/asn/new/FormNewASNController.js
index 7cace29..e5b513f 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/asn/new/FormNewASNController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/asn/new/FormNewASNController.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var FormNewASNController = function(asn, $scope, $controller, asnService) {
// extends the FormASNController to inherit common methods
@@ -17,4 +36,4 @@ var FormNewASNController = function(asn, $scope, $controller, asnService) {
};
FormNewASNController.$inject = ['asn', '$scope', '$controller', 'asnService'];
-module.exports = FormNewASNController;
\ No newline at end of file
+module.exports = FormNewASNController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/asn/new/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/asn/new/index.js b/traffic_ops/experimental/ui/app/src/common/modules/form/asn/new/index.js
index f191ac6..9b4e89c 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/asn/new/index.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/asn/new/index.js
@@ -1,2 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.form.asn.new', [])
.controller('FormNewASNController', require('./FormNewASNController'));
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/cacheGroup/FormCacheGroupController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/cacheGroup/FormCacheGroupController.js b/traffic_ops/experimental/ui/app/src/common/modules/form/cacheGroup/FormCacheGroupController.js
index 2b8e3c7..5be5589 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/cacheGroup/FormCacheGroupController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/cacheGroup/FormCacheGroupController.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var FormCacheGroupController = function(cacheGroup, $scope, formUtils, locationUtils, cacheGroupService, typeService) {
var getCacheGroups = function() {
@@ -31,4 +50,4 @@ var FormCacheGroupController = function(cacheGroup, $scope, formUtils, locationU
};
FormCacheGroupController.$inject = ['cacheGroup', '$scope', 'formUtils', 'locationUtils', 'cacheGroupService', 'typeService'];
-module.exports = FormCacheGroupController;
\ No newline at end of file
+module.exports = FormCacheGroupController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/cacheGroup/edit/FormEditCacheGroupController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/cacheGroup/edit/FormEditCacheGroupController.js b/traffic_ops/experimental/ui/app/src/common/modules/form/cacheGroup/edit/FormEditCacheGroupController.js
index 6f4eddd..a59d358 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/cacheGroup/edit/FormEditCacheGroupController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/cacheGroup/edit/FormEditCacheGroupController.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var FormEditCacheGroupController = function(cacheGroup, $scope, $controller, $uibModal, $anchorScroll, locationUtils, cacheGroupService) {
// extends the FormCacheGroupController to inherit common methods
@@ -50,4 +69,4 @@ var FormEditCacheGroupController = function(cacheGroup, $scope, $controller, $ui
};
FormEditCacheGroupController.$inject = ['cacheGroup', '$scope', '$controller', '$uibModal', '$anchorScroll', 'locationUtils', 'cacheGroupService'];
-module.exports = FormEditCacheGroupController;
\ No newline at end of file
+module.exports = FormEditCacheGroupController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/cacheGroup/edit/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/cacheGroup/edit/index.js b/traffic_ops/experimental/ui/app/src/common/modules/form/cacheGroup/edit/index.js
index 3a8e36d..180be0c 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/cacheGroup/edit/index.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/cacheGroup/edit/index.js
@@ -1,2 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.form.cacheGroup.edit', [])
.controller('FormEditCacheGroupController', require('./FormEditCacheGroupController'));
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/cacheGroup/form.cacheGroup.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/cacheGroup/form.cacheGroup.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/form/cacheGroup/form.cacheGroup.tpl.html
index f2681b9..f881cad 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/cacheGroup/form.cacheGroup.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/cacheGroup/form.cacheGroup.tpl.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<div class="x_panel">
<div class="x_title">
<ol class="breadcrumb">
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/cacheGroup/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/cacheGroup/index.js b/traffic_ops/experimental/ui/app/src/common/modules/form/cacheGroup/index.js
index 1dcc727..b0652d1 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/cacheGroup/index.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/cacheGroup/index.js
@@ -1,2 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.form.cacheGroup', [])
.controller('FormCacheGroupController', require('./FormCacheGroupController'));
[03/26] incubator-trafficcontrol git commit: merge master
Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/config/WatcherConfig.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/config/WatcherConfig.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/config/WatcherConfig.java
index 5d796ae..fde22f9 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/config/WatcherConfig.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/config/WatcherConfig.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/DNSAccessEventBuilder.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/DNSAccessEventBuilder.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/DNSAccessEventBuilder.java
index 12548fb..feeb64e 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/DNSAccessEventBuilder.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/DNSAccessEventBuilder.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/DNSAccessRecord.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/DNSAccessRecord.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/DNSAccessRecord.java
index 81a196c..8bf54f4 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/DNSAccessRecord.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/DNSAccessRecord.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/DNSException.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/DNSException.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/DNSException.java
index 4006710..08aaff0 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/DNSException.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/DNSException.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/DNSKeyPairWrapper.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/DNSKeyPairWrapper.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/DNSKeyPairWrapper.java
index 84ba46c..379061f 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/DNSKeyPairWrapper.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/DNSKeyPairWrapper.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/NameServer.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/NameServer.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/NameServer.java
index 3004b81..1bf3c2e 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/NameServer.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/NameServer.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/NameServerMain.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/NameServerMain.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/NameServerMain.java
index 4a163f0..96be930 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/NameServerMain.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/NameServerMain.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/SignatureManager.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/SignatureManager.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/SignatureManager.java
index 98edd33..7ee3b33 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/SignatureManager.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/SignatureManager.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/SignedZoneKey.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/SignedZoneKey.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/SignedZoneKey.java
index 073f2e5..61fd439 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/SignedZoneKey.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/SignedZoneKey.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/ZoneKey.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/ZoneKey.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/ZoneKey.java
index bd8f76e..cfb913a 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/ZoneKey.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/ZoneKey.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/ZoneManager.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/ZoneManager.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/ZoneManager.java
index edba821..e6d8452 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/ZoneManager.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/ZoneManager.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/ZoneUtils.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/ZoneUtils.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/ZoneUtils.java
index 8346f36..7d366bb 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/ZoneUtils.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/ZoneUtils.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/protocol/AbstractProtocol.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/protocol/AbstractProtocol.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/protocol/AbstractProtocol.java
index f67ad7b..7671b02 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/protocol/AbstractProtocol.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/protocol/AbstractProtocol.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/protocol/Protocol.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/protocol/Protocol.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/protocol/Protocol.java
index c93fde0..c8d2d5f 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/protocol/Protocol.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/protocol/Protocol.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/protocol/TCP.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/protocol/TCP.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/protocol/TCP.java
index 18f949c..604024d 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/protocol/TCP.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/protocol/TCP.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/protocol/UDP.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/protocol/UDP.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/protocol/UDP.java
index 39afdad..9b602e9 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/protocol/UDP.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/protocol/UDP.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/DeliveryService.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/DeliveryService.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/DeliveryService.java
index bddcc91..dca8332 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/DeliveryService.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/DeliveryService.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/DeliveryServiceMatcher.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/DeliveryServiceMatcher.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/DeliveryServiceMatcher.java
index 3a876d4..716fb5a 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/DeliveryServiceMatcher.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/DeliveryServiceMatcher.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/Dispersion.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/Dispersion.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/Dispersion.java
index 6142412..9382748 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/Dispersion.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/Dispersion.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/Steering.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/Steering.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/Steering.java
index bdf0aaf..d42a9d8 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/Steering.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/Steering.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/SteeringFilter.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/SteeringFilter.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/SteeringFilter.java
index d997541..4bbd075 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/SteeringFilter.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/SteeringFilter.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2016 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/SteeringRegistry.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/SteeringRegistry.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/SteeringRegistry.java
index bcba65f..669ed5c 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/SteeringRegistry.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/SteeringRegistry.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/SteeringTarget.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/SteeringTarget.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/SteeringTarget.java
index fd6f309..e2d64f3 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/SteeringTarget.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/SteeringTarget.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/SteeringWatcher.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/SteeringWatcher.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/SteeringWatcher.java
index dd7b15f..66174ce 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/SteeringWatcher.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/SteeringWatcher.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/hash/ConsistentHasher.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/hash/ConsistentHasher.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/hash/ConsistentHasher.java
index 56e6f04..ff1347e 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/hash/ConsistentHasher.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/hash/ConsistentHasher.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2016 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/hash/DefaultHashable.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/hash/DefaultHashable.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/hash/DefaultHashable.java
index 18a4403..2dfe264 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/hash/DefaultHashable.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/hash/DefaultHashable.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2016 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/hash/Hashable.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/hash/Hashable.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/hash/Hashable.java
index 5c604ba..27b7d53 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/hash/Hashable.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/hash/Hashable.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2016 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/hash/MD5HashFunction.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/hash/MD5HashFunction.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/hash/MD5HashFunction.java
index 2f7e3bb..f067423 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/hash/MD5HashFunction.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/hash/MD5HashFunction.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/hash/NumberSearcher.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/hash/NumberSearcher.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/hash/NumberSearcher.java
index 12cdd88..5bc7318 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/hash/NumberSearcher.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/hash/NumberSearcher.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2016 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/http/HTTPAccessEventBuilder.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/http/HTTPAccessEventBuilder.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/http/HTTPAccessEventBuilder.java
index 4ad8335..ca2712e 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/http/HTTPAccessEventBuilder.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/http/HTTPAccessEventBuilder.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/http/HTTPAccessRecord.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/http/HTTPAccessRecord.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/http/HTTPAccessRecord.java
index 45035db..38d0924 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/http/HTTPAccessRecord.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/http/HTTPAccessRecord.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/http/HttpAccessRequestHeaders.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/http/HttpAccessRequestHeaders.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/http/HttpAccessRequestHeaders.java
index f2fa213..37b9a30 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/http/HttpAccessRequestHeaders.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/http/HttpAccessRequestHeaders.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/http/RouterFilter.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/http/RouterFilter.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/http/RouterFilter.java
index 5acdddb..9a09907 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/http/RouterFilter.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/http/RouterFilter.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/AbstractServiceUpdater.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/AbstractServiceUpdater.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/AbstractServiceUpdater.java
index 5477c2a..ba1698b 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/AbstractServiceUpdater.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/AbstractServiceUpdater.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -165,7 +164,7 @@ public abstract class AbstractServiceUpdater {
}
} finally {
- if (newDB != null && newDB.exists()) {
+ if (newDB != null && newDB != existingDB && newDB.exists()) {
LOGGER.info("[" + getClass().getSimpleName() + "] Try to delete downloaded temp file");
deleteDatabase(newDB);
}
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/Federation.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/Federation.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/Federation.java
index 063e4f0..8d2c2ce 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/Federation.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/Federation.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/FederationMapping.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/FederationMapping.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/FederationMapping.java
index fa7c896..63bd0c0 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/FederationMapping.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/FederationMapping.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/FederationMappingBuilder.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/FederationMappingBuilder.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/FederationMappingBuilder.java
index 057e53c..1b6a22f 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/FederationMappingBuilder.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/FederationMappingBuilder.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/FederationRegistry.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/FederationRegistry.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/FederationRegistry.java
index 68d81de..40ffe4f 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/FederationRegistry.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/FederationRegistry.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/FederationsBuilder.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/FederationsBuilder.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/FederationsBuilder.java
index 46252fb..441db11 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/FederationsBuilder.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/FederationsBuilder.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/FederationsWatcher.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/FederationsWatcher.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/FederationsWatcher.java
index df9f874..58988e9 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/FederationsWatcher.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/FederationsWatcher.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/GeolocationDatabaseUpdater.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/GeolocationDatabaseUpdater.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/GeolocationDatabaseUpdater.java
index 5942b38..29b22f4 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/GeolocationDatabaseUpdater.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/GeolocationDatabaseUpdater.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/MaxmindGeolocationService.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/MaxmindGeolocationService.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/MaxmindGeolocationService.java
index 7a5dd99..b9150d2 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/MaxmindGeolocationService.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/MaxmindGeolocationService.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/NetworkNode.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/NetworkNode.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/NetworkNode.java
index 02a7f66..4114204 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/NetworkNode.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/NetworkNode.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/NetworkNodeException.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/NetworkNodeException.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/NetworkNodeException.java
index 57b7fee..20216a0 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/NetworkNodeException.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/NetworkNodeException.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/NetworkUpdater.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/NetworkUpdater.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/NetworkUpdater.java
index d86006b..c5f3e03 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/NetworkUpdater.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/NetworkUpdater.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeo.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeo.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeo.java
index 92235d0..26a8a96 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeo.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeo.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Cisco Systems, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoDsvc.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoDsvc.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoDsvc.java
index 7a2fabf..9f9d7d1 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoDsvc.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoDsvc.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Cisco Systems, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoResult.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoResult.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoResult.java
index 5ae9b2f..c9d9de5 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoResult.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoResult.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Cisco Systems, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoRule.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoRule.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoRule.java
index 52b1ea3..0b5b749 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoRule.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoRule.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Cisco Systems, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoUpdater.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoUpdater.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoUpdater.java
index 2fb0261..4d8ce36 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoUpdater.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoUpdater.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Cisco Systems, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/monitor/TrafficMonitorResourceUrl.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/monitor/TrafficMonitorResourceUrl.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/monitor/TrafficMonitorResourceUrl.java
index cc7392e..a5900e5 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/monitor/TrafficMonitorResourceUrl.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/monitor/TrafficMonitorResourceUrl.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2016 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/monitor/TrafficMonitorWatcher.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/monitor/TrafficMonitorWatcher.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/monitor/TrafficMonitorWatcher.java
index 01caf8f..577ebe2 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/monitor/TrafficMonitorWatcher.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/monitor/TrafficMonitorWatcher.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/request/DNSRequest.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/request/DNSRequest.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/request/DNSRequest.java
index d12746d..bd218a0 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/request/DNSRequest.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/request/DNSRequest.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/request/HTTPRequest.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/request/HTTPRequest.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/request/HTTPRequest.java
index 1bf372a..2410be7 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/request/HTTPRequest.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/request/HTTPRequest.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/request/Request.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/request/Request.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/request/Request.java
index 443b712..f6ac1c9 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/request/Request.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/request/Request.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/request/RequestMatcher.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/request/RequestMatcher.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/request/RequestMatcher.java
index c0d9975..14fca52 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/request/RequestMatcher.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/request/RequestMatcher.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/CacheLocationComparator.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/CacheLocationComparator.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/CacheLocationComparator.java
index 1cd6771..bc64c4a 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/CacheLocationComparator.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/CacheLocationComparator.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/DNSRouteResult.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/DNSRouteResult.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/DNSRouteResult.java
index 0e1ac10..ba81318 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/DNSRouteResult.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/DNSRouteResult.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/HTTPRouteResult.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/HTTPRouteResult.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/HTTPRouteResult.java
index 2852749..2c7e87f 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/HTTPRouteResult.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/HTTPRouteResult.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/RouteResult.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/RouteResult.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/RouteResult.java
index 6e95a07..4a9dedf 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/RouteResult.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/RouteResult.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/StatTracker.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/StatTracker.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/StatTracker.java
index cdc0e34..53c67aa 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/StatTracker.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/StatTracker.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/TrafficRouter.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/TrafficRouter.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/TrafficRouter.java
index 82a68c1..e3cfd90 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/TrafficRouter.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/TrafficRouter.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/TrafficRouterManager.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/TrafficRouterManager.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/TrafficRouterManager.java
index 284560f..be930dd 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/TrafficRouterManager.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/TrafficRouterManager.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/secure/CertificatesClient.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/secure/CertificatesClient.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/secure/CertificatesClient.java
index c350046..ae4525d 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/secure/CertificatesClient.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/secure/CertificatesClient.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2016 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/secure/CertificatesPoller.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/secure/CertificatesPoller.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/secure/CertificatesPoller.java
index 5291709..5093693 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/secure/CertificatesPoller.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/secure/CertificatesPoller.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2016 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/secure/CertificatesPublisher.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/secure/CertificatesPublisher.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/secure/CertificatesPublisher.java
index df36059..2ab8dfd 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/secure/CertificatesPublisher.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/secure/CertificatesPublisher.java
@@ -1,5 +1,25 @@
package com.comcast.cdn.traffic_control.traffic_router.core.secure;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
import com.comcast.cdn.traffic_control.traffic_router.core.config.CertificateChecker;
import com.comcast.cdn.traffic_control.traffic_router.core.ds.DeliveryService;
import com.comcast.cdn.traffic_control.traffic_router.core.router.TrafficRouterManager;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/secure/CertificatesResponse.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/secure/CertificatesResponse.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/secure/CertificatesResponse.java
index acf7dfb..4622cfe 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/secure/CertificatesResponse.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/secure/CertificatesResponse.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2016 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/status/model/CacheModel.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/status/model/CacheModel.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/status/model/CacheModel.java
index 0beedff..eaaa59e 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/status/model/CacheModel.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/status/model/CacheModel.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/status/model/LocationModel.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/status/model/LocationModel.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/status/model/LocationModel.java
index af0c9c7..afd5f69 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/status/model/LocationModel.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/status/model/LocationModel.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/AbstractResourceWatcher.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/AbstractResourceWatcher.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/AbstractResourceWatcher.java
index e4a5639..9b962ca 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/AbstractResourceWatcher.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/AbstractResourceWatcher.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/AbstractUpdatable.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/AbstractUpdatable.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/AbstractUpdatable.java
index b85787f..1e064a8 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/AbstractUpdatable.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/AbstractUpdatable.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/CidrAddress.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/CidrAddress.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/CidrAddress.java
index dd72ad5..ab90493 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/CidrAddress.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/CidrAddress.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/ComparableStringByLength.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/ComparableStringByLength.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/ComparableStringByLength.java
index 672b1e4..4439619 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/ComparableStringByLength.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/ComparableStringByLength.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/ComparableTreeSet.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/ComparableTreeSet.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/ComparableTreeSet.java
index 60d658e..1bc223c 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/ComparableTreeSet.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/ComparableTreeSet.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/Config.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/Config.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/Config.java
index 9589821..1cee36c 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/Config.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/Config.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/DataExporter.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/DataExporter.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/DataExporter.java
index bc1451f..adedfd7 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/DataExporter.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/DataExporter.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/DefaultResourceUrl.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/DefaultResourceUrl.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/DefaultResourceUrl.java
index 3851a55..a103f30 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/DefaultResourceUrl.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/DefaultResourceUrl.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2016 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/FederationExporter.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/FederationExporter.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/FederationExporter.java
index 499d9a0..61bdc26 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/FederationExporter.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/FederationExporter.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/Fetcher.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/Fetcher.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/Fetcher.java
index e6b7ffa..65d77f7 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/Fetcher.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/Fetcher.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/LanguidState.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/LanguidState.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/LanguidState.java
index c721393..83b0a8f 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/LanguidState.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/LanguidState.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/PeriodicResourceUpdater.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/PeriodicResourceUpdater.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/PeriodicResourceUpdater.java
index ab7011d..148ae15 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/PeriodicResourceUpdater.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/PeriodicResourceUpdater.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/ProtectedFetcher.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/ProtectedFetcher.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/ProtectedFetcher.java
index f802b66..10da44f 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/ProtectedFetcher.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/ProtectedFetcher.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/ResourceUrl.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/ResourceUrl.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/ResourceUrl.java
index e6f599c..6669452 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/ResourceUrl.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/ResourceUrl.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/StringProtector.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/StringProtector.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/StringProtector.java
index 50a6e02..351022f 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/StringProtector.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/StringProtector.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/TrafficOpsUtils.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/TrafficOpsUtils.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/TrafficOpsUtils.java
index a2a8a0e..350a1ed 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/TrafficOpsUtils.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/TrafficOpsUtils.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/opt/tomcat/conf/server.xml
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/opt/tomcat/conf/server.xml b/traffic_router/core/src/main/opt/tomcat/conf/server.xml
index ecaa16a..fe24a96 100644
--- a/traffic_router/core/src/main/opt/tomcat/conf/server.xml
+++ b/traffic_router/core/src/main/opt/tomcat/conf/server.xml
@@ -1,6 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/resources/applicationProperties.xml
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/resources/applicationProperties.xml b/traffic_router/core/src/main/resources/applicationProperties.xml
index 141aa89..8c846a7 100644
--- a/traffic_router/core/src/main/resources/applicationProperties.xml
+++ b/traffic_router/core/src/main/resources/applicationProperties.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/resources/dns-traffic-router.xml
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/resources/dns-traffic-router.xml b/traffic_router/core/src/main/resources/dns-traffic-router.xml
index 765685e..b94f6e8 100644
--- a/traffic_router/core/src/main/resources/dns-traffic-router.xml
+++ b/traffic_router/core/src/main/resources/dns-traffic-router.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/resources/version.prop
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/resources/version.prop b/traffic_router/core/src/main/resources/version.prop
index 82bfaf2..6975f60 100644
--- a/traffic_router/core/src/main/resources/version.prop
+++ b/traffic_router/core/src/main/resources/version.prop
@@ -1,5 +1,4 @@
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/scripts/postinstall.sh
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/scripts/postinstall.sh b/traffic_router/core/src/main/scripts/postinstall.sh
index e0d3e64..5cee661 100644
--- a/traffic_router/core/src/main/scripts/postinstall.sh
+++ b/traffic_router/core/src/main/scripts/postinstall.sh
@@ -1,6 +1,5 @@
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
[22/26] incubator-trafficcontrol git commit: merge master
Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/infrastructure/test/apitest/apitest.go
----------------------------------------------------------------------
diff --git a/infrastructure/test/apitest/apitest.go b/infrastructure/test/apitest/apitest.go
index 7ca4a21..584d48c 100644
--- a/infrastructure/test/apitest/apitest.go
+++ b/infrastructure/test/apitest/apitest.go
@@ -1,5 +1,25 @@
package apitest
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
import (
"bytes"
"crypto/tls"
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/infrastructure/test/environment/environment.go
----------------------------------------------------------------------
diff --git a/infrastructure/test/environment/environment.go b/infrastructure/test/environment/environment.go
index 262dae5..752c853 100644
--- a/infrastructure/test/environment/environment.go
+++ b/infrastructure/test/environment/environment.go
@@ -1,5 +1,25 @@
package environment
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
import (
"encoding/json"
"io/ioutil"
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/infrastructure/test/ui/traffic_ops/traffic_ops_test.go
----------------------------------------------------------------------
diff --git a/infrastructure/test/ui/traffic_ops/traffic_ops_test.go b/infrastructure/test/ui/traffic_ops/traffic_ops_test.go
index d54f892..1a9e2f0 100644
--- a/infrastructure/test/ui/traffic_ops/traffic_ops_test.go
+++ b/infrastructure/test/ui/traffic_ops/traffic_ops_test.go
@@ -1,5 +1,25 @@
package main
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
import (
"testing"
"time"
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/misc/changelog.pl
----------------------------------------------------------------------
diff --git a/misc/changelog.pl b/misc/changelog.pl
index 35c03e1..edbffc3 100755
--- a/misc/changelog.pl
+++ b/misc/changelog.pl
@@ -1,6 +1,5 @@
#!/usr/bin/perl
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/misc/kickstart_create_network_line.py
----------------------------------------------------------------------
diff --git a/misc/kickstart_create_network_line.py b/misc/kickstart_create_network_line.py
index 66c85c7..ee1378e 100755
--- a/misc/kickstart_create_network_line.py
+++ b/misc/kickstart_create_network_line.py
@@ -1,5 +1,4 @@
#!/usr/bin/python
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/misc/kickstart_drive_config.sh
----------------------------------------------------------------------
diff --git a/misc/kickstart_drive_config.sh b/misc/kickstart_drive_config.sh
index bf2e2a1..1d6b824 100644
--- a/misc/kickstart_drive_config.sh
+++ b/misc/kickstart_drive_config.sh
@@ -1,6 +1,5 @@
#!/bin/bash
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/misc/release.pl
----------------------------------------------------------------------
diff --git a/misc/release.pl b/misc/release.pl
index 8f7d9ef..e46e443 100755
--- a/misc/release.pl
+++ b/misc/release.pl
@@ -1,6 +1,5 @@
#!/usr/bin/env perl
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -33,7 +32,7 @@ my $usage = "\n"
. "--gpg-key - Your gpg-key id. ie: 774ACED1\n"
. "--release-no - The release-no name you want to cut. ie: 1.1.0\n"
. "--git-hash - (optional) The git hash that will be used to reference the release. ie: da4aab57d \n"
- . "--git-remote-url - (optional) Overrides the git repo URL where the release will be pulled and sent (mostly for testing). ie: git\@github.com:yourrepo/traffic_control.git \n"
+ . "--git-remote-url - (optional) Overrides the git repo URL where the release will be pulled and sent (mostly for testing). ie: git\@github.com:yourrepo/incubator-trafficcontrol.git \n"
. "--dry-run - (optional) Simulation mode which will NOT apply any changes. \n"
. "--debug - (optional) Show debug output\n"
. "\nArguments: \n\n"
@@ -44,7 +43,7 @@ my $usage = "\n"
my $git_remote_name = 'official';
#my $git_remote_url = 'git@github.com:Comcast/traffic_control.git';
-my $git_remote_url = 'git@github.com:Comcast/traffic_control.git';
+my $git_remote_url = 'https://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol.git';
my $gpg_key;
my $release_no;
@@ -207,7 +206,7 @@ sub check_branch_exists {
sub clone_repo_to_tmp {
my $tmp_dir = "/tmp";
- my $tc_dir = "traffic_control";
+ my $tc_dir = "incubator-trafficcontrol";
$working_dir = sprintf( "%s/%s", $tmp_dir, $tc_dir );
remove_tree($working_dir);
chdir $tmp_dir;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/misc/traffic-control-cdn/css/home.css
----------------------------------------------------------------------
diff --git a/misc/traffic-control-cdn/css/home.css b/misc/traffic-control-cdn/css/home.css
index 42d3b52..5b61953 100644
--- a/misc/traffic-control-cdn/css/home.css
+++ b/misc/traffic-control-cdn/css/home.css
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
/*!
* Home Screen CSS
*
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/misc/traffic-control-cdn/downloads/index.html
----------------------------------------------------------------------
diff --git a/misc/traffic-control-cdn/downloads/index.html b/misc/traffic-control-cdn/downloads/index.html
index 1c0f0ef..554d9a1 100644
--- a/misc/traffic-control-cdn/downloads/index.html
+++ b/misc/traffic-control-cdn/downloads/index.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<!DOCTYPE html>
<html lang="en">
<head>
@@ -33,20 +52,20 @@
<p class="sectionContainer">All RPMs have been built and tested on CentOS 6.5.<br></p>
<!-- 1.7.0 -->
- <p class="sectionContainer">PRE-RELEASE -- RELEASE-1.7.0<br>
+ <p class="sectionContainer">STABLE -- RELEASE-1.7.0<br>
Full change list is <a href="https://github.com/Comcast/traffic_control/commits/RELEASE-1.7.0">Release 1.7.0 on github</a>.</p>
<table class="dlTable">
- <!-- <tr><td class="dlTableCell"><a href="1.6.1/RELEASE-1.6.1/traffic_ops-1.6.1-3513.fbb4fcd7.x86_64.rpm">RELEASE-1.6.1/traffic_ops-1.6.1-3513.fbb4fcd7.x86_64.rpm</a></td></tr>
- <tr><td class="dlTableCell"><a href="1.6.1/RELEASE-1.6.1/traffic_monitor-1.6.1-3513.fbb4fcd7.el6.x86_64.rpm">RELEASE-1.6.1/traffic_monitor-1.6.1-3513.fbb4fcd7.el6.x86_64.rpm</a></td></tr>
- <tr><td class="dlTableCell"><a href="1.6.1/RELEASE-1.6.1/traffic_router-1.6.1-3513.fbb4fcd7.el6.x86_64.rpm">RELEASE-1.6.1/traffic_router-1.6.1-3513.fbb4fcd7.el6.x86_64.rpm</a></td></tr>
- <tr><td class="dlTableCell"><a href="1.6.1/RELEASE-1.6.1/traffic_ops_ort-1.6.1-3513.fbb4fcd7.x86_64.rpm">RELEASE-1.6.1/traffic_ops_ort-1.6.1-3513.fbb4fcd7.x86_64.rpm</a></td></tr>
- <tr><td class="dlTableCell"><a href="1.6.1/RELEASE-1.6.1/traffic_stats-1.6.1-3513.fbb4fcd7.x86_64.rpm">RELEASE-1.6.1/traffic_stats-1.6.1-3513.fbb4fcd7.x86_64.rpm</a></td></tr>
- <tr><td class="dlTableCell"><a href="1.6.1/RELEASE-1.6.1/astats_over_http-1.2-8.el6.x86_64.rpm">astats_over_http-1.2-8.el6.x86_64.rpm</a></td></tr> -->
- <tr><td class="dlTableCell"><a href="1.7.0/RELEASE-1.7.0/trafficserver-5.3.2-759.ee14bbe.el6.x86_64.rpm">trafficserver-5.3.2-759.ee14bbe.el6.x86_64.rpm</a></td></tr> <tr><td class="dlTableCell"><a
- href="1.7.0/RELEASE-1.7.0/trafficserver-debuginfo-5.3.2-759.ee14bbe.el6.x86_64.rpm">trafficserver-debuginfo-5.3.2-759.ee14bbe.el6.x86_64.rpm</a></td></tr>
- <!-- <tr><td class="dlTableCell"><a href="1.6.1/RELEASE-1.6.1/SHA1SUMS.asc">SHA1SUMS.asc</a></td></tr> -->
+ <tr><td class="dlTableCell"><a href="1.7.0/RELEASE-1.7.0/traffic_ops-1.7.0-3908.5b77f60f.x86_64.rpm">RELEASE-1.7.0/traffic_ops-1.7.0-3908.5b77f60f.x86_64.rpm</a></td></tr>
+ <tr><td class="dlTableCell"><a href="1.7.0/RELEASE-1.7.0/traffic_portal-1.7.0-3908.5b77f60f.x86_64.rpm">RELEASE-1.7.0/traffic_portal-1.7.0-3908.5b77f60f.x86_64.rpm</a></td></tr>
+ <tr><td class="dlTableCell"><a href="1.7.0/RELEASE-1.7.0/traffic_monitor-1.7.0-3908.5b77f60f.el6.x86_64.rpm">RELEASE-1.7.0/traffic_monitor-1.7.0-3908.5b77f60f.el6.x86_64.rpm</a></td></tr>
+ <tr><td class="dlTableCell"><a href="1.7.0/RELEASE-1.7.0/traffic_router-1.7.0-3908.5b77f60f.el6.x86_64.rpm">RELEASE-1.7.0/traffic_router-1.7.0-3908.5b77f60f.el6.x86_64.rpm</a></td></tr>
+ <tr><td class="dlTableCell"><a href="1.7.0/RELEASE-1.7.0/traffic_ops_ort-1.7.0-3908.5b77f60f.x86_64.rpm">RELEASE-1.7.0/traffic_ops_ort-1.7.0-3908.5b77f60f.x86_64.rpm</a></td></tr>
+ <tr><td class="dlTableCell"><a href="1.7.0/RELEASE-1.7.0/traffic_stats-1.7.0-3908.5b77f60f.x86_64.rpm">RELEASE-1.7.0/traffic_stats-1.7.0-3908.5b77f60f.x86_64.rpm</a></td></tr>
+ <tr><td class="dlTableCell"><a href="1.7.0/RELEASE-1.7.0/trafficserver-5.3.2-759.ee14bbe.el6.x86_64.rpm">trafficserver-5.3.2-759.ee14bbe.el6.x86_64.rpm</a></td></tr>
+ <tr><td class="dlTableCell"><a href="1.7.0/RELEASE-1.7.0/trafficserver-debuginfo-5.3.2-759.ee14bbe.el6.x86_64.rpm">trafficserver-debuginfo-5.3.2-759.ee14bbe.el6.x86_64.rpm</a></td></tr>
+ <tr><td class="dlTableCell"><a href="1.7.0/RELEASE-1.7.0/SHA1SUMS.asc">SHA1SUMS.asc</a></td></tr>
</table>
-
+
<!-- 1.6.1 -->
<p class="sectionContainer">STABLE -- RELEASE-1.6.1<br>
Full change list is <a href="https://github.com/Comcast/traffic_control/commits/RELEASE-1.6.1">Release 1.6.1 on github</a>.</p>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/misc/traffic-control-cdn/index.html
----------------------------------------------------------------------
diff --git a/misc/traffic-control-cdn/index.html b/misc/traffic-control-cdn/index.html
index 42ae629..580f81e 100644
--- a/misc/traffic-control-cdn/index.html
+++ b/misc/traffic-control-cdn/index.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<!DOCTYPE html>
<html lang="en">
<head>
@@ -12,9 +31,7 @@
</head>
<body>
- <div class="bkgdWrapper">
-
- </div>
+ <div class="bkgdWrapper"></div>
<div class="appWrapper">
<div class="appHeader">
<div class="applogo"></div>
@@ -29,33 +46,36 @@
</ul>
</div>
</div>
- <p class="sectionContainer">
- Traffic Control allows you to build a large scale content delivery network using open source. Built around <a href="http://trafficserver.apache.org">Apache Traffic Server</a> as the caching software, Traffic Control implements all the core functions of a modern CDN:
- </p>
- <table class="tableMain" cellpadding="10">
- <tr>
+ <p class="sectionContainer">
+ Traffic Control allows you to build a large scale content delivery network using open source. Built around <a href="http://trafficserver.apache.org">Apache Traffic Server</a> as the caching software, Traffic Control implements all the core functions of a modern CDN:
+ </p>
+
+ <table class="tableMain" cellpadding="10">
+ <tr>
<td class="tableMainCell"><a href="traffic_router/index.html"><img src="images/traffic_router_logo.png"></a></td>
- <td class="tableMainCell">Traffic Router is a Java Tomcat application that routes clients to the closest available cache on the CDN using both HTTP and DNS. By using consistent hashing it sends requests for the same content to the same cache in a group of caches working together in a location. It takes care of routing clients around hot spots and problems in the CDN by using the information from Traffic Monitor with regards to state of all the caches.</td>
- </tr>
- <tr>
+ <td class="tableMainCell">Traffic Router is a Java Tomcat application that routes clients to the closest available cache on the CDN using both HTTP and DNS. By using consistent hashing it sends requests for the same content to the same cache in a group of caches working together in a location. It takes care of routing clients around hot spots and problems in the CDN by using the information from Traffic Monitor with regards to state of all the caches.
+ </td>
+ </tr>
+ <tr>
<td class="tableMainCell"><a href="traffic_monitor/index.html"><img src="images/traffic_monitor_logo.png"></a></td>
- <td class="tableMainCell">Traffic Monitor is a Java Tomcat application that implements the CDN health protocol. Every cache in the CDN is checked using HTTP for vital stats, and based on these stats, caches are declared healthy or unhealthy. This information is then used by Traffic Router to make it's routing decisions.</td>
- </tr>
- <tr>
+ <td class="tableMainCell">Traffic Monitor is a Java Tomcat application that implements the CDN health protocol. Every cache in the CDN is checked using HTTP for vital stats, and based on these stats, caches are declared healthy or unhealthy. This information is then used by Traffic Router to make it's routing decisions.
+ </td>
+ </tr>
+ <tr>
<td class="tableMainCell"><a href="traffic_ops/index.html"><img src="images/traffic_operations_logo.png"></a></td>
<td class="tableMainCell">Traffic Ops is a Mojolicious perl and jQuery UI application for management and monitoring of all servers in the CDN. All server and content routing information for the CDN is managed through Traffic Ops. It also exposes RESTful API enpoints for consumption by tools and other applications.
- </td>
- </tr>
- <tr>
+ </td>
+ </tr>
+ <tr>
<td class="tableMainCell"><a href="traffic_stats/index.html"><img src="images/traffic_stats_logo.png"></a></td>
<td class="tableMainCell">Traffic Stats is a program written in Golang that is used to acquire and store statistics about CDNs controlled by Traffic Control. Traffic Stats mines metrics from Traffic Monitor\u2019s JSON APIs and stores the data in InfluxDb.</td>
- </tr>
- <tr>
+ </tr>
+ <tr>
<td class="tableMainCell"><a href="traffic_portal/index.html"><img src="images/traffic_portal_logo.png"></a></td>
<td class="tableMainCell">Traffic Portal is an AngularJS 1.x client served from a Node.js web server designed to consume the Traffic Ops 1.x API. Traffic Portal provides a set of functionality restricted to the delivery service(s) of the authenticated user. Functionality primarily includes a set of charts / graphs designed to provide insight into the performance of a user\u2019s delivery service(s).</td>
- </tr>
- </table>
- </div>
+ </tr>
+ </table>
+
</body>
</html>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/misc/traffic-control-cdn/traffic_monitor/index.html
----------------------------------------------------------------------
diff --git a/misc/traffic-control-cdn/traffic_monitor/index.html b/misc/traffic-control-cdn/traffic_monitor/index.html
index c32854b..04d5dae 100644
--- a/misc/traffic-control-cdn/traffic_monitor/index.html
+++ b/misc/traffic-control-cdn/traffic_monitor/index.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<!DOCTYPE html>
<html lang="en">
<head>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/misc/traffic-control-cdn/traffic_ops/index.html
----------------------------------------------------------------------
diff --git a/misc/traffic-control-cdn/traffic_ops/index.html b/misc/traffic-control-cdn/traffic_ops/index.html
index bce51b1..f3abbeb 100644
--- a/misc/traffic-control-cdn/traffic_ops/index.html
+++ b/misc/traffic-control-cdn/traffic_ops/index.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<!DOCTYPE html>
<html lang="en">
<head>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/misc/traffic-control-cdn/traffic_portal/index.html
----------------------------------------------------------------------
diff --git a/misc/traffic-control-cdn/traffic_portal/index.html b/misc/traffic-control-cdn/traffic_portal/index.html
index 30bb8eb..448a5c8 100644
--- a/misc/traffic-control-cdn/traffic_portal/index.html
+++ b/misc/traffic-control-cdn/traffic_portal/index.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<!DOCTYPE html>
<html lang="en">
<head>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/misc/traffic-control-cdn/traffic_router/index.html
----------------------------------------------------------------------
diff --git a/misc/traffic-control-cdn/traffic_router/index.html b/misc/traffic-control-cdn/traffic_router/index.html
index 8c91848..53eb1cf 100644
--- a/misc/traffic-control-cdn/traffic_router/index.html
+++ b/misc/traffic-control-cdn/traffic_router/index.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<!DOCTYPE html>
<html lang="en">
<head>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/misc/traffic-control-cdn/traffic_stats/index.html
----------------------------------------------------------------------
diff --git a/misc/traffic-control-cdn/traffic_stats/index.html b/misc/traffic-control-cdn/traffic_stats/index.html
index e95e7c8..7f8cf42 100644
--- a/misc/traffic-control-cdn/traffic_stats/index.html
+++ b/misc/traffic-control-cdn/traffic_stats/index.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<!DOCTYPE html>
<html lang="en">
<head>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/test/router/client/client.go
----------------------------------------------------------------------
diff --git a/test/router/client/client.go b/test/router/client/client.go
index b998bba..4605b76 100644
--- a/test/router/client/client.go
+++ b/test/router/client/client.go
@@ -1,5 +1,25 @@
package client
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
import (
"crypto/tls"
"crypto/x509"
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/test/router/css/loadtest.css
----------------------------------------------------------------------
diff --git a/test/router/css/loadtest.css b/test/router/css/loadtest.css
index b0b6acb..2a962c1 100644
--- a/test/router/css/loadtest.css
+++ b/test/router/css/loadtest.css
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
.grid-table-header {
font-weight: bold;
}
@@ -24,4 +43,4 @@ h4 .btn {
.form-inline button {
margin-left: 5px;
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/test/router/data/httpresult.go
----------------------------------------------------------------------
diff --git a/test/router/data/httpresult.go b/test/router/data/httpresult.go
index f0e797b..5973b6a 100644
--- a/test/router/data/httpresult.go
+++ b/test/router/data/httpresult.go
@@ -1,5 +1,25 @@
package data
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
import "time"
type HttpResult struct {
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/test/router/dnssec/Readme.md
----------------------------------------------------------------------
diff --git a/test/router/dnssec/Readme.md b/test/router/dnssec/Readme.md
new file mode 100644
index 0000000..139824b
--- /dev/null
+++ b/test/router/dnssec/Readme.md
@@ -0,0 +1,23 @@
+DNSSEC Tests
+============
+
+Running the test
+
+`ginkgo -- -ns=router-01.thecdn.example.com:53 -ds=ds-01.thecdn.example.com.`
+
+Sample Output
+```
+Running Suite: Dnssec Suite
+===========================
+Random Seed: 1476984556
+Will run 4 of 4 specs
+
+2016/10/20 11:29:17 Nameserver router-01.thecdn.example.com:53
+2016/10/20 11:29:17 DeliveryService ds-01.thecdn.example.com.
+\u2022\u2022\u2022\u2022
+Ran 4 of 4 Specs in 0.110 seconds
+SUCCESS! -- 4 Passed | 0 Failed | 0 Pending | 0 Skipped PASS
+
+Ginkgo ran 1 suite in 825.345359ms
+Test Suite Passed
+```
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/test/router/dnssec/dnssec.go
----------------------------------------------------------------------
diff --git a/test/router/dnssec/dnssec.go b/test/router/dnssec/dnssec.go
new file mode 100644
index 0000000..d48dc4c
--- /dev/null
+++ b/test/router/dnssec/dnssec.go
@@ -0,0 +1,159 @@
+package dnssec
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
+import (
+. "github.com/miekg/dns"
+. "github.com/onsi/gomega"
+"log"
+)
+
+type DnssecClient struct {
+ *Client
+}
+
+type SignedRRSet struct {
+ RRSIG RRSIG
+ RRSet []RR
+}
+
+type SignedKeys struct {
+ SignedZsks []SignedRRSet
+ SignedKsks []SignedRRSet
+}
+
+func MakeLabelHierarchy(label string) []string {
+ labels := []string{}
+ done := false
+ i := 0
+ for !done {
+ label = label[i:]
+ labels = append([]string{label}, labels...)
+ i, done = NextLabel(label,i)
+ }
+
+ return append([]string{"."}, labels...)
+}
+
+func (d *DnssecClient) GetRecords(nameserver string, name string, t uint16) (*Msg) {
+ m := new(Msg)
+ m.Id = Id()
+ m.RecursionDesired = true
+ m.SetEdns0(4096, true)
+ m.Question = []Question{{name, t, ClassINET}}
+ r, _, err := d.Exchange(m, nameserver)
+
+ Expect(err).Should(BeNil())
+ Expect(len(r.Answer)).ToNot(Equal(0), "Received no answers from %v for query of records type %d for zone %v", nameserver, t, name)
+ return r
+}
+
+func sigCovers(s RRSIG, rr RR) bool {
+ return s.TypeCovered == rr.Header().Rrtype &&
+ s.Hdr.Class == rr.Header().Class &&
+ s.Hdr.Ttl == rr.Header().Ttl
+}
+
+func (d *DnssecClient) GetSignedRRSets(nameserver string, name string, t uint16) ([]SignedRRSet) {
+ records := []RR{}
+ rrsigs := []RR{}
+
+ answers := d.GetRecords(nameserver, name, t).Answer
+ for _, ans := range answers {
+ if ans.Header().Rrtype == TypeRRSIG {
+ rrsigs = append(rrsigs, ans)
+ } else {
+ records = append(records, ans)
+ }
+ }
+
+ rrsets := []SignedRRSet{}
+ for _, sig := range rrsigs {
+ switch s := sig.(type) {
+ case *RRSIG:
+ rs := RRSIG{
+ Hdr: s.Hdr,
+ Signature: s.Signature,
+ Algorithm: s.Algorithm,
+ Expiration: s.Expiration,
+ Inception: s.Inception,
+ KeyTag: s.KeyTag,
+ Labels: s.Labels,
+ OrigTtl: s.OrigTtl,
+ SignerName: s.SignerName,
+ TypeCovered: s.TypeCovered,
+ }
+
+ signedSet := SignedRRSet{
+ RRSIG: rs,
+ }
+
+ for _, rr := range records {
+ if sigCovers(*s,rr) {
+ signedSet.RRSet = append(signedSet.RRSet, rr)
+ } else {
+ log.Println("rrsig does not cover record")
+ log.Println(s.Header(),s.TypeCovered)
+ log.Println(rr.Header(),rr.Header().Rrtype)
+ }
+ }
+
+ rrsets = append(rrsets, signedSet)
+ }
+
+ }
+
+ return rrsets
+}
+
+func (d *DnssecClient) DelegationSignerData(nameserver string, name string) ([]SignedRRSet) {
+ return d.GetSignedRRSets(nameserver, name, TypeDS)
+}
+
+func (d *DnssecClient) SigningData(nameserver string, name string) SignedKeys {
+ var signedKeys = SignedKeys{
+ SignedZsks: []SignedRRSet{},
+ SignedKsks: []SignedRRSet{},
+ }
+
+ signedRrsets := d.GetSignedRRSets(nameserver, name, TypeDNSKEY)
+
+ for _, signedRRset := range signedRrsets {
+ if len(signedRRset.RRSet) < 1 {
+ log.Println("****** no rrset")
+ continue;
+ }
+
+ for _, rr := range signedRRset.RRSet {
+ switch k := rr.(type) {
+ case *DNSKEY:
+ if k.Flags & 1 == 1 {
+ signedKeys.SignedKsks = append(signedKeys.SignedKsks, signedRRset)
+ } else {
+ signedKeys.SignedZsks = append(signedKeys.SignedZsks, signedRRset)
+ }
+ }
+ }
+ }
+
+ return signedKeys
+}
+
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/test/router/dnssec/dnssec_suite_test.go
----------------------------------------------------------------------
diff --git a/test/router/dnssec/dnssec_suite_test.go b/test/router/dnssec/dnssec_suite_test.go
new file mode 100644
index 0000000..c079705
--- /dev/null
+++ b/test/router/dnssec/dnssec_suite_test.go
@@ -0,0 +1,56 @@
+package dnssec_test
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
+import (
+ . "github.com/onsi/ginkgo"
+ . "github.com/onsi/gomega"
+
+ "testing"
+ "github.com/apache/incubator-trafficcontrol/test/router/dnssec"
+ "github.com/miekg/dns"
+ "flag"
+ "log"
+)
+
+var d *dnssec.DnssecClient
+var nameserver string
+var deliveryService string
+
+func init() {
+ flag.StringVar(&nameserver,"ns","changeit","ns is used to direct dns queries to a traffic router")
+ flag.StringVar(&deliveryService,"ds","changeit","ds is used to target some dns DS and DNS queries made by traffic router")
+}
+
+var _ = BeforeSuite(func() {
+ d = &dnssec.DnssecClient{new(dns.Client)}
+ d.Net = "udp"
+
+ Expect(nameserver).ToNot(Equal("changeit"), "Pass in a ns flag with the hostname of the traffic router")
+ Expect(deliveryService).ToNot(Equal("changeit"), "Pass in a ds flag with the dns label for a DNS delivery service")
+ log.Println("Nameserver",nameserver)
+ log.Println("DeliveryService", deliveryService)
+})
+
+func TestDnssec(t *testing.T) {
+ RegisterFailHandler(Fail)
+ RunSpecs(t, "Dnssec Suite")
+}
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/test/router/dnssec/dnssec_test.go
----------------------------------------------------------------------
diff --git a/test/router/dnssec/dnssec_test.go b/test/router/dnssec/dnssec_test.go
new file mode 100644
index 0000000..a29ef40
--- /dev/null
+++ b/test/router/dnssec/dnssec_test.go
@@ -0,0 +1,129 @@
+package dnssec_test
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
+import (
+ "github.com/apache/incubator-trafficcontrol/test/router/dnssec"
+ "github.com/miekg/dns"
+ . "github.com/onsi/ginkgo"
+ . "github.com/onsi/gomega"
+)
+
+var _ = Describe("Dnssec", func() {
+ Context("The Interwebs", func() {
+ It("Makes Label Hierarchy", func() {
+ Expect(dnssec.MakeLabelHierarchy("example.com.")).To(Equal([]string{".", "com.", "example.com."}))
+ })
+
+ It("Uses Parent Zone Key to validate DS", func() {
+ signedDSSets := d.DelegationSignerData(nameserver, deliveryService)
+
+ Expect(len(signedDSSets)).ToNot(Equal(0))
+ Expect(len(signedDSSets[0].RRSet)).ToNot(Equal(0))
+
+ verifiedCount := 0
+ for _, signedDSSet := range signedDSSets {
+
+ signedKeys := d.SigningData(nameserver, signedDSSet.RRSIG.SignerName)
+
+ Expect(len(signedKeys.SignedKsks)).ToNot(Equal(0))
+ Expect(len(signedKeys.SignedZsks)).ToNot(Equal(0))
+
+ for _, sk := range signedKeys.SignedZsks {
+ for _, k := range sk.RRSet {
+ switch kk := k.(type) {
+ case *dns.DNSKEY:
+ if kk.KeyTag() == signedDSSet.RRSIG.KeyTag {
+ Expect(signedDSSet.RRSIG.Verify(kk, signedDSSet.RRSet)).To(BeNil())
+ verifiedCount++
+ }
+ }
+ }
+ }
+
+ for _, sk := range signedKeys.SignedKsks {
+ for _, k := range sk.RRSet {
+ switch kk := k.(type) {
+ case *dns.DNSKEY:
+ if kk.KeyTag() == signedDSSet.RRSIG.KeyTag {
+ Expect(signedDSSet.RRSIG.Verify(kk, signedDSSet.RRSet)).To(BeNil())
+ verifiedCount++
+ }
+ }
+ }
+ }
+ }
+
+ Expect(verifiedCount).ToNot(Equal(0))
+ })
+
+ It("Uses DS to validate Public Key", func() {
+ signedKeys := d.SigningData(nameserver, deliveryService)
+ signedDSSets := d.DelegationSignerData(nameserver, deliveryService)
+
+ Expect(len(signedDSSets)).ToNot(Equal(0))
+
+ count := 0
+ for _, signedZsk := range signedKeys.SignedZsks {
+ for _, zsk := range signedZsk.RRSet {
+ switch z := zsk.(type) {
+ case *dns.DNSKEY:
+ for _, signedDs := range signedDSSets {
+ for _, ds := range signedDs.RRSet {
+ switch d := ds.(type) {
+ case *dns.DS:
+ if d.KeyTag == z.KeyTag() {
+ computedDS := z.ToDS(d.DigestType)
+ Expect(d.Digest).To(Equal(computedDS.Digest))
+ count++
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ Expect(count).ToNot(Equal(0))
+ })
+
+ It("Uses KSK public key to verify ZSK RRSig", func() {
+ signedKeys := d.SigningData(nameserver, deliveryService)
+
+
+ count := 0
+ for _, signedZsk := range signedKeys.SignedZsks {
+ for _, signedKsk := range signedKeys.SignedKsks {
+ for _, ksk := range signedKsk.RRSet {
+ switch k := ksk.(type) {
+ case *dns.DNSKEY:
+ if k.KeyTag() == signedZsk.RRSIG.KeyTag {
+ Expect(signedZsk.RRSIG.Verify(k, signedZsk.RRSet)).To(BeNil())
+ count++
+ }
+ }
+ }
+ }
+ }
+ Expect(count).ToNot(Equal(0))
+ })
+ })
+})
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/test/router/index.html
----------------------------------------------------------------------
diff --git a/test/router/index.html b/test/router/index.html
index f94f773..e4dbdee 100644
--- a/test/router/index.html
+++ b/test/router/index.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<!DOCTYPE html>
<html lang="en">
<head>
@@ -28,4 +47,4 @@
<div id="loadtest"></div>
</div>
</body>
-</html>
\ No newline at end of file
+</html>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/test/router/load/load.go
----------------------------------------------------------------------
diff --git a/test/router/load/load.go b/test/router/load/load.go
index 9db3d17..8cde990 100644
--- a/test/router/load/load.go
+++ b/test/router/load/load.go
@@ -1,5 +1,25 @@
package load
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
import (
"strings"
"sync"
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/test/router/server/server.go
----------------------------------------------------------------------
diff --git a/test/router/server/server.go b/test/router/server/server.go
index c12b109..5f62b0c 100644
--- a/test/router/server/server.go
+++ b/test/router/server/server.go
@@ -1,5 +1,25 @@
package main
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
import (
"crypto/tls"
"encoding/json"
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/build/build_rpm.sh
----------------------------------------------------------------------
diff --git a/traffic_monitor/build/build_rpm.sh b/traffic_monitor/build/build_rpm.sh
index c5761ac..e8970a0 100755
--- a/traffic_monitor/build/build_rpm.sh
+++ b/traffic_monitor/build/build_rpm.sh
@@ -1,7 +1,6 @@
#!/bin/bash
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/build/pmd/ruleset.xml
----------------------------------------------------------------------
diff --git a/traffic_monitor/build/pmd/ruleset.xml b/traffic_monitor/build/pmd/ruleset.xml
index 715a042..6f5ad95 100644
--- a/traffic_monitor/build/pmd/ruleset.xml
+++ b/traffic_monitor/build/pmd/ruleset.xml
@@ -1,4 +1,24 @@
<?xml version="1.0"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<ruleset name="Overpass PMD Ruleset" xmlns="http://pmd.sf.net/ruleset/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd"
xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd">
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/etc/ats_sim.js
----------------------------------------------------------------------
diff --git a/traffic_monitor/etc/ats_sim.js b/traffic_monitor/etc/ats_sim.js
index c4c176f..e2535c3 100644
--- a/traffic_monitor/etc/ats_sim.js
+++ b/traffic_monitor/etc/ats_sim.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var myip = "127.0.0.1";
var myport = 80;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/experimental/common/adapter/adapter.go
----------------------------------------------------------------------
diff --git a/traffic_monitor/experimental/common/adapter/adapter.go b/traffic_monitor/experimental/common/adapter/adapter.go
index de0a322..bdb3621 100644
--- a/traffic_monitor/experimental/common/adapter/adapter.go
+++ b/traffic_monitor/experimental/common/adapter/adapter.go
@@ -1,5 +1,25 @@
package adapter
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
import (
"io"
)
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/experimental/common/crstates/crstates.go
----------------------------------------------------------------------
diff --git a/traffic_monitor/experimental/common/crstates/crstates.go b/traffic_monitor/experimental/common/crstates/crstates.go
index 4f260f9..20e10ca 100644
--- a/traffic_monitor/experimental/common/crstates/crstates.go
+++ b/traffic_monitor/experimental/common/crstates/crstates.go
@@ -1,5 +1,25 @@
package crstates
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
type Cache struct {
Name string `json:"name,omitempty"`
Available bool `json:"isAvailable"`
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/experimental/common/fetcher/fetcher.go
----------------------------------------------------------------------
diff --git a/traffic_monitor/experimental/common/fetcher/fetcher.go b/traffic_monitor/experimental/common/fetcher/fetcher.go
index e439bb2..6534661 100644
--- a/traffic_monitor/experimental/common/fetcher/fetcher.go
+++ b/traffic_monitor/experimental/common/fetcher/fetcher.go
@@ -1,13 +1,33 @@
package fetcher
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
import (
"fmt"
"io/ioutil"
"net/http"
"time"
- "github.com/Comcast/traffic_control/traffic_monitor/experimental/common/handler"
- "github.com/Comcast/traffic_control/traffic_monitor/experimental/common/log"
+ "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/common/handler"
+ "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/common/log"
"github.com/davecheney/gmx"
)
@@ -43,7 +63,9 @@ func (f HttpFetcher) Fetch(id string, url string, pollId uint64, pollFinishedCha
if f.Pending != nil {
f.Pending.Inc()
}
+ startReq := time.Now()
response, err := f.Client.Do(req)
+ reqTime := time.Now().Sub(startReq)
if f.Pending != nil {
f.Pending.Dec()
}
@@ -69,11 +91,11 @@ func (f HttpFetcher) Fetch(id string, url string, pollId uint64, pollFinishedCha
f.Success.Inc()
}
log.Debugf("poll %v %v fetch end\n", pollId, time.Now())
- f.Handler.Handle(id, response.Body, err, pollId, pollFinishedChan)
+ f.Handler.Handle(id, response.Body, reqTime, err, pollId, pollFinishedChan)
} else {
if f.Fail != nil {
f.Fail.Inc()
}
- f.Handler.Handle(id, nil, err, pollId, pollFinishedChan)
+ f.Handler.Handle(id, nil, reqTime, err, pollId, pollFinishedChan)
}
}
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/experimental/common/handler/handler.go
----------------------------------------------------------------------
diff --git a/traffic_monitor/experimental/common/handler/handler.go b/traffic_monitor/experimental/common/handler/handler.go
index 46f9426..312553a 100644
--- a/traffic_monitor/experimental/common/handler/handler.go
+++ b/traffic_monitor/experimental/common/handler/handler.go
@@ -1,10 +1,31 @@
package handler
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
import (
"encoding/json"
"io"
+ "time"
- "github.com/Comcast/traffic_control/traffic_monitor/experimental/common/log"
+ "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/common/log"
)
const (
@@ -14,7 +35,7 @@ const (
)
type Handler interface {
- Handle(string, io.Reader, error, uint64, chan<- uint64)
+ Handle(string, io.Reader, time.Duration, error, uint64, chan<- uint64)
}
type OpsConfigFileHandler struct {
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/experimental/common/instrumentation/instrumentation.go
----------------------------------------------------------------------
diff --git a/traffic_monitor/experimental/common/instrumentation/instrumentation.go b/traffic_monitor/experimental/common/instrumentation/instrumentation.go
index 19e03ef..12e29b4 100644
--- a/traffic_monitor/experimental/common/instrumentation/instrumentation.go
+++ b/traffic_monitor/experimental/common/instrumentation/instrumentation.go
@@ -1,5 +1,25 @@
package instrumentation
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
import (
"github.com/davecheney/gmx"
)
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/experimental/common/log/log.go
----------------------------------------------------------------------
diff --git a/traffic_monitor/experimental/common/log/log.go b/traffic_monitor/experimental/common/log/log.go
index a48362a..884d4c3 100644
--- a/traffic_monitor/experimental/common/log/log.go
+++ b/traffic_monitor/experimental/common/log/log.go
@@ -1,6 +1,26 @@
// Inspired by https://www.goinggo.net/2013/11/using-log-package-in-go.html
package log
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
import (
"fmt"
"io"
@@ -15,7 +35,7 @@ var (
Error *log.Logger
)
-func Init(debugW, infoW, warnW, errW io.Writer) {
+func Init(errW, warnW, infoW, debugW io.Writer) {
Debug = log.New(debugW, "DEBUG: ", log.Lshortfile)
Info = log.New(infoW, "INFO: ", log.Lshortfile)
Warning = log.New(warnW, "WARNING: ", log.Lshortfile)
@@ -48,3 +68,20 @@ func Debugf(format string, v ...interface{}) {
func Debugln(v ...interface{}) {
Debug.Output(3, time.Now().Format(timeFormat)+": "+fmt.Sprintln(v...))
}
+
+// Close calls `Close()` on the given Closer, and logs any error. On error, the context is logged, followed by a colon, the error message, and a newline. This is primarily designed to be used in `defer`, for example, `defer log.Close(resp.Body, "readData fetching /foo/bar")`.
+func Close(c io.Closer, context string) {
+ err := c.Close()
+ if err != nil {
+ Errorf("%v: %v", context, err)
+ }
+}
+
+// Closef acts like Close, with a given format string and values, followed by a colon, the error message, and a newline. The given values are not coerced, concatenated, or printed unless an error occurs, so this is more efficient than `Close()`.
+func Closef(c io.Closer, contextFormat string, v ...interface{}) {
+ err := c.Close()
+ if err != nil {
+ Errorf(contextFormat, v...)
+ Errorf(": %v", err)
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/experimental/common/poller/poller.go
----------------------------------------------------------------------
diff --git a/traffic_monitor/experimental/common/poller/poller.go b/traffic_monitor/experimental/common/poller/poller.go
index 42a0d7d..c1a98fb 100644
--- a/traffic_monitor/experimental/common/poller/poller.go
+++ b/traffic_monitor/experimental/common/poller/poller.go
@@ -1,7 +1,28 @@
package poller
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
import (
"io/ioutil"
+ "math/rand"
"net/http"
"os"
"sync/atomic"
@@ -9,12 +30,12 @@ import (
"gopkg.in/fsnotify.v1"
- "github.com/Comcast/traffic_control/traffic_monitor/experimental/common/fetcher"
- "github.com/Comcast/traffic_control/traffic_monitor/experimental/common/handler"
- instr "github.com/Comcast/traffic_control/traffic_monitor/experimental/common/instrumentation"
- "github.com/Comcast/traffic_control/traffic_monitor/experimental/common/log"
- towrap "github.com/Comcast/traffic_control/traffic_monitor/experimental/traffic_monitor/trafficopswrapper" // TODO move to common
- to "github.com/Comcast/traffic_control/traffic_ops/client"
+ "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/common/fetcher"
+ "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/common/handler"
+ instr "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/common/instrumentation"
+ "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/common/log"
+ towrap "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/traffic_monitor/trafficopswrapper" // TODO move to common
+ to "github.com/apache/incubator-trafficcontrol/traffic_ops/client"
)
type Poller interface {
@@ -22,14 +43,20 @@ type Poller interface {
}
type HttpPoller struct {
- Config HttpPollerConfig
- ConfigChannel chan HttpPollerConfig
- Fetcher fetcher.Fetcher
- TickChan chan uint64
+ Config HttpPollerConfig
+ ConfigChannel chan HttpPollerConfig
+ FetcherTemplate fetcher.HttpFetcher // FetcherTemplate has all the constant settings, and is copied to create fetchers with custom HTTP client timeouts.
+ TickChan chan uint64
+}
+
+type PollConfig struct {
+ URL string
+ Timeout time.Duration
+ Handler handler.Handler
}
type HttpPollerConfig struct {
- Urls map[string]string
+ Urls map[string]PollConfig
Interval time.Duration
}
@@ -46,7 +73,7 @@ func NewHTTP(interval time.Duration, tick bool, httpClient *http.Client, counter
Config: HttpPollerConfig{
Interval: interval,
},
- Fetcher: fetcher.HttpFetcher{
+ FetcherTemplate: fetcher.HttpFetcher{
Handler: fetchHandler,
Client: httpClient,
Counters: counters,
@@ -114,29 +141,35 @@ func (p HttpPoller) Poll() {
// iterationCount++ // on tick<:
// case p.TickChan <- iterationCount:
killChans := map[string]chan<- struct{}{}
- for {
- select {
- case newConfig := <-p.ConfigChannel:
- deletions, additions := diffConfigs(p.Config, newConfig)
- for _, id := range deletions {
- killChan := killChans[id]
- go func() { killChan <- struct{}{} }() // go - we don't want to wait for old polls to die.
- delete(killChans, id)
- }
- for _, info := range additions {
- kill := make(chan struct{})
- killChans[info.ID] = kill
- go pollHttp(info.Interval, info.ID, info.URL, p.Fetcher, kill)
+ for newConfig := range p.ConfigChannel {
+ deletions, additions := diffConfigs(p.Config, newConfig)
+ for _, id := range deletions {
+ killChan := killChans[id]
+ go func() { killChan <- struct{}{} }() // go - we don't want to wait for old polls to die.
+ delete(killChans, id)
+ }
+ for _, info := range additions {
+ kill := make(chan struct{})
+ killChans[info.ID] = kill
+
+ fetcher := p.FetcherTemplate
+ if info.Timeout != 0 { // if the timeout isn't explicitly set, use the template value.
+ c := *fetcher.Client
+ fetcher.Client = &c // copy the client, so we don't change other fetchers.
+ fetcher.Client.Timeout = info.Timeout
}
- p.Config = newConfig
+ go pollHttp(info.Interval, info.ID, info.URL, fetcher, kill)
}
+ p.Config = newConfig
}
}
type HTTPPollInfo struct {
Interval time.Duration
+ Timeout time.Duration
ID string
URL string
+ Handler handler.Handler
}
// diffConfigs takes the old and new configs, and returns a list of deleted IDs, and a list of new polls to do
@@ -148,26 +181,41 @@ func diffConfigs(old HttpPollerConfig, new HttpPollerConfig) ([]string, []HTTPPo
for id, _ := range old.Urls {
deletions = append(deletions, id)
}
- for id, url := range new.Urls {
- additions = append(additions, HTTPPollInfo{Interval: new.Interval, ID: id, URL: url})
+ for id, pollCfg := range new.Urls {
+ additions = append(additions, HTTPPollInfo{
+ Interval: new.Interval,
+ ID: id,
+ URL: pollCfg.URL,
+ Timeout: pollCfg.Timeout,
+ })
}
return deletions, additions
}
- for id, oldUrl := range old.Urls {
- newUrl, newIdExists := new.Urls[id]
+ for id, oldPollCfg := range old.Urls {
+ newPollCfg, newIdExists := new.Urls[id]
if !newIdExists {
deletions = append(deletions, id)
- } else if newUrl != oldUrl {
+ } else if newPollCfg != oldPollCfg {
deletions = append(deletions, id)
- additions = append(additions, HTTPPollInfo{Interval: new.Interval, ID: id, URL: newUrl})
+ additions = append(additions, HTTPPollInfo{
+ Interval: new.Interval,
+ ID: id,
+ URL: newPollCfg.URL,
+ Timeout: newPollCfg.Timeout,
+ })
}
}
- for id, newUrl := range new.Urls {
+ for id, newPollCfg := range new.Urls {
_, oldIdExists := old.Urls[id]
if !oldIdExists {
- additions = append(additions, HTTPPollInfo{Interval: new.Interval, ID: id, URL: newUrl})
+ additions = append(additions, HTTPPollInfo{
+ Interval: new.Interval,
+ ID: id,
+ URL: newPollCfg.URL,
+ Timeout: newPollCfg.Timeout,
+ })
}
}
@@ -208,11 +256,14 @@ func (p FilePoller) Poll() {
// TODO iterationCount and/or p.TickChan?
func pollHttp(interval time.Duration, id string, url string, fetcher fetcher.Fetcher, die <-chan struct{}) {
+ pollSpread := time.Duration(rand.Float64()*float64(interval/time.Nanosecond)) * time.Nanosecond
+ time.Sleep(pollSpread)
tick := time.NewTicker(interval)
lastTime := time.Now()
for {
select {
case now := <-tick.C:
+ tick = time.NewTicker(interval) // recreate timer, to avoid Go's "smoothing" nonsense
realInterval := now.Sub(lastTime)
if realInterval > interval+(time.Millisecond*100) {
instr.TimerFail.Inc()
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/experimental/traffic_monitor/build.sh
----------------------------------------------------------------------
diff --git a/traffic_monitor/experimental/traffic_monitor/build.sh b/traffic_monitor/experimental/traffic_monitor/build.sh
index 8cc5932..e8b09e2 100755
--- a/traffic_monitor/experimental/traffic_monitor/build.sh
+++ b/traffic_monitor/experimental/traffic_monitor/build.sh
@@ -1 +1,17 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
go build -ldflags "-X main.GitRevision=`git rev-parse HEAD` -X main.BuildTimestamp=`date +'%Y-%M-%dT%H:%M:%S'`"
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/experimental/traffic_monitor/cache/astats.go
----------------------------------------------------------------------
diff --git a/traffic_monitor/experimental/traffic_monitor/cache/astats.go b/traffic_monitor/experimental/traffic_monitor/cache/astats.go
index ad658f8..96258c8 100644
--- a/traffic_monitor/experimental/traffic_monitor/cache/astats.go
+++ b/traffic_monitor/experimental/traffic_monitor/cache/astats.go
@@ -1,15 +1,36 @@
package cache
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
import (
"encoding/json"
- "io"
)
+// Astats contains ATS data returned from the Astats ATS plugin. This includes generic stats, as well as fixed system stats.
type Astats struct {
Ats map[string]interface{} `json:"ats"`
System AstatsSystem `json:"system"`
}
+// AstatsSystem represents fixed system stats returne from ATS by the Astats plugin.
type AstatsSystem struct {
InfName string `json:"inf.name"`
InfSpeed int `json:"inf.speed"`
@@ -22,25 +43,9 @@ type AstatsSystem struct {
AstatsLoad int `json:"astatsLoad"`
}
-type AstatsAdapter struct{}
-
+// Unmarshal unmarshalls the given bytes, which must be JSON Astats data, into an Astats object.
func Unmarshal(body []byte) (Astats, error) {
var aStats Astats
err := json.Unmarshal(body, &aStats)
return aStats, err
}
-
-func (AstatsAdapter) Transform(r io.Reader) ([]Astats, error) {
- dec := json.NewDecoder(r)
- var as []Astats
-
- for {
- var a Astats
- if err := dec.Decode(&a); err == io.EOF {
- return as, nil
- } else if err != nil {
- return as, err
- }
- as = append(as, a)
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/experimental/traffic_monitor/cache/astats_test.go
----------------------------------------------------------------------
diff --git a/traffic_monitor/experimental/traffic_monitor/cache/astats_test.go b/traffic_monitor/experimental/traffic_monitor/cache/astats_test.go
index 14401c3..67dd8aa 100644
--- a/traffic_monitor/experimental/traffic_monitor/cache/astats_test.go
+++ b/traffic_monitor/experimental/traffic_monitor/cache/astats_test.go
@@ -1,5 +1,25 @@
package cache
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
import (
"fmt"
"io/ioutil"
@@ -18,5 +38,5 @@ func TestAstats(t *testing.T) {
if err != nil {
t.Log(err)
}
- fmt.Printf("Found %v key/val pairs in ats, and %v key/val pairs in system\n", len(aStats.Ats), len(aStats.System))
+ fmt.Printf("Found %v key/val pairs in ats\n", len(aStats.Ats))
}
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/experimental/traffic_monitor/cache/cache.go
----------------------------------------------------------------------
diff --git a/traffic_monitor/experimental/traffic_monitor/cache/cache.go b/traffic_monitor/experimental/traffic_monitor/cache/cache.go
index eb54e42..bcc3449 100644
--- a/traffic_monitor/experimental/traffic_monitor/cache/cache.go
+++ b/traffic_monitor/experimental/traffic_monitor/cache/cache.go
@@ -1,14 +1,34 @@
package cache
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
import (
"encoding/json"
"fmt"
- "github.com/Comcast/traffic_control/traffic_monitor/experimental/common/log"
- dsdata "github.com/Comcast/traffic_control/traffic_monitor/experimental/traffic_monitor/deliveryservicedata"
- "github.com/Comcast/traffic_control/traffic_monitor/experimental/traffic_monitor/enum"
- "github.com/Comcast/traffic_control/traffic_monitor/experimental/traffic_monitor/http_server"
- "github.com/Comcast/traffic_control/traffic_monitor/experimental/traffic_monitor/peer"
- todata "github.com/Comcast/traffic_control/traffic_monitor/experimental/traffic_monitor/trafficopsdata"
+ "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/common/log"
+ dsdata "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/traffic_monitor/deliveryservicedata"
+ "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/traffic_monitor/enum"
+ "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/traffic_monitor/peer"
+ "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/traffic_monitor/srvhttp"
+ todata "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/traffic_monitor/trafficopsdata"
"io"
"net/url"
"regexp"
@@ -17,6 +37,7 @@ import (
"time"
)
+// Handler is a cache handler, which fulfills the common/handler `Handler` interface.
type Handler struct {
ResultChannel chan Result
Notify int
@@ -25,20 +46,23 @@ type Handler struct {
MultipleSpaceRegex *regexp.Regexp
}
-// NewHandler does NOT precomputes stat data before calling ResultChannel, and Result.Precomputed will be nil
+// NewHandler returns a new cache handler. Note this handler does NOT precomputes stat data before calling ResultChannel, and Result.Precomputed will be nil
+// TODO change this to take the ResultChan. It doesn't make sense for the Handler to 'own' the Result Chan.
func NewHandler() Handler {
return Handler{ResultChannel: make(chan Result), MultipleSpaceRegex: regexp.MustCompile(" +")}
}
-// NewPrecomputeHandler precomputes stat data and populates result.Precomputed before passing to ResultChannel.
+// NewPrecomputeHandler constructs a new cache Handler, which precomputes stat data and populates result.Precomputed before passing to ResultChannel.
func NewPrecomputeHandler(toData todata.TODataThreadsafe, peerStates peer.CRStatesPeersThreadsafe) Handler {
return Handler{ResultChannel: make(chan Result), MultipleSpaceRegex: regexp.MustCompile(" +"), ToData: &toData, PeerStates: &peerStates}
}
-func (h Handler) Precompute() bool {
- return h.ToData != nil && h.PeerStates != nil
+// Precompute returns whether this handler precomputes data before passing the result to the ResultChannel
+func (handler Handler) Precompute() bool {
+ return handler.ToData != nil && handler.PeerStates != nil
}
+// PrecomputedData represents data parsed and pre-computed from the Result.
type PrecomputedData struct {
DeliveryServiceStats map[enum.DeliveryServiceName]dsdata.Stat
OutBytes int64
@@ -47,18 +71,21 @@ type PrecomputedData struct {
Reporting bool
}
+// Result is the data result returned by a cache.
type Result struct {
- Id enum.CacheName
- Available bool
- Error error
- Astats Astats
- Time time.Time
- Vitals Vitals
- PrecomputedData
+ ID enum.CacheName
+ Error error
+ Astats Astats
+ Time time.Time
+ RequestTime time.Duration
+ Vitals Vitals
PollID uint64
PollFinished chan<- uint64
+ PrecomputedData
+ Available bool
}
+// Vitals is the vitals data returned from a cache.
type Vitals struct {
LoadAvg float64
BytesOut int64
@@ -67,35 +94,30 @@ type Vitals struct {
MaxKbpsOut int64
}
+// Stat is a generic stat, including the untyped value and the time the stat was taken.
type Stat struct {
Time int64 `json:"time"`
Value interface{} `json:"value"`
}
+// Stats is designed for returning via the API. It contains result history for each cache, as well as common API data.
type Stats struct {
- Caches map[enum.CacheName]map[string][]Stat `json:"caches"`
- QueryParams string `json:"pp"`
- DateStr string `json:"date"`
+ srvhttp.CommonAPIData
+ Caches map[enum.CacheName]map[string][]Stat `json:"caches"`
}
+// Filter filters whether stats and caches should be returned from a data set.
type Filter interface {
UseStat(name string) bool
UseCache(name enum.CacheName) bool
WithinStatHistoryMax(int) bool
}
-const (
- NOTIFY_NEVER = iota
- NOTIFY_CHANGE
- NOTIFY_ALWAYS
-)
-
// StatsMarshall encodes the stats in JSON, encoding up to historyCount of each stat. If statsToUse is empty, all stats are encoded; otherwise, only the given stats are encoded. If wildcard is true, stats which contain the text in each statsToUse are returned, instead of exact stat names. If cacheType is not CacheTypeInvalid, only stats for the given type are returned. If hosts is not empty, only the given hosts are returned.
func StatsMarshall(statHistory map[enum.CacheName][]Result, filter Filter, params url.Values) ([]byte, error) {
stats := Stats{
- Caches: map[enum.CacheName]map[string][]Stat{},
- QueryParams: http_server.ParametersStr(params),
- DateStr: http_server.DateStr(time.Now()),
+ CommonAPIData: srvhttp.GetCommonAPIData(params, time.Now()),
+ Caches: map[enum.CacheName]map[string][]Stat{},
}
// TODO in 1.0, stats are divided into 'location', 'cache', and 'type'. 'cache' are hidden by default.
@@ -126,7 +148,7 @@ func StatsMarshall(statHistory map[enum.CacheName][]Result, filter Filter, param
stats.Caches[id] = map[string][]Stat{}
}
- stats.Caches[id][stat] = append(stats.Caches[id][stat], s)
+ stats.Caches[id][stat] = append(stats.Caches[id][stat], Stat{Time: s.Time, Value: fmt.Sprintf("%v", s.Value)}) // convert stats to strings, for the TM1.0 /publish/CacheStats API
}
}
}
@@ -134,18 +156,20 @@ func StatsMarshall(statHistory map[enum.CacheName][]Result, filter Filter, param
return json.Marshal(stats)
}
-func (handler Handler) Handle(id string, r io.Reader, err error, pollId uint64, pollFinished chan<- uint64) {
- log.Debugf("poll %v %v handle start\n", pollId, time.Now())
+// Handle handles results fetched from a cache, parsing the raw Reader data and passing it along to a chan for further processing.
+func (handler Handler) Handle(id string, r io.Reader, reqTime time.Duration, reqErr error, pollID uint64, pollFinished chan<- uint64) {
+ log.Debugf("poll %v %v handle start\n", pollID, time.Now())
result := Result{
- Id: enum.CacheName(id),
+ ID: enum.CacheName(id),
Time: time.Now(), // TODO change this to be computed the instant we get the result back, to minimise inaccuracy
- PollID: pollId,
+ RequestTime: reqTime,
+ PollID: pollID,
PollFinished: pollFinished,
}
- if err != nil {
- log.Errorf("%v handler given error '%v'\n", id, err) // error here, in case the thing that called Handle didn't error
- result.Error = err
+ if reqErr != nil {
+ log.Errorf("%v handler given error '%v'\n", id, reqErr) // error here, in case the thing that called Handle didn't error
+ result.Error = reqErr
handler.ResultChannel <- result
return
}
@@ -159,9 +183,9 @@ func (handler Handler) Handle(id string, r io.Reader, err error, pollId uint64,
result.PrecomputedData.Reporting = true
- if err := json.NewDecoder(r).Decode(&result.Astats); err != nil {
- log.Errorf("%s procnetdev decode error '%v'\n", id, err)
- result.Error = err
+ if decodeErr := json.NewDecoder(r).Decode(&result.Astats); decodeErr != nil {
+ log.Errorf("%s procnetdev decode error '%v'\n", id, decodeErr)
+ result.Error = decodeErr
handler.ResultChannel <- result
return
}
@@ -174,23 +198,23 @@ func (handler Handler) Handle(id string, r io.Reader, err error, pollId uint64,
log.Warnf("addkbps %s inf.speed empty\n", id)
}
- log.Debugf("poll %v %v handle decode end\n", pollId, time.Now())
+ log.Debugf("poll %v %v handle decode end\n", pollID, time.Now())
- if err != nil {
- result.Error = err
- log.Errorf("addkbps handle %s error '%v'\n", id, err)
+ if reqErr != nil {
+ result.Error = reqErr
+ log.Errorf("addkbps handle %s error '%v'\n", id, reqErr)
} else {
result.Available = true
}
if handler.Precompute() {
- log.Debugf("poll %v %v handle precompute start\n", pollId, time.Now())
+ log.Debugf("poll %v %v handle precompute start\n", pollID, time.Now())
result = handler.precompute(result)
- log.Debugf("poll %v %v handle precompute end\n", pollId, time.Now())
+ log.Debugf("poll %v %v handle precompute end\n", pollID, time.Now())
}
- log.Debugf("poll %v %v handle write start\n", pollId, time.Now())
+ log.Debugf("poll %v %v handle write start\n", pollID, time.Now())
handler.ResultChannel <- result
- log.Debugf("poll %v %v handle end\n", pollId, time.Now())
+ log.Debugf("poll %v %v handle end\n", pollID, time.Now())
}
// outBytes takes the proc.net.dev string, and the interface name, and returns the bytes field
@@ -226,7 +250,7 @@ func (handler Handler) precompute(result Result) Result {
var err error
if result.PrecomputedData.OutBytes, err = outBytes(result.Astats.System.ProcNetDev, result.Astats.System.InfName, handler.MultipleSpaceRegex); err != nil {
result.PrecomputedData.OutBytes = 0
- log.Errorf("addkbps %s handle precomputing outbytes '%v'\n", result.Id, err)
+ log.Errorf("addkbps %s handle precomputing outbytes '%v'\n", result.ID, err)
}
kbpsInMbps := int64(1000)
@@ -234,9 +258,9 @@ func (handler Handler) precompute(result Result) Result {
for stat, value := range result.Astats.Ats {
var err error
- stats, err = processStat(result.Id, stats, todata, stat, value, result.Time)
+ stats, err = processStat(result.ID, stats, todata, stat, value, result.Time)
if err != nil && err != dsdata.ErrNotProcessedStat {
- log.Errorf("precomputing cache %v stat %v value %v error %v", result.Id, stat, value, err)
+ log.Errorf("precomputing cache %v stat %v value %v error %v", result.ID, stat, value, err)
result.PrecomputedData.Errors = append(result.PrecomputedData.Errors, err)
}
}
[26/26] incubator-trafficcontrol git commit: This closes #62
Posted by mi...@apache.org.
This closes #62
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/0604f369
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/0604f369
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/0604f369
Branch: refs/heads/psql
Commit: 0604f3699703170f6bcb59b118b293518f947e09
Parents: be5ab88
Author: Jeremy Mitchell <mi...@gmail.com>
Authored: Mon Nov 7 15:22:10 2016 -0700
Committer: Jeremy Mitchell <mi...@gmail.com>
Committed: Mon Nov 7 15:22:10 2016 -0700
----------------------------------------------------------------------
----------------------------------------------------------------------
[21/26] incubator-trafficcontrol git commit: merge master
Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/experimental/traffic_monitor/config/config.go
----------------------------------------------------------------------
diff --git a/traffic_monitor/experimental/traffic_monitor/config/config.go b/traffic_monitor/experimental/traffic_monitor/config/config.go
index 1ca4b80..ce24883 100644
--- a/traffic_monitor/experimental/traffic_monitor/config/config.go
+++ b/traffic_monitor/experimental/traffic_monitor/config/config.go
@@ -1,22 +1,49 @@
package config
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
import (
"encoding/json"
"io/ioutil"
"time"
)
+// LogLocation is a location to log to. This may be stdout, stderr, null (/dev/null), or a valid file path.
type LogLocation string
-const LogLocationStdout = "stdout"
-const LogLocationStderr = "stderr"
-const LogLocationNull = "null"
+const (
+ // LogLocationStdout indicates the stdout IO stream
+ LogLocationStdout = "stdout"
+ // LogLocationStderr indicates the stderr IO stream
+ LogLocationStderr = "stderr"
+ // LogLocationNull indicates the null IO stream (/dev/null)
+ LogLocationNull = "null"
+)
+// Config is the configuration for the application. It includes myriad data, such as polling intervals and log locations.
type Config struct {
CacheHealthPollingInterval time.Duration `json:"-"`
CacheStatPollingInterval time.Duration `json:"-"`
MonitorConfigPollingInterval time.Duration `json:"-"`
- HttpTimeout time.Duration `json:"-"`
+ HTTPTimeout time.Duration `json:"-"`
PeerPollingInterval time.Duration `json:"-"`
MaxEvents uint64 `json:"max_events"`
MaxStatHistory uint64 `json:"max_stat_history"`
@@ -27,13 +54,17 @@ type Config struct {
LogLocationWarning string `json:"log_location_warning"`
LogLocationInfo string `json:"log_location_info"`
LogLocationDebug string `json:"log_location_debug"`
+ ServeReadTimeout time.Duration `json:"-"`
+ ServeWriteTimeout time.Duration `json:"-"`
+ HealthToStatRatio uint64 `json:"health_to_stat_ratio"`
}
+// DefaultConfig is the default configuration for the application, if no configuration file is given, or if a given config setting doesn't exist in the config file.
var DefaultConfig = Config{
CacheHealthPollingInterval: 6 * time.Second,
CacheStatPollingInterval: 6 * time.Second,
MonitorConfigPollingInterval: 5 * time.Second,
- HttpTimeout: 2 * time.Second,
+ HTTPTimeout: 2 * time.Second,
PeerPollingInterval: 5 * time.Second,
MaxEvents: 200,
MaxStatHistory: 5,
@@ -44,6 +75,9 @@ var DefaultConfig = Config{
LogLocationWarning: LogLocationStdout,
LogLocationInfo: LogLocationNull,
LogLocationDebug: LogLocationNull,
+ ServeReadTimeout: 10 * time.Second,
+ ServeWriteTimeout: 10 * time.Second,
+ HealthToStatRatio: 4,
}
// MarshalJSON marshals custom millisecond durations. Aliasing inspired by http://choly.ca/post/go-json-marshalling/
@@ -53,16 +87,18 @@ func (c *Config) MarshalJSON() ([]byte, error) {
CacheHealthPollingIntervalMs uint64 `json:"cache_health_polling_interval_ms"`
CacheStatPollingIntervalMs uint64 `json:"cache_stat_polling_interval_ms"`
MonitorConfigPollingIntervalMs uint64 `json:"monitor_config_polling_interval_ms"`
- HttpTimeoutMs uint64 `json:"http_timeout_ms"`
+ HTTPTimeoutMS uint64 `json:"http_timeout_ms"`
PeerPollingIntervalMs uint64 `json:"peer_polling_interval_ms"`
HealthFlushIntervalMs uint64 `json:"health_flush_interval_ms"`
StatFlushIntervalMs uint64 `json:"stat_flush_interval_ms"`
+ ServeReadTimeoutMs uint64 `json:"serve_read_timeout_ms"`
+ ServeWriteTimeoutMs uint64 `json:"serve_write_timeout_ms"`
*Alias
}{
CacheHealthPollingIntervalMs: uint64(c.CacheHealthPollingInterval / time.Millisecond),
CacheStatPollingIntervalMs: uint64(c.CacheStatPollingInterval / time.Millisecond),
MonitorConfigPollingIntervalMs: uint64(c.MonitorConfigPollingInterval / time.Millisecond),
- HttpTimeoutMs: uint64(c.HttpTimeout / time.Millisecond),
+ HTTPTimeoutMS: uint64(c.HTTPTimeout / time.Millisecond),
PeerPollingIntervalMs: uint64(c.PeerPollingInterval / time.Millisecond),
HealthFlushIntervalMs: uint64(c.HealthFlushInterval / time.Millisecond),
StatFlushIntervalMs: uint64(c.StatFlushInterval / time.Millisecond),
@@ -70,16 +106,19 @@ func (c *Config) MarshalJSON() ([]byte, error) {
})
}
+// UnmarshalJSON populates this config object from given JSON bytes.
func (c *Config) UnmarshalJSON(data []byte) error {
type Alias Config
aux := &struct {
CacheHealthPollingIntervalMs *uint64 `json:"cache_health_polling_interval_ms"`
CacheStatPollingIntervalMs *uint64 `json:"cache_stat_polling_interval_ms"`
MonitorConfigPollingIntervalMs *uint64 `json:"monitor_config_polling_interval_ms"`
- HttpTimeoutMs *uint64 `json:"http_timeout_ms"`
+ HTTPTimeoutMS *uint64 `json:"http_timeout_ms"`
PeerPollingIntervalMs *uint64 `json:"peer_polling_interval_ms"`
HealthFlushIntervalMs *uint64 `json:"health_flush_interval_ms"`
StatFlushIntervalMs *uint64 `json:"stat_flush_interval_ms"`
+ ServeReadTimeoutMs *uint64 `json:"serve_read_timeout_ms"`
+ ServeWriteTimeoutMs *uint64 `json:"serve_write_timeout_ms"`
*Alias
}{
Alias: (*Alias)(c),
@@ -97,8 +136,8 @@ func (c *Config) UnmarshalJSON(data []byte) error {
if aux.MonitorConfigPollingIntervalMs != nil {
c.MonitorConfigPollingInterval = time.Duration(*aux.MonitorConfigPollingIntervalMs) * time.Millisecond
}
- if aux.HttpTimeoutMs != nil {
- c.HttpTimeout = time.Duration(*aux.HttpTimeoutMs) * time.Millisecond
+ if aux.HTTPTimeoutMS != nil {
+ c.HTTPTimeout = time.Duration(*aux.HTTPTimeoutMS) * time.Millisecond
}
if aux.PeerPollingIntervalMs != nil {
c.PeerPollingInterval = time.Duration(*aux.PeerPollingIntervalMs) * time.Millisecond
@@ -109,6 +148,12 @@ func (c *Config) UnmarshalJSON(data []byte) error {
if aux.StatFlushIntervalMs != nil {
c.StatFlushInterval = time.Duration(*aux.StatFlushIntervalMs) * time.Millisecond
}
+ if aux.ServeReadTimeoutMs != nil {
+ c.ServeReadTimeout = time.Duration(*aux.ServeReadTimeoutMs) * time.Millisecond
+ }
+ if aux.ServeWriteTimeoutMs != nil {
+ c.ServeWriteTimeout = time.Duration(*aux.ServeWriteTimeoutMs) * time.Millisecond
+ }
return nil
}
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/experimental/traffic_monitor/deliveryservice/stat.go
----------------------------------------------------------------------
diff --git a/traffic_monitor/experimental/traffic_monitor/deliveryservice/stat.go b/traffic_monitor/experimental/traffic_monitor/deliveryservice/stat.go
index 8b72163..ebd883f 100644
--- a/traffic_monitor/experimental/traffic_monitor/deliveryservice/stat.go
+++ b/traffic_monitor/experimental/traffic_monitor/deliveryservice/stat.go
@@ -1,14 +1,34 @@
package deliveryservice
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
import (
"fmt"
- "github.com/Comcast/traffic_control/traffic_monitor/experimental/common/log"
- "github.com/Comcast/traffic_control/traffic_monitor/experimental/traffic_monitor/cache"
- dsdata "github.com/Comcast/traffic_control/traffic_monitor/experimental/traffic_monitor/deliveryservicedata"
- "github.com/Comcast/traffic_control/traffic_monitor/experimental/traffic_monitor/enum"
- "github.com/Comcast/traffic_control/traffic_monitor/experimental/traffic_monitor/http_server"
- "github.com/Comcast/traffic_control/traffic_monitor/experimental/traffic_monitor/peer"
- todata "github.com/Comcast/traffic_control/traffic_monitor/experimental/traffic_monitor/trafficopsdata"
+ "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/common/log"
+ "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/traffic_monitor/cache"
+ dsdata "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/traffic_monitor/deliveryservicedata"
+ "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/traffic_monitor/enum"
+ "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/traffic_monitor/peer"
+ "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/traffic_monitor/srvhttp"
+ todata "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/traffic_monitor/trafficopsdata"
"net/url"
"strconv"
"time"
@@ -16,24 +36,30 @@ import (
// TODO remove 'ds' and 'stat' from names
+// Stats is the JSON-serialisable representation of delivery service Stats. It maps delivery service names to individual stat objects.
// TODO remove DeliveryService and set type to the map directly, or add other members
type Stats struct {
DeliveryService map[enum.DeliveryServiceName]dsdata.Stat `json:"deliveryService"`
+ Time time.Time `json:"-"`
}
-func (a Stats) Copy() Stats {
+// Copy performs a deep copy of this Stats object.
+func (s Stats) Copy() Stats {
b := NewStats()
- for k, v := range a.DeliveryService {
+ for k, v := range s.DeliveryService {
b.DeliveryService[k] = v.Copy()
}
+ b.Time = s.Time
return b
}
-func (a Stats) Get(name enum.DeliveryServiceName) (dsdata.StatReadonly, bool) {
- ds, ok := a.DeliveryService[name]
+// Get returns the stats for the given delivery service, and whether it exists.
+func (s Stats) Get(name enum.DeliveryServiceName) (dsdata.StatReadonly, bool) {
+ ds, ok := s.DeliveryService[name]
return ds, ok
}
+// NewStats creates a new Stats object, initializing any pointer members.
// TODO rename to just 'New'?
func NewStats() Stats {
return Stats{DeliveryService: map[enum.DeliveryServiceName]dsdata.Stat{}}
@@ -59,7 +85,7 @@ func addAvailableData(dsStats Stats, crStates peer.Crstates, serverCachegroups m
log.Warnf("CreateStats not adding availability data for '%s': not found in DeliveryServices\n", cache)
continue
}
- cacheType, ok := serverTypes[enum.CacheName(cache)]
+ cacheType, ok := serverTypes[cache]
if !ok {
log.Warnf("CreateStats not adding availability data for '%s': not found in Server Types\n", cache)
continue
@@ -71,19 +97,20 @@ func addAvailableData(dsStats Stats, crStates peer.Crstates, serverCachegroups m
continue
}
- stat, ok := dsStats.DeliveryService[enum.DeliveryServiceName(deliveryService)]
+ stat, ok := dsStats.DeliveryService[deliveryService]
if !ok {
log.Warnf("CreateStats not adding availability data for '%s': not found in Stats\n", cache)
continue // TODO log warning? Error?
}
if available.IsAvailable {
- // c.IsAvailable.Value
stat.CommonStats.IsAvailable.Value = true
+ // TODO fix to be whether the Delivery Service has exceeded max kbps defined in Traffic Ops in `/health/cdn-name`?
+ stat.CommonStats.IsHealthy.Value = true
stat.CommonStats.CachesAvailableNum.Value++
- cacheGroupStats := stat.CacheGroups[enum.CacheGroupName(cacheGroup)]
+ cacheGroupStats := stat.CacheGroups[cacheGroup]
cacheGroupStats.IsAvailable.Value = true
- stat.CacheGroups[enum.CacheGroupName(cacheGroup)] = cacheGroupStats
+ stat.CacheGroups[cacheGroup] = cacheGroupStats
stat.TotalStats.IsAvailable.Value = true
typeStats := stat.Types[cacheType]
typeStats.IsAvailable.Value = true
@@ -91,13 +118,13 @@ func addAvailableData(dsStats Stats, crStates peer.Crstates, serverCachegroups m
}
// TODO fix nested ifs
- if results, ok := statHistory[enum.CacheName(cache)]; ok {
+ if results, ok := statHistory[cache]; ok {
if len(results) < 1 {
log.Warnf("no results %v %v\n", cache, deliveryService)
} else {
result := results[0]
if result.PrecomputedData.Reporting {
- stat.CommonStats.CachesReporting[enum.CacheName(cache)] = true
+ stat.CommonStats.CachesReporting[cache] = true
} else {
log.Debugf("no reporting %v %v\n", cache, deliveryService)
}
@@ -106,7 +133,7 @@ func addAvailableData(dsStats Stats, crStates peer.Crstates, serverCachegroups m
log.Debugf("no result for %v %v\n", cache, deliveryService)
}
- dsStats.DeliveryService[enum.DeliveryServiceName(deliveryService)] = stat // TODO Necessary? Remove?
+ dsStats.DeliveryService[deliveryService] = stat // TODO Necessary? Remove?
}
}
return dsStats, nil
@@ -118,10 +145,12 @@ type LastStats struct {
Caches map[enum.CacheName]LastStatsData
}
+// NewLastStats returns a new LastStats object, initializing internal pointer values.
func NewLastStats() LastStats {
return LastStats{DeliveryServices: map[enum.DeliveryServiceName]LastDSStat{}, Caches: map[enum.CacheName]LastStatsData{}}
}
+// Copy performs a deep copy of this LastStats object.
func (a LastStats) Copy() LastStats {
b := NewLastStats()
for k, v := range a.DeliveryServices {
@@ -133,6 +162,7 @@ func (a LastStats) Copy() LastStats {
return b
}
+// LastDSStat maps and aggregates the last stats received for the given delivery service to caches, cache groups, types, and total.
// TODO figure a way to associate this type with StatHTTP, with which its members correspond.
type LastDSStat struct {
Caches map[enum.CacheName]LastStatsData
@@ -141,6 +171,7 @@ type LastDSStat struct {
Total LastStatsData
}
+// Copy performs a deep copy of this LastDSStat object.
func (a LastDSStat) Copy() LastDSStat {
b := LastDSStat{
CacheGroups: map[enum.CacheGroupName]LastStatsData{},
@@ -168,6 +199,7 @@ func newLastDSStat() LastDSStat {
}
}
+// LastStatsData contains the last stats and per-second calculations for bytes and status codes received from a cache.
type LastStatsData struct {
Bytes LastStatData
Status2xx LastStatData
@@ -187,6 +219,7 @@ func (a LastStatsData) Sum(b LastStatsData) LastStatsData {
}
}
+// LastStatData contains the value, time it was received, and per-second calculation since the previous stat, for a stat from a cache.
type LastStatData struct {
PerSec float64
Stat int64
@@ -201,6 +234,7 @@ func (a LastStatData) Sum(b LastStatData) LastStatData {
}
}
+// BytesPerKilobit is the number of bytes in a kilobit.
const BytesPerKilobit = 125
func addLastStat(lastData LastStatData, newStat int64, newStatTime time.Time) (LastStatData, error) {
@@ -298,7 +332,7 @@ func addDSPerSecStats(dsName enum.DeliveryServiceName, stat dsdata.Stat, lastSta
for cacheName, cacheStats := range stat.Caches {
lastStat.Caches[cacheName], err = addLastStats(lastStat.Caches[cacheName], cacheStats, dsStatsTime)
if err != nil {
- log.Errorf("debugq %v Error adding kbps for cache %v: %v", cacheName, err)
+ log.Errorf("%v adding kbps for cache %v: %v", dsName, cacheName, err)
continue
}
cacheStats.Kbps.Value = lastStat.Caches[cacheName].Bytes.PerSec / BytesPerKilobit
@@ -371,15 +405,16 @@ func addPerSecStats(statHistory map[enum.CacheName][]cache.Result, dsStats Stats
return dsStats, lastStats
}
+// CreateStats aggregates and creates statistics from given stat history. It returns the created stats, information about these stats necessary for the next calculation, and any error.
func CreateStats(statHistory map[enum.CacheName][]cache.Result, toData todata.TOData, crStates peer.Crstates, lastStats LastStats, now time.Time) (Stats, LastStats, error) {
start := time.Now()
dsStats := NewStats()
- for deliveryService, _ := range toData.DeliveryServiceServers {
+ for deliveryService := range toData.DeliveryServiceServers {
if deliveryService == "" {
log.Errorf("EMPTY CreateStats deliveryService")
continue
}
- dsStats.DeliveryService[enum.DeliveryServiceName(deliveryService)] = *dsdata.NewStat()
+ dsStats.DeliveryService[deliveryService] = *dsdata.NewStat()
}
dsStats = setStaticData(dsStats, toData.DeliveryServiceServers)
var err error
@@ -397,7 +432,7 @@ func CreateStats(statHistory map[enum.CacheName][]cache.Result, toData todata.TO
log.Warnf("server %s has no cachegroup, skipping\n", server)
continue
}
- serverType, ok := toData.ServerTypes[enum.CacheName(server)]
+ serverType, ok := toData.ServerTypes[server]
if !ok {
log.Warnf("server %s not in CRConfig, skipping\n", server)
continue
@@ -428,13 +463,20 @@ func CreateStats(statHistory map[enum.CacheName][]cache.Result, toData todata.TO
perSecStats, lastStats := addPerSecStats(statHistory, dsStats, lastStats, now, toData.ServerCachegroups, toData.ServerTypes)
log.Infof("CreateStats took %v\n", time.Since(start))
+ perSecStats.Time = time.Now()
return perSecStats, lastStats, nil
}
func addStatCacheStats(s *dsdata.StatsOld, c dsdata.StatCacheStats, deliveryService enum.DeliveryServiceName, prefix string, t int64, filter dsdata.Filter) *dsdata.StatsOld {
add := func(name, val string) {
if filter.UseStat(name) {
- s.DeliveryService[deliveryService][dsdata.StatName(prefix+name)] = []dsdata.StatOld{dsdata.StatOld{Time: t, Value: val}}
+ // This is for compatibility with the Traffic Monitor 1.0 API.
+ // TODO abstract this? Or deprecate and remove it?
+ if name == "isAvailable" || name == "error-string" {
+ s.DeliveryService[deliveryService][dsdata.StatName("location."+prefix+name)] = []dsdata.StatOld{dsdata.StatOld{Time: t, Value: val}}
+ } else {
+ s.DeliveryService[deliveryService][dsdata.StatName(prefix+name)] = []dsdata.StatOld{dsdata.StatOld{Time: t, Value: val}}
+ }
}
}
add("out_bytes", strconv.Itoa(int(c.OutBytes.Value)))
@@ -449,7 +491,7 @@ func addStatCacheStats(s *dsdata.StatsOld, c dsdata.StatCacheStats, deliveryServ
add("tps_4xx", fmt.Sprintf("%f", c.Tps4xx.Value))
add("tps_3xx", fmt.Sprintf("%f", c.Tps3xx.Value))
add("tps_2xx", fmt.Sprintf("%f", c.Tps2xx.Value))
- add("error", c.ErrorString.Value)
+ add("error-string", c.ErrorString.Value)
add("tps_total", strconv.Itoa(int(c.TpsTotal.Value)))
return s
}
@@ -470,16 +512,16 @@ func addCommonData(s *dsdata.StatsOld, c *dsdata.StatCommon, deliveryService enu
return s
}
-// StatsJSON returns an object formatted as expected to be serialized to JSON and served.
-func (dsStats Stats) JSON(filter dsdata.Filter, params url.Values) dsdata.StatsOld {
- now := time.Now().Unix()
+// JSON returns an object formatted as expected to be serialized to JSON and served.
+func (s Stats) JSON(filter dsdata.Filter, params url.Values) dsdata.StatsOld {
+ // TODO fix to be the time calculated, not the time requested
+ now := s.Time.UnixNano() / int64(time.Millisecond) // Traffic Monitor 1.0 API is 'ms since the epoch'
jsonObj := &dsdata.StatsOld{
+ CommonAPIData: srvhttp.GetCommonAPIData(params, time.Now()),
DeliveryService: map[enum.DeliveryServiceName]map[dsdata.StatName][]dsdata.StatOld{},
- QueryParams: http_server.ParametersStr(params),
- DateStr: http_server.DateStr(time.Now()),
}
- for deliveryService, stat := range dsStats.DeliveryService {
+ for deliveryService, stat := range s.DeliveryService {
if !filter.UseDeliveryService(deliveryService) {
continue
}
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/experimental/traffic_monitor/deliveryservicedata/stat.go
----------------------------------------------------------------------
diff --git a/traffic_monitor/experimental/traffic_monitor/deliveryservicedata/stat.go b/traffic_monitor/experimental/traffic_monitor/deliveryservicedata/stat.go
index 16680e4..cce4a8e 100644
--- a/traffic_monitor/experimental/traffic_monitor/deliveryservicedata/stat.go
+++ b/traffic_monitor/experimental/traffic_monitor/deliveryservicedata/stat.go
@@ -1,8 +1,29 @@
package deliveryservicedata // TODO rename?
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
import (
"errors"
- "github.com/Comcast/traffic_control/traffic_monitor/experimental/traffic_monitor/enum"
+ "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/traffic_monitor/enum"
+ "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/traffic_monitor/srvhttp"
"net/url"
"time"
)
@@ -15,25 +36,30 @@ type Filter interface {
WithinStatHistoryMax(int) bool
}
+// StatName is the name of a stat.
type StatName string
+
+// StatOld is the old JSON representation of a stat, from Traffic Monitor 1.0.
type StatOld struct {
Time int64 `json:"time"`
Value string `json:"value"`
Span int `json:"span,omitempty"` // TODO set? remove?
Index int `json:"index,omitempty"` // TODO set? remove?
}
+
+// StatsOld is the old JSON representation of stats, from Traffic Monitor 1.0. It is designed to be serialized and returns from an API, and includes stat history for each delivery service, as well as data common to most endpoints.
type StatsOld struct {
- // TODO move QueryParams, DateStr to a 'EndpointCommon' struct
DeliveryService map[enum.DeliveryServiceName]map[StatName][]StatOld `json:"deliveryService"`
- QueryParams string `json:"pp"`
- DateStr string `json:"date"`
+ srvhttp.CommonAPIData
}
+// StatsReadonly is a read-only interface for delivery service Stats, designed to be passed to multiple goroutine readers.
type StatsReadonly interface {
Get(enum.DeliveryServiceName) (StatReadonly, bool)
JSON(Filter, url.Values) StatsOld
}
+// StatReadonly is a read-only interface for a delivery service Stat, designed to be passed to multiple goroutine readers.
type StatReadonly interface {
Copy() Stat
Common() StatCommonReadonly
@@ -42,6 +68,7 @@ type StatReadonly interface {
Total() StatCacheStats
}
+// StatCommonReadonly is a read-only interface for a delivery service's common Stat data, designed to be passed to multiple goroutine readers.
type StatCommonReadonly interface {
Copy() StatCommon
CachesConfigured() StatInt
@@ -53,27 +80,36 @@ type StatCommonReadonly interface {
CachesAvailable() StatInt
}
-// New, more structured format:
+// StatMeta includes metadata about a particular stat.
type StatMeta struct {
- Time int `json:"time"`
+ Time int64 `json:"time"`
}
+
+// StatFloat is a float stat, combined with its metadata
type StatFloat struct {
StatMeta
Value float64 `json:"value"`
}
+
+// StatBool is a boolean stat, combined with its metadata
type StatBool struct {
StatMeta
Value bool `json:"value"`
}
+
+// StatInt is an integer stat, combined with its metadata
type StatInt struct {
StatMeta
Value int64 `json:"value"`
}
+
+// StatString is a string stat, combined with its metadata
type StatString struct {
StatMeta
Value string `json:"value"`
}
+// StatCommon contains stat data common to most delivery service stats.
type StatCommon struct {
CachesConfiguredNum StatInt `json:"caches_configured"`
CachesReporting map[enum.CacheName]bool `json:"caches_reporting"`
@@ -84,6 +120,7 @@ type StatCommon struct {
CachesAvailableNum StatInt `json:"caches_available"`
}
+// Copy returns a deep copy of this StatCommon object.
func (a StatCommon) Copy() StatCommon {
b := a
for k, v := range a.CachesReporting {
@@ -92,32 +129,47 @@ func (a StatCommon) Copy() StatCommon {
return b
}
+// CachesConfigured returns the number of caches configured for this delivery service stat. It is part of the StatCommonReadonly interface.
func (a StatCommon) CachesConfigured() StatInt {
return a.CachesConfiguredNum
}
+
+// CacheReporting returns the number of caches reporting for this delivery service stat. It is part of the StatCommonReadonly interface.
func (a StatCommon) CacheReporting(name enum.CacheName) (bool, bool) {
c, ok := a.CachesReporting[name]
return c, ok
}
+
+// CachesReportingNames returns the list of caches reporting for this delivery service stat. It is part of the StatCommonReadonly interface.
func (a StatCommon) CachesReportingNames() []enum.CacheName {
names := make([]enum.CacheName, 0, len(a.CachesReporting))
- for name, _ := range a.CachesReporting {
+ for name := range a.CachesReporting {
names = append(names, name)
}
return names
}
+
+// Error returns the error string of this delivery service stat. It is part of the StatCommonReadonly interface.
func (a StatCommon) Error() StatString {
return a.ErrorStr
}
+
+// Status returns the status string of this delivery service stat. It is part of the StatCommonReadonly interface.
func (a StatCommon) Status() StatString {
return a.StatusStr
}
+
+// Healthy returns whether this delivery service is considered healthy by this stat. It is part of the StatCommonReadonly interface.
func (a StatCommon) Healthy() StatBool {
return a.IsHealthy
}
+
+// Available returns whether this delivery service is considered available by this stat. It is part of the StatCommonReadonly interface.
func (a StatCommon) Available() StatBool {
return a.IsAvailable
}
+
+// CachesAvailable returns the number of caches available to the delivery service in this stat. It is part of the StatCommonReadonly interface.
func (a StatCommon) CachesAvailable() StatInt {
return a.CachesAvailableNum
}
@@ -142,6 +194,7 @@ type StatCacheStats struct {
TpsTotal StatInt `json:"tps_total"`
}
+// Sum adds the given cache stats to this cache stats. Numeric values are summed; strings are appended.
func (a StatCacheStats) Sum(b StatCacheStats) StatCacheStats {
return StatCacheStats{
OutBytes: StatInt{Value: a.OutBytes.Value + b.OutBytes.Value},
@@ -161,6 +214,7 @@ func (a StatCacheStats) Sum(b StatCacheStats) StatCacheStats {
}
}
+// Stat represents a complete delivery service stat, for a given poll, or at the time requested.
type Stat struct {
CommonStats StatCommon
CacheGroups map[enum.CacheGroupName]StatCacheStats
@@ -170,8 +224,10 @@ type Stat struct {
TotalStats StatCacheStats
}
+// ErrNotProcessedStat indicates a stat received is not used by Traffic Monitor, nor returned by any API endpoint. Receiving this error indicates the stat has been discarded.
var ErrNotProcessedStat = errors.New("This stat is not used.")
+// NewStat returns a new delivery service Stat, initializing pointer members.
func NewStat() *Stat {
return &Stat{
CacheGroups: map[enum.CacheGroupName]StatCacheStats{},
@@ -182,6 +238,7 @@ func NewStat() *Stat {
}
}
+// Copy performs a deep copy of this Stat. It does not modify, and is thus safe for multiple goroutines.
func (a Stat) Copy() Stat {
b := Stat{
CommonStats: a.CommonStats.Copy(),
@@ -206,20 +263,24 @@ func (a Stat) Copy() Stat {
return b
}
+// Common returns the common stat data for this stat. It is part of the StatCommonReadonly interface.
func (a Stat) Common() StatCommonReadonly {
return a.CommonStats
}
+// CacheGroup returns the data for the given cachegroup in this stat. It is part of the StatCommonReadonly interface.
func (a Stat) CacheGroup(name enum.CacheGroupName) (StatCacheStats, bool) {
c, ok := a.CacheGroups[name]
return c, ok
}
+// Type returns the aggregated data for the given cache type in this stat. It is part of the StatCommonReadonly interface.
func (a Stat) Type(name enum.CacheType) (StatCacheStats, bool) {
t, ok := a.Types[name]
return t, ok
}
+// Total returns the aggregated total data in this stat. It is part of the StatCommonReadonly interface.
func (a Stat) Total() StatCacheStats {
return a.TotalStats
}
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/experimental/traffic_monitor/enum/enum.go
----------------------------------------------------------------------
diff --git a/traffic_monitor/experimental/traffic_monitor/enum/enum.go b/traffic_monitor/experimental/traffic_monitor/enum/enum.go
index d14593c..77f8ea4 100644
--- a/traffic_monitor/experimental/traffic_monitor/enum/enum.go
+++ b/traffic_monitor/experimental/traffic_monitor/enum/enum.go
@@ -1,29 +1,56 @@
-// enum contains enumerations and strongly typed names.
+// Package enum contains enumerations and strongly typed names.
// The names are an experiment with strong typing of string types. The primary goal is to make code more self-documenting, especially map keys. If peole don't like it, we can get rid of it.
package enum
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
import (
"strings"
)
+// TrafficMonitorName is the hostname of a Traffic Monitor peer.
type TrafficMonitorName string
+// CacheName is the hostname of a CDN cache.
type CacheName string
+// CacheGroupName is the name of a CDN cachegroup.
type CacheGroupName string
-// Current JSON endpoint:
+// DeliveryServiceName is the name of a CDN delivery service.
type DeliveryServiceName string
-// TODO move and rename more generically
+// CacheType is the type (or tier) of a CDN cache.
type CacheType string
const (
- CacheTypeEdge = CacheType("EDGE")
- CacheTypeMid = CacheType("MID")
+ // CacheTypeEdge represents an edge cache.
+ CacheTypeEdge = CacheType("EDGE")
+ // CacheTypeMid represents a mid cache.
+ CacheTypeMid = CacheType("MID")
+ // CacheTypeInvalid represents an cache type enumeration. Note this is the default construction for a CacheType.
CacheTypeInvalid = CacheType("")
)
+// String returns a string representation of this cache type.
func (t CacheType) String() string {
switch t {
case CacheTypeEdge:
@@ -31,10 +58,11 @@ func (t CacheType) String() string {
case CacheTypeMid:
return "MID"
default:
- return "INVALID"
+ return "INVALIDCACHETYPE"
}
}
+// CacheTypeFromString returns a cache type object from its string representation, or CacheTypeInvalid if the string is not a valid type.
func CacheTypeFromString(s string) CacheType {
s = strings.ToLower(s)
switch s {
@@ -51,11 +79,15 @@ func CacheTypeFromString(s string) CacheType {
type DSType string
const (
- DSTypeHTTP = DSType("http")
- DSTypeDNS = DSType("dns")
+ // DSTypeHTTP represents an HTTP delivery service
+ DSTypeHTTP = DSType("http")
+ // DSTypeDNS represents a DNS delivery service
+ DSTypeDNS = DSType("dns")
+ // DSTypeInvalid represents an invalid delivery service type enumeration. Note this is the default construction for a DSType.
DSTypeInvalid = DSType("")
)
+// String returns a string representation of this delivery service type.
func (t DSType) String() string {
switch t {
case DSTypeHTTP:
@@ -63,10 +95,11 @@ func (t DSType) String() string {
case DSTypeDNS:
return "DNS"
default:
- return "INVALID"
+ return "INVALIDDSTYPE"
}
}
+// DSTypeFromString returns a delivery service type object from its string representation, or DSTypeInvalid if the string is not a valid type.
func DSTypeFromString(s string) DSType {
s = strings.ToLower(s)
switch s {
@@ -78,3 +111,54 @@ func DSTypeFromString(s string) DSType {
return DSTypeInvalid
}
}
+
+// CacheStatus represents the Traffic Server status set in Traffic Ops (online, offline, admin_down, reported). The string values of this type should match the Traffic Ops values.
+type CacheStatus string
+
+const (
+ // CacheStatusAdminDown represents a cache which has been administratively marked as down, but which should still appear in the CDN (Traffic Server, Traffic Monitor, Traffic Router).
+ CacheStatusAdminDown = CacheStatus("ADMIN_DOWN")
+ // CacheStatusOnline represents a cache which has been marked as Online in Traffic Ops, irrespective of monitoring. Traffic Monitor will always flag these caches as available.
+ CacheStatusOnline = CacheStatus("ONLINE")
+ // CacheStatusOffline represents a cache which has been marked as Offline in Traffic Ops. These caches will not be returned in any endpoint, and Traffic Monitor acts like they don't exist.
+ CacheStatusOffline = CacheStatus("OFFLINE")
+ // CacheStatusReported represents a cache which has been marked as Reported in Traffic Ops. These caches are polled for health and returned in endpoints as available or unavailable based on bandwidth, response time, and other factors. The vast majority of caches should be Reported.
+ CacheStatusReported = CacheStatus("REPORTED")
+ // CacheStatusInvalid represents an invalid status enumeration.
+ CacheStatusInvalid = CacheStatus("")
+)
+
+// String returns a string representation of this cache status
+func (t CacheStatus) String() string {
+ switch t {
+ case CacheStatusAdminDown:
+ fallthrough
+ case CacheStatusOnline:
+ fallthrough
+ case CacheStatusOffline:
+ fallthrough
+ case CacheStatusReported:
+ return string(t)
+ default:
+ return "INVALIDCACHESTATUS"
+ }
+}
+
+// CacheStatusFromString returns a CacheStatus from its string representation, or CacheStatusInvalid if the string is not a valid type.
+func CacheStatusFromString(s string) CacheStatus {
+ s = strings.ToLower(s)
+ switch s {
+ case "admin_down":
+ fallthrough
+ case "admindown":
+ return CacheStatusAdminDown
+ case "offline":
+ return CacheStatusOffline
+ case "online":
+ return CacheStatusOnline
+ case "reported":
+ return CacheStatusReported
+ default:
+ return CacheStatusInvalid
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/experimental/traffic_monitor/health/cache_health.go
----------------------------------------------------------------------
diff --git a/traffic_monitor/experimental/traffic_monitor/health/cache_health.go b/traffic_monitor/experimental/traffic_monitor/health/cache_health.go
index b8b180f..5dfa0c2 100644
--- a/traffic_monitor/experimental/traffic_monitor/health/cache_health.go
+++ b/traffic_monitor/experimental/traffic_monitor/health/cache_health.go
@@ -1,43 +1,44 @@
package health
-import (
- "github.com/Comcast/traffic_control/traffic_monitor/experimental/common/log"
- "github.com/Comcast/traffic_control/traffic_monitor/experimental/traffic_monitor/cache"
- traffic_ops "github.com/Comcast/traffic_control/traffic_ops/client"
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+import (
"fmt"
+ "math"
"strconv"
"strings"
-)
-
-// Get the String value of one of those pesky map[string]interface{} things that seem so easy
-func getString(key string, intface map[string]interface{}) (string, error) {
- str, ok := intface[key].(string)
-
- if ok {
- return str, nil
- } else {
- return "", fmt.Errorf("Error in getString: No string found for key %s", key)
- }
-}
+ "time"
-// Get the float64 value of one of those pesky map[string]interface{} things that seem so easy
-func getNumber(key string, intface map[string]interface{}) (float64, error) {
- val, ok := intface[key].(float64)
-
- if ok {
- return val, nil
- } else {
- return -1, fmt.Errorf("Error in getNumber: No number found for %s", key)
- }
-}
+ "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/common/log"
+ "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/traffic_monitor/cache"
+ "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/traffic_monitor/enum"
+ traffic_ops "github.com/apache/incubator-trafficcontrol/traffic_ops/client"
+)
func setError(newResult *cache.Result, err error) {
newResult.Error = err
newResult.Available = false
}
-// Get the vitals to decide health on in the right format
+// GetVitals Gets the vitals to decide health on in the right format
func GetVitals(newResult *cache.Result, prevResult *cache.Result, mc *traffic_ops.TrafficMonitorConfigMap) {
if newResult.Error != nil {
log.Errorf("cache_health.GetVitals() called with an errored Result!")
@@ -54,7 +55,7 @@ func GetVitals(newResult *cache.Result, prevResult *cache.Result, mc *traffic_op
}
newResult.Vitals.LoadAvg = oneMinAvg
} else {
- setError(newResult, fmt.Errorf("Can't make sense of '%s' as a load average for %s", newResult.Astats.System.ProcLoadavg, newResult.Id))
+ setError(newResult, fmt.Errorf("Can't make sense of '%s' as a load average for %s", newResult.Astats.System.ProcLoadavg, newResult.ID))
return
}
@@ -90,27 +91,63 @@ func GetVitals(newResult *cache.Result, prevResult *cache.Result, mc *traffic_op
// inf.speed -- value looks like "10000" (without the quotes) so it is in Mbps.
// TODO JvD: Should we really be running this code every second for every cache polled????? I don't think so.
interfaceBandwidth := newResult.Astats.System.InfSpeed
- newResult.Vitals.MaxKbpsOut = int64(interfaceBandwidth)*1000 - mc.Profile[mc.TrafficServer[string(newResult.Id)].Profile].Parameters.MinFreeKbps
+ newResult.Vitals.MaxKbpsOut = int64(interfaceBandwidth)*1000 - mc.Profile[mc.TrafficServer[string(newResult.ID)].Profile].Parameters.MinFreeKbps
// log.Infoln(newResult.Id, "BytesOut", newResult.Vitals.BytesOut, "BytesIn", newResult.Vitals.BytesIn, "Kbps", newResult.Vitals.KbpsOut, "max", newResult.Vitals.MaxKbpsOut)
}
+// getKbpsThreshold returns the numeric kbps threshold, from the Traffic Ops string value. If there is a parse error, it logs a warning and returns the max floating point number, signifying no limit
+// TODO add float64 to Traffic Ops Client interface
+func getKbpsThreshold(threshStr string) int64 {
+ if len(threshStr) == 0 {
+ log.Errorf("Empty Traffic Ops HealthThresholdAvailableBandwidthInKbps; setting no limit.\n")
+ return math.MaxInt64
+ }
+ if threshStr[0] == '>' {
+ threshStr = threshStr[1:]
+ }
+ thresh, err := strconv.ParseInt(threshStr, 10, 64)
+ if err != nil {
+ log.Errorf("Failed to parse Traffic Ops HealthThresholdAvailableBandwidthInKbps, setting no limit: '%v'\n", err)
+ return math.MaxInt64
+ }
+ return thresh
+}
+
+// TODO add time.Duration to Traffic Ops Client interface
+func getQueryThreshold(threshInt int64) time.Duration {
+ return time.Duration(threshInt) * time.Millisecond
+}
+
+func cacheCapacityKbps(result cache.Result) int64 {
+ kbpsInMbps := int64(1000)
+ return int64(result.Astats.System.InfSpeed) * kbpsInMbps
+}
+
// EvalCache returns whether the given cache should be marked available, and a string describing why
func EvalCache(result cache.Result, mc *traffic_ops.TrafficMonitorConfigMap) (bool, string) {
- status := mc.TrafficServer[string(result.Id)].Status
+ toServer := mc.TrafficServer[string(result.ID)]
+ status := enum.CacheStatusFromString(toServer.Status)
+ if status == enum.CacheStatusInvalid {
+ log.Errorf("Cache %v got invalid status from Traffic Ops '%v' - treating as Reported\n", result.ID, toServer.Status)
+ }
+ params := mc.Profile[toServer.Profile].Parameters
switch {
- case status == "ADMIN_DOWN":
- return false, "set to ADMIN_DOWN"
- case status == "OFFLINE":
- return false, "set to OFFLINE"
- case status == "ONLINE":
- return true, "set to ONLINE"
+ case status == enum.CacheStatusAdminDown:
+ return false, "set to " + status.String()
+ case status == enum.CacheStatusOffline:
+ log.Errorf("Cache %v set to offline, but still polled\n", result.ID)
+ return false, "set to " + status.String()
+ case status == enum.CacheStatusOnline:
+ return true, "set to " + status.String()
case result.Error != nil:
return false, fmt.Sprintf("error: %v", result.Error)
- case result.Vitals.LoadAvg > mc.Profile[mc.TrafficServer[string(result.Id)].Profile].Parameters.HealthThresholdLoadAvg:
- return false, fmt.Sprintf("load average %f exceeds threshold %f", result.Vitals.LoadAvg, mc.Profile[mc.TrafficServer[string(result.Id)].Profile].Parameters.HealthThresholdLoadAvg)
- case result.Vitals.MaxKbpsOut < result.Vitals.KbpsOut:
- return false, fmt.Sprintf("%dkbps exceeds max %dkbps", result.Vitals.KbpsOut, result.Vitals.MaxKbpsOut)
+ case result.Vitals.LoadAvg > params.HealthThresholdLoadAvg:
+ return false, fmt.Sprintf("load average %f exceeds threshold %f", result.Vitals.LoadAvg, params.HealthThresholdLoadAvg)
+ case result.Vitals.KbpsOut > cacheCapacityKbps(result)-getKbpsThreshold(params.HealthThresholdAvailableBandwidthInKbps):
+ return false, fmt.Sprintf("%dkbps exceeds max %dkbps", result.Vitals.KbpsOut, getKbpsThreshold(params.HealthThresholdAvailableBandwidthInKbps))
+ case result.RequestTime > getQueryThreshold(int64(params.HealthThresholdQueryTime)):
+ return false, fmt.Sprintf("request time %v exceeds max %v", result.RequestTime, getQueryThreshold(int64(params.HealthThresholdQueryTime)))
default:
return result.Available, "reported"
}
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/experimental/traffic_monitor/http_server/http_server.go
----------------------------------------------------------------------
diff --git a/traffic_monitor/experimental/traffic_monitor/http_server/http_server.go b/traffic_monitor/experimental/traffic_monitor/http_server/http_server.go
deleted file mode 100644
index fb70d72..0000000
--- a/traffic_monitor/experimental/traffic_monitor/http_server/http_server.go
+++ /dev/null
@@ -1,289 +0,0 @@
-package http_server
-
-import (
- "fmt"
- "github.com/Comcast/traffic_control/traffic_monitor/experimental/common/log"
- "github.com/hydrogen18/stoppableListener"
- "io/ioutil"
- "net"
- "net/http"
- "net/url"
- "sync"
- "time"
-)
-
-// Server is a re-runnable HTTP server. Server.Run() may be called repeatedly, and
-// each time the previous running server will be stopped, and the server will be
-// restarted with the new port address and data request channel.
-type Server struct {
- getData GetDataFunc
- stoppableListener *stoppableListener.StoppableListener
- stoppableListenerWaitGroup sync.WaitGroup
-}
-
-// Endpoints returns a map of HTTP paths to functions.
-// This is a function because Go doesn't have constant map literals.
-func (s Server) endpoints() (map[string]http.HandlerFunc, error) {
- handleRoot, err := s.handleRootFunc()
- handleSortableJs, err := s.handleSortableFunc()
- if err != nil {
- return nil, fmt.Errorf("Error getting root endpoint: %v", err)
- }
-
- // note: with the trailing slash, any non-trailing slash requests will get a 301 redirect
- return map[string]http.HandlerFunc{
- "/publish/CacheStats/": s.dataRequestFunc(CacheStats),
- "/publish/CacheStats": s.dataRequestFunc(CacheStats),
- "/publish/CrConfig/": s.dataRequestFunc(TRConfig),
- "/publish/CrConfig": s.dataRequestFunc(TRConfig),
- "/publish/CrStates/": s.handleCrStatesFunc(),
- "/publish/CrStates": s.handleCrStatesFunc(),
- "/publish/DsStats/": s.dataRequestFunc(DSStats),
- "/publish/DsStats": s.dataRequestFunc(DSStats),
- "/publish/EventLog/": s.dataRequestFunc(EventLog),
- "/publish/EventLog": s.dataRequestFunc(EventLog),
- "/publish/PeerStates/": s.dataRequestFunc(PeerStates),
- "/publish/PeerStates": s.dataRequestFunc(PeerStates),
- "/publish/StatSummary/": s.dataRequestFunc(StatSummary),
- "/publish/StatSummary": s.dataRequestFunc(StatSummary),
- "/publish/Stats/": s.dataRequestFunc(Stats),
- "/publish/Stats": s.dataRequestFunc(Stats),
- "/publish/ConfigDoc/": s.dataRequestFunc(ConfigDoc),
- "/publish/ConfigDoc": s.dataRequestFunc(ConfigDoc),
- "/api/cache-count/": s.dataRequestFunc(APICacheCount),
- "/api/cache-count": s.dataRequestFunc(APICacheCount),
- "/api/cache-available-count/": s.dataRequestFunc(APICacheAvailableCount),
- "/api/cache-available-count": s.dataRequestFunc(APICacheAvailableCount),
- "/api/cache-down-count/": s.dataRequestFunc(APICacheDownCount),
- "/api/cache-down-count": s.dataRequestFunc(APICacheDownCount),
- "/api/version/": s.dataRequestFunc(APIVersion),
- "/api/version": s.dataRequestFunc(APIVersion),
- "/api/traffic-ops-uri/": s.dataRequestFunc(APITrafficOpsURI),
- "/api/traffic-ops-uri": s.dataRequestFunc(APITrafficOpsURI),
- "/api/cache-statuses/": s.dataRequestFunc(APICacheStates),
- "/api/cache-statuses": s.dataRequestFunc(APICacheStates),
- "/api/bandwidth-kbps/": s.dataRequestFunc(APIBandwidthKbps),
- "/api/bandwidth-kbps": s.dataRequestFunc(APIBandwidthKbps),
- "/api/bandwidth-capacity-kbps/": s.dataRequestFunc(APIBandwidthCapacityKbps),
- "/api/bandwidth-capacity-kbps": s.dataRequestFunc(APIBandwidthCapacityKbps),
- "/": handleRoot,
- "/sorttable.js": handleSortableJs,
- }, nil
-}
-
-func (s Server) registerEndpoints(sm *http.ServeMux) error {
- endpoints, err := s.endpoints()
- if err != nil {
- return err
- }
- for path, f := range endpoints {
- sm.HandleFunc(path, f)
- }
- return nil
-}
-
-// Run runs a new HTTP service at the given addr, making data requests to the given c.
-// Run may be called repeatedly, and each time, will shut down any existing service first.
-// Run is NOT threadsafe, and MUST NOT be called concurrently by multiple goroutines.
-func (s Server) Run(f GetDataFunc, addr string) error {
- // TODO make an object, which itself is not threadsafe, but which encapsulates all data so multiple
- // objects can be created and Run.
-
- if s.stoppableListener != nil {
- log.Infof("Stopping Web Server\n")
- s.stoppableListener.Stop()
- s.stoppableListenerWaitGroup.Wait()
- }
- log.Infof("Starting Web Server\n")
-
- var err error
- var originalListener net.Listener
- if originalListener, err = net.Listen("tcp", addr); err != nil {
- return err
- }
- if s.stoppableListener, err = stoppableListener.New(originalListener); err != nil {
- return err
- }
-
- s.getData = f
-
- sm := http.NewServeMux()
- err = s.registerEndpoints(sm)
- if err != nil {
- return err
- }
- server := &http.Server{
- Addr: addr,
- Handler: sm,
- ReadTimeout: 10 * time.Second,
- WriteTimeout: 10 * time.Second,
- MaxHeaderBytes: 1 << 20,
- }
-
- s.stoppableListenerWaitGroup = sync.WaitGroup{}
- s.stoppableListenerWaitGroup.Add(1)
- go func() {
- defer s.stoppableListenerWaitGroup.Done()
- server.Serve(s.stoppableListener)
- }()
-
- log.Infof("Web server listening on %s", addr)
- return nil
-}
-
-type Type int
-
-const (
- TRConfig Type = (1 << iota)
- TRStateDerived
- TRStateSelf
- CacheStats
- DSStats
- EventLog
- PeerStates
- StatSummary
- Stats
- ConfigDoc
- APICacheCount
- APICacheAvailableCount
- APICacheDownCount
- APIVersion
- APITrafficOpsURI
- APICacheStates
- APIBandwidthKbps
- APIBandwidthCapacityKbps
-)
-
-func (t Type) String() string {
- switch t {
- case TRConfig:
- return "TRConfig"
- case TRStateDerived:
- return "TRStateDerived"
- case TRStateSelf:
- return "TRStateSelf"
- case CacheStats:
- return "CacheStats"
- case DSStats:
- return "DSStats"
- case EventLog:
- return "EventLog"
- case PeerStates:
- return "PeerStates"
- case StatSummary:
- return "StatSummary"
- case Stats:
- return "Stats"
- case ConfigDoc:
- return "ConfigDoc"
- case APICacheCount:
- return "APICacheCount"
- case APICacheAvailableCount:
- return "APICacheAvailableCount"
- case APICacheDownCount:
- return "APICacheDownCount"
- case APIVersion:
- return "APIVersion"
- case APITrafficOpsURI:
- return "APITrafficOpsURI"
- case APICacheStates:
- return "APICacheStates"
- case APIBandwidthKbps:
- return "APIBandwidthKbps"
- case APIBandwidthCapacityKbps:
- return "APIBandwidthCapacityKbps"
- default:
- return "Invalid"
- }
-}
-
-type Format int
-
-const (
- XML Format = (1 << iota)
- JSON
-)
-
-type DataRequest struct {
- Type
- Format
- Date string
- Parameters map[string][]string
-}
-
-type GetDataFunc func(DataRequest) ([]byte, int)
-
-// ParametersStr takes the URL query parameters, and returns a string as used by the Traffic Monitor 1.0 endpoints "pp" key.
-func ParametersStr(params url.Values) string {
- fmt.Println("debug4 ParametersStr 0")
- pp := ""
- for param, vals := range params {
- for _, val := range vals {
- pp += param + "=[" + val + "], "
- }
- }
- if len(pp) > 2 {
- pp = pp[:len(pp)-2]
- }
- return pp
-}
-
-// DateStr returns the given time in the format expected by Traffic Monitor 1.0 API users
-func DateStr(t time.Time) string {
- return t.UTC().Format("Mon Jan 02 15:04:05 UTC 2006")
-}
-
-func (s Server) dataRequest(w http.ResponseWriter, req *http.Request, t Type, f Format) {
- //pp: "0=[my-ats-edge-cache-0], hc=[1]",
- //dateLayout := "Thu Oct 09 20:28:36 UTC 2014"
- dateLayout := "Mon Jan 02 15:04:05 MST 2006"
- data, responseCode := s.getData(DataRequest{
- Type: t,
- Format: f,
- Date: time.Now().UTC().Format(dateLayout),
- Parameters: req.URL.Query(),
- })
- if len(data) > 0 {
- w.WriteHeader(responseCode)
- w.Write(data)
- } else {
- w.WriteHeader(http.StatusInternalServerError)
- w.Write([]byte("Internal Server Error"))
- }
-}
-
-func (s Server) handleRootFunc() (http.HandlerFunc, error) {
- index, err := ioutil.ReadFile("index.html")
- if err != nil {
- return nil, err
- }
- return func(w http.ResponseWriter, req *http.Request) {
- fmt.Fprintf(w, "%s", index)
- }, nil
-}
-
-func (s Server) handleSortableFunc() (http.HandlerFunc, error) {
- index, err := ioutil.ReadFile("sorttable.js")
- if err != nil {
- return nil, err
- }
- return func(w http.ResponseWriter, req *http.Request) {
- fmt.Fprintf(w, "%s", index)
- }, nil
-}
-
-func (s Server) handleCrStatesFunc() http.HandlerFunc {
- return func(w http.ResponseWriter, req *http.Request) {
- t := TRStateDerived
- if req.URL.RawQuery == "raw" {
- t = TRStateSelf
- }
- s.dataRequest(w, req, t, JSON)
- }
-}
-
-func (s Server) dataRequestFunc(t Type) http.HandlerFunc {
- return func(w http.ResponseWriter, r *http.Request) {
- s.dataRequest(w, r, t, JSON)
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/experimental/traffic_monitor/index.html
----------------------------------------------------------------------
diff --git a/traffic_monitor/experimental/traffic_monitor/index.html b/traffic_monitor/experimental/traffic_monitor/index.html
index a5c43aa..43d1ab4 100644
--- a/traffic_monitor/experimental/traffic_monitor/index.html
+++ b/traffic_monitor/experimental/traffic_monitor/index.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<!DOCTYPE html>
<html>
<head>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/experimental/traffic_monitor/manager/cacheavailablestatus.go
----------------------------------------------------------------------
diff --git a/traffic_monitor/experimental/traffic_monitor/manager/cacheavailablestatus.go b/traffic_monitor/experimental/traffic_monitor/manager/cacheavailablestatus.go
index b66c392..67860b1 100644
--- a/traffic_monitor/experimental/traffic_monitor/manager/cacheavailablestatus.go
+++ b/traffic_monitor/experimental/traffic_monitor/manager/cacheavailablestatus.go
@@ -1,25 +1,50 @@
package manager
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
import (
- "github.com/Comcast/traffic_control/traffic_monitor/experimental/traffic_monitor/enum"
+ "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/traffic_monitor/enum"
"sync"
)
+// CacheAvailableStatusReported is the status string returned by caches set to "reported" in Traffic Ops.
// TODO put somewhere more generic
const CacheAvailableStatusReported = "REPORTED"
+// CacheAvailableStatus is the available status of the given cache. It includes a boolean available/unavailable flag, and a descriptive string.
type CacheAvailableStatus struct {
Available bool
Status string
}
+// CacheAvailableStatuses is the available status of each cache.
type CacheAvailableStatuses map[enum.CacheName]CacheAvailableStatus
+// CacheAvailableStatusThreadsafe wraps a map of cache available statuses to be safe for multiple reader goroutines and one writer.
type CacheAvailableStatusThreadsafe struct {
caches *CacheAvailableStatuses
m *sync.RWMutex
}
+// Copy copies this CacheAvailableStatuses. It does not modify, and thus is safe for multiple reader goroutines.
func (a CacheAvailableStatuses) Copy() CacheAvailableStatuses {
b := CacheAvailableStatuses(map[enum.CacheName]CacheAvailableStatus{})
for k, v := range a {
@@ -28,17 +53,20 @@ func (a CacheAvailableStatuses) Copy() CacheAvailableStatuses {
return b
}
+// NewCacheAvailableStatusThreadsafe creates and returns a new CacheAvailableStatusThreadsafe, initializing internal pointer values.
func NewCacheAvailableStatusThreadsafe() CacheAvailableStatusThreadsafe {
c := CacheAvailableStatuses(map[enum.CacheName]CacheAvailableStatus{})
return CacheAvailableStatusThreadsafe{m: &sync.RWMutex{}, caches: &c}
}
+// Get returns the internal map of cache statuses. The returned map MUST NOT be modified. If modification is necessary, copy.
func (o *CacheAvailableStatusThreadsafe) Get() CacheAvailableStatuses {
o.m.RLock()
defer o.m.RUnlock()
return *o.caches
}
+// Set sets the internal map of cache availability. This MUST NOT be called by multiple goroutines.
func (o *CacheAvailableStatusThreadsafe) Set(v CacheAvailableStatuses) {
o.m.Lock()
*o.caches = v
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/experimental/traffic_monitor/manager/datarequest.go
----------------------------------------------------------------------
diff --git a/traffic_monitor/experimental/traffic_monitor/manager/datarequest.go b/traffic_monitor/experimental/traffic_monitor/manager/datarequest.go
index 4651aa3..7de4c0e 100644
--- a/traffic_monitor/experimental/traffic_monitor/manager/datarequest.go
+++ b/traffic_monitor/experimental/traffic_monitor/manager/datarequest.go
@@ -1,5 +1,25 @@
package manager
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
import (
"encoding/json"
"fmt"
@@ -11,31 +31,35 @@ import (
"strings"
"time"
- "github.com/Comcast/traffic_control/traffic_monitor/experimental/common/log"
- "github.com/Comcast/traffic_control/traffic_monitor/experimental/traffic_monitor/cache"
- ds "github.com/Comcast/traffic_control/traffic_monitor/experimental/traffic_monitor/deliveryservice"
- dsdata "github.com/Comcast/traffic_control/traffic_monitor/experimental/traffic_monitor/deliveryservicedata"
- "github.com/Comcast/traffic_control/traffic_monitor/experimental/traffic_monitor/enum"
- "github.com/Comcast/traffic_control/traffic_monitor/experimental/traffic_monitor/http_server"
- "github.com/Comcast/traffic_control/traffic_monitor/experimental/traffic_monitor/peer"
- todata "github.com/Comcast/traffic_control/traffic_monitor/experimental/traffic_monitor/trafficopsdata"
- towrap "github.com/Comcast/traffic_control/traffic_monitor/experimental/traffic_monitor/trafficopswrapper"
+ "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/common/log"
+ "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/traffic_monitor/cache"
+ ds "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/traffic_monitor/deliveryservice"
+ dsdata "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/traffic_monitor/deliveryservicedata"
+ "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/traffic_monitor/enum"
+ "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/traffic_monitor/peer"
+ "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/traffic_monitor/srvhttp"
+ todata "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/traffic_monitor/trafficopsdata"
+ towrap "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/traffic_monitor/trafficopswrapper"
+ to "github.com/apache/incubator-trafficcontrol/traffic_ops/client"
)
+// JSONEvents represents the structure we wish to serialize to JSON, for Events.
type JSONEvents struct {
Events []Event `json:"events"`
}
+// CacheState represents the available state of a cache.
type CacheState struct {
Value bool `json:"value"`
}
-type ApiPeerStates struct {
- Peers map[enum.TrafficMonitorName]map[enum.CacheName][]CacheState `json:"peers"`
- QueryParams string `json:"pp"`
- DateStr string `json:"date"`
+// APIPeerStates contains the data to be returned for an API call to get the peer states of a Traffic Monitor. This contains common API data returned by most endpoints, and a map of peers, to caches' states.
+type APIPeerStates struct {
+ srvhttp.CommonAPIData
+ Peers map[enum.TrafficMonitorName]map[enum.CacheName][]CacheState `json:"peers"`
}
+// CacheStatus contains summary stat data about the given cache.
// TODO make fields nullable, so error fields can be omitted, letting API callers still get updates for unerrored fields
type CacheStatus struct {
Type *string `json:"type,omitempty"`
@@ -56,6 +80,7 @@ type CacheStatFilter struct {
cacheTypes map[enum.CacheName]enum.CacheType
}
+// UseCache returns whether the given cache is in the filter.
func (f *CacheStatFilter) UseCache(name enum.CacheName) bool {
if _, inHosts := f.hosts[name]; len(f.hosts) != 0 && !inHosts {
return false
@@ -66,6 +91,7 @@ func (f *CacheStatFilter) UseCache(name enum.CacheName) bool {
return true
}
+// UseStat returns whether the given stat is in the filter.
func (f *CacheStatFilter) UseStat(statName string) bool {
if len(f.statsToUse) == 0 {
return true
@@ -74,7 +100,7 @@ func (f *CacheStatFilter) UseStat(statName string) bool {
_, ok := f.statsToUse[statName]
return ok
}
- for statToUse, _ := range f.statsToUse {
+ for statToUse := range f.statsToUse {
if strings.Contains(statName, statToUse) {
return true
}
@@ -82,6 +108,7 @@ func (f *CacheStatFilter) UseStat(statName string) bool {
return false
}
+// WithinStatHistoryMax returns whether the given history index is less than the max history of this filter.
func (f *CacheStatFilter) WithinStatHistoryMax(n int) bool {
if f.historyCount == 0 {
return true
@@ -103,7 +130,7 @@ func NewCacheStatFilter(params url.Values, cacheTypes map[enum.CacheName]enum.Ca
if len(params) > len(validParams) {
return nil, fmt.Errorf("invalid query parameters")
}
- for param, _ := range params {
+ for param := range params {
if _, ok := validParams[param]; !ok {
return nil, fmt.Errorf("invalid query parameter '%v'", param)
}
@@ -172,6 +199,7 @@ type DSStatFilter struct {
dsTypes map[enum.DeliveryServiceName]enum.DSType
}
+// UseDeliveryService returns whether the given delivery service is in this filter.
func (f *DSStatFilter) UseDeliveryService(name enum.DeliveryServiceName) bool {
if _, inDSes := f.deliveryServices[name]; len(f.deliveryServices) != 0 && !inDSes {
return false
@@ -182,6 +210,7 @@ func (f *DSStatFilter) UseDeliveryService(name enum.DeliveryServiceName) bool {
return true
}
+// UseStat returns whether the given stat is in this filter.
func (f *DSStatFilter) UseStat(statName string) bool {
if len(f.statsToUse) == 0 {
return true
@@ -190,7 +219,7 @@ func (f *DSStatFilter) UseStat(statName string) bool {
_, ok := f.statsToUse[statName]
return ok
}
- for statToUse, _ := range f.statsToUse {
+ for statToUse := range f.statsToUse {
if strings.Contains(statName, statToUse) {
return true
}
@@ -198,6 +227,7 @@ func (f *DSStatFilter) UseStat(statName string) bool {
return false
}
+// WithinStatHistoryMax returns whether the given history index is less than the max history of this filter.
func (f *DSStatFilter) WithinStatHistoryMax(n int) bool {
if f.historyCount == 0 {
return true
@@ -219,7 +249,7 @@ func NewDSStatFilter(params url.Values, dsTypes map[enum.DeliveryServiceName]enu
if len(params) > len(validParams) {
return nil, fmt.Errorf("invalid query parameters")
}
- for param, _ := range params {
+ for param := range params {
if _, ok := validParams[param]; !ok {
return nil, fmt.Errorf("invalid query parameter '%v'", param)
}
@@ -289,6 +319,7 @@ type PeerStateFilter struct {
cacheTypes map[enum.CacheName]enum.CacheType
}
+// UsePeer returns whether the given Traffic Monitor peer is in this filter.
func (f *PeerStateFilter) UsePeer(name enum.TrafficMonitorName) bool {
if _, inPeers := f.peersToUse[name]; len(f.peersToUse) != 0 && !inPeers {
return false
@@ -296,6 +327,7 @@ func (f *PeerStateFilter) UsePeer(name enum.TrafficMonitorName) bool {
return true
}
+// UseCache returns whether the given cache is in this filter.
func (f *PeerStateFilter) UseCache(name enum.CacheName) bool {
if f.cacheType != enum.CacheTypeInvalid && f.cacheTypes[name] != f.cacheType {
return false
@@ -309,7 +341,7 @@ func (f *PeerStateFilter) UseCache(name enum.CacheName) bool {
_, ok := f.cachesToUse[name]
return ok
}
- for cacheToUse, _ := range f.cachesToUse {
+ for cacheToUse := range f.cachesToUse {
if strings.Contains(string(name), string(cacheToUse)) {
return true
}
@@ -317,6 +349,7 @@ func (f *PeerStateFilter) UseCache(name enum.CacheName) bool {
return false
}
+// WithinStatHistoryMax returns whether the given history index is less than the max history of this filter.
func (f *PeerStateFilter) WithinStatHistoryMax(n int) bool {
if f.historyCount == 0 {
return true
@@ -339,7 +372,7 @@ func NewPeerStateFilter(params url.Values, cacheTypes map[enum.CacheName]enum.Ca
if len(params) > len(validParams) {
return nil, fmt.Errorf("invalid query parameters")
}
- for param, _ := range params {
+ for param := range params {
if _, ok := validParams[param]; !ok {
return nil, fmt.Errorf("invalid query parameter '%v'", param)
}
@@ -399,16 +432,16 @@ func NewPeerStateFilter(params url.Values, cacheTypes map[enum.CacheName]enum.Ca
}, nil
}
-// DataRequest takes an `http_server.DataRequest`, and the monitored data objects, and returns the appropriate response, and the status code.
+// DataRequest takes an `srvhttp.DataRequest`, and the monitored data objects, and returns the appropriate response, and the status code.
func DataRequest(
- req http_server.DataRequest,
+ req srvhttp.DataRequest,
opsConfig OpsConfigThreadsafe,
toSession towrap.ITrafficOpsSession,
localStates peer.CRStatesThreadsafe,
peerStates peer.CRStatesPeersThreadsafe,
combinedStates peer.CRStatesThreadsafe,
statHistory StatHistoryThreadsafe,
- dsStats DSStatsThreadsafe,
+ dsStats DSStatsReader,
events EventsThreadsafe,
staticAppData StaticAppData,
healthPollInterval time.Duration,
@@ -420,7 +453,8 @@ func DataRequest(
localCacheStatus CacheAvailableStatusThreadsafe,
lastStats LastStatsThreadsafe,
unpolledCaches UnpolledCachesThreadsafe,
-) (body []byte, responseCode int) {
+ monitorConfig TrafficMonitorConfigMapThreadsafe,
+) ([]byte, int) {
// handleErr takes an error, and the request type it came from, and logs. It is ok to call with a nil error, in which case this is a no-op.
handleErr := func(err error) {
@@ -431,7 +465,7 @@ func DataRequest(
log.Errorf("Request Error: %v\n", fmt.Errorf(req.Type.String()+": %v", err))
}
- // commonReturn takes the body, err, and the data request Type which has been processed. It logs and deals with any error, and returns the appropriate bytes and response code for the `http_server`.
+ // commonReturn takes the body, err, and the data request Type which has been processed. It logs and deals with any error, and returns the appropriate bytes and response code for the `srvhttp`.
commonReturn := func(body []byte, err error) ([]byte, int) {
if err == nil {
return body, http.StatusOK
@@ -445,9 +479,8 @@ func DataRequest(
return []byte("Service Unavailable"), http.StatusServiceUnavailable
}
- var err error
switch req.Type {
- case http_server.TRConfig:
+ case srvhttp.TRConfig:
cdnName := opsConfig.Get().CdnName
if toSession == nil {
return commonReturn(nil, fmt.Errorf("Unable to connect to Traffic Ops"))
@@ -455,61 +488,53 @@ func DataRequest(
if cdnName == "" {
return commonReturn(nil, fmt.Errorf("No CDN Configured"))
}
- return commonReturn(body, err)
- case http_server.TRStateDerived:
- body, err = peer.CrstatesMarshall(combinedStates.Get())
- return commonReturn(body, err)
- case http_server.TRStateSelf:
- body, err = peer.CrstatesMarshall(localStates.Get())
- return commonReturn(body, err)
- case http_server.CacheStats:
+ return commonReturn(toSession.CRConfigRaw(cdnName))
+ case srvhttp.TRStateDerived:
+ return commonReturn(peer.CrstatesMarshall(combinedStates.Get()))
+ case srvhttp.TRStateSelf:
+ return commonReturn(peer.CrstatesMarshall(localStates.Get()))
+ case srvhttp.CacheStats:
filter, err := NewCacheStatFilter(req.Parameters, toData.Get().ServerTypes)
if err != nil {
handleErr(err)
return []byte(err.Error()), http.StatusBadRequest
}
- body, err = cache.StatsMarshall(statHistory.Get(), filter, req.Parameters)
- return commonReturn(body, err)
- case http_server.DSStats:
+ return commonReturn(cache.StatsMarshall(statHistory.Get(), filter, req.Parameters))
+ case srvhttp.DSStats:
filter, err := NewDSStatFilter(req.Parameters, toData.Get().DeliveryServiceTypes)
if err != nil {
handleErr(err)
return []byte(err.Error()), http.StatusBadRequest
}
- body, err = json.Marshal(dsStats.Get().JSON(filter, req.Parameters)) // TODO marshall beforehand, for performance? (test to see how often requests are made)
- return commonReturn(body, err)
- case http_server.EventLog:
- body, err = json.Marshal(JSONEvents{Events: events.Get()})
- return commonReturn(body, err)
- case http_server.PeerStates:
+ // TODO marshall beforehand, for performance? (test to see how often requests are made)
+ return commonReturn(json.Marshal(dsStats.Get().JSON(filter, req.Parameters)))
+ case srvhttp.EventLog:
+ return commonReturn(json.Marshal(JSONEvents{Events: events.Get()}))
+ case srvhttp.PeerStates:
filter, err := NewPeerStateFilter(req.Parameters, toData.Get().ServerTypes)
if err != nil {
handleErr(err)
return []byte(err.Error()), http.StatusBadRequest
}
-
- body, err = json.Marshal(createApiPeerStates(peerStates.Get(), filter, req.Parameters))
- return commonReturn(body, err)
- case http_server.StatSummary:
+ return commonReturn(json.Marshal(createAPIPeerStates(peerStates.Get(), filter, req.Parameters)))
+ case srvhttp.StatSummary:
return nil, http.StatusNotImplemented
- case http_server.Stats:
- body, err = getStats(staticAppData, healthPollInterval, lastHealthDurations.Get(), fetchCount.Get(), healthIteration.Get(), errorCount.Get())
- return commonReturn(body, err)
- case http_server.ConfigDoc:
+ case srvhttp.Stats:
+ return commonReturn(getStats(staticAppData, healthPollInterval, lastHealthDurations.Get(), fetchCount.Get(), healthIteration.Get(), errorCount.Get()))
+ case srvhttp.ConfigDoc:
opsConfigCopy := opsConfig.Get()
// if the password is blank, leave it blank, so callers can see it's missing.
if opsConfigCopy.Password != "" {
opsConfigCopy.Password = "*****"
}
- body, err = json.Marshal(opsConfigCopy)
- return commonReturn(body, err)
- case http_server.APICacheCount: // TODO determine if this should use peerStates
+ return commonReturn(json.Marshal(opsConfigCopy))
+ case srvhttp.APICacheCount: // TODO determine if this should use peerStates
return []byte(strconv.Itoa(len(localStates.Get().Caches))), http.StatusOK
- case http_server.APICacheAvailableCount:
+ case srvhttp.APICacheAvailableCount:
return []byte(strconv.Itoa(cacheAvailableCount(localStates.Get().Caches))), http.StatusOK
- case http_server.APICacheDownCount:
- return []byte(strconv.Itoa(cacheDownCount(localStates.Get().Caches))), http.StatusOK
- case http_server.APIVersion:
+ case srvhttp.APICacheDownCount:
+ return []byte(strconv.Itoa(cacheDownCount(localStates.Get().Caches, monitorConfig.Get().TrafficServer))), http.StatusOK
+ case srvhttp.APIVersion:
s := "traffic_monitor-" + staticAppData.Version + "."
if len(staticAppData.GitRevision) > 6 {
s += staticAppData.GitRevision[:6]
@@ -517,13 +542,12 @@ func DataRequest(
s += staticAppData.GitRevision
}
return []byte(s), http.StatusOK
- case http_server.APITrafficOpsURI:
+ case srvhttp.APITrafficOpsURI:
return []byte(opsConfig.Get().Url), http.StatusOK
- case http_server.APICacheStates:
- body, err = json.Marshal(createCacheStatuses(toData.Get().ServerTypes, statHistory.Get(),
- lastHealthDurations.Get(), localStates.Get().Caches, lastStats.Get(), localCacheStatus))
- return commonReturn(body, err)
- case http_server.APIBandwidthKbps:
+ case srvhttp.APICacheStates:
+ return commonReturn(json.Marshal(createCacheStatuses(toData.Get().ServerTypes, statHistory.Get(),
+ lastHealthDurations.Get(), localStates.Get().Caches, lastStats.Get(), localCacheStatus)))
+ case srvhttp.APIBandwidthKbps:
serverTypes := toData.Get().ServerTypes
kbpsStats := lastStats.Get()
sum := float64(0.0)
@@ -534,7 +558,7 @@ func DataRequest(
sum += data.Bytes.PerSec / ds.BytesPerKilobit
}
return []byte(fmt.Sprintf("%f", sum)), http.StatusOK
- case http_server.APIBandwidthCapacityKbps:
+ case srvhttp.APIBandwidthCapacityKbps:
statHistory := statHistory.Get()
cap := int64(0)
for _, results := range statHistory {
@@ -601,7 +625,7 @@ func createCacheStatuses(
}
var kbps *float64
- lastStat, ok := lastStats.Caches[enum.CacheName(cacheName)]
+ lastStat, ok := lastStats.Caches[cacheName]
if !ok {
log.Warnf("cache not in last kbps cache %s\n", cacheName)
} else {
@@ -610,7 +634,7 @@ func createCacheStatuses(
}
var connections *int64
- connectionsVal, ok := conns[enum.CacheName(cacheName)]
+ connectionsVal, ok := conns[cacheName]
if !ok {
log.Warnf("cache not in connections %s\n", cacheName)
} else {
@@ -618,12 +642,12 @@ func createCacheStatuses(
}
var status *string
- statusVal, ok := localCacheStatus[enum.CacheName(cacheName)]
+ statusVal, ok := localCacheStatus[cacheName]
if !ok {
log.Warnf("cache not in statuses %s\n", cacheName)
} else {
statusString := statusVal.Status + " - "
- if localCacheStatus[enum.CacheName(cacheName)].Available {
+ if localCacheStatus[cacheName].Available {
statusString += "available"
} else {
statusString += "unavailable"
@@ -632,7 +656,7 @@ func createCacheStatuses(
}
cacheTypeStr := string(cacheType)
- statii[enum.CacheName(cacheName)] = CacheStatus{Type: &cacheTypeStr, LoadAverage: loadAverage, QueryTimeMilliseconds: queryTime, BandwidthKbps: kbps, ConnectionCount: connections, Status: status}
+ statii[cacheName] = CacheStatus{Type: &cacheTypeStr, LoadAverage: loadAverage, QueryTimeMilliseconds: queryTime, BandwidthKbps: kbps, ConnectionCount: connections, Status: status}
}
return statii
}
@@ -658,7 +682,8 @@ func createCacheConnections(statHistory map[enum.CacheName][]cache.Result) map[e
return conns
}
-func cacheDownCount(caches map[enum.CacheName]peer.IsAvailable) int {
+// cacheOfflineCount returns the total caches not available, including marked unavailable, status offline, and status admin_down
+func cacheOfflineCount(caches map[enum.CacheName]peer.IsAvailable) int {
count := 0
for _, available := range caches {
if !available.IsAvailable {
@@ -668,15 +693,26 @@ func cacheDownCount(caches map[enum.CacheName]peer.IsAvailable) int {
return count
}
+// cacheAvailableCount returns the total caches available, including marked available and status online
func cacheAvailableCount(caches map[enum.CacheName]peer.IsAvailable) int {
- return len(caches) - cacheDownCount(caches)
+ return len(caches) - cacheOfflineCount(caches)
+}
+
+// cacheOfflineCount returns the total reported caches marked down, excluding status offline and admin_down.
+func cacheDownCount(caches map[enum.CacheName]peer.IsAvailable, toServers map[string]to.TrafficServer) int {
+ count := 0
+ for cache, available := range caches {
+ if !available.IsAvailable && enum.CacheStatusFromString(toServers[string(cache)].Status) == enum.CacheStatusReported {
+ count++
+ }
+ }
+ return count
}
-func createApiPeerStates(peerStates map[enum.TrafficMonitorName]peer.Crstates, filter *PeerStateFilter, params url.Values) ApiPeerStates {
- apiPeerStates := ApiPeerStates{
- Peers: map[enum.TrafficMonitorName]map[enum.CacheName][]CacheState{},
- QueryParams: http_server.ParametersStr(params),
- DateStr: http_server.DateStr(time.Now()),
+func createAPIPeerStates(peerStates map[enum.TrafficMonitorName]peer.Crstates, filter *PeerStateFilter, params url.Values) APIPeerStates {
+ apiPeerStates := APIPeerStates{
+ CommonAPIData: srvhttp.GetCommonAPIData(params, time.Now()),
+ Peers: map[enum.TrafficMonitorName]map[enum.CacheName][]CacheState{},
}
for peer, state := range peerStates {
@@ -698,6 +734,7 @@ func createApiPeerStates(peerStates map[enum.TrafficMonitorName]peer.Crstates, f
return apiPeerStates
}
+// Stats contains statistics data about this running app. Designed to be returned via an API endpoint.
type Stats struct {
MaxMemoryMB uint64 `json:"Max Memory (MB)"`
GitRevision string `json:"git-revision"`
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/experimental/traffic_monitor/manager/dsstats.go
----------------------------------------------------------------------
diff --git a/traffic_monitor/experimental/traffic_monitor/manager/dsstats.go b/traffic_monitor/experimental/traffic_monitor/manager/dsstats.go
index ae273d8..23a3fef 100644
--- a/traffic_monitor/experimental/traffic_monitor/manager/dsstats.go
+++ b/traffic_monitor/experimental/traffic_monitor/manager/dsstats.go
@@ -1,31 +1,56 @@
package manager
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
import (
- ds "github.com/Comcast/traffic_control/traffic_monitor/experimental/traffic_monitor/deliveryservice"
- dsdata "github.com/Comcast/traffic_control/traffic_monitor/experimental/traffic_monitor/deliveryservicedata"
+ ds "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/traffic_monitor/deliveryservice"
+ dsdata "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/traffic_monitor/deliveryservicedata"
"sync"
)
+// DSStatsThreadsafe wraps a deliveryservice.Stats object to be safe for multiple reader goroutines and a single writer.
type DSStatsThreadsafe struct {
dsStats *ds.Stats
m *sync.RWMutex
}
+// DSStatsReader permits reading of a dsdata.Stats object, but not writing. This is designed so a Stats object can safely be passed to multiple goroutines, without worry one may unsafely write.
type DSStatsReader interface {
Get() dsdata.StatsReadonly
}
+// NewDSStatsThreadsafe returns a deliveryservice.Stats object wrapped to be safe for multiple readers and a single writer.
func NewDSStatsThreadsafe() DSStatsThreadsafe {
s := ds.NewStats()
return DSStatsThreadsafe{m: &sync.RWMutex{}, dsStats: &s}
}
+// Get returns a Stats object safe for reading by multiple goroutines
func (o *DSStatsThreadsafe) Get() dsdata.StatsReadonly {
o.m.RLock()
defer o.m.RUnlock()
return *o.dsStats
}
+// Set sets the internal Stats object. This MUST NOT be called by multiple goroutines.
func (o *DSStatsThreadsafe) Set(newDsStats ds.Stats) {
o.m.Lock()
*o.dsStats = newDsStats
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/experimental/traffic_monitor/manager/events.go
----------------------------------------------------------------------
diff --git a/traffic_monitor/experimental/traffic_monitor/manager/events.go b/traffic_monitor/experimental/traffic_monitor/manager/events.go
index 19e4f5d..0a35783 100644
--- a/traffic_monitor/experimental/traffic_monitor/manager/events.go
+++ b/traffic_monitor/experimental/traffic_monitor/manager/events.go
@@ -1,11 +1,32 @@
package manager
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
import (
"sync"
- "github.com/Comcast/traffic_control/traffic_monitor/experimental/traffic_monitor/enum"
+ "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/traffic_monitor/enum"
)
+// Event represents an event change in aggregated data. For example, a cache being marked as unavailable.
type Event struct {
Index uint64 `json:"index"`
Time int64 `json:"time"`
@@ -16,6 +37,7 @@ type Event struct {
Available bool `json:"isAvailable"`
}
+// EventsThreadsafe provides safe access for multiple goroutines readers and a single writer to a stored Events slice.
type EventsThreadsafe struct {
events *[]Event
m *sync.RWMutex
@@ -25,17 +47,17 @@ type EventsThreadsafe struct {
func copyEvents(a []Event) []Event {
b := make([]Event, len(a), len(a))
- for i, v := range a {
- b[i] = v
- }
+ copy(b, a)
return b
}
+// NewEventsThreadsafe creates a new single-writer-multiple-reader Threadsafe object
func NewEventsThreadsafe(maxEvents uint64) EventsThreadsafe {
i := uint64(0)
return EventsThreadsafe{m: &sync.RWMutex{}, events: &[]Event{}, nextIndex: &i, max: maxEvents}
}
+// Get returns the internal slice of Events for reading. This MUST NOT be modified. If modification is necessary, copy the slice.
func (o *EventsThreadsafe) Get() []Event {
o.m.RLock()
defer o.m.RUnlock()
[09/26] incubator-trafficcontrol git commit: merge master
Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/table/asns/TableASNsController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/asns/TableASNsController.js b/traffic_ops/experimental/ui/app/src/common/modules/table/asns/TableASNsController.js
index f2092bf..38a0e93 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/asns/TableASNsController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/asns/TableASNsController.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var TableASNsController = function(asns, $scope, locationUtils) {
$scope.asns = asns;
@@ -20,4 +39,4 @@ var TableASNsController = function(asns, $scope, locationUtils) {
};
TableASNsController.$inject = ['asns', '$scope', 'locationUtils'];
-module.exports = TableASNsController;
\ No newline at end of file
+module.exports = TableASNsController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/table/asns/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/asns/index.js b/traffic_ops/experimental/ui/app/src/common/modules/table/asns/index.js
index db3b84f..475db0b 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/asns/index.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/asns/index.js
@@ -1,2 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.table.asns', [])
.controller('TableASNsController', require('./TableASNsController'));
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/table/asns/table.asns.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/asns/table.asns.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/table/asns/table.asns.tpl.html
index d65c56c..78cbb07 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/asns/table.asns.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/asns/table.asns.tpl.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<div class="x_panel">
<div class="x_title">
<ol class="breadcrumb pull-left">
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/table/cacheGroups/TableCacheGroupsController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/cacheGroups/TableCacheGroupsController.js b/traffic_ops/experimental/ui/app/src/common/modules/table/cacheGroups/TableCacheGroupsController.js
index 92d6d26..6525a04 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/cacheGroups/TableCacheGroupsController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/cacheGroups/TableCacheGroupsController.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var TableCacheGroupsController = function(cacheGroups, $scope, locationUtils) {
$scope.cacheGroups = cacheGroups;
@@ -20,4 +39,4 @@ var TableCacheGroupsController = function(cacheGroups, $scope, locationUtils) {
};
TableCacheGroupsController.$inject = ['cacheGroups', '$scope', 'locationUtils'];
-module.exports = TableCacheGroupsController;
\ No newline at end of file
+module.exports = TableCacheGroupsController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/table/cacheGroups/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/cacheGroups/index.js b/traffic_ops/experimental/ui/app/src/common/modules/table/cacheGroups/index.js
index 04b84f2..aa84225 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/cacheGroups/index.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/cacheGroups/index.js
@@ -1,2 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.table.cacheGroups', [])
.controller('TableCacheGroupsController', require('./TableCacheGroupsController'));
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/table/cacheGroups/table.cacheGroups.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/cacheGroups/table.cacheGroups.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/table/cacheGroups/table.cacheGroups.tpl.html
index 5b2c34b..a473f0d 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/cacheGroups/table.cacheGroups.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/cacheGroups/table.cacheGroups.tpl.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<div class="x_panel">
<div class="x_title">
<ol class="breadcrumb pull-left">
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/table/cdns/TableCDNsController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/cdns/TableCDNsController.js b/traffic_ops/experimental/ui/app/src/common/modules/table/cdns/TableCDNsController.js
index 846bc64..5686c0b 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/cdns/TableCDNsController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/cdns/TableCDNsController.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var TableCDNsController = function(cdns, $scope, locationUtils) {
$scope.cdns = cdns;
@@ -20,4 +39,4 @@ var TableCDNsController = function(cdns, $scope, locationUtils) {
};
TableCDNsController.$inject = ['cdns', '$scope', 'locationUtils'];
-module.exports = TableCDNsController;
\ No newline at end of file
+module.exports = TableCDNsController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/table/cdns/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/cdns/index.js b/traffic_ops/experimental/ui/app/src/common/modules/table/cdns/index.js
index 3f23dee..d7ef000 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/cdns/index.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/cdns/index.js
@@ -1,2 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.table.cdns', [])
.controller('TableCDNsController', require('./TableCDNsController'));
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/table/cdns/table.cdns.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/cdns/table.cdns.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/table/cdns/table.cdns.tpl.html
index 97b7ee1..bc3aeee 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/cdns/table.cdns.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/cdns/table.cdns.tpl.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<div class="x_panel">
<div class="x_title">
<ol class="breadcrumb pull-left">
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/table/deliveryServices/TableDeliveryServicesController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/deliveryServices/TableDeliveryServicesController.js b/traffic_ops/experimental/ui/app/src/common/modules/table/deliveryServices/TableDeliveryServicesController.js
index f9f2867..7a74333 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/deliveryServices/TableDeliveryServicesController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/deliveryServices/TableDeliveryServicesController.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var TableDeliveryServicesController = function(deliveryServices, $scope, locationUtils) {
$scope.deliveryServices = deliveryServices;
@@ -20,4 +39,4 @@ var TableDeliveryServicesController = function(deliveryServices, $scope, locatio
};
TableDeliveryServicesController.$inject = ['deliveryServices', '$scope', 'locationUtils'];
-module.exports = TableDeliveryServicesController;
\ No newline at end of file
+module.exports = TableDeliveryServicesController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/table/deliveryServices/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/deliveryServices/index.js b/traffic_ops/experimental/ui/app/src/common/modules/table/deliveryServices/index.js
index fe412ba..8d38bfb 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/deliveryServices/index.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/deliveryServices/index.js
@@ -1,2 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.table.deliveryServices', [])
.controller('TableDeliveryServicesController', require('./TableDeliveryServicesController'));
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/table/deliveryServices/table.deliveryServices.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/deliveryServices/table.deliveryServices.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/table/deliveryServices/table.deliveryServices.tpl.html
index 6d6afaf..fa4fbde 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/deliveryServices/table.deliveryServices.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/deliveryServices/table.deliveryServices.tpl.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<div class="x_panel">
<div class="x_title">
<ol class="breadcrumb pull-left">
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/table/divisions/TableDivisionsController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/divisions/TableDivisionsController.js b/traffic_ops/experimental/ui/app/src/common/modules/table/divisions/TableDivisionsController.js
index fa337c9..d030bbb 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/divisions/TableDivisionsController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/divisions/TableDivisionsController.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var TableDivisionsController = function(divisions, $scope, locationUtils) {
$scope.divisions = divisions;
@@ -20,4 +39,4 @@ var TableDivisionsController = function(divisions, $scope, locationUtils) {
};
TableDivisionsController.$inject = ['divisions', '$scope', 'locationUtils'];
-module.exports = TableDivisionsController;
\ No newline at end of file
+module.exports = TableDivisionsController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/table/divisions/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/divisions/index.js b/traffic_ops/experimental/ui/app/src/common/modules/table/divisions/index.js
index 549f23b..f5d17f4 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/divisions/index.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/divisions/index.js
@@ -1,2 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.table.divisions', [])
.controller('TableDivisionsController', require('./TableDivisionsController'));
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/table/divisions/table.divisions.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/divisions/table.divisions.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/table/divisions/table.divisions.tpl.html
index f2118ee..97abea6 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/divisions/table.divisions.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/divisions/table.divisions.tpl.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<div class="x_panel">
<div class="x_title">
<ol class="breadcrumb pull-left">
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/table/locations/TableLocationsController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/locations/TableLocationsController.js b/traffic_ops/experimental/ui/app/src/common/modules/table/locations/TableLocationsController.js
index d998b18..5862c7b 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/locations/TableLocationsController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/locations/TableLocationsController.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var TableLocationsController = function(locations, $scope, locationUtils) {
$scope.locations = locations;
@@ -20,4 +39,4 @@ var TableLocationsController = function(locations, $scope, locationUtils) {
};
TableLocationsController.$inject = ['locations', '$scope', 'locationUtils'];
-module.exports = TableLocationsController;
\ No newline at end of file
+module.exports = TableLocationsController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/table/locations/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/locations/index.js b/traffic_ops/experimental/ui/app/src/common/modules/table/locations/index.js
index 2a0ea40..6b2c3f7 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/locations/index.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/locations/index.js
@@ -1,2 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.table.locations', [])
.controller('TableLocationsController', require('./TableLocationsController'));
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/table/locations/table.locations.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/locations/table.locations.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/table/locations/table.locations.tpl.html
index bce22fd..c6061e9 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/locations/table.locations.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/locations/table.locations.tpl.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<div class="x_panel">
<div class="x_title">
<ol class="breadcrumb pull-left">
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/table/parameters/TableParametersController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/parameters/TableParametersController.js b/traffic_ops/experimental/ui/app/src/common/modules/table/parameters/TableParametersController.js
index 1345ec8..4d8fb1e 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/parameters/TableParametersController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/parameters/TableParametersController.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var TableParametersController = function(parameters, $scope, locationUtils) {
$scope.parameters = parameters;
@@ -20,4 +39,4 @@ var TableParametersController = function(parameters, $scope, locationUtils) {
};
TableParametersController.$inject = ['parameters', '$scope', 'locationUtils'];
-module.exports = TableParametersController;
\ No newline at end of file
+module.exports = TableParametersController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/table/parameters/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/parameters/index.js b/traffic_ops/experimental/ui/app/src/common/modules/table/parameters/index.js
index dfa5c1e..c6606b8 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/parameters/index.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/parameters/index.js
@@ -1,2 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.table.parameters', [])
.controller('TableParametersController', require('./TableParametersController'));
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/table/parameters/table.parameters.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/parameters/table.parameters.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/table/parameters/table.parameters.tpl.html
index c7778b0..984af8c 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/parameters/table.parameters.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/parameters/table.parameters.tpl.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<div class="x_panel">
<div class="x_title">
<ol class="breadcrumb pull-left">
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/table/profiles/TableProfilesController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/profiles/TableProfilesController.js b/traffic_ops/experimental/ui/app/src/common/modules/table/profiles/TableProfilesController.js
index 1d2fb44..660b978 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/profiles/TableProfilesController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/profiles/TableProfilesController.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var TableProfilesController = function(profiles, $scope, locationUtils) {
$scope.profiles = profiles;
@@ -20,4 +39,4 @@ var TableProfilesController = function(profiles, $scope, locationUtils) {
};
TableProfilesController.$inject = ['profiles', '$scope', 'locationUtils'];
-module.exports = TableProfilesController;
\ No newline at end of file
+module.exports = TableProfilesController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/table/profiles/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/profiles/index.js b/traffic_ops/experimental/ui/app/src/common/modules/table/profiles/index.js
index da5c683..4c902ba 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/profiles/index.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/profiles/index.js
@@ -1,2 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.table.profiles', [])
.controller('TableProfilesController', require('./TableProfilesController'));
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/table/profiles/table.profiles.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/profiles/table.profiles.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/table/profiles/table.profiles.tpl.html
index 25663d8..4430a6a 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/profiles/table.profiles.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/profiles/table.profiles.tpl.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<div class="x_panel">
<div class="x_title">
<ol class="breadcrumb pull-left">
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/table/regions/TableRegionsController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/regions/TableRegionsController.js b/traffic_ops/experimental/ui/app/src/common/modules/table/regions/TableRegionsController.js
index 736857b..8722b45 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/regions/TableRegionsController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/regions/TableRegionsController.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var TableRegionsController = function(regions, $scope, locationUtils) {
$scope.regions = regions;
@@ -20,4 +39,4 @@ var TableRegionsController = function(regions, $scope, locationUtils) {
};
TableRegionsController.$inject = ['regions', '$scope', 'locationUtils'];
-module.exports = TableRegionsController;
\ No newline at end of file
+module.exports = TableRegionsController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/table/regions/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/regions/index.js b/traffic_ops/experimental/ui/app/src/common/modules/table/regions/index.js
index 67a8bf4..69a318c 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/regions/index.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/regions/index.js
@@ -1,2 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.table.regions', [])
.controller('TableRegionsController', require('./TableRegionsController'));
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/table/regions/table.regions.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/regions/table.regions.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/table/regions/table.regions.tpl.html
index 7580d59..32dd17a 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/regions/table.regions.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/regions/table.regions.tpl.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<div class="x_panel">
<div class="x_title">
<ol class="breadcrumb pull-left">
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/table/servers/TableServersController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/servers/TableServersController.js b/traffic_ops/experimental/ui/app/src/common/modules/table/servers/TableServersController.js
index be3f09b..0045d23 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/servers/TableServersController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/servers/TableServersController.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var TableServersController = function(servers, $scope, locationUtils) {
$scope.servers = servers;
@@ -20,4 +39,4 @@ var TableServersController = function(servers, $scope, locationUtils) {
};
TableServersController.$inject = ['servers', '$scope', 'locationUtils'];
-module.exports = TableServersController;
\ No newline at end of file
+module.exports = TableServersController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/table/servers/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/servers/index.js b/traffic_ops/experimental/ui/app/src/common/modules/table/servers/index.js
index f315a42..dc5775b 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/servers/index.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/servers/index.js
@@ -1,2 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.table.servers', [])
.controller('TableServersController', require('./TableServersController'));
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/table/servers/table.servers.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/servers/table.servers.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/table/servers/table.servers.tpl.html
index 653f07b..c48a058 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/servers/table.servers.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/servers/table.servers.tpl.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<div class="x_panel">
<div class="x_title">
<ol class="breadcrumb pull-left">
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/table/statuses/TableStatusesController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/statuses/TableStatusesController.js b/traffic_ops/experimental/ui/app/src/common/modules/table/statuses/TableStatusesController.js
index 228a5ca..b7eddf0 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/statuses/TableStatusesController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/statuses/TableStatusesController.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var TableStatusesController = function(statuses, $scope, locationUtils) {
$scope.statuses = statuses;
@@ -20,4 +39,4 @@ var TableStatusesController = function(statuses, $scope, locationUtils) {
};
TableStatusesController.$inject = ['statuses', '$scope', 'locationUtils'];
-module.exports = TableStatusesController;
\ No newline at end of file
+module.exports = TableStatusesController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/table/statuses/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/statuses/index.js b/traffic_ops/experimental/ui/app/src/common/modules/table/statuses/index.js
index 76a65c0..0b441dd 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/statuses/index.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/statuses/index.js
@@ -1,2 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.table.statuses', [])
.controller('TableStatusesController', require('./TableStatusesController'));
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/table/statuses/table.statuses.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/statuses/table.statuses.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/table/statuses/table.statuses.tpl.html
index 2472063..503f674 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/statuses/table.statuses.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/statuses/table.statuses.tpl.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<div class="x_panel">
<div class="x_title">
<ol class="breadcrumb pull-left">
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/table/tenants/TableTenantsController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/tenants/TableTenantsController.js b/traffic_ops/experimental/ui/app/src/common/modules/table/tenants/TableTenantsController.js
index 3f296cd..430b4b5 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/tenants/TableTenantsController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/tenants/TableTenantsController.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var TableTenantsController = function(tenants, $scope, locationUtils) {
$scope.tenants = tenants;
@@ -20,4 +39,4 @@ var TableTenantsController = function(tenants, $scope, locationUtils) {
};
TableTenantsController.$inject = ['tenants', '$scope', 'locationUtils'];
-module.exports = TableTenantsController;
\ No newline at end of file
+module.exports = TableTenantsController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/table/tenants/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/tenants/index.js b/traffic_ops/experimental/ui/app/src/common/modules/table/tenants/index.js
index 1f29ab2..4256270 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/tenants/index.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/tenants/index.js
@@ -1,2 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.table.tenants', [])
.controller('TableTenantsController', require('./TableTenantsController'));
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/table/tenants/table.tenants.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/tenants/table.tenants.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/table/tenants/table.tenants.tpl.html
index 8c508f4..15ed605 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/tenants/table.tenants.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/tenants/table.tenants.tpl.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<div class="x_panel">
<div class="x_title">
<ol class="breadcrumb pull-left">
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/table/types/TableTypesController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/types/TableTypesController.js b/traffic_ops/experimental/ui/app/src/common/modules/table/types/TableTypesController.js
index 1891d79..d439cc8 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/types/TableTypesController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/types/TableTypesController.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var TableTypesController = function(types, $scope, locationUtils) {
$scope.types = types;
@@ -20,4 +39,4 @@ var TableTypesController = function(types, $scope, locationUtils) {
};
TableTypesController.$inject = ['types', '$scope', 'locationUtils'];
-module.exports = TableTypesController;
\ No newline at end of file
+module.exports = TableTypesController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/table/types/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/types/index.js b/traffic_ops/experimental/ui/app/src/common/modules/table/types/index.js
index 42acbdc..2522659 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/types/index.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/types/index.js
@@ -1,2 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.table.types', [])
.controller('TableTypesController', require('./TableTypesController'));
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/table/types/table.types.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/types/table.types.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/table/types/table.types.tpl.html
index 25161f2..621800f 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/types/table.types.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/types/table.types.tpl.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<div class="x_panel">
<div class="x_title">
<ol class="breadcrumb pull-left">
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/table/users/TableUsersController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/users/TableUsersController.js b/traffic_ops/experimental/ui/app/src/common/modules/table/users/TableUsersController.js
index 712a3c3..979de77 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/users/TableUsersController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/users/TableUsersController.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var TableUsersController = function(users, $scope, locationUtils) {
$scope.users = users;
@@ -20,4 +39,4 @@ var TableUsersController = function(users, $scope, locationUtils) {
};
TableUsersController.$inject = ['users', '$scope', 'locationUtils'];
-module.exports = TableUsersController;
\ No newline at end of file
+module.exports = TableUsersController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/table/users/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/users/index.js b/traffic_ops/experimental/ui/app/src/common/modules/table/users/index.js
index 9c9093a..3248e7c 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/users/index.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/users/index.js
@@ -1,2 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.table.users', [])
.controller('TableUsersController', require('./TableUsersController'));
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/table/users/table.users.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/users/table.users.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/table/users/table.users.tpl.html
index 523d296..51f3d39 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/users/table.users.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/users/table.users.tpl.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<div class="x_panel">
<div class="x_title">
<ol class="breadcrumb pull-left">
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/service/application/ApplicationService.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/service/application/ApplicationService.js b/traffic_ops/experimental/ui/app/src/common/service/application/ApplicationService.js
index e78e607..1fde86d 100644
--- a/traffic_ops/experimental/ui/app/src/common/service/application/ApplicationService.js
+++ b/traffic_ops/experimental/ui/app/src/common/service/application/ApplicationService.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var ApplicationService = function($rootScope, $anchorScroll, $http) {
this.startup = function() {
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/service/application/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/service/application/index.js b/traffic_ops/experimental/ui/app/src/common/service/application/index.js
index c8bbf2d..56e79e3 100644
--- a/traffic_ops/experimental/ui/app/src/common/service/application/index.js
+++ b/traffic_ops/experimental/ui/app/src/common/service/application/index.js
@@ -1,2 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.application', [])
- .service('applicationService', require('./ApplicationService'));
\ No newline at end of file
+ .service('applicationService', require('./ApplicationService'));
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/service/utils/FormUtils.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/service/utils/FormUtils.js b/traffic_ops/experimental/ui/app/src/common/service/utils/FormUtils.js
index 524a9ac..1c2d85b 100644
--- a/traffic_ops/experimental/ui/app/src/common/service/utils/FormUtils.js
+++ b/traffic_ops/experimental/ui/app/src/common/service/utils/FormUtils.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var FormUtils = function() {
this.hasError = function(input) {
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/service/utils/LocationUtils.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/service/utils/LocationUtils.js b/traffic_ops/experimental/ui/app/src/common/service/utils/LocationUtils.js
index d371463..8defa68 100644
--- a/traffic_ops/experimental/ui/app/src/common/service/utils/LocationUtils.js
+++ b/traffic_ops/experimental/ui/app/src/common/service/utils/LocationUtils.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var LocationUtils = function($location) {
this.navigateToPath = function(path) {
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/service/utils/StringUtils.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/service/utils/StringUtils.js b/traffic_ops/experimental/ui/app/src/common/service/utils/StringUtils.js
index a24a57b..2e5bb38 100644
--- a/traffic_ops/experimental/ui/app/src/common/service/utils/StringUtils.js
+++ b/traffic_ops/experimental/ui/app/src/common/service/utils/StringUtils.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var FormUtils = function() {
this.labelize = function(string) {
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/service/utils/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/service/utils/index.js b/traffic_ops/experimental/ui/app/src/common/service/utils/index.js
index 4ececa1..c9d1977 100644
--- a/traffic_ops/experimental/ui/app/src/common/service/utils/index.js
+++ b/traffic_ops/experimental/ui/app/src/common/service/utils/index.js
@@ -1,4 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.utils', [])
.service('formUtils', require('./FormUtils'))
.service('locationUtils', require('./LocationUtils'))
- .service('stringUtils', require('./StringUtils'));
\ No newline at end of file
+ .service('stringUtils', require('./StringUtils'));
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/templates/master.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/templates/master.tpl.html b/traffic_ops/experimental/ui/app/src/common/templates/master.tpl.html
index f0b629b..a1e5a94 100644
--- a/traffic_ops/experimental/ui/app/src/common/templates/master.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/common/templates/master.tpl.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<div class="main_container">
<!-- navigation -->
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/index.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/index.html b/traffic_ops/experimental/ui/app/src/index.html
old mode 100755
new mode 100644
index 68a75c3..ee95434
--- a/traffic_ops/experimental/ui/app/src/index.html
+++ b/traffic_ops/experimental/ui/app/src/index.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<!doctype html>
<head>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/admin/AdminController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/admin/AdminController.js b/traffic_ops/experimental/ui/app/src/modules/private/admin/AdminController.js
index 3157a7a..54d348c 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/admin/AdminController.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/admin/AdminController.js
@@ -1,4 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var AdminController = function() {};
AdminController.$inject = [];
-module.exports = AdminController;
\ No newline at end of file
+module.exports = AdminController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/admin/admin.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/admin/admin.tpl.html b/traffic_ops/experimental/ui/app/src/modules/private/admin/admin.tpl.html
index 3194c46..ea0ece1 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/admin/admin.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/modules/private/admin/admin.tpl.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<div id="adminContainer">
<div ui-view="adminContent"></div>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/admin/asns/AsnsController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/admin/asns/AsnsController.js b/traffic_ops/experimental/ui/app/src/modules/private/admin/asns/AsnsController.js
index bbbf4d1..c3e10f8 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/admin/asns/AsnsController.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/admin/asns/AsnsController.js
@@ -1,5 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var AsnsController = function() {
};
AsnsController.$inject = [];
-module.exports = AsnsController;
\ No newline at end of file
+module.exports = AsnsController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/admin/asns/asns.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/admin/asns/asns.tpl.html b/traffic_ops/experimental/ui/app/src/modules/private/admin/asns/asns.tpl.html
index 51ca9d7..6df2eca 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/admin/asns/asns.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/modules/private/admin/asns/asns.tpl.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<div id="asnsContainer">
<div ui-view="asnsContent"></div>
</div>
[16/26] incubator-trafficcontrol git commit: merge master
Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Fixtures/Regex.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/Regex.pm b/traffic_ops/app/lib/Fixtures/Regex.pm
index 57a5d67..c72a3ad 100644
--- a/traffic_ops/app/lib/Fixtures/Regex.pm
+++ b/traffic_ops/app/lib/Fixtures/Regex.pm
@@ -1,6 +1,5 @@
package Fixtures::Regex;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Fixtures/Region.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/Region.pm b/traffic_ops/app/lib/Fixtures/Region.pm
index 5dfd500..0926a55 100644
--- a/traffic_ops/app/lib/Fixtures/Region.pm
+++ b/traffic_ops/app/lib/Fixtures/Region.pm
@@ -1,6 +1,5 @@
package Fixtures::Region;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Fixtures/Role.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/Role.pm b/traffic_ops/app/lib/Fixtures/Role.pm
index 9c5d064..b3f3499 100644
--- a/traffic_ops/app/lib/Fixtures/Role.pm
+++ b/traffic_ops/app/lib/Fixtures/Role.pm
@@ -1,6 +1,5 @@
package Fixtures::Role;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Fixtures/Server.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/Server.pm b/traffic_ops/app/lib/Fixtures/Server.pm
index 55a70d2..3a584c9 100644
--- a/traffic_ops/app/lib/Fixtures/Server.pm
+++ b/traffic_ops/app/lib/Fixtures/Server.pm
@@ -1,6 +1,5 @@
package Fixtures::Server;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Fixtures/Staticdnsentry.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/Staticdnsentry.pm b/traffic_ops/app/lib/Fixtures/Staticdnsentry.pm
index fb75c21..d1c574f 100644
--- a/traffic_ops/app/lib/Fixtures/Staticdnsentry.pm
+++ b/traffic_ops/app/lib/Fixtures/Staticdnsentry.pm
@@ -1,6 +1,5 @@
package Fixtures::Staticdnsentry;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Fixtures/StatsSummary.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/StatsSummary.pm b/traffic_ops/app/lib/Fixtures/StatsSummary.pm
index 0cca0f2..94f2aec 100644
--- a/traffic_ops/app/lib/Fixtures/StatsSummary.pm
+++ b/traffic_ops/app/lib/Fixtures/StatsSummary.pm
@@ -1,6 +1,5 @@
package Fixtures::StatsSummary;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Fixtures/Status.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/Status.pm b/traffic_ops/app/lib/Fixtures/Status.pm
index 41e50c2..8a79440 100644
--- a/traffic_ops/app/lib/Fixtures/Status.pm
+++ b/traffic_ops/app/lib/Fixtures/Status.pm
@@ -1,6 +1,5 @@
package Fixtures::Status;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Fixtures/SteeringTarget.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/SteeringTarget.pm b/traffic_ops/app/lib/Fixtures/SteeringTarget.pm
index 53aa8e4..6372493 100644
--- a/traffic_ops/app/lib/Fixtures/SteeringTarget.pm
+++ b/traffic_ops/app/lib/Fixtures/SteeringTarget.pm
@@ -1,4 +1,22 @@
package Fixtures::SteeringTarget;
+
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
+
use strict;
use warnings FATAL => 'all';
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Fixtures/TmUser.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/TmUser.pm b/traffic_ops/app/lib/Fixtures/TmUser.pm
index 763184d..6f70947 100644
--- a/traffic_ops/app/lib/Fixtures/TmUser.pm
+++ b/traffic_ops/app/lib/Fixtures/TmUser.pm
@@ -1,6 +1,5 @@
package Fixtures::TmUser;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Fixtures/Type.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/Type.pm b/traffic_ops/app/lib/Fixtures/Type.pm
index 76a7872..6a83897 100644
--- a/traffic_ops/app/lib/Fixtures/Type.pm
+++ b/traffic_ops/app/lib/Fixtures/Type.pm
@@ -1,6 +1,5 @@
package Fixtures::Type;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Helper/CacheStats.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Helper/CacheStats.pm b/traffic_ops/app/lib/Helper/CacheStats.pm
index 9d1b9b4..5693412 100755
--- a/traffic_ops/app/lib/Helper/CacheStats.pm
+++ b/traffic_ops/app/lib/Helper/CacheStats.pm
@@ -1,6 +1,5 @@
package Helper::CacheStats;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Helper/DeliveryServiceStats.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Helper/DeliveryServiceStats.pm b/traffic_ops/app/lib/Helper/DeliveryServiceStats.pm
index 53ce165..ab97b60 100755
--- a/traffic_ops/app/lib/Helper/DeliveryServiceStats.pm
+++ b/traffic_ops/app/lib/Helper/DeliveryServiceStats.pm
@@ -1,6 +1,5 @@
package Helper::DeliveryServiceStats;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Helper/Stats.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Helper/Stats.pm b/traffic_ops/app/lib/Helper/Stats.pm
index 4b525f8..438f188 100755
--- a/traffic_ops/app/lib/Helper/Stats.pm
+++ b/traffic_ops/app/lib/Helper/Stats.pm
@@ -1,6 +1,5 @@
package Helper::Stats;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/MojoPlugins/Daemonize.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/MojoPlugins/Daemonize.pm b/traffic_ops/app/lib/MojoPlugins/Daemonize.pm
index a085160..7cecd07 100755
--- a/traffic_ops/app/lib/MojoPlugins/Daemonize.pm
+++ b/traffic_ops/app/lib/MojoPlugins/Daemonize.pm
@@ -1,6 +1,5 @@
package MojoPlugins::Daemonize;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/MojoPlugins/DeliveryService.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/MojoPlugins/DeliveryService.pm b/traffic_ops/app/lib/MojoPlugins/DeliveryService.pm
index 823a0c8..e14e0fb 100755
--- a/traffic_ops/app/lib/MojoPlugins/DeliveryService.pm
+++ b/traffic_ops/app/lib/MojoPlugins/DeliveryService.pm
@@ -1,6 +1,5 @@
package MojoPlugins::DeliveryService;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/MojoPlugins/DnssecKeys.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/MojoPlugins/DnssecKeys.pm b/traffic_ops/app/lib/MojoPlugins/DnssecKeys.pm
index 6c70188..d2c62da 100755
--- a/traffic_ops/app/lib/MojoPlugins/DnssecKeys.pm
+++ b/traffic_ops/app/lib/MojoPlugins/DnssecKeys.pm
@@ -1,6 +1,5 @@
package MojoPlugins::DnssecKeys;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/MojoPlugins/Email.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/MojoPlugins/Email.pm b/traffic_ops/app/lib/MojoPlugins/Email.pm
index 7ef756f..5b89679 100755
--- a/traffic_ops/app/lib/MojoPlugins/Email.pm
+++ b/traffic_ops/app/lib/MojoPlugins/Email.pm
@@ -1,6 +1,5 @@
package MojoPlugins::Email;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/MojoPlugins/Health.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/MojoPlugins/Health.pm b/traffic_ops/app/lib/MojoPlugins/Health.pm
index 3eea16e..cd2eda8 100755
--- a/traffic_ops/app/lib/MojoPlugins/Health.pm
+++ b/traffic_ops/app/lib/MojoPlugins/Health.pm
@@ -1,6 +1,5 @@
package MojoPlugins::Health;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/MojoPlugins/InfluxDB.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/MojoPlugins/InfluxDB.pm b/traffic_ops/app/lib/MojoPlugins/InfluxDB.pm
index 88ca008..f631d78 100755
--- a/traffic_ops/app/lib/MojoPlugins/InfluxDB.pm
+++ b/traffic_ops/app/lib/MojoPlugins/InfluxDB.pm
@@ -1,6 +1,5 @@
package MojoPlugins::InfluxDB;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/MojoPlugins/Job.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/MojoPlugins/Job.pm b/traffic_ops/app/lib/MojoPlugins/Job.pm
index 5d16f96..f0746c6 100755
--- a/traffic_ops/app/lib/MojoPlugins/Job.pm
+++ b/traffic_ops/app/lib/MojoPlugins/Job.pm
@@ -1,7 +1,6 @@
package MojoPlugins::Job;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/MojoPlugins/Response.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/MojoPlugins/Response.pm b/traffic_ops/app/lib/MojoPlugins/Response.pm
index 0b875c3..6067b6a 100755
--- a/traffic_ops/app/lib/MojoPlugins/Response.pm
+++ b/traffic_ops/app/lib/MojoPlugins/Response.pm
@@ -1,6 +1,5 @@
package MojoPlugins::Response;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/MojoPlugins/Riak.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/MojoPlugins/Riak.pm b/traffic_ops/app/lib/MojoPlugins/Riak.pm
index bf8f2ee..0da4560 100755
--- a/traffic_ops/app/lib/MojoPlugins/Riak.pm
+++ b/traffic_ops/app/lib/MojoPlugins/Riak.pm
@@ -1,6 +1,5 @@
package MojoPlugins::Riak;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/MojoPlugins/RuntimeDependencies.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/MojoPlugins/RuntimeDependencies.pm b/traffic_ops/app/lib/MojoPlugins/RuntimeDependencies.pm
index 73a99c6..6c318b0 100755
--- a/traffic_ops/app/lib/MojoPlugins/RuntimeDependencies.pm
+++ b/traffic_ops/app/lib/MojoPlugins/RuntimeDependencies.pm
@@ -1,6 +1,5 @@
package MojoPlugins::RuntimeDependencies;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/MojoPlugins/Server.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/MojoPlugins/Server.pm b/traffic_ops/app/lib/MojoPlugins/Server.pm
index 936253a..139194e 100755
--- a/traffic_ops/app/lib/MojoPlugins/Server.pm
+++ b/traffic_ops/app/lib/MojoPlugins/Server.pm
@@ -1,7 +1,6 @@
package MojoPlugins::Server;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/MojoPlugins/SslKeys.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/MojoPlugins/SslKeys.pm b/traffic_ops/app/lib/MojoPlugins/SslKeys.pm
index c203af7..4980c79 100755
--- a/traffic_ops/app/lib/MojoPlugins/SslKeys.pm
+++ b/traffic_ops/app/lib/MojoPlugins/SslKeys.pm
@@ -1,6 +1,5 @@
package MojoPlugins::SslKeys;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/MojoPlugins/Stats.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/MojoPlugins/Stats.pm b/traffic_ops/app/lib/MojoPlugins/Stats.pm
index e64898e..bc8feaa 100755
--- a/traffic_ops/app/lib/MojoPlugins/Stats.pm
+++ b/traffic_ops/app/lib/MojoPlugins/Stats.pm
@@ -1,6 +1,5 @@
package MojoPlugins::Stats;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/MojoPlugins/TrafficMonitorConnection.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/MojoPlugins/TrafficMonitorConnection.pm b/traffic_ops/app/lib/MojoPlugins/TrafficMonitorConnection.pm
index 8761658..62be1c8 100755
--- a/traffic_ops/app/lib/MojoPlugins/TrafficMonitorConnection.pm
+++ b/traffic_ops/app/lib/MojoPlugins/TrafficMonitorConnection.pm
@@ -1,6 +1,5 @@
package MojoPlugins::TrafficMonitorConnection;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/MojoPlugins/TrafficRouterConnection.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/MojoPlugins/TrafficRouterConnection.pm b/traffic_ops/app/lib/MojoPlugins/TrafficRouterConnection.pm
index 4936287..952fbf9 100755
--- a/traffic_ops/app/lib/MojoPlugins/TrafficRouterConnection.pm
+++ b/traffic_ops/app/lib/MojoPlugins/TrafficRouterConnection.pm
@@ -1,6 +1,5 @@
package MojoPlugins::TrafficRouterConnection;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/MojoPlugins/Validation.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/MojoPlugins/Validation.pm b/traffic_ops/app/lib/MojoPlugins/Validation.pm
index 9133d5a..e9e3482 100755
--- a/traffic_ops/app/lib/MojoPlugins/Validation.pm
+++ b/traffic_ops/app/lib/MojoPlugins/Validation.pm
@@ -1,6 +1,5 @@
package MojoPlugins::Validation;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Schema.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Schema.pm b/traffic_ops/app/lib/Schema.pm
index 6cce0f2..7907530 100644
--- a/traffic_ops/app/lib/Schema.pm
+++ b/traffic_ops/app/lib/Schema.pm
@@ -69,7 +69,6 @@ sub get_dbinfo {
# You can replace this text with custom code or comments, and it will be preserved on regeneration
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Schema/Result/Asn.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Schema/Result/Asn.pm b/traffic_ops/app/lib/Schema/Result/Asn.pm
index ccd5275..4084202 100644
--- a/traffic_ops/app/lib/Schema/Result/Asn.pm
+++ b/traffic_ops/app/lib/Schema/Result/Asn.pm
@@ -129,7 +129,6 @@ __PACKAGE__->belongs_to(
# You can replace this text with custom code or comments, and it will be preserved on regeneration
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Schema/Result/Cachegroup.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Schema/Result/Cachegroup.pm b/traffic_ops/app/lib/Schema/Result/Cachegroup.pm
index 09c1d45..b5c617b 100644
--- a/traffic_ops/app/lib/Schema/Result/Cachegroup.pm
+++ b/traffic_ops/app/lib/Schema/Result/Cachegroup.pm
@@ -313,7 +313,6 @@ __PACKAGE__->belongs_to(
# You can replace this text with custom code or comments, and it will be preserved on regeneration
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Schema/Result/CachegroupParameter.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Schema/Result/CachegroupParameter.pm b/traffic_ops/app/lib/Schema/Result/CachegroupParameter.pm
index a15ccb3..d68da81 100644
--- a/traffic_ops/app/lib/Schema/Result/CachegroupParameter.pm
+++ b/traffic_ops/app/lib/Schema/Result/CachegroupParameter.pm
@@ -117,7 +117,6 @@ __PACKAGE__->belongs_to(
# You can replace this text with custom code or comments, and it will be preserved on regeneration
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Schema/Result/Cdn.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Schema/Result/Cdn.pm b/traffic_ops/app/lib/Schema/Result/Cdn.pm
index d07e8b3..73de01e 100644
--- a/traffic_ops/app/lib/Schema/Result/Cdn.pm
+++ b/traffic_ops/app/lib/Schema/Result/Cdn.pm
@@ -136,7 +136,6 @@ __PACKAGE__->has_many(
# You can replace this text with custom code or comments, and it will be preserved on regeneration
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Schema/Result/DeliveryServiceInfoForDomainList.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Schema/Result/DeliveryServiceInfoForDomainList.pm b/traffic_ops/app/lib/Schema/Result/DeliveryServiceInfoForDomainList.pm
index e48b70f..438028c 100644
--- a/traffic_ops/app/lib/Schema/Result/DeliveryServiceInfoForDomainList.pm
+++ b/traffic_ops/app/lib/Schema/Result/DeliveryServiceInfoForDomainList.pm
@@ -1,7 +1,6 @@
use utf8;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Schema/Result/DeliveryServiceInfoForServerList.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Schema/Result/DeliveryServiceInfoForServerList.pm b/traffic_ops/app/lib/Schema/Result/DeliveryServiceInfoForServerList.pm
index 2abe87b..72ff2b9 100644
--- a/traffic_ops/app/lib/Schema/Result/DeliveryServiceInfoForServerList.pm
+++ b/traffic_ops/app/lib/Schema/Result/DeliveryServiceInfoForServerList.pm
@@ -1,7 +1,6 @@
use utf8;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Schema/Result/Deliveryservice.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Schema/Result/Deliveryservice.pm b/traffic_ops/app/lib/Schema/Result/Deliveryservice.pm
index 858b822..25acf41 100644
--- a/traffic_ops/app/lib/Schema/Result/Deliveryservice.pm
+++ b/traffic_ops/app/lib/Schema/Result/Deliveryservice.pm
@@ -1,6 +1,24 @@
use utf8;
package Schema::Result::Deliveryservice;
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
+
+
# Created by DBIx::Class::Schema::Loader
# DO NOT MODIFY THE FIRST PART OF THIS FILE
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Schema/Result/DeliveryserviceExtuser.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Schema/Result/DeliveryserviceExtuser.pm b/traffic_ops/app/lib/Schema/Result/DeliveryserviceExtuser.pm
index 60b830f..4d703c3 100644
--- a/traffic_ops/app/lib/Schema/Result/DeliveryserviceExtuser.pm
+++ b/traffic_ops/app/lib/Schema/Result/DeliveryserviceExtuser.pm
@@ -1,6 +1,5 @@
use utf8;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -128,7 +127,6 @@ __PACKAGE__->belongs_to(
# You can replace this text with custom code or comments, and it will be preserved on regeneration
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Schema/Result/DeliveryserviceRegex.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Schema/Result/DeliveryserviceRegex.pm b/traffic_ops/app/lib/Schema/Result/DeliveryserviceRegex.pm
index 2cb8746..a498fb9 100644
--- a/traffic_ops/app/lib/Schema/Result/DeliveryserviceRegex.pm
+++ b/traffic_ops/app/lib/Schema/Result/DeliveryserviceRegex.pm
@@ -105,7 +105,6 @@ __PACKAGE__->belongs_to(
# You can replace this text with custom code or comments, and it will be preserved on regeneration
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Schema/Result/DeliveryserviceServer.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Schema/Result/DeliveryserviceServer.pm b/traffic_ops/app/lib/Schema/Result/DeliveryserviceServer.pm
index d719378..1bb54c2 100644
--- a/traffic_ops/app/lib/Schema/Result/DeliveryserviceServer.pm
+++ b/traffic_ops/app/lib/Schema/Result/DeliveryserviceServer.pm
@@ -111,7 +111,6 @@ __PACKAGE__->belongs_to(
# You can replace this text with custom code or comments, and it will be preserved on regeneration
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Schema/Result/DeliveryserviceTmuser.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Schema/Result/DeliveryserviceTmuser.pm b/traffic_ops/app/lib/Schema/Result/DeliveryserviceTmuser.pm
index 2de32d6..2ad9eb7 100644
--- a/traffic_ops/app/lib/Schema/Result/DeliveryserviceTmuser.pm
+++ b/traffic_ops/app/lib/Schema/Result/DeliveryserviceTmuser.pm
@@ -111,7 +111,6 @@ __PACKAGE__->belongs_to(
# You can replace this text with custom code or comments, and it will be preserved on regeneration
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Schema/Result/Division.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Schema/Result/Division.pm b/traffic_ops/app/lib/Schema/Result/Division.pm
index 4b50ccf..608b664 100644
--- a/traffic_ops/app/lib/Schema/Result/Division.pm
+++ b/traffic_ops/app/lib/Schema/Result/Division.pm
@@ -113,7 +113,6 @@ __PACKAGE__->has_many(
# You can replace this text with custom code or comments, and it will be preserved on regeneration
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Schema/Result/Federation.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Schema/Result/Federation.pm b/traffic_ops/app/lib/Schema/Result/Federation.pm
index 0fc7184..c90a9d2 100644
--- a/traffic_ops/app/lib/Schema/Result/Federation.pm
+++ b/traffic_ops/app/lib/Schema/Result/Federation.pm
@@ -1,6 +1,24 @@
use utf8;
package Schema::Result::Federation;
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
+
+
# Created by DBIx::Class::Schema::Loader
# DO NOT MODIFY THE FIRST PART OF THIS FILE
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Schema/Result/FederationDeliveryservice.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Schema/Result/FederationDeliveryservice.pm b/traffic_ops/app/lib/Schema/Result/FederationDeliveryservice.pm
index 3294e5f..fca7c09 100644
--- a/traffic_ops/app/lib/Schema/Result/FederationDeliveryservice.pm
+++ b/traffic_ops/app/lib/Schema/Result/FederationDeliveryservice.pm
@@ -1,6 +1,24 @@
use utf8;
package Schema::Result::FederationDeliveryservice;
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
+
+
# Created by DBIx::Class::Schema::Loader
# DO NOT MODIFY THE FIRST PART OF THIS FILE
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Schema/Result/FederationFederationResolver.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Schema/Result/FederationFederationResolver.pm b/traffic_ops/app/lib/Schema/Result/FederationFederationResolver.pm
index de74171..9121eb6 100644
--- a/traffic_ops/app/lib/Schema/Result/FederationFederationResolver.pm
+++ b/traffic_ops/app/lib/Schema/Result/FederationFederationResolver.pm
@@ -1,6 +1,24 @@
use utf8;
package Schema::Result::FederationFederationResolver;
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
+
+
# Created by DBIx::Class::Schema::Loader
# DO NOT MODIFY THE FIRST PART OF THIS FILE
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Schema/Result/FederationResolver.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Schema/Result/FederationResolver.pm b/traffic_ops/app/lib/Schema/Result/FederationResolver.pm
index 5f6929f..fbc30cf 100644
--- a/traffic_ops/app/lib/Schema/Result/FederationResolver.pm
+++ b/traffic_ops/app/lib/Schema/Result/FederationResolver.pm
@@ -1,6 +1,24 @@
use utf8;
package Schema::Result::FederationResolver;
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
+
+
# Created by DBIx::Class::Schema::Loader
# DO NOT MODIFY THE FIRST PART OF THIS FILE
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Schema/Result/FederationTmuser.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Schema/Result/FederationTmuser.pm b/traffic_ops/app/lib/Schema/Result/FederationTmuser.pm
index 6a2ce21..ecb8cd0 100644
--- a/traffic_ops/app/lib/Schema/Result/FederationTmuser.pm
+++ b/traffic_ops/app/lib/Schema/Result/FederationTmuser.pm
@@ -1,6 +1,24 @@
use utf8;
package Schema::Result::FederationTmuser;
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
+
+
# Created by DBIx::Class::Schema::Loader
# DO NOT MODIFY THE FIRST PART OF THIS FILE
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Schema/Result/GooseDbVersion.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Schema/Result/GooseDbVersion.pm b/traffic_ops/app/lib/Schema/Result/GooseDbVersion.pm
index 8acc88d..64d48c0 100644
--- a/traffic_ops/app/lib/Schema/Result/GooseDbVersion.pm
+++ b/traffic_ops/app/lib/Schema/Result/GooseDbVersion.pm
@@ -89,7 +89,6 @@ __PACKAGE__->set_primary_key("id");
# You can replace this text with custom code or comments, and it will be preserved on regeneration
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Schema/Result/Hwinfo.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Schema/Result/Hwinfo.pm b/traffic_ops/app/lib/Schema/Result/Hwinfo.pm
index 5f76bf3..4e369dd 100644
--- a/traffic_ops/app/lib/Schema/Result/Hwinfo.pm
+++ b/traffic_ops/app/lib/Schema/Result/Hwinfo.pm
@@ -130,7 +130,6 @@ __PACKAGE__->belongs_to(
# You can replace this text with custom code or comments, and it will be preserved on regeneration
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Schema/Result/InfluxDBHostsOnline.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Schema/Result/InfluxDBHostsOnline.pm b/traffic_ops/app/lib/Schema/Result/InfluxDBHostsOnline.pm
index 71902c1..f0b42c8 100644
--- a/traffic_ops/app/lib/Schema/Result/InfluxDBHostsOnline.pm
+++ b/traffic_ops/app/lib/Schema/Result/InfluxDBHostsOnline.pm
@@ -1,6 +1,5 @@
use utf8;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Schema/Result/Job.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Schema/Result/Job.pm b/traffic_ops/app/lib/Schema/Result/Job.pm
index 859d98e..8dbdbe1 100644
--- a/traffic_ops/app/lib/Schema/Result/Job.pm
+++ b/traffic_ops/app/lib/Schema/Result/Job.pm
@@ -250,7 +250,6 @@ __PACKAGE__->belongs_to(
# You can replace this text with custom code or comments, and it will be preserved on regeneration
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Schema/Result/JobAgent.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Schema/Result/JobAgent.pm b/traffic_ops/app/lib/Schema/Result/JobAgent.pm
index 5ec2e98..ebe9122 100644
--- a/traffic_ops/app/lib/Schema/Result/JobAgent.pm
+++ b/traffic_ops/app/lib/Schema/Result/JobAgent.pm
@@ -129,7 +129,6 @@ __PACKAGE__->has_many(
# You can replace this text with custom code or comments, and it will be preserved on regeneration
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Schema/Result/JobResult.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Schema/Result/JobResult.pm b/traffic_ops/app/lib/Schema/Result/JobResult.pm
index e268b67..f00771d 100644
--- a/traffic_ops/app/lib/Schema/Result/JobResult.pm
+++ b/traffic_ops/app/lib/Schema/Result/JobResult.pm
@@ -137,7 +137,6 @@ __PACKAGE__->belongs_to(
# You can replace this text with custom code or comments, and it will be preserved on regeneration
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Schema/Result/JobStatus.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Schema/Result/JobStatus.pm b/traffic_ops/app/lib/Schema/Result/JobStatus.pm
index 61469b0..1957739 100644
--- a/traffic_ops/app/lib/Schema/Result/JobStatus.pm
+++ b/traffic_ops/app/lib/Schema/Result/JobStatus.pm
@@ -106,7 +106,6 @@ __PACKAGE__->has_many(
# You can replace this text with custom code or comments, and it will be preserved on regeneration
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Schema/Result/Log.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Schema/Result/Log.pm b/traffic_ops/app/lib/Schema/Result/Log.pm
index d65c259..e96a3de 100644
--- a/traffic_ops/app/lib/Schema/Result/Log.pm
+++ b/traffic_ops/app/lib/Schema/Result/Log.pm
@@ -123,7 +123,6 @@ __PACKAGE__->belongs_to(
# You can replace this text with custom code or comments, and it will be preserved on regeneration
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Schema/Result/Parameter.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Schema/Result/Parameter.pm b/traffic_ops/app/lib/Schema/Result/Parameter.pm
index f9ab63c..e2bf24b 100644
--- a/traffic_ops/app/lib/Schema/Result/Parameter.pm
+++ b/traffic_ops/app/lib/Schema/Result/Parameter.pm
@@ -136,7 +136,6 @@ __PACKAGE__->has_many(
# You can replace this text with custom code or comments, and it will be preserved on regeneration
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Schema/Result/PhysLocation.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Schema/Result/PhysLocation.pm b/traffic_ops/app/lib/Schema/Result/PhysLocation.pm
index df06765..d18c4cf 100644
--- a/traffic_ops/app/lib/Schema/Result/PhysLocation.pm
+++ b/traffic_ops/app/lib/Schema/Result/PhysLocation.pm
@@ -211,7 +211,6 @@ __PACKAGE__->has_many(
# You can replace this text with custom code or comments, and it will be preserved on regeneration
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Schema/Result/Profile.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Schema/Result/Profile.pm b/traffic_ops/app/lib/Schema/Result/Profile.pm
index 2eeb8d6..6533bae 100644
--- a/traffic_ops/app/lib/Schema/Result/Profile.pm
+++ b/traffic_ops/app/lib/Schema/Result/Profile.pm
@@ -150,7 +150,6 @@ __PACKAGE__->has_many(
# You can replace this text with custom code or comments, and it will be preserved on regeneration
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Schema/Result/ProfileParameter.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Schema/Result/ProfileParameter.pm b/traffic_ops/app/lib/Schema/Result/ProfileParameter.pm
index cd77620..e6a20d9 100644
--- a/traffic_ops/app/lib/Schema/Result/ProfileParameter.pm
+++ b/traffic_ops/app/lib/Schema/Result/ProfileParameter.pm
@@ -111,7 +111,6 @@ __PACKAGE__->belongs_to(
# You can replace this text with custom code or comments, and it will be preserved on regeneration
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Schema/Result/RascalHostsByCdn.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Schema/Result/RascalHostsByCdn.pm b/traffic_ops/app/lib/Schema/Result/RascalHostsByCdn.pm
index 4ca4b36..4e39b51 100644
--- a/traffic_ops/app/lib/Schema/Result/RascalHostsByCdn.pm
+++ b/traffic_ops/app/lib/Schema/Result/RascalHostsByCdn.pm
@@ -1,6 +1,5 @@
use utf8;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Schema/Result/RascalHostsByCdnAll.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Schema/Result/RascalHostsByCdnAll.pm b/traffic_ops/app/lib/Schema/Result/RascalHostsByCdnAll.pm
index 4bfd835..fbea3f8 100644
--- a/traffic_ops/app/lib/Schema/Result/RascalHostsByCdnAll.pm
+++ b/traffic_ops/app/lib/Schema/Result/RascalHostsByCdnAll.pm
@@ -1,6 +1,5 @@
use utf8;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Schema/Result/Regex.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Schema/Result/Regex.pm b/traffic_ops/app/lib/Schema/Result/Regex.pm
index b39eaf3..fc57de4 100644
--- a/traffic_ops/app/lib/Schema/Result/Regex.pm
+++ b/traffic_ops/app/lib/Schema/Result/Regex.pm
@@ -139,7 +139,6 @@ __PACKAGE__->belongs_to(
# You can replace this text with custom code or comments, and it will be preserved on regeneration
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Schema/Result/RegexByDeliveryServiceList.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Schema/Result/RegexByDeliveryServiceList.pm b/traffic_ops/app/lib/Schema/Result/RegexByDeliveryServiceList.pm
index 45e7d1f..5d1ee0d 100644
--- a/traffic_ops/app/lib/Schema/Result/RegexByDeliveryServiceList.pm
+++ b/traffic_ops/app/lib/Schema/Result/RegexByDeliveryServiceList.pm
@@ -1,6 +1,5 @@
use utf8;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Schema/Result/RegexesForDeliveryService.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Schema/Result/RegexesForDeliveryService.pm b/traffic_ops/app/lib/Schema/Result/RegexesForDeliveryService.pm
index 6070f3b..2dbdd4e 100644
--- a/traffic_ops/app/lib/Schema/Result/RegexesForDeliveryService.pm
+++ b/traffic_ops/app/lib/Schema/Result/RegexesForDeliveryService.pm
@@ -1,6 +1,5 @@
use utf8;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Schema/Result/Region.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Schema/Result/Region.pm b/traffic_ops/app/lib/Schema/Result/Region.pm
index 2c38025..4efceeb 100644
--- a/traffic_ops/app/lib/Schema/Result/Region.pm
+++ b/traffic_ops/app/lib/Schema/Result/Region.pm
@@ -136,7 +136,6 @@ __PACKAGE__->has_many(
# You can replace this text with custom code or comments, and it will be preserved on regeneration
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Schema/Result/RiakHostsOnline.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Schema/Result/RiakHostsOnline.pm b/traffic_ops/app/lib/Schema/Result/RiakHostsOnline.pm
index f5d3bb8..4765e6d 100644
--- a/traffic_ops/app/lib/Schema/Result/RiakHostsOnline.pm
+++ b/traffic_ops/app/lib/Schema/Result/RiakHostsOnline.pm
@@ -1,6 +1,5 @@
use utf8;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Schema/Result/Role.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Schema/Result/Role.pm b/traffic_ops/app/lib/Schema/Result/Role.pm
index f31181b..2f5c87a 100644
--- a/traffic_ops/app/lib/Schema/Result/Role.pm
+++ b/traffic_ops/app/lib/Schema/Result/Role.pm
@@ -114,7 +114,6 @@ __PACKAGE__->has_many(
# You can replace this text with custom code or comments, and it will be preserved on regeneration
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Schema/Result/Server.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Schema/Result/Server.pm b/traffic_ops/app/lib/Schema/Result/Server.pm
index 5f399ea..21e0e5a 100644
--- a/traffic_ops/app/lib/Schema/Result/Server.pm
+++ b/traffic_ops/app/lib/Schema/Result/Server.pm
@@ -962,7 +962,6 @@ __PACKAGE__->belongs_to(
# You can replace this text with custom code or comments, and it will be preserved on regeneration
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -983,7 +982,6 @@ __PACKAGE__->belongs_to(
# You can replace this text with custom code or comments, and it will be preserved on regeneration
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Schema/Result/ServerTypes.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Schema/Result/ServerTypes.pm b/traffic_ops/app/lib/Schema/Result/ServerTypes.pm
index 9904ae0..c284b4e 100644
--- a/traffic_ops/app/lib/Schema/Result/ServerTypes.pm
+++ b/traffic_ops/app/lib/Schema/Result/ServerTypes.pm
@@ -1,6 +1,5 @@
use utf8;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Schema/Result/Servercheck.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Schema/Result/Servercheck.pm b/traffic_ops/app/lib/Schema/Result/Servercheck.pm
index 2d82551..cdb38fa 100644
--- a/traffic_ops/app/lib/Schema/Result/Servercheck.pm
+++ b/traffic_ops/app/lib/Schema/Result/Servercheck.pm
@@ -345,7 +345,6 @@ __PACKAGE__->belongs_to(
# You can replace this text with custom code or comments, and it will be preserved on regeneration
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Schema/Result/ServersParentCachegroupList.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Schema/Result/ServersParentCachegroupList.pm b/traffic_ops/app/lib/Schema/Result/ServersParentCachegroupList.pm
index 864a1d2..e0ae37b 100644
--- a/traffic_ops/app/lib/Schema/Result/ServersParentCachegroupList.pm
+++ b/traffic_ops/app/lib/Schema/Result/ServersParentCachegroupList.pm
@@ -1,6 +1,5 @@
use utf8;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Schema/Result/Staticdn.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Schema/Result/Staticdn.pm b/traffic_ops/app/lib/Schema/Result/Staticdn.pm
index b1e5370..10d1dc5 100644
--- a/traffic_ops/app/lib/Schema/Result/Staticdn.pm
+++ b/traffic_ops/app/lib/Schema/Result/Staticdn.pm
@@ -1,6 +1,5 @@
use utf8;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -189,7 +188,6 @@ __PACKAGE__->many_to_many("locations", "staticdns_locations", "location");
# You can replace this text with custom code or comments, and it will be preserved on regeneration
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Schema/Result/Staticdnsentry.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Schema/Result/Staticdnsentry.pm b/traffic_ops/app/lib/Schema/Result/Staticdnsentry.pm
index 68bbd56..7ea0689 100644
--- a/traffic_ops/app/lib/Schema/Result/Staticdnsentry.pm
+++ b/traffic_ops/app/lib/Schema/Result/Staticdnsentry.pm
@@ -196,7 +196,6 @@ __PACKAGE__->belongs_to(
# You can replace this text with custom code or comments, and it will be preserved on regeneration
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Schema/Result/StatsSummary.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Schema/Result/StatsSummary.pm b/traffic_ops/app/lib/Schema/Result/StatsSummary.pm
index 8600fe6..8442381 100644
--- a/traffic_ops/app/lib/Schema/Result/StatsSummary.pm
+++ b/traffic_ops/app/lib/Schema/Result/StatsSummary.pm
@@ -1,6 +1,24 @@
use utf8;
package Schema::Result::StatsSummary;
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
+
+
# Created by DBIx::Class::Schema::Loader
# DO NOT MODIFY THE FIRST PART OF THIS FILE
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Schema/Result/Status.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Schema/Result/Status.pm b/traffic_ops/app/lib/Schema/Result/Status.pm
index aa6425a..9911a9b 100644
--- a/traffic_ops/app/lib/Schema/Result/Status.pm
+++ b/traffic_ops/app/lib/Schema/Result/Status.pm
@@ -106,7 +106,6 @@ __PACKAGE__->has_many(
# You can replace this text with custom code or comments, and it will be preserved on regeneration
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Schema/Result/SteeringTarget.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Schema/Result/SteeringTarget.pm b/traffic_ops/app/lib/Schema/Result/SteeringTarget.pm
index 236eb8e..f7d4bd5 100644
--- a/traffic_ops/app/lib/Schema/Result/SteeringTarget.pm
+++ b/traffic_ops/app/lib/Schema/Result/SteeringTarget.pm
@@ -1,6 +1,24 @@
use utf8;
package Schema::Result::SteeringTarget;
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
+
+
# Created by DBIx::Class::Schema::Loader
# DO NOT MODIFY THE FIRST PART OF THIS FILE
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Schema/Result/SteeringView.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Schema/Result/SteeringView.pm b/traffic_ops/app/lib/Schema/Result/SteeringView.pm
index 833d16a..6a8311b 100644
--- a/traffic_ops/app/lib/Schema/Result/SteeringView.pm
+++ b/traffic_ops/app/lib/Schema/Result/SteeringView.pm
@@ -1,9 +1,45 @@
package SteeringView;
+
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
+
use strict;
use warnings FATAL => 'all';
package Schema::Result::SteeringView;
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
+
+
use strict;
use warnings;
@@ -34,4 +70,4 @@ __PACKAGE__->add_columns(
{ data_type => "integer", extra => { unsigned => 1 }, is_nullable => 0 },
);
-1;
\ No newline at end of file
+1;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Schema/Result/TmUser.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Schema/Result/TmUser.pm b/traffic_ops/app/lib/Schema/Result/TmUser.pm
index 34237b9..6898635 100644
--- a/traffic_ops/app/lib/Schema/Result/TmUser.pm
+++ b/traffic_ops/app/lib/Schema/Result/TmUser.pm
@@ -325,7 +325,6 @@ __PACKAGE__->belongs_to(
# You can replace this text with custom code or comments, and it will be preserved on regeneration
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Schema/Result/ToExtension.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Schema/Result/ToExtension.pm b/traffic_ops/app/lib/Schema/Result/ToExtension.pm
index c6c5213..bc206d6 100644
--- a/traffic_ops/app/lib/Schema/Result/ToExtension.pm
+++ b/traffic_ops/app/lib/Schema/Result/ToExtension.pm
@@ -163,7 +163,6 @@ __PACKAGE__->belongs_to(
# You can replace this text with custom code or comments, and it will be preserved on regeneration
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Schema/Result/Type.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Schema/Result/Type.pm b/traffic_ops/app/lib/Schema/Result/Type.pm
index 8d16b6d..061a17b 100644
--- a/traffic_ops/app/lib/Schema/Result/Type.pm
+++ b/traffic_ops/app/lib/Schema/Result/Type.pm
@@ -217,7 +217,6 @@ __PACKAGE__->has_many(
# You can replace this text with custom code or comments, and it will be preserved on regeneration
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Test/IntegrationTestHelper.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Test/IntegrationTestHelper.pm b/traffic_ops/app/lib/Test/IntegrationTestHelper.pm
index 0955cbc..f0c1eef 100644
--- a/traffic_ops/app/lib/Test/IntegrationTestHelper.pm
+++ b/traffic_ops/app/lib/Test/IntegrationTestHelper.pm
@@ -1,6 +1,5 @@
use utf8;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Test/TestHelper.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Test/TestHelper.pm b/traffic_ops/app/lib/Test/TestHelper.pm
index 0d61ad7..7b8aef9 100644
--- a/traffic_ops/app/lib/Test/TestHelper.pm
+++ b/traffic_ops/app/lib/Test/TestHelper.pm
@@ -1,6 +1,5 @@
use utf8;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Test/TrafficServerConfig.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Test/TrafficServerConfig.pm b/traffic_ops/app/lib/Test/TrafficServerConfig.pm
index e7514b3..2adcefa 100644
--- a/traffic_ops/app/lib/Test/TrafficServerConfig.pm
+++ b/traffic_ops/app/lib/Test/TrafficServerConfig.pm
@@ -1,5 +1,23 @@
package Test::TrafficServerConfig;
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
+
+
use strict;
use warnings;
use Carp qw/cluck/;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/TrafficOps.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/TrafficOps.pm b/traffic_ops/app/lib/TrafficOps.pm
index 1c344c6..2c5a1a0 100644
--- a/traffic_ops/app/lib/TrafficOps.pm
+++ b/traffic_ops/app/lib/TrafficOps.pm
@@ -1,7 +1,6 @@
package TrafficOps;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/TrafficOpsRoutes.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/TrafficOpsRoutes.pm b/traffic_ops/app/lib/TrafficOpsRoutes.pm
index a6d5c89..0534318 100644
--- a/traffic_ops/app/lib/TrafficOpsRoutes.pm
+++ b/traffic_ops/app/lib/TrafficOpsRoutes.pm
@@ -1,6 +1,5 @@
package TrafficOpsRoutes;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -493,19 +492,19 @@ sub api_routes {
->to( 'Deliveryservice2#assign_servers', namespace => $namespace );
# -- DELIVERYSERVICES: HEALTH
- $r->get("/api/$version/deliveryservices/:id/health")->over( authenticated => 1 )->to( 'DeliveryService#health', namespace => $namespace );
+ $r->get("/api/$version/deliveryservices/:id/health")->over( authenticated => 1 )->to( 'Deliveryservice#health', namespace => $namespace );
# -- DELIVERYSERVICES: CAPACITY
- $r->get("/api/$version/deliveryservices/:id/capacity")->over( authenticated => 1 )->to( 'DeliveryService#capacity', namespace => $namespace );
+ $r->get("/api/$version/deliveryservices/:id/capacity")->over( authenticated => 1 )->to( 'Deliveryservice#capacity', namespace => $namespace );
# -- DELIVERYSERVICES: ROUTING
- $r->get("/api/$version/deliveryservices/:id/routing")->over( authenticated => 1 )->to( 'DeliveryService#routing', namespace => $namespace );
+ $r->get("/api/$version/deliveryservices/:id/routing")->over( authenticated => 1 )->to( 'Deliveryservice#routing', namespace => $namespace );
# -- DELIVERYSERVICES: STATE
- $r->get("/api/$version/deliveryservices/:id/state")->over( authenticated => 1 )->to( 'DeliveryService#state', namespace => $namespace );
+ $r->get("/api/$version/deliveryservices/:id/state")->over( authenticated => 1 )->to( 'Deliveryservice#state', namespace => $namespace );
# -- DELIVERYSERVICES: REQUEST NEW DELIVERY SERVICE
- $r->post("/api/$version/deliveryservices/request")->over( authenticated => 1 )->to( 'DeliveryService#request', namespace => $namespace );
+ $r->post("/api/$version/deliveryservices/request")->over( authenticated => 1 )->to( 'Deliveryservice#request', namespace => $namespace );
# -- DELIVERYSERVICES: STEERING DELIVERYSERVICES
$r->get("/internal/api/$version/steering")->over( authenticated => 1 )->to( 'Steering#index', namespace => 'API::DeliveryService' );
@@ -550,9 +549,11 @@ sub api_routes {
# -- DIVISIONS
$r->get("/api/$version/divisions")->over( authenticated => 1 )->to( 'Division#index', namespace => $namespace );
$r->get( "/api/$version/divisions/:id" => [ id => qr/\d+/ ] )->over( authenticated => 1 )->to( 'Division#show', namespace => $namespace );
+ $r->get( "/api/$version/divisions/name/:name")->over( authenticated => 1 )->to( 'Division#index_by_name', namespace => $namespace );
$r->put("/api/$version/divisions/:id")->over( authenticated => 1 )->to( 'Division#update', namespace => $namespace );
$r->post("/api/$version/divisions")->over( authenticated => 1 )->to( 'Division#create', namespace => $namespace );
$r->delete("/api/$version/divisions/:id")->over( authenticated => 1 )->to( 'Division#delete', namespace => $namespace );
+ $r->delete("/api/$version/divisions/name/:name")->over( authenticated => 1 )->to( 'Division#delete_by_name', namespace => $namespace );
# -- FEDERATIONS
$r->get("/internal/api/$version/federations")->over( authenticated => 1 )->to( 'Federation#index', namespace => $namespace );
@@ -602,7 +603,6 @@ sub api_routes {
$r->get("/api/$version/phys_locations/trimmed")->over( authenticated => 1 )->to( 'PhysLocation#index_trimmed', namespace => $namespace );
$r->get( "/api/$version/phys_locations/:id" => [ id => qr/\d+/ ] )->over( authenticated => 1 )->to( 'PhysLocation#show', namespace => $namespace );
$r->post("/api/$version/phys_locations")->over( authenticated => 1 )->to( 'PhysLocation#create', namespace => $namespace );
- $r->post("/api/$version/regions/:region_name/phys_locations")->over( authenticated => 1 )->to( 'PhysLocation#create_for_reg', namespace => $namespace );
$r->put("/api/$version/phys_locations/:id")->over( authenticated => 1 )->to( 'PhysLocation#update', namespace => $namespace );
$r->delete("/api/$version/phys_locations/:id")->over( authenticated => 1 )->to( 'PhysLocation#delete', namespace => $namespace );
@@ -624,10 +624,13 @@ sub api_routes {
# Supports ?orderby=key
$r->get("/api/$version/regions")->over( authenticated => 1 )->to( 'Region#index', namespace => $namespace );
$r->get( "/api/$version/regions/:id" => [ id => qr/\d+/ ] )->over( authenticated => 1 )->to( 'Region#show', namespace => $namespace );
+ $r->get( "/api/$version/regions/name/:name" => [ id => qr/\d+/ ] )->over( authenticated => 1 )->to( 'Region#index_by_name', namespace => $namespace );
$r->put("/api/$version/regions/:id")->over( authenticated => 1 )->to( 'Region#update', namespace => $namespace );
$r->post("/api/$version/regions")->over( authenticated => 1 )->to( 'Region#create', namespace => $namespace );
- $r->post("/api/$version/divisions/:division_name/regions")->over( authenticated => 1 )->to( 'Region#create_for_div', namespace => $namespace );
+ $r->post("/api/$version/divisions/:division_name/regions")->over( authenticated => 1 )->to( 'Region#create_for_division', namespace => $namespace );
$r->delete("/api/$version/regions/:id")->over( authenticated => 1 )->to( 'Region#delete', namespace => $namespace );
+ $r->delete("/api/$version/regions/name/:name")->over( authenticated => 1 )->to( 'Region#delete_by_name', namespace => $namespace );
+ $r->post("/api/$version/regions/:region_name/phys_locations")->over( authenticated => 1 )->to( 'PhysLocation#create_for_region', namespace => $namespace );
# -- ROLES
# Supports ?orderby=key
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/UI/Anomaly.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/UI/Anomaly.pm b/traffic_ops/app/lib/UI/Anomaly.pm
index bd11f05..8548aa8 100644
--- a/traffic_ops/app/lib/UI/Anomaly.pm
+++ b/traffic_ops/app/lib/UI/Anomaly.pm
@@ -1,6 +1,5 @@
package UI::Anomaly;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/UI/Asn.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/UI/Asn.pm b/traffic_ops/app/lib/UI/Asn.pm
index e39da14..2b03c9b 100644
--- a/traffic_ops/app/lib/UI/Asn.pm
+++ b/traffic_ops/app/lib/UI/Asn.pm
@@ -1,6 +1,5 @@
package UI::Asn;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/UI/Cachegroup.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/UI/Cachegroup.pm b/traffic_ops/app/lib/UI/Cachegroup.pm
index c4b928f..a3d0974 100644
--- a/traffic_ops/app/lib/UI/Cachegroup.pm
+++ b/traffic_ops/app/lib/UI/Cachegroup.pm
@@ -1,7 +1,6 @@
package UI::Cachegroup;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/UI/CachegroupParameter.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/UI/CachegroupParameter.pm b/traffic_ops/app/lib/UI/CachegroupParameter.pm
index b6c1bdf..b85b418 100644
--- a/traffic_ops/app/lib/UI/CachegroupParameter.pm
+++ b/traffic_ops/app/lib/UI/CachegroupParameter.pm
@@ -1,6 +1,5 @@
package UI::CachegroupParameter;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/UI/Cdn.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/UI/Cdn.pm b/traffic_ops/app/lib/UI/Cdn.pm
index 7509b76..c0c0b3f 100644
--- a/traffic_ops/app/lib/UI/Cdn.pm
+++ b/traffic_ops/app/lib/UI/Cdn.pm
@@ -1,7 +1,6 @@
package UI::Cdn;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/UI/ChangeLog.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/UI/ChangeLog.pm b/traffic_ops/app/lib/UI/ChangeLog.pm
index edaa9d3..fd82391 100644
--- a/traffic_ops/app/lib/UI/ChangeLog.pm
+++ b/traffic_ops/app/lib/UI/ChangeLog.pm
@@ -1,6 +1,5 @@
package UI::ChangeLog;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/UI/ConfigFiles.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/UI/ConfigFiles.pm b/traffic_ops/app/lib/UI/ConfigFiles.pm
index 26195ac..6845439 100644
--- a/traffic_ops/app/lib/UI/ConfigFiles.pm
+++ b/traffic_ops/app/lib/UI/ConfigFiles.pm
@@ -1,7 +1,6 @@
package UI::ConfigFiles;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/UI/DataAll.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/UI/DataAll.pm b/traffic_ops/app/lib/UI/DataAll.pm
index 36d19b5..d1ba298 100644
--- a/traffic_ops/app/lib/UI/DataAll.pm
+++ b/traffic_ops/app/lib/UI/DataAll.pm
@@ -1,6 +1,5 @@
package UI::DataAll;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/UI/DeliveryService.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/UI/DeliveryService.pm b/traffic_ops/app/lib/UI/DeliveryService.pm
index c99fd73..a3fce79 100644
--- a/traffic_ops/app/lib/UI/DeliveryService.pm
+++ b/traffic_ops/app/lib/UI/DeliveryService.pm
@@ -1,7 +1,6 @@
package UI::DeliveryService;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -134,30 +133,30 @@ sub get_example_urls {
}
}
}
- else {
+ else { # TODO: Is this necessary? Could this be consolidated?
foreach my $re ( @{$regexp_set} ) {
if ( $re->{type} eq 'HOST_REGEXP' ) {
my $host = $re->{pattern};
- my $url;
+ my $http_url;
+ my $https_url;
$host =~ s/\\//g;
$host =~ s/\.\*//g;
$host =~ s/\.//g;
- my $p =
- defined( $example_urls[ $re->{set_number} ] )
- ? $example_urls[ $re->{set_number} ]
- : "";
+
if ( $re->{set_number} == 0 ) {
- $example_urls[ $re->{set_number} ] = $scheme . '://ccr.' . $host . "." . $cdn_domain . $p;
+ $http_url = $scheme . '://ccr.' . $host . "." . $cdn_domain;
+ push( @example_urls, $http_url );
if ($scheme2) {
- $url = $scheme2 . '://ccr.' . $host . "." . $cdn_domain . $p;
- push( @example_urls, $url );
+ $https_url = $scheme2 . '://ccr.' . $host . "." . $cdn_domain;
+ push( @example_urls, $https_url );
}
}
else {
- $example_urls[ $re->{set_number} ] = $scheme . '://' . $re->{pattern} . $p;
+ $http_url = $scheme . '://' . $re->{pattern};
+ push( @example_urls, $http_url );
if ($scheme2) {
- $url = $scheme2 . '://' . $re->{pattern} . $p;
- push( @example_urls, $url );
+ $https_url = $scheme2 . '://' . $re->{pattern};
+ push( @example_urls, $https_url );
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/UI/DeliveryServiceServer.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/UI/DeliveryServiceServer.pm b/traffic_ops/app/lib/UI/DeliveryServiceServer.pm
index 240c85e..fefa1f9 100644
--- a/traffic_ops/app/lib/UI/DeliveryServiceServer.pm
+++ b/traffic_ops/app/lib/UI/DeliveryServiceServer.pm
@@ -1,6 +1,5 @@
package UI::DeliveryServiceServer;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/UI/DeliveryServiceTmUser.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/UI/DeliveryServiceTmUser.pm b/traffic_ops/app/lib/UI/DeliveryServiceTmUser.pm
index 01bf254..50f071e 100644
--- a/traffic_ops/app/lib/UI/DeliveryServiceTmUser.pm
+++ b/traffic_ops/app/lib/UI/DeliveryServiceTmUser.pm
@@ -1,6 +1,5 @@
package UI::DeliveryServiceTmUser;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/UI/Dell.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/UI/Dell.pm b/traffic_ops/app/lib/UI/Dell.pm
index c4dc484..9096bdc 100644
--- a/traffic_ops/app/lib/UI/Dell.pm
+++ b/traffic_ops/app/lib/UI/Dell.pm
@@ -1,6 +1,5 @@
package UI::Dell;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/UI/Division.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/UI/Division.pm b/traffic_ops/app/lib/UI/Division.pm
index 979dee1..0c26882 100644
--- a/traffic_ops/app/lib/UI/Division.pm
+++ b/traffic_ops/app/lib/UI/Division.pm
@@ -1,6 +1,5 @@
package UI::Division;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/UI/DnssecKeys.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/UI/DnssecKeys.pm b/traffic_ops/app/lib/UI/DnssecKeys.pm
index d1078e7..70e5595 100644
--- a/traffic_ops/app/lib/UI/DnssecKeys.pm
+++ b/traffic_ops/app/lib/UI/DnssecKeys.pm
@@ -1,6 +1,5 @@
package UI::DnssecKeys;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/UI/Federation.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/UI/Federation.pm b/traffic_ops/app/lib/UI/Federation.pm
index feef5dd..bb925e3 100644
--- a/traffic_ops/app/lib/UI/Federation.pm
+++ b/traffic_ops/app/lib/UI/Federation.pm
@@ -1,6 +1,5 @@
package UI::Federation;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/UI/GenDbDump.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/UI/GenDbDump.pm b/traffic_ops/app/lib/UI/GenDbDump.pm
index 52a0d36..44f9f11 100644
--- a/traffic_ops/app/lib/UI/GenDbDump.pm
+++ b/traffic_ops/app/lib/UI/GenDbDump.pm
@@ -1,6 +1,5 @@
package UI::GenDbDump;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/UI/GenIso.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/UI/GenIso.pm b/traffic_ops/app/lib/UI/GenIso.pm
index d6ccba8..2431ee1 100644
--- a/traffic_ops/app/lib/UI/GenIso.pm
+++ b/traffic_ops/app/lib/UI/GenIso.pm
@@ -1,6 +1,5 @@
package UI::GenIso;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
[15/26] incubator-trafficcontrol git commit: merge master
Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/UI/GenericUploader.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/UI/GenericUploader.pm b/traffic_ops/app/lib/UI/GenericUploader.pm
index 08b1a44..c4c92cb 100644
--- a/traffic_ops/app/lib/UI/GenericUploader.pm
+++ b/traffic_ops/app/lib/UI/GenericUploader.pm
@@ -1,6 +1,5 @@
package UI::GenericUploader;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/UI/Hardware.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/UI/Hardware.pm b/traffic_ops/app/lib/UI/Hardware.pm
index bd7e4f1..26942af 100644
--- a/traffic_ops/app/lib/UI/Hardware.pm
+++ b/traffic_ops/app/lib/UI/Hardware.pm
@@ -1,6 +1,5 @@
package UI::Hardware;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/UI/Health.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/UI/Health.pm b/traffic_ops/app/lib/UI/Health.pm
index 2f7fd6d..2458546 100644
--- a/traffic_ops/app/lib/UI/Health.pm
+++ b/traffic_ops/app/lib/UI/Health.pm
@@ -1,6 +1,5 @@
package UI::Health;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/UI/Help.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/UI/Help.pm b/traffic_ops/app/lib/UI/Help.pm
index d6279ea..5fc83ad 100644
--- a/traffic_ops/app/lib/UI/Help.pm
+++ b/traffic_ops/app/lib/UI/Help.pm
@@ -1,6 +1,5 @@
package UI::Help;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/UI/HwInfo.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/UI/HwInfo.pm b/traffic_ops/app/lib/UI/HwInfo.pm
index 1bc8e8b..754d24d 100644
--- a/traffic_ops/app/lib/UI/HwInfo.pm
+++ b/traffic_ops/app/lib/UI/HwInfo.pm
@@ -1,6 +1,5 @@
package UI::HwInfo;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/UI/Job.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/UI/Job.pm b/traffic_ops/app/lib/UI/Job.pm
index 8db9e0a..0e7a5b4 100644
--- a/traffic_ops/app/lib/UI/Job.pm
+++ b/traffic_ops/app/lib/UI/Job.pm
@@ -1,6 +1,5 @@
package UI::Job;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/UI/Ort.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/UI/Ort.pm b/traffic_ops/app/lib/UI/Ort.pm
index a5fb512..a026b0b 100644
--- a/traffic_ops/app/lib/UI/Ort.pm
+++ b/traffic_ops/app/lib/UI/Ort.pm
@@ -1,6 +1,5 @@
package UI::Ort;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/UI/Parameter.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/UI/Parameter.pm b/traffic_ops/app/lib/UI/Parameter.pm
index 8b8237a..4f437a5 100644
--- a/traffic_ops/app/lib/UI/Parameter.pm
+++ b/traffic_ops/app/lib/UI/Parameter.pm
@@ -1,6 +1,5 @@
package UI::Parameter;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/UI/PhysLocation.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/UI/PhysLocation.pm b/traffic_ops/app/lib/UI/PhysLocation.pm
index a08ac4a..06f220d 100644
--- a/traffic_ops/app/lib/UI/PhysLocation.pm
+++ b/traffic_ops/app/lib/UI/PhysLocation.pm
@@ -1,6 +1,5 @@
#
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/UI/Profile.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/UI/Profile.pm b/traffic_ops/app/lib/UI/Profile.pm
index dd1a4a5..2966750 100644
--- a/traffic_ops/app/lib/UI/Profile.pm
+++ b/traffic_ops/app/lib/UI/Profile.pm
@@ -1,6 +1,5 @@
package UI::Profile;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/UI/ProfileParameter.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/UI/ProfileParameter.pm b/traffic_ops/app/lib/UI/ProfileParameter.pm
index 5886590..6c35cfe 100644
--- a/traffic_ops/app/lib/UI/ProfileParameter.pm
+++ b/traffic_ops/app/lib/UI/ProfileParameter.pm
@@ -1,6 +1,5 @@
package UI::ProfileParameter;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/UI/RascalStatus.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/UI/RascalStatus.pm b/traffic_ops/app/lib/UI/RascalStatus.pm
index a09960f..4c0558e 100644
--- a/traffic_ops/app/lib/UI/RascalStatus.pm
+++ b/traffic_ops/app/lib/UI/RascalStatus.pm
@@ -1,7 +1,6 @@
package UI::RascalStatus;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/UI/Region.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/UI/Region.pm b/traffic_ops/app/lib/UI/Region.pm
index de93585..fe60b02 100644
--- a/traffic_ops/app/lib/UI/Region.pm
+++ b/traffic_ops/app/lib/UI/Region.pm
@@ -1,6 +1,5 @@
package UI::Region;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/UI/Render.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/UI/Render.pm b/traffic_ops/app/lib/UI/Render.pm
index 189a46f..4072a82 100644
--- a/traffic_ops/app/lib/UI/Render.pm
+++ b/traffic_ops/app/lib/UI/Render.pm
@@ -1,6 +1,5 @@
package UI::Render;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/UI/Role.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/UI/Role.pm b/traffic_ops/app/lib/UI/Role.pm
index e2cc8d1..04afe6f 100644
--- a/traffic_ops/app/lib/UI/Role.pm
+++ b/traffic_ops/app/lib/UI/Role.pm
@@ -1,6 +1,5 @@
package UI::Role;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/UI/Server.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/UI/Server.pm b/traffic_ops/app/lib/UI/Server.pm
index df63fa0..5ff0daa 100644
--- a/traffic_ops/app/lib/UI/Server.pm
+++ b/traffic_ops/app/lib/UI/Server.pm
@@ -1,7 +1,6 @@
package UI::Server;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/UI/ServerCheck.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/UI/ServerCheck.pm b/traffic_ops/app/lib/UI/ServerCheck.pm
index cdc3406..cac17bc 100644
--- a/traffic_ops/app/lib/UI/ServerCheck.pm
+++ b/traffic_ops/app/lib/UI/ServerCheck.pm
@@ -1,6 +1,5 @@
package UI::ServerCheck;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/UI/SslKeys.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/UI/SslKeys.pm b/traffic_ops/app/lib/UI/SslKeys.pm
index c7d9b78..cb19de2 100644
--- a/traffic_ops/app/lib/UI/SslKeys.pm
+++ b/traffic_ops/app/lib/UI/SslKeys.pm
@@ -1,6 +1,5 @@
package UI::SslKeys;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/UI/StaticDnsEntry.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/UI/StaticDnsEntry.pm b/traffic_ops/app/lib/UI/StaticDnsEntry.pm
index b483420..9a2a339 100644
--- a/traffic_ops/app/lib/UI/StaticDnsEntry.pm
+++ b/traffic_ops/app/lib/UI/StaticDnsEntry.pm
@@ -1,6 +1,5 @@
package UI::StaticDnsEntry;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/UI/Status.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/UI/Status.pm b/traffic_ops/app/lib/UI/Status.pm
index 33cba60..71863df 100644
--- a/traffic_ops/app/lib/UI/Status.pm
+++ b/traffic_ops/app/lib/UI/Status.pm
@@ -1,6 +1,5 @@
package UI::Status;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/UI/Steering.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/UI/Steering.pm b/traffic_ops/app/lib/UI/Steering.pm
index b7b30db..8a3cebd 100644
--- a/traffic_ops/app/lib/UI/Steering.pm
+++ b/traffic_ops/app/lib/UI/Steering.pm
@@ -1,6 +1,5 @@
package UI::Steering;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/UI/Tools.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/UI/Tools.pm b/traffic_ops/app/lib/UI/Tools.pm
index ef06b6a..2482579 100644
--- a/traffic_ops/app/lib/UI/Tools.pm
+++ b/traffic_ops/app/lib/UI/Tools.pm
@@ -1,7 +1,6 @@
package UI::Tools;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/UI/Topology.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/UI/Topology.pm b/traffic_ops/app/lib/UI/Topology.pm
index 6b7513f..02b6ff4 100644
--- a/traffic_ops/app/lib/UI/Topology.pm
+++ b/traffic_ops/app/lib/UI/Topology.pm
@@ -1,7 +1,6 @@
package UI::Topology;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/UI/Types.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/UI/Types.pm b/traffic_ops/app/lib/UI/Types.pm
index f5a7867..178487d 100644
--- a/traffic_ops/app/lib/UI/Types.pm
+++ b/traffic_ops/app/lib/UI/Types.pm
@@ -1,6 +1,5 @@
package UI::Types;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/UI/UploadHandler.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/UI/UploadHandler.pm b/traffic_ops/app/lib/UI/UploadHandler.pm
index befe353..728ab1b 100644
--- a/traffic_ops/app/lib/UI/UploadHandler.pm
+++ b/traffic_ops/app/lib/UI/UploadHandler.pm
@@ -1,6 +1,5 @@
package UI::UploadHandler;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/UI/UploadHandlerCsv.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/UI/UploadHandlerCsv.pm b/traffic_ops/app/lib/UI/UploadHandlerCsv.pm
index 349fdf5..7921eb1 100644
--- a/traffic_ops/app/lib/UI/UploadHandlerCsv.pm
+++ b/traffic_ops/app/lib/UI/UploadHandlerCsv.pm
@@ -1,6 +1,5 @@
package UI::UploadHandlerCsv;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/UI/UploadServerCsv.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/UI/UploadServerCsv.pm b/traffic_ops/app/lib/UI/UploadServerCsv.pm
index e0f8072..1e29b99 100644
--- a/traffic_ops/app/lib/UI/UploadServerCsv.pm
+++ b/traffic_ops/app/lib/UI/UploadServerCsv.pm
@@ -1,6 +1,5 @@
package UI::UploadServerCsv;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/UI/User.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/UI/User.pm b/traffic_ops/app/lib/UI/User.pm
index f0c8ab8..8d981b6 100644
--- a/traffic_ops/app/lib/UI/User.pm
+++ b/traffic_ops/app/lib/UI/User.pm
@@ -1,6 +1,5 @@
package UI::User;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/UI/Utils.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/UI/Utils.pm b/traffic_ops/app/lib/UI/Utils.pm
index 2c93e55..ddeb2d6 100644
--- a/traffic_ops/app/lib/UI/Utils.pm
+++ b/traffic_ops/app/lib/UI/Utils.pm
@@ -1,6 +1,5 @@
package UI::Utils;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -318,7 +317,7 @@ sub stash_role {
my $self = shift;
if ( !defined( $self->current_user() ) ) {
- return $self->redirect_to('/login.html');
+ return $self->redirect_to('/loginpage');
}
my $user = $self->current_user()->{username};
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/UI/VisualStatus.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/UI/VisualStatus.pm b/traffic_ops/app/lib/UI/VisualStatus.pm
index 3893cfa..57c6390 100644
--- a/traffic_ops/app/lib/UI/VisualStatus.pm
+++ b/traffic_ops/app/lib/UI/VisualStatus.pm
@@ -1,7 +1,6 @@
package UI::VisualStatus;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Utils/CCR.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Utils/CCR.pm b/traffic_ops/app/lib/Utils/CCR.pm
index a4b7577..50e1aa7 100644
--- a/traffic_ops/app/lib/Utils/CCR.pm
+++ b/traffic_ops/app/lib/Utils/CCR.pm
@@ -1,6 +1,5 @@
package Utils::CCR;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Utils/Deliveryservice.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Utils/Deliveryservice.pm b/traffic_ops/app/lib/Utils/Deliveryservice.pm
index 7bfa0c7..88d4f19 100644
--- a/traffic_ops/app/lib/Utils/Deliveryservice.pm
+++ b/traffic_ops/app/lib/Utils/Deliveryservice.pm
@@ -1,6 +1,5 @@
package Utils::DeliveryService;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Utils/Helper.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Utils/Helper.pm b/traffic_ops/app/lib/Utils/Helper.pm
index 0377f01..78e1ee5 100644
--- a/traffic_ops/app/lib/Utils/Helper.pm
+++ b/traffic_ops/app/lib/Utils/Helper.pm
@@ -1,6 +1,5 @@
package Utils::Helper;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Utils/Helper/DateHelper.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Utils/Helper/DateHelper.pm b/traffic_ops/app/lib/Utils/Helper/DateHelper.pm
index a03ced5..7a6e2bf 100644
--- a/traffic_ops/app/lib/Utils/Helper/DateHelper.pm
+++ b/traffic_ops/app/lib/Utils/Helper/DateHelper.pm
@@ -1,6 +1,5 @@
package Utils::Helper::DateHelper;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Utils/Helper/Extensions.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Utils/Helper/Extensions.pm b/traffic_ops/app/lib/Utils/Helper/Extensions.pm
index 57113fa..d950e95 100644
--- a/traffic_ops/app/lib/Utils/Helper/Extensions.pm
+++ b/traffic_ops/app/lib/Utils/Helper/Extensions.pm
@@ -1,6 +1,5 @@
package Utils::Helper::Extensions;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Utils/Helper/ResponseHelper.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Utils/Helper/ResponseHelper.pm b/traffic_ops/app/lib/Utils/Helper/ResponseHelper.pm
index edd5430..d2457ba 100644
--- a/traffic_ops/app/lib/Utils/Helper/ResponseHelper.pm
+++ b/traffic_ops/app/lib/Utils/Helper/ResponseHelper.pm
@@ -1,6 +1,5 @@
package Utils::Helper::ResponseHelper;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Utils/Helper/TrafficOpsRoutesLoader.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Utils/Helper/TrafficOpsRoutesLoader.pm b/traffic_ops/app/lib/Utils/Helper/TrafficOpsRoutesLoader.pm
index 66de348..bdc859b 100644
--- a/traffic_ops/app/lib/Utils/Helper/TrafficOpsRoutesLoader.pm
+++ b/traffic_ops/app/lib/Utils/Helper/TrafficOpsRoutesLoader.pm
@@ -1,6 +1,5 @@
package Utils::Helper::TrafficOpsRoutesLoader;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Utils/Helper/Version.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Utils/Helper/Version.pm b/traffic_ops/app/lib/Utils/Helper/Version.pm
index f394f14..5c251e4 100644
--- a/traffic_ops/app/lib/Utils/Helper/Version.pm
+++ b/traffic_ops/app/lib/Utils/Helper/Version.pm
@@ -1,6 +1,5 @@
package Utils::Helper::Version;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Utils/JsonConfig.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Utils/JsonConfig.pm b/traffic_ops/app/lib/Utils/JsonConfig.pm
index 35d3cca..a40b045 100644
--- a/traffic_ops/app/lib/Utils/JsonConfig.pm
+++ b/traffic_ops/app/lib/Utils/JsonConfig.pm
@@ -1,6 +1,5 @@
package Utils::JsonConfig;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Utils/Properties.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Utils/Properties.pm b/traffic_ops/app/lib/Utils/Properties.pm
index d3a75da..b17691d 100644
--- a/traffic_ops/app/lib/Utils/Properties.pm
+++ b/traffic_ops/app/lib/Utils/Properties.pm
@@ -1,6 +1,5 @@
package Utils::Properties;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/Utils/Rascal.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Utils/Rascal.pm b/traffic_ops/app/lib/Utils/Rascal.pm
index a376a4c..ba16ccf 100644
--- a/traffic_ops/app/lib/Utils/Rascal.pm
+++ b/traffic_ops/app/lib/Utils/Rascal.pm
@@ -1,6 +1,5 @@
package Utils::Rascal;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/public/close_fancybox.html
----------------------------------------------------------------------
diff --git a/traffic_ops/app/public/close_fancybox.html b/traffic_ops/app/public/close_fancybox.html
index a7e086c..26d8da3 100644
--- a/traffic_ops/app/public/close_fancybox.html
+++ b/traffic_ops/app/public/close_fancybox.html
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/public/css/site.css
----------------------------------------------------------------------
diff --git a/traffic_ops/app/public/css/site.css b/traffic_ops/app/public/css/site.css
index 12ad49e..effbf29 100644
--- a/traffic_ops/app/public/css/site.css
+++ b/traffic_ops/app/public/css/site.css
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/public/images/tc_logo.png
----------------------------------------------------------------------
diff --git a/traffic_ops/app/public/images/tc_logo.png b/traffic_ops/app/public/images/tc_logo.png
index e30944c..9ea6966 100644
Binary files a/traffic_ops/app/public/images/tc_logo.png and b/traffic_ops/app/public/images/tc_logo.png differ
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/public/js/application.js
----------------------------------------------------------------------
diff --git a/traffic_ops/app/public/js/application.js b/traffic_ops/app/public/js/application.js
index 7f3ae42..179bf6e 100644
--- a/traffic_ops/app/public/js/application.js
+++ b/traffic_ops/app/public/js/application.js
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/public/js/tm_utils.js
----------------------------------------------------------------------
diff --git a/traffic_ops/app/public/js/tm_utils.js b/traffic_ops/app/public/js/tm_utils.js
index c9036de..403ac31 100644
--- a/traffic_ops/app/public/js/tm_utils.js
+++ b/traffic_ops/app/public/js/tm_utils.js
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/public/theme/default/style.css
----------------------------------------------------------------------
diff --git a/traffic_ops/app/public/theme/default/style.css b/traffic_ops/app/public/theme/default/style.css
index 324e2b6..f99b30c 100644
--- a/traffic_ops/app/public/theme/default/style.css
+++ b/traffic_ops/app/public/theme/default/style.css
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/script/detect10ginterfaces.pl
----------------------------------------------------------------------
diff --git a/traffic_ops/app/script/detect10ginterfaces.pl b/traffic_ops/app/script/detect10ginterfaces.pl
index 0512b53..577abbf 100644
--- a/traffic_ops/app/script/detect10ginterfaces.pl
+++ b/traffic_ops/app/script/detect10ginterfaces.pl
@@ -1,6 +1,5 @@
#!/usr/bin/perl
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/script/generate_raid0_files.pl
----------------------------------------------------------------------
diff --git a/traffic_ops/app/script/generate_raid0_files.pl b/traffic_ops/app/script/generate_raid0_files.pl
index 574fcc2..af888f2 100644
--- a/traffic_ops/app/script/generate_raid0_files.pl
+++ b/traffic_ops/app/script/generate_raid0_files.pl
@@ -1,6 +1,5 @@
#!/usr/bin/perl
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/script/update_riak_for_search.pl
----------------------------------------------------------------------
diff --git a/traffic_ops/app/script/update_riak_for_search.pl b/traffic_ops/app/script/update_riak_for_search.pl
index dafdff7..5eb2950 100755
--- a/traffic_ops/app/script/update_riak_for_search.pl
+++ b/traffic_ops/app/script/update_riak_for_search.pl
@@ -1,6 +1,5 @@
#!/usr/bin/perl
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -41,6 +40,9 @@ foreach my $ds (@$dss) {
my $xml_id = $ds->{xmlId};
my $cdn = $ds->{cdnName};
my $record = &get_riak_record($xml_id, $to_url, $ua);
+ if (!defined($record)) {
+ next;
+ }
$record->{deliveryservice} = $xml_id;
$record->{cdn} = $cdn;
$record->{certificate}->{crt} = decode_base64($record->{certificate}->{crt});
@@ -118,8 +120,8 @@ sub get_riak_record {
my $response = $ua->get( $url );
if(!$response->is_success() || $response->code() > 400) {
- print "Could not get ssl record for $xml_id from riak! Response was ". $response->{_rc} . " - " . $response->{_msg} . "\n";
- exit 1;
+ print "Could not get ssl record for $xml_id from riak! Response was ". $response->{_rc} . " - " . $response->{_msg} . "Skipping...\n";
+ return;
}
my $content = decode_json($response->{_content});
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/t/aadata.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/aadata.t b/traffic_ops/app/t/aadata.t
index 4bffdd5..a2d9db5 100644
--- a/traffic_ops/app/t/aadata.t
+++ b/traffic_ops/app/t/aadata.t
@@ -1,6 +1,5 @@
package main;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/t/api/1.0/availableds.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/api/1.0/availableds.t b/traffic_ops/app/t/api/1.0/availableds.t
index d8ee527..6bc6482 100644
--- a/traffic_ops/app/t/api/1.0/availableds.t
+++ b/traffic_ops/app/t/api/1.0/availableds.t
@@ -1,6 +1,5 @@
package main;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/t/api/1.0/data.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/api/1.0/data.t b/traffic_ops/app/t/api/1.0/data.t
index d24d93f..5e92143 100644
--- a/traffic_ops/app/t/api/1.0/data.t
+++ b/traffic_ops/app/t/api/1.0/data.t
@@ -1,6 +1,5 @@
package main;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/t/api/1.0/health.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/api/1.0/health.t b/traffic_ops/app/t/api/1.0/health.t
index 3b55d73..c5d6d01 100644
--- a/traffic_ops/app/t/api/1.0/health.t
+++ b/traffic_ops/app/t/api/1.0/health.t
@@ -1,6 +1,5 @@
package main;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/t/api/1.0/ort.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/api/1.0/ort.t b/traffic_ops/app/t/api/1.0/ort.t
index c173e7a..3d128d9 100644
--- a/traffic_ops/app/t/api/1.0/ort.t
+++ b/traffic_ops/app/t/api/1.0/ort.t
@@ -1,6 +1,5 @@
package main;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/t/api/1.1/asn.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/api/1.1/asn.t b/traffic_ops/app/t/api/1.1/asn.t
index af7ef60..c88ecc6 100644
--- a/traffic_ops/app/t/api/1.1/asn.t
+++ b/traffic_ops/app/t/api/1.1/asn.t
@@ -1,6 +1,5 @@
package main;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/t/api/1.1/cachegroup.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/api/1.1/cachegroup.t b/traffic_ops/app/t/api/1.1/cachegroup.t
index 81cadb5..0403462 100644
--- a/traffic_ops/app/t/api/1.1/cachegroup.t
+++ b/traffic_ops/app/t/api/1.1/cachegroup.t
@@ -1,6 +1,5 @@
package main;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/t/api/1.1/cachegroupparameter.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/api/1.1/cachegroupparameter.t b/traffic_ops/app/t/api/1.1/cachegroupparameter.t
index 0f9bb81..b36fcbd 100644
--- a/traffic_ops/app/t/api/1.1/cachegroupparameter.t
+++ b/traffic_ops/app/t/api/1.1/cachegroupparameter.t
@@ -1,6 +1,5 @@
package main;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/t/api/1.1/deliveryservice/keys_url_sig.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/api/1.1/deliveryservice/keys_url_sig.t b/traffic_ops/app/t/api/1.1/deliveryservice/keys_url_sig.t
index 700abc9..b9faee6 100644
--- a/traffic_ops/app/t/api/1.1/deliveryservice/keys_url_sig.t
+++ b/traffic_ops/app/t/api/1.1/deliveryservice/keys_url_sig.t
@@ -1,6 +1,5 @@
package main;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/t/api/1.1/deliveryservice/ssl_keys.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/api/1.1/deliveryservice/ssl_keys.t b/traffic_ops/app/t/api/1.1/deliveryservice/ssl_keys.t
index 77b5167..e3d5ded 100644
--- a/traffic_ops/app/t/api/1.1/deliveryservice/ssl_keys.t
+++ b/traffic_ops/app/t/api/1.1/deliveryservice/ssl_keys.t
@@ -1,6 +1,5 @@
package main;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/t/api/1.1/deliveryserviceserver.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/api/1.1/deliveryserviceserver.t b/traffic_ops/app/t/api/1.1/deliveryserviceserver.t
index 6384210..8a9af0e 100644
--- a/traffic_ops/app/t/api/1.1/deliveryserviceserver.t
+++ b/traffic_ops/app/t/api/1.1/deliveryserviceserver.t
@@ -1,6 +1,5 @@
package main;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/t/api/1.1/hwinfo.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/api/1.1/hwinfo.t b/traffic_ops/app/t/api/1.1/hwinfo.t
index 45fa9f7..c3a042f 100644
--- a/traffic_ops/app/t/api/1.1/hwinfo.t
+++ b/traffic_ops/app/t/api/1.1/hwinfo.t
@@ -1,6 +1,5 @@
package main;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/t/api/1.1/job.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/api/1.1/job.t b/traffic_ops/app/t/api/1.1/job.t
index c3bdde9..b72f412 100644
--- a/traffic_ops/app/t/api/1.1/job.t
+++ b/traffic_ops/app/t/api/1.1/job.t
@@ -1,7 +1,6 @@
package main;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/t/api/1.1/keys.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/api/1.1/keys.t b/traffic_ops/app/t/api/1.1/keys.t
index 1b1dfbc..a0e065b 100644
--- a/traffic_ops/app/t/api/1.1/keys.t
+++ b/traffic_ops/app/t/api/1.1/keys.t
@@ -1,6 +1,5 @@
package main;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/t/api/1.1/log.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/api/1.1/log.t b/traffic_ops/app/t/api/1.1/log.t
index d1ec8b1..7726d99 100644
--- a/traffic_ops/app/t/api/1.1/log.t
+++ b/traffic_ops/app/t/api/1.1/log.t
@@ -1,6 +1,5 @@
package main;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/t/api/1.1/metrics.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/api/1.1/metrics.t b/traffic_ops/app/t/api/1.1/metrics.t
index 0ec81c1..00acee2 100644
--- a/traffic_ops/app/t/api/1.1/metrics.t
+++ b/traffic_ops/app/t/api/1.1/metrics.t
@@ -1,6 +1,5 @@
package main;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/t/api/1.1/parameter.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/api/1.1/parameter.t b/traffic_ops/app/t/api/1.1/parameter.t
index 7c4dcd7..7ab2c92 100644
--- a/traffic_ops/app/t/api/1.1/parameter.t
+++ b/traffic_ops/app/t/api/1.1/parameter.t
@@ -1,6 +1,5 @@
package main;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/t/api/1.1/phys_location.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/api/1.1/phys_location.t b/traffic_ops/app/t/api/1.1/phys_location.t
index 29a50a8..6901e1e 100644
--- a/traffic_ops/app/t/api/1.1/phys_location.t
+++ b/traffic_ops/app/t/api/1.1/phys_location.t
@@ -1,6 +1,5 @@
package main;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/t/api/1.1/profile.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/api/1.1/profile.t b/traffic_ops/app/t/api/1.1/profile.t
index 661e381..fd694c1 100644
--- a/traffic_ops/app/t/api/1.1/profile.t
+++ b/traffic_ops/app/t/api/1.1/profile.t
@@ -1,6 +1,5 @@
package main;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/t/api/1.1/region.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/api/1.1/region.t b/traffic_ops/app/t/api/1.1/region.t
index 3babf8a..efe66df 100644
--- a/traffic_ops/app/t/api/1.1/region.t
+++ b/traffic_ops/app/t/api/1.1/region.t
@@ -1,6 +1,5 @@
package main;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/t/api/1.1/riak_adapter.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/api/1.1/riak_adapter.t b/traffic_ops/app/t/api/1.1/riak_adapter.t
index 07c55a6..1c2a3d4 100644
--- a/traffic_ops/app/t/api/1.1/riak_adapter.t
+++ b/traffic_ops/app/t/api/1.1/riak_adapter.t
@@ -1,6 +1,5 @@
package main;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/t/api/1.1/roles.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/api/1.1/roles.t b/traffic_ops/app/t/api/1.1/roles.t
index 2ecd070..c720d36 100644
--- a/traffic_ops/app/t/api/1.1/roles.t
+++ b/traffic_ops/app/t/api/1.1/roles.t
@@ -1,6 +1,5 @@
package main;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/t/api/1.1/server.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/api/1.1/server.t b/traffic_ops/app/t/api/1.1/server.t
index c16da6d..e361e10 100644
--- a/traffic_ops/app/t/api/1.1/server.t
+++ b/traffic_ops/app/t/api/1.1/server.t
@@ -1,6 +1,5 @@
package main;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/t/api/1.1/staticdns.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/api/1.1/staticdns.t b/traffic_ops/app/t/api/1.1/staticdns.t
index 03afb01..290db16 100644
--- a/traffic_ops/app/t/api/1.1/staticdns.t
+++ b/traffic_ops/app/t/api/1.1/staticdns.t
@@ -1,6 +1,5 @@
package main;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/t/api/1.1/status.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/api/1.1/status.t b/traffic_ops/app/t/api/1.1/status.t
index d7f7ec6..df39053 100644
--- a/traffic_ops/app/t/api/1.1/status.t
+++ b/traffic_ops/app/t/api/1.1/status.t
@@ -1,6 +1,5 @@
package main;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/t/api/1.1/traffic_monitor.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/api/1.1/traffic_monitor.t b/traffic_ops/app/t/api/1.1/traffic_monitor.t
index 20b64c9..9a9460d 100644
--- a/traffic_ops/app/t/api/1.1/traffic_monitor.t
+++ b/traffic_ops/app/t/api/1.1/traffic_monitor.t
@@ -1,6 +1,5 @@
package main;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/t/api/1.1/types.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/api/1.1/types.t b/traffic_ops/app/t/api/1.1/types.t
index 56441f7..fc15176 100644
--- a/traffic_ops/app/t/api/1.1/types.t
+++ b/traffic_ops/app/t/api/1.1/types.t
@@ -1,6 +1,5 @@
package main;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/t/api/1.1/user.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/api/1.1/user.t b/traffic_ops/app/t/api/1.1/user.t
index dce5513..a82575f 100644
--- a/traffic_ops/app/t/api/1.1/user.t
+++ b/traffic_ops/app/t/api/1.1/user.t
@@ -1,6 +1,5 @@
package main;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/t/api/1.2/asn.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/api/1.2/asn.t b/traffic_ops/app/t/api/1.2/asn.t
index 8fb4a56..2a6a6c1 100644
--- a/traffic_ops/app/t/api/1.2/asn.t
+++ b/traffic_ops/app/t/api/1.2/asn.t
@@ -1,6 +1,5 @@
package main;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/t/api/1.2/cache_stats.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/api/1.2/cache_stats.t b/traffic_ops/app/t/api/1.2/cache_stats.t
index 70bc33e..bcc839a 100644
--- a/traffic_ops/app/t/api/1.2/cache_stats.t
+++ b/traffic_ops/app/t/api/1.2/cache_stats.t
@@ -1,6 +1,5 @@
package main;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/t/api/1.2/cachegroup.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/api/1.2/cachegroup.t b/traffic_ops/app/t/api/1.2/cachegroup.t
index 3fe5b8e..750cd98 100644
--- a/traffic_ops/app/t/api/1.2/cachegroup.t
+++ b/traffic_ops/app/t/api/1.2/cachegroup.t
@@ -1,6 +1,5 @@
package main;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/t/api/1.2/cdn.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/api/1.2/cdn.t b/traffic_ops/app/t/api/1.2/cdn.t
index 265bae4..b062660 100644
--- a/traffic_ops/app/t/api/1.2/cdn.t
+++ b/traffic_ops/app/t/api/1.2/cdn.t
@@ -1,6 +1,5 @@
package main;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/t/api/1.2/deliveryservice.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/api/1.2/deliveryservice.t b/traffic_ops/app/t/api/1.2/deliveryservice.t
index 0cda46b..44305e4 100644
--- a/traffic_ops/app/t/api/1.2/deliveryservice.t
+++ b/traffic_ops/app/t/api/1.2/deliveryservice.t
@@ -1,6 +1,5 @@
package main;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/t/api/1.2/deliveryservice_matches.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/api/1.2/deliveryservice_matches.t b/traffic_ops/app/t/api/1.2/deliveryservice_matches.t
index 3ec8c04..e4f2ab9 100644
--- a/traffic_ops/app/t/api/1.2/deliveryservice_matches.t
+++ b/traffic_ops/app/t/api/1.2/deliveryservice_matches.t
@@ -1,6 +1,5 @@
package main;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/t/api/1.2/deliveryservice_regex.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/api/1.2/deliveryservice_regex.t b/traffic_ops/app/t/api/1.2/deliveryservice_regex.t
index 6bd92f4..8bd75ff 100644
--- a/traffic_ops/app/t/api/1.2/deliveryservice_regex.t
+++ b/traffic_ops/app/t/api/1.2/deliveryservice_regex.t
@@ -1,6 +1,5 @@
package main;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/t/api/1.2/deliveryservice_server.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/api/1.2/deliveryservice_server.t b/traffic_ops/app/t/api/1.2/deliveryservice_server.t
index 8825f1b..fdf68db 100644
--- a/traffic_ops/app/t/api/1.2/deliveryservice_server.t
+++ b/traffic_ops/app/t/api/1.2/deliveryservice_server.t
@@ -1,6 +1,5 @@
package main;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/t/api/1.2/deliveryservice_stats.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/api/1.2/deliveryservice_stats.t b/traffic_ops/app/t/api/1.2/deliveryservice_stats.t
index e29c8b4..f78e223 100644
--- a/traffic_ops/app/t/api/1.2/deliveryservice_stats.t
+++ b/traffic_ops/app/t/api/1.2/deliveryservice_stats.t
@@ -1,6 +1,5 @@
package main;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/t/api/1.2/division.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/api/1.2/division.t b/traffic_ops/app/t/api/1.2/division.t
index 0315259..0923e78 100644
--- a/traffic_ops/app/t/api/1.2/division.t
+++ b/traffic_ops/app/t/api/1.2/division.t
@@ -1,6 +1,5 @@
package main;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/t/api/1.2/federation_external.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/api/1.2/federation_external.t b/traffic_ops/app/t/api/1.2/federation_external.t
index 7976e38..de4a526 100644
--- a/traffic_ops/app/t/api/1.2/federation_external.t
+++ b/traffic_ops/app/t/api/1.2/federation_external.t
@@ -1,7 +1,6 @@
package main;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/t/api/1.2/federation_internal.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/api/1.2/federation_internal.t b/traffic_ops/app/t/api/1.2/federation_internal.t
index 4d12ec5..c494093 100644
--- a/traffic_ops/app/t/api/1.2/federation_internal.t
+++ b/traffic_ops/app/t/api/1.2/federation_internal.t
@@ -1,7 +1,6 @@
package main;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/t/api/1.2/physlocation.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/api/1.2/physlocation.t b/traffic_ops/app/t/api/1.2/physlocation.t
index 81e390d..50d4c43 100644
--- a/traffic_ops/app/t/api/1.2/physlocation.t
+++ b/traffic_ops/app/t/api/1.2/physlocation.t
@@ -1,6 +1,5 @@
package main;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/t/api/1.2/profile.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/api/1.2/profile.t b/traffic_ops/app/t/api/1.2/profile.t
index 24c0de6..ce962d8 100644
--- a/traffic_ops/app/t/api/1.2/profile.t
+++ b/traffic_ops/app/t/api/1.2/profile.t
@@ -1,6 +1,5 @@
package main;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/t/api/1.2/profile_parameter.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/api/1.2/profile_parameter.t b/traffic_ops/app/t/api/1.2/profile_parameter.t
index d7adb90..9cc77d0 100644
--- a/traffic_ops/app/t/api/1.2/profile_parameter.t
+++ b/traffic_ops/app/t/api/1.2/profile_parameter.t
@@ -1,6 +1,5 @@
package main;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/t/api/1.2/region.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/api/1.2/region.t b/traffic_ops/app/t/api/1.2/region.t
index ede15cf..e5abc65 100644
--- a/traffic_ops/app/t/api/1.2/region.t
+++ b/traffic_ops/app/t/api/1.2/region.t
@@ -1,6 +1,5 @@
package main;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/t/api/1.2/server.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/api/1.2/server.t b/traffic_ops/app/t/api/1.2/server.t
index 70fafa3..2b2fdaf 100644
--- a/traffic_ops/app/t/api/1.2/server.t
+++ b/traffic_ops/app/t/api/1.2/server.t
@@ -1,6 +1,5 @@
package main;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/t/api/1.2/server_create.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/api/1.2/server_create.t b/traffic_ops/app/t/api/1.2/server_create.t
index 7b549e8..4005d60 100644
--- a/traffic_ops/app/t/api/1.2/server_create.t
+++ b/traffic_ops/app/t/api/1.2/server_create.t
@@ -1,6 +1,5 @@
package main;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/t/api/1.2/stats_summary.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/api/1.2/stats_summary.t b/traffic_ops/app/t/api/1.2/stats_summary.t
index 86fac09..fd3c154 100644
--- a/traffic_ops/app/t/api/1.2/stats_summary.t
+++ b/traffic_ops/app/t/api/1.2/stats_summary.t
@@ -1,6 +1,5 @@
package main;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/t/api/1.2/steering_internal.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/api/1.2/steering_internal.t b/traffic_ops/app/t/api/1.2/steering_internal.t
index 77a01c1..69fc7e5 100644
--- a/traffic_ops/app/t/api/1.2/steering_internal.t
+++ b/traffic_ops/app/t/api/1.2/steering_internal.t
@@ -1,7 +1,6 @@
package main;
#
-# Copyright 2016 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/t/api/1.2/user.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/api/1.2/user.t b/traffic_ops/app/t/api/1.2/user.t
index e344ea1..3501e8c 100644
--- a/traffic_ops/app/t/api/1.2/user.t
+++ b/traffic_ops/app/t/api/1.2/user.t
@@ -1,6 +1,5 @@
package main;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/t/asn.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/asn.t b/traffic_ops/app/t/asn.t
index 11683bb..3f47f19 100644
--- a/traffic_ops/app/t/asn.t
+++ b/traffic_ops/app/t/asn.t
@@ -1,6 +1,5 @@
package main;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/t/deliveryservice.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/deliveryservice.t b/traffic_ops/app/t/deliveryservice.t
index b1cc795..e25f24b 100644
--- a/traffic_ops/app/t/deliveryservice.t
+++ b/traffic_ops/app/t/deliveryservice.t
@@ -1,7 +1,6 @@
package main;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/t/deliveryserviceserver.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/deliveryserviceserver.t b/traffic_ops/app/t/deliveryserviceserver.t
index 61f29b1..759840e 100644
--- a/traffic_ops/app/t/deliveryserviceserver.t
+++ b/traffic_ops/app/t/deliveryserviceserver.t
@@ -1,6 +1,5 @@
package main;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/t/federation.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/federation.t b/traffic_ops/app/t/federation.t
index 2a943e0..9b5c2b3 100644
--- a/traffic_ops/app/t/federation.t
+++ b/traffic_ops/app/t/federation.t
@@ -1,7 +1,6 @@
package main;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/t/health.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/health.t b/traffic_ops/app/t/health.t
index 0e20ab7..bb9ac6a 100644
--- a/traffic_ops/app/t/health.t
+++ b/traffic_ops/app/t/health.t
@@ -1,6 +1,5 @@
package main;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/t/hwinfo.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/hwinfo.t b/traffic_ops/app/t/hwinfo.t
index 2bf335c..8a095a9 100644
--- a/traffic_ops/app/t/hwinfo.t
+++ b/traffic_ops/app/t/hwinfo.t
@@ -1,6 +1,5 @@
package main;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/t/influxdb_adapter.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/influxdb_adapter.t b/traffic_ops/app/t/influxdb_adapter.t
index 547f43d..afcd210 100644
--- a/traffic_ops/app/t/influxdb_adapter.t
+++ b/traffic_ops/app/t/influxdb_adapter.t
@@ -1,6 +1,5 @@
package main;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/t/log.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/log.t b/traffic_ops/app/t/log.t
index 7d0e359..b43a71f 100644
--- a/traffic_ops/app/t/log.t
+++ b/traffic_ops/app/t/log.t
@@ -1,6 +1,5 @@
package main;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/t/modules.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/modules.t b/traffic_ops/app/t/modules.t
index 2f9c77e..3987dda 100644
--- a/traffic_ops/app/t/modules.t
+++ b/traffic_ops/app/t/modules.t
@@ -1,6 +1,5 @@
use strict;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/t/parameter.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/parameter.t b/traffic_ops/app/t/parameter.t
index 55c581a..584071d 100644
--- a/traffic_ops/app/t/parameter.t
+++ b/traffic_ops/app/t/parameter.t
@@ -1,6 +1,5 @@
package main;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/t/phys_location.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/phys_location.t b/traffic_ops/app/t/phys_location.t
index e5a5522..902020c 100644
--- a/traffic_ops/app/t/phys_location.t
+++ b/traffic_ops/app/t/phys_location.t
@@ -1,6 +1,5 @@
package main;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/t/profile.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/profile.t b/traffic_ops/app/t/profile.t
index 426f03a..6293ed0 100644
--- a/traffic_ops/app/t/profile.t
+++ b/traffic_ops/app/t/profile.t
@@ -1,6 +1,5 @@
package main;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/t/purge.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/purge.t b/traffic_ops/app/t/purge.t
index 4c9aadf..a74e2af 100644
--- a/traffic_ops/app/t/purge.t
+++ b/traffic_ops/app/t/purge.t
@@ -1,6 +1,5 @@
package main;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/t/rascal_status.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/rascal_status.t b/traffic_ops/app/t/rascal_status.t
index de02b86..a780ae0 100644
--- a/traffic_ops/app/t/rascal_status.t
+++ b/traffic_ops/app/t/rascal_status.t
@@ -1,6 +1,5 @@
package main;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/t/server.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/server.t b/traffic_ops/app/t/server.t
index 788230c..e18ead4 100644
--- a/traffic_ops/app/t/server.t
+++ b/traffic_ops/app/t/server.t
@@ -1,7 +1,6 @@
package main;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/t/staticdnsentry.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/staticdnsentry.t b/traffic_ops/app/t/staticdnsentry.t
index 81a8395..54837be 100644
--- a/traffic_ops/app/t/staticdnsentry.t
+++ b/traffic_ops/app/t/staticdnsentry.t
@@ -1,6 +1,5 @@
package main;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/t/status.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/status.t b/traffic_ops/app/t/status.t
index 537eb3e..d82c527 100644
--- a/traffic_ops/app/t/status.t
+++ b/traffic_ops/app/t/status.t
@@ -1,6 +1,5 @@
package main;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/t/types.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/types.t b/traffic_ops/app/t/types.t
index 294bc44..a455bb9 100644
--- a/traffic_ops/app/t/types.t
+++ b/traffic_ops/app/t/types.t
@@ -1,6 +1,5 @@
package main;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/t/uploadhandlercsv.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/uploadhandlercsv.t b/traffic_ops/app/t/uploadhandlercsv.t
index 311ddb8..d78fb26 100644
--- a/traffic_ops/app/t/uploadhandlercsv.t
+++ b/traffic_ops/app/t/uploadhandlercsv.t
@@ -1,6 +1,5 @@
package main;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/t/user.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/user.t b/traffic_ops/app/t/user.t
index 37ac13f..5a53490 100644
--- a/traffic_ops/app/t/user.t
+++ b/traffic_ops/app/t/user.t
@@ -1,6 +1,5 @@
package main;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/asn/_form.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/asn/_form.html.ep b/traffic_ops/app/templates/asn/_form.html.ep
index fbf7b4d..0e844d4 100644
--- a/traffic_ops/app/templates/asn/_form.html.ep
+++ b/traffic_ops/app/templates/asn/_form.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/asn/add.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/asn/add.html.ep b/traffic_ops/app/templates/asn/add.html.ep
index f243e1b..5090065 100644
--- a/traffic_ops/app/templates/asn/add.html.ep
+++ b/traffic_ops/app/templates/asn/add.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/asn/asn.js.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/asn/asn.js.html.ep b/traffic_ops/app/templates/asn/asn.js.html.ep
index 8056eb8..4bddd3d 100644
--- a/traffic_ops/app/templates/asn/asn.js.html.ep
+++ b/traffic_ops/app/templates/asn/asn.js.html.ep
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/asn/edit.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/asn/edit.html.ep b/traffic_ops/app/templates/asn/edit.html.ep
index b5a0ca0..8d0d912 100644
--- a/traffic_ops/app/templates/asn/edit.html.ep
+++ b/traffic_ops/app/templates/asn/edit.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/asn/index.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/asn/index.html.ep b/traffic_ops/app/templates/asn/index.html.ep
index 04f9f85..5478ad1 100644
--- a/traffic_ops/app/templates/asn/index.html.ep
+++ b/traffic_ops/app/templates/asn/index.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/asn/view.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/asn/view.html.ep b/traffic_ops/app/templates/asn/view.html.ep
index 7bcec85..46224ef 100644
--- a/traffic_ops/app/templates/asn/view.html.ep
+++ b/traffic_ops/app/templates/asn/view.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/blueimp_uploader/blueimp.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/blueimp_uploader/blueimp.html.ep b/traffic_ops/app/templates/blueimp_uploader/blueimp.html.ep
index 4a3a3d0..47cef4b 100644
--- a/traffic_ops/app/templates/blueimp_uploader/blueimp.html.ep
+++ b/traffic_ops/app/templates/blueimp_uploader/blueimp.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/cachegroup/_form.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/cachegroup/_form.html.ep b/traffic_ops/app/templates/cachegroup/_form.html.ep
index fdbbd91..055a8b0 100644
--- a/traffic_ops/app/templates/cachegroup/_form.html.ep
+++ b/traffic_ops/app/templates/cachegroup/_form.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/cachegroup/add.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/cachegroup/add.html.ep b/traffic_ops/app/templates/cachegroup/add.html.ep
index 91a53c9..2bd2693 100644
--- a/traffic_ops/app/templates/cachegroup/add.html.ep
+++ b/traffic_ops/app/templates/cachegroup/add.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/cachegroup/cachegroup.js.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/cachegroup/cachegroup.js.html.ep b/traffic_ops/app/templates/cachegroup/cachegroup.js.html.ep
index 2afc0b1..95227bd 100644
--- a/traffic_ops/app/templates/cachegroup/cachegroup.js.html.ep
+++ b/traffic_ops/app/templates/cachegroup/cachegroup.js.html.ep
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/cachegroup/edit.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/cachegroup/edit.html.ep b/traffic_ops/app/templates/cachegroup/edit.html.ep
index 22a6b48..3f2f810 100644
--- a/traffic_ops/app/templates/cachegroup/edit.html.ep
+++ b/traffic_ops/app/templates/cachegroup/edit.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/cachegroup/index.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/cachegroup/index.html.ep b/traffic_ops/app/templates/cachegroup/index.html.ep
index c46db3f..1a4756a 100644
--- a/traffic_ops/app/templates/cachegroup/index.html.ep
+++ b/traffic_ops/app/templates/cachegroup/index.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/cachegroup/view.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/cachegroup/view.html.ep b/traffic_ops/app/templates/cachegroup/view.html.ep
index 47c6eb1..891bb18 100644
--- a/traffic_ops/app/templates/cachegroup/view.html.ep
+++ b/traffic_ops/app/templates/cachegroup/view.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/cdn/_form.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/cdn/_form.html.ep b/traffic_ops/app/templates/cdn/_form.html.ep
index 84bab61..b886a36 100644
--- a/traffic_ops/app/templates/cdn/_form.html.ep
+++ b/traffic_ops/app/templates/cdn/_form.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/cdn/add.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/cdn/add.html.ep b/traffic_ops/app/templates/cdn/add.html.ep
index ba366d4..aa82a19 100644
--- a/traffic_ops/app/templates/cdn/add.html.ep
+++ b/traffic_ops/app/templates/cdn/add.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/cdn/edit.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/cdn/edit.html.ep b/traffic_ops/app/templates/cdn/edit.html.ep
index 07fee67..b47b7d8 100644
--- a/traffic_ops/app/templates/cdn/edit.html.ep
+++ b/traffic_ops/app/templates/cdn/edit.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/cdn/index.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/cdn/index.html.ep b/traffic_ops/app/templates/cdn/index.html.ep
index df30609..b086d0c 100644
--- a/traffic_ops/app/templates/cdn/index.html.ep
+++ b/traffic_ops/app/templates/cdn/index.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/cdn/loginpage.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/cdn/loginpage.html.ep b/traffic_ops/app/templates/cdn/loginpage.html.ep
index abe6efb..12983fa 100644
--- a/traffic_ops/app/templates/cdn/loginpage.html.ep
+++ b/traffic_ops/app/templates/cdn/loginpage.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/cdn/parameter.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/cdn/parameter.html.ep b/traffic_ops/app/templates/cdn/parameter.html.ep
index 7630f11..7ed328e 100644
--- a/traffic_ops/app/templates/cdn/parameter.html.ep
+++ b/traffic_ops/app/templates/cdn/parameter.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/cdn/snapshot_crconfig.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/cdn/snapshot_crconfig.html.ep b/traffic_ops/app/templates/cdn/snapshot_crconfig.html.ep
index 9222105..b1a3de6 100644
--- a/traffic_ops/app/templates/cdn/snapshot_crconfig.html.ep
+++ b/traffic_ops/app/templates/cdn/snapshot_crconfig.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
[18/26] incubator-trafficcontrol git commit: merge master
Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/models/CacheDataModel.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/models/CacheDataModel.java b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/models/CacheDataModel.java
index 345ac92..6ad1170 100644
--- a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/models/CacheDataModel.java
+++ b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/models/CacheDataModel.java
@@ -1,5 +1,25 @@
package com.comcast.cdn.traffic_control.traffic_monitor.wicket.models;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
import org.apache.wicket.model.Model;
public class CacheDataModel extends Model<String> {
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/models/CacheStateModel.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/models/CacheStateModel.java b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/models/CacheStateModel.java
index 8cb34e5..20287f2 100644
--- a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/models/CacheStateModel.java
+++ b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/models/CacheStateModel.java
@@ -1,5 +1,25 @@
package com.comcast.cdn.traffic_control.traffic_monitor.wicket.models;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
import com.comcast.cdn.traffic_control.traffic_monitor.health.CacheStateRegistry;
public class CacheStateModel extends StateModel {
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/models/DsStateModel.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/models/DsStateModel.java b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/models/DsStateModel.java
index e8b5f65..bc5ffde 100644
--- a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/models/DsStateModel.java
+++ b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/models/DsStateModel.java
@@ -1,5 +1,25 @@
package com.comcast.cdn.traffic_control.traffic_monitor.wicket.models;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
import com.comcast.cdn.traffic_control.traffic_monitor.health.DeliveryServiceStateRegistry;
public class DsStateModel extends StateModel {
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/models/StateModel.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/models/StateModel.java b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/models/StateModel.java
index 3c6ebe7..2096bee 100644
--- a/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/models/StateModel.java
+++ b/traffic_monitor/src/main/java/com/comcast/cdn/traffic_control/traffic_monitor/wicket/models/StateModel.java
@@ -1,5 +1,25 @@
package com.comcast.cdn.traffic_control.traffic_monitor.wicket.models;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
import com.comcast.cdn.traffic_control.traffic_monitor.health.AbstractState;
import org.apache.wicket.model.Model;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/opt/tomcat/conf/server.xml
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/opt/tomcat/conf/server.xml b/traffic_monitor/src/main/opt/tomcat/conf/server.xml
index 3cdc7f2..a342763 100644
--- a/traffic_monitor/src/main/opt/tomcat/conf/server.xml
+++ b/traffic_monitor/src/main/opt/tomcat/conf/server.xml
@@ -1,6 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/resources/log4j.properties b/traffic_monitor/src/main/resources/log4j.properties
index f3cfc8c..0f83890 100644
--- a/traffic_monitor/src/main/resources/log4j.properties
+++ b/traffic_monitor/src/main/resources/log4j.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
+
log4j.appender.Stdout=org.apache.log4j.ConsoleAppender
log4j.appender.Stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.Stdout.layout.conversionPattern=%-5p - %-26.26c{1} - %m\n
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/scripts/postinstall.sh
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/scripts/postinstall.sh b/traffic_monitor/src/main/scripts/postinstall.sh
index 7ce73c9..ebab902 100644
--- a/traffic_monitor/src/main/scripts/postinstall.sh
+++ b/traffic_monitor/src/main/scripts/postinstall.sh
@@ -1,6 +1,5 @@
#
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/scripts/postremove.sh
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/scripts/postremove.sh b/traffic_monitor/src/main/scripts/postremove.sh
index d522932..713e722 100644
--- a/traffic_monitor/src/main/scripts/postremove.sh
+++ b/traffic_monitor/src/main/scripts/postremove.sh
@@ -1,5 +1,21 @@
#!/usr/bin/env bash
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
# Get rid of exploded war file directory, but leave everything else untouched because this runs after the install
# steps during an upgrade (http://www.ibm.com/developerworks/library/l-rpm2/)
-rm -rf /opt/traffic_monitor/webapps/ROOT
\ No newline at end of file
+rm -rf /opt/traffic_monitor/webapps/ROOT
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/scripts/preinstall.sh
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/scripts/preinstall.sh b/traffic_monitor/src/main/scripts/preinstall.sh
index 39d8b82..de01cbf 100644
--- a/traffic_monitor/src/main/scripts/preinstall.sh
+++ b/traffic_monitor/src/main/scripts/preinstall.sh
@@ -1,6 +1,5 @@
#!/bin/bash#
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/scripts/preremove.sh
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/scripts/preremove.sh b/traffic_monitor/src/main/scripts/preremove.sh
index e0b7505..8039254 100644
--- a/traffic_monitor/src/main/scripts/preremove.sh
+++ b/traffic_monitor/src/main/scripts/preremove.sh
@@ -1,6 +1,5 @@
#
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/webapp/WEB-INF/web.xml b/traffic_monitor/src/main/webapp/WEB-INF/web.xml
index dbdb174..79a83f2 100644
--- a/traffic_monitor/src/main/webapp/WEB-INF/web.xml
+++ b/traffic_monitor/src/main/webapp/WEB-INF/web.xml
@@ -1,4 +1,24 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
version="2.5">
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/webapp/js/main.js
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/webapp/js/main.js b/traffic_monitor/src/main/webapp/js/main.js
index bc48fd3..1cd66fe 100644
--- a/traffic_monitor/src/main/webapp/js/main.js
+++ b/traffic_monitor/src/main/webapp/js/main.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
function updateAjaxComponents(arg) {
for ( var key in arg) {
if (arg.hasOwnProperty(key)) {
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/webapp/style.css
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/webapp/style.css b/traffic_monitor/src/main/webapp/style.css
index 978e037..38958ef 100644
--- a/traffic_monitor/src/main/webapp/style.css
+++ b/traffic_monitor/src/main/webapp/style.css
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
@CHARSET "ISO-8859-1";
body {
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/main/webapp/test.html
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/webapp/test.html b/traffic_monitor/src/main/webapp/test.html
index 57975c9..a6d4f9c 100644
--- a/traffic_monitor/src/main/webapp/test.html
+++ b/traffic_monitor/src/main/webapp/test.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<html>
<head>
@@ -73,4 +92,4 @@ function worker() {
</div>
</div>
</body>
-</html>
\ No newline at end of file
+</html>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/test/java/application/MonitorApplicationTest.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/test/java/application/MonitorApplicationTest.java b/traffic_monitor/src/test/java/application/MonitorApplicationTest.java
index 3b9e551..1dc467f 100644
--- a/traffic_monitor/src/test/java/application/MonitorApplicationTest.java
+++ b/traffic_monitor/src/test/java/application/MonitorApplicationTest.java
@@ -1,5 +1,25 @@
package application;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
import com.comcast.cdn.traffic_control.traffic_monitor.MonitorApplication;
import com.comcast.cdn.traffic_control.traffic_monitor.config.ConfigHandler;
import org.junit.Before;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/test/java/com/comcast/cdn/traffic_control/traffic_monitor/Start.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/test/java/com/comcast/cdn/traffic_control/traffic_monitor/Start.java b/traffic_monitor/src/test/java/com/comcast/cdn/traffic_control/traffic_monitor/Start.java
index 98d0e68..67c8f74 100644
--- a/traffic_monitor/src/test/java/com/comcast/cdn/traffic_control/traffic_monitor/Start.java
+++ b/traffic_monitor/src/test/java/com/comcast/cdn/traffic_control/traffic_monitor/Start.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/test/java/com/comcast/cdn/traffic_control/traffic_monitor/TestHomePage.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/test/java/com/comcast/cdn/traffic_control/traffic_monitor/TestHomePage.java b/traffic_monitor/src/test/java/com/comcast/cdn/traffic_control/traffic_monitor/TestHomePage.java
index 30fef7d..eacf331 100644
--- a/traffic_monitor/src/test/java/com/comcast/cdn/traffic_control/traffic_monitor/TestHomePage.java
+++ b/traffic_monitor/src/test/java/com/comcast/cdn/traffic_control/traffic_monitor/TestHomePage.java
@@ -1,5 +1,4 @@
/*
- * Copyright 2015 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/test/java/config/CacheTest.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/test/java/config/CacheTest.java b/traffic_monitor/src/test/java/config/CacheTest.java
index 8c9ca24..7f1ffc9 100644
--- a/traffic_monitor/src/test/java/config/CacheTest.java
+++ b/traffic_monitor/src/test/java/config/CacheTest.java
@@ -1,5 +1,25 @@
package config;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
import com.comcast.cdn.traffic_control.traffic_monitor.config.Cache;
import com.comcast.cdn.traffic_control.traffic_monitor.health.CacheState;
import com.comcast.cdn.traffic_control.traffic_monitor.health.HealthDeterminer;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/test/java/config/ConfigHandlerTest.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/test/java/config/ConfigHandlerTest.java b/traffic_monitor/src/test/java/config/ConfigHandlerTest.java
index c6b7bc5..4b56b3d 100644
--- a/traffic_monitor/src/test/java/config/ConfigHandlerTest.java
+++ b/traffic_monitor/src/test/java/config/ConfigHandlerTest.java
@@ -1,5 +1,25 @@
package config;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
import com.comcast.cdn.traffic_control.traffic_monitor.config.ConfigHandler;
import org.apache.commons.io.IOUtils;
import org.junit.Before;
@@ -79,4 +99,4 @@ public class ConfigHandlerTest {
public void itReturnsCorrectPathToDbFile() {
assertThat(configHandler.getDbFile("health-config.json").toString(), equalTo("/opt/traffic_monitor/db/health-config.json"));
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/test/java/config/ConfigTest.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/test/java/config/ConfigTest.java b/traffic_monitor/src/test/java/config/ConfigTest.java
index bc8472a..68e66b2 100644
--- a/traffic_monitor/src/test/java/config/ConfigTest.java
+++ b/traffic_monitor/src/test/java/config/ConfigTest.java
@@ -1,5 +1,25 @@
package config;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
import com.comcast.cdn.traffic_control.traffic_monitor.config.Config;
import org.apache.wicket.ajax.json.JSONException;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/test/java/config/MonitorConfigTest.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/test/java/config/MonitorConfigTest.java b/traffic_monitor/src/test/java/config/MonitorConfigTest.java
index eab5540..0149862 100644
--- a/traffic_monitor/src/test/java/config/MonitorConfigTest.java
+++ b/traffic_monitor/src/test/java/config/MonitorConfigTest.java
@@ -1,5 +1,25 @@
package config;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
import com.comcast.cdn.traffic_control.traffic_monitor.config.MonitorConfig;
import org.apache.wicket.ajax.json.JSONObject;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/test/java/config/RouterConfigTest.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/test/java/config/RouterConfigTest.java b/traffic_monitor/src/test/java/config/RouterConfigTest.java
index 0c6dad0..0031750 100644
--- a/traffic_monitor/src/test/java/config/RouterConfigTest.java
+++ b/traffic_monitor/src/test/java/config/RouterConfigTest.java
@@ -1,5 +1,25 @@
package config;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
import com.comcast.cdn.traffic_control.traffic_monitor.config.Cache;
import com.comcast.cdn.traffic_control.traffic_monitor.config.Peer;
import com.comcast.cdn.traffic_control.traffic_monitor.config.RouterConfig;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/test/java/data/DataPointTest.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/test/java/data/DataPointTest.java b/traffic_monitor/src/test/java/data/DataPointTest.java
index c51f365..05588bb 100644
--- a/traffic_monitor/src/test/java/data/DataPointTest.java
+++ b/traffic_monitor/src/test/java/data/DataPointTest.java
@@ -1,5 +1,25 @@
package data;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
import com.comcast.cdn.traffic_control.traffic_monitor.data.DataPoint;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/test/java/data/StatisticsLogTest.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/test/java/data/StatisticsLogTest.java b/traffic_monitor/src/test/java/data/StatisticsLogTest.java
index 968e560..835dd5d 100644
--- a/traffic_monitor/src/test/java/data/StatisticsLogTest.java
+++ b/traffic_monitor/src/test/java/data/StatisticsLogTest.java
@@ -1,5 +1,25 @@
package data;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
import com.comcast.cdn.traffic_control.traffic_monitor.data.DataPoint;
import com.comcast.cdn.traffic_control.traffic_monitor.data.StatisticsLog;
import com.comcast.cdn.traffic_control.traffic_monitor.health.DeliveryServiceStateRegistry;
@@ -302,4 +322,4 @@ class TimeGetter implements Runnable {
e.printStackTrace();
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/test/java/health/CacheStateUpdaterTest.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/test/java/health/CacheStateUpdaterTest.java b/traffic_monitor/src/test/java/health/CacheStateUpdaterTest.java
index 9316cf5..f0dd1be 100644
--- a/traffic_monitor/src/test/java/health/CacheStateUpdaterTest.java
+++ b/traffic_monitor/src/test/java/health/CacheStateUpdaterTest.java
@@ -1,5 +1,25 @@
package health;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
import com.comcast.cdn.traffic_control.traffic_monitor.config.Cache;
import com.comcast.cdn.traffic_control.traffic_monitor.health.CacheState;
import com.comcast.cdn.traffic_control.traffic_monitor.health.CacheStateUpdater;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/test/java/health/CacheStatisticsClientTest.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/test/java/health/CacheStatisticsClientTest.java b/traffic_monitor/src/test/java/health/CacheStatisticsClientTest.java
index caaf24b..53958e9 100644
--- a/traffic_monitor/src/test/java/health/CacheStatisticsClientTest.java
+++ b/traffic_monitor/src/test/java/health/CacheStatisticsClientTest.java
@@ -1,5 +1,25 @@
package health;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
import com.comcast.cdn.traffic_control.traffic_monitor.config.Cache;
import com.comcast.cdn.traffic_control.traffic_monitor.health.CacheStateUpdater;
import com.comcast.cdn.traffic_control.traffic_monitor.health.CacheStatisticsClient;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/test/java/health/DeletemeTest.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/test/java/health/DeletemeTest.java b/traffic_monitor/src/test/java/health/DeletemeTest.java
index 46bc636..eb51c35 100644
--- a/traffic_monitor/src/test/java/health/DeletemeTest.java
+++ b/traffic_monitor/src/test/java/health/DeletemeTest.java
@@ -1,4 +1,24 @@
package health;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
public class DeletemeTest {
}
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/test/java/health/HealthDeterminerTest.java
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/test/java/health/HealthDeterminerTest.java b/traffic_monitor/src/test/java/health/HealthDeterminerTest.java
index ee1d58d..be0e094 100644
--- a/traffic_monitor/src/test/java/health/HealthDeterminerTest.java
+++ b/traffic_monitor/src/test/java/health/HealthDeterminerTest.java
@@ -1,5 +1,25 @@
package health;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
import com.comcast.cdn.traffic_control.traffic_monitor.config.Cache;
import com.comcast.cdn.traffic_control.traffic_monitor.health.HealthDeterminer;
import org.apache.wicket.ajax.json.JSONObject;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_monitor/src/test/resources/var/health-params.js
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/test/resources/var/health-params.js b/traffic_monitor/src/test/resources/var/health-params.js
index 30617ed..cc34841 100644
--- a/traffic_monitor/src/test/resources/var/health-params.js
+++ b/traffic_monitor/src/test/resources/var/health-params.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
{
"deliveryServices": {
"omg-08": {
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/bin/checks/ToCDUCheck.pl
----------------------------------------------------------------------
diff --git a/traffic_ops/app/bin/checks/ToCDUCheck.pl b/traffic_ops/app/bin/checks/ToCDUCheck.pl
index ab3631b..95b6aa5 100755
--- a/traffic_ops/app/bin/checks/ToCDUCheck.pl
+++ b/traffic_ops/app/bin/checks/ToCDUCheck.pl
@@ -1,6 +1,5 @@
#!/usr/bin/perl
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/bin/checks/ToCHRCheck.pl
----------------------------------------------------------------------
diff --git a/traffic_ops/app/bin/checks/ToCHRCheck.pl b/traffic_ops/app/bin/checks/ToCHRCheck.pl
index a55d2e5..10bf0e6 100755
--- a/traffic_ops/app/bin/checks/ToCHRCheck.pl
+++ b/traffic_ops/app/bin/checks/ToCHRCheck.pl
@@ -1,6 +1,5 @@
#!/usr/bin/perl
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/bin/checks/ToDSCPCheck.pl
----------------------------------------------------------------------
diff --git a/traffic_ops/app/bin/checks/ToDSCPCheck.pl b/traffic_ops/app/bin/checks/ToDSCPCheck.pl
index 459fdf8..0ff2626 100755
--- a/traffic_ops/app/bin/checks/ToDSCPCheck.pl
+++ b/traffic_ops/app/bin/checks/ToDSCPCheck.pl
@@ -1,6 +1,5 @@
#!/usr/bin/perl
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/bin/checks/ToDnssecRefresh.pl
----------------------------------------------------------------------
diff --git a/traffic_ops/app/bin/checks/ToDnssecRefresh.pl b/traffic_ops/app/bin/checks/ToDnssecRefresh.pl
index 01f27ee..fad097d 100755
--- a/traffic_ops/app/bin/checks/ToDnssecRefresh.pl
+++ b/traffic_ops/app/bin/checks/ToDnssecRefresh.pl
@@ -1,6 +1,5 @@
#!/usr/bin/perl
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/bin/checks/ToFQDNCheck.pl
----------------------------------------------------------------------
diff --git a/traffic_ops/app/bin/checks/ToFQDNCheck.pl b/traffic_ops/app/bin/checks/ToFQDNCheck.pl
index a33f2a4..9c1106a8 100644
--- a/traffic_ops/app/bin/checks/ToFQDNCheck.pl
+++ b/traffic_ops/app/bin/checks/ToFQDNCheck.pl
@@ -1,6 +1,5 @@
#!/usr/bin/perl
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/bin/checks/ToMTUCheck.pl
----------------------------------------------------------------------
diff --git a/traffic_ops/app/bin/checks/ToMTUCheck.pl b/traffic_ops/app/bin/checks/ToMTUCheck.pl
index 40767b5..89c92e8 100755
--- a/traffic_ops/app/bin/checks/ToMTUCheck.pl
+++ b/traffic_ops/app/bin/checks/ToMTUCheck.pl
@@ -1,6 +1,5 @@
#!/usr/bin/perl
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/bin/checks/ToORTCheck.pl
----------------------------------------------------------------------
diff --git a/traffic_ops/app/bin/checks/ToORTCheck.pl b/traffic_ops/app/bin/checks/ToORTCheck.pl
index 76150be..deb71bb 100755
--- a/traffic_ops/app/bin/checks/ToORTCheck.pl
+++ b/traffic_ops/app/bin/checks/ToORTCheck.pl
@@ -1,6 +1,5 @@
#!/usr/bin/perl
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/bin/checks/ToPingCheck.pl
----------------------------------------------------------------------
diff --git a/traffic_ops/app/bin/checks/ToPingCheck.pl b/traffic_ops/app/bin/checks/ToPingCheck.pl
index 752c839..b03a19b 100755
--- a/traffic_ops/app/bin/checks/ToPingCheck.pl
+++ b/traffic_ops/app/bin/checks/ToPingCheck.pl
@@ -1,6 +1,5 @@
#!/usr/bin/perl
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/bin/checks/ToRTRCheck.pl
----------------------------------------------------------------------
diff --git a/traffic_ops/app/bin/checks/ToRTRCheck.pl b/traffic_ops/app/bin/checks/ToRTRCheck.pl
index 42475c0..6e43ba1 100755
--- a/traffic_ops/app/bin/checks/ToRTRCheck.pl
+++ b/traffic_ops/app/bin/checks/ToRTRCheck.pl
@@ -1,6 +1,5 @@
#!/usr/bin/perl
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/bin/db/setup_kabletown.pl
----------------------------------------------------------------------
diff --git a/traffic_ops/app/bin/db/setup_kabletown.pl b/traffic_ops/app/bin/db/setup_kabletown.pl
index 882551b..f8f6c72 100755
--- a/traffic_ops/app/bin/db/setup_kabletown.pl
+++ b/traffic_ops/app/bin/db/setup_kabletown.pl
@@ -2,7 +2,6 @@
package main;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/bin/extensions
----------------------------------------------------------------------
diff --git a/traffic_ops/app/bin/extensions b/traffic_ops/app/bin/extensions
index 95f9693..b3d53ae 100755
--- a/traffic_ops/app/bin/extensions
+++ b/traffic_ops/app/bin/extensions
@@ -1,6 +1,5 @@
#!/usr/bin/perl
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/bin/routes.pl
----------------------------------------------------------------------
diff --git a/traffic_ops/app/bin/routes.pl b/traffic_ops/app/bin/routes.pl
index 55ac76d..efd2904 100755
--- a/traffic_ops/app/bin/routes.pl
+++ b/traffic_ops/app/bin/routes.pl
@@ -1,6 +1,5 @@
#!/usr/bin/env perl
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/bin/start.pl
----------------------------------------------------------------------
diff --git a/traffic_ops/app/bin/start.pl b/traffic_ops/app/bin/start.pl
index 0596b9a..cdd800a 100755
--- a/traffic_ops/app/bin/start.pl
+++ b/traffic_ops/app/bin/start.pl
@@ -2,7 +2,6 @@
#
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/bin/tests/run_integration_tests.sh
----------------------------------------------------------------------
diff --git a/traffic_ops/app/bin/tests/run_integration_tests.sh b/traffic_ops/app/bin/tests/run_integration_tests.sh
index e10a36b..6f4b878 100755
--- a/traffic_ops/app/bin/tests/run_integration_tests.sh
+++ b/traffic_ops/app/bin/tests/run_integration_tests.sh
@@ -1,6 +1,5 @@
#!/bin/bash
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/bin/tests/run_unit_tests.sh
----------------------------------------------------------------------
diff --git a/traffic_ops/app/bin/tests/run_unit_tests.sh b/traffic_ops/app/bin/tests/run_unit_tests.sh
index 49caded..6ff1c0f 100755
--- a/traffic_ops/app/bin/tests/run_unit_tests.sh
+++ b/traffic_ops/app/bin/tests/run_unit_tests.sh
@@ -1,6 +1,5 @@
#!/bin/bash
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/conf/misc/riak_search/sslkeys.xml
----------------------------------------------------------------------
diff --git a/traffic_ops/app/conf/misc/riak_search/sslkeys.xml b/traffic_ops/app/conf/misc/riak_search/sslkeys.xml
index 90eae37..245b8bc 100644
--- a/traffic_ops/app/conf/misc/riak_search/sslkeys.xml
+++ b/traffic_ops/app/conf/misc/riak_search/sslkeys.xml
@@ -1,4 +1,24 @@
<?xml version="1.0" encoding="UTF-8" ?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<schema name="schedule" version="1.5">
<fields>
<field name="cdn" type="string" indexed="true" stored="true" />
@@ -32,4 +52,4 @@
<!-- Used for the catch all field -->
<fieldtype name="ignored" stored="false" indexed="false" multiValued="true" class="solr.StrField" />
</types>
-</schema>
\ No newline at end of file
+</schema>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/cpanfile
----------------------------------------------------------------------
diff --git a/traffic_ops/app/cpanfile b/traffic_ops/app/cpanfile
index 5bd1e0a..a57ea0e 100644
--- a/traffic_ops/app/cpanfile
+++ b/traffic_ops/app/cpanfile
@@ -1,5 +1,4 @@
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/db/admin.pl
----------------------------------------------------------------------
diff --git a/traffic_ops/app/db/admin.pl b/traffic_ops/app/db/admin.pl
index 968c089..324044e 100755
--- a/traffic_ops/app/db/admin.pl
+++ b/traffic_ops/app/db/admin.pl
@@ -1,6 +1,5 @@
#!/usr/bin/env perl
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/db/dbconf.yml
----------------------------------------------------------------------
diff --git a/traffic_ops/app/db/dbconf.yml b/traffic_ops/app/db/dbconf.yml
index 99ded75..ed624e7 100755
--- a/traffic_ops/app/db/dbconf.yml
+++ b/traffic_ops/app/db/dbconf.yml
@@ -1,6 +1,5 @@
#!/usr/bin/env perl
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/db/migration_readme.txt
----------------------------------------------------------------------
diff --git a/traffic_ops/app/db/migration_readme.txt b/traffic_ops/app/db/migration_readme.txt
index febe4fe..7318d33 100644
--- a/traffic_ops/app/db/migration_readme.txt
+++ b/traffic_ops/app/db/migration_readme.txt
@@ -1,5 +1,4 @@
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/db/reset.sh
----------------------------------------------------------------------
diff --git a/traffic_ops/app/db/reset.sh b/traffic_ops/app/db/reset.sh
index 2c40dd1..751fad7 100644
--- a/traffic_ops/app/db/reset.sh
+++ b/traffic_ops/app/db/reset.sh
@@ -1,6 +1,5 @@
mysql twelve_monkeys_test -utwelve_monkeys -ptwelve -e 'drop database twelve_monkeys_test; create database twelve_monkeys_test;';
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/db/seeds.sql
----------------------------------------------------------------------
diff --git a/traffic_ops/app/db/seeds.sql b/traffic_ops/app/db/seeds.sql
index 1ba2700..f76a63a 100644
--- a/traffic_ops/app/db/seeds.sql
+++ b/traffic_ops/app/db/seeds.sql
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -159,6 +158,21 @@ insert into parameter (name, config_file, value) select * from (select 'DsStats'
insert into parameter (name, config_file, value) select * from (select 'DsStats', 'traffic_stats.config', 'tps_total') as temp where not exists (select name from parameter where name = 'DsStats' and config_file = 'traffic_stats.config' and value = 'tps_total') limit 1 ON CONFLICT DO NOTHING;
+insert into parameter (name, config_file, value) select * from (select 'CacheStats', 'traffic_stats.config', 'bandwidth') as temp where not exists (select name from parameter where name = 'CacheStats' and config_file = 'traffic_stats.config' and value = 'bandwidth') limit 1;
+insert into parameter (name, config_file, value) select * from (select 'CacheStats', 'traffic_stats.config', 'maxKbps') as temp where not exists (select name from parameter where name = 'CacheStats' and config_file = 'traffic_stats.config' and value = 'maxKbps') limit 1;
+insert into parameter (name, config_file, value) select * from (select 'CacheStats', 'traffic_stats.config', 'ats.proxy.process.http.current_client_connections') as temp where not exists (select name from parameter where name = 'CacheStats' and config_file = 'traffic_stats.config' and value = 'ats.proxy.process.http.current_client_connections') limit 1;
+insert into parameter (name, config_file, value) select * from (select 'CacheStats', 'traffic_stats.config', 'ats.proxy.process.cache.volume_1.wrap_count') as temp where not exists (select name from parameter where name = 'CacheStats' and config_file = 'traffic_stats.config' and value = 'ats.proxy.process.cache.volume_1.wrap_count') limit 1;
+insert into parameter (name, config_file, value) select * from (select 'CacheStats', 'traffic_stats.config', 'ats.proxy.process.cache.volume_2.wrap_count') as temp where not exists (select name from parameter where name = 'CacheStats' and config_file = 'traffic_stats.config' and value = 'ats.proxy.process.cache.volume_2.wrap_count') limit 1;
+insert into parameter (name, config_file, value) select * from (select 'DsStats', 'traffic_stats.config', 'kbps') as temp where not exists (select name from parameter where name = 'DsStats' and config_file = 'traffic_stats.config' and value = 'kbps') limit 1;
+insert into parameter (name, config_file, value) select * from (select 'DsStats', 'traffic_stats.config', 'tps_2xx') as temp where not exists (select name from parameter where name = 'DsStats' and config_file = 'traffic_stats.config' and value = 'tps_2xx') limit 1;
+insert into parameter (name, config_file, value) select * from (select 'DsStats', 'traffic_stats.config', 'status_4xx') as temp where not exists (select name from parameter where name = 'DsStats' and config_file = 'traffic_stats.config' and value = 'status_4xx') limit 1;
+insert into parameter (name, config_file, value) select * from (select 'DsStats', 'traffic_stats.config', 'status_5xx') as temp where not exists (select name from parameter where name = 'DsStats' and config_file = 'traffic_stats.config' and value = 'status_5xx') limit 1;
+insert into parameter (name, config_file, value) select * from (select 'DsStats', 'traffic_stats.config', 'tps_3xx') as temp where not exists (select name from parameter where name = 'DsStats' and config_file = 'traffic_stats.config' and value = 'tps_3xx') limit 1;
+insert into parameter (name, config_file, value) select * from (select 'DsStats', 'traffic_stats.config', 'tps_4xx') as temp where not exists (select name from parameter where name = 'DsStats' and config_file = 'traffic_stats.config' and value = 'tps_4xx') limit 1;
+insert into parameter (name, config_file, value) select * from (select 'DsStats', 'traffic_stats.config', 'tps_5xx') as temp where not exists (select name from parameter where name = 'DsStats' and config_file = 'traffic_stats.config' and value = 'tps_5xx') limit 1;
+insert into parameter (name, config_file, value) select * from (select 'DsStats', 'traffic_stats.config', 'tps_total') as temp where not exists (select name from parameter where name = 'DsStats' and config_file = 'traffic_stats.config' and value = 'tps_total') limit 1;
+
+
insert into profile_parameter (profile, parameter) values (
(select id from profile where name = 'TRAFFIC_STATS'),
(select id from parameter where name = 'CacheStats' and config_file = 'traffic_stats.config' and value = 'bandwidth')
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/db/setup_migrations.sql
----------------------------------------------------------------------
diff --git a/traffic_ops/app/db/setup_migrations.sql b/traffic_ops/app/db/setup_migrations.sql
index fabfb9b..84ff88d 100644
--- a/traffic_ops/app/db/setup_migrations.sql
+++ b/traffic_ops/app/db/setup_migrations.sql
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/API/ApiDocs.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/API/ApiDocs.pm b/traffic_ops/app/lib/API/ApiDocs.pm
index bd54fab..927c29a 100644
--- a/traffic_ops/app/lib/API/ApiDocs.pm
+++ b/traffic_ops/app/lib/API/ApiDocs.pm
@@ -1,6 +1,5 @@
package API::ApiDocs;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/API/Asn.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/API/Asn.pm b/traffic_ops/app/lib/API/Asn.pm
index 2ec4b53..080099a 100644
--- a/traffic_ops/app/lib/API/Asn.pm
+++ b/traffic_ops/app/lib/API/Asn.pm
@@ -1,6 +1,5 @@
package API::Asn;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/API/Cachegroup.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/API/Cachegroup.pm b/traffic_ops/app/lib/API/Cachegroup.pm
index b8a5752..7066b6c 100644
--- a/traffic_ops/app/lib/API/Cachegroup.pm
+++ b/traffic_ops/app/lib/API/Cachegroup.pm
@@ -1,6 +1,5 @@
package API::Cachegroup;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -300,7 +299,7 @@ sub delete {
if ( defined($parent_cgs) ) {
return $self->alert("This cachegroup is currently used as a parent cachegroup.");
}
-
+
my $secondary_parent_cgs = $self->db->resultset('Cachegroup')->find( { secondary_parent_cachegroup_id => $cg->id } );
if ( defined($secondary_parent_cgs) ) {
return $self->alert("This cachegroup is currently used as a secondary parent cachegroup.");
@@ -310,7 +309,7 @@ sub delete {
if ( defined($asns) ) {
return $self->alert("This cachegroup is currently used by one or more ASNs.");
}
-
+
my $rs = $cg->delete();
if ($rs) {
return $self->success_message("Cachegroup deleted.");
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/API/Cachegroup2.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/API/Cachegroup2.pm b/traffic_ops/app/lib/API/Cachegroup2.pm
index a1184fb..fa6b1ab 100644
--- a/traffic_ops/app/lib/API/Cachegroup2.pm
+++ b/traffic_ops/app/lib/API/Cachegroup2.pm
@@ -1,6 +1,5 @@
package API::Cachegroup2;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/API/CachegroupParameter.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/API/CachegroupParameter.pm b/traffic_ops/app/lib/API/CachegroupParameter.pm
index 3cf3c84..8111309 100644
--- a/traffic_ops/app/lib/API/CachegroupParameter.pm
+++ b/traffic_ops/app/lib/API/CachegroupParameter.pm
@@ -1,6 +1,5 @@
package API::CachegroupParameter;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/API/Cdn.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/API/Cdn.pm b/traffic_ops/app/lib/API/Cdn.pm
index 320ac43..e8cfd8c 100644
--- a/traffic_ops/app/lib/API/Cdn.pm
+++ b/traffic_ops/app/lib/API/Cdn.pm
@@ -1,7 +1,6 @@
package API::Cdn;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -109,7 +108,7 @@ sub create {
my $value = { name => $params->{name}, };
if ( defined( $params->{dnssecEnabled} ) ) {
- $value->{dnssec_enabled} = $params->{dnssecEnabled};
+ $value->{dnssec_enabled} = lc( $params->{dnssecEnabled} ) ne 'false' ? 1 : 0;
}
my $insert = $self->db->resultset('Cdn')->create($value);
@@ -120,7 +119,7 @@ sub create {
my $response;
$response->{id} = $rs->id;
$response->{name} = $rs->name;
- $response->{dnssecEnabled} = $rs->dnssec_enabled;
+ $response->{dnssecEnabled} = \$rs->dnssec_enabled;
&log( $self, "Created CDN with id: " . $rs->id . " and name: " . $rs->name, "APICHANGE" );
return $self->success( $response, "cdn was created." );
}
@@ -157,7 +156,7 @@ sub update {
my $value = { name => $params->{name}, };
if ( defined( $params->{dnssecEnabled} ) ) {
- $value->{dnssec_enabled} = $params->{dnssecEnabled};
+ $value->{dnssec_enabled} = lc( $params->{dnssecEnabled} ) ne 'false' ? 1 : 0;
}
my $rs = $cdn->update($value);
@@ -165,7 +164,7 @@ sub update {
my $response;
$response->{id} = $rs->id;
$response->{name} = $rs->name;
- $response->{dnssecEnabled} = $rs->dnssec_enabled;
+ $response->{dnssecEnabled} = \$rs->dnssec_enabled;
&log( $self, "Updated CDN name '" . $rs->name . "' for id: " . $rs->id, "APICHANGE" );
return $self->success( $response, "CDN update was successful." );
}
@@ -203,6 +202,37 @@ sub delete {
return $self->success_message("cdn was deleted.");
}
+sub delete_by_name {
+ my $self = shift;
+ my $cdn_name = $self->param('name');
+
+ if ( !&is_oper($self) ) {
+ return $self->forbidden();
+ }
+
+ my $cdn = $self->db->resultset('Cdn')->find( { name => $cdn_name } );
+ if ( !defined($cdn) ) {
+ return $self->not_found();
+ }
+ my $id = $cdn->id;
+
+ my $rs = $self->db->resultset('Server')->search( { cdn_id => $id } );
+ if ( $rs->count() > 0 ) {
+ $self->app->log->error("Failed to delete cdn id = $id has servers");
+ return $self->alert("Failed to delete cdn id = $id has servers");
+ }
+
+ $rs = $self->db->resultset('Deliveryservice')->search( { cdn_id => $id } );
+ if ( $rs->count() > 0 ) {
+ $self->app->log->error("Failed to delete cdn id = $id has delivery services");
+ return $self->alert("Failed to delete cdn id = $id has delivery services");
+ }
+
+ $cdn->delete();
+ &log( $self, "Delete cdn " . $cdn_name, "APICHANGE" );
+ return $self->success_message("cdn was deleted.");
+}
+
sub configs_monitoring {
my $self = shift;
my $cdn_name = $self->param('name');
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/API/ChangeLog.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/API/ChangeLog.pm b/traffic_ops/app/lib/API/ChangeLog.pm
index 770bbbb..c5816b7 100644
--- a/traffic_ops/app/lib/API/ChangeLog.pm
+++ b/traffic_ops/app/lib/API/ChangeLog.pm
@@ -1,6 +1,5 @@
package API::ChangeLog;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/API/DeliveryService/KeysUrlSig.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/API/DeliveryService/KeysUrlSig.pm b/traffic_ops/app/lib/API/DeliveryService/KeysUrlSig.pm
index cd6d983..d7e7197 100644
--- a/traffic_ops/app/lib/API/DeliveryService/KeysUrlSig.pm
+++ b/traffic_ops/app/lib/API/DeliveryService/KeysUrlSig.pm
@@ -1,6 +1,5 @@
package API::DeliveryService::KeysUrlSig;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/API/DeliveryService/SslKeys.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/API/DeliveryService/SslKeys.pm b/traffic_ops/app/lib/API/DeliveryService/SslKeys.pm
index a09b816..e7cf456 100644
--- a/traffic_ops/app/lib/API/DeliveryService/SslKeys.pm
+++ b/traffic_ops/app/lib/API/DeliveryService/SslKeys.pm
@@ -1,6 +1,5 @@
package API::DeliveryService::SslKeys;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/API/DeliveryService/Steering.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/API/DeliveryService/Steering.pm b/traffic_ops/app/lib/API/DeliveryService/Steering.pm
index 6f6f350..c8f08f4 100644
--- a/traffic_ops/app/lib/API/DeliveryService/Steering.pm
+++ b/traffic_ops/app/lib/API/DeliveryService/Steering.pm
@@ -1,6 +1,5 @@
package API::DeliveryService::Steering;
#
-# Copyright 2016 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/API/DeliveryServiceMatches.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/API/DeliveryServiceMatches.pm b/traffic_ops/app/lib/API/DeliveryServiceMatches.pm
index 9d1553d..3234667 100644
--- a/traffic_ops/app/lib/API/DeliveryServiceMatches.pm
+++ b/traffic_ops/app/lib/API/DeliveryServiceMatches.pm
@@ -1,6 +1,5 @@
package API::DeliveryServiceMatches;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/API/DeliveryServiceRegexes.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/API/DeliveryServiceRegexes.pm b/traffic_ops/app/lib/API/DeliveryServiceRegexes.pm
index a3ebf60..4688f3a 100644
--- a/traffic_ops/app/lib/API/DeliveryServiceRegexes.pm
+++ b/traffic_ops/app/lib/API/DeliveryServiceRegexes.pm
@@ -1,6 +1,5 @@
package API::DeliveryServiceRegexes;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/API/DeliveryServiceServer.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/API/DeliveryServiceServer.pm b/traffic_ops/app/lib/API/DeliveryServiceServer.pm
index d15d438..0aec9cd 100644
--- a/traffic_ops/app/lib/API/DeliveryServiceServer.pm
+++ b/traffic_ops/app/lib/API/DeliveryServiceServer.pm
@@ -1,6 +1,5 @@
package API::DeliveryServiceServer;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/API/Deliveryservice.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/API/Deliveryservice.pm b/traffic_ops/app/lib/API/Deliveryservice.pm
index 8a69e00..27ee53c 100644
--- a/traffic_ops/app/lib/API/Deliveryservice.pm
+++ b/traffic_ops/app/lib/API/Deliveryservice.pm
@@ -1,6 +1,5 @@
package API::Deliveryservice;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -50,19 +49,6 @@ sub index {
my $rs_data = $self->db->resultset("Deliveryservice")->search( \%criteria, { order_by => 'me.' . $orderby } );
while ( my $row = $rs_data->next ) {
- my $ds_regexes = $row->deliveryservice_regexes;
- my @matchlist = ();
-
- while ( my $ds_regex = $ds_regexes->next ) {
- push(
- @matchlist, {
- type => $ds_regex->regex->type->name,
- pattern => $ds_regex->regex->pattern,
- setNumber => $ds_regex->set_number
- }
- );
- }
-
my $cdn_domain = $self->get_cdn_domain_by_ds_id( $row->id );
my $regexp_set = &UI::DeliveryService::get_regexp_set( $self, $row->id );
my @example_urls = &UI::DeliveryService::get_example_urls( $self, $row->id, $regexp_set, $row, $cdn_domain, $row->protocol );
@@ -99,7 +85,6 @@ sub index {
"longDesc" => $row->long_desc,
"longDesc1" => $row->long_desc_1,
"longDesc2" => $row->long_desc_2,
- "matchList" => \@matchlist,
"maxDnsAnswers" => $row->max_dns_answers,
"midHeaderRewrite" => $row->mid_header_rewrite,
"missLat" => $row->miss_lat,
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/API/Deliveryservice2.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/API/Deliveryservice2.pm b/traffic_ops/app/lib/API/Deliveryservice2.pm
index bd78959..946b415 100644
--- a/traffic_ops/app/lib/API/Deliveryservice2.pm
+++ b/traffic_ops/app/lib/API/Deliveryservice2.pm
@@ -1,6 +1,5 @@
package API::Deliveryservice2;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/API/Division.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/API/Division.pm b/traffic_ops/app/lib/API/Division.pm
index c59e345..492be47 100644
--- a/traffic_ops/app/lib/API/Division.pm
+++ b/traffic_ops/app/lib/API/Division.pm
@@ -1,5 +1,23 @@
package API::Division;
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
+
+
use UI::Utils;
use UI::Division;
use Mojo::Base 'Mojolicious::Controller';
@@ -24,6 +42,25 @@ sub index {
$self->success( \@data );
}
+sub index_by_name {
+ my $self = shift;
+ my $name = $self->param('name');
+
+ my $rs_data = $self->db->resultset("Division")->search( { name => $name } );
+ my @data = ();
+ while ( my $row = $rs_data->next ) {
+ push(
+ @data, {
+ "id" => $row->id,
+ "name" => $row->name,
+ "lastUpdated" => $row->last_updated
+ }
+ );
+ }
+ $self->success( \@data );
+}
+
+
sub show {
my $self = shift;
my $id = $self->param('id');
@@ -142,5 +179,33 @@ sub delete {
}
}
+sub delete_by_name {
+ my $self = shift;
+ my $name = $self->param('name');
+
+ if ( !&is_oper($self) ) {
+ return $self->forbidden();
+ }
+
+ my $division = $self->db->resultset('Division')->find( { name => $name } );
+ if ( !defined($division) ) {
+ return $self->not_found();
+ }
+
+ my $regions = $self->db->resultset('Region')->find( { division => $division->id } );
+ if ( defined($regions) ) {
+ return $self->alert("This division is currently used by regions.");
+ }
+
+
+ my $rs = $division->delete();
+ if ($rs) {
+ return $self->success_message("Division deleted.");
+ } else {
+ return $self->alert( "Division delete failed." );
+ }
+}
+
+
1;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/API/Federation.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/API/Federation.pm b/traffic_ops/app/lib/API/Federation.pm
index fc8cbd1..557de3a 100644
--- a/traffic_ops/app/lib/API/Federation.pm
+++ b/traffic_ops/app/lib/API/Federation.pm
@@ -1,6 +1,5 @@
package API::Federation;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/API/HwInfo.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/API/HwInfo.pm b/traffic_ops/app/lib/API/HwInfo.pm
index c34518a..43495fc 100644
--- a/traffic_ops/app/lib/API/HwInfo.pm
+++ b/traffic_ops/app/lib/API/HwInfo.pm
@@ -1,6 +1,5 @@
package API::HwInfo;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/API/Job.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/API/Job.pm b/traffic_ops/app/lib/API/Job.pm
index e171660..cf2608e 100644
--- a/traffic_ops/app/lib/API/Job.pm
+++ b/traffic_ops/app/lib/API/Job.pm
@@ -1,7 +1,6 @@
package API::Job;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/API/Keys.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/API/Keys.pm b/traffic_ops/app/lib/API/Keys.pm
index c1f5788..967c126 100644
--- a/traffic_ops/app/lib/API/Keys.pm
+++ b/traffic_ops/app/lib/API/Keys.pm
@@ -1,6 +1,5 @@
package API::Keys;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/API/Parameter.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/API/Parameter.pm b/traffic_ops/app/lib/API/Parameter.pm
index 216c09b..218d003 100644
--- a/traffic_ops/app/lib/API/Parameter.pm
+++ b/traffic_ops/app/lib/API/Parameter.pm
@@ -1,6 +1,5 @@
package API::Parameter;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/API/PhysLocation.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/API/PhysLocation.pm b/traffic_ops/app/lib/API/PhysLocation.pm
index ab9dc22..6e2de39 100644
--- a/traffic_ops/app/lib/API/PhysLocation.pm
+++ b/traffic_ops/app/lib/API/PhysLocation.pm
@@ -1,6 +1,5 @@
package API::PhysLocation;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -249,7 +248,7 @@ sub create {
}
}
-sub create_for_reg {
+sub create_for_region {
my $self = shift;
my $region_name = $self->param('region_name');
my $params = $self->req->json;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/API/Profile.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/API/Profile.pm b/traffic_ops/app/lib/API/Profile.pm
index 1dc6cdc..34b4a02 100644
--- a/traffic_ops/app/lib/API/Profile.pm
+++ b/traffic_ops/app/lib/API/Profile.pm
@@ -1,6 +1,5 @@
package API::Profile;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/API/ProfileParameter.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/API/ProfileParameter.pm b/traffic_ops/app/lib/API/ProfileParameter.pm
index 2495c3f..c94c897 100644
--- a/traffic_ops/app/lib/API/ProfileParameter.pm
+++ b/traffic_ops/app/lib/API/ProfileParameter.pm
@@ -1,6 +1,5 @@
package API::ProfileParameter;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/API/Region.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/API/Region.pm b/traffic_ops/app/lib/API/Region.pm
index 77f370a..a871a2b 100644
--- a/traffic_ops/app/lib/API/Region.pm
+++ b/traffic_ops/app/lib/API/Region.pm
@@ -1,6 +1,5 @@
package API::Region;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -44,6 +43,27 @@ sub index {
$self->success( \@data );
}
+sub index_by_name {
+ my $self = shift;
+ my $name = $self->param('name');
+
+ my $rs_data = $self->db->resultset("Region")->search( { 'me.name' => $name }, { prefetch => ['division'] } );
+ my @data = ();
+ while ( my $row = $rs_data->next ) {
+ my $division = { "id" => $row->division->id,
+ "name" => $row->division->name
+ };
+ push(
+ @data, {
+ "id" => $row->id,
+ "name" => $row->name,
+ "division" => $division,
+ }
+ );
+ }
+ $self->success( \@data );
+}
+
sub show {
my $self = shift;
my $id = $self->param('id');
@@ -159,7 +179,7 @@ sub create {
}
-sub create_for_div {
+sub create_for_division {
my $self = shift;
my $division_name = $self->param('division_name');
my $params = $self->req->json;
@@ -221,5 +241,26 @@ sub delete {
}
}
+sub delete_by_name {
+ my $self = shift;
+ my $name = $self->param('name');
+
+ if ( !&is_oper($self) ) {
+ return $self->forbidden();
+ }
+
+ my $region = $self->db->resultset('Region')->find( { name => $name } );
+ if ( !defined($region) ) {
+ return $self->not_found();
+ }
+
+ my $rs = $region->delete();
+ if ($rs) {
+ return $self->success_message("Region deleted.");
+ } else {
+ return $self->alert( "Region delete failed." );
+ }
+}
+
1;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/API/Riak.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/API/Riak.pm b/traffic_ops/app/lib/API/Riak.pm
index 5ae55fd..cfa1c4a 100644
--- a/traffic_ops/app/lib/API/Riak.pm
+++ b/traffic_ops/app/lib/API/Riak.pm
@@ -1,6 +1,5 @@
package API::Riak;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/API/Role.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/API/Role.pm b/traffic_ops/app/lib/API/Role.pm
index c76880f..9cd0c5b 100644
--- a/traffic_ops/app/lib/API/Role.pm
+++ b/traffic_ops/app/lib/API/Role.pm
@@ -1,6 +1,5 @@
package API::Role;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/API/Server.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/API/Server.pm b/traffic_ops/app/lib/API/Server.pm
index c9b762c..c7c7cab 100644
--- a/traffic_ops/app/lib/API/Server.pm
+++ b/traffic_ops/app/lib/API/Server.pm
@@ -1,6 +1,5 @@
package API::Server;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/API/Server2.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/API/Server2.pm b/traffic_ops/app/lib/API/Server2.pm
index b706e59..b13fba5 100644
--- a/traffic_ops/app/lib/API/Server2.pm
+++ b/traffic_ops/app/lib/API/Server2.pm
@@ -1,6 +1,5 @@
package API::Server2;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/API/ServerCheck.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/API/ServerCheck.pm b/traffic_ops/app/lib/API/ServerCheck.pm
index 1ac194f..34dd6a7 100644
--- a/traffic_ops/app/lib/API/ServerCheck.pm
+++ b/traffic_ops/app/lib/API/ServerCheck.pm
@@ -1,7 +1,6 @@
package API::ServerCheck;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/API/StaticDnsEntry.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/API/StaticDnsEntry.pm b/traffic_ops/app/lib/API/StaticDnsEntry.pm
index 69d8a4f..938c2b4 100644
--- a/traffic_ops/app/lib/API/StaticDnsEntry.pm
+++ b/traffic_ops/app/lib/API/StaticDnsEntry.pm
@@ -1,6 +1,5 @@
package API::StaticDnsEntry;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/lib/API/StatsSummary.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/API/StatsSummary.pm b/traffic_ops/app/lib/API/StatsSummary.pm
index ddf6e1c..afe2c97 100644
--- a/traffic_ops/app/lib/API/StatsSummary.pm
+++ b/traffic_ops/app/lib/API/StatsSummary.pm
@@ -1,6 +1,5 @@
package API::StatsSummary;
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
[25/26] incubator-trafficcontrol git commit: merge master
Posted by mi...@apache.org.
merge master
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/be5ab888
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/be5ab888
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/be5ab888
Branch: refs/heads/psql
Commit: be5ab888c9de4c143e3d73fe983452ea5e3fb79a
Parents: 9102176
Author: Dan Kirkwood <da...@gmail.com>
Authored: Mon Nov 7 14:50:50 2016 -0700
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Mon Nov 7 14:50:50 2016 -0700
----------------------------------------------------------------------
.rat-excludes | 1 +
CONTRIBUTING.md | 14 +-
DISCLAIMER | 1 +
NOTICE | 13 +-
README.md | 27 +-
VERSION | 2 +-
build/README.md | 24 +
build/build.sh | 1 -
build/docker-build.sh | 94 ---
build/functions.sh | 1 -
docs/source/_static/theme_overrides.css | 19 +
docs/source/admin/index.rst | 1 -
docs/source/admin/quick_howto/dnssec.rst | 1 -
docs/source/admin/quick_howto/federations.rst | 1 -
docs/source/admin/quick_howto/index.rst | 1 -
docs/source/admin/quick_howto/multi_site.rst | 1 -
docs/source/admin/quick_howto/regionalgeo.rst | 1 -
docs/source/admin/quick_howto/steering.rst | 1 -
docs/source/admin/traffic_monitor.rst | 3 +-
docs/source/admin/traffic_ops_config.rst | 5 +-
docs/source/admin/traffic_ops_extensions.rst | 1 -
docs/source/admin/traffic_ops_install.rst | 7 +-
docs/source/admin/traffic_ops_using.rst | 5 +-
docs/source/admin/traffic_portal.rst | 3 +-
docs/source/admin/traffic_router.rst | 1 -
docs/source/admin/traffic_server.rst | 1 -
docs/source/admin/traffic_stats.rst | 5 +-
docs/source/admin/traffic_vault.rst | 5 +-
docs/source/basics/cache_revalidation.rst | 1 -
docs/source/basics/caching_proxies.rst | 1 -
.../source/basics/content_delivery_networks.rst | 1 -
docs/source/basics/http_11.rst | 1 -
docs/source/basics/index.rst | 1 -
docs/source/conf.py | 11 +-
docs/source/development/index.rst | 1 -
docs/source/development/traffic_monitor.rst | 1 -
.../traffic_monitor/traffic_monitor_api.rst | 1 -
docs/source/development/traffic_ops.rst | 3 +-
.../development/traffic_ops_api/routes.rst | 1 -
.../development/traffic_ops_api/v11/asn.rst | 1 -
.../traffic_ops_api/v11/cachegroup.rst | 1 -
.../development/traffic_ops_api/v11/cdn.rst | 1 -
.../traffic_ops_api/v11/changelog.rst | 1 -
.../traffic_ops_api/v11/deliveryservice.rst | 9 +-
.../development/traffic_ops_api/v11/hwinfo.rst | 1 -
.../traffic_ops_api/v11/parameter.rst | 1 -
.../traffic_ops_api/v11/phys_location.rst | 1 -
.../development/traffic_ops_api/v11/profile.rst | 1 -
.../development/traffic_ops_api/v11/region.rst | 1 -
.../development/traffic_ops_api/v11/role.rst | 1 -
.../development/traffic_ops_api/v11/server.rst | 1 -
.../traffic_ops_api/v11/static_dns.rst | 1 -
.../development/traffic_ops_api/v11/status.rst | 1 -
.../development/traffic_ops_api/v11/system.rst | 1 -
.../traffic_ops_api/v11/to_extension.rst | 1 -
.../development/traffic_ops_api/v11/type.rst | 1 -
.../development/traffic_ops_api/v11/user.rst | 1 -
.../development/traffic_ops_api/v12/asn.rst | 1 -
.../traffic_ops_api/v12/cache_stats.rst | 1 -
.../traffic_ops_api/v12/cachegroup.rst | 1 -
.../development/traffic_ops_api/v12/cdn.rst | 1 -
.../traffic_ops_api/v12/changelog.rst | 1 -
.../traffic_ops_api/v12/deliveryservice.rst | 133 ++--
.../v12/deliveryservice_stats.rst | 3 +-
.../traffic_ops_api/v12/division.rst | 1 -
.../traffic_ops_api/v12/federation.rst | 1 -
.../development/traffic_ops_api/v12/hwinfo.rst | 1 -
.../traffic_ops_api/v12/influxdb.rst | 1 -
.../traffic_ops_api/v12/parameter.rst | 1 -
.../traffic_ops_api/v12/phys_location.rst | 1 -
.../development/traffic_ops_api/v12/profile.rst | 1 -
.../traffic_ops_api/v12/profile_parameter.rst | 1 -
.../development/traffic_ops_api/v12/region.rst | 1 -
.../development/traffic_ops_api/v12/role.rst | 1 -
.../development/traffic_ops_api/v12/server.rst | 1 -
.../traffic_ops_api/v12/static_dns.rst | 1 -
.../development/traffic_ops_api/v12/status.rst | 1 -
.../development/traffic_ops_api/v12/system.rst | 1 -
.../traffic_ops_api/v12/to_extension.rst | 1 -
.../traffic_ops_api/v12/topology.rst | 1 -
.../development/traffic_ops_api/v12/type.rst | 1 -
.../development/traffic_ops_api/v12/user.rst | 1 -
docs/source/development/traffic_portal.rst | 1 -
docs/source/development/traffic_router.rst | 1 -
.../traffic_router/traffic_router_api.rst | 1 -
docs/source/development/traffic_server.rst | 1 -
docs/source/development/traffic_stats.rst | 1 -
docs/source/faq/administration.rst | 1 -
docs/source/faq/development.rst | 3 +-
docs/source/faq/general.rst | 5 +-
docs/source/faq/index.rst | 1 -
docs/source/index.rst | 1 -
docs/source/overview/index.rst | 1 -
docs/source/overview/introduction.rst | 3 +-
docs/source/overview/traffic_monitor.rst | 1 -
docs/source/overview/traffic_ops.rst | 1 -
docs/source/overview/traffic_portal.rst | 1 -
docs/source/overview/traffic_router.rst | 1 -
docs/source/overview/traffic_server.rst | 1 -
docs/source/overview/traffic_stats.rst | 1 -
docs/source/overview/traffic_vault.rst | 1 -
.../docker/build/Dockerfile-traffic_monitor | 18 +-
.../docker/build/Dockerfile-traffic_ops | 18 +-
.../docker/build/Dockerfile-traffic_portal | 18 +-
.../docker/build/Dockerfile-traffic_router | 18 +-
.../docker/build/Dockerfile-traffic_stats | 18 +-
infrastructure/docker/build/README.md | 6 +-
infrastructure/docker/build/docker-compose.yml | 22 +-
infrastructure/docker/build/run-build.sh | 25 +-
.../docker/traffic_monitor/Dockerfile | 16 +
infrastructure/docker/traffic_monitor/run.sh | 16 +
infrastructure/docker/traffic_ops/Dockerfile | 20 +-
infrastructure/docker/traffic_ops/run.sh | 16 +
infrastructure/docker/traffic_router/Dockerfile | 16 +
infrastructure/docker/traffic_router/run.sh | 16 +
.../docker/traffic_server_edge/Dockerfile | 16 +
.../docker/traffic_server_edge/run.sh | 16 +
.../docker/traffic_server_mid/Dockerfile | 16 +
infrastructure/docker/traffic_server_mid/run.sh | 16 +
infrastructure/docker/traffic_stats/Dockerfile | 16 +
infrastructure/docker/traffic_stats/run.sh | 16 +
infrastructure/docker/traffic_vault/Dockerfile | 16 +
infrastructure/docker/traffic_vault/run.sh | 16 +
.../test/api/traffic_ops/traffic_ops_test.go | 20 +
.../test/api/traffic_ops/traffic_ops_tester.go | 20 +
infrastructure/test/apitest/apitest.go | 20 +
infrastructure/test/environment/environment.go | 20 +
.../test/ui/traffic_ops/traffic_ops_test.go | 20 +
misc/changelog.pl | 1 -
misc/kickstart_create_network_line.py | 1 -
misc/kickstart_drive_config.sh | 1 -
misc/release.pl | 7 +-
misc/traffic-control-cdn/css/home.css | 19 +
misc/traffic-control-cdn/downloads/index.html | 41 +-
misc/traffic-control-cdn/index.html | 64 +-
.../traffic_monitor/index.html | 19 +
misc/traffic-control-cdn/traffic_ops/index.html | 19 +
.../traffic_portal/index.html | 19 +
.../traffic_router/index.html | 19 +
.../traffic_stats/index.html | 19 +
test/router/client/client.go | 20 +
test/router/css/loadtest.css | 21 +-
test/router/data/httpresult.go | 20 +
test/router/dnssec/Readme.md | 23 +
test/router/dnssec/dnssec.go | 159 +++++
test/router/dnssec/dnssec_suite_test.go | 56 ++
test/router/dnssec/dnssec_test.go | 129 ++++
test/router/index.html | 21 +-
test/router/load/load.go | 20 +
test/router/server/server.go | 20 +
traffic_monitor/build/build_rpm.sh | 1 -
traffic_monitor/build/pmd/ruleset.xml | 20 +
traffic_monitor/etc/ats_sim.js | 19 +
.../experimental/common/adapter/adapter.go | 20 +
.../experimental/common/crstates/crstates.go | 20 +
.../experimental/common/fetcher/fetcher.go | 30 +-
.../experimental/common/handler/handler.go | 25 +-
.../common/instrumentation/instrumentation.go | 20 +
traffic_monitor/experimental/common/log/log.go | 39 +-
.../experimental/common/poller/poller.go | 119 +++-
.../experimental/traffic_monitor/build.sh | 16 +
.../traffic_monitor/cache/astats.go | 41 +-
.../traffic_monitor/cache/astats_test.go | 22 +-
.../experimental/traffic_monitor/cache/cache.go | 126 ++--
.../traffic_monitor/config/config.go | 65 +-
.../traffic_monitor/deliveryservice/stat.go | 104 ++-
.../traffic_monitor/deliveryservicedata/stat.go | 75 +-
.../experimental/traffic_monitor/enum/enum.go | 102 ++-
.../traffic_monitor/health/cache_health.go | 117 ++--
.../traffic_monitor/http_server/http_server.go | 289 --------
.../experimental/traffic_monitor/index.html | 19 +
.../manager/cacheavailablestatus.go | 30 +-
.../traffic_monitor/manager/datarequest.go | 191 +++---
.../traffic_monitor/manager/dsstats.go | 29 +-
.../traffic_monitor/manager/events.go | 30 +-
.../traffic_monitor/manager/healthresult.go | 63 +-
.../traffic_monitor/manager/lastkbpsstats.go | 25 +-
.../traffic_monitor/manager/manager.go | 51 +-
.../traffic_monitor/manager/monitorconfig.go | 262 ++++---
.../traffic_monitor/manager/opsconfig.go | 182 ++---
.../traffic_monitor/manager/peer.go | 38 +-
.../traffic_monitor/manager/polledcaches.go | 45 +-
.../traffic_monitor/manager/stathistory.go | 89 ++-
.../traffic_monitor/manager/uintman.go | 25 +
.../traffic_monitor/peer/crstates.go | 106 ++-
.../experimental/traffic_monitor/peer/peer.go | 41 +-
.../traffic_monitor/peer/peer_test.go | 22 +-
.../traffic_monitor/srvhttp/srvhttp.go | 353 ++++++++++
.../traffic_monitor-example-config.json | 8 +-
.../traffic_monitor/traffic_monitor.go | 31 +-
.../trafficopsdata/trafficopsdata.go | 36 +-
.../trafficopswrapper/trafficopswrapper.go | 28 +-
.../experimental/traffic_monitor/version.go | 21 +
traffic_monitor/pom.xml | 23 +-
traffic_monitor/src/main/bin/config-doc.sh | 1 -
.../src/main/bin/traffic_monitor_config.pl | 1 -
traffic_monitor/src/main/conf/log4j.properties | 1 -
.../traffic_control/traffic_monitor/Index.html | 19 +
.../traffic_control/traffic_monitor/Index.java | 1 -
.../traffic_monitor/MonitorApplication.java | 1 -
.../traffic_monitor/MonitorPage.java | 1 -
.../traffic_monitor/MonitorSession.java | 1 -
.../traffic_monitor/StatisticModel.java | 1 -
.../traffic_monitor/config/Cache.java | 1 -
.../traffic_monitor/config/Config.java | 1 -
.../traffic_monitor/config/ConfigHandler.java | 1 -
.../traffic_monitor/config/MonitorConfig.java | 1 -
.../traffic_monitor/config/Peer.java | 1 -
.../traffic_monitor/config/RouterConfig.java | 1 -
.../traffic_monitor/data/DataPoint.java | 1 -
.../traffic_monitor/data/DataSummary.java | 1 -
.../traffic_monitor/data/StatisticsLog.java | 22 +-
.../traffic_monitor/health/AbstractState.java | 1 -
.../traffic_monitor/health/Bandwidth.java | 1 -
.../traffic_monitor/health/CacheState.java | 1 -
.../health/CacheStateRegistry.java | 20 +
.../health/CacheStateUpdater.java | 20 +
.../health/CacheStatisticsClient.java | 20 +
.../traffic_monitor/health/CacheWatcher.java | 1 -
.../health/DeliveryServiceStateRegistry.java | 20 +
.../traffic_monitor/health/DsState.java | 1 -
.../traffic_monitor/health/DsStati.java | 20 +
.../traffic_monitor/health/DsWatcher.java | 1 -
.../traffic_monitor/health/EmbeddedStati.java | 20 +
.../traffic_monitor/health/Event.java | 1 -
.../health/HealthDeterminer.java | 1 -
.../traffic_monitor/health/PeerState.java | 1 -
.../traffic_monitor/health/PeerWatcher.java | 1 -
.../traffic_monitor/health/StateRegistry.java | 20 +
.../traffic_monitor/health/TmListener.java | 1 -
.../traffic_monitor/health/TmWatcher.java | 1 -
.../traffic_monitor/publish/CacheStats.java | 1 -
.../traffic_monitor/publish/ConfigDoc.java | 1 -
.../traffic_monitor/publish/CrConfig.java | 1 -
.../traffic_monitor/publish/CrStates.java | 1 -
.../traffic_monitor/publish/DsStats.java | 1 -
.../traffic_monitor/publish/EventLog.java | 1 -
.../traffic_monitor/publish/JsonPage.java | 1 -
.../traffic_monitor/publish/PeerStates.java | 1 -
.../traffic_monitor/publish/StatSummary.java | 1 -
.../traffic_monitor/publish/Stats.java | 1 -
.../traffic_monitor/util/Fetcher.java | 1 -
.../traffic_monitor/util/Network.java | 1 -
.../util/PeriodicResourceUpdater.java | 1 -
.../traffic_monitor/util/StableBloomFilter.java | 1 -
.../traffic_monitor/util/Updatable.java | 1 -
.../behaviors/AbstractMultiAjaxBehavior.java | 1 -
.../behaviors/MultiUpdatingTimerBehavior.java | 1 -
.../behaviors/UpdatingAttributeAppender.java | 1 -
.../wicket/components/CacheDetailsPage.html | 21 +-
.../wicket/components/CacheDetailsPage.java | 1 -
.../wicket/components/CacheListPanel.html | 21 +-
.../wicket/components/CacheListPanel.java | 1 -
.../wicket/components/DsDetailsPage.html | 21 +-
.../wicket/components/DsDetailsPage.java | 1 -
.../wicket/components/DsListPanel.html | 21 +-
.../wicket/components/DsListPanel.java | 1 -
.../wicket/components/EventLogPanel.html | 21 +-
.../wicket/components/EventLogPanel.java | 1 -
.../wicket/components/StateDetailsPage.java | 20 +
.../wicket/models/CacheDataModel.java | 20 +
.../wicket/models/CacheStateModel.java | 20 +
.../wicket/models/DsStateModel.java | 20 +
.../wicket/models/StateModel.java | 20 +
.../src/main/opt/tomcat/conf/server.xml | 1 -
.../src/main/resources/log4j.properties | 17 +
traffic_monitor/src/main/scripts/postinstall.sh | 1 -
traffic_monitor/src/main/scripts/postremove.sh | 18 +-
traffic_monitor/src/main/scripts/preinstall.sh | 1 -
traffic_monitor/src/main/scripts/preremove.sh | 1 -
traffic_monitor/src/main/webapp/WEB-INF/web.xml | 20 +
traffic_monitor/src/main/webapp/js/main.js | 19 +
traffic_monitor/src/main/webapp/style.css | 19 +
traffic_monitor/src/main/webapp/test.html | 21 +-
.../application/MonitorApplicationTest.java | 20 +
.../traffic_control/traffic_monitor/Start.java | 1 -
.../traffic_monitor/TestHomePage.java | 1 -
.../src/test/java/config/CacheTest.java | 20 +
.../src/test/java/config/ConfigHandlerTest.java | 22 +-
.../src/test/java/config/ConfigTest.java | 20 +
.../src/test/java/config/MonitorConfigTest.java | 20 +
.../src/test/java/config/RouterConfigTest.java | 20 +
.../src/test/java/data/DataPointTest.java | 20 +
.../src/test/java/data/StatisticsLogTest.java | 22 +-
.../test/java/health/CacheStateUpdaterTest.java | 20 +
.../java/health/CacheStatisticsClientTest.java | 20 +
.../src/test/java/health/DeletemeTest.java | 20 +
.../test/java/health/HealthDeterminerTest.java | 20 +
.../src/test/resources/var/health-params.js | 19 +
traffic_ops/app/bin/checks/ToCDUCheck.pl | 1 -
traffic_ops/app/bin/checks/ToCHRCheck.pl | 1 -
traffic_ops/app/bin/checks/ToDSCPCheck.pl | 1 -
traffic_ops/app/bin/checks/ToDnssecRefresh.pl | 1 -
traffic_ops/app/bin/checks/ToFQDNCheck.pl | 1 -
traffic_ops/app/bin/checks/ToMTUCheck.pl | 1 -
traffic_ops/app/bin/checks/ToORTCheck.pl | 1 -
traffic_ops/app/bin/checks/ToPingCheck.pl | 1 -
traffic_ops/app/bin/checks/ToRTRCheck.pl | 1 -
traffic_ops/app/bin/db/setup_kabletown.pl | 1 -
traffic_ops/app/bin/extensions | 1 -
traffic_ops/app/bin/routes.pl | 1 -
traffic_ops/app/bin/start.pl | 1 -
.../app/bin/tests/run_integration_tests.sh | 1 -
traffic_ops/app/bin/tests/run_unit_tests.sh | 1 -
.../app/conf/misc/riak_search/sslkeys.xml | 22 +-
traffic_ops/app/cpanfile | 1 -
traffic_ops/app/db/admin.pl | 1 -
traffic_ops/app/db/dbconf.yml | 1 -
traffic_ops/app/db/migration_readme.txt | 1 -
traffic_ops/app/db/reset.sh | 1 -
traffic_ops/app/db/seeds.sql | 16 +-
traffic_ops/app/db/setup_migrations.sql | 1 -
traffic_ops/app/lib/API/ApiDocs.pm | 1 -
traffic_ops/app/lib/API/Asn.pm | 1 -
traffic_ops/app/lib/API/Cachegroup.pm | 5 +-
traffic_ops/app/lib/API/Cachegroup2.pm | 1 -
traffic_ops/app/lib/API/CachegroupParameter.pm | 1 -
traffic_ops/app/lib/API/Cdn.pm | 40 +-
traffic_ops/app/lib/API/ChangeLog.pm | 1 -
.../app/lib/API/DeliveryService/KeysUrlSig.pm | 1 -
.../app/lib/API/DeliveryService/SslKeys.pm | 1 -
.../app/lib/API/DeliveryService/Steering.pm | 1 -
.../app/lib/API/DeliveryServiceMatches.pm | 1 -
.../app/lib/API/DeliveryServiceRegexes.pm | 1 -
.../app/lib/API/DeliveryServiceServer.pm | 1 -
traffic_ops/app/lib/API/Deliveryservice.pm | 15 -
traffic_ops/app/lib/API/Deliveryservice2.pm | 1 -
traffic_ops/app/lib/API/Division.pm | 65 ++
traffic_ops/app/lib/API/Federation.pm | 1 -
traffic_ops/app/lib/API/HwInfo.pm | 1 -
traffic_ops/app/lib/API/Job.pm | 1 -
traffic_ops/app/lib/API/Keys.pm | 1 -
traffic_ops/app/lib/API/Parameter.pm | 1 -
traffic_ops/app/lib/API/PhysLocation.pm | 3 +-
traffic_ops/app/lib/API/Profile.pm | 1 -
traffic_ops/app/lib/API/ProfileParameter.pm | 1 -
traffic_ops/app/lib/API/Region.pm | 45 +-
traffic_ops/app/lib/API/Riak.pm | 1 -
traffic_ops/app/lib/API/Role.pm | 1 -
traffic_ops/app/lib/API/Server.pm | 1 -
traffic_ops/app/lib/API/Server2.pm | 1 -
traffic_ops/app/lib/API/ServerCheck.pm | 1 -
traffic_ops/app/lib/API/StaticDnsEntry.pm | 1 -
traffic_ops/app/lib/API/StatsSummary.pm | 1 -
traffic_ops/app/lib/API/Status.pm | 1 -
traffic_ops/app/lib/API/System.pm | 1 -
traffic_ops/app/lib/API/ToExtension.pm | 1 -
traffic_ops/app/lib/API/Topology.pm | 1 -
traffic_ops/app/lib/API/TrafficMonitor.pm | 1 -
traffic_ops/app/lib/API/Types.pm | 1 -
traffic_ops/app/lib/API/User.pm | 3 +-
traffic_ops/app/lib/Common/ReturnCodes.pm | 1 -
traffic_ops/app/lib/Connection/RiakAdapter.pm | 1 -
traffic_ops/app/lib/Extensions/Helper.pm | 1 -
.../Extensions/TrafficStats/API/CacheStats.pm | 1 -
.../lib/Extensions/TrafficStats/API/CdnStats.pm | 1 -
.../TrafficStats/API/DeliveryServiceStats.pm | 1 -
.../TrafficStats/Builder/BaseBuilder.pm | 1 -
.../TrafficStats/Builder/CacheStatsBuilder.pm | 1 -
.../Builder/DeliveryServiceStatsBuilder.pm | 1 -
.../TrafficStats/Connection/InfluxDBAdapter.pm | 1 -
.../TrafficStats/Delegate/CacheStatistics.pm | 20 +-
.../TrafficStats/Delegate/CdnStatistics.pm | 17 +-
.../TrafficStats/Delegate/Statistics.pm | 18 +-
.../TrafficStats/Helper/InfluxResponse.pm | 16 +-
traffic_ops/app/lib/Fixtures/Asn.pm | 1 -
traffic_ops/app/lib/Fixtures/Cachegroup.pm | 1 -
.../app/lib/Fixtures/CachegroupParameter.pm | 1 -
traffic_ops/app/lib/Fixtures/Cdn.pm | 1 -
traffic_ops/app/lib/Fixtures/Deliveryservice.pm | 1 -
.../app/lib/Fixtures/DeliveryserviceRegex.pm | 1 -
.../app/lib/Fixtures/DeliveryserviceServer.pm | 1 -
.../app/lib/Fixtures/DeliveryserviceTmuser.pm | 1 -
traffic_ops/app/lib/Fixtures/Division.pm | 1 -
traffic_ops/app/lib/Fixtures/Federation.pm | 1 -
.../lib/Fixtures/FederationDeliveryservice.pm | 1 -
.../Fixtures/FederationFederationResolver.pm | 1 -
.../app/lib/Fixtures/FederationResolver.pm | 1 -
.../app/lib/Fixtures/FederationTmuser.pm | 1 -
traffic_ops/app/lib/Fixtures/Hwinfo.pm | 1 -
traffic_ops/app/lib/Fixtures/Integration/Asn.pm | 18 +
.../app/lib/Fixtures/Integration/Cachegroup.pm | 18 +
.../Fixtures/Integration/CachegroupParameter.pm | 18 +
traffic_ops/app/lib/Fixtures/Integration/Cdn.pm | 18 +
.../lib/Fixtures/Integration/Deliveryservice.pm | 18 +
.../Integration/DeliveryserviceRegex.pm | 18 +
.../Integration/DeliveryserviceServer.pm | 18 +
.../Integration/DeliveryserviceTmuser.pm | 18 +
.../app/lib/Fixtures/Integration/Division.pm | 18 +
.../app/lib/Fixtures/Integration/Federation.pm | 18 +
.../Integration/FederationDeliveryservice.pm | 18 +
.../Integration/FederationFederationResolver.pm | 18 +
.../Fixtures/Integration/FederationResolver.pm | 18 +
.../Fixtures/Integration/FederationTmuser.pm | 18 +
.../lib/Fixtures/Integration/GooseDbVersion.pm | 18 +
.../app/lib/Fixtures/Integration/Hwinfo.pm | 18 +
traffic_ops/app/lib/Fixtures/Integration/Job.pm | 18 +
.../app/lib/Fixtures/Integration/JobAgent.pm | 18 +
.../app/lib/Fixtures/Integration/JobResult.pm | 18 +
.../app/lib/Fixtures/Integration/JobStatus.pm | 18 +
traffic_ops/app/lib/Fixtures/Integration/Log.pm | 18 +
.../app/lib/Fixtures/Integration/Parameter.pm | 18 +
.../lib/Fixtures/Integration/PhysLocation.pm | 18 +
.../app/lib/Fixtures/Integration/Profile.pm | 18 +
.../Fixtures/Integration/ProfileParameter.pm | 18 +
.../app/lib/Fixtures/Integration/Regex.pm | 18 +
.../app/lib/Fixtures/Integration/Region.pm | 18 +
.../app/lib/Fixtures/Integration/Role.pm | 18 +
.../app/lib/Fixtures/Integration/Server.pm | 18 +
.../app/lib/Fixtures/Integration/Servercheck.pm | 18 +
.../lib/Fixtures/Integration/Staticdnsentry.pm | 18 +
.../lib/Fixtures/Integration/StatsSummary.pm | 18 +
.../app/lib/Fixtures/Integration/Status.pm | 18 +
.../app/lib/Fixtures/Integration/TmUser.pm | 18 +
.../app/lib/Fixtures/Integration/ToExtension.pm | 18 +
.../app/lib/Fixtures/Integration/Type.pm | 18 +
.../lib/Fixtures/Integration/gen_fixtures.pl | 16 +
traffic_ops/app/lib/Fixtures/Job.pm | 1 -
traffic_ops/app/lib/Fixtures/JobAgent.pm | 1 -
traffic_ops/app/lib/Fixtures/JobStatus.pm | 1 -
traffic_ops/app/lib/Fixtures/Log.pm | 1 -
traffic_ops/app/lib/Fixtures/Parameter.pm | 1 -
traffic_ops/app/lib/Fixtures/PhysLocation.pm | 1 -
traffic_ops/app/lib/Fixtures/Profile.pm | 1 -
.../app/lib/Fixtures/ProfileParameter.pm | 1 -
traffic_ops/app/lib/Fixtures/Regex.pm | 1 -
traffic_ops/app/lib/Fixtures/Region.pm | 1 -
traffic_ops/app/lib/Fixtures/Role.pm | 1 -
traffic_ops/app/lib/Fixtures/Server.pm | 1 -
traffic_ops/app/lib/Fixtures/Staticdnsentry.pm | 1 -
traffic_ops/app/lib/Fixtures/StatsSummary.pm | 1 -
traffic_ops/app/lib/Fixtures/Status.pm | 1 -
traffic_ops/app/lib/Fixtures/SteeringTarget.pm | 18 +
traffic_ops/app/lib/Fixtures/TmUser.pm | 1 -
traffic_ops/app/lib/Fixtures/Type.pm | 1 -
traffic_ops/app/lib/Helper/CacheStats.pm | 1 -
.../app/lib/Helper/DeliveryServiceStats.pm | 1 -
traffic_ops/app/lib/Helper/Stats.pm | 1 -
traffic_ops/app/lib/MojoPlugins/Daemonize.pm | 1 -
.../app/lib/MojoPlugins/DeliveryService.pm | 1 -
traffic_ops/app/lib/MojoPlugins/DnssecKeys.pm | 1 -
traffic_ops/app/lib/MojoPlugins/Email.pm | 1 -
traffic_ops/app/lib/MojoPlugins/Health.pm | 1 -
traffic_ops/app/lib/MojoPlugins/InfluxDB.pm | 1 -
traffic_ops/app/lib/MojoPlugins/Job.pm | 1 -
traffic_ops/app/lib/MojoPlugins/Response.pm | 1 -
traffic_ops/app/lib/MojoPlugins/Riak.pm | 1 -
.../app/lib/MojoPlugins/RuntimeDependencies.pm | 1 -
traffic_ops/app/lib/MojoPlugins/Server.pm | 1 -
traffic_ops/app/lib/MojoPlugins/SslKeys.pm | 1 -
traffic_ops/app/lib/MojoPlugins/Stats.pm | 1 -
.../lib/MojoPlugins/TrafficMonitorConnection.pm | 1 -
.../lib/MojoPlugins/TrafficRouterConnection.pm | 1 -
traffic_ops/app/lib/MojoPlugins/Validation.pm | 1 -
traffic_ops/app/lib/Schema.pm | 1 -
traffic_ops/app/lib/Schema/Result/Asn.pm | 1 -
traffic_ops/app/lib/Schema/Result/Cachegroup.pm | 1 -
.../lib/Schema/Result/CachegroupParameter.pm | 1 -
traffic_ops/app/lib/Schema/Result/Cdn.pm | 1 -
.../Result/DeliveryServiceInfoForDomainList.pm | 1 -
.../Result/DeliveryServiceInfoForServerList.pm | 1 -
.../app/lib/Schema/Result/Deliveryservice.pm | 18 +
.../lib/Schema/Result/DeliveryserviceExtuser.pm | 2 -
.../lib/Schema/Result/DeliveryserviceRegex.pm | 1 -
.../lib/Schema/Result/DeliveryserviceServer.pm | 1 -
.../lib/Schema/Result/DeliveryserviceTmuser.pm | 1 -
traffic_ops/app/lib/Schema/Result/Division.pm | 1 -
traffic_ops/app/lib/Schema/Result/Federation.pm | 18 +
.../Schema/Result/FederationDeliveryservice.pm | 18 +
.../Result/FederationFederationResolver.pm | 18 +
.../app/lib/Schema/Result/FederationResolver.pm | 18 +
.../app/lib/Schema/Result/FederationTmuser.pm | 18 +
.../app/lib/Schema/Result/GooseDbVersion.pm | 1 -
traffic_ops/app/lib/Schema/Result/Hwinfo.pm | 1 -
.../lib/Schema/Result/InfluxDBHostsOnline.pm | 1 -
traffic_ops/app/lib/Schema/Result/Job.pm | 1 -
traffic_ops/app/lib/Schema/Result/JobAgent.pm | 1 -
traffic_ops/app/lib/Schema/Result/JobResult.pm | 1 -
traffic_ops/app/lib/Schema/Result/JobStatus.pm | 1 -
traffic_ops/app/lib/Schema/Result/Log.pm | 1 -
traffic_ops/app/lib/Schema/Result/Parameter.pm | 1 -
.../app/lib/Schema/Result/PhysLocation.pm | 1 -
traffic_ops/app/lib/Schema/Result/Profile.pm | 1 -
.../app/lib/Schema/Result/ProfileParameter.pm | 1 -
.../app/lib/Schema/Result/RascalHostsByCdn.pm | 1 -
.../lib/Schema/Result/RascalHostsByCdnAll.pm | 1 -
traffic_ops/app/lib/Schema/Result/Regex.pm | 1 -
.../Schema/Result/RegexByDeliveryServiceList.pm | 1 -
.../Schema/Result/RegexesForDeliveryService.pm | 1 -
traffic_ops/app/lib/Schema/Result/Region.pm | 1 -
.../app/lib/Schema/Result/RiakHostsOnline.pm | 1 -
traffic_ops/app/lib/Schema/Result/Role.pm | 1 -
traffic_ops/app/lib/Schema/Result/Server.pm | 2 -
.../app/lib/Schema/Result/ServerTypes.pm | 1 -
.../app/lib/Schema/Result/Servercheck.pm | 1 -
.../Result/ServersParentCachegroupList.pm | 1 -
traffic_ops/app/lib/Schema/Result/Staticdn.pm | 2 -
.../app/lib/Schema/Result/Staticdnsentry.pm | 1 -
.../app/lib/Schema/Result/StatsSummary.pm | 18 +
traffic_ops/app/lib/Schema/Result/Status.pm | 1 -
.../app/lib/Schema/Result/SteeringTarget.pm | 18 +
.../app/lib/Schema/Result/SteeringView.pm | 38 +-
traffic_ops/app/lib/Schema/Result/TmUser.pm | 1 -
.../app/lib/Schema/Result/ToExtension.pm | 1 -
traffic_ops/app/lib/Schema/Result/Type.pm | 1 -
.../app/lib/Test/IntegrationTestHelper.pm | 1 -
traffic_ops/app/lib/Test/TestHelper.pm | 1 -
traffic_ops/app/lib/Test/TrafficServerConfig.pm | 18 +
traffic_ops/app/lib/TrafficOps.pm | 1 -
traffic_ops/app/lib/TrafficOpsRoutes.pm | 19 +-
traffic_ops/app/lib/UI/Anomaly.pm | 1 -
traffic_ops/app/lib/UI/Asn.pm | 1 -
traffic_ops/app/lib/UI/Cachegroup.pm | 1 -
traffic_ops/app/lib/UI/CachegroupParameter.pm | 1 -
traffic_ops/app/lib/UI/Cdn.pm | 1 -
traffic_ops/app/lib/UI/ChangeLog.pm | 1 -
traffic_ops/app/lib/UI/ConfigFiles.pm | 1 -
traffic_ops/app/lib/UI/DataAll.pm | 1 -
traffic_ops/app/lib/UI/DeliveryService.pm | 25 +-
traffic_ops/app/lib/UI/DeliveryServiceServer.pm | 1 -
traffic_ops/app/lib/UI/DeliveryServiceTmUser.pm | 1 -
traffic_ops/app/lib/UI/Dell.pm | 1 -
traffic_ops/app/lib/UI/Division.pm | 1 -
traffic_ops/app/lib/UI/DnssecKeys.pm | 1 -
traffic_ops/app/lib/UI/Federation.pm | 1 -
traffic_ops/app/lib/UI/GenDbDump.pm | 1 -
traffic_ops/app/lib/UI/GenIso.pm | 1 -
traffic_ops/app/lib/UI/GenericUploader.pm | 1 -
traffic_ops/app/lib/UI/Hardware.pm | 1 -
traffic_ops/app/lib/UI/Health.pm | 1 -
traffic_ops/app/lib/UI/Help.pm | 1 -
traffic_ops/app/lib/UI/HwInfo.pm | 1 -
traffic_ops/app/lib/UI/Job.pm | 1 -
traffic_ops/app/lib/UI/Ort.pm | 1 -
traffic_ops/app/lib/UI/Parameter.pm | 1 -
traffic_ops/app/lib/UI/PhysLocation.pm | 1 -
traffic_ops/app/lib/UI/Profile.pm | 1 -
traffic_ops/app/lib/UI/ProfileParameter.pm | 1 -
traffic_ops/app/lib/UI/RascalStatus.pm | 1 -
traffic_ops/app/lib/UI/Region.pm | 1 -
traffic_ops/app/lib/UI/Render.pm | 1 -
traffic_ops/app/lib/UI/Role.pm | 1 -
traffic_ops/app/lib/UI/Server.pm | 1 -
traffic_ops/app/lib/UI/ServerCheck.pm | 1 -
traffic_ops/app/lib/UI/SslKeys.pm | 1 -
traffic_ops/app/lib/UI/StaticDnsEntry.pm | 1 -
traffic_ops/app/lib/UI/Status.pm | 1 -
traffic_ops/app/lib/UI/Steering.pm | 1 -
traffic_ops/app/lib/UI/Tools.pm | 1 -
traffic_ops/app/lib/UI/Topology.pm | 1 -
traffic_ops/app/lib/UI/Types.pm | 1 -
traffic_ops/app/lib/UI/UploadHandler.pm | 1 -
traffic_ops/app/lib/UI/UploadHandlerCsv.pm | 1 -
traffic_ops/app/lib/UI/UploadServerCsv.pm | 1 -
traffic_ops/app/lib/UI/User.pm | 1 -
traffic_ops/app/lib/UI/Utils.pm | 3 +-
traffic_ops/app/lib/UI/VisualStatus.pm | 1 -
traffic_ops/app/lib/Utils/CCR.pm | 1 -
traffic_ops/app/lib/Utils/Deliveryservice.pm | 1 -
traffic_ops/app/lib/Utils/Helper.pm | 1 -
traffic_ops/app/lib/Utils/Helper/DateHelper.pm | 1 -
traffic_ops/app/lib/Utils/Helper/Extensions.pm | 1 -
.../app/lib/Utils/Helper/ResponseHelper.pm | 1 -
.../lib/Utils/Helper/TrafficOpsRoutesLoader.pm | 1 -
traffic_ops/app/lib/Utils/Helper/Version.pm | 1 -
traffic_ops/app/lib/Utils/JsonConfig.pm | 1 -
traffic_ops/app/lib/Utils/Properties.pm | 1 -
traffic_ops/app/lib/Utils/Rascal.pm | 1 -
traffic_ops/app/public/close_fancybox.html | 1 -
traffic_ops/app/public/css/site.css | 1 -
traffic_ops/app/public/images/tc_logo.png | Bin 89813 -> 101717 bytes
traffic_ops/app/public/js/application.js | 1 -
traffic_ops/app/public/js/tm_utils.js | 1 -
traffic_ops/app/public/theme/default/style.css | 1 -
traffic_ops/app/script/detect10ginterfaces.pl | 1 -
traffic_ops/app/script/generate_raid0_files.pl | 1 -
.../app/script/update_riak_for_search.pl | 8 +-
traffic_ops/app/t/aadata.t | 1 -
traffic_ops/app/t/api/1.0/availableds.t | 1 -
traffic_ops/app/t/api/1.0/data.t | 1 -
traffic_ops/app/t/api/1.0/health.t | 1 -
traffic_ops/app/t/api/1.0/ort.t | 1 -
traffic_ops/app/t/api/1.1/asn.t | 1 -
traffic_ops/app/t/api/1.1/cachegroup.t | 1 -
traffic_ops/app/t/api/1.1/cachegroupparameter.t | 1 -
.../t/api/1.1/deliveryservice/keys_url_sig.t | 1 -
.../app/t/api/1.1/deliveryservice/ssl_keys.t | 1 -
.../app/t/api/1.1/deliveryserviceserver.t | 1 -
traffic_ops/app/t/api/1.1/hwinfo.t | 1 -
traffic_ops/app/t/api/1.1/job.t | 1 -
traffic_ops/app/t/api/1.1/keys.t | 1 -
traffic_ops/app/t/api/1.1/log.t | 1 -
traffic_ops/app/t/api/1.1/metrics.t | 1 -
traffic_ops/app/t/api/1.1/parameter.t | 1 -
traffic_ops/app/t/api/1.1/phys_location.t | 1 -
traffic_ops/app/t/api/1.1/profile.t | 1 -
traffic_ops/app/t/api/1.1/region.t | 1 -
traffic_ops/app/t/api/1.1/riak_adapter.t | 1 -
traffic_ops/app/t/api/1.1/roles.t | 1 -
traffic_ops/app/t/api/1.1/server.t | 1 -
traffic_ops/app/t/api/1.1/staticdns.t | 1 -
traffic_ops/app/t/api/1.1/status.t | 1 -
traffic_ops/app/t/api/1.1/traffic_monitor.t | 1 -
traffic_ops/app/t/api/1.1/types.t | 1 -
traffic_ops/app/t/api/1.1/user.t | 1 -
traffic_ops/app/t/api/1.2/asn.t | 1 -
traffic_ops/app/t/api/1.2/cache_stats.t | 1 -
traffic_ops/app/t/api/1.2/cachegroup.t | 1 -
traffic_ops/app/t/api/1.2/cdn.t | 1 -
traffic_ops/app/t/api/1.2/deliveryservice.t | 1 -
.../app/t/api/1.2/deliveryservice_matches.t | 1 -
.../app/t/api/1.2/deliveryservice_regex.t | 1 -
.../app/t/api/1.2/deliveryservice_server.t | 1 -
.../app/t/api/1.2/deliveryservice_stats.t | 1 -
traffic_ops/app/t/api/1.2/division.t | 1 -
traffic_ops/app/t/api/1.2/federation_external.t | 1 -
traffic_ops/app/t/api/1.2/federation_internal.t | 1 -
traffic_ops/app/t/api/1.2/physlocation.t | 1 -
traffic_ops/app/t/api/1.2/profile.t | 1 -
traffic_ops/app/t/api/1.2/profile_parameter.t | 1 -
traffic_ops/app/t/api/1.2/region.t | 1 -
traffic_ops/app/t/api/1.2/server.t | 1 -
traffic_ops/app/t/api/1.2/server_create.t | 1 -
traffic_ops/app/t/api/1.2/stats_summary.t | 1 -
traffic_ops/app/t/api/1.2/steering_internal.t | 1 -
traffic_ops/app/t/api/1.2/user.t | 1 -
traffic_ops/app/t/asn.t | 1 -
traffic_ops/app/t/deliveryservice.t | 1 -
traffic_ops/app/t/deliveryserviceserver.t | 1 -
traffic_ops/app/t/federation.t | 1 -
traffic_ops/app/t/health.t | 1 -
traffic_ops/app/t/hwinfo.t | 1 -
traffic_ops/app/t/influxdb_adapter.t | 1 -
traffic_ops/app/t/log.t | 1 -
traffic_ops/app/t/modules.t | 1 -
traffic_ops/app/t/parameter.t | 1 -
traffic_ops/app/t/phys_location.t | 1 -
traffic_ops/app/t/profile.t | 1 -
traffic_ops/app/t/purge.t | 1 -
traffic_ops/app/t/rascal_status.t | 1 -
traffic_ops/app/t/server.t | 1 -
traffic_ops/app/t/staticdnsentry.t | 1 -
traffic_ops/app/t/status.t | 1 -
traffic_ops/app/t/types.t | 1 -
traffic_ops/app/t/uploadhandlercsv.t | 1 -
traffic_ops/app/t/user.t | 1 -
traffic_ops/app/templates/asn/_form.html.ep | 1 -
traffic_ops/app/templates/asn/add.html.ep | 1 -
traffic_ops/app/templates/asn/asn.js.html.ep | 1 -
traffic_ops/app/templates/asn/edit.html.ep | 1 -
traffic_ops/app/templates/asn/index.html.ep | 1 -
traffic_ops/app/templates/asn/view.html.ep | 1 -
.../templates/blueimp_uploader/blueimp.html.ep | 1 -
.../app/templates/cachegroup/_form.html.ep | 1 -
.../app/templates/cachegroup/add.html.ep | 1 -
.../templates/cachegroup/cachegroup.js.html.ep | 1 -
.../app/templates/cachegroup/edit.html.ep | 1 -
.../app/templates/cachegroup/index.html.ep | 1 -
.../app/templates/cachegroup/view.html.ep | 1 -
traffic_ops/app/templates/cdn/_form.html.ep | 1 -
traffic_ops/app/templates/cdn/add.html.ep | 1 -
traffic_ops/app/templates/cdn/edit.html.ep | 1 -
traffic_ops/app/templates/cdn/index.html.ep | 1 -
traffic_ops/app/templates/cdn/loginpage.html.ep | 1 -
traffic_ops/app/templates/cdn/parameter.html.ep | 1 -
.../app/templates/cdn/snapshot_crconfig.html.ep | 1 -
traffic_ops/app/templates/cdn/view.html.ep | 1 -
.../app/templates/change_log/changelog.html.ep | 1 -
.../app/templates/common/_error_list.html.ep | 1 -
.../app/templates/common/_errors.html.ep | 1 -
traffic_ops/app/templates/common/_flash.html.ep | 1 -
.../app/templates/config_files/genfiles.html.ep | 1 -
.../templates/delivery_service/_form.html.ep | 1 -
.../app/templates/delivery_service/add.html.ep | 1 -
.../app/templates/delivery_service/edit.html.ep | 1 -
.../templates/delivery_service/index.html.ep | 1 -
.../templates/delivery_service/request.mail.ep | 1 -
.../cpdss_iframe.html.ep | 1 -
.../delivery_service_server/edit.html.ep | 1 -
traffic_ops/app/templates/division/add.html.ep | 1 -
traffic_ops/app/templates/division/edit.html.ep | 1 -
.../app/templates/division/index.html.ep | 1 -
.../app/templates/dnssec_keys/add.html.ep | 1 -
.../app/templates/dnssec_keys/addksk.html.ep | 1 -
.../app/templates/dnssec_keys/index.html.ep | 1 -
.../app/templates/dnssec_keys/manage.html.ep | 1 -
traffic_ops/app/templates/exception.html.ep | 1 -
.../app/templates/federation/_form.html.ep | 1 -
.../federation/_listdeliveryservices.js.html.ep | 1 -
.../federation/_listfederationusers.js.html.ep | 1 -
.../templates/federation/_listroles.js.html.ep | 1 -
.../app/templates/federation/add.html.ep | 1 -
.../app/templates/federation/edit.html.ep | 1 -
.../app/templates/federation/index.html.ep | 1 -
.../app/templates/gen_iso/geniso.html.ep | 1 -
.../templates/generic_uploader/generic.html.ep | 1 -
.../app/templates/hardware/hardware.html.ep | 1 -
traffic_ops/app/templates/help/about.html.ep | 1 -
traffic_ops/app/templates/jmenu.html.ep | 1 -
traffic_ops/app/templates/job/addagent.html.ep | 1 -
traffic_ops/app/templates/job/addjob.html.ep | 1 -
traffic_ops/app/templates/job/jobs.html.ep | 1 -
.../app/templates/layouts/jquery.html.ep | 1 -
.../app/templates/layouts/nojquery.html.ep | 1 -
traffic_ops/app/templates/navbar.html.ep | 1 -
traffic_ops/app/templates/not_found.html.ep | 1 -
.../app/templates/parameter/_form.html.ep | 1 -
traffic_ops/app/templates/parameter/add.html.ep | 1 -
.../app/templates/parameter/index.html.ep | 1 -
.../app/templates/parameter/view.html.ep | 1 -
.../app/templates/phys_location/_form.html.ep | 1 -
.../app/templates/phys_location/add.html.ep | 1 -
.../app/templates/phys_location/edit.html.ep | 1 -
.../app/templates/phys_location/index.html.ep | 1 -
.../app/templates/phys_location/view.html.ep | 1 -
traffic_ops/app/templates/profile/_form.html.ep | 1 -
traffic_ops/app/templates/profile/add.html.ep | 1 -
.../templates/profile/compareprofile.html.ep | 1 -
traffic_ops/app/templates/profile/edit.html.ep | 1 -
.../app/templates/profile/import.html.ep | 1 -
traffic_ops/app/templates/profile/index.html.ep | 1 -
traffic_ops/app/templates/profile/view.html.ep | 1 -
.../app/templates/rascal_status/health.html.ep | 1 -
traffic_ops/app/templates/region/_form.html.ep | 1 -
traffic_ops/app/templates/region/add.html.ep | 1 -
traffic_ops/app/templates/region/edit.html.ep | 1 -
traffic_ops/app/templates/region/index.html.ep | 1 -
traffic_ops/app/templates/server/add.html.ep | 1 -
traffic_ops/app/templates/server/index.html.ep | 1 -
traffic_ops/app/templates/server/view.html.ep | 1 -
.../templates/server_check/server_check.html.ep | 1 -
traffic_ops/app/templates/ssl_keys/add.html.ep | 1 -
.../app/templates/static_dns_entry/edit.html.ep | 1 -
.../app/templates/steering/index.html.ep | 1 -
traffic_ops/app/templates/tools/db_dump.html.ep | 1 -
.../tools/diff_crconfig_iframe.html.ep | 1 -
.../templates/tools/invalidate_content.html.ep | 1 -
.../app/templates/tools/queue_updates.html.ep | 1 -
.../templates/tools/snapshot_crconfig.html.ep | 1 -
traffic_ops/app/templates/tools/tools.html.ep | 1 -
traffic_ops/app/templates/types/_form.html.ep | 1 -
traffic_ops/app/templates/types/add.html.ep | 1 -
traffic_ops/app/templates/types/edit.html.ep | 1 -
traffic_ops/app/templates/types/index.html.ep | 1 -
traffic_ops/app/templates/types/view.html.ep | 1 -
traffic_ops/app/templates/update_js.html.ep | 1 -
.../upload_server_csv/uploadservercsv.html.ep | 1 -
.../user/_delivery_services.js.html.ep | 1 -
traffic_ops/app/templates/user/_form.html.ep | 1 -
.../app/templates/user/_listroles.js.html.ep | 1 -
traffic_ops/app/templates/user/add.html.ep | 1 -
traffic_ops/app/templates/user/edit.html.ep | 1 -
traffic_ops/app/templates/user/index.html.ep | 3 +-
traffic_ops/app/templates/user/register.html.ep | 1 -
.../app/templates/user/registration.mail.ep | 1 -
.../app/templates/user/reset_password.mail.ep | 1 -
.../app/templates/utils/close_fancybox.html.ep | 1 -
.../visual_status/daily_summary.html.ep | 1 -
.../app/templates/visual_status/graphs.html.ep | 1 -
traffic_ops/bin/supermicro_udev_mapper.pl | 1 -
traffic_ops/bin/traffic_ops_ort.pl | 16 +-
traffic_ops/build/build_rpm.sh | 1 -
traffic_ops/build/traffic_ops.spec | 1 -
traffic_ops/build/traffic_ops_ort.spec | 1 -
traffic_ops/client/cachegroup.go | 1 -
traffic_ops/client/cdn.go | 1 -
traffic_ops/client/crconfig.go | 1 -
traffic_ops/client/delivery_service.go | 193 ++----
.../client/delivery_service_endpoints.go | 20 +-
.../client/delivery_service_endpoints_test.go | 37 +-
.../client/delivery_service_resources.go | 206 ++++++
traffic_ops/client/fixtures/cachegroup.go | 3 +-
traffic_ops/client/fixtures/cdn.go | 3 +-
traffic_ops/client/fixtures/delivery_service.go | 62 +-
traffic_ops/client/fixtures/hardware.go | 3 +-
traffic_ops/client/fixtures/parameter.go | 3 +-
traffic_ops/client/fixtures/profile.go | 3 +-
traffic_ops/client/fixtures/server.go | 3 +-
traffic_ops/client/fixtures/stats_summary.go | 3 +-
.../client/fixtures/traffic_monitor_config.go | 22 +-
.../client/fixtures/traffic_router_config.go | 22 +-
traffic_ops/client/fixtures/types.go | 3 +-
traffic_ops/client/fixtures/user.go | 3 +-
traffic_ops/client/hardware.go | 1 -
traffic_ops/client/parameter.go | 1 -
traffic_ops/client/profile.go | 1 -
traffic_ops/client/server.go | 1 -
traffic_ops/client/stats_summary.go | 1 -
traffic_ops/client/tests/cachegroup_test.go | 5 +-
traffic_ops/client/tests/cdn_test.go | 5 +-
.../client/tests/delivery_service_test.go | 218 +++++-
traffic_ops/client/tests/hardware_test.go | 5 +-
traffic_ops/client/tests/parameter_test.go | 5 +-
traffic_ops/client/tests/profile_test.go | 5 +-
traffic_ops/client/tests/server_test.go | 5 +-
traffic_ops/client/tests/stats_summary_test.go | 5 +-
.../client/tests/traffic_monitor_config_test.go | 5 +-
traffic_ops/client/tests/traffic_ops_test.go | 3 +-
.../client/tests/traffic_router_config_test.go | 5 +-
traffic_ops/client/tests/type_test.go | 5 +-
traffic_ops/client/tests/user_test.go | 5 +-
traffic_ops/client/traffic_monitor_config.go | 1 -
traffic_ops/client/traffic_ops.go | 1 -
traffic_ops/client/traffic_router_config.go | 1 -
traffic_ops/client/type.go | 1 -
traffic_ops/client/user.go | 1 -
traffic_ops/etc/init.d/traffic_ops | 1 -
traffic_ops/etc/logrotate.d/traffic_ops | 1 -
traffic_ops/etc/logrotate.d/traffic_ops_access | 1 -
.../experimental/ats_config/ats_config.go | 1 -
.../experimental/ats_config/ats_config_cli.go | 1 -
.../ats_config/config_files/config_files.go | 1 -
.../ats_config/traffic_ops/traffic_ops.go | 1 -
.../postgrest/Postgrest_Dockerfile_run.sh | 16 +
traffic_ops/experimental/server/api/api.go | 1 -
traffic_ops/experimental/server/api/asn_test.go | 1 -
traffic_ops/experimental/server/api/asns.go | 1 -
.../experimental/server/api/cachegroups.go | 1 -
.../server/api/cachegroups_parameters.go | 1 -
.../server/api/cachegroups_types.go | 1 -
traffic_ops/experimental/server/api/cdns.go | 1 -
.../server/api/crconfig_snapshots.go | 1 -
.../experimental/server/api/deliveryservices.go | 1 -
.../server/api/deliveryservices_regexes.go | 1 -
.../server/api/deliveryservices_servers.go | 1 -
.../server/api/deliveryservices_types.go | 1 -
.../server/api/deliveryservices_users.go | 1 -
.../experimental/server/api/divisions.go | 1 -
traffic_ops/experimental/server/api/domains.go | 1 -
.../experimental/server/api/extensions.go | 1 -
.../experimental/server/api/extensions_types.go | 1 -
.../server/api/federation_resolvers.go | 1 -
.../experimental/server/api/federation_users.go | 1 -
.../experimental/server/api/federations.go | 1 -
.../server/api/federations_deliveryservices.go | 1 -
.../api/federations_federation_resolvers.go | 1 -
.../experimental/server/api/goose_db_version.go | 1 -
traffic_ops/experimental/server/api/log.go | 1 -
.../experimental/server/api/parameters.go | 1 -
.../experimental/server/api/phys_locations.go | 1 -
traffic_ops/experimental/server/api/profiles.go | 1 -
.../server/api/profiles_parameters.go | 1 -
traffic_ops/experimental/server/api/regexes.go | 1 -
.../experimental/server/api/regexes_types.go | 1 -
traffic_ops/experimental/server/api/regions.go | 1 -
traffic_ops/experimental/server/api/roles.go | 1 -
.../experimental/server/api/server_byname.go | 1 -
traffic_ops/experimental/server/api/servers.go | 1 -
.../experimental/server/api/servers_types.go | 1 -
.../server/api/snapshot_crconfig.go | 1 -
.../experimental/server/api/staticdnsentries.go | 1 -
.../server/api/staticdnsentries_types.go | 1 -
.../experimental/server/api/stats_summary.go | 1 -
traffic_ops/experimental/server/api/statuses.go | 1 -
traffic_ops/experimental/server/api/users.go | 1 -
traffic_ops/experimental/server/auth/auth.go | 1 -
.../experimental/server/client/client/client.go | 1 -
traffic_ops/experimental/server/client/main.go | 1 -
.../experimental/server/crconfig/crconfig.go | 1 -
.../experimental/server/csconfig/csconfig.go | 1 -
traffic_ops/experimental/server/db/init.go | 1 -
traffic_ops/experimental/server/main.go | 1 -
.../server/output_format/output_format.go | 1 -
.../experimental/server/routes/routes.go | 1 -
.../experimental/server/tools/gen_goto2.go | 4 +-
.../experimental/server/tools/get_structs.go | 1 -
.../traffic_ops_auth/traffic_ops_auth.go | 20 +
traffic_ops/experimental/ui/Gruntfile.js | 21 +-
traffic_ops/experimental/ui/app/src/app.js | 19 +
.../ui/app/src/assets/css/custom.css | 19 +
.../ui/app/src/common/api/ASNService.js | 21 +-
.../ui/app/src/common/api/AuthService.js | 21 +-
.../ui/app/src/common/api/CDNService.js | 21 +-
.../ui/app/src/common/api/CacheGroupService.js | 21 +-
.../src/common/api/DeliveryServiceService.js | 21 +-
.../ui/app/src/common/api/DivisionService.js | 21 +-
.../ui/app/src/common/api/HttpService.js | 21 +-
.../ui/app/src/common/api/LocationService.js | 21 +-
.../ui/app/src/common/api/ParameterService.js | 21 +-
.../ui/app/src/common/api/ProfileService.js | 21 +-
.../ui/app/src/common/api/RegionService.js | 21 +-
.../ui/app/src/common/api/RoleService.js | 21 +-
.../ui/app/src/common/api/ServerService.js | 21 +-
.../ui/app/src/common/api/StatusService.js | 21 +-
.../ui/app/src/common/api/TenantService.js | 21 +-
.../ui/app/src/common/api/TrafficOpsService.js | 23 +-
.../ui/app/src/common/api/TypeService.js | 21 +-
.../ui/app/src/common/api/UserService.js | 21 +-
.../experimental/ui/app/src/common/api/index.js | 21 +-
.../common/directives/match/MatchDirective.js | 19 +
.../ui/app/src/common/directives/match/index.js | 19 +
.../ui/app/src/common/filters/OffsetFilter.js | 19 +
.../ui/app/src/common/filters/index.js | 19 +
.../ui/app/src/common/models/MessageModel.js | 19 +
.../ui/app/src/common/models/UserModel.js | 21 +-
.../ui/app/src/common/models/index.js | 19 +
.../dialog/confirm/DialogConfirmController.js | 19 +
.../dialog/confirm/dialog.confirm.tpl.html | 21 +-
.../src/common/modules/dialog/confirm/index.js | 19 +
.../dialog/delete/DialogDeleteController.js | 19 +
.../dialog/delete/dialog.delete.tpl.html | 21 +-
.../src/common/modules/dialog/delete/index.js | 19 +
.../dialog/reset/DialogResetController.js | 19 +
.../modules/dialog/reset/dialog.reset.tpl.html | 21 +-
.../src/common/modules/dialog/reset/index.js | 19 +
.../modules/form/asn/FormASNController.js | 21 +-
.../form/asn/edit/FormEditASNController.js | 21 +-
.../src/common/modules/form/asn/edit/index.js | 19 +
.../common/modules/form/asn/form.asn.tpl.html | 21 +-
.../ui/app/src/common/modules/form/asn/index.js | 19 +
.../form/asn/new/FormNewASNController.js | 21 +-
.../src/common/modules/form/asn/new/index.js | 19 +
.../form/cacheGroup/FormCacheGroupController.js | 21 +-
.../edit/FormEditCacheGroupController.js | 21 +-
.../modules/form/cacheGroup/edit/index.js | 19 +
.../form/cacheGroup/form.cacheGroup.tpl.html | 19 +
.../src/common/modules/form/cacheGroup/index.js | 19 +
.../new/FormNewCacheGroupController.js | 21 +-
.../common/modules/form/cacheGroup/new/index.js | 19 +
.../modules/form/cdn/FormCDNController.js | 21 +-
.../form/cdn/edit/FormEditCDNController.js | 21 +-
.../src/common/modules/form/cdn/edit/index.js | 19 +
.../common/modules/form/cdn/form.cdn.tpl.html | 21 +-
.../ui/app/src/common/modules/form/cdn/index.js | 19 +
.../form/cdn/new/FormNewCDNController.js | 21 +-
.../src/common/modules/form/cdn/new/index.js | 19 +
.../FormDeliveryServiceController.js | 123 ++--
.../edit/FormEditDeliveryServiceController.js | 21 +-
.../modules/form/deliveryService/edit/index.js | 19 +
.../form.deliveryService.tpl.html | 21 +-
.../modules/form/deliveryService/index.js | 19 +
.../new/FormNewDeliveryServiceController.js | 21 +-
.../modules/form/deliveryService/new/index.js | 19 +
.../form/division/FormDivisionController.js | 21 +-
.../division/edit/FormEditDivisionController.js | 21 +-
.../common/modules/form/division/edit/index.js | 19 +
.../form/division/form.division.tpl.html | 21 +-
.../src/common/modules/form/division/index.js | 19 +
.../division/new/FormNewDivisionController.js | 21 +-
.../common/modules/form/division/new/index.js | 19 +
.../form/location/FormLocationController.js | 21 +-
.../location/edit/FormEditLocationController.js | 21 +-
.../common/modules/form/location/edit/index.js | 19 +
.../form/location/form.location.tpl.html | 21 +-
.../src/common/modules/form/location/index.js | 19 +
.../location/new/FormNewLocationController.js | 21 +-
.../common/modules/form/location/new/index.js | 19 +
.../form/parameter/FormParameterController.js | 21 +-
.../edit/FormEditParameterController.js | 21 +-
.../common/modules/form/parameter/edit/index.js | 19 +
.../form/parameter/form.parameter.tpl.html | 21 +-
.../src/common/modules/form/parameter/index.js | 19 +
.../parameter/new/FormNewParameterController.js | 21 +-
.../common/modules/form/parameter/new/index.js | 19 +
.../form/profile/FormProfileController.js | 21 +-
.../profile/edit/FormEditProfileController.js | 21 +-
.../common/modules/form/profile/edit/index.js | 19 +
.../modules/form/profile/form.profile.tpl.html | 21 +-
.../src/common/modules/form/profile/index.js | 19 +
.../profile/new/FormNewProfileController.js | 21 +-
.../common/modules/form/profile/new/index.js | 19 +
.../modules/form/region/FormRegionController.js | 21 +-
.../region/edit/FormEditRegionController.js | 21 +-
.../common/modules/form/region/edit/index.js | 19 +
.../modules/form/region/form.region.tpl.html | 21 +-
.../app/src/common/modules/form/region/index.js | 19 +
.../form/region/new/FormNewRegionController.js | 21 +-
.../src/common/modules/form/region/new/index.js | 19 +
.../modules/form/server/FormServerController.js | 21 +-
.../server/edit/FormEditServerController.js | 21 +-
.../common/modules/form/server/edit/index.js | 19 +
.../modules/form/server/form.server.tpl.html | 21 +-
.../app/src/common/modules/form/server/index.js | 19 +
.../form/server/new/FormNewServerController.js | 21 +-
.../src/common/modules/form/server/new/index.js | 19 +
.../modules/form/status/FormStatusController.js | 21 +-
.../status/edit/FormEditStatusController.js | 21 +-
.../common/modules/form/status/edit/index.js | 19 +
.../modules/form/status/form.status.tpl.html | 21 +-
.../app/src/common/modules/form/status/index.js | 19 +
.../form/status/new/FormNewStatusController.js | 21 +-
.../src/common/modules/form/status/new/index.js | 19 +
.../modules/form/tenant/FormTenantController.js | 21 +-
.../tenant/edit/FormEditTenantController.js | 21 +-
.../common/modules/form/tenant/edit/index.js | 19 +
.../modules/form/tenant/form.tenant.tpl.html | 21 +-
.../app/src/common/modules/form/tenant/index.js | 19 +
.../form/tenant/new/FormNewTenantController.js | 21 +-
.../src/common/modules/form/tenant/new/index.js | 19 +
.../modules/form/type/FormTypeController.js | 21 +-
.../form/type/edit/FormEditTypeController.js | 21 +-
.../src/common/modules/form/type/edit/index.js | 19 +
.../common/modules/form/type/form.type.tpl.html | 21 +-
.../app/src/common/modules/form/type/index.js | 19 +
.../form/type/new/FormNewTypeController.js | 21 +-
.../src/common/modules/form/type/new/index.js | 19 +
.../modules/form/user/FormUserController.js | 21 +-
.../form/user/edit/FormEditUserController.js | 21 +-
.../src/common/modules/form/user/edit/index.js | 19 +
.../common/modules/form/user/form.user.tpl.html | 19 +
.../app/src/common/modules/form/user/index.js | 19 +
.../form/user/new/FormNewUserController.js | 21 +-
.../src/common/modules/form/user/new/index.js | 19 +
.../common/modules/header/HeaderController.js | 19 +
.../src/common/modules/header/header.tpl.html | 19 +
.../ui/app/src/common/modules/header/index.js | 21 +-
.../common/modules/message/MessageController.js | 19 +
.../ui/app/src/common/modules/message/index.js | 19 +
.../src/common/modules/message/message.tpl.html | 19 +
.../modules/navigation/NavigationController.js | 19 +
.../app/src/common/modules/navigation/index.js | 19 +
.../modules/navigation/navigation.tpl.html | 19 +
.../common/modules/release/ReleaseController.js | 19 +
.../ui/app/src/common/modules/release/index.js | 19 +
.../src/common/modules/release/release.tpl.html | 19 +
.../modules/table/asns/TableASNsController.js | 21 +-
.../app/src/common/modules/table/asns/index.js | 19 +
.../modules/table/asns/table.asns.tpl.html | 19 +
.../cacheGroups/TableCacheGroupsController.js | 21 +-
.../common/modules/table/cacheGroups/index.js | 19 +
.../cacheGroups/table.cacheGroups.tpl.html | 19 +
.../modules/table/cdns/TableCDNsController.js | 21 +-
.../app/src/common/modules/table/cdns/index.js | 19 +
.../modules/table/cdns/table.cdns.tpl.html | 19 +
.../TableDeliveryServicesController.js | 21 +-
.../modules/table/deliveryServices/index.js | 19 +
.../table.deliveryServices.tpl.html | 19 +
.../table/divisions/TableDivisionsController.js | 21 +-
.../src/common/modules/table/divisions/index.js | 19 +
.../table/divisions/table.divisions.tpl.html | 19 +
.../table/locations/TableLocationsController.js | 21 +-
.../src/common/modules/table/locations/index.js | 19 +
.../table/locations/table.locations.tpl.html | 19 +
.../parameters/TableParametersController.js | 21 +-
.../common/modules/table/parameters/index.js | 19 +
.../table/parameters/table.parameters.tpl.html | 19 +
.../table/profiles/TableProfilesController.js | 21 +-
.../src/common/modules/table/profiles/index.js | 19 +
.../table/profiles/table.profiles.tpl.html | 19 +
.../table/regions/TableRegionsController.js | 21 +-
.../src/common/modules/table/regions/index.js | 19 +
.../table/regions/table.regions.tpl.html | 19 +
.../table/servers/TableServersController.js | 21 +-
.../src/common/modules/table/servers/index.js | 19 +
.../table/servers/table.servers.tpl.html | 19 +
.../table/statuses/TableStatusesController.js | 21 +-
.../src/common/modules/table/statuses/index.js | 19 +
.../table/statuses/table.statuses.tpl.html | 19 +
.../table/tenants/TableTenantsController.js | 21 +-
.../src/common/modules/table/tenants/index.js | 19 +
.../table/tenants/table.tenants.tpl.html | 19 +
.../modules/table/types/TableTypesController.js | 21 +-
.../app/src/common/modules/table/types/index.js | 19 +
.../modules/table/types/table.types.tpl.html | 19 +
.../modules/table/users/TableUsersController.js | 21 +-
.../app/src/common/modules/table/users/index.js | 19 +
.../modules/table/users/table.users.tpl.html | 19 +
.../service/application/ApplicationService.js | 19 +
.../app/src/common/service/application/index.js | 21 +-
.../app/src/common/service/utils/FormUtils.js | 19 +
.../src/common/service/utils/LocationUtils.js | 19 +
.../app/src/common/service/utils/StringUtils.js | 19 +
.../ui/app/src/common/service/utils/index.js | 21 +-
.../ui/app/src/common/templates/master.tpl.html | 19 +
traffic_ops/experimental/ui/app/src/index.html | 19 +
.../modules/private/admin/AdminController.js | 21 +-
.../src/modules/private/admin/admin.tpl.html | 19 +
.../private/admin/asns/AsnsController.js | 21 +-
.../modules/private/admin/asns/asns.tpl.html | 19 +
.../modules/private/admin/asns/edit/index.js | 19 +
.../app/src/modules/private/admin/asns/index.js | 19 +
.../modules/private/admin/asns/list/index.js | 19 +
.../src/modules/private/admin/asns/new/index.js | 19 +
.../private/admin/cdns/CdnsController.js | 21 +-
.../modules/private/admin/cdns/cdns.tpl.html | 19 +
.../modules/private/admin/cdns/edit/index.js | 19 +
.../app/src/modules/private/admin/cdns/index.js | 19 +
.../modules/private/admin/cdns/list/index.js | 19 +
.../src/modules/private/admin/cdns/new/index.js | 19 +
.../admin/divisions/DivisionsController.js | 21 +-
.../private/admin/divisions/divisions.tpl.html | 19 +
.../private/admin/divisions/edit/index.js | 19 +
.../modules/private/admin/divisions/index.js | 19 +
.../private/admin/divisions/list/index.js | 19 +
.../private/admin/divisions/new/index.js | 19 +
.../ui/app/src/modules/private/admin/index.js | 19 +
.../admin/locations/LocationsController.js | 21 +-
.../private/admin/locations/edit/index.js | 19 +
.../modules/private/admin/locations/index.js | 19 +
.../private/admin/locations/list/index.js | 19 +
.../private/admin/locations/locations.tpl.html | 19 +
.../private/admin/locations/new/index.js | 19 +
.../admin/parameters/ParametersController.js | 21 +-
.../private/admin/parameters/edit/index.js | 19 +
.../modules/private/admin/parameters/index.js | 19 +
.../private/admin/parameters/list/index.js | 19 +
.../private/admin/parameters/new/index.js | 19 +
.../admin/parameters/parameters.tpl.html | 19 +
.../admin/profiles/ProfilesController.js | 21 +-
.../private/admin/profiles/edit/index.js | 19 +
.../src/modules/private/admin/profiles/index.js | 19 +
.../private/admin/profiles/list/index.js | 19 +
.../modules/private/admin/profiles/new/index.js | 19 +
.../private/admin/profiles/profiles.tpl.html | 19 +
.../private/admin/regions/RegionsController.js | 21 +-
.../modules/private/admin/regions/edit/index.js | 19 +
.../src/modules/private/admin/regions/index.js | 19 +
.../modules/private/admin/regions/list/index.js | 19 +
.../modules/private/admin/regions/new/index.js | 19 +
.../private/admin/regions/regions.tpl.html | 19 +
.../admin/statuses/StatusesController.js | 21 +-
.../private/admin/statuses/edit/index.js | 19 +
.../src/modules/private/admin/statuses/index.js | 19 +
.../private/admin/statuses/list/index.js | 19 +
.../modules/private/admin/statuses/new/index.js | 19 +
.../private/admin/statuses/statuses.tpl.html | 19 +
.../private/admin/tenants/TenantsController.js | 21 +-
.../modules/private/admin/tenants/edit/index.js | 19 +
.../src/modules/private/admin/tenants/index.js | 19 +
.../modules/private/admin/tenants/list/index.js | 19 +
.../modules/private/admin/tenants/new/index.js | 19 +
.../private/admin/tenants/tenants.tpl.html | 19 +
.../private/admin/types/TypesController.js | 21 +-
.../modules/private/admin/types/edit/index.js | 19 +
.../src/modules/private/admin/types/index.js | 19 +
.../modules/private/admin/types/list/index.js | 19 +
.../modules/private/admin/types/new/index.js | 19 +
.../modules/private/admin/types/types.tpl.html | 19 +
.../private/admin/users/UsersController.js | 21 +-
.../modules/private/admin/users/edit/index.js | 19 +
.../src/modules/private/admin/users/index.js | 19 +
.../modules/private/admin/users/list/index.js | 19 +
.../modules/private/admin/users/new/index.js | 19 +
.../modules/private/admin/users/users.tpl.html | 19 +
.../private/configure/ConfigureController.js | 21 +-
.../cacheGroups/CacheGroupsController.js | 21 +-
.../configure/cacheGroups/cacheGroups.tpl.html | 19 +
.../private/configure/cacheGroups/edit/index.js | 19 +
.../private/configure/cacheGroups/index.js | 19 +
.../private/configure/cacheGroups/list/index.js | 19 +
.../private/configure/cacheGroups/new/index.js | 19 +
.../private/configure/configure.tpl.html | 19 +
.../DeliveryServicesController.js | 21 +-
.../deliveryServices/deliveryServices.tpl.html | 19 +
.../configure/deliveryServices/edit/index.js | 19 +
.../private/configure/deliveryServices/index.js | 19 +
.../configure/deliveryServices/list/index.js | 19 +
.../configure/deliveryServices/new/index.js | 19 +
.../app/src/modules/private/configure/index.js | 19 +
.../configure/servers/ServersController.js | 21 +-
.../private/configure/servers/edit/index.js | 19 +
.../modules/private/configure/servers/index.js | 19 +
.../private/configure/servers/list/index.js | 19 +
.../private/configure/servers/new/index.js | 19 +
.../private/configure/servers/servers.tpl.html | 19 +
.../ui/app/src/modules/private/index.js | 19 +
.../private/monitor/MonitorController.js | 21 +-
.../monitor/dashboards/DashboardsController.js | 21 +-
.../monitor/dashboards/dashboards.tpl.html | 19 +
.../modules/private/monitor/dashboards/index.js | 19 +
.../dashboards/one/DashboardsOneController.js | 21 +-
.../dashboards/one/dashboards.one.tpl.html | 21 +-
.../private/monitor/dashboards/one/index.js | 19 +
.../three/DashboardsThreeController.js | 21 +-
.../dashboards/three/dashboards.three.tpl.html | 19 +
.../private/monitor/dashboards/three/index.js | 19 +
.../dashboards/two/DashboardsTwoController.js | 21 +-
.../dashboards/two/dashboards.two.tpl.html | 19 +
.../private/monitor/dashboards/two/index.js | 19 +
.../ui/app/src/modules/private/monitor/index.js | 19 +
.../modules/private/monitor/monitor.tpl.html | 19 +
.../ui/app/src/modules/private/private.tpl.html | 19 +
.../src/modules/private/user/UserController.js | 19 +
.../private/user/edit/UserEditController.js | 19 +
.../app/src/modules/private/user/edit/index.js | 19 +
.../ui/app/src/modules/private/user/index.js | 19 +
.../app/src/modules/private/user/user.tpl.html | 19 +
.../ui/app/src/modules/public/index.js | 19 +
.../src/modules/public/login/LoginController.js | 19 +
.../ui/app/src/modules/public/login/index.js | 21 +-
.../app/src/modules/public/login/login.tpl.html | 19 +
.../ui/app/src/modules/public/public.tpl.html | 19 +
.../experimental/ui/app/src/package.json | 1 +
.../experimental/ui/app/src/scripts/config.js | 21 +-
.../ui/app/src/scripts/shared-libs.js | 19 +
.../experimental/ui/app/src/styles/main.scss | 2 +
.../ui/app/src/trafficOps_release.json | 5 -
.../ui/app/src/traffic_ops_release.json | 5 +
traffic_ops/experimental/ui/build/Dockerfile | 56 ++
traffic_ops/experimental/ui/build/README.md | 63 ++
traffic_ops/experimental/ui/build/build_rpm.sh | 57 ++
.../ui/build/etc/init.d/traffic_ops_v2 | 135 ++++
.../ui/build/etc/logrotate.d/traffic_ops_v2 | 8 +
.../build/etc/logrotate.d/traffic_ops_v2-access | 8 +
traffic_ops/experimental/ui/build/run-build.sh | 37 +
.../experimental/ui/build/traffic_ops_v2.spec | 89 +++
.../experimental/ui/conf/config-template.js | 49 ++
traffic_ops/experimental/ui/conf/config.js | 19 +
.../experimental/ui/grunt/browserify2.js | 19 +
traffic_ops/experimental/ui/grunt/clean.js | 21 +-
traffic_ops/experimental/ui/grunt/compass.js | 21 +-
traffic_ops/experimental/ui/grunt/copy.js | 19 +
traffic_ops/experimental/ui/grunt/express.js | 19 +
.../experimental/ui/grunt/globalConfig.js | 19 +
traffic_ops/experimental/ui/grunt/html2js.js | 21 +-
.../ui/grunt/install-dependencies.js | 19 +
traffic_ops/experimental/ui/grunt/jshint.js | 21 +-
traffic_ops/experimental/ui/grunt/ngconstant.js | 19 +
traffic_ops/experimental/ui/grunt/uglify.js | 21 +-
traffic_ops/experimental/ui/grunt/watch.js | 21 +-
traffic_ops/experimental/ui/server/server.js | 27 +-
traffic_ops/goto/README.md | 2 +-
traffic_ops/goto/api.go | 1 -
traffic_ops/goto/index.html | 19 +
traffic_ops/goto/js/main.js | 19 +
traffic_ops/goto/mooseFixture/mooseFixture.go | 1 -
.../goto/outputFormatter/outputFormatter.go | 1 -
traffic_ops/goto/sqlParser/sqlMapInit.go | 20 +
traffic_ops/goto/sqlParser/sqlParser.go | 1 -
traffic_ops/goto/sqlParser/sqlTypeMap.go | 1 -
traffic_ops/goto/urlParser/urlParser.go | 1 -
traffic_ops/install/README | 1 -
.../install/bin/build_trafficops_perl_library | 1 -
traffic_ops/install/bin/download_web_deps | 1 -
traffic_ops/install/bin/generateCert | 1 -
traffic_ops/install/bin/get_parameters.go | 1 -
traffic_ops/install/bin/migratedb | 1 -
traffic_ops/install/bin/postinstall | 1 -
traffic_ops/install/bin/web_deps.txt | 1 -
traffic_ops/install/data/perl/osversions.cfg | 1 -
traffic_ops/install/etc/README | 1 -
.../go/src/comcast.com/create_db/create_db.go | 1 -
.../go/src/comcast.com/csv2json/csv2json.go | 1 -
.../go/src/comcast.com/dataload/dataload.go | 1 -
.../go/src/comcast.com/systemtest/systemtest.go | 1 -
traffic_ops/install/lib/InstallUtils.pm | 18 +
traffic_ops/install/lib/WebDep.pm | 1 -
traffic_portal/Gruntfile.js | 1 -
traffic_portal/app/src/AppController.js | 1 -
traffic_portal/app/src/app.js | 1 -
traffic_portal/app/src/assets/css/custom.css | 1 -
.../app/src/common/api/AuthService.js | 1 -
.../src/common/api/DeliveryServiceService.js | 1 -
.../app/src/common/api/HealthService.js | 1 -
.../app/src/common/api/PortalService.js | 1 -
.../app/src/common/api/StatsService.js | 1 -
.../app/src/common/api/UserService.js | 1 -
traffic_portal/app/src/common/api/index.js | 1 -
.../common/directives/enter/EnterDirective.js | 1 -
.../app/src/common/directives/enter/index.js | 1 -
.../formattedDate/FormattedDateDirective.js | 1 -
.../common/directives/formattedDate/index.js | 1 -
.../common/directives/match/MatchDirective.js | 1 -
.../app/src/common/directives/match/index.js | 1 -
.../directives/rcSubmit/RCSubmitDirective.js | 1 -
.../app/src/common/directives/rcSubmit/index.js | 1 -
.../rcVerifySet/RCVerifySetDirective.js | 1 -
.../src/common/directives/rcVerifySet/index.js | 1 -
.../selectOnClick/SelectOnClickDirective.js | 1 -
.../common/directives/selectOnClick/index.js | 1 -
.../app/src/common/filters/DateRangeFilter.js | 1 -
.../app/src/common/filters/OffsetFilter.js | 1 -
.../app/src/common/filters/PartitionFilter.js | 1 -
.../app/src/common/filters/PercentFilter.js | 1 -
.../app/src/common/filters/UnitsFilter.js | 1 -
traffic_portal/app/src/common/filters/index.js | 1 -
.../app/src/common/models/AuthModel.js | 1 -
.../app/src/common/models/ChartModel.js | 1 -
.../src/common/models/DeliveryServicesModel.js | 1 -
.../app/src/common/models/MessageModel.js | 1 -
.../app/src/common/models/PropertiesModel.js | 1 -
.../app/src/common/models/UserModel.js | 1 -
traffic_portal/app/src/common/models/index.js | 1 -
.../cacheGroups/CacheGroupsController.js | 1 -
.../modules/cacheGroups/_cacheGroups.scss | 1 -
.../modules/cacheGroups/cacheGroups.tpl.html | 1 -
.../app/src/common/modules/cacheGroups/index.js | 1 -
.../app/src/common/modules/chart/_chart.scss | 1 -
.../ChartBandwidthPerSecondController.js | 1 -
.../_chart.bandwidthPerSecond.scss | 1 -
.../chart.bandwidthPerSecond.tpl.html | 1 -
.../modules/chart/bandwidthPerSecond/index.js | 1 -
.../chart/capacity/ChartCapacityController.js | 1 -
.../modules/chart/capacity/_chart.capacity.scss | 1 -
.../chart/capacity/chart.capacity.tpl.html | 1 -
.../src/common/modules/chart/capacity/index.js | 1 -
.../modules/chart/dates/ChartDatesController.js | 1 -
.../modules/chart/dates/_chart.dates.scss | 1 -
.../modules/chart/dates/chart.dates.tpl.html | 1 -
.../app/src/common/modules/chart/dates/index.js | 1 -
.../httpStatus/ChartHttpStatusController.js | 1 -
.../chart/httpStatus/_chart.httpStatus.scss | 1 -
.../chart/httpStatus/chart.httpStatus.tpl.html | 1 -
.../common/modules/chart/httpStatus/index.js | 1 -
.../chart/routing/ChartRoutingController.js | 1 -
.../modules/chart/routing/_chart.routing.scss | 1 -
.../chart/routing/chart.routing.tpl.html | 1 -
.../src/common/modules/chart/routing/index.js | 1 -
.../ChartTransactionsPerSecondController.js | 1 -
.../_chart.transactionsPerSecond.scss | 1 -
.../chart.transactionsPerSecond.tpl.html | 1 -
.../chart/transactionsPerSecond/index.js | 1 -
.../src/common/modules/dates/DatesController.js | 1 -
.../app/src/common/modules/dates/_dates.scss | 1 -
.../app/src/common/modules/dates/dates.tpl.html | 1 -
.../app/src/common/modules/dates/index.js | 1 -
.../config/edit/DSConfigEditController.js | 1 -
.../edit/_deliveryService.config.edit.scss | 1 -
.../edit/deliveryService.config.edit.tpl.html | 1 -
.../deliveryService/config/edit/index.js | 1 -
.../dialog/confirm/DialogConfirmController.js | 1 -
.../modules/dialog/confirm/_dialog.confirm.scss | 1 -
.../dialog/confirm/dialog.confirm.tpl.html | 1 -
.../src/common/modules/dialog/confirm/index.js | 1 -
.../dialog/reset/DialogResetController.js | 1 -
.../modules/dialog/reset/_dialog.reset.scss | 1 -
.../modules/dialog/reset/dialog.reset.tpl.html | 1 -
.../src/common/modules/dialog/reset/index.js | 1 -
.../common/modules/footer/FooterController.js | 1 -
.../src/common/modules/footer/footer.tpl.html | 1 -
.../app/src/common/modules/footer/index.js | 1 -
.../common/modules/header/HeaderController.js | 1 -
.../app/src/common/modules/header/_header.scss | 1 -
.../src/common/modules/header/header.tpl.html | 1 -
.../app/src/common/modules/header/index.js | 1 -
.../common/modules/message/MessageController.js | 1 -
.../src/common/modules/message/_message.scss | 1 -
.../app/src/common/modules/message/index.js | 1 -
.../src/common/modules/message/message.tpl.html | 1 -
.../release/version/ReleaseVersionController.js | 1 -
.../release/version/_release.version.scss | 1 -
.../src/common/modules/release/version/index.js | 1 -
.../release/version/release.version.tpl.html | 1 -
.../modules/tools/purge/ToolsPurgeController.js | 1 -
.../modules/tools/purge/_tools.purge.scss | 1 -
.../app/src/common/modules/tools/purge/index.js | 1 -
.../modules/tools/purge/tools.purge.tpl.html | 1 -
.../service/application/ApplicationService.js | 1 -
.../app/src/common/service/application/index.js | 1 -
.../app/src/common/service/utils/ChartUtils.js | 1 -
.../app/src/common/service/utils/FormUtils.js | 1 -
.../app/src/common/service/utils/JSONUtils.js | 19 +
.../app/src/common/service/utils/NumberUtils.js | 1 -
.../src/common/service/utils/date/DateUtils.js | 19 +
.../app/src/common/service/utils/date/index.js | 1 -
.../app/src/common/service/utils/index.js | 1 -
.../app/src/common/templates/master.tpl.html | 1 -
traffic_portal/app/src/index.html | 1 -
.../private/collateral/CollateralController.js | 1 -
.../modules/private/collateral/_collateral.scss | 1 -
.../private/collateral/collateral.tpl.html | 1 -
.../app/src/modules/private/collateral/index.js | 1 -
.../private/dashboard/DashboardController.js | 1 -
.../modules/private/dashboard/_dashboard.scss | 1 -
.../private/dashboard/dashboard.tpl.html | 1 -
.../app/src/modules/private/dashboard/index.js | 1 -
.../DashboardDeliveryServicesController.js | 1 -
.../_dashboard.deliveryServices.scss | 1 -
.../dashboard.deliveryServices.tpl.html | 1 -
.../modules/private/dashboard/overview/index.js | 1 -
.../DeliveryServiceController.js | 1 -
.../deliveryService/_deliveryService.scss | 1 -
.../deliveryService/deliveryService.tpl.html | 1 -
.../modules/private/deliveryService/index.js | 1 -
.../new/DeliveryServiceNewController.js | 1 -
.../new/_deliveryService.new.scss | 1 -
.../new/deliveryService.new.tpl.html | 1 -
.../private/deliveryService/new/index.js | 1 -
.../view/DeliveryServiceViewController.js | 1 -
.../view/_deliveryService.view.scss | 1 -
.../DeliveryServiceViewChartsController.js | 1 -
.../charts/_deliveryService.view.charts.scss | 1 -
.../view/charts/bandwidthPerSecond/index.js | 1 -
.../charts/deliveryService.view.charts.tpl.html | 1 -
.../view/charts/httpStatus/index.js | 1 -
.../deliveryService/view/charts/index.js | 1 -
.../view/charts/transactionsPerSecond/index.js | 1 -
.../view/deliveryService.view.tpl.html | 1 -
.../private/deliveryService/view/index.js | 1 -
.../DeliveryServiceViewOverviewController.js | 1 -
.../_deliveryService.view.overview.scss | 1 -
.../deliveryService.view.overview.tpl.html | 1 -
.../view/overview/detail/index.js | 1 -
.../deliveryService/view/overview/index.js | 1 -
traffic_portal/app/src/modules/private/index.js | 1 -
.../app/src/modules/private/private.tpl.html | 1 -
.../src/modules/private/user/UserController.js | 1 -
.../app/src/modules/private/user/_user.scss | 1 -
.../private/user/edit/UserEditController.js | 1 -
.../modules/private/user/edit/_user.edit.scss | 1 -
.../app/src/modules/private/user/edit/index.js | 1 -
.../private/user/edit/user.edit.tpl.html | 1 -
.../app/src/modules/private/user/index.js | 1 -
.../user/register/UserRegisterController.js | 1 -
.../private/user/register/_user.register.scss | 1 -
.../src/modules/private/user/register/index.js | 1 -
.../private/user/reset/UserResetController.js | 1 -
.../modules/private/user/reset/_user.reset.scss | 1 -
.../app/src/modules/private/user/reset/index.js | 1 -
.../app/src/modules/private/user/user.tpl.html | 1 -
.../src/modules/public/about/AboutController.js | 1 -
.../app/src/modules/public/about/_about.scss | 1 -
.../app/src/modules/public/about/about.tpl.html | 1 -
.../app/src/modules/public/about/index.js | 1 -
.../src/modules/public/home/HomeController.js | 1 -
.../app/src/modules/public/home/_home.scss | 1 -
.../app/src/modules/public/home/home.tpl.html | 1 -
.../app/src/modules/public/home/index.js | 1 -
.../src/modules/public/home/landing/index.js | 1 -
traffic_portal/app/src/modules/public/index.js | 1 -
.../app/src/modules/public/public.tpl.html | 1 -
traffic_portal/app/src/scripts/shared-libs.js | 1 -
traffic_portal/app/src/styles/main.scss | 1 -
traffic_portal/app/src/styles/variables.scss | 1 -
traffic_portal/build/build_rpm.sh | 1 -
traffic_portal/build/traffic_portal.spec | 1 -
traffic_portal/conf/config-template.js | 1 -
traffic_portal/conf/config.js | 1 -
traffic_portal/grunt/browserify2.js | 1 -
traffic_portal/grunt/clean.js | 1 -
traffic_portal/grunt/compass.js | 1 -
traffic_portal/grunt/copy.js | 1 -
traffic_portal/grunt/express.js | 1 -
traffic_portal/grunt/globalConfig.js | 1 -
traffic_portal/grunt/html2js.js | 1 -
traffic_portal/grunt/install-dependencies.js | 1 -
traffic_portal/grunt/jshint.js | 1 -
traffic_portal/grunt/ngconstant.js | 1 -
traffic_portal/grunt/uglify.js | 1 -
traffic_portal/grunt/watch.js | 1 -
traffic_portal/server/server.js | 1 -
traffic_router/build/build_rpm.sh | 1 -
traffic_router/build/pom.xml | 2 -
traffic_router/configuration/pom.xml | 20 +
.../configuration/ConfigurationListener.java | 1 -
traffic_router/connector/.classpath | 1 -
traffic_router/connector/build/pmd/ruleset.xml | 1 -
traffic_router/connector/pom.xml | 1 -
.../traffic_router/protocol/LanguidPoller.java | 1 -
.../protocol/LanguidProtocol.java | 1 -
.../protocol/RouterJsseFactory.java | 1 -
.../protocol/RouterSslImplementation.java | 1 -
.../protocol/RouterSslServerSocketFactory.java | 1 -
.../secure/CertificateDataConverter.java | 1 -
.../secure/CertificateDataListener.java | 1 -
.../secure/CertificateDecoder.java | 1 -
.../secure/CertificateRegistry.java | 1 -
.../traffic_router/secure/HandshakeData.java | 1 -
.../traffic_router/secure/KeyManager.java | 1 -
.../traffic_router/secure/Pkcs.java | 1 -
.../traffic_router/secure/Pkcs1.java | 1 -
.../traffic_router/secure/Pkcs8.java | 1 -
.../secure/PrivateKeyDecoder.java | 1 -
.../tomcat/TomcatLifecycleListener.java | 1 -
.../protocol/RouterSslImplementationTest.java | 1 -
.../RouterSslServerSocketFactoryTest.java | 1 -
.../secure/CertificateDataConverterTest.java | 1 -
.../secure/CertificateDataListenerTest.java | 1 -
.../java/secure/CertificateRegistryTest.java | 1 -
.../src/test/java/secure/KeyManagerTest.java | 1 -
.../secure/TomcatLifecycleListenerTest.java | 1 -
traffic_router/core/build/pmd/ruleset.xml | 1 -
traffic_router/core/pom.xml | 1 -
.../core/src/main/conf/cache.properties | 1 -
.../core/src/main/conf/dns.properties | 1 -
.../core/src/main/conf/http.properties | 1 -
.../core/src/main/conf/log4j.properties | 1 -
.../src/main/conf/traffic_monitor.properties | 1 -
.../core/src/main/conf/traffic_ops.properties | 1 -
traffic_router/core/src/main/etc/init.d/tomcat | 1 -
.../controllers/ConsistentHashController.java | 1 -
.../api/controllers/CoverageZoneController.java | 1 -
.../controllers/DeliveryServicesController.java | 1 -
.../api/controllers/LocationController.java | 1 -
.../api/controllers/StatsController.java | 1 -
.../api/controllers/SteeringController.java | 1 -
.../api/controllers/ZonesController.java | 1 -
.../traffic_router/core/cache/Cache.java | 1 -
.../core/cache/CacheLocation.java | 1 -
.../core/cache/CacheLocationManager.java | 1 -
.../core/cache/CacheRegister.java | 1 -
.../traffic_router/core/cache/InetRecord.java | 1 -
.../traffic_router/core/cache/Resolver.java | 1 -
.../core/config/CertificateChecker.java | 1 -
.../core/config/ConfigHandler.java | 1 -
.../core/config/ParseException.java | 1 -
.../core/config/WatcherConfig.java | 1 -
.../core/dns/DNSAccessEventBuilder.java | 1 -
.../core/dns/DNSAccessRecord.java | 1 -
.../traffic_router/core/dns/DNSException.java | 1 -
.../core/dns/DNSKeyPairWrapper.java | 1 -
.../traffic_router/core/dns/NameServer.java | 1 -
.../traffic_router/core/dns/NameServerMain.java | 1 -
.../core/dns/SignatureManager.java | 1 -
.../traffic_router/core/dns/SignedZoneKey.java | 1 -
.../traffic_router/core/dns/ZoneKey.java | 1 -
.../traffic_router/core/dns/ZoneManager.java | 1 -
.../traffic_router/core/dns/ZoneUtils.java | 1 -
.../core/dns/protocol/AbstractProtocol.java | 1 -
.../core/dns/protocol/Protocol.java | 1 -
.../traffic_router/core/dns/protocol/TCP.java | 1 -
.../traffic_router/core/dns/protocol/UDP.java | 1 -
.../traffic_router/core/ds/DeliveryService.java | 1 -
.../core/ds/DeliveryServiceMatcher.java | 1 -
.../traffic_router/core/ds/Dispersion.java | 1 -
.../traffic_router/core/ds/Steering.java | 1 -
.../traffic_router/core/ds/SteeringFilter.java | 1 -
.../core/ds/SteeringRegistry.java | 1 -
.../traffic_router/core/ds/SteeringTarget.java | 1 -
.../traffic_router/core/ds/SteeringWatcher.java | 1 -
.../core/hash/ConsistentHasher.java | 1 -
.../core/hash/DefaultHashable.java | 1 -
.../traffic_router/core/hash/Hashable.java | 1 -
.../core/hash/MD5HashFunction.java | 1 -
.../core/hash/NumberSearcher.java | 1 -
.../core/http/HTTPAccessEventBuilder.java | 1 -
.../core/http/HTTPAccessRecord.java | 1 -
.../core/http/HttpAccessRequestHeaders.java | 1 -
.../traffic_router/core/http/RouterFilter.java | 1 -
.../core/loc/AbstractServiceUpdater.java | 3 +-
.../traffic_router/core/loc/Federation.java | 1 -
.../core/loc/FederationMapping.java | 1 -
.../core/loc/FederationMappingBuilder.java | 1 -
.../core/loc/FederationRegistry.java | 1 -
.../core/loc/FederationsBuilder.java | 1 -
.../core/loc/FederationsWatcher.java | 1 -
.../core/loc/GeolocationDatabaseUpdater.java | 1 -
.../core/loc/MaxmindGeolocationService.java | 1 -
.../traffic_router/core/loc/NetworkNode.java | 1 -
.../core/loc/NetworkNodeException.java | 1 -
.../traffic_router/core/loc/NetworkUpdater.java | 1 -
.../traffic_router/core/loc/RegionalGeo.java | 1 -
.../core/loc/RegionalGeoDsvc.java | 1 -
.../core/loc/RegionalGeoResult.java | 1 -
.../core/loc/RegionalGeoRule.java | 1 -
.../core/loc/RegionalGeoUpdater.java | 1 -
.../core/monitor/TrafficMonitorResourceUrl.java | 1 -
.../core/monitor/TrafficMonitorWatcher.java | 1 -
.../traffic_router/core/request/DNSRequest.java | 1 -
.../core/request/HTTPRequest.java | 1 -
.../traffic_router/core/request/Request.java | 1 -
.../core/request/RequestMatcher.java | 1 -
.../core/router/CacheLocationComparator.java | 1 -
.../core/router/DNSRouteResult.java | 1 -
.../core/router/HTTPRouteResult.java | 1 -
.../traffic_router/core/router/RouteResult.java | 1 -
.../traffic_router/core/router/StatTracker.java | 1 -
.../core/router/TrafficRouter.java | 1 -
.../core/router/TrafficRouterManager.java | 1 -
.../core/secure/CertificatesClient.java | 1 -
.../core/secure/CertificatesPoller.java | 1 -
.../core/secure/CertificatesPublisher.java | 20 +
.../core/secure/CertificatesResponse.java | 1 -
.../core/status/model/CacheModel.java | 1 -
.../core/status/model/LocationModel.java | 1 -
.../core/util/AbstractResourceWatcher.java | 1 -
.../core/util/AbstractUpdatable.java | 1 -
.../traffic_router/core/util/CidrAddress.java | 1 -
.../core/util/ComparableStringByLength.java | 1 -
.../core/util/ComparableTreeSet.java | 1 -
.../traffic_router/core/util/Config.java | 1 -
.../traffic_router/core/util/DataExporter.java | 1 -
.../core/util/DefaultResourceUrl.java | 1 -
.../core/util/FederationExporter.java | 1 -
.../traffic_router/core/util/Fetcher.java | 1 -
.../traffic_router/core/util/LanguidState.java | 1 -
.../core/util/PeriodicResourceUpdater.java | 1 -
.../core/util/ProtectedFetcher.java | 1 -
.../traffic_router/core/util/ResourceUrl.java | 1 -
.../core/util/StringProtector.java | 1 -
.../core/util/TrafficOpsUtils.java | 1 -
.../core/src/main/opt/tomcat/conf/server.xml | 1 -
.../main/resources/applicationProperties.xml | 1 -
.../src/main/resources/dns-traffic-router.xml | 1 -
.../core/src/main/resources/version.prop | 1 -
.../core/src/main/scripts/postinstall.sh | 1 -
.../core/src/main/scripts/preinstall.sh | 1 -
.../core/src/main/scripts/preremove.sh | 1 -
.../main/webapp/WEB-INF/applicationContext.xml | 1 -
.../src/main/webapp/WEB-INF/status-servlet.xml | 1 -
.../core/src/main/webapp/WEB-INF/web.xml | 1 -
.../core/src/main/webapp/clientaccesspolicy.xml | 1 -
.../core/src/main/webapp/crossdomain.xml | 1 -
traffic_router/core/src/main/webapp/index.html | 1 -
.../core/src/test/conf/cache.properties | 1 -
.../core/CatalinaTrafficRouter.java | 1 -
.../traffic_router/core/TestBase.java | 1 -
.../traffic_router/core/TrafficRouterStart.java | 1 -
.../core/cache/CacheRegisterTest.java | 1 -
.../core/config/CertificateCheckerTest.java | 1 -
.../core/config/ConfigHandlerTest.java | 1 -
.../core/dns/DNSAccessEventBuilderTest.java | 1 -
.../core/dns/DNSExceptionTest.java | 1 -
.../core/dns/NameServerMainTest.java | 1 -
.../core/dns/ZoneManagerTest.java | 1 -
.../core/dns/ZoneManagerUnitTest.java | 1 -
.../core/dns/protocol/AbstractProtocolTest.java | 1 -
.../core/dns/protocol/TCPTest.java | 1 -
.../core/dns/protocol/UDPTest.java | 1 -
.../core/ds/DeliveryServiceMatcherTest.java | 1 -
.../core/ds/DeliveryServiceTest.java | 1 -
.../core/ds/SteeringRegistryTest.java | 1 -
.../core/external/ConsistentHashTest.java | 1 -
.../core/external/CoverageZoneTest.java | 1 -
.../core/external/DeliveryServicesTest.java | 1 -
.../core/external/ExternalTestSuite.java | 1 -
.../core/external/HttpDataServer.java | 1 -
.../core/external/LocationsTest.java | 1 -
.../core/external/RouterTest.java | 1 -
.../traffic_router/core/external/StatsTest.java | 1 -
.../core/external/SteeringTest.java | 1 -
.../traffic_router/core/external/ZonesTest.java | 1 -
.../core/hashing/BinarySearchTest.java | 1 -
.../core/hashing/ConsistentHasherTest.java | 1 -
.../core/hashing/HashableTest.java | 1 -
.../core/hashing/NumberSearcherTest.java | 1 -
.../core/http/HTTPAccessEventBuilderTest.java | 1 -
.../core/loc/CoverageZoneTest.java | 1 -
.../core/loc/FederationMappingBuilderTest.java | 1 -
.../core/loc/FederationRegistryTest.java | 1 -
.../core/loc/FederationsBuilderTest.java | 1 -
.../traffic_router/core/loc/GeoTest.java | 1 -
.../core/loc/MaxmindGeoIP2Test.java | 1 -
.../core/loc/MaxmindGeolocationServiceTest.java | 1 -
.../core/loc/NetworkNodeTest.java | 1 -
.../core/loc/NetworkNodeUnitTest.java | 1 -
.../core/loc/RegionalGeoRuleTest.java | 1 -
.../core/loc/RegionalGeoTest.java | 1 -
.../core/request/RequestMatcherTest.java | 1 -
.../router/CacheLocationComparatorTest.java | 1 -
.../core/router/CacheRegisterBuilder.java | 1 -
.../core/router/DNSRoutingMissesTest.java | 1 -
.../DeliveryServiceHTTPRoutingMissesTest.java | 1 -
.../core/router/DnsNameGenerator.java | 1 -
.../core/router/StatelessTrafficRouterTest.java | 1 -
.../TrafficRouterHTTPRoutingMissesTest.java | 1 -
.../core/router/TrafficRouterTest.java | 1 -
.../core/secure/CertificatesClientTest.java | 1 -
.../traffic_router/core/secure/Pkcs1Test.java | 1 -
.../core/util/ComparableStringByLengthTest.java | 1 -
.../traffic_router/core/util/ExternalTest.java | 1 -
.../traffic_router/core/util/FetcherTest.java | 1 -
.../core/util/IntegrationTest.java | 1 -
traffic_router/geolocation/pom.xml | 20 +
.../traffic_router/geolocation/Geolocation.java | 1 -
.../geolocation/GeolocationException.java | 1 -
.../geolocation/GeolocationService.java | 1 -
.../test/java/geolocation/GeolocationTest.java | 1 -
traffic_router/neustar/pom.xml | 20 +
.../neustar/NeustarGeolocationService.java | 1 -
.../configuration/NeustarConfiguration.java | 1 -
.../neustar/configuration/ServiceRefresher.java | 1 -
.../TrafficRouterConfigurationListener.java | 1 -
.../traffic_router/neustar/data/HttpClient.java | 1 -
.../neustar/data/NeustarDatabaseUpdater.java | 1 -
.../neustar/data/TarExtractor.java | 1 -
.../neustar/files/FilesMover.java | 1 -
.../PeriodicUpdateConfigurationTest.java | 1 -
.../configuration/ServiceRefresherTest.java | 1 -
.../TrafficRouterConfigurationListenerTest.java | 1 -
.../java/data/NeustarDatabaseUpdaterTest.java | 1 -
.../src/test/java/data/TarExtractorTest.java | 1 -
.../src/test/java/files/FilesMoverTest.java | 1 -
.../NeustarGeolocationServiceTest.java | 1 -
.../neustar/GPDatabaseReaderBuilderTest.java | 1 -
traffic_router/pom.xml | 1 -
traffic_router/shared/build/pmd/ruleset.xml | 1 -
traffic_router/shared/pom.xml | 22 +-
.../traffic_router/shared/Certificate.java | 1 -
.../traffic_router/shared/CertificateData.java | 1 -
.../shared/DeliveryServiceCertificates.java | 1 -
.../DeliveryServiceCertificatesMBean.java | 1 -
.../shared/DeliveryServiceCertificatesTest.java | 1 -
traffic_stats/build/build_rpm.sh | 1 -
traffic_stats/build/traffic_stats.spec | 13 +-
traffic_stats/grafana/traffic_ops_cachegroup.js | 1 -
.../grafana/traffic_ops_deliveryservice.js | 1 -
traffic_stats/grafana/traffic_ops_scripted.js | 1 -
traffic_stats/grafana/traffic_ops_server.js | 685 +++++++++++++++++--
.../influxdb_tools/create_ts_databases.go | 2 +
traffic_stats/traffic_stats.go | 2 +-
traffic_stats/traffic_stats_seelog.xml | 20 +
1682 files changed, 13904 insertions(+), 2788 deletions(-)
----------------------------------------------------------------------
[23/26] incubator-trafficcontrol git commit: merge master
Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_ops_api/v12/deliveryservice.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v12/deliveryservice.rst b/docs/source/development/traffic_ops_api/v12/deliveryservice.rst
index a6a6b66..9d86ffd 100644
--- a/docs/source/development/traffic_ops_api/v12/deliveryservice.rst
+++ b/docs/source/development/traffic_ops_api/v12/deliveryservice.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
@@ -25,9 +24,9 @@ Delivery Service
/api/1.2/deliveryservices
+++++++++++++++++++++++++
-**GET /api/1.2/deliveryservices.json**
+**GET /api/1.2/deliveryservices**
- Retrieves all delivery services. See also `Using Traffic Ops - Delivery Service <http://traffic-control-cdn.net/docs/latest/admin/traffic_ops_using.html#delivery-service>`_.
+ Retrieves all delivery services. See also `Using Traffic Ops - Delivery Service <http://trafficcontrol.apache.org/docs/latest/admin/traffic_ops_using.html#delivery-service>`_.
Authentication Required: Yes
@@ -64,8 +63,6 @@ Delivery Service
+--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
| ``edgeHeaderRewrite`` | string | The EDGE header rewrite actions to perform. |
+--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
- | ``exampleURLs`` | array | Entry points into the CDN for this deliveryservice. |
- +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
| ``geoLimitRedirectUrl`` | string | |
+--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
| ``geoLimit`` | string | - 0: None - no limitations |
@@ -107,8 +104,6 @@ Delivery Service
+--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
| ``longDesc2`` | string | Description field 2. |
+--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
- | ``matchList`` | array | Array of matchList hashes. |
- +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
| ``>>type`` | string | The type of MatchList (one of :ref:to-api-v11-types use_in_table='regex'). |
+--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
| ``>>setNumber`` | string | The set Number of the matchList. |
@@ -254,7 +249,7 @@ Delivery Service
**GET /api/1.2/deliveryservices/:id**
- Retrieves a specific delivery service. See also `Using Traffic Ops - Delivery Service <http://traffic-control-cdn.net/docs/latest/admin/traffic_ops_using.html#delivery-service>`_.
+ Retrieves a specific delivery service. See also `Using Traffic Ops - Delivery Service <http://trafficcontrol.apache.org/docs/latest/admin/traffic_ops_using.html#delivery-service>`_.
Authentication Required: Yes
@@ -482,7 +477,7 @@ Delivery Service
Health
++++++
-**GET /api/1.2/deliveryservices/:id/state.json**
+**GET /api/1.2/deliveryservices/:id/state**
Retrieves the failover state for a delivery service.
@@ -531,7 +526,7 @@ Health
|
-**GET /api/1.2/deliveryservices/:id/health.json**
+**GET /api/1.2/deliveryservices/:id/health**
Retrieves the health of all locations (cache groups) for a delivery service.
@@ -581,7 +576,7 @@ Health
|
-**GET /api/1.2/deliveryservices/:id/capacity.json**
+**GET /api/1.2/deliveryservices/:id/capacity**
Retrieves the capacity percentages of a delivery service.
@@ -629,7 +624,7 @@ Health
|
-**GET /api/1.2/deliveryservices/:id/routing.json**
+**GET /api/1.2/deliveryservices/:id/routing**
Retrieves the routing method percentages of a delivery service.
@@ -693,7 +688,7 @@ Health
Server
++++++
-**GET /api/1.2/deliveryserviceserver.json**
+**GET /api/1.2/deliveryserviceserver**
Authentication Required: Yes
@@ -749,7 +744,7 @@ Server
SSL Keys
+++++++++
-**GET /api/1.2/deliveryservices/xmlId/:xmlid/sslkeys.json**
+**GET /api/1.2/deliveryservices/xmlId/:xmlid/sslkeys**
Authentication Required: Yes
@@ -774,29 +769,34 @@ SSL Keys
**Response Properties**
- +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
- | Parameter | Type | Description |
- +==================+========+=========================================================================================================================================+
- | ``crt`` | string | base64 encoded crt file for delivery service |
- +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
- | ``csr`` | string | base64 encoded csr file for delivery service |
- +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
- | ``key`` | string | base64 encoded private key file for delivery service |
- +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
- | ``businessUnit`` | string | The business unit entered by the user when generating certs. Field is optional and if not provided by the user will not be in response |
- +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
- | ``city`` | string | The city entered by the user when generating certs. Field is optional and if not provided by the user will not be in response |
- +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
- | ``organization`` | string | The organization entered by the user when generating certs. Field is optional and if not provided by the user will not be in response |
- +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
- | ``hostname`` | string | The hostname entered by the user when generating certs. Field is optional and if not provided by the user will not be in response |
- +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
- | ``country`` | string | The country entered by the user when generating certs. Field is optional and if not provided by the user will not be in response |
- +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
- | ``state`` | string | The state entered by the user when generating certs. Field is optional and if not provided by the user will not be in response |
- +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
- | ``version`` | string | The version of the certificate record in Riak |
- +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+ +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+ | Parameter | Type | Description |
+ +=====================+========+=========================================================================================================================================+
+ | ``crt`` | string | base64 encoded crt file for delivery service |
+ +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+ | ``csr`` | string | base64 encoded csr file for delivery service |
+ +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+ | ``key`` | string | base64 encoded private key file for delivery service |
+ +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+ | ``cdn`` | string | The CDN of the delivery service for which the certs were generated. |
+ +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+ | ``deliveryservice`` | string | The XML ID of the delivery service for which the cert was generated. |
+ +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+ | ``businessUnit`` | string | The business unit entered by the user when generating certs. Field is optional and if not provided by the user will not be in response |
+ +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+ | ``city`` | string | The city entered by the user when generating certs. Field is optional and if not provided by the user will not be in response |
+ +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+ | ``organization`` | string | The organization entered by the user when generating certs. Field is optional and if not provided by the user will not be in response |
+ +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+ | ``hostname`` | string | The hostname generated by Traffic Ops that is used as the common name when generating the certificate. |
+ | | | This will be a FQDN for DNS delivery services and a wildcard URL for HTTP delivery services. |
+ +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+ | ``country`` | string | The country entered by the user when generating certs. Field is optional and if not provided by the user will not be in response |
+ +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+ | ``state`` | string | The state entered by the user when generating certs. Field is optional and if not provided by the user will not be in response |
+ +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+ | ``version`` | string | The version of the certificate record in Riak |
+ +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
**Response Example** ::
@@ -807,6 +807,8 @@ SSL Keys
"key": "key",
"csr": "csr"
},
+ "deliveryservice": "my-ds",
+ "cdn": "qa",
"businessUnit": "CDN_Eng",
"city": "Denver",
"organization": "KableTown",
@@ -819,7 +821,7 @@ SSL Keys
|
-**GET /api/1.2/deliveryservices/hostname/:hostname/sslkeys.json**
+**GET /api/1.2/deliveryservices/hostname/:hostname/sslkeys**
Authentication Required: Yes
@@ -844,29 +846,34 @@ SSL Keys
**Response Properties**
- +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
- | Parameter | Type | Description |
- +==================+========+=========================================================================================================================================+
- | ``crt`` | string | base64 encoded crt file for delivery service |
- +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
- | ``csr`` | string | base64 encoded csr file for delivery service |
- +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
- | ``key`` | string | base64 encoded private key file for delivery service |
- +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
- | ``businessUnit`` | string | The business unit entered by the user when generating certs. Field is optional and if not provided by the user will not be in response |
- +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
- | ``city`` | string | The city entered by the user when generating certs. Field is optional and if not provided by the user will not be in response |
- +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
- | ``organization`` | string | The organization entered by the user when generating certs. Field is optional and if not provided by the user will not be in response |
- +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
- | ``hostname`` | string | The hostname entered by the user when generating certs. Field is optional and if not provided by the user will not be in response |
- +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
- | ``country`` | string | The country entered by the user when generating certs. Field is optional and if not provided by the user will not be in response |
- +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
- | ``state`` | string | The state entered by the user when generating certs. Field is optional and if not provided by the user will not be in response |
- +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
- | ``version`` | string | The version of the certificate record in Riak |
- +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+ +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+ | Parameter | Type | Description |
+ +=====================+========+=========================================================================================================================================+
+ | ``crt`` | string | base64 encoded crt file for delivery service |
+ +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+ | ``csr`` | string | base64 encoded csr file for delivery service |
+ +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+ | ``key`` | string | base64 encoded private key file for delivery service |
+ +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+ | ``cdn`` | string | The CDN of the delivery service for which the certs were generated. |
+ +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+ | ``deliveryservice`` | string | The XML ID of the delivery service for which the cert was generated. |
+ +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+ | ``businessUnit`` | string | The business unit entered by the user when generating certs. Field is optional and if not provided by the user will not be in response |
+ +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+ | ``city`` | string | The city entered by the user when generating certs. Field is optional and if not provided by the user will not be in response |
+ +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+ | ``organization`` | string | The organization entered by the user when generating certs. Field is optional and if not provided by the user will not be in response |
+ +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+ | ``hostname`` | string | The hostname generated by Traffic Ops that is used as the common name when generating the certificate. |
+ | | | This will be a FQDN for DNS delivery services and a wildcard URL for HTTP delivery services. |
+ +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+ | ``country`` | string | The country entered by the user when generating certs. Field is optional and if not provided by the user will not be in response |
+ +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+ | ``state`` | string | The state entered by the user when generating certs. Field is optional and if not provided by the user will not be in response |
+ +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+ | ``version`` | string | The version of the certificate record in Riak |
+ +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
**Response Example** ::
@@ -877,6 +884,8 @@ SSL Keys
"key": "key",
"csr": "csr"
},
+ "deliveryservice": "my-ds",
+ "cdn": "qa",
"businessUnit": "CDN_Eng",
"city": "Denver",
"organization": "KableTown",
@@ -889,7 +898,7 @@ SSL Keys
|
-**GET /api/1.2/deliveryservices/xmlId/:xmlid/sslkeys/delete.json**
+**GET /api/1.2/deliveryservices/xmlId/:xmlid/sslkeys/delete**
Authentication Required: Yes
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_ops_api/v12/deliveryservice_stats.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v12/deliveryservice_stats.rst b/docs/source/development/traffic_ops_api/v12/deliveryservice_stats.rst
index 9d6c21f..8d9dadb 100644
--- a/docs/source/development/traffic_ops_api/v12/deliveryservice_stats.rst
+++ b/docs/source/development/traffic_ops_api/v12/deliveryservice_stats.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
@@ -27,7 +26,7 @@ Delivery Service Statistics
**GET /api/1.2/deliveryservice_stats.json**
- Retrieves statistics on the delivery services. See also `Using Traffic Ops - Delivery Service <http://traffic-control-cdn.net/docs/latest/admin/traffic_ops_using.html#delivery-service>`_.
+ Retrieves statistics on the delivery services. See also `Using Traffic Ops - Delivery Service <http://trafficcontrol.apache.org/docs/latest/admin/traffic_ops_using.html#delivery-service>`_.
Authentication Required: Yes
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_ops_api/v12/division.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v12/division.rst b/docs/source/development/traffic_ops_api/v12/division.rst
index 2d9403a..934c393 100644
--- a/docs/source/development/traffic_ops_api/v12/division.rst
+++ b/docs/source/development/traffic_ops_api/v12/division.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2016 Cisco
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_ops_api/v12/federation.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v12/federation.rst b/docs/source/development/traffic_ops_api/v12/federation.rst
index 54038a8..a15922e 100644
--- a/docs/source/development/traffic_ops_api/v12/federation.rst
+++ b/docs/source/development/traffic_ops_api/v12/federation.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_ops_api/v12/hwinfo.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v12/hwinfo.rst b/docs/source/development/traffic_ops_api/v12/hwinfo.rst
index 24ce897..2da59c5 100644
--- a/docs/source/development/traffic_ops_api/v12/hwinfo.rst
+++ b/docs/source/development/traffic_ops_api/v12/hwinfo.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_ops_api/v12/influxdb.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v12/influxdb.rst b/docs/source/development/traffic_ops_api/v12/influxdb.rst
index b2bdbd5..ca82cf5 100644
--- a/docs/source/development/traffic_ops_api/v12/influxdb.rst
+++ b/docs/source/development/traffic_ops_api/v12/influxdb.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_ops_api/v12/parameter.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v12/parameter.rst b/docs/source/development/traffic_ops_api/v12/parameter.rst
index 81c00c3..307d4c7 100644
--- a/docs/source/development/traffic_ops_api/v12/parameter.rst
+++ b/docs/source/development/traffic_ops_api/v12/parameter.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_ops_api/v12/phys_location.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v12/phys_location.rst b/docs/source/development/traffic_ops_api/v12/phys_location.rst
index 53c561f..b9e6cb6 100644
--- a/docs/source/development/traffic_ops_api/v12/phys_location.rst
+++ b/docs/source/development/traffic_ops_api/v12/phys_location.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_ops_api/v12/profile.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v12/profile.rst b/docs/source/development/traffic_ops_api/v12/profile.rst
index 5892272..bec8f9f 100644
--- a/docs/source/development/traffic_ops_api/v12/profile.rst
+++ b/docs/source/development/traffic_ops_api/v12/profile.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_ops_api/v12/profile_parameter.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v12/profile_parameter.rst b/docs/source/development/traffic_ops_api/v12/profile_parameter.rst
index bc16128..31b5789 100644
--- a/docs/source/development/traffic_ops_api/v12/profile_parameter.rst
+++ b/docs/source/development/traffic_ops_api/v12/profile_parameter.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_ops_api/v12/region.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v12/region.rst b/docs/source/development/traffic_ops_api/v12/region.rst
index 8129854..2fd96d9 100644
--- a/docs/source/development/traffic_ops_api/v12/region.rst
+++ b/docs/source/development/traffic_ops_api/v12/region.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_ops_api/v12/role.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v12/role.rst b/docs/source/development/traffic_ops_api/v12/role.rst
index 247c0cb..b993c97 100644
--- a/docs/source/development/traffic_ops_api/v12/role.rst
+++ b/docs/source/development/traffic_ops_api/v12/role.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_ops_api/v12/server.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v12/server.rst b/docs/source/development/traffic_ops_api/v12/server.rst
index 316f126..3700160 100644
--- a/docs/source/development/traffic_ops_api/v12/server.rst
+++ b/docs/source/development/traffic_ops_api/v12/server.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_ops_api/v12/static_dns.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v12/static_dns.rst b/docs/source/development/traffic_ops_api/v12/static_dns.rst
index 266dad4..0e44cec 100644
--- a/docs/source/development/traffic_ops_api/v12/static_dns.rst
+++ b/docs/source/development/traffic_ops_api/v12/static_dns.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_ops_api/v12/status.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v12/status.rst b/docs/source/development/traffic_ops_api/v12/status.rst
index e374527..a97a313 100644
--- a/docs/source/development/traffic_ops_api/v12/status.rst
+++ b/docs/source/development/traffic_ops_api/v12/status.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_ops_api/v12/system.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v12/system.rst b/docs/source/development/traffic_ops_api/v12/system.rst
index e2f5fe7..2740d22 100644
--- a/docs/source/development/traffic_ops_api/v12/system.rst
+++ b/docs/source/development/traffic_ops_api/v12/system.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_ops_api/v12/to_extension.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v12/to_extension.rst b/docs/source/development/traffic_ops_api/v12/to_extension.rst
index b4b05f8..44c0246 100644
--- a/docs/source/development/traffic_ops_api/v12/to_extension.rst
+++ b/docs/source/development/traffic_ops_api/v12/to_extension.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_ops_api/v12/topology.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v12/topology.rst b/docs/source/development/traffic_ops_api/v12/topology.rst
index 6c73832..89444f0 100644
--- a/docs/source/development/traffic_ops_api/v12/topology.rst
+++ b/docs/source/development/traffic_ops_api/v12/topology.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_ops_api/v12/type.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v12/type.rst b/docs/source/development/traffic_ops_api/v12/type.rst
index 4238fc7..6d614c5 100644
--- a/docs/source/development/traffic_ops_api/v12/type.rst
+++ b/docs/source/development/traffic_ops_api/v12/type.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_ops_api/v12/user.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v12/user.rst b/docs/source/development/traffic_ops_api/v12/user.rst
index e81292a..bbe0278 100644
--- a/docs/source/development/traffic_ops_api/v12/user.rst
+++ b/docs/source/development/traffic_ops_api/v12/user.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_portal.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_portal.rst b/docs/source/development/traffic_portal.rst
index 691c4b2..7135bc7 100644
--- a/docs/source/development/traffic_portal.rst
+++ b/docs/source/development/traffic_portal.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_router.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_router.rst b/docs/source/development/traffic_router.rst
index a9baaa3..6df7627 100644
--- a/docs/source/development/traffic_router.rst
+++ b/docs/source/development/traffic_router.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_router/traffic_router_api.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_router/traffic_router_api.rst b/docs/source/development/traffic_router/traffic_router_api.rst
index 00f3e8a..d742276 100644
--- a/docs/source/development/traffic_router/traffic_router_api.rst
+++ b/docs/source/development/traffic_router/traffic_router_api.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_server.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_server.rst b/docs/source/development/traffic_server.rst
index 25014b3..f8a78fb 100644
--- a/docs/source/development/traffic_server.rst
+++ b/docs/source/development/traffic_server.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_stats.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_stats.rst b/docs/source/development/traffic_stats.rst
index 4c78bec..02317f7 100644
--- a/docs/source/development/traffic_stats.rst
+++ b/docs/source/development/traffic_stats.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/faq/administration.rst
----------------------------------------------------------------------
diff --git a/docs/source/faq/administration.rst b/docs/source/faq/administration.rst
index a003811..feecff7 100644
--- a/docs/source/faq/administration.rst
+++ b/docs/source/faq/administration.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/faq/development.rst
----------------------------------------------------------------------
diff --git a/docs/source/faq/development.rst b/docs/source/faq/development.rst
index cb62481..8518eeb 100644
--- a/docs/source/faq/development.rst
+++ b/docs/source/faq/development.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
@@ -19,4 +18,4 @@ Development
How can I become involved?
==========================
- See our `CONTRIBUTING <https://github.com/Comcast/traffic_control/blob/master/CONTRIBUTING.md>`_ page.
\ No newline at end of file
+ See our `CONTRIBUTING <https://github.com/apache/incubator-trafficcontrol/blob/master/CONTRIBUTING.md>`_ page.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/faq/general.rst
----------------------------------------------------------------------
diff --git a/docs/source/faq/general.rst b/docs/source/faq/general.rst
index c2364e2..747aa60 100644
--- a/docs/source/faq/general.rst
+++ b/docs/source/faq/general.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
@@ -34,7 +33,7 @@ Who is using Traffic Control?
How do I get help with Traffic Control?
=======================================
- Hop on to our Slack Channel by filling out `this form <https://goo.gl/Suzakj>`_, or send a question to our google forum `here <https://groups.google.com/forum/#!forum/traffic_control>`_.
+ Hop on to our Slack Channel by filling out `this form <https://goo.gl/Suzakj>`_, or send a question to our mailing list `here <ma...@trafficcontrol.incubator.apache.org>`_.
What is Rascal?
===============
@@ -50,4 +49,4 @@ What is Twelve Monkeys?
What license is Traffic Control released under?
===============================================
- See the `LICENSE file <https://github.com/Comcast/traffic_control/blob/master/LICENSE>`_
+ See the `LICENSE file <https://github.com/apache/incubator-trafficcontrol/blob/master/LICENSE>`_
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/faq/index.rst
----------------------------------------------------------------------
diff --git a/docs/source/faq/index.rst b/docs/source/faq/index.rst
index c72fbe4..82ea912 100644
--- a/docs/source/faq/index.rst
+++ b/docs/source/faq/index.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/index.rst
----------------------------------------------------------------------
diff --git a/docs/source/index.rst b/docs/source/index.rst
index 2c49467..2a12096 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/overview/index.rst
----------------------------------------------------------------------
diff --git a/docs/source/overview/index.rst b/docs/source/overview/index.rst
index 095dda0..65dd20e 100644
--- a/docs/source/overview/index.rst
+++ b/docs/source/overview/index.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/overview/introduction.rst
----------------------------------------------------------------------
diff --git a/docs/source/overview/introduction.rst b/docs/source/overview/introduction.rst
index c379578..a983820 100644
--- a/docs/source/overview/introduction.rst
+++ b/docs/source/overview/introduction.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
@@ -18,7 +17,7 @@ Introduction
============
Traffic Control is a control plane for a CDN, which includes all of the components mentioned in the CDN Basics section, except for the Log File Analysis System. The caching software chosen for Traffic Control is `Apache Traffic Server <http://trafficserver.apache.org/>`_ (ATS). Although the current release only supports ATS as a cache, this may change with future releases.
-Traffic Control was first developed at Comcast for internal use and released to Open Source in April of 2015.
+Traffic Control was first developed at Comcast for internal use and released to Open Source in April of 2015. Traffic Control moved into the Apache Incubator in August of 2016.
Traffic Control implements the blue boxes in the architecture diagram below.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/overview/traffic_monitor.rst
----------------------------------------------------------------------
diff --git a/docs/source/overview/traffic_monitor.rst b/docs/source/overview/traffic_monitor.rst
index e25fcbc..1a3222f 100644
--- a/docs/source/overview/traffic_monitor.rst
+++ b/docs/source/overview/traffic_monitor.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/overview/traffic_ops.rst
----------------------------------------------------------------------
diff --git a/docs/source/overview/traffic_ops.rst b/docs/source/overview/traffic_ops.rst
index 59720e2..9cc72ee 100644
--- a/docs/source/overview/traffic_ops.rst
+++ b/docs/source/overview/traffic_ops.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/overview/traffic_portal.rst
----------------------------------------------------------------------
diff --git a/docs/source/overview/traffic_portal.rst b/docs/source/overview/traffic_portal.rst
index a52ee84..20325e4 100644
--- a/docs/source/overview/traffic_portal.rst
+++ b/docs/source/overview/traffic_portal.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/overview/traffic_router.rst
----------------------------------------------------------------------
diff --git a/docs/source/overview/traffic_router.rst b/docs/source/overview/traffic_router.rst
index 0f72a50..f9ed1bc 100644
--- a/docs/source/overview/traffic_router.rst
+++ b/docs/source/overview/traffic_router.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/overview/traffic_server.rst
----------------------------------------------------------------------
diff --git a/docs/source/overview/traffic_server.rst b/docs/source/overview/traffic_server.rst
index 8fd0e15..4928e4e 100644
--- a/docs/source/overview/traffic_server.rst
+++ b/docs/source/overview/traffic_server.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/overview/traffic_stats.rst
----------------------------------------------------------------------
diff --git a/docs/source/overview/traffic_stats.rst b/docs/source/overview/traffic_stats.rst
index 874b10d..10981de 100644
--- a/docs/source/overview/traffic_stats.rst
+++ b/docs/source/overview/traffic_stats.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/overview/traffic_vault.rst
----------------------------------------------------------------------
diff --git a/docs/source/overview/traffic_vault.rst b/docs/source/overview/traffic_vault.rst
index 33efdd3..933b86b 100644
--- a/docs/source/overview/traffic_vault.rst
+++ b/docs/source/overview/traffic_vault.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/infrastructure/docker/build/Dockerfile-traffic_monitor
----------------------------------------------------------------------
diff --git a/infrastructure/docker/build/Dockerfile-traffic_monitor b/infrastructure/docker/build/Dockerfile-traffic_monitor
index 286fe8f..cfa86c8 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_monitor
+++ b/infrastructure/docker/build/Dockerfile-traffic_monitor
@@ -1,3 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
FROM centos:7
MAINTAINER Dan Kirkwood
@@ -8,7 +24,7 @@ RUN yum -y install \
rpm-build && \
yum -y clean all
-ENV GITREPO=https://github.com/Comcast/traffic_control
+ENV GITREPO=https://github.com/apache/incubator-trafficcontrol
ENV BRANCH=master
# Above are common for all sub-projects.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/infrastructure/docker/build/Dockerfile-traffic_ops
----------------------------------------------------------------------
diff --git a/infrastructure/docker/build/Dockerfile-traffic_ops b/infrastructure/docker/build/Dockerfile-traffic_ops
index 87c6458..24878c7 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_ops
+++ b/infrastructure/docker/build/Dockerfile-traffic_ops
@@ -1,3 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
FROM centos:7
MAINTAINER Dan Kirkwood
@@ -26,7 +42,7 @@ RUN yum install -y \
# all ENV vars can be controlled by, e.g. `docker run -e BRANCH=1.6.x <image>`
-ENV GITREPO=https://github.com/Comcast/traffic_control
+ENV GITREPO=https://github.com/apache/incubator-trafficcontrol
ENV BRANCH=master
WORKDIR /repo
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/infrastructure/docker/build/Dockerfile-traffic_portal
----------------------------------------------------------------------
diff --git a/infrastructure/docker/build/Dockerfile-traffic_portal b/infrastructure/docker/build/Dockerfile-traffic_portal
index 5763459..7d535f5 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_portal
+++ b/infrastructure/docker/build/Dockerfile-traffic_portal
@@ -1,3 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
FROM centos:7
MAINTAINER Dan Kirkwood
@@ -8,7 +24,7 @@ RUN yum -y install \
rpm-build && \
yum -y clean all
-ENV GITREPO https://github.com/Comcast/traffic_control
+ENV GITREPO https://github.com/apache/incubator-trafficcontrol
ENV BRANCH master
WORKDIR /repo
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/infrastructure/docker/build/Dockerfile-traffic_router
----------------------------------------------------------------------
diff --git a/infrastructure/docker/build/Dockerfile-traffic_router b/infrastructure/docker/build/Dockerfile-traffic_router
index 733c738..e2188f9 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_router
+++ b/infrastructure/docker/build/Dockerfile-traffic_router
@@ -1,3 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
FROM centos:7
MAINTAINER Dan Kirkwood
@@ -8,7 +24,7 @@ RUN yum -y install \
rpm-build && \
yum -y clean all
-ENV GITREPO https://github.com/Comcast/traffic_control
+ENV GITREPO https://github.com/apache/incubator-trafficcontrol
ENV BRANCH master
WORKDIR /repo
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/infrastructure/docker/build/Dockerfile-traffic_stats
----------------------------------------------------------------------
diff --git a/infrastructure/docker/build/Dockerfile-traffic_stats b/infrastructure/docker/build/Dockerfile-traffic_stats
index dbf66c8..d669b03 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_stats
+++ b/infrastructure/docker/build/Dockerfile-traffic_stats
@@ -1,3 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
FROM centos:7
MAINTAINER Dan Kirkwood
@@ -8,7 +24,7 @@ RUN yum -y install \
rpm-build && \
yum -y clean all
-ENV GITREPO https://github.com/Comcast/traffic_control
+ENV GITREPO https://github.com/apache/incubator-trafficcontrol
ENV BRANCH master
WORKDIR /repo
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/infrastructure/docker/build/README.md
----------------------------------------------------------------------
diff --git a/infrastructure/docker/build/README.md b/infrastructure/docker/build/README.md
index 6e7a7bd..a600340 100644
--- a/infrastructure/docker/build/README.md
+++ b/infrastructure/docker/build/README.md
@@ -1,9 +1,9 @@
-# Building *traffic_control* using *docker-compose*
+# Building *trafficcontrol* using *docker-compose*
- install `docker-engine` and `docker-compose`
-- `cd traffic_control/infrastructure/docker/build`
-- `export GITREPO=https://github.com/<username>/traffic_control`
+- `cd incubator-trafficcontrol/infrastructure/docker/build`
+- `export GITREPO=https://github.com/<username>/incubator-trafficcontrol`
- `export BRANCH=mynewbranch`
- `docker-compose up traffic_monitor_build traffic_ops_build ...`
- new rpm files will be in `./artifacts`
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/infrastructure/docker/build/docker-compose.yml
----------------------------------------------------------------------
diff --git a/infrastructure/docker/build/docker-compose.yml b/infrastructure/docker/build/docker-compose.yml
index b219c5f..879446d 100644
--- a/infrastructure/docker/build/docker-compose.yml
+++ b/infrastructure/docker/build/docker-compose.yml
@@ -1,11 +1,27 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
---
-# Build configuration for traffic_control
+# Build configuration for trafficcontrol
# Usage:
# GITREPO=... BRANCH=... docker-compose up [<service>...]
#
-# where GITREPO is https path to traffic_control clone
-# (default: https://github.com/Comcast/traffic_control)
+# where GITREPO is https path to trafficcontrol clone
+# (default: https://github.com/apache/incubator-trafficcontrol)
# and <branch> is name of branch to test
# (default: master).
#
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/infrastructure/docker/build/run-build.sh
----------------------------------------------------------------------
diff --git a/infrastructure/docker/build/run-build.sh b/infrastructure/docker/build/run-build.sh
index cbe00a9..58127d8 100755
--- a/infrastructure/docker/build/run-build.sh
+++ b/infrastructure/docker/build/run-build.sh
@@ -1,20 +1,37 @@
#!/usr/bin/env bash
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
target=$1
[[ -z $target ]] && echo "No target specified"
echo "Building $target"
-echo "GITREPO=${GITREPO:=https://github.com/Comcast/traffic_control}"
+echo "GITREPO=${GITREPO:=https://github.com/apache/incubator-trafficcontrol}"
echo "BRANCH=${BRANCH:=master}"
+dir=$(basename $GITREPO)
set -x
-git clone $GITREPO -b $BRANCH traffic_control
+git clone "$GITREPO" -b "$BRANCH" $dir || echo "Clone failed: $!"
-cd traffic_control/$target
+cd $dir/$target
./build/build_rpm.sh
mkdir -p /artifacts
cp ../dist/* /artifacts/.
# Clean up for next build
cd -
-rm -r traffic_control
+rm -r $dir
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/infrastructure/docker/traffic_monitor/Dockerfile
----------------------------------------------------------------------
diff --git a/infrastructure/docker/traffic_monitor/Dockerfile b/infrastructure/docker/traffic_monitor/Dockerfile
index 01ef03d..a47227a 100644
--- a/infrastructure/docker/traffic_monitor/Dockerfile
+++ b/infrastructure/docker/traffic_monitor/Dockerfile
@@ -1,3 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
############################################################
# Dockerfile to build Traffic Monitor 1.6.0 container images
# Based on CentOS 6.6
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/infrastructure/docker/traffic_monitor/run.sh
----------------------------------------------------------------------
diff --git a/infrastructure/docker/traffic_monitor/run.sh b/infrastructure/docker/traffic_monitor/run.sh
index d109e44..b6269a9 100755
--- a/infrastructure/docker/traffic_monitor/run.sh
+++ b/infrastructure/docker/traffic_monitor/run.sh
@@ -1,4 +1,20 @@
#!/bin/bash
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
# Script for running the Dockerfile for Traffic Monitor.
# The Dockerfile sets up a Docker image which can be used for any new container;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/infrastructure/docker/traffic_ops/Dockerfile
----------------------------------------------------------------------
diff --git a/infrastructure/docker/traffic_ops/Dockerfile b/infrastructure/docker/traffic_ops/Dockerfile
index 444c3db..951f0dc 100644
--- a/infrastructure/docker/traffic_ops/Dockerfile
+++ b/infrastructure/docker/traffic_ops/Dockerfile
@@ -1,3 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
############################################################
# Dockerfile to build Traffic Ops 1.6.0 container images
# Based on CentOS 7.2
@@ -5,7 +21,7 @@
# Example Build and Run:
# docker network create cdnet
-# docker build --rm --tag traffic_ops:1.6.0 --build-arg=RPM=http://traffic-control-cdn.net/downloads/1.6.0/RELEASE-1.6.0/traffic_ops-1.6.0-3503.4899d302.x86_64.rpm traffic_ops
+# docker build --rm --tag traffic_ops:1.7.0 --build-arg=RPM=http://traffic-control-cdn.net/downloads/1.7.0/RELEASE-1.7.0/traffic_ops-1.7.0-3908.5b77f60f.x86_64.rpm traffic_ops
#
# docker run --name my-traffic-ops-mysql --hostname my-traffic-ops-mysql --net cdnet --env MYSQL_ROOT_PASSWORD=secretrootpass --detach mysql:5.5
#
@@ -18,7 +34,7 @@ RUN yum install -y perl cpanminus perl-Test-CPAN-Meta
RUN cpanm Carton
# Override RPM arg to use a different one using --build-arg RPM=... Can be local file or http://...
-ARG RPM=TODO
+ARG RPM=http://traffic-control-cdn.net/downloads/1.7.0/RELEASE-1.7.0/traffic_ops-1.7.0-3908.5b77f60f.x86_64.rpm
ADD $RPM /
RUN yum install -y /$(basename $RPM)
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/infrastructure/docker/traffic_ops/run.sh
----------------------------------------------------------------------
diff --git a/infrastructure/docker/traffic_ops/run.sh b/infrastructure/docker/traffic_ops/run.sh
index 3a44c8c..8672494 100755
--- a/infrastructure/docker/traffic_ops/run.sh
+++ b/infrastructure/docker/traffic_ops/run.sh
@@ -1,4 +1,20 @@
#!/bin/bash
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
# Script for running the Dockerfile for Traffic Ops.
# The Dockerfile sets up a Docker image which can be used for any new Traffic Ops container;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/infrastructure/docker/traffic_router/Dockerfile
----------------------------------------------------------------------
diff --git a/infrastructure/docker/traffic_router/Dockerfile b/infrastructure/docker/traffic_router/Dockerfile
index f8ae335..dc4d0fc 100644
--- a/infrastructure/docker/traffic_router/Dockerfile
+++ b/infrastructure/docker/traffic_router/Dockerfile
@@ -1,3 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
############################################################
# Dockerfile to build Traffic Router 1.4 container images
# Based on CentOS 6.6
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/infrastructure/docker/traffic_router/run.sh
----------------------------------------------------------------------
diff --git a/infrastructure/docker/traffic_router/run.sh b/infrastructure/docker/traffic_router/run.sh
index fcb15fe..9970ebc 100755
--- a/infrastructure/docker/traffic_router/run.sh
+++ b/infrastructure/docker/traffic_router/run.sh
@@ -1,4 +1,20 @@
#!/bin/bash
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
# Script for running the Dockerfile for Traffic Router.
# The Dockerfile sets up a Docker image which can be used for any new container;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/infrastructure/docker/traffic_server_edge/Dockerfile
----------------------------------------------------------------------
diff --git a/infrastructure/docker/traffic_server_edge/Dockerfile b/infrastructure/docker/traffic_server_edge/Dockerfile
index c379290..4cd059b 100644
--- a/infrastructure/docker/traffic_server_edge/Dockerfile
+++ b/infrastructure/docker/traffic_server_edge/Dockerfile
@@ -1,3 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
############################################################
# Dockerfile to build Traffic Server container images
# as Edges for Traffic Control 1.4
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/infrastructure/docker/traffic_server_edge/run.sh
----------------------------------------------------------------------
diff --git a/infrastructure/docker/traffic_server_edge/run.sh b/infrastructure/docker/traffic_server_edge/run.sh
index 98e45f5..d695973 100755
--- a/infrastructure/docker/traffic_server_edge/run.sh
+++ b/infrastructure/docker/traffic_server_edge/run.sh
@@ -1,4 +1,20 @@
#!/bin/bash
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
# Script for running the Dockerfile for Traffic Server Edge caches.
# The Dockerfile sets up a Docker image which can be used for any new container;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/infrastructure/docker/traffic_server_mid/Dockerfile
----------------------------------------------------------------------
diff --git a/infrastructure/docker/traffic_server_mid/Dockerfile b/infrastructure/docker/traffic_server_mid/Dockerfile
index b3a7001..33ff0cd 100644
--- a/infrastructure/docker/traffic_server_mid/Dockerfile
+++ b/infrastructure/docker/traffic_server_mid/Dockerfile
@@ -1,3 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
############################################################
# Dockerfile to build Traffic Server container images
# as Mids for Traffic Control 1.4
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/infrastructure/docker/traffic_server_mid/run.sh
----------------------------------------------------------------------
diff --git a/infrastructure/docker/traffic_server_mid/run.sh b/infrastructure/docker/traffic_server_mid/run.sh
index a6617b2..f4f8612 100755
--- a/infrastructure/docker/traffic_server_mid/run.sh
+++ b/infrastructure/docker/traffic_server_mid/run.sh
@@ -1,4 +1,20 @@
#!/bin/bash
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
# Script for running the Dockerfile for Traffic Server Mid caches.
# The Dockerfile sets up a Docker image which can be used for any new container;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/infrastructure/docker/traffic_stats/Dockerfile
----------------------------------------------------------------------
diff --git a/infrastructure/docker/traffic_stats/Dockerfile b/infrastructure/docker/traffic_stats/Dockerfile
index c363624..6881d07 100644
--- a/infrastructure/docker/traffic_stats/Dockerfile
+++ b/infrastructure/docker/traffic_stats/Dockerfile
@@ -1,3 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
############################################################
# Dockerfile to build Traffic Stats 1.4 container images
# Based on CentOS 6.6
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/infrastructure/docker/traffic_stats/run.sh
----------------------------------------------------------------------
diff --git a/infrastructure/docker/traffic_stats/run.sh b/infrastructure/docker/traffic_stats/run.sh
index 4ca54e5..7f91b64 100755
--- a/infrastructure/docker/traffic_stats/run.sh
+++ b/infrastructure/docker/traffic_stats/run.sh
@@ -1,4 +1,20 @@
#!/bin/bash
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
# Script for running the Dockerfile for Traffic Stats.
# The Dockerfile sets up a Docker image which can be used for any new container;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/infrastructure/docker/traffic_vault/Dockerfile
----------------------------------------------------------------------
diff --git a/infrastructure/docker/traffic_vault/Dockerfile b/infrastructure/docker/traffic_vault/Dockerfile
index 4e07403..4096336 100644
--- a/infrastructure/docker/traffic_vault/Dockerfile
+++ b/infrastructure/docker/traffic_vault/Dockerfile
@@ -1,3 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
############################################################
# Dockerfile to build Riak container images
# as Traffic Vault for Traffic Control 1.6.0
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/infrastructure/docker/traffic_vault/run.sh
----------------------------------------------------------------------
diff --git a/infrastructure/docker/traffic_vault/run.sh b/infrastructure/docker/traffic_vault/run.sh
index 023169a..a0c7485 100755
--- a/infrastructure/docker/traffic_vault/run.sh
+++ b/infrastructure/docker/traffic_vault/run.sh
@@ -1,4 +1,20 @@
#!/bin/bash
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# 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.
# Script for running the Dockerfile for Traffic Vault.
# The Dockerfile sets up a Docker image which can be used for any new container;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/infrastructure/test/api/traffic_ops/traffic_ops_test.go
----------------------------------------------------------------------
diff --git a/infrastructure/test/api/traffic_ops/traffic_ops_test.go b/infrastructure/test/api/traffic_ops/traffic_ops_test.go
index d79535b..1c3b96b 100644
--- a/infrastructure/test/api/traffic_ops/traffic_ops_test.go
+++ b/infrastructure/test/api/traffic_ops/traffic_ops_test.go
@@ -1,5 +1,25 @@
package main
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
import (
"github.com/Comcast/traffic_control/infrastructure/test/apitest"
"strconv"
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/infrastructure/test/api/traffic_ops/traffic_ops_tester.go
----------------------------------------------------------------------
diff --git a/infrastructure/test/api/traffic_ops/traffic_ops_tester.go b/infrastructure/test/api/traffic_ops/traffic_ops_tester.go
index a2d06b3..a9ed5ed 100644
--- a/infrastructure/test/api/traffic_ops/traffic_ops_tester.go
+++ b/infrastructure/test/api/traffic_ops/traffic_ops_tester.go
@@ -1,5 +1,25 @@
package main
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
+
import (
"errors"
"github.com/Comcast/traffic_control/infrastructure/test/apitest"
[14/26] incubator-trafficcontrol git commit: merge master
Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/cdn/view.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/cdn/view.html.ep b/traffic_ops/app/templates/cdn/view.html.ep
index 59fc429..08cd5d6 100644
--- a/traffic_ops/app/templates/cdn/view.html.ep
+++ b/traffic_ops/app/templates/cdn/view.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/change_log/changelog.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/change_log/changelog.html.ep b/traffic_ops/app/templates/change_log/changelog.html.ep
index b331914..0701618 100644
--- a/traffic_ops/app/templates/change_log/changelog.html.ep
+++ b/traffic_ops/app/templates/change_log/changelog.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/common/_error_list.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/common/_error_list.html.ep b/traffic_ops/app/templates/common/_error_list.html.ep
index e7d9ff8..50f6980 100644
--- a/traffic_ops/app/templates/common/_error_list.html.ep
+++ b/traffic_ops/app/templates/common/_error_list.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/common/_errors.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/common/_errors.html.ep b/traffic_ops/app/templates/common/_errors.html.ep
index 5a5fe4e..acd6c67 100644
--- a/traffic_ops/app/templates/common/_errors.html.ep
+++ b/traffic_ops/app/templates/common/_errors.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/common/_flash.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/common/_flash.html.ep b/traffic_ops/app/templates/common/_flash.html.ep
index 2e2f8b8..d6a0766 100644
--- a/traffic_ops/app/templates/common/_flash.html.ep
+++ b/traffic_ops/app/templates/common/_flash.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/config_files/genfiles.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/config_files/genfiles.html.ep b/traffic_ops/app/templates/config_files/genfiles.html.ep
index 2335fa3..4d19446 100644
--- a/traffic_ops/app/templates/config_files/genfiles.html.ep
+++ b/traffic_ops/app/templates/config_files/genfiles.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/delivery_service/_form.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/delivery_service/_form.html.ep b/traffic_ops/app/templates/delivery_service/_form.html.ep
index c4bfe7c..5f1cff5 100644
--- a/traffic_ops/app/templates/delivery_service/_form.html.ep
+++ b/traffic_ops/app/templates/delivery_service/_form.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/delivery_service/add.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/delivery_service/add.html.ep b/traffic_ops/app/templates/delivery_service/add.html.ep
index dfa5abb..085839e 100644
--- a/traffic_ops/app/templates/delivery_service/add.html.ep
+++ b/traffic_ops/app/templates/delivery_service/add.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/delivery_service/edit.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/delivery_service/edit.html.ep b/traffic_ops/app/templates/delivery_service/edit.html.ep
index 18eaebb..2980ce4 100644
--- a/traffic_ops/app/templates/delivery_service/edit.html.ep
+++ b/traffic_ops/app/templates/delivery_service/edit.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/delivery_service/index.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/delivery_service/index.html.ep b/traffic_ops/app/templates/delivery_service/index.html.ep
index 7cb0932..e034005 100644
--- a/traffic_ops/app/templates/delivery_service/index.html.ep
+++ b/traffic_ops/app/templates/delivery_service/index.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/delivery_service/request.mail.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/delivery_service/request.mail.ep b/traffic_ops/app/templates/delivery_service/request.mail.ep
index 57241b3..bb6a8a5 100644
--- a/traffic_ops/app/templates/delivery_service/request.mail.ep
+++ b/traffic_ops/app/templates/delivery_service/request.mail.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/delivery_service_server/cpdss_iframe.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/delivery_service_server/cpdss_iframe.html.ep b/traffic_ops/app/templates/delivery_service_server/cpdss_iframe.html.ep
index f7c9c60..faa3778 100644
--- a/traffic_ops/app/templates/delivery_service_server/cpdss_iframe.html.ep
+++ b/traffic_ops/app/templates/delivery_service_server/cpdss_iframe.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/delivery_service_server/edit.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/delivery_service_server/edit.html.ep b/traffic_ops/app/templates/delivery_service_server/edit.html.ep
index 588f9eb..269a92a 100644
--- a/traffic_ops/app/templates/delivery_service_server/edit.html.ep
+++ b/traffic_ops/app/templates/delivery_service_server/edit.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/division/add.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/division/add.html.ep b/traffic_ops/app/templates/division/add.html.ep
index e67460c..4f60b01 100644
--- a/traffic_ops/app/templates/division/add.html.ep
+++ b/traffic_ops/app/templates/division/add.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/division/edit.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/division/edit.html.ep b/traffic_ops/app/templates/division/edit.html.ep
index 5f88188..df69f7a 100644
--- a/traffic_ops/app/templates/division/edit.html.ep
+++ b/traffic_ops/app/templates/division/edit.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/division/index.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/division/index.html.ep b/traffic_ops/app/templates/division/index.html.ep
index 4890d2c..52f6222 100644
--- a/traffic_ops/app/templates/division/index.html.ep
+++ b/traffic_ops/app/templates/division/index.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/dnssec_keys/add.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/dnssec_keys/add.html.ep b/traffic_ops/app/templates/dnssec_keys/add.html.ep
index 5487336..37f9aa4 100644
--- a/traffic_ops/app/templates/dnssec_keys/add.html.ep
+++ b/traffic_ops/app/templates/dnssec_keys/add.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/dnssec_keys/addksk.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/dnssec_keys/addksk.html.ep b/traffic_ops/app/templates/dnssec_keys/addksk.html.ep
index 1fc60b7..8d5fa2c 100644
--- a/traffic_ops/app/templates/dnssec_keys/addksk.html.ep
+++ b/traffic_ops/app/templates/dnssec_keys/addksk.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/dnssec_keys/index.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/dnssec_keys/index.html.ep b/traffic_ops/app/templates/dnssec_keys/index.html.ep
index 67c52d6..edb202f 100644
--- a/traffic_ops/app/templates/dnssec_keys/index.html.ep
+++ b/traffic_ops/app/templates/dnssec_keys/index.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/dnssec_keys/manage.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/dnssec_keys/manage.html.ep b/traffic_ops/app/templates/dnssec_keys/manage.html.ep
index bb07d53..5d2ed13 100644
--- a/traffic_ops/app/templates/dnssec_keys/manage.html.ep
+++ b/traffic_ops/app/templates/dnssec_keys/manage.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/exception.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/exception.html.ep b/traffic_ops/app/templates/exception.html.ep
index 7c24cb6..d53a733 100644
--- a/traffic_ops/app/templates/exception.html.ep
+++ b/traffic_ops/app/templates/exception.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/federation/_form.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/federation/_form.html.ep b/traffic_ops/app/templates/federation/_form.html.ep
index 6c209c0..e4171ec 100644
--- a/traffic_ops/app/templates/federation/_form.html.ep
+++ b/traffic_ops/app/templates/federation/_form.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/federation/_listdeliveryservices.js.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/federation/_listdeliveryservices.js.html.ep b/traffic_ops/app/templates/federation/_listdeliveryservices.js.html.ep
index 2bba94a..4f3f936 100644
--- a/traffic_ops/app/templates/federation/_listdeliveryservices.js.html.ep
+++ b/traffic_ops/app/templates/federation/_listdeliveryservices.js.html.ep
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/federation/_listfederationusers.js.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/federation/_listfederationusers.js.html.ep b/traffic_ops/app/templates/federation/_listfederationusers.js.html.ep
index ce0986a..95484c8 100644
--- a/traffic_ops/app/templates/federation/_listfederationusers.js.html.ep
+++ b/traffic_ops/app/templates/federation/_listfederationusers.js.html.ep
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/federation/_listroles.js.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/federation/_listroles.js.html.ep b/traffic_ops/app/templates/federation/_listroles.js.html.ep
index 4e0a2cd..16d2fcf 100644
--- a/traffic_ops/app/templates/federation/_listroles.js.html.ep
+++ b/traffic_ops/app/templates/federation/_listroles.js.html.ep
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/federation/add.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/federation/add.html.ep b/traffic_ops/app/templates/federation/add.html.ep
index 1989e5c..4bfd1c0 100644
--- a/traffic_ops/app/templates/federation/add.html.ep
+++ b/traffic_ops/app/templates/federation/add.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/federation/edit.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/federation/edit.html.ep b/traffic_ops/app/templates/federation/edit.html.ep
index cb3b773..e3c806f 100644
--- a/traffic_ops/app/templates/federation/edit.html.ep
+++ b/traffic_ops/app/templates/federation/edit.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/federation/index.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/federation/index.html.ep b/traffic_ops/app/templates/federation/index.html.ep
index 39a1e4f..7c3fe4b 100644
--- a/traffic_ops/app/templates/federation/index.html.ep
+++ b/traffic_ops/app/templates/federation/index.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/gen_iso/geniso.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/gen_iso/geniso.html.ep b/traffic_ops/app/templates/gen_iso/geniso.html.ep
index c766cb1..2711685 100644
--- a/traffic_ops/app/templates/gen_iso/geniso.html.ep
+++ b/traffic_ops/app/templates/gen_iso/geniso.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/generic_uploader/generic.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/generic_uploader/generic.html.ep b/traffic_ops/app/templates/generic_uploader/generic.html.ep
index b3d84f6..7ab8d37 100644
--- a/traffic_ops/app/templates/generic_uploader/generic.html.ep
+++ b/traffic_ops/app/templates/generic_uploader/generic.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/hardware/hardware.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/hardware/hardware.html.ep b/traffic_ops/app/templates/hardware/hardware.html.ep
index d4f1388..1bef1d8 100644
--- a/traffic_ops/app/templates/hardware/hardware.html.ep
+++ b/traffic_ops/app/templates/hardware/hardware.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/help/about.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/help/about.html.ep b/traffic_ops/app/templates/help/about.html.ep
index f01e670..4e2afd0 100644
--- a/traffic_ops/app/templates/help/about.html.ep
+++ b/traffic_ops/app/templates/help/about.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/jmenu.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/jmenu.html.ep b/traffic_ops/app/templates/jmenu.html.ep
index 9e642d7..1137776 100644
--- a/traffic_ops/app/templates/jmenu.html.ep
+++ b/traffic_ops/app/templates/jmenu.html.ep
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/job/addagent.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/job/addagent.html.ep b/traffic_ops/app/templates/job/addagent.html.ep
index fef8e11..f7f9ccc 100644
--- a/traffic_ops/app/templates/job/addagent.html.ep
+++ b/traffic_ops/app/templates/job/addagent.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/job/addjob.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/job/addjob.html.ep b/traffic_ops/app/templates/job/addjob.html.ep
index 2999c09..11269ba 100644
--- a/traffic_ops/app/templates/job/addjob.html.ep
+++ b/traffic_ops/app/templates/job/addjob.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/job/jobs.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/job/jobs.html.ep b/traffic_ops/app/templates/job/jobs.html.ep
index 7618e73..5aacd00 100644
--- a/traffic_ops/app/templates/job/jobs.html.ep
+++ b/traffic_ops/app/templates/job/jobs.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/layouts/jquery.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/layouts/jquery.html.ep b/traffic_ops/app/templates/layouts/jquery.html.ep
index a76d7e2..0b22a6b 100644
--- a/traffic_ops/app/templates/layouts/jquery.html.ep
+++ b/traffic_ops/app/templates/layouts/jquery.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/layouts/nojquery.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/layouts/nojquery.html.ep b/traffic_ops/app/templates/layouts/nojquery.html.ep
index e03ba65..911b2de 100644
--- a/traffic_ops/app/templates/layouts/nojquery.html.ep
+++ b/traffic_ops/app/templates/layouts/nojquery.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/navbar.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/navbar.html.ep b/traffic_ops/app/templates/navbar.html.ep
index b8cd181..76b4ae2 100644
--- a/traffic_ops/app/templates/navbar.html.ep
+++ b/traffic_ops/app/templates/navbar.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/not_found.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/not_found.html.ep b/traffic_ops/app/templates/not_found.html.ep
index 6cfe41f..afa042f 100644
--- a/traffic_ops/app/templates/not_found.html.ep
+++ b/traffic_ops/app/templates/not_found.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/parameter/_form.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/parameter/_form.html.ep b/traffic_ops/app/templates/parameter/_form.html.ep
index 44deac4..02ebc14 100644
--- a/traffic_ops/app/templates/parameter/_form.html.ep
+++ b/traffic_ops/app/templates/parameter/_form.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/parameter/add.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/parameter/add.html.ep b/traffic_ops/app/templates/parameter/add.html.ep
index 7dda5e0..1431c11 100644
--- a/traffic_ops/app/templates/parameter/add.html.ep
+++ b/traffic_ops/app/templates/parameter/add.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/parameter/index.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/parameter/index.html.ep b/traffic_ops/app/templates/parameter/index.html.ep
index d926d50..4bc5f24 100644
--- a/traffic_ops/app/templates/parameter/index.html.ep
+++ b/traffic_ops/app/templates/parameter/index.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/parameter/view.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/parameter/view.html.ep b/traffic_ops/app/templates/parameter/view.html.ep
index e843ce4..f584b50 100644
--- a/traffic_ops/app/templates/parameter/view.html.ep
+++ b/traffic_ops/app/templates/parameter/view.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/phys_location/_form.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/phys_location/_form.html.ep b/traffic_ops/app/templates/phys_location/_form.html.ep
index 31c3f06..bc0dfc8 100644
--- a/traffic_ops/app/templates/phys_location/_form.html.ep
+++ b/traffic_ops/app/templates/phys_location/_form.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/phys_location/add.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/phys_location/add.html.ep b/traffic_ops/app/templates/phys_location/add.html.ep
index 14acd1c..1be6fa8 100644
--- a/traffic_ops/app/templates/phys_location/add.html.ep
+++ b/traffic_ops/app/templates/phys_location/add.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/phys_location/edit.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/phys_location/edit.html.ep b/traffic_ops/app/templates/phys_location/edit.html.ep
index c73406c..725e2f3 100644
--- a/traffic_ops/app/templates/phys_location/edit.html.ep
+++ b/traffic_ops/app/templates/phys_location/edit.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/phys_location/index.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/phys_location/index.html.ep b/traffic_ops/app/templates/phys_location/index.html.ep
index a7ddef6..74134cb 100644
--- a/traffic_ops/app/templates/phys_location/index.html.ep
+++ b/traffic_ops/app/templates/phys_location/index.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/phys_location/view.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/phys_location/view.html.ep b/traffic_ops/app/templates/phys_location/view.html.ep
index 3bfb29d..c2ca3e3 100644
--- a/traffic_ops/app/templates/phys_location/view.html.ep
+++ b/traffic_ops/app/templates/phys_location/view.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/profile/_form.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/profile/_form.html.ep b/traffic_ops/app/templates/profile/_form.html.ep
index d8ce133..5073c43 100644
--- a/traffic_ops/app/templates/profile/_form.html.ep
+++ b/traffic_ops/app/templates/profile/_form.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/profile/add.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/profile/add.html.ep b/traffic_ops/app/templates/profile/add.html.ep
index 449cf78..a46e60f 100644
--- a/traffic_ops/app/templates/profile/add.html.ep
+++ b/traffic_ops/app/templates/profile/add.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/profile/compareprofile.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/profile/compareprofile.html.ep b/traffic_ops/app/templates/profile/compareprofile.html.ep
index 91a63bf..c953599 100644
--- a/traffic_ops/app/templates/profile/compareprofile.html.ep
+++ b/traffic_ops/app/templates/profile/compareprofile.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/profile/edit.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/profile/edit.html.ep b/traffic_ops/app/templates/profile/edit.html.ep
index c467e8b..89ff72f 100644
--- a/traffic_ops/app/templates/profile/edit.html.ep
+++ b/traffic_ops/app/templates/profile/edit.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/profile/import.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/profile/import.html.ep b/traffic_ops/app/templates/profile/import.html.ep
index bf1073d..9b30c7b 100644
--- a/traffic_ops/app/templates/profile/import.html.ep
+++ b/traffic_ops/app/templates/profile/import.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/profile/index.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/profile/index.html.ep b/traffic_ops/app/templates/profile/index.html.ep
index f183482..6df8688 100644
--- a/traffic_ops/app/templates/profile/index.html.ep
+++ b/traffic_ops/app/templates/profile/index.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/profile/view.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/profile/view.html.ep b/traffic_ops/app/templates/profile/view.html.ep
index df69609..c24f53e 100644
--- a/traffic_ops/app/templates/profile/view.html.ep
+++ b/traffic_ops/app/templates/profile/view.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/rascal_status/health.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/rascal_status/health.html.ep b/traffic_ops/app/templates/rascal_status/health.html.ep
index 306611b..bc5b543 100644
--- a/traffic_ops/app/templates/rascal_status/health.html.ep
+++ b/traffic_ops/app/templates/rascal_status/health.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/region/_form.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/region/_form.html.ep b/traffic_ops/app/templates/region/_form.html.ep
index 264460c..9279bb7 100644
--- a/traffic_ops/app/templates/region/_form.html.ep
+++ b/traffic_ops/app/templates/region/_form.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/region/add.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/region/add.html.ep b/traffic_ops/app/templates/region/add.html.ep
index 6f20666..d968fbd 100644
--- a/traffic_ops/app/templates/region/add.html.ep
+++ b/traffic_ops/app/templates/region/add.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/region/edit.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/region/edit.html.ep b/traffic_ops/app/templates/region/edit.html.ep
index 0e561ba..32c8be6 100644
--- a/traffic_ops/app/templates/region/edit.html.ep
+++ b/traffic_ops/app/templates/region/edit.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/region/index.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/region/index.html.ep b/traffic_ops/app/templates/region/index.html.ep
index 7474fc1..9b6b31e 100644
--- a/traffic_ops/app/templates/region/index.html.ep
+++ b/traffic_ops/app/templates/region/index.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/server/add.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/server/add.html.ep b/traffic_ops/app/templates/server/add.html.ep
index f33711d..75cbdfc 100644
--- a/traffic_ops/app/templates/server/add.html.ep
+++ b/traffic_ops/app/templates/server/add.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/server/index.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/server/index.html.ep b/traffic_ops/app/templates/server/index.html.ep
index 4134cad..fb07e0d 100644
--- a/traffic_ops/app/templates/server/index.html.ep
+++ b/traffic_ops/app/templates/server/index.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/server/view.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/server/view.html.ep b/traffic_ops/app/templates/server/view.html.ep
index 0cf8ffd..62361fd 100644
--- a/traffic_ops/app/templates/server/view.html.ep
+++ b/traffic_ops/app/templates/server/view.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/server_check/server_check.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/server_check/server_check.html.ep b/traffic_ops/app/templates/server_check/server_check.html.ep
index b9ce17b..3c29a84 100644
--- a/traffic_ops/app/templates/server_check/server_check.html.ep
+++ b/traffic_ops/app/templates/server_check/server_check.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/ssl_keys/add.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/ssl_keys/add.html.ep b/traffic_ops/app/templates/ssl_keys/add.html.ep
index ad8988b..b7f95df 100644
--- a/traffic_ops/app/templates/ssl_keys/add.html.ep
+++ b/traffic_ops/app/templates/ssl_keys/add.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/static_dns_entry/edit.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/static_dns_entry/edit.html.ep b/traffic_ops/app/templates/static_dns_entry/edit.html.ep
index 7d7894e..ded8155 100644
--- a/traffic_ops/app/templates/static_dns_entry/edit.html.ep
+++ b/traffic_ops/app/templates/static_dns_entry/edit.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/steering/index.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/steering/index.html.ep b/traffic_ops/app/templates/steering/index.html.ep
index e4df27f..439e747 100644
--- a/traffic_ops/app/templates/steering/index.html.ep
+++ b/traffic_ops/app/templates/steering/index.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/tools/db_dump.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/tools/db_dump.html.ep b/traffic_ops/app/templates/tools/db_dump.html.ep
index 268bfc1..52d97c4 100644
--- a/traffic_ops/app/templates/tools/db_dump.html.ep
+++ b/traffic_ops/app/templates/tools/db_dump.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/tools/diff_crconfig_iframe.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/tools/diff_crconfig_iframe.html.ep b/traffic_ops/app/templates/tools/diff_crconfig_iframe.html.ep
index 02562cf..f17275e 100644
--- a/traffic_ops/app/templates/tools/diff_crconfig_iframe.html.ep
+++ b/traffic_ops/app/templates/tools/diff_crconfig_iframe.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/tools/invalidate_content.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/tools/invalidate_content.html.ep b/traffic_ops/app/templates/tools/invalidate_content.html.ep
index 00e0e56..fbe91d0 100644
--- a/traffic_ops/app/templates/tools/invalidate_content.html.ep
+++ b/traffic_ops/app/templates/tools/invalidate_content.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/tools/queue_updates.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/tools/queue_updates.html.ep b/traffic_ops/app/templates/tools/queue_updates.html.ep
index c45bf7f..1541767 100644
--- a/traffic_ops/app/templates/tools/queue_updates.html.ep
+++ b/traffic_ops/app/templates/tools/queue_updates.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/tools/snapshot_crconfig.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/tools/snapshot_crconfig.html.ep b/traffic_ops/app/templates/tools/snapshot_crconfig.html.ep
index 99c4a22..b0789d1 100644
--- a/traffic_ops/app/templates/tools/snapshot_crconfig.html.ep
+++ b/traffic_ops/app/templates/tools/snapshot_crconfig.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/tools/tools.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/tools/tools.html.ep b/traffic_ops/app/templates/tools/tools.html.ep
index cbda981..dd2cd23 100644
--- a/traffic_ops/app/templates/tools/tools.html.ep
+++ b/traffic_ops/app/templates/tools/tools.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/types/_form.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/types/_form.html.ep b/traffic_ops/app/templates/types/_form.html.ep
index cc827cf..0a04207 100644
--- a/traffic_ops/app/templates/types/_form.html.ep
+++ b/traffic_ops/app/templates/types/_form.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/types/add.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/types/add.html.ep b/traffic_ops/app/templates/types/add.html.ep
index 1593e65..d037114 100644
--- a/traffic_ops/app/templates/types/add.html.ep
+++ b/traffic_ops/app/templates/types/add.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/types/edit.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/types/edit.html.ep b/traffic_ops/app/templates/types/edit.html.ep
index 7862f12..cfda331 100644
--- a/traffic_ops/app/templates/types/edit.html.ep
+++ b/traffic_ops/app/templates/types/edit.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/types/index.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/types/index.html.ep b/traffic_ops/app/templates/types/index.html.ep
index b4947e6..20bb2cf 100644
--- a/traffic_ops/app/templates/types/index.html.ep
+++ b/traffic_ops/app/templates/types/index.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/types/view.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/types/view.html.ep b/traffic_ops/app/templates/types/view.html.ep
index f95c572..fe779a9 100644
--- a/traffic_ops/app/templates/types/view.html.ep
+++ b/traffic_ops/app/templates/types/view.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/update_js.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/update_js.html.ep b/traffic_ops/app/templates/update_js.html.ep
index 1fef7f6..bd0f7e1 100644
--- a/traffic_ops/app/templates/update_js.html.ep
+++ b/traffic_ops/app/templates/update_js.html.ep
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/upload_server_csv/uploadservercsv.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/upload_server_csv/uploadservercsv.html.ep b/traffic_ops/app/templates/upload_server_csv/uploadservercsv.html.ep
index 447f32b..79fa660 100644
--- a/traffic_ops/app/templates/upload_server_csv/uploadservercsv.html.ep
+++ b/traffic_ops/app/templates/upload_server_csv/uploadservercsv.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/user/_delivery_services.js.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/user/_delivery_services.js.html.ep b/traffic_ops/app/templates/user/_delivery_services.js.html.ep
index 7ac4a5d..91f2459 100644
--- a/traffic_ops/app/templates/user/_delivery_services.js.html.ep
+++ b/traffic_ops/app/templates/user/_delivery_services.js.html.ep
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/user/_form.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/user/_form.html.ep b/traffic_ops/app/templates/user/_form.html.ep
index 93bf18e..250c842 100644
--- a/traffic_ops/app/templates/user/_form.html.ep
+++ b/traffic_ops/app/templates/user/_form.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/user/_listroles.js.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/user/_listroles.js.html.ep b/traffic_ops/app/templates/user/_listroles.js.html.ep
index 024f654..f6e74bd 100644
--- a/traffic_ops/app/templates/user/_listroles.js.html.ep
+++ b/traffic_ops/app/templates/user/_listroles.js.html.ep
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/user/add.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/user/add.html.ep b/traffic_ops/app/templates/user/add.html.ep
index e1a1593..6b21d0c 100644
--- a/traffic_ops/app/templates/user/add.html.ep
+++ b/traffic_ops/app/templates/user/add.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/user/edit.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/user/edit.html.ep b/traffic_ops/app/templates/user/edit.html.ep
index 820fc5f..dd8c048 100644
--- a/traffic_ops/app/templates/user/edit.html.ep
+++ b/traffic_ops/app/templates/user/edit.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/user/index.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/user/index.html.ep b/traffic_ops/app/templates/user/index.html.ep
index 5d4296f..ad12079 100644
--- a/traffic_ops/app/templates/user/index.html.ep
+++ b/traffic_ops/app/templates/user/index.html.ep
@@ -1,5 +1,4 @@
-<!-- Copyright 2015 Comcast Cable Communications Management, LLC
-
+<!--
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
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/user/register.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/user/register.html.ep b/traffic_ops/app/templates/user/register.html.ep
index af6f809..c0a51aa 100644
--- a/traffic_ops/app/templates/user/register.html.ep
+++ b/traffic_ops/app/templates/user/register.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/user/registration.mail.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/user/registration.mail.ep b/traffic_ops/app/templates/user/registration.mail.ep
index d0542de..d9017e9 100644
--- a/traffic_ops/app/templates/user/registration.mail.ep
+++ b/traffic_ops/app/templates/user/registration.mail.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/user/reset_password.mail.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/user/reset_password.mail.ep b/traffic_ops/app/templates/user/reset_password.mail.ep
index ba93a01..925ab93 100644
--- a/traffic_ops/app/templates/user/reset_password.mail.ep
+++ b/traffic_ops/app/templates/user/reset_password.mail.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/utils/close_fancybox.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/utils/close_fancybox.html.ep b/traffic_ops/app/templates/utils/close_fancybox.html.ep
index 751820b..18c045e 100644
--- a/traffic_ops/app/templates/utils/close_fancybox.html.ep
+++ b/traffic_ops/app/templates/utils/close_fancybox.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/visual_status/daily_summary.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/visual_status/daily_summary.html.ep b/traffic_ops/app/templates/visual_status/daily_summary.html.ep
index 8c5dd3a..018f92f 100644
--- a/traffic_ops/app/templates/visual_status/daily_summary.html.ep
+++ b/traffic_ops/app/templates/visual_status/daily_summary.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/visual_status/graphs.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/visual_status/graphs.html.ep b/traffic_ops/app/templates/visual_status/graphs.html.ep
index f5ab148..551a8c1 100644
--- a/traffic_ops/app/templates/visual_status/graphs.html.ep
+++ b/traffic_ops/app/templates/visual_status/graphs.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/bin/supermicro_udev_mapper.pl
----------------------------------------------------------------------
diff --git a/traffic_ops/bin/supermicro_udev_mapper.pl b/traffic_ops/bin/supermicro_udev_mapper.pl
index 99bc6df..efaecb5 100755
--- a/traffic_ops/bin/supermicro_udev_mapper.pl
+++ b/traffic_ops/bin/supermicro_udev_mapper.pl
@@ -1,6 +1,5 @@
#!/usr/bin/perl
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/bin/traffic_ops_ort.pl
----------------------------------------------------------------------
diff --git a/traffic_ops/bin/traffic_ops_ort.pl b/traffic_ops/bin/traffic_ops_ort.pl
index 35cc97b..0d9f018 100755
--- a/traffic_ops/bin/traffic_ops_ort.pl
+++ b/traffic_ops/bin/traffic_ops_ort.pl
@@ -1,6 +1,5 @@
#!/usr/bin/perl
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -1343,7 +1342,7 @@ sub check_lwp_response_code {
return 1;
}
elsif ( $lwp_response->code() >= 400 ) {
- ( $log_level >> $panic_level ) && print $log_level_str . " $url returned HTTP " . $lwp_response->code() . "!\n";
+ ( $log_level >> $panic_level ) && print $log_level_str . " $url returned HTTP " . $lwp_response->code() . "! " . $lwp_response->message() . " \n";
exit 1 if ($log_level_str eq 'FATAL');
return 1;
}
@@ -2524,11 +2523,17 @@ sub adv_processing_ssl {
foreach my $keypair ( @{ $ssl_tracker->{'db_config'} } ) {
( $log_level >> $DEBUG ) && print "DEBUG Processing SSL key: " . $keypair->{'key_name'} . "\n";
-
my $remap = $keypair->{'key_name'};
$remap =~ s/\.key$//;
+ if ($remap !~ /^edge/) {
+ #remove routing name (ccr/tr) and add * for wildcard certs
+ $remap =~ /^(.*?)(\..*)/;
+ $remap = "*$2";
+ }
+ my $found = 0;
foreach my $record (@$certs){
if ($record->{'hostname'} eq $remap){
+ $found = 1;
my $ssl_key = decode_base64($record->{'certificate'}->{'key'});
my $ssl_cert = decode_base64($record->{'certificate'}->{'crt'});
( $log_level >> $DEBUG ) && print "DEBUG private key for $remap is:\n$ssl_key\n";
@@ -2547,6 +2552,11 @@ sub adv_processing_ssl {
$cfg_file_tracker->{ $keypair->{'cert_name'} }->{'fname-in-TO'} = $keypair->{'cert_name'};
}
}
+ #if no cert is found, log error and exit
+ if (!$found) {
+ ( $log_level >> $FATAL ) && print "FATAL SSL certificate for $remap not found!\n";
+ exit 1;
+ }
}
}
return 0;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/build/build_rpm.sh
----------------------------------------------------------------------
diff --git a/traffic_ops/build/build_rpm.sh b/traffic_ops/build/build_rpm.sh
index e3e89e0..9fec83c 100755
--- a/traffic_ops/build/build_rpm.sh
+++ b/traffic_ops/build/build_rpm.sh
@@ -1,7 +1,6 @@
#!/bin/bash
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/build/traffic_ops.spec
----------------------------------------------------------------------
diff --git a/traffic_ops/build/traffic_ops.spec b/traffic_ops/build/traffic_ops.spec
index fc6fa21..f358ea6 100644
--- a/traffic_ops/build/traffic_ops.spec
+++ b/traffic_ops/build/traffic_ops.spec
@@ -1,5 +1,4 @@
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/build/traffic_ops_ort.spec
----------------------------------------------------------------------
diff --git a/traffic_ops/build/traffic_ops_ort.spec b/traffic_ops/build/traffic_ops_ort.spec
index 31f4e77..f485b85 100644
--- a/traffic_ops/build/traffic_ops_ort.spec
+++ b/traffic_ops/build/traffic_ops_ort.spec
@@ -1,5 +1,4 @@
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/client/cachegroup.go
----------------------------------------------------------------------
diff --git a/traffic_ops/client/cachegroup.go b/traffic_ops/client/cachegroup.go
index bcc7c39..2505abb 100644
--- a/traffic_ops/client/cachegroup.go
+++ b/traffic_ops/client/cachegroup.go
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/client/cdn.go
----------------------------------------------------------------------
diff --git a/traffic_ops/client/cdn.go b/traffic_ops/client/cdn.go
index 91ecd6b..a32b5f1 100644
--- a/traffic_ops/client/cdn.go
+++ b/traffic_ops/client/cdn.go
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/client/crconfig.go
----------------------------------------------------------------------
diff --git a/traffic_ops/client/crconfig.go b/traffic_ops/client/crconfig.go
index 4283a8a..56b079e 100644
--- a/traffic_ops/client/crconfig.go
+++ b/traffic_ops/client/crconfig.go
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/client/delivery_service.go
----------------------------------------------------------------------
diff --git a/traffic_ops/client/delivery_service.go b/traffic_ops/client/delivery_service.go
index 39e196c..03817b5 100644
--- a/traffic_ops/client/delivery_service.go
+++ b/traffic_ops/client/delivery_service.go
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -18,138 +17,10 @@ package client
import "encoding/json"
-// DeliveryServiceResponse ...
-type DeliveryServiceResponse struct {
- Version string `json:"version"`
- Response []DeliveryService `json:"response"`
-}
-
-// DeliveryService ...
-type DeliveryService struct {
- ID string `json:"id"`
- XMLID string `json:"xmlId"`
- Active bool `json:"active"`
- DSCP string `json:"dscp"`
- Signed bool `json:"signed"`
- QStringIgnore string `json:"qstringIgnore"`
- GeoLimit string `json:"geoLimit"`
- GeoProvider string `json:"geoProvider"`
- HTTPBypassFQDN string `json:"httpBypassFqdn"`
- DNSBypassIP string `json:"dnsBypassIp"`
- DNSBypassIP6 string `json:"dnsBypassIp6"`
- DNSBypassCname string `json:"dnsBypassCname"`
- DNSBypassTTL string `json:"dnsBypassTtl"`
- OrgServerFQDN string `json:"orgServerFqdn"`
- Type string `json:"type"`
- ProfileName string `json:"profileName"`
- ProfileDesc string `json:"profileDescription"`
- CDNName string `json:"cdnName"`
- CCRDNSTTL string `json:"ccrDnsTtl"`
- GlobalMaxMBPS string `json:"globalMaxMbps"`
- GlobalMaxTPS string `json:"globalMaxTps"`
- LongDesc string `json:"longDesc"`
- LongDesc1 string `json:"longDesc1"`
- LongDesc2 string `json:"longDesc2"`
- MaxDNSAnswers string `json:"maxDnsAnswers"`
- InfoURL string `json:"infoUrl"`
- MissLat string `json:"missLat"`
- MissLong string `json:"missLong"`
- CheckPath string `json:"checkPath"`
- LastUpdated string `json:"lastUpdated"`
- Protocol string `json:"protocol"`
- IPV6RoutingEnabled bool `json:"ipv6RoutingEnabled"`
- RangeRequestHandling string `json:"rangeRequestHandling"`
- HeaderRewrite string `json:"headerRewrite"`
- EdgeHeaderRewrite string `json:"edgeHeaderRewrite"`
- MidHeaderRewrite string `json:"midHeaderRewrite"`
- TRResponseHeaders string `json:"trResponseHeaders"`
- RegexRemap string `json:"regexRemap"`
- CacheURL string `json:"cacheurl"`
- RemapText string `json:"remapText"`
- MultiSiteOrigin string `json:"multiSiteOrigin"`
- DisplayName string `json:"displayName"`
- InitialDispersion string `json:"initialDispersion"`
-}
-
-// DeliveryServiceStateResponse ...
-type DeliveryServiceStateResponse struct {
- Response DeliveryServiceState `json:"response"`
-}
-
-// DeliveryServiceState ...
-type DeliveryServiceState struct {
- Enabled bool `json:"enabled"`
- Failover DeliveryServiceFailover `json:"failover"`
-}
-
-// DeliveryServiceFailover ...
-type DeliveryServiceFailover struct {
- Locations []string `json:"locations"`
- Destination DeliveryServiceDestination `json:"destination"`
- Configured bool `json:"configured"`
- Enabled bool `json:"enabled"`
-}
-
-// DeliveryServiceDestination ...
-type DeliveryServiceDestination struct {
- Location string `json:"location"`
- Type string `json:"type"`
-}
-
-// DeliveryServiceHealthResponse ...
-type DeliveryServiceHealthResponse struct {
- Response DeliveryServiceHealth `json:"response"`
-}
-
-// DeliveryServiceHealth ...
-type DeliveryServiceHealth struct {
- TotalOnline int `json:"totalOnline"`
- TotalOffline int `json:"totalOffline"`
- CacheGroups []DeliveryServiceCacheGroup `json:"cacheGroups"`
-}
-
-// DeliveryServiceCacheGroup ...
-type DeliveryServiceCacheGroup struct {
- Online int `json:"online"`
- Offline int `json:"offline"`
- Name string `json:"name"`
-}
-
-// DeliveryServiceCapacityResponse ...
-type DeliveryServiceCapacityResponse struct {
- Response DeliveryServiceCapacity `json:"response"`
-}
-
-// DeliveryServiceCapacity ...
-type DeliveryServiceCapacity struct {
- AvailablePercent float64 `json:"availablePercent"`
- UnavailablePercent float64 `json:"unavailablePercent"`
- UtilizedPercent float64 `json:"utilizedPercent"`
- MaintenancePercent float64 `json:"maintenancePercent"`
-}
-
-// DeliveryServiceRoutingResponse ...
-type DeliveryServiceRoutingResponse struct {
- Response DeliveryServiceRouting `json:"response"`
-}
-
-// DeliveryServiceRouting ...
-type DeliveryServiceRouting struct {
- StaticRoute int `json:"staticRoute"`
- Miss int `json:"miss"`
- Geo float64 `json:"geo"`
- Err int `json:"err"`
- CZ float64 `json:"cz"`
- DSR float64 `json:"dsr"`
- Fed int `json:"fed"`
- RegionalAlternate int `json:"regionalAlternate"`
- RegionalDenied int `json:"regionalDenied"`
-}
-
// DeliveryServices gets an array of DeliveryServices
func (to *Session) DeliveryServices() ([]DeliveryService, error) {
var data DeliveryServiceResponse
- err := get(to, deliveryServicesEp(), &data)
+ err := makeReq(to, deliveryServicesEp(), nil, &data)
if err != nil {
return nil, err
}
@@ -160,7 +31,7 @@ func (to *Session) DeliveryServices() ([]DeliveryService, error) {
// DeliveryService gets the DeliveryService for the ID it's passed
func (to *Session) DeliveryService(id string) (*DeliveryService, error) {
var data DeliveryServiceResponse
- err := get(to, deliveryServiceEp(id), &data)
+ err := makeReq(to, deliveryServiceEp(id), nil, &data)
if err != nil {
return nil, err
}
@@ -168,10 +39,25 @@ func (to *Session) DeliveryService(id string) (*DeliveryService, error) {
return &data.Response[0], nil
}
+// CreateDeliveryService creates the DeliveryService it's passed
+func (to *Session) CreateDeliveryService(ds *DeliveryService) (*CreateDeliveryServiceResponse, error) {
+ var data CreateDeliveryServiceResponse
+ jsonReq, err := json.Marshal(ds)
+ if err != nil {
+ return nil, err
+ }
+ err = makeReq(to, deliveryServicesEp(), jsonReq, &data)
+ if err != nil {
+ return nil, err
+ }
+
+ return &data, nil
+}
+
// DeliveryServiceState gets the DeliveryServiceState for the ID it's passed
func (to *Session) DeliveryServiceState(id string) (*DeliveryServiceState, error) {
var data DeliveryServiceStateResponse
- err := get(to, deliveryServiceStateEp(id), &data)
+ err := makeReq(to, deliveryServiceStateEp(id), nil, &data)
if err != nil {
return nil, err
}
@@ -182,7 +68,7 @@ func (to *Session) DeliveryServiceState(id string) (*DeliveryServiceState, error
// DeliveryServiceHealth gets the DeliveryServiceHealth for the ID it's passed
func (to *Session) DeliveryServiceHealth(id string) (*DeliveryServiceHealth, error) {
var data DeliveryServiceHealthResponse
- err := get(to, deliveryServiceHealthEp(id), &data)
+ err := makeReq(to, deliveryServiceHealthEp(id), nil, &data)
if err != nil {
return nil, err
}
@@ -193,7 +79,7 @@ func (to *Session) DeliveryServiceHealth(id string) (*DeliveryServiceHealth, err
// DeliveryServiceCapacity gets the DeliveryServiceCapacity for the ID it's passed
func (to *Session) DeliveryServiceCapacity(id string) (*DeliveryServiceCapacity, error) {
var data DeliveryServiceCapacityResponse
- err := get(to, deliveryServiceCapacityEp(id), &data)
+ err := makeReq(to, deliveryServiceCapacityEp(id), nil, &data)
if err != nil {
return nil, err
}
@@ -204,7 +90,40 @@ func (to *Session) DeliveryServiceCapacity(id string) (*DeliveryServiceCapacity,
// DeliveryServiceRouting gets the DeliveryServiceRouting for the ID it's passed
func (to *Session) DeliveryServiceRouting(id string) (*DeliveryServiceRouting, error) {
var data DeliveryServiceRoutingResponse
- err := get(to, deliveryServiceRoutingEp(id), &data)
+ err := makeReq(to, deliveryServiceRoutingEp(id), nil, &data)
+ if err != nil {
+ return nil, err
+ }
+
+ return &data.Response, nil
+}
+
+// DeliveryServiceServer gets the DeliveryServiceServer
+func (to *Session) DeliveryServiceServer(page, limit string) ([]DeliveryServiceServer, error) {
+ var data DeliveryServiceServerResponse
+ err := makeReq(to, deliveryServiceServerEp(page, limit), nil, &data)
+ if err != nil {
+ return nil, err
+ }
+
+ return data.Response, nil
+}
+
+// DeliveryServiceSSLKeysByID gets the DeliveryServiceSSLKeys by ID
+func (to *Session) DeliveryServiceSSLKeysByID(id string) (*DeliveryServiceSSLKeys, error) {
+ var data DeliveryServiceSSLKeysResponse
+ err := makeReq(to, deliveryServiceSSLKeysByIDEp(id), nil, &data)
+ if err != nil {
+ return nil, err
+ }
+
+ return &data.Response, nil
+}
+
+// DeliveryServiceSSLKeysByHostname gets the DeliveryServiceSSLKeys by Hostname
+func (to *Session) DeliveryServiceSSLKeysByHostname(hostname string) (*DeliveryServiceSSLKeys, error) {
+ var data DeliveryServiceSSLKeysResponse
+ err := makeReq(to, deliveryServiceSSLKeysByHostnameEp(hostname), nil, &data)
if err != nil {
return nil, err
}
@@ -212,8 +131,8 @@ func (to *Session) DeliveryServiceRouting(id string) (*DeliveryServiceRouting, e
return &data.Response, nil
}
-func get(to *Session, endpoint string, respStruct interface{}) error {
- resp, err := to.request(endpoint, nil)
+func makeReq(to *Session, endpoint string, body []byte, respStruct interface{}) error {
+ resp, err := to.request(endpoint, body)
if err != nil {
return err
}
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/client/delivery_service_endpoints.go
----------------------------------------------------------------------
diff --git a/traffic_ops/client/delivery_service_endpoints.go b/traffic_ops/client/delivery_service_endpoints.go
index ba9ef2c..d07171f 100644
--- a/traffic_ops/client/delivery_service_endpoints.go
+++ b/traffic_ops/client/delivery_service_endpoints.go
@@ -1,5 +1,4 @@
/*
- Copyright 2016 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -16,14 +15,15 @@
package client
-const dsPath = "/api/1.2/deliveryservices"
+const apiBase = "/api/1.2"
+const dsPath = "/deliveryservices"
func deliveryServicesEp() string {
- return dsPath + ".json"
+ return apiBase + dsPath + ".json"
}
func deliveryServiceBaseEp(id string) string {
- return dsPath + "/" + id
+ return apiBase + dsPath + "/" + id
}
func deliveryServiceEp(id string) string {
@@ -45,3 +45,15 @@ func deliveryServiceCapacityEp(id string) string {
func deliveryServiceRoutingEp(id string) string {
return deliveryServiceBaseEp(id) + "/routing.json"
}
+
+func deliveryServiceServerEp(page, limit string) string {
+ return apiBase + "/deliveryserviceserver.json?page=" + page + "&limit=" + limit
+}
+
+func deliveryServiceSSLKeysByIDEp(id string) string {
+ return apiBase + dsPath + "/xmlId/" + id + "/sslkeys.json"
+}
+
+func deliveryServiceSSLKeysByHostnameEp(hostname string) string {
+ return apiBase + dsPath + "/hostname/" + hostname + "/sslkeys.json"
+}
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/client/delivery_service_endpoints_test.go
----------------------------------------------------------------------
diff --git a/traffic_ops/client/delivery_service_endpoints_test.go b/traffic_ops/client/delivery_service_endpoints_test.go
index 1a44a35..f698b72 100644
--- a/traffic_ops/client/delivery_service_endpoints_test.go
+++ b/traffic_ops/client/delivery_service_endpoints_test.go
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -93,3 +92,39 @@ func TestDeliveryServiceRoutingEp(t *testing.T) {
testHelper.Success(t, "Should be able to get the correct delivery service routing endpoint")
}
}
+
+func TestDeliveryServiceServerEp(t *testing.T) {
+ testHelper.Context(t, "Given the need to test that DeliveryServiceServer uses the correct URL")
+
+ ep := deliveryServiceServerEp("1", "2")
+ expected := "/api/1.2/deliveryserviceserver.json?page=1&limit=2"
+ if ep != expected {
+ testHelper.Error(t, "Should get back %s for \"deliveryServiceServerEp\", got: %s", expected, ep)
+ } else {
+ testHelper.Success(t, "Should be able to get the correct delivery service server endpoint")
+ }
+}
+
+func TestDeliveryServiceSSLKeysByIDEp(t *testing.T) {
+ testHelper.Context(t, "Given the need to test that DeliveryServiceSSLKeysByID uses the correct URL")
+
+ ep := deliveryServiceSSLKeysByIDEp("123")
+ expected := "/api/1.2/deliveryservices/xmlId/123/sslkeys.json"
+ if ep != expected {
+ testHelper.Error(t, "Should get back %s for \"deliveryServiceSSLKeysByIDEp\", got: %s", expected, ep)
+ } else {
+ testHelper.Success(t, "Should be able to get the correct delivery service SSL Keys by ID endpoint")
+ }
+}
+
+func TestDeliveryServiceSSLKeysByHostnameEp(t *testing.T) {
+ testHelper.Context(t, "Given the need to test that DeliveryServiceSSLKeysByHostname uses the correct URL")
+
+ ep := deliveryServiceSSLKeysByHostnameEp("some-host")
+ expected := "/api/1.2/deliveryservices/hostname/some-host/sslkeys.json"
+ if ep != expected {
+ testHelper.Error(t, "Should get back %s for \"deliveryServiceSSLKeysByHostnameEp\", got: %s", expected, ep)
+ } else {
+ testHelper.Success(t, "Should be able to get the correct delivery service SSL Keys by hostname endpoint")
+ }
+}
[08/26] incubator-trafficcontrol git commit: merge master
Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/admin/asns/edit/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/admin/asns/edit/index.js b/traffic_ops/experimental/ui/app/src/modules/private/admin/asns/edit/index.js
index 9f93f98..193297f 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/admin/asns/edit/index.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/admin/asns/edit/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.private.admin.asns.edit', [])
.config(function($stateProvider, $urlRouterProvider) {
$stateProvider
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/admin/asns/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/admin/asns/index.js b/traffic_ops/experimental/ui/app/src/modules/private/admin/asns/index.js
index 0c058cd..d82ca12 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/admin/asns/index.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/admin/asns/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.private.admin.asns', [])
.controller('AsnsController', require('./AsnsController'))
.config(function($stateProvider, $urlRouterProvider) {
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/admin/asns/list/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/admin/asns/list/index.js b/traffic_ops/experimental/ui/app/src/modules/private/admin/asns/list/index.js
index b19d510..b855dfe 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/admin/asns/list/index.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/admin/asns/list/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.private.admin.asns.list', [])
.config(function($stateProvider, $urlRouterProvider) {
$stateProvider
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/admin/asns/new/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/admin/asns/new/index.js b/traffic_ops/experimental/ui/app/src/modules/private/admin/asns/new/index.js
index 9953128..a5c077d 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/admin/asns/new/index.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/admin/asns/new/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.private.admin.asns.new', [])
.config(function($stateProvider, $urlRouterProvider) {
$stateProvider
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/admin/cdns/CdnsController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/admin/cdns/CdnsController.js b/traffic_ops/experimental/ui/app/src/modules/private/admin/cdns/CdnsController.js
index c8c6765..9f121b0 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/admin/cdns/CdnsController.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/admin/cdns/CdnsController.js
@@ -1,5 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var CdnsController = function() {
};
CdnsController.$inject = [];
-module.exports = CdnsController;
\ No newline at end of file
+module.exports = CdnsController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/admin/cdns/cdns.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/admin/cdns/cdns.tpl.html b/traffic_ops/experimental/ui/app/src/modules/private/admin/cdns/cdns.tpl.html
index 84259ec..b4d6fe7 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/admin/cdns/cdns.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/modules/private/admin/cdns/cdns.tpl.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<div id="cdnsContainer">
<div ui-view="cdnsContent"></div>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/admin/cdns/edit/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/admin/cdns/edit/index.js b/traffic_ops/experimental/ui/app/src/modules/private/admin/cdns/edit/index.js
index 7d3dd0c..1a7222d 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/admin/cdns/edit/index.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/admin/cdns/edit/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.private.admin.cdns.edit', [])
.config(function($stateProvider, $urlRouterProvider) {
$stateProvider
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/admin/cdns/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/admin/cdns/index.js b/traffic_ops/experimental/ui/app/src/modules/private/admin/cdns/index.js
index 34382f9..a2b9d0c 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/admin/cdns/index.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/admin/cdns/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.private.admin.cdns', [])
.controller('CdnsController', require('./CdnsController'))
.config(function($stateProvider, $urlRouterProvider) {
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/admin/cdns/list/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/admin/cdns/list/index.js b/traffic_ops/experimental/ui/app/src/modules/private/admin/cdns/list/index.js
index 4dded22..c50ed67 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/admin/cdns/list/index.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/admin/cdns/list/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.private.admin.cdns.list', [])
.config(function($stateProvider, $urlRouterProvider) {
$stateProvider
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/admin/cdns/new/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/admin/cdns/new/index.js b/traffic_ops/experimental/ui/app/src/modules/private/admin/cdns/new/index.js
index a84b996..25847b9 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/admin/cdns/new/index.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/admin/cdns/new/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.private.admin.cdns.new', [])
.config(function($stateProvider, $urlRouterProvider) {
$stateProvider
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/admin/divisions/DivisionsController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/admin/divisions/DivisionsController.js b/traffic_ops/experimental/ui/app/src/modules/private/admin/divisions/DivisionsController.js
index d3e538d..21b0bea 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/admin/divisions/DivisionsController.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/admin/divisions/DivisionsController.js
@@ -1,5 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var DivisionsController = function() {
};
DivisionsController.$inject = [];
-module.exports = DivisionsController;
\ No newline at end of file
+module.exports = DivisionsController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/admin/divisions/divisions.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/admin/divisions/divisions.tpl.html b/traffic_ops/experimental/ui/app/src/modules/private/admin/divisions/divisions.tpl.html
index dd9023b..8c8d7e4 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/admin/divisions/divisions.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/modules/private/admin/divisions/divisions.tpl.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<div id="divisionsContainer">
<div ui-view="divisionsContent"></div>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/admin/divisions/edit/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/admin/divisions/edit/index.js b/traffic_ops/experimental/ui/app/src/modules/private/admin/divisions/edit/index.js
index 4fa842b..8066477 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/admin/divisions/edit/index.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/admin/divisions/edit/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.private.admin.divisions.edit', [])
.config(function($stateProvider, $urlRouterProvider) {
$stateProvider
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/admin/divisions/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/admin/divisions/index.js b/traffic_ops/experimental/ui/app/src/modules/private/admin/divisions/index.js
index 1973423..9828c8c 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/admin/divisions/index.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/admin/divisions/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.private.admin.divisions', [])
.controller('DivisionsController', require('./DivisionsController'))
.config(function($stateProvider, $urlRouterProvider) {
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/admin/divisions/list/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/admin/divisions/list/index.js b/traffic_ops/experimental/ui/app/src/modules/private/admin/divisions/list/index.js
index 7af086d..a37c521 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/admin/divisions/list/index.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/admin/divisions/list/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.private.admin.divisions.list', [])
.config(function($stateProvider, $urlRouterProvider) {
$stateProvider
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/admin/divisions/new/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/admin/divisions/new/index.js b/traffic_ops/experimental/ui/app/src/modules/private/admin/divisions/new/index.js
index ff37648..44197cd 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/admin/divisions/new/index.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/admin/divisions/new/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.private.admin.divisions.new', [])
.config(function($stateProvider, $urlRouterProvider) {
$stateProvider
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/admin/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/admin/index.js b/traffic_ops/experimental/ui/app/src/modules/private/admin/index.js
index 3699bf3..ba19269 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/admin/index.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/admin/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.private.admin', [])
.controller('AdminController', require('./AdminController'))
.config(function($stateProvider, $urlRouterProvider) {
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/admin/locations/LocationsController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/admin/locations/LocationsController.js b/traffic_ops/experimental/ui/app/src/modules/private/admin/locations/LocationsController.js
index b24dc9a..0b2c316 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/admin/locations/LocationsController.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/admin/locations/LocationsController.js
@@ -1,5 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var LocationsController = function() {
};
LocationsController.$inject = [];
-module.exports = LocationsController;
\ No newline at end of file
+module.exports = LocationsController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/admin/locations/edit/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/admin/locations/edit/index.js b/traffic_ops/experimental/ui/app/src/modules/private/admin/locations/edit/index.js
index 99ebe17..67f5722 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/admin/locations/edit/index.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/admin/locations/edit/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.private.admin.locations.edit', [])
.config(function($stateProvider, $urlRouterProvider) {
$stateProvider
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/admin/locations/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/admin/locations/index.js b/traffic_ops/experimental/ui/app/src/modules/private/admin/locations/index.js
index 86ef624..d42f0b4 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/admin/locations/index.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/admin/locations/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.private.admin.locations', [])
.controller('LocationsController', require('./LocationsController'))
.config(function($stateProvider, $urlRouterProvider) {
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/admin/locations/list/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/admin/locations/list/index.js b/traffic_ops/experimental/ui/app/src/modules/private/admin/locations/list/index.js
index bef1e8c..a77e587 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/admin/locations/list/index.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/admin/locations/list/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.private.admin.locations.list', [])
.config(function($stateProvider, $urlRouterProvider) {
$stateProvider
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/admin/locations/locations.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/admin/locations/locations.tpl.html b/traffic_ops/experimental/ui/app/src/modules/private/admin/locations/locations.tpl.html
index 2f3e4dd..5763f02 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/admin/locations/locations.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/modules/private/admin/locations/locations.tpl.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<div id="locationsContainer">
<div ui-view="locationsContent"></div>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/admin/locations/new/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/admin/locations/new/index.js b/traffic_ops/experimental/ui/app/src/modules/private/admin/locations/new/index.js
index dd4c9ea..0e61d4b 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/admin/locations/new/index.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/admin/locations/new/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.private.admin.locations.new', [])
.config(function($stateProvider, $urlRouterProvider) {
$stateProvider
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/admin/parameters/ParametersController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/admin/parameters/ParametersController.js b/traffic_ops/experimental/ui/app/src/modules/private/admin/parameters/ParametersController.js
index 055c8b6..746c81c 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/admin/parameters/ParametersController.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/admin/parameters/ParametersController.js
@@ -1,5 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var ParametersController = function() {
};
ParametersController.$inject = [];
-module.exports = ParametersController;
\ No newline at end of file
+module.exports = ParametersController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/admin/parameters/edit/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/admin/parameters/edit/index.js b/traffic_ops/experimental/ui/app/src/modules/private/admin/parameters/edit/index.js
index 76cdb8d..77e75ba 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/admin/parameters/edit/index.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/admin/parameters/edit/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.private.admin.parameters.edit', [])
.config(function($stateProvider, $urlRouterProvider) {
$stateProvider
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/admin/parameters/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/admin/parameters/index.js b/traffic_ops/experimental/ui/app/src/modules/private/admin/parameters/index.js
index 63b4932..b24838c 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/admin/parameters/index.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/admin/parameters/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.private.admin.parameters', [])
.controller('ParametersController', require('./ParametersController'))
.config(function($stateProvider, $urlRouterProvider) {
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/admin/parameters/list/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/admin/parameters/list/index.js b/traffic_ops/experimental/ui/app/src/modules/private/admin/parameters/list/index.js
index 31c84b3..ffdefb2 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/admin/parameters/list/index.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/admin/parameters/list/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.private.admin.parameters.list', [])
.config(function($stateProvider, $urlRouterProvider) {
$stateProvider
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/admin/parameters/new/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/admin/parameters/new/index.js b/traffic_ops/experimental/ui/app/src/modules/private/admin/parameters/new/index.js
index f6c69ce..84fdc02 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/admin/parameters/new/index.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/admin/parameters/new/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.private.admin.parameters.new', [])
.config(function($stateProvider, $urlRouterProvider) {
$stateProvider
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/admin/parameters/parameters.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/admin/parameters/parameters.tpl.html b/traffic_ops/experimental/ui/app/src/modules/private/admin/parameters/parameters.tpl.html
index 61c51e4..2ec147c 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/admin/parameters/parameters.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/modules/private/admin/parameters/parameters.tpl.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<div id="parametersContainer">
<div ui-view="parametersContent"></div>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/admin/profiles/ProfilesController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/admin/profiles/ProfilesController.js b/traffic_ops/experimental/ui/app/src/modules/private/admin/profiles/ProfilesController.js
index 4f01ce7..f7e3264 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/admin/profiles/ProfilesController.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/admin/profiles/ProfilesController.js
@@ -1,5 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var ProfilesController = function() {
};
ProfilesController.$inject = [];
-module.exports = ProfilesController;
\ No newline at end of file
+module.exports = ProfilesController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/admin/profiles/edit/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/admin/profiles/edit/index.js b/traffic_ops/experimental/ui/app/src/modules/private/admin/profiles/edit/index.js
index ad795be..ad9733b 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/admin/profiles/edit/index.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/admin/profiles/edit/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.private.admin.profiles.edit', [])
.config(function($stateProvider, $urlRouterProvider) {
$stateProvider
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/admin/profiles/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/admin/profiles/index.js b/traffic_ops/experimental/ui/app/src/modules/private/admin/profiles/index.js
index 132aadf..4eca7c8 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/admin/profiles/index.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/admin/profiles/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.private.admin.profiles', [])
.controller('ProfilesController', require('./ProfilesController'))
.config(function($stateProvider, $urlRouterProvider) {
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/admin/profiles/list/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/admin/profiles/list/index.js b/traffic_ops/experimental/ui/app/src/modules/private/admin/profiles/list/index.js
index 6a6649c..f112da8 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/admin/profiles/list/index.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/admin/profiles/list/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.private.admin.profiles.list', [])
.config(function($stateProvider, $urlRouterProvider) {
$stateProvider
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/admin/profiles/new/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/admin/profiles/new/index.js b/traffic_ops/experimental/ui/app/src/modules/private/admin/profiles/new/index.js
index 53fb0bb..267579f 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/admin/profiles/new/index.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/admin/profiles/new/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.private.admin.profiles.new', [])
.config(function($stateProvider, $urlRouterProvider) {
$stateProvider
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/admin/profiles/profiles.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/admin/profiles/profiles.tpl.html b/traffic_ops/experimental/ui/app/src/modules/private/admin/profiles/profiles.tpl.html
index 00b15d0..4b35411 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/admin/profiles/profiles.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/modules/private/admin/profiles/profiles.tpl.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<div id="profilesContainer">
<div ui-view="profilesContent"></div>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/admin/regions/RegionsController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/admin/regions/RegionsController.js b/traffic_ops/experimental/ui/app/src/modules/private/admin/regions/RegionsController.js
index 3e9fb3a..002d01e 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/admin/regions/RegionsController.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/admin/regions/RegionsController.js
@@ -1,5 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var RegionsController = function() {
};
RegionsController.$inject = [];
-module.exports = RegionsController;
\ No newline at end of file
+module.exports = RegionsController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/admin/regions/edit/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/admin/regions/edit/index.js b/traffic_ops/experimental/ui/app/src/modules/private/admin/regions/edit/index.js
index f98864c..e4702bc 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/admin/regions/edit/index.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/admin/regions/edit/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.private.admin.regions.edit', [])
.config(function($stateProvider, $urlRouterProvider) {
$stateProvider
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/admin/regions/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/admin/regions/index.js b/traffic_ops/experimental/ui/app/src/modules/private/admin/regions/index.js
index 08da4a8..5c2449a 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/admin/regions/index.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/admin/regions/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.private.admin.regions', [])
.controller('RegionsController', require('./RegionsController'))
.config(function($stateProvider, $urlRouterProvider) {
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/admin/regions/list/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/admin/regions/list/index.js b/traffic_ops/experimental/ui/app/src/modules/private/admin/regions/list/index.js
index f512eb4..b1a3d4b 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/admin/regions/list/index.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/admin/regions/list/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.private.admin.regions.list', [])
.config(function($stateProvider, $urlRouterProvider) {
$stateProvider
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/admin/regions/new/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/admin/regions/new/index.js b/traffic_ops/experimental/ui/app/src/modules/private/admin/regions/new/index.js
index 72cab50..39ab5a8 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/admin/regions/new/index.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/admin/regions/new/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.private.admin.regions.new', [])
.config(function($stateProvider, $urlRouterProvider) {
$stateProvider
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/admin/regions/regions.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/admin/regions/regions.tpl.html b/traffic_ops/experimental/ui/app/src/modules/private/admin/regions/regions.tpl.html
index 1e712d0..f9af711 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/admin/regions/regions.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/modules/private/admin/regions/regions.tpl.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<div id="regionsContainer">
<div ui-view="regionsContent"></div>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/admin/statuses/StatusesController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/admin/statuses/StatusesController.js b/traffic_ops/experimental/ui/app/src/modules/private/admin/statuses/StatusesController.js
index 5584a17..f25aedf 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/admin/statuses/StatusesController.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/admin/statuses/StatusesController.js
@@ -1,5 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var StatusesController = function() {
};
StatusesController.$inject = [];
-module.exports = StatusesController;
\ No newline at end of file
+module.exports = StatusesController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/admin/statuses/edit/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/admin/statuses/edit/index.js b/traffic_ops/experimental/ui/app/src/modules/private/admin/statuses/edit/index.js
index dd1f8da..507ed40 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/admin/statuses/edit/index.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/admin/statuses/edit/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.private.admin.statuses.edit', [])
.config(function($stateProvider, $urlRouterProvider) {
$stateProvider
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/admin/statuses/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/admin/statuses/index.js b/traffic_ops/experimental/ui/app/src/modules/private/admin/statuses/index.js
index 74ceda6..bf2ddc0 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/admin/statuses/index.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/admin/statuses/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.private.admin.statuses', [])
.controller('StatusesController', require('./StatusesController'))
.config(function($stateProvider, $urlRouterProvider) {
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/admin/statuses/list/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/admin/statuses/list/index.js b/traffic_ops/experimental/ui/app/src/modules/private/admin/statuses/list/index.js
index 622006a..ce2842f 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/admin/statuses/list/index.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/admin/statuses/list/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.private.admin.statuses.list', [])
.config(function($stateProvider, $urlRouterProvider) {
$stateProvider
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/admin/statuses/new/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/admin/statuses/new/index.js b/traffic_ops/experimental/ui/app/src/modules/private/admin/statuses/new/index.js
index 6810cd5..66b03a4 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/admin/statuses/new/index.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/admin/statuses/new/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.private.admin.statuses.new', [])
.config(function($stateProvider, $urlRouterProvider) {
$stateProvider
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/admin/statuses/statuses.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/admin/statuses/statuses.tpl.html b/traffic_ops/experimental/ui/app/src/modules/private/admin/statuses/statuses.tpl.html
index 2b54b82..fff7089 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/admin/statuses/statuses.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/modules/private/admin/statuses/statuses.tpl.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<div id="statusesContainer">
<div ui-view="statusesContent"></div>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/admin/tenants/TenantsController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/admin/tenants/TenantsController.js b/traffic_ops/experimental/ui/app/src/modules/private/admin/tenants/TenantsController.js
index 25a9490..0657d69 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/admin/tenants/TenantsController.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/admin/tenants/TenantsController.js
@@ -1,5 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var TenantsController = function() {
};
TenantsController.$inject = [];
-module.exports = TenantsController;
\ No newline at end of file
+module.exports = TenantsController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/admin/tenants/edit/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/admin/tenants/edit/index.js b/traffic_ops/experimental/ui/app/src/modules/private/admin/tenants/edit/index.js
index 62a7f37..ba7a174 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/admin/tenants/edit/index.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/admin/tenants/edit/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.private.admin.tenants.edit', [])
.config(function($stateProvider, $urlRouterProvider) {
$stateProvider
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/admin/tenants/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/admin/tenants/index.js b/traffic_ops/experimental/ui/app/src/modules/private/admin/tenants/index.js
index bcb30f8..1f96ca2 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/admin/tenants/index.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/admin/tenants/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.private.admin.tenants', [])
.controller('TenantsController', require('./TenantsController'))
.config(function($stateProvider, $urlRouterProvider) {
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/admin/tenants/list/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/admin/tenants/list/index.js b/traffic_ops/experimental/ui/app/src/modules/private/admin/tenants/list/index.js
index 2ec6c70..dee991b 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/admin/tenants/list/index.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/admin/tenants/list/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.private.admin.tenants.list', [])
.config(function($stateProvider, $urlRouterProvider) {
$stateProvider
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/admin/tenants/new/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/admin/tenants/new/index.js b/traffic_ops/experimental/ui/app/src/modules/private/admin/tenants/new/index.js
index 9d48ffd..796fa5f 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/admin/tenants/new/index.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/admin/tenants/new/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.private.admin.tenants.new', [])
.config(function($stateProvider, $urlRouterProvider) {
$stateProvider
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/admin/tenants/tenants.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/admin/tenants/tenants.tpl.html b/traffic_ops/experimental/ui/app/src/modules/private/admin/tenants/tenants.tpl.html
index bf4cec5..54556c3 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/admin/tenants/tenants.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/modules/private/admin/tenants/tenants.tpl.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<div id="tenantsContainer">
<div ui-view="tenantsContent"></div>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/admin/types/TypesController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/admin/types/TypesController.js b/traffic_ops/experimental/ui/app/src/modules/private/admin/types/TypesController.js
index e7e8dcb..0325631 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/admin/types/TypesController.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/admin/types/TypesController.js
@@ -1,5 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var TypesController = function() {
};
TypesController.$inject = [];
-module.exports = TypesController;
\ No newline at end of file
+module.exports = TypesController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/admin/types/edit/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/admin/types/edit/index.js b/traffic_ops/experimental/ui/app/src/modules/private/admin/types/edit/index.js
index 5442d55..9cd3f9b 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/admin/types/edit/index.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/admin/types/edit/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.private.admin.types.edit', [])
.config(function($stateProvider, $urlRouterProvider) {
$stateProvider
[05/26] incubator-trafficcontrol git commit: merge master
Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/filters/PercentFilter.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/filters/PercentFilter.js b/traffic_portal/app/src/common/filters/PercentFilter.js
index 3ccf08f..3f871e3 100644
--- a/traffic_portal/app/src/common/filters/PercentFilter.js
+++ b/traffic_portal/app/src/common/filters/PercentFilter.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/filters/UnitsFilter.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/filters/UnitsFilter.js b/traffic_portal/app/src/common/filters/UnitsFilter.js
index 026b17c..eff8a8d 100644
--- a/traffic_portal/app/src/common/filters/UnitsFilter.js
+++ b/traffic_portal/app/src/common/filters/UnitsFilter.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/filters/index.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/filters/index.js b/traffic_portal/app/src/common/filters/index.js
index 26feedd..0422370 100755
--- a/traffic_portal/app/src/common/filters/index.js
+++ b/traffic_portal/app/src/common/filters/index.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/models/AuthModel.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/models/AuthModel.js b/traffic_portal/app/src/common/models/AuthModel.js
index 1106bcd..ac61e9a 100644
--- a/traffic_portal/app/src/common/models/AuthModel.js
+++ b/traffic_portal/app/src/common/models/AuthModel.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/models/ChartModel.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/models/ChartModel.js b/traffic_portal/app/src/common/models/ChartModel.js
index 6173eae..6a7c74f 100644
--- a/traffic_portal/app/src/common/models/ChartModel.js
+++ b/traffic_portal/app/src/common/models/ChartModel.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/models/DeliveryServicesModel.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/models/DeliveryServicesModel.js b/traffic_portal/app/src/common/models/DeliveryServicesModel.js
index 2d36a95..8665e2b 100644
--- a/traffic_portal/app/src/common/models/DeliveryServicesModel.js
+++ b/traffic_portal/app/src/common/models/DeliveryServicesModel.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/models/MessageModel.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/models/MessageModel.js b/traffic_portal/app/src/common/models/MessageModel.js
index e2787ab..ca0d007 100644
--- a/traffic_portal/app/src/common/models/MessageModel.js
+++ b/traffic_portal/app/src/common/models/MessageModel.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/models/PropertiesModel.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/models/PropertiesModel.js b/traffic_portal/app/src/common/models/PropertiesModel.js
index 0ba8fc0..32c8a73 100644
--- a/traffic_portal/app/src/common/models/PropertiesModel.js
+++ b/traffic_portal/app/src/common/models/PropertiesModel.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/models/UserModel.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/models/UserModel.js b/traffic_portal/app/src/common/models/UserModel.js
index 6164abd..07f39c2 100755
--- a/traffic_portal/app/src/common/models/UserModel.js
+++ b/traffic_portal/app/src/common/models/UserModel.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/models/index.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/models/index.js b/traffic_portal/app/src/common/models/index.js
index f2e8441..873c311 100755
--- a/traffic_portal/app/src/common/models/index.js
+++ b/traffic_portal/app/src/common/models/index.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/modules/cacheGroups/CacheGroupsController.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/cacheGroups/CacheGroupsController.js b/traffic_portal/app/src/common/modules/cacheGroups/CacheGroupsController.js
index 7aba389..93e94fa 100644
--- a/traffic_portal/app/src/common/modules/cacheGroups/CacheGroupsController.js
+++ b/traffic_portal/app/src/common/modules/cacheGroups/CacheGroupsController.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/modules/cacheGroups/_cacheGroups.scss
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/cacheGroups/_cacheGroups.scss b/traffic_portal/app/src/common/modules/cacheGroups/_cacheGroups.scss
index b6441f2..01c8d51 100644
--- a/traffic_portal/app/src/common/modules/cacheGroups/_cacheGroups.scss
+++ b/traffic_portal/app/src/common/modules/cacheGroups/_cacheGroups.scss
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/modules/cacheGroups/cacheGroups.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/cacheGroups/cacheGroups.tpl.html b/traffic_portal/app/src/common/modules/cacheGroups/cacheGroups.tpl.html
index 6139be6..0db1915 100644
--- a/traffic_portal/app/src/common/modules/cacheGroups/cacheGroups.tpl.html
+++ b/traffic_portal/app/src/common/modules/cacheGroups/cacheGroups.tpl.html
@@ -1,6 +1,5 @@
<!--
-Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/modules/cacheGroups/index.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/cacheGroups/index.js b/traffic_portal/app/src/common/modules/cacheGroups/index.js
index d0f218c..7c15e75 100644
--- a/traffic_portal/app/src/common/modules/cacheGroups/index.js
+++ b/traffic_portal/app/src/common/modules/cacheGroups/index.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/modules/chart/_chart.scss
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/chart/_chart.scss b/traffic_portal/app/src/common/modules/chart/_chart.scss
index aef003e..31e8284 100644
--- a/traffic_portal/app/src/common/modules/chart/_chart.scss
+++ b/traffic_portal/app/src/common/modules/chart/_chart.scss
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/modules/chart/bandwidthPerSecond/ChartBandwidthPerSecondController.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/chart/bandwidthPerSecond/ChartBandwidthPerSecondController.js b/traffic_portal/app/src/common/modules/chart/bandwidthPerSecond/ChartBandwidthPerSecondController.js
index e1430b2..f5221a9 100644
--- a/traffic_portal/app/src/common/modules/chart/bandwidthPerSecond/ChartBandwidthPerSecondController.js
+++ b/traffic_portal/app/src/common/modules/chart/bandwidthPerSecond/ChartBandwidthPerSecondController.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/modules/chart/bandwidthPerSecond/_chart.bandwidthPerSecond.scss
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/chart/bandwidthPerSecond/_chart.bandwidthPerSecond.scss b/traffic_portal/app/src/common/modules/chart/bandwidthPerSecond/_chart.bandwidthPerSecond.scss
index 1cc0503..6eddf96 100644
--- a/traffic_portal/app/src/common/modules/chart/bandwidthPerSecond/_chart.bandwidthPerSecond.scss
+++ b/traffic_portal/app/src/common/modules/chart/bandwidthPerSecond/_chart.bandwidthPerSecond.scss
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/modules/chart/bandwidthPerSecond/chart.bandwidthPerSecond.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/chart/bandwidthPerSecond/chart.bandwidthPerSecond.tpl.html b/traffic_portal/app/src/common/modules/chart/bandwidthPerSecond/chart.bandwidthPerSecond.tpl.html
index af721a2..9848a81 100644
--- a/traffic_portal/app/src/common/modules/chart/bandwidthPerSecond/chart.bandwidthPerSecond.tpl.html
+++ b/traffic_portal/app/src/common/modules/chart/bandwidthPerSecond/chart.bandwidthPerSecond.tpl.html
@@ -1,6 +1,5 @@
<!--
-Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/modules/chart/bandwidthPerSecond/index.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/chart/bandwidthPerSecond/index.js b/traffic_portal/app/src/common/modules/chart/bandwidthPerSecond/index.js
index 99dbd98..2ced45d 100644
--- a/traffic_portal/app/src/common/modules/chart/bandwidthPerSecond/index.js
+++ b/traffic_portal/app/src/common/modules/chart/bandwidthPerSecond/index.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/modules/chart/capacity/ChartCapacityController.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/chart/capacity/ChartCapacityController.js b/traffic_portal/app/src/common/modules/chart/capacity/ChartCapacityController.js
index e338c80..deb664f 100644
--- a/traffic_portal/app/src/common/modules/chart/capacity/ChartCapacityController.js
+++ b/traffic_portal/app/src/common/modules/chart/capacity/ChartCapacityController.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/modules/chart/capacity/_chart.capacity.scss
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/chart/capacity/_chart.capacity.scss b/traffic_portal/app/src/common/modules/chart/capacity/_chart.capacity.scss
index 3a0e375..5fee086 100644
--- a/traffic_portal/app/src/common/modules/chart/capacity/_chart.capacity.scss
+++ b/traffic_portal/app/src/common/modules/chart/capacity/_chart.capacity.scss
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/modules/chart/capacity/chart.capacity.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/chart/capacity/chart.capacity.tpl.html b/traffic_portal/app/src/common/modules/chart/capacity/chart.capacity.tpl.html
index 0a1b181..b5b1ca7 100644
--- a/traffic_portal/app/src/common/modules/chart/capacity/chart.capacity.tpl.html
+++ b/traffic_portal/app/src/common/modules/chart/capacity/chart.capacity.tpl.html
@@ -1,6 +1,5 @@
<!--
-Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/modules/chart/capacity/index.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/chart/capacity/index.js b/traffic_portal/app/src/common/modules/chart/capacity/index.js
index db22b52..b60e0db 100644
--- a/traffic_portal/app/src/common/modules/chart/capacity/index.js
+++ b/traffic_portal/app/src/common/modules/chart/capacity/index.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/modules/chart/dates/ChartDatesController.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/chart/dates/ChartDatesController.js b/traffic_portal/app/src/common/modules/chart/dates/ChartDatesController.js
index 0e53ab8..f0bc83e 100644
--- a/traffic_portal/app/src/common/modules/chart/dates/ChartDatesController.js
+++ b/traffic_portal/app/src/common/modules/chart/dates/ChartDatesController.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/modules/chart/dates/_chart.dates.scss
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/chart/dates/_chart.dates.scss b/traffic_portal/app/src/common/modules/chart/dates/_chart.dates.scss
index b23d404..6bdf3f4 100644
--- a/traffic_portal/app/src/common/modules/chart/dates/_chart.dates.scss
+++ b/traffic_portal/app/src/common/modules/chart/dates/_chart.dates.scss
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/modules/chart/dates/chart.dates.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/chart/dates/chart.dates.tpl.html b/traffic_portal/app/src/common/modules/chart/dates/chart.dates.tpl.html
index 4380447..e13d247 100644
--- a/traffic_portal/app/src/common/modules/chart/dates/chart.dates.tpl.html
+++ b/traffic_portal/app/src/common/modules/chart/dates/chart.dates.tpl.html
@@ -1,6 +1,5 @@
<!--
-Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/modules/chart/dates/index.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/chart/dates/index.js b/traffic_portal/app/src/common/modules/chart/dates/index.js
index 1b4de93..63eec0a 100644
--- a/traffic_portal/app/src/common/modules/chart/dates/index.js
+++ b/traffic_portal/app/src/common/modules/chart/dates/index.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/modules/chart/httpStatus/ChartHttpStatusController.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/chart/httpStatus/ChartHttpStatusController.js b/traffic_portal/app/src/common/modules/chart/httpStatus/ChartHttpStatusController.js
index 2ba1bc2..60c8a62 100644
--- a/traffic_portal/app/src/common/modules/chart/httpStatus/ChartHttpStatusController.js
+++ b/traffic_portal/app/src/common/modules/chart/httpStatus/ChartHttpStatusController.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/modules/chart/httpStatus/_chart.httpStatus.scss
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/chart/httpStatus/_chart.httpStatus.scss b/traffic_portal/app/src/common/modules/chart/httpStatus/_chart.httpStatus.scss
index e839685..b4ed1c3 100644
--- a/traffic_portal/app/src/common/modules/chart/httpStatus/_chart.httpStatus.scss
+++ b/traffic_portal/app/src/common/modules/chart/httpStatus/_chart.httpStatus.scss
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/modules/chart/httpStatus/chart.httpStatus.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/chart/httpStatus/chart.httpStatus.tpl.html b/traffic_portal/app/src/common/modules/chart/httpStatus/chart.httpStatus.tpl.html
index 62aeb88..40a79b2 100644
--- a/traffic_portal/app/src/common/modules/chart/httpStatus/chart.httpStatus.tpl.html
+++ b/traffic_portal/app/src/common/modules/chart/httpStatus/chart.httpStatus.tpl.html
@@ -1,6 +1,5 @@
<!--
-Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/modules/chart/httpStatus/index.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/chart/httpStatus/index.js b/traffic_portal/app/src/common/modules/chart/httpStatus/index.js
index 68b11c5..a05339a 100644
--- a/traffic_portal/app/src/common/modules/chart/httpStatus/index.js
+++ b/traffic_portal/app/src/common/modules/chart/httpStatus/index.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/modules/chart/routing/ChartRoutingController.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/chart/routing/ChartRoutingController.js b/traffic_portal/app/src/common/modules/chart/routing/ChartRoutingController.js
index baea7ea..7f10dfc 100644
--- a/traffic_portal/app/src/common/modules/chart/routing/ChartRoutingController.js
+++ b/traffic_portal/app/src/common/modules/chart/routing/ChartRoutingController.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/modules/chart/routing/_chart.routing.scss
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/chart/routing/_chart.routing.scss b/traffic_portal/app/src/common/modules/chart/routing/_chart.routing.scss
index 56c3e40..84eb5dd 100644
--- a/traffic_portal/app/src/common/modules/chart/routing/_chart.routing.scss
+++ b/traffic_portal/app/src/common/modules/chart/routing/_chart.routing.scss
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/modules/chart/routing/chart.routing.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/chart/routing/chart.routing.tpl.html b/traffic_portal/app/src/common/modules/chart/routing/chart.routing.tpl.html
index a297b7a..9be074e 100644
--- a/traffic_portal/app/src/common/modules/chart/routing/chart.routing.tpl.html
+++ b/traffic_portal/app/src/common/modules/chart/routing/chart.routing.tpl.html
@@ -1,6 +1,5 @@
<!--
-Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/modules/chart/routing/index.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/chart/routing/index.js b/traffic_portal/app/src/common/modules/chart/routing/index.js
index e6f47ee..d3782c5 100644
--- a/traffic_portal/app/src/common/modules/chart/routing/index.js
+++ b/traffic_portal/app/src/common/modules/chart/routing/index.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/modules/chart/transactionsPerSecond/ChartTransactionsPerSecondController.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/chart/transactionsPerSecond/ChartTransactionsPerSecondController.js b/traffic_portal/app/src/common/modules/chart/transactionsPerSecond/ChartTransactionsPerSecondController.js
index c9336fb..d1b3c47 100644
--- a/traffic_portal/app/src/common/modules/chart/transactionsPerSecond/ChartTransactionsPerSecondController.js
+++ b/traffic_portal/app/src/common/modules/chart/transactionsPerSecond/ChartTransactionsPerSecondController.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/modules/chart/transactionsPerSecond/_chart.transactionsPerSecond.scss
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/chart/transactionsPerSecond/_chart.transactionsPerSecond.scss b/traffic_portal/app/src/common/modules/chart/transactionsPerSecond/_chart.transactionsPerSecond.scss
index 0dff498..31a1ba4 100644
--- a/traffic_portal/app/src/common/modules/chart/transactionsPerSecond/_chart.transactionsPerSecond.scss
+++ b/traffic_portal/app/src/common/modules/chart/transactionsPerSecond/_chart.transactionsPerSecond.scss
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/modules/chart/transactionsPerSecond/chart.transactionsPerSecond.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/chart/transactionsPerSecond/chart.transactionsPerSecond.tpl.html b/traffic_portal/app/src/common/modules/chart/transactionsPerSecond/chart.transactionsPerSecond.tpl.html
index 99d1119..f446009 100644
--- a/traffic_portal/app/src/common/modules/chart/transactionsPerSecond/chart.transactionsPerSecond.tpl.html
+++ b/traffic_portal/app/src/common/modules/chart/transactionsPerSecond/chart.transactionsPerSecond.tpl.html
@@ -1,6 +1,5 @@
<!--
-Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/modules/chart/transactionsPerSecond/index.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/chart/transactionsPerSecond/index.js b/traffic_portal/app/src/common/modules/chart/transactionsPerSecond/index.js
index bb754ba..aedd14b 100644
--- a/traffic_portal/app/src/common/modules/chart/transactionsPerSecond/index.js
+++ b/traffic_portal/app/src/common/modules/chart/transactionsPerSecond/index.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/modules/dates/DatesController.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/dates/DatesController.js b/traffic_portal/app/src/common/modules/dates/DatesController.js
index d631137..48d5243 100644
--- a/traffic_portal/app/src/common/modules/dates/DatesController.js
+++ b/traffic_portal/app/src/common/modules/dates/DatesController.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/modules/dates/_dates.scss
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/dates/_dates.scss b/traffic_portal/app/src/common/modules/dates/_dates.scss
index a32ba77..83dd492 100644
--- a/traffic_portal/app/src/common/modules/dates/_dates.scss
+++ b/traffic_portal/app/src/common/modules/dates/_dates.scss
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/modules/dates/dates.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/dates/dates.tpl.html b/traffic_portal/app/src/common/modules/dates/dates.tpl.html
index 8135610..4c9a3d9 100644
--- a/traffic_portal/app/src/common/modules/dates/dates.tpl.html
+++ b/traffic_portal/app/src/common/modules/dates/dates.tpl.html
@@ -1,6 +1,5 @@
<!--
-Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/modules/dates/index.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/dates/index.js b/traffic_portal/app/src/common/modules/dates/index.js
index d88e959..47ae7a0 100644
--- a/traffic_portal/app/src/common/modules/dates/index.js
+++ b/traffic_portal/app/src/common/modules/dates/index.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/modules/deliveryService/config/edit/DSConfigEditController.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/deliveryService/config/edit/DSConfigEditController.js b/traffic_portal/app/src/common/modules/deliveryService/config/edit/DSConfigEditController.js
index 2b55f27..f3d9860 100644
--- a/traffic_portal/app/src/common/modules/deliveryService/config/edit/DSConfigEditController.js
+++ b/traffic_portal/app/src/common/modules/deliveryService/config/edit/DSConfigEditController.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/modules/deliveryService/config/edit/_deliveryService.config.edit.scss
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/deliveryService/config/edit/_deliveryService.config.edit.scss b/traffic_portal/app/src/common/modules/deliveryService/config/edit/_deliveryService.config.edit.scss
index 8688a96..26796c4 100644
--- a/traffic_portal/app/src/common/modules/deliveryService/config/edit/_deliveryService.config.edit.scss
+++ b/traffic_portal/app/src/common/modules/deliveryService/config/edit/_deliveryService.config.edit.scss
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/modules/deliveryService/config/edit/deliveryService.config.edit.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/deliveryService/config/edit/deliveryService.config.edit.tpl.html b/traffic_portal/app/src/common/modules/deliveryService/config/edit/deliveryService.config.edit.tpl.html
index ca657c8..0b92e5e 100644
--- a/traffic_portal/app/src/common/modules/deliveryService/config/edit/deliveryService.config.edit.tpl.html
+++ b/traffic_portal/app/src/common/modules/deliveryService/config/edit/deliveryService.config.edit.tpl.html
@@ -1,6 +1,5 @@
<!--
-Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/modules/deliveryService/config/edit/index.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/deliveryService/config/edit/index.js b/traffic_portal/app/src/common/modules/deliveryService/config/edit/index.js
index 54f5823..b6f67f6 100644
--- a/traffic_portal/app/src/common/modules/deliveryService/config/edit/index.js
+++ b/traffic_portal/app/src/common/modules/deliveryService/config/edit/index.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/modules/dialog/confirm/DialogConfirmController.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/dialog/confirm/DialogConfirmController.js b/traffic_portal/app/src/common/modules/dialog/confirm/DialogConfirmController.js
index c21455d..09aef67 100644
--- a/traffic_portal/app/src/common/modules/dialog/confirm/DialogConfirmController.js
+++ b/traffic_portal/app/src/common/modules/dialog/confirm/DialogConfirmController.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/modules/dialog/confirm/_dialog.confirm.scss
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/dialog/confirm/_dialog.confirm.scss b/traffic_portal/app/src/common/modules/dialog/confirm/_dialog.confirm.scss
index aa7787c..fff23b4 100644
--- a/traffic_portal/app/src/common/modules/dialog/confirm/_dialog.confirm.scss
+++ b/traffic_portal/app/src/common/modules/dialog/confirm/_dialog.confirm.scss
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/modules/dialog/confirm/dialog.confirm.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/dialog/confirm/dialog.confirm.tpl.html b/traffic_portal/app/src/common/modules/dialog/confirm/dialog.confirm.tpl.html
index 9c1bfac..8fad17f 100644
--- a/traffic_portal/app/src/common/modules/dialog/confirm/dialog.confirm.tpl.html
+++ b/traffic_portal/app/src/common/modules/dialog/confirm/dialog.confirm.tpl.html
@@ -1,6 +1,5 @@
<!--
-Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/modules/dialog/confirm/index.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/dialog/confirm/index.js b/traffic_portal/app/src/common/modules/dialog/confirm/index.js
index 7b0a8d9..f824c8f 100644
--- a/traffic_portal/app/src/common/modules/dialog/confirm/index.js
+++ b/traffic_portal/app/src/common/modules/dialog/confirm/index.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/modules/dialog/reset/DialogResetController.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/dialog/reset/DialogResetController.js b/traffic_portal/app/src/common/modules/dialog/reset/DialogResetController.js
index ca87027..271345f 100644
--- a/traffic_portal/app/src/common/modules/dialog/reset/DialogResetController.js
+++ b/traffic_portal/app/src/common/modules/dialog/reset/DialogResetController.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/modules/dialog/reset/_dialog.reset.scss
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/dialog/reset/_dialog.reset.scss b/traffic_portal/app/src/common/modules/dialog/reset/_dialog.reset.scss
index aa7787c..fff23b4 100644
--- a/traffic_portal/app/src/common/modules/dialog/reset/_dialog.reset.scss
+++ b/traffic_portal/app/src/common/modules/dialog/reset/_dialog.reset.scss
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/modules/dialog/reset/dialog.reset.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/dialog/reset/dialog.reset.tpl.html b/traffic_portal/app/src/common/modules/dialog/reset/dialog.reset.tpl.html
index 238d70f..852131d 100644
--- a/traffic_portal/app/src/common/modules/dialog/reset/dialog.reset.tpl.html
+++ b/traffic_portal/app/src/common/modules/dialog/reset/dialog.reset.tpl.html
@@ -1,6 +1,5 @@
<!--
-Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/modules/dialog/reset/index.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/dialog/reset/index.js b/traffic_portal/app/src/common/modules/dialog/reset/index.js
index df731be..c14c8e7 100644
--- a/traffic_portal/app/src/common/modules/dialog/reset/index.js
+++ b/traffic_portal/app/src/common/modules/dialog/reset/index.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/modules/footer/FooterController.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/footer/FooterController.js b/traffic_portal/app/src/common/modules/footer/FooterController.js
index 5683340..0a55062 100644
--- a/traffic_portal/app/src/common/modules/footer/FooterController.js
+++ b/traffic_portal/app/src/common/modules/footer/FooterController.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/modules/footer/footer.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/footer/footer.tpl.html b/traffic_portal/app/src/common/modules/footer/footer.tpl.html
index cfb1a19..dcf4458 100755
--- a/traffic_portal/app/src/common/modules/footer/footer.tpl.html
+++ b/traffic_portal/app/src/common/modules/footer/footer.tpl.html
@@ -1,6 +1,5 @@
<!--
-Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/modules/footer/index.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/footer/index.js b/traffic_portal/app/src/common/modules/footer/index.js
index be5e6a4..98e59e6 100644
--- a/traffic_portal/app/src/common/modules/footer/index.js
+++ b/traffic_portal/app/src/common/modules/footer/index.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/modules/header/HeaderController.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/header/HeaderController.js b/traffic_portal/app/src/common/modules/header/HeaderController.js
index 1d984ad..1b82c26 100755
--- a/traffic_portal/app/src/common/modules/header/HeaderController.js
+++ b/traffic_portal/app/src/common/modules/header/HeaderController.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/modules/header/_header.scss
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/header/_header.scss b/traffic_portal/app/src/common/modules/header/_header.scss
index 299b760..148e59f 100755
--- a/traffic_portal/app/src/common/modules/header/_header.scss
+++ b/traffic_portal/app/src/common/modules/header/_header.scss
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/modules/header/header.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/header/header.tpl.html b/traffic_portal/app/src/common/modules/header/header.tpl.html
index 88124d8..0174b8e 100755
--- a/traffic_portal/app/src/common/modules/header/header.tpl.html
+++ b/traffic_portal/app/src/common/modules/header/header.tpl.html
@@ -1,6 +1,5 @@
<!--
-Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/modules/header/index.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/header/index.js b/traffic_portal/app/src/common/modules/header/index.js
index 68e85a6..8a93e86 100755
--- a/traffic_portal/app/src/common/modules/header/index.js
+++ b/traffic_portal/app/src/common/modules/header/index.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/modules/message/MessageController.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/message/MessageController.js b/traffic_portal/app/src/common/modules/message/MessageController.js
index e0b36bd..c253d8e 100644
--- a/traffic_portal/app/src/common/modules/message/MessageController.js
+++ b/traffic_portal/app/src/common/modules/message/MessageController.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/modules/message/_message.scss
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/message/_message.scss b/traffic_portal/app/src/common/modules/message/_message.scss
index d0c62be..21978d4 100644
--- a/traffic_portal/app/src/common/modules/message/_message.scss
+++ b/traffic_portal/app/src/common/modules/message/_message.scss
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/modules/message/index.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/message/index.js b/traffic_portal/app/src/common/modules/message/index.js
index a251d63..6d10dd0 100644
--- a/traffic_portal/app/src/common/modules/message/index.js
+++ b/traffic_portal/app/src/common/modules/message/index.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/modules/message/message.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/message/message.tpl.html b/traffic_portal/app/src/common/modules/message/message.tpl.html
index 9b04f6c..8f6d9c4 100644
--- a/traffic_portal/app/src/common/modules/message/message.tpl.html
+++ b/traffic_portal/app/src/common/modules/message/message.tpl.html
@@ -1,6 +1,5 @@
<!--
-Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/modules/release/version/ReleaseVersionController.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/release/version/ReleaseVersionController.js b/traffic_portal/app/src/common/modules/release/version/ReleaseVersionController.js
index e31bd2c..a020157 100644
--- a/traffic_portal/app/src/common/modules/release/version/ReleaseVersionController.js
+++ b/traffic_portal/app/src/common/modules/release/version/ReleaseVersionController.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/modules/release/version/_release.version.scss
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/release/version/_release.version.scss b/traffic_portal/app/src/common/modules/release/version/_release.version.scss
index aa7787c..fff23b4 100644
--- a/traffic_portal/app/src/common/modules/release/version/_release.version.scss
+++ b/traffic_portal/app/src/common/modules/release/version/_release.version.scss
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/modules/release/version/index.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/release/version/index.js b/traffic_portal/app/src/common/modules/release/version/index.js
index 6788c44..6e2598f 100644
--- a/traffic_portal/app/src/common/modules/release/version/index.js
+++ b/traffic_portal/app/src/common/modules/release/version/index.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/modules/release/version/release.version.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/release/version/release.version.tpl.html b/traffic_portal/app/src/common/modules/release/version/release.version.tpl.html
index 401d86c..ce8df6e 100644
--- a/traffic_portal/app/src/common/modules/release/version/release.version.tpl.html
+++ b/traffic_portal/app/src/common/modules/release/version/release.version.tpl.html
@@ -1,6 +1,5 @@
<!--
-Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/modules/tools/purge/ToolsPurgeController.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/tools/purge/ToolsPurgeController.js b/traffic_portal/app/src/common/modules/tools/purge/ToolsPurgeController.js
index b45a9cc..1a10e1b 100644
--- a/traffic_portal/app/src/common/modules/tools/purge/ToolsPurgeController.js
+++ b/traffic_portal/app/src/common/modules/tools/purge/ToolsPurgeController.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/modules/tools/purge/_tools.purge.scss
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/tools/purge/_tools.purge.scss b/traffic_portal/app/src/common/modules/tools/purge/_tools.purge.scss
index 4e6ff1e..c1b1c4e 100644
--- a/traffic_portal/app/src/common/modules/tools/purge/_tools.purge.scss
+++ b/traffic_portal/app/src/common/modules/tools/purge/_tools.purge.scss
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/modules/tools/purge/index.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/tools/purge/index.js b/traffic_portal/app/src/common/modules/tools/purge/index.js
index 64e43a1..d8792a1 100644
--- a/traffic_portal/app/src/common/modules/tools/purge/index.js
+++ b/traffic_portal/app/src/common/modules/tools/purge/index.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/modules/tools/purge/tools.purge.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/tools/purge/tools.purge.tpl.html b/traffic_portal/app/src/common/modules/tools/purge/tools.purge.tpl.html
index 87ca735..c0b80df 100644
--- a/traffic_portal/app/src/common/modules/tools/purge/tools.purge.tpl.html
+++ b/traffic_portal/app/src/common/modules/tools/purge/tools.purge.tpl.html
@@ -1,6 +1,5 @@
<!--
-Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/service/application/ApplicationService.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/service/application/ApplicationService.js b/traffic_portal/app/src/common/service/application/ApplicationService.js
index 78ae071..b152b63 100644
--- a/traffic_portal/app/src/common/service/application/ApplicationService.js
+++ b/traffic_portal/app/src/common/service/application/ApplicationService.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/service/application/index.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/service/application/index.js b/traffic_portal/app/src/common/service/application/index.js
index 6d5bb79..0943e96 100644
--- a/traffic_portal/app/src/common/service/application/index.js
+++ b/traffic_portal/app/src/common/service/application/index.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/service/utils/ChartUtils.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/service/utils/ChartUtils.js b/traffic_portal/app/src/common/service/utils/ChartUtils.js
index c257c6d..51ad636 100644
--- a/traffic_portal/app/src/common/service/utils/ChartUtils.js
+++ b/traffic_portal/app/src/common/service/utils/ChartUtils.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/service/utils/FormUtils.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/service/utils/FormUtils.js b/traffic_portal/app/src/common/service/utils/FormUtils.js
index 57b93e5..7c0e111 100644
--- a/traffic_portal/app/src/common/service/utils/FormUtils.js
+++ b/traffic_portal/app/src/common/service/utils/FormUtils.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/service/utils/JSONUtils.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/service/utils/JSONUtils.js b/traffic_portal/app/src/common/service/utils/JSONUtils.js
index 6aad924..792c0d5 100644
--- a/traffic_portal/app/src/common/service/utils/JSONUtils.js
+++ b/traffic_portal/app/src/common/service/utils/JSONUtils.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var JSONUtils = function() {
this.convertToCSV = function(JSONData, reportTitle, includedKeys) {
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/service/utils/NumberUtils.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/service/utils/NumberUtils.js b/traffic_portal/app/src/common/service/utils/NumberUtils.js
index 154f4cb..e3502ef 100644
--- a/traffic_portal/app/src/common/service/utils/NumberUtils.js
+++ b/traffic_portal/app/src/common/service/utils/NumberUtils.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/service/utils/date/DateUtils.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/service/utils/date/DateUtils.js b/traffic_portal/app/src/common/service/utils/date/DateUtils.js
index b76e48d..14ad2d3 100644
--- a/traffic_portal/app/src/common/service/utils/date/DateUtils.js
+++ b/traffic_portal/app/src/common/service/utils/date/DateUtils.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var DateUtils = function() {
this.dateFormat = function () {
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/service/utils/date/index.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/service/utils/date/index.js b/traffic_portal/app/src/common/service/utils/date/index.js
index 168a257..b104c3d 100644
--- a/traffic_portal/app/src/common/service/utils/date/index.js
+++ b/traffic_portal/app/src/common/service/utils/date/index.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/service/utils/index.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/service/utils/index.js b/traffic_portal/app/src/common/service/utils/index.js
index 471d8bb..581a3b1 100644
--- a/traffic_portal/app/src/common/service/utils/index.js
+++ b/traffic_portal/app/src/common/service/utils/index.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/common/templates/master.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/templates/master.tpl.html b/traffic_portal/app/src/common/templates/master.tpl.html
index 68ab398..668b5e4 100755
--- a/traffic_portal/app/src/common/templates/master.tpl.html
+++ b/traffic_portal/app/src/common/templates/master.tpl.html
@@ -1,6 +1,5 @@
<!--
-Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/index.html
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/index.html b/traffic_portal/app/src/index.html
index 8969edd..054a477 100755
--- a/traffic_portal/app/src/index.html
+++ b/traffic_portal/app/src/index.html
@@ -1,6 +1,5 @@
<!--
-Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/collateral/CollateralController.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/collateral/CollateralController.js b/traffic_portal/app/src/modules/private/collateral/CollateralController.js
index f8ad038..1236e52 100644
--- a/traffic_portal/app/src/modules/private/collateral/CollateralController.js
+++ b/traffic_portal/app/src/modules/private/collateral/CollateralController.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/collateral/_collateral.scss
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/collateral/_collateral.scss b/traffic_portal/app/src/modules/private/collateral/_collateral.scss
index 5919d19..b2f81fc 100644
--- a/traffic_portal/app/src/modules/private/collateral/_collateral.scss
+++ b/traffic_portal/app/src/modules/private/collateral/_collateral.scss
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/collateral/collateral.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/collateral/collateral.tpl.html b/traffic_portal/app/src/modules/private/collateral/collateral.tpl.html
index 9fb6d2e..6d6a025 100644
--- a/traffic_portal/app/src/modules/private/collateral/collateral.tpl.html
+++ b/traffic_portal/app/src/modules/private/collateral/collateral.tpl.html
@@ -1,6 +1,5 @@
<!--
-Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/collateral/index.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/collateral/index.js b/traffic_portal/app/src/modules/private/collateral/index.js
index b8e4e30..7fdf76e 100644
--- a/traffic_portal/app/src/modules/private/collateral/index.js
+++ b/traffic_portal/app/src/modules/private/collateral/index.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/dashboard/DashboardController.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/dashboard/DashboardController.js b/traffic_portal/app/src/modules/private/dashboard/DashboardController.js
index 3b3d903..a09ba9d 100644
--- a/traffic_portal/app/src/modules/private/dashboard/DashboardController.js
+++ b/traffic_portal/app/src/modules/private/dashboard/DashboardController.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/dashboard/_dashboard.scss
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/dashboard/_dashboard.scss b/traffic_portal/app/src/modules/private/dashboard/_dashboard.scss
index 8789596..891e068 100644
--- a/traffic_portal/app/src/modules/private/dashboard/_dashboard.scss
+++ b/traffic_portal/app/src/modules/private/dashboard/_dashboard.scss
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/dashboard/dashboard.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/dashboard/dashboard.tpl.html b/traffic_portal/app/src/modules/private/dashboard/dashboard.tpl.html
index 5b042d2..62764f0 100644
--- a/traffic_portal/app/src/modules/private/dashboard/dashboard.tpl.html
+++ b/traffic_portal/app/src/modules/private/dashboard/dashboard.tpl.html
@@ -1,6 +1,5 @@
<!--
-Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/dashboard/index.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/dashboard/index.js b/traffic_portal/app/src/modules/private/dashboard/index.js
index 66f8f1a..a997c20 100644
--- a/traffic_portal/app/src/modules/private/dashboard/index.js
+++ b/traffic_portal/app/src/modules/private/dashboard/index.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/dashboard/overview/deliveryServices/DashboardDeliveryServicesController.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/dashboard/overview/deliveryServices/DashboardDeliveryServicesController.js b/traffic_portal/app/src/modules/private/dashboard/overview/deliveryServices/DashboardDeliveryServicesController.js
index 72f6058..f7bf9a4 100644
--- a/traffic_portal/app/src/modules/private/dashboard/overview/deliveryServices/DashboardDeliveryServicesController.js
+++ b/traffic_portal/app/src/modules/private/dashboard/overview/deliveryServices/DashboardDeliveryServicesController.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/dashboard/overview/deliveryServices/_dashboard.deliveryServices.scss
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/dashboard/overview/deliveryServices/_dashboard.deliveryServices.scss b/traffic_portal/app/src/modules/private/dashboard/overview/deliveryServices/_dashboard.deliveryServices.scss
index 14d8aa5..ea39454 100644
--- a/traffic_portal/app/src/modules/private/dashboard/overview/deliveryServices/_dashboard.deliveryServices.scss
+++ b/traffic_portal/app/src/modules/private/dashboard/overview/deliveryServices/_dashboard.deliveryServices.scss
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/dashboard/overview/deliveryServices/dashboard.deliveryServices.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/dashboard/overview/deliveryServices/dashboard.deliveryServices.tpl.html b/traffic_portal/app/src/modules/private/dashboard/overview/deliveryServices/dashboard.deliveryServices.tpl.html
index dcb9ee0..9df6480 100644
--- a/traffic_portal/app/src/modules/private/dashboard/overview/deliveryServices/dashboard.deliveryServices.tpl.html
+++ b/traffic_portal/app/src/modules/private/dashboard/overview/deliveryServices/dashboard.deliveryServices.tpl.html
@@ -1,6 +1,5 @@
<!--
-Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/dashboard/overview/index.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/dashboard/overview/index.js b/traffic_portal/app/src/modules/private/dashboard/overview/index.js
index 4db194d..27ade92 100644
--- a/traffic_portal/app/src/modules/private/dashboard/overview/index.js
+++ b/traffic_portal/app/src/modules/private/dashboard/overview/index.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/deliveryService/DeliveryServiceController.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/deliveryService/DeliveryServiceController.js b/traffic_portal/app/src/modules/private/deliveryService/DeliveryServiceController.js
index 35f2f06..47bc476 100644
--- a/traffic_portal/app/src/modules/private/deliveryService/DeliveryServiceController.js
+++ b/traffic_portal/app/src/modules/private/deliveryService/DeliveryServiceController.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/deliveryService/_deliveryService.scss
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/deliveryService/_deliveryService.scss b/traffic_portal/app/src/modules/private/deliveryService/_deliveryService.scss
index aa7787c..fff23b4 100644
--- a/traffic_portal/app/src/modules/private/deliveryService/_deliveryService.scss
+++ b/traffic_portal/app/src/modules/private/deliveryService/_deliveryService.scss
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/deliveryService/deliveryService.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/deliveryService/deliveryService.tpl.html b/traffic_portal/app/src/modules/private/deliveryService/deliveryService.tpl.html
index 1ff9ad8..b986f5c 100644
--- a/traffic_portal/app/src/modules/private/deliveryService/deliveryService.tpl.html
+++ b/traffic_portal/app/src/modules/private/deliveryService/deliveryService.tpl.html
@@ -1,6 +1,5 @@
<!--
-Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/deliveryService/index.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/deliveryService/index.js b/traffic_portal/app/src/modules/private/deliveryService/index.js
index 5a3a31d..19c6ecf 100644
--- a/traffic_portal/app/src/modules/private/deliveryService/index.js
+++ b/traffic_portal/app/src/modules/private/deliveryService/index.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/deliveryService/new/DeliveryServiceNewController.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/deliveryService/new/DeliveryServiceNewController.js b/traffic_portal/app/src/modules/private/deliveryService/new/DeliveryServiceNewController.js
index ef2c39e..36e81ab 100644
--- a/traffic_portal/app/src/modules/private/deliveryService/new/DeliveryServiceNewController.js
+++ b/traffic_portal/app/src/modules/private/deliveryService/new/DeliveryServiceNewController.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/deliveryService/new/_deliveryService.new.scss
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/deliveryService/new/_deliveryService.new.scss b/traffic_portal/app/src/modules/private/deliveryService/new/_deliveryService.new.scss
index 85341dd..e1efd00 100644
--- a/traffic_portal/app/src/modules/private/deliveryService/new/_deliveryService.new.scss
+++ b/traffic_portal/app/src/modules/private/deliveryService/new/_deliveryService.new.scss
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/deliveryService/new/deliveryService.new.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/deliveryService/new/deliveryService.new.tpl.html b/traffic_portal/app/src/modules/private/deliveryService/new/deliveryService.new.tpl.html
index 79fa4a7..9003ee3 100644
--- a/traffic_portal/app/src/modules/private/deliveryService/new/deliveryService.new.tpl.html
+++ b/traffic_portal/app/src/modules/private/deliveryService/new/deliveryService.new.tpl.html
@@ -1,6 +1,5 @@
<!--
-Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/deliveryService/new/index.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/deliveryService/new/index.js b/traffic_portal/app/src/modules/private/deliveryService/new/index.js
index 2f2399c..fc7ab24 100644
--- a/traffic_portal/app/src/modules/private/deliveryService/new/index.js
+++ b/traffic_portal/app/src/modules/private/deliveryService/new/index.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/deliveryService/view/DeliveryServiceViewController.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/deliveryService/view/DeliveryServiceViewController.js b/traffic_portal/app/src/modules/private/deliveryService/view/DeliveryServiceViewController.js
index 4bd0a73..1257613 100644
--- a/traffic_portal/app/src/modules/private/deliveryService/view/DeliveryServiceViewController.js
+++ b/traffic_portal/app/src/modules/private/deliveryService/view/DeliveryServiceViewController.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/deliveryService/view/_deliveryService.view.scss
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/deliveryService/view/_deliveryService.view.scss b/traffic_portal/app/src/modules/private/deliveryService/view/_deliveryService.view.scss
index aa7787c..fff23b4 100644
--- a/traffic_portal/app/src/modules/private/deliveryService/view/_deliveryService.view.scss
+++ b/traffic_portal/app/src/modules/private/deliveryService/view/_deliveryService.view.scss
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/deliveryService/view/charts/DeliveryServiceViewChartsController.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/deliveryService/view/charts/DeliveryServiceViewChartsController.js b/traffic_portal/app/src/modules/private/deliveryService/view/charts/DeliveryServiceViewChartsController.js
index 28ad6de..a7212bf 100644
--- a/traffic_portal/app/src/modules/private/deliveryService/view/charts/DeliveryServiceViewChartsController.js
+++ b/traffic_portal/app/src/modules/private/deliveryService/view/charts/DeliveryServiceViewChartsController.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/deliveryService/view/charts/_deliveryService.view.charts.scss
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/deliveryService/view/charts/_deliveryService.view.charts.scss b/traffic_portal/app/src/modules/private/deliveryService/view/charts/_deliveryService.view.charts.scss
index 590c04f..ce980e2 100644
--- a/traffic_portal/app/src/modules/private/deliveryService/view/charts/_deliveryService.view.charts.scss
+++ b/traffic_portal/app/src/modules/private/deliveryService/view/charts/_deliveryService.view.charts.scss
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/deliveryService/view/charts/bandwidthPerSecond/index.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/deliveryService/view/charts/bandwidthPerSecond/index.js b/traffic_portal/app/src/modules/private/deliveryService/view/charts/bandwidthPerSecond/index.js
index 594f276..07ab673 100644
--- a/traffic_portal/app/src/modules/private/deliveryService/view/charts/bandwidthPerSecond/index.js
+++ b/traffic_portal/app/src/modules/private/deliveryService/view/charts/bandwidthPerSecond/index.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/deliveryService/view/charts/deliveryService.view.charts.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/deliveryService/view/charts/deliveryService.view.charts.tpl.html b/traffic_portal/app/src/modules/private/deliveryService/view/charts/deliveryService.view.charts.tpl.html
index ba4aaf0..2a8c0b4 100644
--- a/traffic_portal/app/src/modules/private/deliveryService/view/charts/deliveryService.view.charts.tpl.html
+++ b/traffic_portal/app/src/modules/private/deliveryService/view/charts/deliveryService.view.charts.tpl.html
@@ -1,6 +1,5 @@
<!--
-Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/deliveryService/view/charts/httpStatus/index.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/deliveryService/view/charts/httpStatus/index.js b/traffic_portal/app/src/modules/private/deliveryService/view/charts/httpStatus/index.js
index 69fb8f1..1618b0b 100644
--- a/traffic_portal/app/src/modules/private/deliveryService/view/charts/httpStatus/index.js
+++ b/traffic_portal/app/src/modules/private/deliveryService/view/charts/httpStatus/index.js
@@ -1,6 +1,5 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
[07/26] incubator-trafficcontrol git commit: merge master
Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/admin/types/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/admin/types/index.js b/traffic_ops/experimental/ui/app/src/modules/private/admin/types/index.js
index f47e726..d92e962 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/admin/types/index.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/admin/types/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.private.admin.types', [])
.controller('TypesController', require('./TypesController'))
.config(function($stateProvider, $urlRouterProvider) {
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/admin/types/list/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/admin/types/list/index.js b/traffic_ops/experimental/ui/app/src/modules/private/admin/types/list/index.js
index c74f9c6..6703742 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/admin/types/list/index.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/admin/types/list/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.private.admin.types.list', [])
.config(function($stateProvider, $urlRouterProvider) {
$stateProvider
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/admin/types/new/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/admin/types/new/index.js b/traffic_ops/experimental/ui/app/src/modules/private/admin/types/new/index.js
index d5528f5..f2f3a14 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/admin/types/new/index.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/admin/types/new/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.private.admin.types.new', [])
.config(function($stateProvider, $urlRouterProvider) {
$stateProvider
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/admin/types/types.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/admin/types/types.tpl.html b/traffic_ops/experimental/ui/app/src/modules/private/admin/types/types.tpl.html
index b7d54c1..c8856f4 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/admin/types/types.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/modules/private/admin/types/types.tpl.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<div id="typesContainer">
<div ui-view="typesContent"></div>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/admin/users/UsersController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/admin/users/UsersController.js b/traffic_ops/experimental/ui/app/src/modules/private/admin/users/UsersController.js
index db06a29..5e51dbf 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/admin/users/UsersController.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/admin/users/UsersController.js
@@ -1,5 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var UsersController = function() {
};
UsersController.$inject = [];
-module.exports = UsersController;
\ No newline at end of file
+module.exports = UsersController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/admin/users/edit/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/admin/users/edit/index.js b/traffic_ops/experimental/ui/app/src/modules/private/admin/users/edit/index.js
index aec9ee1..2eac387 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/admin/users/edit/index.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/admin/users/edit/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.private.admin.users.edit', [])
.config(function($stateProvider, $urlRouterProvider) {
$stateProvider
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/admin/users/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/admin/users/index.js b/traffic_ops/experimental/ui/app/src/modules/private/admin/users/index.js
index 3dd4819..7adc96d 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/admin/users/index.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/admin/users/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.private.admin.users', [])
.controller('UsersController', require('./UsersController'))
.config(function($stateProvider, $urlRouterProvider) {
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/admin/users/list/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/admin/users/list/index.js b/traffic_ops/experimental/ui/app/src/modules/private/admin/users/list/index.js
index 7ed4a45..e3b99ef 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/admin/users/list/index.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/admin/users/list/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.private.admin.users.list', [])
.config(function($stateProvider, $urlRouterProvider) {
$stateProvider
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/admin/users/new/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/admin/users/new/index.js b/traffic_ops/experimental/ui/app/src/modules/private/admin/users/new/index.js
index 0328a38..ee3f0c2 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/admin/users/new/index.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/admin/users/new/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.private.admin.users.new', [])
.config(function($stateProvider, $urlRouterProvider) {
$stateProvider
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/admin/users/users.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/admin/users/users.tpl.html b/traffic_ops/experimental/ui/app/src/modules/private/admin/users/users.tpl.html
index 17eb397..84ef55b 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/admin/users/users.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/modules/private/admin/users/users.tpl.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<div id="usersContainer">
<div ui-view="usersContent"></div>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/configure/ConfigureController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/configure/ConfigureController.js b/traffic_ops/experimental/ui/app/src/modules/private/configure/ConfigureController.js
index ddd41bb..2e1f17c 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/configure/ConfigureController.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/configure/ConfigureController.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var ConfigureController = function($scope, $location) {
$scope.navigateToPath = function(path) {
@@ -7,4 +26,4 @@ var ConfigureController = function($scope, $location) {
};
ConfigureController.$inject = ['$scope', '$location'];
-module.exports = ConfigureController;
\ No newline at end of file
+module.exports = ConfigureController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/configure/cacheGroups/CacheGroupsController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/configure/cacheGroups/CacheGroupsController.js b/traffic_ops/experimental/ui/app/src/modules/private/configure/cacheGroups/CacheGroupsController.js
index 3b16e9f..f541f60 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/configure/cacheGroups/CacheGroupsController.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/configure/cacheGroups/CacheGroupsController.js
@@ -1,5 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var CacheGroupsController = function() {
};
CacheGroupsController.$inject = [];
-module.exports = CacheGroupsController;
\ No newline at end of file
+module.exports = CacheGroupsController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/configure/cacheGroups/cacheGroups.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/configure/cacheGroups/cacheGroups.tpl.html b/traffic_ops/experimental/ui/app/src/modules/private/configure/cacheGroups/cacheGroups.tpl.html
index da16425..6f047d3 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/configure/cacheGroups/cacheGroups.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/modules/private/configure/cacheGroups/cacheGroups.tpl.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<div id="cacheGroupsContainer">
<div ui-view="cacheGroupsContent"></div>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/configure/cacheGroups/edit/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/configure/cacheGroups/edit/index.js b/traffic_ops/experimental/ui/app/src/modules/private/configure/cacheGroups/edit/index.js
index 95a5d6f..2f01f1a 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/configure/cacheGroups/edit/index.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/configure/cacheGroups/edit/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.private.configure.cacheGroups.edit', [])
.config(function($stateProvider, $urlRouterProvider) {
$stateProvider
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/configure/cacheGroups/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/configure/cacheGroups/index.js b/traffic_ops/experimental/ui/app/src/modules/private/configure/cacheGroups/index.js
index ed2e88f..1fddc13 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/configure/cacheGroups/index.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/configure/cacheGroups/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.private.configure.cacheGroups', [])
.controller('CacheGroupsController', require('./CacheGroupsController'))
.config(function($stateProvider, $urlRouterProvider) {
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/configure/cacheGroups/list/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/configure/cacheGroups/list/index.js b/traffic_ops/experimental/ui/app/src/modules/private/configure/cacheGroups/list/index.js
index f9935ef..58e8c94 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/configure/cacheGroups/list/index.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/configure/cacheGroups/list/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.private.configure.cacheGroups.list', [])
.config(function($stateProvider, $urlRouterProvider) {
$stateProvider
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/configure/cacheGroups/new/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/configure/cacheGroups/new/index.js b/traffic_ops/experimental/ui/app/src/modules/private/configure/cacheGroups/new/index.js
index 71d8f07..ef964fb 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/configure/cacheGroups/new/index.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/configure/cacheGroups/new/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.private.configure.cacheGroups.new', [])
.config(function($stateProvider, $urlRouterProvider) {
$stateProvider
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/configure/configure.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/configure/configure.tpl.html b/traffic_ops/experimental/ui/app/src/modules/private/configure/configure.tpl.html
index 0bdf8b7..af35161 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/configure/configure.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/modules/private/configure/configure.tpl.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<div id="configureContainer">
<div ui-view="configureContent"></div>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/configure/deliveryServices/DeliveryServicesController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/configure/deliveryServices/DeliveryServicesController.js b/traffic_ops/experimental/ui/app/src/modules/private/configure/deliveryServices/DeliveryServicesController.js
index acab1a7..b472032 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/configure/deliveryServices/DeliveryServicesController.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/configure/deliveryServices/DeliveryServicesController.js
@@ -1,5 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var DeliveryServicesController = function() {
};
DeliveryServicesController.$inject = [];
-module.exports = DeliveryServicesController;
\ No newline at end of file
+module.exports = DeliveryServicesController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/configure/deliveryServices/deliveryServices.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/configure/deliveryServices/deliveryServices.tpl.html b/traffic_ops/experimental/ui/app/src/modules/private/configure/deliveryServices/deliveryServices.tpl.html
index b55fbd6..2035386 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/configure/deliveryServices/deliveryServices.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/modules/private/configure/deliveryServices/deliveryServices.tpl.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<div id="deliveryServicesContainer">
<div ui-view="deliveryServicesContent"></div>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/configure/deliveryServices/edit/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/configure/deliveryServices/edit/index.js b/traffic_ops/experimental/ui/app/src/modules/private/configure/deliveryServices/edit/index.js
index 9bd86fd..6a75535 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/configure/deliveryServices/edit/index.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/configure/deliveryServices/edit/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.private.configure.deliveryServices.edit', [])
.config(function($stateProvider, $urlRouterProvider) {
$stateProvider
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/configure/deliveryServices/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/configure/deliveryServices/index.js b/traffic_ops/experimental/ui/app/src/modules/private/configure/deliveryServices/index.js
index 0dc6e8e..60b895a 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/configure/deliveryServices/index.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/configure/deliveryServices/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.private.configure.deliveryServices', [])
.controller('DeliveryServicesController', require('./DeliveryServicesController'))
.config(function($stateProvider, $urlRouterProvider) {
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/configure/deliveryServices/list/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/configure/deliveryServices/list/index.js b/traffic_ops/experimental/ui/app/src/modules/private/configure/deliveryServices/list/index.js
index 460ea39..d299bee 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/configure/deliveryServices/list/index.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/configure/deliveryServices/list/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.private.configure.deliveryServices.list', [])
.config(function($stateProvider, $urlRouterProvider) {
$stateProvider
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/configure/deliveryServices/new/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/configure/deliveryServices/new/index.js b/traffic_ops/experimental/ui/app/src/modules/private/configure/deliveryServices/new/index.js
index cab823e..d77698c 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/configure/deliveryServices/new/index.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/configure/deliveryServices/new/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.private.configure.deliveryServices.new', [])
.config(function($stateProvider, $urlRouterProvider) {
$stateProvider
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/configure/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/configure/index.js b/traffic_ops/experimental/ui/app/src/modules/private/configure/index.js
index 92f9efb..0660dc4 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/configure/index.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/configure/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.private.configure', [])
.controller('ConfigureController', require('./ConfigureController'))
.config(function($stateProvider, $urlRouterProvider) {
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/configure/servers/ServersController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/configure/servers/ServersController.js b/traffic_ops/experimental/ui/app/src/modules/private/configure/servers/ServersController.js
index 871a433..a015b09 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/configure/servers/ServersController.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/configure/servers/ServersController.js
@@ -1,5 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var ServersController = function() {
};
ServersController.$inject = [];
-module.exports = ServersController;
\ No newline at end of file
+module.exports = ServersController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/configure/servers/edit/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/configure/servers/edit/index.js b/traffic_ops/experimental/ui/app/src/modules/private/configure/servers/edit/index.js
index e3184d3..a500b16 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/configure/servers/edit/index.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/configure/servers/edit/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.private.configure.servers.edit', [])
.config(function($stateProvider, $urlRouterProvider) {
$stateProvider
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/configure/servers/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/configure/servers/index.js b/traffic_ops/experimental/ui/app/src/modules/private/configure/servers/index.js
index f10f4e7..614cb34 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/configure/servers/index.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/configure/servers/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.private.configure.servers', [])
.controller('ServersController', require('./ServersController'))
.config(function($stateProvider, $urlRouterProvider) {
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/configure/servers/list/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/configure/servers/list/index.js b/traffic_ops/experimental/ui/app/src/modules/private/configure/servers/list/index.js
index bcedad2..182f6cd 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/configure/servers/list/index.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/configure/servers/list/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.private.configure.servers.list', [])
.config(function($stateProvider, $urlRouterProvider) {
$stateProvider
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/configure/servers/new/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/configure/servers/new/index.js b/traffic_ops/experimental/ui/app/src/modules/private/configure/servers/new/index.js
index 0361a52..9a165e7 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/configure/servers/new/index.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/configure/servers/new/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.private.configure.servers.new', [])
.config(function($stateProvider, $urlRouterProvider) {
$stateProvider
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/configure/servers/servers.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/configure/servers/servers.tpl.html b/traffic_ops/experimental/ui/app/src/modules/private/configure/servers/servers.tpl.html
index c93e203..326b8fc 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/configure/servers/servers.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/modules/private/configure/servers/servers.tpl.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<div id="serversContainer">
<div ui-view="serversContent"></div>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/index.js b/traffic_ops/experimental/ui/app/src/modules/private/index.js
index 60d4df7..19d66db 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/index.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.private', [])
.config(function($stateProvider, $urlRouterProvider) {
$stateProvider
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/monitor/MonitorController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/monitor/MonitorController.js b/traffic_ops/experimental/ui/app/src/modules/private/monitor/MonitorController.js
index 85d5a8e..695fdbb 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/monitor/MonitorController.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/monitor/MonitorController.js
@@ -1,4 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var MonitorController = function() {};
MonitorController.$inject = [];
-module.exports = MonitorController;
\ No newline at end of file
+module.exports = MonitorController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/DashboardsController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/DashboardsController.js b/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/DashboardsController.js
index 0a7f2ae..ab114c2 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/DashboardsController.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/DashboardsController.js
@@ -1,5 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var DashboardsController = function($scope) {
};
DashboardsController.$inject = ['$scope'];
-module.exports = DashboardsController;
\ No newline at end of file
+module.exports = DashboardsController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/dashboards.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/dashboards.tpl.html b/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/dashboards.tpl.html
index 7f28d22..3a7a94a 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/dashboards.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/dashboards.tpl.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<div id="dashboardsContainer">
<div ui-view="dashboardsContent"></div>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/index.js b/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/index.js
index e841831..aa6994a 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/index.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.private.monitor.dashboards', [])
.controller('DashboardsController', require('./DashboardsController'))
.config(function($stateProvider, $urlRouterProvider) {
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/one/DashboardsOneController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/one/DashboardsOneController.js b/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/one/DashboardsOneController.js
index 28c83ff..b37e1c0 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/one/DashboardsOneController.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/one/DashboardsOneController.js
@@ -1,5 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var DashboardsOneController = function($scope) {
};
DashboardsOneController.$inject = ['$scope'];
-module.exports = DashboardsOneController;
\ No newline at end of file
+module.exports = DashboardsOneController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/one/dashboards.one.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/one/dashboards.one.tpl.html b/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/one/dashboards.one.tpl.html
index 9477c43..b1a8be8 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/one/dashboards.one.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/one/dashboards.one.tpl.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<div class="angular-google-map-container" map-lazy-load="https://maps.google.com/maps/api/js">
<ng-map center="41,-87" zoom="3"></ng-map>
-</div>
\ No newline at end of file
+</div>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/one/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/one/index.js b/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/one/index.js
index 2da2719..73a645a 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/one/index.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/one/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.private.monitor.dashboards.one', [])
.controller('DashboardsOneController', require('./DashboardsOneController'))
.config(function($stateProvider, $urlRouterProvider) {
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/three/DashboardsThreeController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/three/DashboardsThreeController.js b/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/three/DashboardsThreeController.js
index 1d187af..65317c2 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/three/DashboardsThreeController.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/three/DashboardsThreeController.js
@@ -1,5 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var DashboardsThreeController = function($scope) {
};
DashboardsThreeController.$inject = ['$scope'];
-module.exports = DashboardsThreeController;
\ No newline at end of file
+module.exports = DashboardsThreeController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/three/dashboards.three.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/three/dashboards.three.tpl.html b/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/three/dashboards.three.tpl.html
index 9a19464..5fc86dd 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/three/dashboards.three.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/three/dashboards.three.tpl.html
@@ -1 +1,20 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<h3>Dashboard #3</h3>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/three/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/three/index.js b/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/three/index.js
index 94d4128..28fe8c4 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/three/index.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/three/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.private.monitor.dashboards.three', [])
.controller('DashboardsThreeController', require('./DashboardsThreeController'))
.config(function($stateProvider, $urlRouterProvider) {
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/two/DashboardsTwoController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/two/DashboardsTwoController.js b/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/two/DashboardsTwoController.js
index 416e90f..5cc6f60 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/two/DashboardsTwoController.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/two/DashboardsTwoController.js
@@ -1,5 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var DashboardsTwoController = function($scope) {
};
DashboardsTwoController.$inject = ['$scope'];
-module.exports = DashboardsTwoController;
\ No newline at end of file
+module.exports = DashboardsTwoController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/two/dashboards.two.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/two/dashboards.two.tpl.html b/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/two/dashboards.two.tpl.html
index 1845fe2..de5ac12 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/two/dashboards.two.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/two/dashboards.two.tpl.html
@@ -1 +1,20 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<h3>Dashboard #2</h3>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/two/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/two/index.js b/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/two/index.js
index 2992b27..7e14aed 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/two/index.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/two/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.private.monitor.dashboards.two', [])
.controller('DashboardsTwoController', require('./DashboardsTwoController'))
.config(function($stateProvider, $urlRouterProvider) {
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/monitor/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/monitor/index.js b/traffic_ops/experimental/ui/app/src/modules/private/monitor/index.js
index 16ed996..3fb1357 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/monitor/index.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/monitor/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.private.monitor', [])
.controller('MonitorController', require('./MonitorController'))
.config(function($stateProvider, $urlRouterProvider) {
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/monitor/monitor.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/monitor/monitor.tpl.html b/traffic_ops/experimental/ui/app/src/modules/private/monitor/monitor.tpl.html
index 5d0b259..6b509ab 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/monitor/monitor.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/modules/private/monitor/monitor.tpl.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<div id="monitorContainer">
<div ui-view="monitorContent"></div>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/private.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/private.tpl.html b/traffic_ops/experimental/ui/app/src/modules/private/private.tpl.html
index a547659..fe3c966 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/private.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/modules/private/private.tpl.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<div id="privateContainer">
<div ui-view="privateContent"></div>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/user/UserController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/user/UserController.js b/traffic_ops/experimental/ui/app/src/modules/private/user/UserController.js
index c630715..bb68bd1 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/user/UserController.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/user/UserController.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var UserController = function($scope, $state, $uibModal, formUtils, locationUtils, userService, authService, roleService, userModel) {
var updateUser = function(user, options) {
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/user/edit/UserEditController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/user/edit/UserEditController.js b/traffic_ops/experimental/ui/app/src/modules/private/user/edit/UserEditController.js
index d063dd2..7dd5999 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/user/edit/UserEditController.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/user/edit/UserEditController.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var UserEditController = function($scope) {
$scope.settings = {
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/user/edit/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/user/edit/index.js b/traffic_ops/experimental/ui/app/src/modules/private/user/edit/index.js
index 3960d8c..b218157 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/user/edit/index.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/user/edit/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.private.user.edit', [])
.controller('UserEditController', require('./UserEditController'))
.config(function($stateProvider, $urlRouterProvider) {
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/user/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/user/index.js b/traffic_ops/experimental/ui/app/src/modules/private/user/index.js
index dc29f8d..cff85b2 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/user/index.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/user/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.private.user', [])
.controller('UserController', require('./UserController'))
.config(function($stateProvider, $urlRouterProvider) {
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/private/user/user.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/user/user.tpl.html b/traffic_ops/experimental/ui/app/src/modules/private/user/user.tpl.html
index 733f10e..57c0cde 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/user/user.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/modules/private/user/user.tpl.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<div id="userContainer">
<div ui-view="userContent"></div>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/public/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/public/index.js b/traffic_ops/experimental/ui/app/src/modules/public/index.js
index 3ea8afe..2f945c4 100644
--- a/traffic_ops/experimental/ui/app/src/modules/public/index.js
+++ b/traffic_ops/experimental/ui/app/src/modules/public/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.public', [])
.config(function($stateProvider, $urlRouterProvider) {
$stateProvider
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/modules/public/login/LoginController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/public/login/LoginController.js b/traffic_ops/experimental/ui/app/src/modules/public/login/LoginController.js
index e191263..f8e1282 100644
--- a/traffic_ops/experimental/ui/app/src/modules/public/login/LoginController.js
+++ b/traffic_ops/experimental/ui/app/src/modules/public/login/LoginController.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var LoginController = function($scope, $log, $uibModal, authService) {
$scope.credentials = {
[11/26] incubator-trafficcontrol git commit: merge master
Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/cacheGroup/new/FormNewCacheGroupController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/cacheGroup/new/FormNewCacheGroupController.js b/traffic_ops/experimental/ui/app/src/common/modules/form/cacheGroup/new/FormNewCacheGroupController.js
index 0c78a1a..f13ad51 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/cacheGroup/new/FormNewCacheGroupController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/cacheGroup/new/FormNewCacheGroupController.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var FormNewCacheGroupController = function(cacheGroup, $scope, $controller, cacheGroupService) {
// extends the FormCacheGroupController to inherit common methods
@@ -17,4 +36,4 @@ var FormNewCacheGroupController = function(cacheGroup, $scope, $controller, cach
};
FormNewCacheGroupController.$inject = ['cacheGroup', '$scope', '$controller', 'cacheGroupService'];
-module.exports = FormNewCacheGroupController;
\ No newline at end of file
+module.exports = FormNewCacheGroupController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/cacheGroup/new/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/cacheGroup/new/index.js b/traffic_ops/experimental/ui/app/src/common/modules/form/cacheGroup/new/index.js
index 8bd5d0d..60e0e24 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/cacheGroup/new/index.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/cacheGroup/new/index.js
@@ -1,2 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.form.cacheGroup.new', [])
.controller('FormNewCacheGroupController', require('./FormNewCacheGroupController'));
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/cdn/FormCDNController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/cdn/FormCDNController.js b/traffic_ops/experimental/ui/app/src/common/modules/form/cdn/FormCDNController.js
index 298f28b..6349099 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/cdn/FormCDNController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/cdn/FormCDNController.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var FormCDNController = function(cdn, $scope, formUtils, stringUtils, locationUtils) {
$scope.cdn = cdn;
@@ -22,4 +41,4 @@ var FormCDNController = function(cdn, $scope, formUtils, stringUtils, locationUt
};
FormCDNController.$inject = ['cdn', '$scope', 'formUtils', 'stringUtils', 'locationUtils'];
-module.exports = FormCDNController;
\ No newline at end of file
+module.exports = FormCDNController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/cdn/edit/FormEditCDNController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/cdn/edit/FormEditCDNController.js b/traffic_ops/experimental/ui/app/src/common/modules/form/cdn/edit/FormEditCDNController.js
index 1126fa7..8f7a796 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/cdn/edit/FormEditCDNController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/cdn/edit/FormEditCDNController.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var FormEditCDNController = function(cdn, $scope, $controller, $uibModal, $anchorScroll, locationUtils, cdnService) {
// extends the FormCDNController to inherit common methods
@@ -50,4 +69,4 @@ var FormEditCDNController = function(cdn, $scope, $controller, $uibModal, $ancho
};
FormEditCDNController.$inject = ['cdn', '$scope', '$controller', '$uibModal', '$anchorScroll', 'locationUtils', 'cdnService'];
-module.exports = FormEditCDNController;
\ No newline at end of file
+module.exports = FormEditCDNController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/cdn/edit/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/cdn/edit/index.js b/traffic_ops/experimental/ui/app/src/common/modules/form/cdn/edit/index.js
index bc01eca..7efadd2 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/cdn/edit/index.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/cdn/edit/index.js
@@ -1,2 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.form.cdn.edit', [])
.controller('FormEditCDNController', require('./FormEditCDNController'));
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/cdn/form.cdn.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/cdn/form.cdn.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/form/cdn/form.cdn.tpl.html
index 06bf468..71fd948 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/cdn/form.cdn.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/cdn/form.cdn.tpl.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<div class="x_panel">
<div class="x_title">
<ol class="breadcrumb">
@@ -31,4 +50,4 @@
</div>
</form>
</div>
-</div>
\ No newline at end of file
+</div>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/cdn/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/cdn/index.js b/traffic_ops/experimental/ui/app/src/common/modules/form/cdn/index.js
index ae85f31..aab2ead 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/cdn/index.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/cdn/index.js
@@ -1,2 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.form.cdn', [])
.controller('FormCDNController', require('./FormCDNController'));
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/cdn/new/FormNewCDNController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/cdn/new/FormNewCDNController.js b/traffic_ops/experimental/ui/app/src/common/modules/form/cdn/new/FormNewCDNController.js
index dc517a8..0d4079a 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/cdn/new/FormNewCDNController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/cdn/new/FormNewCDNController.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var FormNewCDNController = function(cdn, $scope, $controller, cdnService) {
// extends the FormCDNController to inherit common methods
@@ -17,4 +36,4 @@ var FormNewCDNController = function(cdn, $scope, $controller, cdnService) {
};
FormNewCDNController.$inject = ['cdn', '$scope', '$controller', 'cdnService'];
-module.exports = FormNewCDNController;
\ No newline at end of file
+module.exports = FormNewCDNController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/cdn/new/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/cdn/new/index.js b/traffic_ops/experimental/ui/app/src/common/modules/form/cdn/new/index.js
index 6274340..308da11 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/cdn/new/index.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/cdn/new/index.js
@@ -1,2 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.form.cdn.new', [])
.controller('FormNewCDNController', require('./FormNewCDNController'));
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/deliveryService/FormDeliveryServiceController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/deliveryService/FormDeliveryServiceController.js b/traffic_ops/experimental/ui/app/src/common/modules/form/deliveryService/FormDeliveryServiceController.js
index 51619ad..82c9a7c 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/deliveryService/FormDeliveryServiceController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/deliveryService/FormDeliveryServiceController.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var FormDeliveryServiceController = function(deliveryService, $scope, formUtils, locationUtils, cdnService, profileService, typeService) {
var getTypes = function() {
@@ -29,78 +48,78 @@ var FormDeliveryServiceController = function(deliveryService, $scope, formUtils,
];
$scope.protocols = [
- { value: "0", label: '0 - HTTP' },
- { value: "1", label: '1 - HTTPS' },
- { value: "2", label: '2 - HTTP AND HTTPS' },
- { value: "3", label: '3 - HTTP TO HTTPS' }
+ { value: 0, label: '0 - HTTP' },
+ { value: 1, label: '1 - HTTPS' },
+ { value: 2, label: '2 - HTTP AND HTTPS' },
+ { value: 3, label: '3 - HTTP TO HTTPS' }
];
$scope.qStrings = [
- { value: "0", label: '0 - use qstring in cache key, and pass up' },
- { value: "1", label: '1 - ignore in cache key, and pass up' },
- { value: "2", label: '2 - drop at edge' }
+ { value: 0, label: '0 - use qstring in cache key, and pass up' },
+ { value: 1, label: '1 - ignore in cache key, and pass up' },
+ { value: 2, label: '2 - drop at edge' }
];
$scope.geoLimits = [
- { value: "0", label: '0 - None' },
- { value: "1", label: '1 - CZF only' },
- { value: "2", label: '2 - CZF + Country Code(s)' }
+ { value: 0, label: '0 - None' },
+ { value: 1, label: '1 - CZF only' },
+ { value: 2, label: '2 - CZF + Country Code(s)' }
];
$scope.geoProviders = [
- { value: "0", label: '0 - Maxmind (Default)' },
- { value: "1", label: '1 - Neustar' }
+ { value: 0, label: '0 - Maxmind (Default)' },
+ { value: 1, label: '1 - Neustar' }
];
$scope.dscps = [
- { value: "0", label: '0 - Best Effort' },
- { value: "10", label: '10 - AF11' },
- { value: "12", label: '12 - AF12' },
- { value: "14", label: '14 - AF13' },
- { value: "18", label: '18 - AF21' },
- { value: "20", label: '20 - AF22' },
- { value: "22", label: '22 - AF23' },
- { value: "26", label: '26 - AF31' },
- { value: "28", label: '28 - AF32' },
- { value: "30", label: '30 - AF33' },
- { value: "34", label: '34 - AF41' },
- { value: "36", label: '36 - AF42' },
- { value: "37", label: '37 - ' },
- { value: "38", label: '38 - AF43' },
- { value: "8", label: '8 - CS1' },
- { value: "16", label: '16 - CS2' },
- { value: "24", label: '24 - CS3' },
- { value: "32", label: '32 - CS4' },
- { value: "40", label: '40 - CS5' },
- { value: "48", label: '48 - CS6' },
- { value: "56", label: '56 - CS7' }
+ { value: 0, label: '0 - Best Effort' },
+ { value: 10, label: '10 - AF11' },
+ { value: 12, label: '12 - AF12' },
+ { value: 14, label: '14 - AF13' },
+ { value: 18, label: '18 - AF21' },
+ { value: 20, label: '20 - AF22' },
+ { value: 22, label: '22 - AF23' },
+ { value: 26, label: '26 - AF31' },
+ { value: 28, label: '28 - AF32' },
+ { value: 30, label: '30 - AF33' },
+ { value: 34, label: '34 - AF41' },
+ { value: 36, label: '36 - AF42' },
+ { value: 37, label: '37 - ' },
+ { value: 38, label: '38 - AF43' },
+ { value: 8, label: '8 - CS1' },
+ { value: 16, label: '16 - CS2' },
+ { value: 24, label: '24 - CS3' },
+ { value: 32, label: '32 - CS4' },
+ { value: 40, label: '40 - CS5' },
+ { value: 48, label: '48 - CS6' },
+ { value: 56, label: '56 - CS7' }
];
$scope.dispersions = [
- { value: "1", label: '1 - OFF' },
- { value: "2", label: '2' },
- { value: "3", label: '3' },
- { value: "4", label: '4' },
- { value: "5", label: '5' },
- { value: "6", label: '6' },
- { value: "7", label: '7' },
- { value: "8", label: '8' },
- { value: "9", label: '9' },
- { value: "10", label: '10' }
+ { value: 1, label: '1 - OFF' },
+ { value: 2, label: '2' },
+ { value: 3, label: '3' },
+ { value: 4, label: '4' },
+ { value: 5, label: '5' },
+ { value: 6, label: '6' },
+ { value: 7, label: '7' },
+ { value: 8, label: '8' },
+ { value: 9, label: '9' },
+ { value: 10, label: '10' }
];
$scope.rrhs = [
- { value: "0", label: "0 - Don't cache" },
- { value: "1", label: "1 - Use background_fetch plugin" },
- { value: "2", label: "2 - Use cache_range_requests plugin" }
+ { value: 0, label: "0 - Don't cache" },
+ { value: 1, label: "1 - Use background_fetch plugin" },
+ { value: 2, label: "2 - Use cache_range_requests plugin" }
];
$scope.msoAlgos = [
- { value: "0", label: "0 - Consistent Hash" },
- { value: "1", label: "1 - Primary/Backup" },
- { value: "2", label: "2 - Strict Round Robin" },
- { value: "3", label: "3 - IP-based Round Robin" },
- { value: "4", label: "4 - Latch on Failover" }
+ { value: 0, label: "0 - Consistent Hash" },
+ { value: 1, label: "1 - Primary/Backup" },
+ { value: 2, label: "2 - Strict Round Robin" },
+ { value: 3, label: "3 - IP-based Round Robin" },
+ { value: 4, label: "4 - Latch on Failover" }
];
$scope.navigateToPath = locationUtils.navigateToPath;
@@ -119,4 +138,4 @@ var FormDeliveryServiceController = function(deliveryService, $scope, formUtils,
};
FormDeliveryServiceController.$inject = ['deliveryService', '$scope', 'formUtils', 'locationUtils', 'cdnService', 'profileService', 'typeService'];
-module.exports = FormDeliveryServiceController;
\ No newline at end of file
+module.exports = FormDeliveryServiceController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/deliveryService/edit/FormEditDeliveryServiceController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/deliveryService/edit/FormEditDeliveryServiceController.js b/traffic_ops/experimental/ui/app/src/common/modules/form/deliveryService/edit/FormEditDeliveryServiceController.js
index 5591b52..8abb889 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/deliveryService/edit/FormEditDeliveryServiceController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/deliveryService/edit/FormEditDeliveryServiceController.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var FormEditDeliveryServiceController = function(deliveryService, $scope, $controller, $uibModal, $anchorScroll, locationUtils, deliveryServiceService) {
// extends the FormDeliveryServiceController to inherit common methods
@@ -50,4 +69,4 @@ var FormEditDeliveryServiceController = function(deliveryService, $scope, $contr
};
FormEditDeliveryServiceController.$inject = ['deliveryService', '$scope', '$controller', '$uibModal', '$anchorScroll', 'locationUtils', 'deliveryServiceService'];
-module.exports = FormEditDeliveryServiceController;
\ No newline at end of file
+module.exports = FormEditDeliveryServiceController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/deliveryService/edit/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/deliveryService/edit/index.js b/traffic_ops/experimental/ui/app/src/common/modules/form/deliveryService/edit/index.js
index 351b9bb..af76783 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/deliveryService/edit/index.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/deliveryService/edit/index.js
@@ -1,2 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.form.deliveryService.edit', [])
.controller('FormEditDeliveryServiceController', require('./FormEditDeliveryServiceController'));
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/deliveryService/form.deliveryService.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/deliveryService/form.deliveryService.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/form/deliveryService/form.deliveryService.tpl.html
index 2b63a22..1bc4cfe 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/deliveryService/form.deliveryService.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/deliveryService/form.deliveryService.tpl.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<div class="x_panel">
<div class="x_title">
<ol class="breadcrumb">
@@ -439,4 +458,4 @@
</div>
</form>
</div>
-</div>
\ No newline at end of file
+</div>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/deliveryService/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/deliveryService/index.js b/traffic_ops/experimental/ui/app/src/common/modules/form/deliveryService/index.js
index c828c9a..be33a68 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/deliveryService/index.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/deliveryService/index.js
@@ -1,2 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.form.deliveryService', [])
.controller('FormDeliveryServiceController', require('./FormDeliveryServiceController'));
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/deliveryService/new/FormNewDeliveryServiceController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/deliveryService/new/FormNewDeliveryServiceController.js b/traffic_ops/experimental/ui/app/src/common/modules/form/deliveryService/new/FormNewDeliveryServiceController.js
index 839b138..98c6ba3 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/deliveryService/new/FormNewDeliveryServiceController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/deliveryService/new/FormNewDeliveryServiceController.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var FormNewDeliveryServiceController = function(deliveryService, $scope, $controller, deliveryServiceService) {
// extends the FormDeliveryServiceController to inherit common methods
@@ -17,4 +36,4 @@ var FormNewDeliveryServiceController = function(deliveryService, $scope, $contro
};
FormNewDeliveryServiceController.$inject = ['deliveryService', '$scope', '$controller', 'deliveryServiceService'];
-module.exports = FormNewDeliveryServiceController;
\ No newline at end of file
+module.exports = FormNewDeliveryServiceController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/deliveryService/new/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/deliveryService/new/index.js b/traffic_ops/experimental/ui/app/src/common/modules/form/deliveryService/new/index.js
index 3339679..f6593dd 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/deliveryService/new/index.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/deliveryService/new/index.js
@@ -1,2 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.form.deliveryService.new', [])
.controller('FormNewDeliveryServiceController', require('./FormNewDeliveryServiceController'));
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/division/FormDivisionController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/division/FormDivisionController.js b/traffic_ops/experimental/ui/app/src/common/modules/form/division/FormDivisionController.js
index 4a4e1b0..81d4031 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/division/FormDivisionController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/division/FormDivisionController.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var FormDivisionController = function(division, $scope, formUtils, stringUtils, locationUtils) {
$scope.division = division;
@@ -17,4 +36,4 @@ var FormDivisionController = function(division, $scope, formUtils, stringUtils,
};
FormDivisionController.$inject = ['division', '$scope', 'formUtils', 'stringUtils', 'locationUtils'];
-module.exports = FormDivisionController;
\ No newline at end of file
+module.exports = FormDivisionController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/division/edit/FormEditDivisionController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/division/edit/FormEditDivisionController.js b/traffic_ops/experimental/ui/app/src/common/modules/form/division/edit/FormEditDivisionController.js
index 1b69b86..fde5db9 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/division/edit/FormEditDivisionController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/division/edit/FormEditDivisionController.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var FormEditDivisionController = function(division, $scope, $controller, $uibModal, $anchorScroll, locationUtils, divisionService) {
// extends the FormDivisionController to inherit common methods
@@ -50,4 +69,4 @@ var FormEditDivisionController = function(division, $scope, $controller, $uibMod
};
FormEditDivisionController.$inject = ['division', '$scope', '$controller', '$uibModal', '$anchorScroll', 'locationUtils', 'divisionService'];
-module.exports = FormEditDivisionController;
\ No newline at end of file
+module.exports = FormEditDivisionController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/division/edit/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/division/edit/index.js b/traffic_ops/experimental/ui/app/src/common/modules/form/division/edit/index.js
index ca33896..34211b8 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/division/edit/index.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/division/edit/index.js
@@ -1,2 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.form.division.edit', [])
.controller('FormEditDivisionController', require('./FormEditDivisionController'));
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/division/form.division.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/division/form.division.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/form/division/form.division.tpl.html
index 6028bc0..ac51fbc 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/division/form.division.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/division/form.division.tpl.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<div class="x_panel">
<div class="x_title">
<ol class="breadcrumb">
@@ -24,4 +43,4 @@
</div>
</form>
</div>
-</div>
\ No newline at end of file
+</div>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/division/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/division/index.js b/traffic_ops/experimental/ui/app/src/common/modules/form/division/index.js
index 5fd787f..f24d5da 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/division/index.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/division/index.js
@@ -1,2 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.form.division', [])
.controller('FormDivisionController', require('./FormDivisionController'));
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/division/new/FormNewDivisionController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/division/new/FormNewDivisionController.js b/traffic_ops/experimental/ui/app/src/common/modules/form/division/new/FormNewDivisionController.js
index 2e91c9c..d7f081f 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/division/new/FormNewDivisionController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/division/new/FormNewDivisionController.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var FormNewDivisionController = function(division, $scope, $controller, divisionService) {
// extends the FormDivisionController to inherit common methods
@@ -17,4 +36,4 @@ var FormNewDivisionController = function(division, $scope, $controller, division
};
FormNewDivisionController.$inject = ['division', '$scope', '$controller', 'divisionService'];
-module.exports = FormNewDivisionController;
\ No newline at end of file
+module.exports = FormNewDivisionController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/division/new/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/division/new/index.js b/traffic_ops/experimental/ui/app/src/common/modules/form/division/new/index.js
index 5055d07..5cffead 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/division/new/index.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/division/new/index.js
@@ -1,2 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.form.division.new', [])
.controller('FormNewDivisionController', require('./FormNewDivisionController'));
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/location/FormLocationController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/location/FormLocationController.js b/traffic_ops/experimental/ui/app/src/common/modules/form/location/FormLocationController.js
index 417a614..4a92e43 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/location/FormLocationController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/location/FormLocationController.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var FormLocationController = function(location, $scope, formUtils, stringUtils, locationUtils, regionService) {
var getRegions = function() {
@@ -37,4 +56,4 @@ var FormLocationController = function(location, $scope, formUtils, stringUtils,
};
FormLocationController.$inject = ['location', '$scope', 'formUtils', 'stringUtils', 'locationUtils', 'regionService'];
-module.exports = FormLocationController;
\ No newline at end of file
+module.exports = FormLocationController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/location/edit/FormEditLocationController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/location/edit/FormEditLocationController.js b/traffic_ops/experimental/ui/app/src/common/modules/form/location/edit/FormEditLocationController.js
index 4960524..47a3db7 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/location/edit/FormEditLocationController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/location/edit/FormEditLocationController.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var FormEditLocationController = function(location, $scope, $controller, $uibModal, $anchorScroll, locationUtils, locationService) {
// extends the FormLocationController to inherit common methods
@@ -50,4 +69,4 @@ var FormEditLocationController = function(location, $scope, $controller, $uibMod
};
FormEditLocationController.$inject = ['location', '$scope', '$controller', '$uibModal', '$anchorScroll', 'locationUtils', 'locationService'];
-module.exports = FormEditLocationController;
\ No newline at end of file
+module.exports = FormEditLocationController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/location/edit/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/location/edit/index.js b/traffic_ops/experimental/ui/app/src/common/modules/form/location/edit/index.js
index 50212fc..b143206 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/location/edit/index.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/location/edit/index.js
@@ -1,2 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.form.location.edit', [])
.controller('FormEditLocationController', require('./FormEditLocationController'));
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/location/form.location.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/location/form.location.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/form/location/form.location.tpl.html
index d9728c1..34dd343 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/location/form.location.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/location/form.location.tpl.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<div class="x_panel">
<div class="x_title">
<ol class="breadcrumb">
@@ -39,4 +58,4 @@
</div>
</form>
</div>
-</div>
\ No newline at end of file
+</div>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/location/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/location/index.js b/traffic_ops/experimental/ui/app/src/common/modules/form/location/index.js
index c505285..978649a 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/location/index.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/location/index.js
@@ -1,2 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.form.location', [])
.controller('FormLocationController', require('./FormLocationController'));
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/location/new/FormNewLocationController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/location/new/FormNewLocationController.js b/traffic_ops/experimental/ui/app/src/common/modules/form/location/new/FormNewLocationController.js
index 2d83277..2feef85 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/location/new/FormNewLocationController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/location/new/FormNewLocationController.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var FormNewLocationController = function(location, $scope, $controller, locationService) {
// extends the FormLocationController to inherit common methods
@@ -17,4 +36,4 @@ var FormNewLocationController = function(location, $scope, $controller, location
};
FormNewLocationController.$inject = ['location', '$scope', '$controller', 'locationService'];
-module.exports = FormNewLocationController;
\ No newline at end of file
+module.exports = FormNewLocationController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/location/new/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/location/new/index.js b/traffic_ops/experimental/ui/app/src/common/modules/form/location/new/index.js
index 79c5734..3544d29 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/location/new/index.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/location/new/index.js
@@ -1,2 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.form.location.new', [])
.controller('FormNewLocationController', require('./FormNewLocationController'));
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/parameter/FormParameterController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/parameter/FormParameterController.js b/traffic_ops/experimental/ui/app/src/common/modules/form/parameter/FormParameterController.js
index 45545bb..aa877ea 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/parameter/FormParameterController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/parameter/FormParameterController.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var FormParameterController = function(parameter, $scope, formUtils, stringUtils, locationUtils) {
$scope.parameter = parameter;
@@ -19,4 +38,4 @@ var FormParameterController = function(parameter, $scope, formUtils, stringUtils
};
FormParameterController.$inject = ['parameter', '$scope', 'formUtils', 'stringUtils', 'locationUtils'];
-module.exports = FormParameterController;
\ No newline at end of file
+module.exports = FormParameterController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/parameter/edit/FormEditParameterController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/parameter/edit/FormEditParameterController.js b/traffic_ops/experimental/ui/app/src/common/modules/form/parameter/edit/FormEditParameterController.js
index 665458f..962d74c 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/parameter/edit/FormEditParameterController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/parameter/edit/FormEditParameterController.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var FormEditParameterController = function(parameter, $scope, $controller, $uibModal, $anchorScroll, locationUtils, parameterService) {
// extends the FormParameterController to inherit common methods
@@ -50,4 +69,4 @@ var FormEditParameterController = function(parameter, $scope, $controller, $uibM
};
FormEditParameterController.$inject = ['parameter', '$scope', '$controller', '$uibModal', '$anchorScroll', 'locationUtils', 'parameterService'];
-module.exports = FormEditParameterController;
\ No newline at end of file
+module.exports = FormEditParameterController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/parameter/edit/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/parameter/edit/index.js b/traffic_ops/experimental/ui/app/src/common/modules/form/parameter/edit/index.js
index 23311b2..78d0dce 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/parameter/edit/index.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/parameter/edit/index.js
@@ -1,2 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.form.parameter.edit', [])
.controller('FormEditParameterController', require('./FormEditParameterController'));
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/parameter/form.parameter.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/parameter/form.parameter.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/form/parameter/form.parameter.tpl.html
index 79e80f9..b0c4250 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/parameter/form.parameter.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/parameter/form.parameter.tpl.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<div class="x_panel">
<div class="x_title">
<ol class="breadcrumb">
@@ -24,4 +43,4 @@
</div>
</form>
</div>
-</div>
\ No newline at end of file
+</div>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/parameter/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/parameter/index.js b/traffic_ops/experimental/ui/app/src/common/modules/form/parameter/index.js
index 3db0656..3991011 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/parameter/index.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/parameter/index.js
@@ -1,2 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.form.parameter', [])
.controller('FormParameterController', require('./FormParameterController'));
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/parameter/new/FormNewParameterController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/parameter/new/FormNewParameterController.js b/traffic_ops/experimental/ui/app/src/common/modules/form/parameter/new/FormNewParameterController.js
index fa03765..9f124ff 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/parameter/new/FormNewParameterController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/parameter/new/FormNewParameterController.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var FormNewParameterController = function(parameter, $scope, $controller, parameterService) {
// extends the FormParameterController to inherit common methods
@@ -17,4 +36,4 @@ var FormNewParameterController = function(parameter, $scope, $controller, parame
};
FormNewParameterController.$inject = ['parameter', '$scope', '$controller', 'parameterService'];
-module.exports = FormNewParameterController;
\ No newline at end of file
+module.exports = FormNewParameterController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/parameter/new/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/parameter/new/index.js b/traffic_ops/experimental/ui/app/src/common/modules/form/parameter/new/index.js
index 65f82b4..b3c00bb 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/parameter/new/index.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/parameter/new/index.js
@@ -1,2 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.form.parameter.new', [])
.controller('FormNewParameterController', require('./FormNewParameterController'));
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/profile/FormProfileController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/profile/FormProfileController.js b/traffic_ops/experimental/ui/app/src/common/modules/form/profile/FormProfileController.js
index b0aa284..6c32f66 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/profile/FormProfileController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/profile/FormProfileController.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var FormProfileController = function(profile, $scope, formUtils, stringUtils, locationUtils) {
$scope.profile = profile;
@@ -17,4 +36,4 @@ var FormProfileController = function(profile, $scope, formUtils, stringUtils, lo
};
FormProfileController.$inject = ['profile', '$scope', 'formUtils', 'stringUtils', 'locationUtils'];
-module.exports = FormProfileController;
\ No newline at end of file
+module.exports = FormProfileController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/profile/edit/FormEditProfileController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/profile/edit/FormEditProfileController.js b/traffic_ops/experimental/ui/app/src/common/modules/form/profile/edit/FormEditProfileController.js
index 7c0ce00..29f8590 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/profile/edit/FormEditProfileController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/profile/edit/FormEditProfileController.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var FormEditProfileController = function(profile, $scope, $controller, $uibModal, $anchorScroll, locationUtils, profileService) {
// extends the FormProfileController to inherit common methods
@@ -50,4 +69,4 @@ var FormEditProfileController = function(profile, $scope, $controller, $uibModal
};
FormEditProfileController.$inject = ['profile', '$scope', '$controller', '$uibModal', '$anchorScroll', 'locationUtils', 'profileService'];
-module.exports = FormEditProfileController;
\ No newline at end of file
+module.exports = FormEditProfileController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/profile/edit/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/profile/edit/index.js b/traffic_ops/experimental/ui/app/src/common/modules/form/profile/edit/index.js
index f2eaf4d..420dac6 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/profile/edit/index.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/profile/edit/index.js
@@ -1,2 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.form.profile.edit', [])
.controller('FormEditProfileController', require('./FormEditProfileController'));
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/profile/form.profile.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/profile/form.profile.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/form/profile/form.profile.tpl.html
index 9105461..a4c83c8 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/profile/form.profile.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/profile/form.profile.tpl.html
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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
+
+ 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.
+-->
+
<div class="x_panel">
<div class="x_title">
<ol class="breadcrumb">
@@ -30,4 +49,4 @@
</div>
</form>
</div>
-</div>
\ No newline at end of file
+</div>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/profile/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/profile/index.js b/traffic_ops/experimental/ui/app/src/common/modules/form/profile/index.js
index 2e462aa..f5735c7 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/profile/index.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/profile/index.js
@@ -1,2 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.form.profile', [])
.controller('FormProfileController', require('./FormProfileController'));
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/profile/new/FormNewProfileController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/profile/new/FormNewProfileController.js b/traffic_ops/experimental/ui/app/src/common/modules/form/profile/new/FormNewProfileController.js
index d2362e9..07507b3 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/profile/new/FormNewProfileController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/profile/new/FormNewProfileController.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var FormNewProfileController = function(profile, $scope, $controller, profileService) {
// extends the FormProfileController to inherit common methods
@@ -17,4 +36,4 @@ var FormNewProfileController = function(profile, $scope, $controller, profileSer
};
FormNewProfileController.$inject = ['profile', '$scope', '$controller', 'profileService'];
-module.exports = FormNewProfileController;
\ No newline at end of file
+module.exports = FormNewProfileController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/profile/new/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/profile/new/index.js b/traffic_ops/experimental/ui/app/src/common/modules/form/profile/new/index.js
index f188196..e5c2d99 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/profile/new/index.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/profile/new/index.js
@@ -1,2 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
module.exports = angular.module('trafficOps.form.profile.new', [])
.controller('FormNewProfileController', require('./FormNewProfileController'));
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/region/FormRegionController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/region/FormRegionController.js b/traffic_ops/experimental/ui/app/src/common/modules/form/region/FormRegionController.js
index bf98f79..3eda152 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/region/FormRegionController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/region/FormRegionController.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var FormRegionController = function(region, $scope, formUtils, stringUtils, locationUtils, divisionService) {
var getDivisions = function() {
@@ -29,4 +48,4 @@ var FormRegionController = function(region, $scope, formUtils, stringUtils, loca
};
FormRegionController.$inject = ['region', '$scope', 'formUtils', 'stringUtils', 'locationUtils', 'divisionService'];
-module.exports = FormRegionController;
\ No newline at end of file
+module.exports = FormRegionController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/experimental/ui/app/src/common/modules/form/region/edit/FormEditRegionController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/region/edit/FormEditRegionController.js b/traffic_ops/experimental/ui/app/src/common/modules/form/region/edit/FormEditRegionController.js
index ea18fe9..eab550e 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/region/edit/FormEditRegionController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/region/edit/FormEditRegionController.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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.
+ */
+
var FormEditRegionController = function(region, $scope, $controller, $uibModal, $anchorScroll, locationUtils, regionService) {
// extends the FormRegionController to inherit common methods
@@ -50,4 +69,4 @@ var FormEditRegionController = function(region, $scope, $controller, $uibModal,
};
FormEditRegionController.$inject = ['region', '$scope', '$controller', '$uibModal', '$anchorScroll', 'locationUtils', 'regionService'];
-module.exports = FormEditRegionController;
\ No newline at end of file
+module.exports = FormEditRegionController;