You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by ne...@apache.org on 2017/04/24 18:43:58 UTC
[1/2] incubator-trafficcontrol git commit: [TC-245] Remove index.html
from Traffic Router.
Repository: incubator-trafficcontrol
Updated Branches:
refs/heads/master e90e7c702 -> 439f243b7
[TC-245] Remove index.html from Traffic Router.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/7f224538
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/7f224538
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/7f224538
Branch: refs/heads/master
Commit: 7f224538b0894e1d17e240c60eb3ab4e6dcbf08b
Parents: e90e7c7
Author: Jeff Elsloo <je...@cable.comcast.com>
Authored: Mon Apr 24 10:49:18 2017 -0600
Committer: Dave Neuman <ne...@apache.org>
Committed: Mon Apr 24 12:13:56 2017 -0600
----------------------------------------------------------------------
.../main/webapp/WEB-INF/applicationContext.xml | 1 -
traffic_router/core/src/main/webapp/index.html | 25 --------------------
.../core/external/RouterTest.java | 13 ----------
3 files changed, 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/7f224538/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 b8d8824..4d09f29 100644
--- a/traffic_router/core/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/traffic_router/core/src/main/webapp/WEB-INF/applicationContext.xml
@@ -286,7 +286,6 @@
<util:list id="staticContentWhiteList" value-type="java.lang.String">
<value>/crossdomain.xml</value>
<value>/clientaccesspolicy.xml</value>
- <value>/index.html</value>
</util:list>
<bean name="routerFilter" class="com.comcast.cdn.traffic_control.traffic_router.core.http.RouterFilter">
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/7f224538/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
deleted file mode 100644
index 4e35356..0000000
--- a/traffic_router/core/src/main/webapp/index.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-
- 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.
- -->
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Insert title here</title>
-</head>
-<body>
-<h1>This is a test!</h1>
-<h1>This is a test!</h1>
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/7f224538/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 df29d89..4e18e8a 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
@@ -239,19 +239,6 @@ public class RouterTest {
}
@Test
- public void itHasAHomePage() throws IOException {
- HttpGet httpGet = new HttpGet("http://localhost:" + routerHttpPort + "/index.html");
-
- CloseableHttpResponse response = null;
- try {
- response = httpClient.execute(httpGet);
- assertThat(EntityUtils.toString(response.getEntity()), containsString("This is a test!"));
- } finally {
- if (response != null) response.close();
- }
- }
-
- @Test
public void itRedirectsValidHttpRequests() throws IOException, InterruptedException {
HttpGet httpGet = new HttpGet("http://localhost:" + routerHttpPort + "/stuff?fakeClientIpAddress=12.34.56.78");
httpGet.addHeader("Host", "tr." + deliveryServiceId + ".bar");
[2/2] incubator-trafficcontrol git commit: This closes #504
Posted by ne...@apache.org.
This closes #504
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/439f243b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/439f243b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/439f243b
Branch: refs/heads/master
Commit: 439f243b7993759d8a7c11e0b4b3a8dee65ee084
Parents: 7f22453
Author: Dave Neuman <ne...@apache.org>
Authored: Mon Apr 24 12:14:09 2017 -0600
Committer: Dave Neuman <ne...@apache.org>
Committed: Mon Apr 24 12:14:09 2017 -0600
----------------------------------------------------------------------
----------------------------------------------------------------------