Andy Wilkinson
4b6bddd476
Merge branch '1.4.x' into 1.5.x
2019-03-20 16:30:04 +00:00
Andy Wilkinson
6920c39349
Merge branch '1.3.x' into 1.4.x
2019-03-20 15:06:50 +00:00
Andy Wilkinson
0e009ef047
Use HTTPS to link to the Apache license
2019-03-20 15:00:10 +00:00
Phillip Webb
e69296d7d3
Fix checkstyle violations in samples
2018-05-25 18:18:00 -07:00
Andy Wilkinson
3348ed5bb3
Make use of new GetMapping and PostMapping annotations
...
Closes gh-5277
2016-05-09 17:08:16 +01:00
Stephane Nicoll
f269383803
Polish contribution
...
Closes gh-4770
2015-12-14 14:49:22 +01:00
David Morley
288aa962c4
Rename method to clarify which connector is being created
...
See gh-4770
2015-12-14 14:44:48 +01:00
Andy Wilkinson
248fcbec5d
Merge branch '1.2.x'
2015-10-30 09:06:58 +00:00
Andy Wilkinson
05b501ce41
Update Tomcat multi-connectors sample to configure SSL declaratively
...
The documentation recommends configuring the HTTP connector in code
and using application.properties to configure the HTTPS connector
as it's easier. This commit updates the sample to follow that
recommendation.
Closes gh-4342
2015-10-30 09:05:24 +00:00
Phillip Webb
1e4d974ec0
Merge remote-tracking branch 'local12x/1.2.x'
2015-10-19 12:56:55 -07:00
Phillip Webb
a79131f8d2
Organize imports with new settings
...
See gh-4234
2015-10-19 12:55:44 -07:00
Phillip Webb
61fc4f3f12
Polish copyright headers
2015-06-23 10:22:14 -07:00
Phillip Webb
1ce617f1ae
Polish sample package names
2015-06-23 00:47:12 -07:00
Andy Wilkinson
2085a5b0cf
Work around the behaviour change in latest Spring 4.2 snapshots
...
The changes made in spring-projects/spring-framework@e403aefe cause
SampleTomcatTwoConnectorsApplication to fail to launch. The port bean,
typed as an int, is coerced into an Integer when the bean’s created. The
port() method is then called, and the proxy’s bean method interceptor
complains as it’s expecting the port bean to be an int but it’s actually
an Integer. Changing the port() bean method’s return type to Integer
works around the problem.
2015-04-16 11:00:12 +01:00
Phillip Webb
a641f0c72a
Polish
2014-11-18 15:45:14 -08:00
Phillip Webb
d039f43107
Update samples to use @SpringBootApplication
...
Update the relevant samples to use the new @SpringBootApplication
annotation.
Closes gh-1842
2014-11-06 22:51:09 -08:00
Phillip Webb
fa88c481a5
Remote trailing whitespace
2014-07-02 15:17:14 -07:00
Phillip Webb
4119ef5cf4
Use random ports for tests
...
Update remaining tests to use random ports.
Fixes gh-337
2014-04-23 19:11:54 +01:00
brockwmills
8b77a0298f
Allow multiple connectors with Tomcat
...
Update TomcatEmbeddedServletContainerFactory to allow for additional
containers (e.g. SSL or AJP in addition to HTTP).
Fixes gh-528
2014-03-21 11:10:11 -07:00
