From b71ac1c8da5e5eefdd81f0f358a34174423809e3 Mon Sep 17 00:00:00 2001 From: archcentric <51startup\@sina.com> Date: Wed, 18 Apr 2018 21:05:40 +0800 Subject: [PATCH] package refactoring --- lab05/README.md | 9 +- .../angularjs/oauth-ui-implicit/.springBeans | 16 +++ .../pom.xml | 8 +- .../io/spring2go}/config/UiApplication.java | 2 +- .../io/spring2go}/config/UiWebConfig.java | 2 +- .../src/main/resources/application.properties | 0 .../src/main/resources/oauth-ng.js | 0 .../src/main/resources/templates/header.html | 10 +- .../src/main/resources/templates/index.html | 0 .../main/resources/templates/oauthTemp.html | 0 .../src/main/webapp/resources/oauth-ng.js | 0 .../org/baeldung/test/UiIntegrationTest.java | 18 --- lab05/oauth-resource/.springBeans | 16 +++ .../pom.xml | 13 +- .../java/io/spring2go}/config/CorsFilter.java | 2 +- .../config/MethodSecurityConfig.java | 2 +- ...esourceServerConfigRemoteTokenService.java | 4 +- .../config/ResourceServerApplication.java | 2 +- .../config/ResourceServerWebConfig.java | 4 +- .../web/controller/BarController.java | 5 +- .../web/controller/FooController.java | 5 +- .../main/java/io/spring2go}/web/dto/Bar.java | 2 +- .../main/java/io/spring2go}/web/dto/Foo.java | 2 +- .../src/main/resources/application.properties | 1 - lab05/oauth-server/.springBeans | 16 +++ .../pom.xml | 15 +-- .../AuthorizationServerApplication.java | 2 +- .../java/io/spring2go}/config/CorsFilter.java | 2 +- .../config/CustomTokenEnhancer.java | 2 +- .../OAuth2AuthorizationServerConfig.java | 2 +- .../config/RevokeTokenEndpoint.java | 2 +- .../io/spring2go}/config/TokenController.java | 2 +- .../spring2go}/config/WebSecurityConfig.java | 2 +- .../src/main/resources/application.properties | 3 + .../src/main/resources/data.sql | 0 .../src/main/resources/persistence.properties | 0 .../src/main/resources/schema.sql | 0 lab05/pom.xml | 8 +- .../config/CustomAccessTokenConverter.java | 19 --- .../web/controller/UserController.java | 25 ---- .../AuthenticationClaimsIntegrationTest.java | 61 --------- .../test/ResourceServerIntegrationTest.java | 18 --- .../src/main/resources/application.properties | 4 - .../test/AuthServerIntegrationTest.java | 18 --- .../java/org/baeldung/test/OAuthMvcTest.java | 117 ------------------ .../test/TokenRevocationLiveTest.java | 92 -------------- 46 files changed, 105 insertions(+), 428 deletions(-) create mode 100644 lab05/angularjs/oauth-ui-implicit/.springBeans rename lab05/angularjs/{spring-security-oauth-ui-implicit => oauth-ui-implicit}/pom.xml (94%) rename lab05/angularjs/{spring-security-oauth-ui-implicit/src/main/java/org/baeldung => oauth-ui-implicit/src/main/java/io/spring2go}/config/UiApplication.java (93%) rename lab05/angularjs/{spring-security-oauth-ui-implicit/src/main/java/org/baeldung => oauth-ui-implicit/src/main/java/io/spring2go}/config/UiWebConfig.java (98%) rename lab05/angularjs/{spring-security-oauth-ui-implicit => oauth-ui-implicit}/src/main/resources/application.properties (100%) rename lab05/angularjs/{spring-security-oauth-ui-implicit => oauth-ui-implicit}/src/main/resources/oauth-ng.js (100%) rename lab05/angularjs/{spring-security-oauth-ui-implicit => oauth-ui-implicit}/src/main/resources/templates/header.html (86%) rename lab05/angularjs/{spring-security-oauth-ui-implicit => oauth-ui-implicit}/src/main/resources/templates/index.html (100%) rename lab05/angularjs/{spring-security-oauth-ui-implicit => oauth-ui-implicit}/src/main/resources/templates/oauthTemp.html (100%) rename lab05/angularjs/{spring-security-oauth-ui-implicit => oauth-ui-implicit}/src/main/webapp/resources/oauth-ng.js (100%) delete mode 100644 lab05/angularjs/spring-security-oauth-ui-implicit/src/test/java/org/baeldung/test/UiIntegrationTest.java create mode 100644 lab05/oauth-resource/.springBeans rename lab05/{spring-security-oauth-resource => oauth-resource}/pom.xml (91%) rename lab05/{spring-security-oauth-server/src/main/java/org/baeldung => oauth-resource/src/main/java/io/spring2go}/config/CorsFilter.java (98%) rename lab05/{spring-security-oauth-resource/src/main/java/org/baeldung => oauth-resource/src/main/java/io/spring2go}/config/MethodSecurityConfig.java (96%) rename lab05/{spring-security-oauth-resource/src/main/java/org/baeldung => oauth-resource/src/main/java/io/spring2go}/config/OAuth2ResourceServerConfigRemoteTokenService.java (94%) rename lab05/{spring-security-oauth-resource/src/main/java/org/baeldung => oauth-resource/src/main/java/io/spring2go}/config/ResourceServerApplication.java (93%) rename lab05/{spring-security-oauth-resource/src/main/java/org/baeldung => oauth-resource/src/main/java/io/spring2go}/config/ResourceServerWebConfig.java (83%) rename lab05/{spring-security-oauth-resource/src/main/java/org/baeldung => oauth-resource/src/main/java/io/spring2go}/web/controller/BarController.java (95%) rename lab05/{spring-security-oauth-resource/src/main/java/org/baeldung => oauth-resource/src/main/java/io/spring2go}/web/controller/FooController.java (95%) rename lab05/{spring-security-oauth-resource/src/main/java/org/baeldung => oauth-resource/src/main/java/io/spring2go}/web/dto/Bar.java (94%) rename lab05/{spring-security-oauth-resource/src/main/java/org/baeldung => oauth-resource/src/main/java/io/spring2go}/web/dto/Foo.java (94%) rename lab05/{spring-security-oauth-resource => oauth-resource}/src/main/resources/application.properties (58%) create mode 100644 lab05/oauth-server/.springBeans rename lab05/{spring-security-oauth-server => oauth-server}/pom.xml (91%) rename lab05/{spring-security-oauth-server/src/main/java/org/baeldung => oauth-server/src/main/java/io/spring2go}/config/AuthorizationServerApplication.java (93%) rename lab05/{spring-security-oauth-resource/src/main/java/org/baeldung => oauth-server/src/main/java/io/spring2go}/config/CorsFilter.java (98%) rename lab05/{spring-security-oauth-server/src/main/java/org/baeldung => oauth-server/src/main/java/io/spring2go}/config/CustomTokenEnhancer.java (96%) rename lab05/{spring-security-oauth-server/src/main/java/org/baeldung => oauth-server/src/main/java/io/spring2go}/config/OAuth2AuthorizationServerConfig.java (99%) rename lab05/{spring-security-oauth-server/src/main/java/org/baeldung => oauth-server/src/main/java/io/spring2go}/config/RevokeTokenEndpoint.java (97%) rename lab05/{spring-security-oauth-server/src/main/java/org/baeldung => oauth-server/src/main/java/io/spring2go}/config/TokenController.java (98%) rename lab05/{spring-security-oauth-server/src/main/java/org/baeldung => oauth-server/src/main/java/io/spring2go}/config/WebSecurityConfig.java (98%) create mode 100644 lab05/oauth-server/src/main/resources/application.properties rename lab05/{spring-security-oauth-server => oauth-server}/src/main/resources/data.sql (100%) rename lab05/{spring-security-oauth-server => oauth-server}/src/main/resources/persistence.properties (100%) rename lab05/{spring-security-oauth-server => oauth-server}/src/main/resources/schema.sql (100%) delete mode 100644 lab05/spring-security-oauth-resource/src/main/java/org/baeldung/config/CustomAccessTokenConverter.java delete mode 100644 lab05/spring-security-oauth-resource/src/main/java/org/baeldung/web/controller/UserController.java delete mode 100644 lab05/spring-security-oauth-resource/src/test/java/org/baeldung/test/AuthenticationClaimsIntegrationTest.java delete mode 100644 lab05/spring-security-oauth-resource/src/test/java/org/baeldung/test/ResourceServerIntegrationTest.java delete mode 100644 lab05/spring-security-oauth-server/src/main/resources/application.properties delete mode 100644 lab05/spring-security-oauth-server/src/test/java/org/baeldung/test/AuthServerIntegrationTest.java delete mode 100644 lab05/spring-security-oauth-server/src/test/java/org/baeldung/test/OAuthMvcTest.java delete mode 100644 lab05/spring-security-oauth-server/src/test/java/org/baeldung/test/TokenRevocationLiveTest.java diff --git a/lab05/README.md b/lab05/README.md index 6133999..ddefecc 100644 --- a/lab05/README.md +++ b/lab05/README.md @@ -5,4 +5,11 @@ [源码](https://github.com/Baeldung/spring-security-oauth) - +### 实验步骤 +1. 需要启动mysql数据库，在oauth-server/src/main/resources/persistence.properties设置数据库访问用户名/密码 +2. 依次启动： + * 授权服务器oauth-server(8081) + * 资源服务器oauth-resource(8082) + * AngularJS单页应用oauth-ui-implicit(0803) +3. 浏览器打开http://localhost:8083 开始实验 +4. 登录用户名密码在oauth-server/.../WebSecurityConfig中配置 diff --git a/lab05/angularjs/oauth-ui-implicit/.springBeans b/lab05/angularjs/oauth-ui-implicit/.springBeans new file mode 100644 index 0000000..eca996c --- /dev/null +++ b/lab05/angularjs/oauth-ui-implicit/.springBeans @@ -0,0 +1,16 @@ + + + 1 + + + + + + + java:io.spring2go.config.UiApplication + + + + + + diff --git a/lab05/angularjs/spring-security-oauth-ui-implicit/pom.xml b/lab05/angularjs/oauth-ui-implicit/pom.xml similarity index 94% rename from lab05/angularjs/spring-security-oauth-ui-implicit/pom.xml rename to lab05/angularjs/oauth-ui-implicit/pom.xml index 6f30a3c..0aec88a 100644 --- a/lab05/angularjs/spring-security-oauth-ui-implicit/pom.xml +++ b/lab05/angularjs/oauth-ui-implicit/pom.xml @@ -1,12 +1,12 @@ 4.0.0 - spring-security-oauth-ui-implicit + oauth-ui-implicit - spring-security-oauth-ui-implicit + oauth-ui-implicit war - org.baeldung + io.spring2go spring-security-oauth 1.0.0-SNAPSHOT ../../ @@ -56,7 +56,7 @@ - spring-security-oauth-ui-implicit + oauth-ui-implicit src/main/resources diff --git a/lab05/angularjs/spring-security-oauth-ui-implicit/src/main/java/org/baeldung/config/UiApplication.java b/lab05/angularjs/oauth-ui-implicit/src/main/java/io/spring2go/config/UiApplication.java similarity index 93% rename from lab05/angularjs/spring-security-oauth-ui-implicit/src/main/java/org/baeldung/config/UiApplication.java rename to lab05/angularjs/oauth-ui-implicit/src/main/java/io/spring2go/config/UiApplication.java index 04125a9..d326a8c 100644 --- a/lab05/angularjs/spring-security-oauth-ui-implicit/src/main/java/org/baeldung/config/UiApplication.java +++ b/lab05/angularjs/oauth-ui-implicit/src/main/java/io/spring2go/config/UiApplication.java @@ -1,4 +1,4 @@ -package org.baeldung.config; +package io.spring2go.config; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/lab05/angularjs/spring-security-oauth-ui-implicit/src/main/java/org/baeldung/config/UiWebConfig.java b/lab05/angularjs/oauth-ui-implicit/src/main/java/io/spring2go/config/UiWebConfig.java similarity index 98% rename from lab05/angularjs/spring-security-oauth-ui-implicit/src/main/java/org/baeldung/config/UiWebConfig.java rename to lab05/angularjs/oauth-ui-implicit/src/main/java/io/spring2go/config/UiWebConfig.java index 71197ce..2cb40ea 100644 --- a/lab05/angularjs/spring-security-oauth-ui-implicit/src/main/java/org/baeldung/config/UiWebConfig.java +++ b/lab05/angularjs/oauth-ui-implicit/src/main/java/io/spring2go/config/UiWebConfig.java @@ -1,4 +1,4 @@ -package org.baeldung.config; +package io.spring2go.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/lab05/angularjs/spring-security-oauth-ui-implicit/src/main/resources/application.properties b/lab05/angularjs/oauth-ui-implicit/src/main/resources/application.properties similarity index 100% rename from lab05/angularjs/spring-security-oauth-ui-implicit/src/main/resources/application.properties rename to lab05/angularjs/oauth-ui-implicit/src/main/resources/application.properties diff --git a/lab05/angularjs/spring-security-oauth-ui-implicit/src/main/resources/oauth-ng.js b/lab05/angularjs/oauth-ui-implicit/src/main/resources/oauth-ng.js similarity index 100% rename from lab05/angularjs/spring-security-oauth-ui-implicit/src/main/resources/oauth-ng.js rename to lab05/angularjs/oauth-ui-implicit/src/main/resources/oauth-ng.js diff --git a/lab05/angularjs/spring-security-oauth-ui-implicit/src/main/resources/templates/header.html b/lab05/angularjs/oauth-ui-implicit/src/main/resources/templates/header.html similarity index 86% rename from lab05/angularjs/spring-security-oauth-ui-implicit/src/main/resources/templates/header.html rename to lab05/angularjs/oauth-ui-implicit/src/main/resources/templates/header.html index eb979ae..4b9a023 100644 --- a/lab05/angularjs/spring-security-oauth-ui-implicit/src/main/resources/templates/header.html +++ b/lab05/angularjs/oauth-ui-implicit/src/main/resources/templates/header.html @@ -10,7 +10,7 @@ + + 1 + + + + + + + java:io.spring2go.config.ResourceServerApplication + + + + + + diff --git a/lab05/spring-security-oauth-resource/pom.xml b/lab05/oauth-resource/pom.xml similarity index 91% rename from lab05/spring-security-oauth-resource/pom.xml rename to lab05/oauth-resource/pom.xml index 43b0cb9..1edc785 100644 --- a/lab05/spring-security-oauth-resource/pom.xml +++ b/lab05/oauth-resource/pom.xml @@ -1,12 +1,12 @@ 4.0.0 - spring-security-oauth-resource - spring-security-oauth-resource + oauth-resource + oauth-resource war - org.baeldung + io.spring2go spring-security-oauth 1.0.0-SNAPSHOT @@ -45,11 +45,6 @@ spring-security-oauth2 - - org.springframework.security - spring-security-jwt - - org.apache.commons commons-lang3 @@ -95,7 +90,7 @@ - spring-security-oauth-resource + oauth-resource src/main/resources diff --git a/lab05/spring-security-oauth-server/src/main/java/org/baeldung/config/CorsFilter.java b/lab05/oauth-resource/src/main/java/io/spring2go/config/CorsFilter.java similarity index 98% rename from lab05/spring-security-oauth-server/src/main/java/org/baeldung/config/CorsFilter.java rename to lab05/oauth-resource/src/main/java/io/spring2go/config/CorsFilter.java index a1c3184..a004a04 100644 --- a/lab05/spring-security-oauth-server/src/main/java/org/baeldung/config/CorsFilter.java +++ b/lab05/oauth-resource/src/main/java/io/spring2go/config/CorsFilter.java @@ -1,4 +1,4 @@ -package org.baeldung.config; +package io.spring2go.config; import java.io.IOException; diff --git a/lab05/spring-security-oauth-resource/src/main/java/org/baeldung/config/MethodSecurityConfig.java b/lab05/oauth-resource/src/main/java/io/spring2go/config/MethodSecurityConfig.java similarity index 96% rename from lab05/spring-security-oauth-resource/src/main/java/org/baeldung/config/MethodSecurityConfig.java rename to lab05/oauth-resource/src/main/java/io/spring2go/config/MethodSecurityConfig.java index 25fcab2..7e42efb 100644 --- a/lab05/spring-security-oauth-resource/src/main/java/org/baeldung/config/MethodSecurityConfig.java +++ b/lab05/oauth-resource/src/main/java/io/spring2go/config/MethodSecurityConfig.java @@ -1,4 +1,4 @@ -package org.baeldung.config; +package io.spring2go.config; import org.springframework.context.annotation.Configuration; import org.springframework.security.access.expression.method.MethodSecurityExpressionHandler; diff --git a/lab05/spring-security-oauth-resource/src/main/java/org/baeldung/config/OAuth2ResourceServerConfigRemoteTokenService.java b/lab05/oauth-resource/src/main/java/io/spring2go/config/OAuth2ResourceServerConfigRemoteTokenService.java similarity index 94% rename from lab05/spring-security-oauth-resource/src/main/java/org/baeldung/config/OAuth2ResourceServerConfigRemoteTokenService.java rename to lab05/oauth-resource/src/main/java/io/spring2go/config/OAuth2ResourceServerConfigRemoteTokenService.java index 414ab6b..2a8494a 100644 --- a/lab05/spring-security-oauth-resource/src/main/java/org/baeldung/config/OAuth2ResourceServerConfigRemoteTokenService.java +++ b/lab05/oauth-resource/src/main/java/io/spring2go/config/OAuth2ResourceServerConfigRemoteTokenService.java @@ -1,4 +1,4 @@ -package org.baeldung.config; +package io.spring2go.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -26,7 +26,7 @@ public void configure(final HttpSecurity http) throws Exception { @Bean public RemoteTokenServices tokenServices() { final RemoteTokenServices tokenService = new RemoteTokenServices(); - tokenService.setCheckTokenEndpointUrl("http://localhost:8081/spring-security-oauth-server/oauth/check_token"); + tokenService.setCheckTokenEndpointUrl("http://localhost:8081/oauth/check_token"); tokenService.setClientId("fooClientIdPassword"); tokenService.setClientSecret("secret"); return tokenService; diff --git a/lab05/spring-security-oauth-resource/src/main/java/org/baeldung/config/ResourceServerApplication.java b/lab05/oauth-resource/src/main/java/io/spring2go/config/ResourceServerApplication.java similarity index 93% rename from lab05/spring-security-oauth-resource/src/main/java/org/baeldung/config/ResourceServerApplication.java rename to lab05/oauth-resource/src/main/java/io/spring2go/config/ResourceServerApplication.java index 9f1d2e1..466b6d2 100644 --- a/lab05/spring-security-oauth-resource/src/main/java/org/baeldung/config/ResourceServerApplication.java +++ b/lab05/oauth-resource/src/main/java/io/spring2go/config/ResourceServerApplication.java @@ -1,4 +1,4 @@ -package org.baeldung.config; +package io.spring2go.config; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/lab05/spring-security-oauth-resource/src/main/java/org/baeldung/config/ResourceServerWebConfig.java b/lab05/oauth-resource/src/main/java/io/spring2go/config/ResourceServerWebConfig.java similarity index 83% rename from lab05/spring-security-oauth-resource/src/main/java/org/baeldung/config/ResourceServerWebConfig.java rename to lab05/oauth-resource/src/main/java/io/spring2go/config/ResourceServerWebConfig.java index 81b2d24..6fd5e7e 100644 --- a/lab05/spring-security-oauth-resource/src/main/java/org/baeldung/config/ResourceServerWebConfig.java +++ b/lab05/oauth-resource/src/main/java/io/spring2go/config/ResourceServerWebConfig.java @@ -1,4 +1,4 @@ -package org.baeldung.config; +package io.spring2go.config; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; @@ -7,7 +7,7 @@ @Configuration @EnableWebMvc -@ComponentScan({ "org.baeldung.web.controller" }) +@ComponentScan({ "io.spring2go.web.controller" }) public class ResourceServerWebConfig extends WebMvcConfigurerAdapter { // } diff --git a/lab05/spring-security-oauth-resource/src/main/java/org/baeldung/web/controller/BarController.java b/lab05/oauth-resource/src/main/java/io/spring2go/web/controller/BarController.java similarity index 95% rename from lab05/spring-security-oauth-resource/src/main/java/org/baeldung/web/controller/BarController.java rename to lab05/oauth-resource/src/main/java/io/spring2go/web/controller/BarController.java index 208a7f6..e49210b 100644 --- a/lab05/spring-security-oauth-resource/src/main/java/org/baeldung/web/controller/BarController.java +++ b/lab05/oauth-resource/src/main/java/io/spring2go/web/controller/BarController.java @@ -1,9 +1,8 @@ -package org.baeldung.web.controller; +package io.spring2go.web.controller; import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic; import static org.apache.commons.lang3.RandomStringUtils.randomNumeric; -import org.baeldung.web.dto.Bar; import org.springframework.http.HttpStatus; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.stereotype.Controller; @@ -14,6 +13,8 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseStatus; +import io.spring2go.web.dto.Bar; + @Controller public class BarController { diff --git a/lab05/spring-security-oauth-resource/src/main/java/org/baeldung/web/controller/FooController.java b/lab05/oauth-resource/src/main/java/io/spring2go/web/controller/FooController.java similarity index 95% rename from lab05/spring-security-oauth-resource/src/main/java/org/baeldung/web/controller/FooController.java rename to lab05/oauth-resource/src/main/java/io/spring2go/web/controller/FooController.java index be0abbc..8856a77 100644 --- a/lab05/spring-security-oauth-resource/src/main/java/org/baeldung/web/controller/FooController.java +++ b/lab05/oauth-resource/src/main/java/io/spring2go/web/controller/FooController.java @@ -1,9 +1,8 @@ -package org.baeldung.web.controller; +package io.spring2go.web.controller; import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic; import static org.apache.commons.lang3.RandomStringUtils.randomNumeric; -import org.baeldung.web.dto.Foo; import org.springframework.http.HttpStatus; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.stereotype.Controller; @@ -14,6 +13,8 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseStatus; +import io.spring2go.web.dto.Foo; + @Controller public class FooController { diff --git a/lab05/spring-security-oauth-resource/src/main/java/org/baeldung/web/dto/Bar.java b/lab05/oauth-resource/src/main/java/io/spring2go/web/dto/Bar.java similarity index 94% rename from lab05/spring-security-oauth-resource/src/main/java/org/baeldung/web/dto/Bar.java rename to lab05/oauth-resource/src/main/java/io/spring2go/web/dto/Bar.java index adbb2aa..0b5f46b 100644 --- a/lab05/spring-security-oauth-resource/src/main/java/org/baeldung/web/dto/Bar.java +++ b/lab05/oauth-resource/src/main/java/io/spring2go/web/dto/Bar.java @@ -1,4 +1,4 @@ -package org.baeldung.web.dto; +package io.spring2go.web.dto; public class Bar { private long id; diff --git a/lab05/spring-security-oauth-resource/src/main/java/org/baeldung/web/dto/Foo.java b/lab05/oauth-resource/src/main/java/io/spring2go/web/dto/Foo.java similarity index 94% rename from lab05/spring-security-oauth-resource/src/main/java/org/baeldung/web/dto/Foo.java rename to lab05/oauth-resource/src/main/java/io/spring2go/web/dto/Foo.java index 9d26618..f64185c 100644 --- a/lab05/spring-security-oauth-resource/src/main/java/org/baeldung/web/dto/Foo.java +++ b/lab05/oauth-resource/src/main/java/io/spring2go/web/dto/Foo.java @@ -1,4 +1,4 @@ -package org.baeldung.web.dto; +package io.spring2go.web.dto; public class Foo { private long id; diff --git a/lab05/spring-security-oauth-resource/src/main/resources/application.properties b/lab05/oauth-resource/src/main/resources/application.properties similarity index 58% rename from lab05/spring-security-oauth-resource/src/main/resources/application.properties rename to lab05/oauth-resource/src/main/resources/application.properties index 1c63aa0..598c6de 100644 --- a/lab05/spring-security-oauth-resource/src/main/resources/application.properties +++ b/lab05/oauth-resource/src/main/resources/application.properties @@ -1,4 +1,3 @@ -server.contextPath=/spring-security-oauth-resource server.port=8082 logging.level.org=INFO #endpoints.cors.allowed-origins=* \ No newline at end of file diff --git a/lab05/oauth-server/.springBeans b/lab05/oauth-server/.springBeans new file mode 100644 index 0000000..e7630e4 --- /dev/null +++ b/lab05/oauth-server/.springBeans @@ -0,0 +1,16 @@ + + + 1 + + + + + + + java:io.spring2go.config.AuthorizationServerApplication + + + + + + diff --git a/lab05/spring-security-oauth-server/pom.xml b/lab05/oauth-server/pom.xml similarity index 91% rename from lab05/spring-security-oauth-server/pom.xml rename to lab05/oauth-server/pom.xml index 535ac25..b537aaf 100644 --- a/lab05/spring-security-oauth-server/pom.xml +++ b/lab05/oauth-server/pom.xml @@ -1,13 +1,13 @@ 4.0.0 - spring-security-oauth-server + oauth-server - spring-security-oauth-server + oauth-server war - org.baeldung + io.spring2go spring-security-oauth 1.0.0-SNAPSHOT @@ -47,11 +47,6 @@ spring-security-oauth2 - - org.springframework.security - spring-security-jwt - - org.apache.commons commons-lang3 @@ -94,7 +89,7 @@ - spring-security-oauth-server + oauth-server org.springframework.boot @@ -165,7 +160,7 @@ - org.baeldung.config.AuthorizationServerApplication + io.spring2go.AuthorizationServerApplication