JavaSsun
diff --git a/‎lab05/pom.xml‎
Lines changed: 1 addition & 1 deletion b/‎lab05/pom.xml‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎lab05/spring-security-oauth-resource/src/main/java/org/baeldung/config/OAuth2ResourceServerConfig.java‎
Lines changed: 0 additions & 67 deletions b/‎lab05/spring-security-oauth-resource/src/main/java/org/baeldung/config/OAuth2ResourceServerConfig.java‎
Lines changed: 0 additions & 67 deletions
diff --git a/‎lab05/spring-security-oauth-resource/src/main/java/org/baeldung/config/OAuth2ResourceServerConfigJwt.java‎
Lines changed: 0 additions & 73 deletions b/‎lab05/spring-security-oauth-resource/src/main/java/org/baeldung/config/OAuth2ResourceServerConfigJwt.java‎
Lines changed: 0 additions & 73 deletions
diff --git a/‎lab05/spring-security-oauth-resource/src/main/java/org/baeldung/config/OAuth2ResourceServerConfigRemoteTokenService.java‎
Lines changed: 4 additions & 2 deletions b/‎lab05/spring-security-oauth-resource/src/main/java/org/baeldung/config/OAuth2ResourceServerConfigRemoteTokenService.java‎
Lines changed: 4 additions & 2 deletions
diff --git a/‎lab05/spring-security-oauth-resource/src/main/resources/persistence.properties‎
Lines changed: 0 additions & 15 deletions b/‎lab05/spring-security-oauth-resource/src/main/resources/persistence.properties‎
Lines changed: 0 additions & 15 deletions
diff --git a/‎lab05/spring-security-oauth-resource/src/main/resources/public.txt‎
Lines changed: 0 additions & 9 deletions b/‎lab05/spring-security-oauth-resource/src/main/resources/public.txt‎
Lines changed: 0 additions & 9 deletions
diff --git a/‎lab05/spring-security-oauth-server/pom.xml‎
Lines changed: 4 additions & 4 deletions b/‎lab05/spring-security-oauth-server/pom.xml‎
Lines changed: 4 additions & 4 deletions
diff --git a/‎lab05/spring-security-oauth-server/src/main/java/org/baeldung/config/EmployeeController.java‎
Lines changed: 0 additions & 35 deletions b/‎lab05/spring-security-oauth-server/src/main/java/org/baeldung/config/EmployeeController.java‎
Lines changed: 0 additions & 35 deletions
diff --git a/‎lab05/spring-security-oauth-server/src/main/java/org/baeldung/config/OAuth2AuthorizationServerConfig.java‎
Lines changed: 6 additions & 3 deletions b/‎lab05/spring-security-oauth-server/src/main/java/org/baeldung/config/OAuth2AuthorizationServerConfig.java‎
Lines changed: 6 additions & 3 deletions
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.5.8.RELEASE</version>
+		<version>1.5.9.RELEASE</version>
 		<relativePath></relativePath>
 	</parent>
 
 
@@ -1,14 +1,16 @@
 package org.baeldung.config;
 
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.http.SessionCreationPolicy;
+import org.springframework.security.oauth2.config.annotation.web.configuration.EnableResourceServer;
 import org.springframework.security.oauth2.config.annotation.web.configuration.ResourceServerConfigurerAdapter;
 import org.springframework.security.oauth2.provider.token.RemoteTokenServices;
 
-//@Configuration
-//@EnableResourceServer
+@Configuration
+@EnableResourceServer
 public class OAuth2ResourceServerConfigRemoteTokenService extends ResourceServerConfigurerAdapter {
 
     @Override
 
@@ -30,17 +30,17 @@
 			<artifactId>spring-jdbc</artifactId>
 		</dependency>
 
- 		<dependency>
+ 		<!--dependency>
 			<groupId>com.h2database</groupId>
 			<artifactId>h2</artifactId>
-		</dependency>
+		</dependency-->
 
-<!--         <dependency>
+         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
             <scope>runtime</scope>
         </dependency>
- -->
+
 		<!-- oauth -->
 		<dependency>
 			<groupId>org.springframework.security.oauth</groupId>
 
@@ -8,7 +8,9 @@
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
+import org.springframework.context.annotation.PropertySource;
 import org.springframework.core.env.Environment;
 import org.springframework.core.io.Resource;
 import org.springframework.jdbc.datasource.DriverManagerDataSource;
@@ -18,6 +20,7 @@
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.oauth2.config.annotation.configurers.ClientDetailsServiceConfigurer;
 import org.springframework.security.oauth2.config.annotation.web.configuration.AuthorizationServerConfigurerAdapter;
+import org.springframework.security.oauth2.config.annotation.web.configuration.EnableAuthorizationServer;
 import org.springframework.security.oauth2.config.annotation.web.configurers.AuthorizationServerEndpointsConfigurer;
 import org.springframework.security.oauth2.config.annotation.web.configurers.AuthorizationServerSecurityConfigurer;
 import org.springframework.security.oauth2.provider.token.DefaultTokenServices;
@@ -26,9 +29,9 @@
 import org.springframework.security.oauth2.provider.token.TokenStore;
 import org.springframework.security.oauth2.provider.token.store.JdbcTokenStore;
 
-//@Configuration
-//@PropertySource({ "classpath:persistence.properties" })
-//@EnableAuthorizationServer
+@Configuration
+@PropertySource({ "classpath:persistence.properties" })
+@EnableAuthorizationServer
 public class OAuth2AuthorizationServerConfig extends AuthorizationServerConfigurerAdapter {
 
     @Autowired