From fba9f8f81aed790730885d7f5a23dcc055c118e5 Mon Sep 17 00:00:00 2001 From: Christian Raedel Date: Mon, 8 Aug 2016 03:02:47 +0200 Subject: [PATCH] Fixed indentation and removed empty lines. --- spring-security-x509/basic-secured-server/pom.xml | 2 -- .../security/x509/X509AuthenticationServer.java | 5 ----- .../src/main/resources/application.properties | 5 +---- .../src/main/resources/templates/user.html | 14 +++++++------- spring-security-x509/client-auth-server/pom.xml | 2 -- .../security/x509/X509AuthenticationServer.java | 4 ---- .../src/main/resources/templates/user.html | 14 +++++++------- 7 files changed, 15 insertions(+), 31 deletions(-) diff --git a/spring-security-x509/basic-secured-server/pom.xml b/spring-security-x509/basic-secured-server/pom.xml index e8a65a02cf..ce35990b21 100644 --- a/spring-security-x509/basic-secured-server/pom.xml +++ b/spring-security-x509/basic-secured-server/pom.xml @@ -53,6 +53,4 @@ - - diff --git a/spring-security-x509/basic-secured-server/src/main/java/com/baeldung/spring/security/x509/X509AuthenticationServer.java b/spring-security-x509/basic-secured-server/src/main/java/com/baeldung/spring/security/x509/X509AuthenticationServer.java index 41e88686fb..ee81cf3ad5 100644 --- a/spring-security-x509/basic-secured-server/src/main/java/com/baeldung/spring/security/x509/X509AuthenticationServer.java +++ b/spring-security-x509/basic-secured-server/src/main/java/com/baeldung/spring/security/x509/X509AuthenticationServer.java @@ -1,14 +1,10 @@ package com.baeldung.spring.security.x509; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.Bean; -import org.springframework.security.authentication.AuthenticationManager; -import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.builders.WebSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; import org.springframework.security.core.authority.AuthorityUtils; @@ -21,7 +17,6 @@ import org.springframework.security.core.userdetails.UsernameNotFoundException; @EnableWebSecurity @EnableGlobalMethodSecurity(prePostEnabled = true) public class X509AuthenticationServer extends WebSecurityConfigurerAdapter { - public static void main(String[] args) { SpringApplication.run(X509AuthenticationServer.class, args); } diff --git a/spring-security-x509/basic-secured-server/src/main/resources/application.properties b/spring-security-x509/basic-secured-server/src/main/resources/application.properties index 294c7d9c6b..1eed9cbbb0 100644 --- a/spring-security-x509/basic-secured-server/src/main/resources/application.properties +++ b/spring-security-x509/basic-secured-server/src/main/resources/application.properties @@ -5,7 +5,4 @@ server.ssl.key-password=${PASSWORD} server.ssl.enabled=true server.port=8443 security.user.name=Admin -security.user.password=admin -server.ssl.trust-store=../keystore/truststore.jks -server.ssl.trust-store-password=${PASSWORD} -server.ssl.client-auth=need \ No newline at end of file +security.user.password=admin \ No newline at end of file diff --git a/spring-security-x509/basic-secured-server/src/main/resources/templates/user.html b/spring-security-x509/basic-secured-server/src/main/resources/templates/user.html index 81159e757a..3e36d7b644 100644 --- a/spring-security-x509/basic-secured-server/src/main/resources/templates/user.html +++ b/spring-security-x509/basic-secured-server/src/main/resources/templates/user.html @@ -1,9 +1,9 @@ - -X.509 Authentication Demo - - -

Hello !

- - \ No newline at end of file + + X.509 Authentication Demo + + +

Hello !

+ + diff --git a/spring-security-x509/client-auth-server/pom.xml b/spring-security-x509/client-auth-server/pom.xml index 8b902ee63f..5cdf1f8859 100644 --- a/spring-security-x509/client-auth-server/pom.xml +++ b/spring-security-x509/client-auth-server/pom.xml @@ -53,6 +53,4 @@ - - diff --git a/spring-security-x509/client-auth-server/src/main/java/com/baeldung/spring/security/x509/X509AuthenticationServer.java b/spring-security-x509/client-auth-server/src/main/java/com/baeldung/spring/security/x509/X509AuthenticationServer.java index 462c984555..7d8413589e 100644 --- a/spring-security-x509/client-auth-server/src/main/java/com/baeldung/spring/security/x509/X509AuthenticationServer.java +++ b/spring-security-x509/client-auth-server/src/main/java/com/baeldung/spring/security/x509/X509AuthenticationServer.java @@ -1,14 +1,10 @@ package com.baeldung.spring.security.x509; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.Bean; -import org.springframework.security.authentication.AuthenticationManager; -import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.builders.WebSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; import org.springframework.security.core.authority.AuthorityUtils; diff --git a/spring-security-x509/client-auth-server/src/main/resources/templates/user.html b/spring-security-x509/client-auth-server/src/main/resources/templates/user.html index a04ec6b406..a35b18bacc 100644 --- a/spring-security-x509/client-auth-server/src/main/resources/templates/user.html +++ b/spring-security-x509/client-auth-server/src/main/resources/templates/user.html @@ -1,9 +1,9 @@ - -X.509 Authentication Demo - - -

Hello !

- - \ No newline at end of file + + X.509 Authentication Demo + + +

Hello !

+ +