mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-09-03 04:26:12 +08:00
Merge branch '1.1.x'
Conflicts: spring-boot-samples/spring-boot-sample-tomcat-ssl/pom.xml spring-boot-samples/spring-boot-sample-tomcat-ssl/src/test/java/sample/tomcat/SampleTomcatSslApplicationTests.java spring-boot/src/main/java/org/springframework/boot/context/embedded/ConfigurableEmbeddedServletContainer.java spring-boot/src/main/java/org/springframework/boot/context/embedded/Ssl.java
This commit is contained in:
commit
4f610fa5a1
@ -74,7 +74,7 @@ public class ManagementSecurityAutoConfigurationTests {
|
||||
this.context.refresh();
|
||||
assertNotNull(this.context.getBean(AuthenticationManagerBuilder.class));
|
||||
// 6 for static resources, one for management endpoints and one for the rest
|
||||
assertEquals(9, this.context.getBean(FilterChainProxy.class).getFilterChains()
|
||||
assertEquals(8, this.context.getBean(FilterChainProxy.class).getFilterChains()
|
||||
.size());
|
||||
}
|
||||
|
||||
@ -144,7 +144,7 @@ public class ManagementSecurityAutoConfigurationTests {
|
||||
this.context.refresh();
|
||||
// Just the management endpoints (one filter) and ignores now plus the backup
|
||||
// filter on app endpoints
|
||||
assertEquals(9, this.context.getBean(FilterChainProxy.class).getFilterChains()
|
||||
assertEquals(8, this.context.getBean(FilterChainProxy.class).getFilterChains()
|
||||
.size());
|
||||
}
|
||||
|
||||
|
@ -16,7 +16,6 @@
|
||||
|
||||
package org.springframework.boot.autoconfigure.jdbc;
|
||||
|
||||
import javax.annotation.PostConstruct;
|
||||
import javax.sql.DataSource;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
@ -62,10 +61,7 @@ public class DataSourceTransactionManagerAutoConfiguration implements Ordered {
|
||||
@Configuration
|
||||
@EnableTransactionManagement
|
||||
protected static class TransactionManagementConfiguration {
|
||||
@PostConstruct
|
||||
public void init() {
|
||||
System.err.println("*************");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -63,4 +63,5 @@ public class SampleTomcatSslApplicationTests {
|
||||
assertEquals(HttpStatus.OK, entity.getStatusCode());
|
||||
assertEquals("Hello, world", entity.getBody());
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -258,6 +258,15 @@ public abstract class AbstractConfigurableEmbeddedServletContainer implements
|
||||
this.jspServletClassName = jspServletClassName;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setSsl(Ssl ssl) {
|
||||
this.ssl = ssl;
|
||||
}
|
||||
|
||||
public Ssl getSsl() {
|
||||
return this.ssl;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return the JSP servlet class name
|
||||
*/
|
||||
|
@ -145,4 +145,5 @@ public interface ConfigurableEmbeddedServletContainer {
|
||||
* @param ssl the SSL configuration
|
||||
*/
|
||||
void setSsl(Ssl ssl);
|
||||
|
||||
}
|
||||
|
@ -21,7 +21,7 @@ package org.springframework.boot.context.embedded;
|
||||
*
|
||||
* @author Andy Wilkinson
|
||||
* @author Vladimir Tsanev
|
||||
* @since 1.2.0
|
||||
* @since 1.1.7
|
||||
*/
|
||||
public class Ssl {
|
||||
|
||||
@ -158,4 +158,5 @@ public class Ssl {
|
||||
public enum ClientAuth {
|
||||
WANT, NEED;
|
||||
}
|
||||
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user