diff --git a/spring-boot-samples/README.adoc b/spring-boot-samples/README.adoc index b14a8f712b7..7ab7709e5d7 100644 --- a/spring-boot-samples/README.adoc +++ b/spring-boot-samples/README.adoc @@ -195,9 +195,6 @@ The following sample applications are provided: | link:spring-boot-sample-tomcat-ssl[spring-boot-sample-tomcat-ssl] | Web application that uses Tomcat configured with SSL -| link:spring-boot-sample-tomcat80-ssl[spring-boot-sample-tomcat80-ssl] -| Web application that uses Tomcat 8.0 configured with SSL - | link:spring-boot-sample-traditional[spring-boot-sample-traditional] | Traditional WAR packaging (but also executable using `java -jar`) diff --git a/spring-boot-samples/pom.xml b/spring-boot-samples/pom.xml index a6e3d53c1d9..7a263b09941 100644 --- a/spring-boot-samples/pom.xml +++ b/spring-boot-samples/pom.xml @@ -85,7 +85,6 @@ spring-boot-sample-tomcat-jsp spring-boot-sample-tomcat-ssl spring-boot-sample-tomcat-multi-connectors - spring-boot-sample-tomcat80-ssl spring-boot-sample-traditional spring-boot-sample-undertow spring-boot-sample-undertow-ssl diff --git a/spring-boot-samples/spring-boot-sample-tomcat80-ssl/pom.xml b/spring-boot-samples/spring-boot-sample-tomcat80-ssl/pom.xml deleted file mode 100644 index a8e4c48a123..00000000000 --- a/spring-boot-samples/spring-boot-sample-tomcat80-ssl/pom.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - 4.0.0 - - - org.springframework.boot - spring-boot-samples - 2.0.0.BUILD-SNAPSHOT - - spring-boot-sample-tomcat80-ssl - Spring Boot Tomcat 8.0 SSL Sample - Spring Boot Tomcat 8.0 SSL Sample - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - - ${basedir}/../.. - 8.0.33 - - - - - org.springframework.boot - spring-boot-starter - - - org.springframework.boot - spring-boot-starter-tomcat - - - org.springframework - spring-webmvc - - - org.apache.httpcomponents - httpclient - - - org.apache.tomcat - tomcat-juli - ${tomcat.version} - - - - org.springframework.boot - spring-boot-starter-test - test - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - diff --git a/spring-boot-samples/spring-boot-sample-tomcat80-ssl/src/main/java/sample/tomcat/ssl/SampleTomcatSslApplication.java b/spring-boot-samples/spring-boot-sample-tomcat80-ssl/src/main/java/sample/tomcat/ssl/SampleTomcatSslApplication.java deleted file mode 100644 index c801ea33d04..00000000000 --- a/spring-boot-samples/spring-boot-sample-tomcat80-ssl/src/main/java/sample/tomcat/ssl/SampleTomcatSslApplication.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright 2012-2016 the original author or authors. - * - * 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 sample.tomcat.ssl; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -@SpringBootApplication -public class SampleTomcatSslApplication { - - public static void main(String[] args) throws Exception { - SpringApplication.run(SampleTomcatSslApplication.class, args); - } - -} diff --git a/spring-boot-samples/spring-boot-sample-tomcat80-ssl/src/main/java/sample/tomcat/ssl/web/SampleController.java b/spring-boot-samples/spring-boot-sample-tomcat80-ssl/src/main/java/sample/tomcat/ssl/web/SampleController.java deleted file mode 100644 index 7ca0d5ed01c..00000000000 --- a/spring-boot-samples/spring-boot-sample-tomcat80-ssl/src/main/java/sample/tomcat/ssl/web/SampleController.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright 2012-2016 the original author or authors. - * - * 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 sample.tomcat.ssl.web; - -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.ResponseBody; - -@Controller -public class SampleController { - - @GetMapping("/") - @ResponseBody - public String helloWorld() { - return "Hello, world"; - } - -} diff --git a/spring-boot-samples/spring-boot-sample-tomcat80-ssl/src/main/resources/application.properties b/spring-boot-samples/spring-boot-sample-tomcat80-ssl/src/main/resources/application.properties deleted file mode 100644 index 37199bfd256..00000000000 --- a/spring-boot-samples/spring-boot-sample-tomcat80-ssl/src/main/resources/application.properties +++ /dev/null @@ -1,4 +0,0 @@ -server.port = 8443 -server.ssl.key-store = classpath:sample.jks -server.ssl.key-store-password = secret -server.ssl.key-password = password diff --git a/spring-boot-samples/spring-boot-sample-tomcat80-ssl/src/main/resources/sample.jks b/spring-boot-samples/spring-boot-sample-tomcat80-ssl/src/main/resources/sample.jks deleted file mode 100644 index 6aa9a28053a..00000000000 Binary files a/spring-boot-samples/spring-boot-sample-tomcat80-ssl/src/main/resources/sample.jks and /dev/null differ diff --git a/spring-boot-samples/spring-boot-sample-tomcat80-ssl/src/test/java/sample/tomcat/ssl/SampleTomcatSslApplicationTests.java b/spring-boot-samples/spring-boot-sample-tomcat80-ssl/src/test/java/sample/tomcat/ssl/SampleTomcatSslApplicationTests.java deleted file mode 100644 index 81856affbbc..00000000000 --- a/spring-boot-samples/spring-boot-sample-tomcat80-ssl/src/test/java/sample/tomcat/ssl/SampleTomcatSslApplicationTests.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright 2012-2016 the original author or authors. - * - * 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 sample.tomcat.ssl; - -import org.junit.Test; -import org.junit.runner.RunWith; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; -import org.springframework.boot.test.web.client.TestRestTemplate; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.test.annotation.DirtiesContext; -import org.springframework.test.context.junit4.SpringRunner; - -import static org.assertj.core.api.Assertions.assertThat; - -@RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) -@DirtiesContext -public class SampleTomcatSslApplicationTests { - - @Autowired - private TestRestTemplate restTemplate; - - @Test - public void testHome() throws Exception { - ResponseEntity entity = this.restTemplate.getForEntity("/", String.class); - assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK); - assertThat(entity.getBody()).isEqualTo("Hello, world"); - } - -}