From 88f776ef1718847b60aba3197c8fd0a9c53a2c47 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Sat, 7 Nov 2015 10:25:07 +0000 Subject: [PATCH] Remove duplicate sample --- spring-boot-samples/pom.xml | 1 - .../spring-boot-sample-secure-sso/pom.xml | 58 ---------------- .../sso/SampleOAuth2SsoApplication.java | 38 ---------- .../src/main/resources/application.yml | 14 ---- .../src/main/resources/static/index.html | 39 ----------- .../sso/SampleOAuth2SsoApplicationTests.java | 69 ------------------- 6 files changed, 219 deletions(-) delete mode 100644 spring-boot-samples/spring-boot-sample-secure-sso/pom.xml delete mode 100644 spring-boot-samples/spring-boot-sample-secure-sso/src/main/java/sample/secure/sso/SampleOAuth2SsoApplication.java delete mode 100644 spring-boot-samples/spring-boot-sample-secure-sso/src/main/resources/application.yml delete mode 100644 spring-boot-samples/spring-boot-sample-secure-sso/src/main/resources/static/index.html delete mode 100644 spring-boot-samples/spring-boot-sample-secure-sso/src/test/java/sample/secure/sso/SampleOAuth2SsoApplicationTests.java diff --git a/spring-boot-samples/pom.xml b/spring-boot-samples/pom.xml index 73efbdc770f..c7279281dae 100644 --- a/spring-boot-samples/pom.xml +++ b/spring-boot-samples/pom.xml @@ -74,7 +74,6 @@ spring-boot-sample-secure spring-boot-sample-secure-oauth2 spring-boot-sample-secure-oauth2-resource - spring-boot-sample-secure-sso spring-boot-sample-servlet spring-boot-sample-session-redis spring-boot-sample-simple diff --git a/spring-boot-samples/spring-boot-sample-secure-sso/pom.xml b/spring-boot-samples/spring-boot-sample-secure-sso/pom.xml deleted file mode 100644 index 4fa4166822c..00000000000 --- a/spring-boot-samples/spring-boot-sample-secure-sso/pom.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - 4.0.0 - - - org.springframework.boot - spring-boot-samples - 1.3.0.BUILD-SNAPSHOT - - spring-boot-sample-secure-sso - spring-boot-sample-secure-sso - Spring Boot Security OAuth2 Sample - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - - ${basedir}/../.. - - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-security - - - org.springframework.security.oauth - spring-security-oauth2 - - - org.springframework.boot - spring-boot-starter-test - test - - - org.webjars - bootstrap - 3.0.3 - - - org.webjars - jquery - 2.0.3-1 - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - diff --git a/spring-boot-samples/spring-boot-sample-secure-sso/src/main/java/sample/secure/sso/SampleOAuth2SsoApplication.java b/spring-boot-samples/spring-boot-sample-secure-sso/src/main/java/sample/secure/sso/SampleOAuth2SsoApplication.java deleted file mode 100644 index f692ac037ef..00000000000 --- a/spring-boot-samples/spring-boot-sample-secure-sso/src/main/java/sample/secure/sso/SampleOAuth2SsoApplication.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright 2012-2015 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.secure.sso; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.security.oauth2.client.EnableOAuth2Sso; - -/** - * After you launch the app it should prompt you for login with github. As long as it runs - * on port 8080 on localhost it should work. Use an incognito window for testing - * (otherwise you might find you are already authenticated). - * - * @author Dave Syer - */ -@SpringBootApplication -@EnableOAuth2Sso -public class SampleOAuth2SsoApplication { - - public static void main(String[] args) { - SpringApplication.run(SampleOAuth2SsoApplication.class, args); - } - -} diff --git a/spring-boot-samples/spring-boot-sample-secure-sso/src/main/resources/application.yml b/spring-boot-samples/spring-boot-sample-secure-sso/src/main/resources/application.yml deleted file mode 100644 index 5e37fe2e6eb..00000000000 --- a/spring-boot-samples/spring-boot-sample-secure-sso/src/main/resources/application.yml +++ /dev/null @@ -1,14 +0,0 @@ -security: - oauth2: - client: - clientId: 314f917438a18b82966a - clientSecret: 0cc21fd8c59749bfff0e0d441378438e692ae896 - accessTokenUri: https://github.com/login/oauth/access_token - userAuthorizationUri: https://github.com/login/oauth/authorize - clientAuthenticationScheme: form - resource: - userInfoUri: https://api.github.com/user - -logging: - level: - org.springframework.security: DEBUG diff --git a/spring-boot-samples/spring-boot-sample-secure-sso/src/main/resources/static/index.html b/spring-boot-samples/spring-boot-sample-secure-sso/src/main/resources/static/index.html deleted file mode 100644 index d7affc9e2e9..00000000000 --- a/spring-boot-samples/spring-boot-sample-secure-sso/src/main/resources/static/index.html +++ /dev/null @@ -1,39 +0,0 @@ - - - -Static - - - - - - -
-

Home

-

Some static content

-

- Go - » -

-
- - - diff --git a/spring-boot-samples/spring-boot-sample-secure-sso/src/test/java/sample/secure/sso/SampleOAuth2SsoApplicationTests.java b/spring-boot-samples/spring-boot-sample-secure-sso/src/test/java/sample/secure/sso/SampleOAuth2SsoApplicationTests.java deleted file mode 100644 index 6a2be2e28f5..00000000000 --- a/spring-boot-samples/spring-boot-sample-secure-sso/src/test/java/sample/secure/sso/SampleOAuth2SsoApplicationTests.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright 2012-2015 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.secure.sso; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.SpringApplicationConfiguration; -import org.springframework.boot.test.WebIntegrationTest; -import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.security.web.FilterChainProxy; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.web.servlet.MockMvc; -import org.springframework.web.context.WebApplicationContext; - -import static org.hamcrest.CoreMatchers.containsString; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.header; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -import static org.springframework.test.web.servlet.setup.MockMvcBuilders.webAppContextSetup; - -/** - * Series of automated integration tests to verify proper behavior of auto-configured, - * OAuth2-secured system - * - * @author Greg Turnquist - */ -@RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(SampleOAuth2SsoApplication.class) -@WebIntegrationTest(randomPort = true) -public class SampleOAuth2SsoApplicationTests { - - @Autowired - WebApplicationContext context; - - @Autowired - FilterChainProxy filterChain; - - private MockMvc mvc; - - @Before - public void setUp() { - this.mvc = webAppContextSetup(this.context).addFilters(this.filterChain).build(); - SecurityContextHolder.clearContext(); - } - - @Test - public void everythingIsSecuredByDefault() throws Exception { - this.mvc.perform(get("/")).andExpect(status().isFound()).andExpect( - header().string("location", containsString("localhost/login"))); - } - -}