Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
19c2a076
Commit
19c2a076
authored
Jun 17, 2013
by
Phillip Webb
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #4 from gregturn/BS-157
# By Greg Turnquist * BS-157: [BS-157] Fix misnamed method
parents
018231d2
f8c20919
Changes
9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
23 additions
and
23 deletions
+23
-23
AbstractEmbeddedServletContainerFactory.java
...ext/embedded/AbstractEmbeddedServletContainerFactory.java
+3
-3
EmbeddedServletContainerFactory.java
...rap/context/embedded/EmbeddedServletContainerFactory.java
+1
-1
EmbeddedWebApplicationContext.java
...strap/context/embedded/EmbeddedWebApplicationContext.java
+1
-1
JettyEmbeddedServletContainerFactory.java
.../embedded/jetty/JettyEmbeddedServletContainerFactory.java
+1
-1
TomcatEmbeddedServletContainerFactory.java
...mbedded/tomcat/TomcatEmbeddedServletContainerFactory.java
+2
-2
AbstractEmbeddedServletContainerFactoryTests.java
...mbedded/AbstractEmbeddedServletContainerFactoryTests.java
+12
-12
MockEmbeddedServletContainerFactory.java
...context/embedded/MockEmbeddedServletContainerFactory.java
+1
-1
JettyEmbeddedServletContainerFactoryTests.java
...dded/jetty/JettyEmbeddedServletContainerFactoryTests.java
+1
-1
TomcatEmbeddedServletContainerFactoryTests.java
...ed/tomcat/TomcatEmbeddedServletContainerFactoryTests.java
+1
-1
No files found.
spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/AbstractEmbeddedServletContainerFactory.java
View file @
19c2a076
...
...
@@ -159,7 +159,7 @@ public abstract class AbstractEmbeddedServletContainerFactory implements
/**
* Sets {@link ServletContextInitializer} that should be applied in addition to
* {@link #getEmb
d
eddedServletContainer(ServletContextInitializer...)} parameters.
* {@link #getEmbeddedServletContainer(ServletContextInitializer...)} parameters.
* This method will replace any previously set or added initializers.
* @param initializers the initializers to set
* @see #addInitializers
...
...
@@ -172,7 +172,7 @@ public abstract class AbstractEmbeddedServletContainerFactory implements
/**
* Add {@link ServletContextInitializer}s to those that should be applied in addition
* to {@link #getEmb
d
eddedServletContainer(ServletContextInitializer...)} parameters.
* to {@link #getEmbeddedServletContainer(ServletContextInitializer...)} parameters.
* @param initializers the initializers to add
* @see #setInitializers
* @see #getInitializers
...
...
@@ -185,7 +185,7 @@ public abstract class AbstractEmbeddedServletContainerFactory implements
/**
* Returns a mutable list of {@link ServletContextInitializer} that should be applied
* in addition to {@link #getEmb
d
eddedServletContainer(ServletContextInitializer...)}
* in addition to {@link #getEmbeddedServletContainer(ServletContextInitializer...)}
* parameters.
* @return the initializers
*/
...
...
spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerFactory.java
View file @
19c2a076
...
...
@@ -40,7 +40,7 @@ public interface EmbeddedServletContainerFactory {
* @return a fully configured and started {@link EmbeddedServletContainer}
* @see EmbeddedServletContainer#stop()
*/
EmbeddedServletContainer
getEmb
d
eddedServletContainer
(
EmbeddedServletContainer
getEmbeddedServletContainer
(
ServletContextInitializer
...
initializers
);
}
spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedWebApplicationContext.java
View file @
19c2a076
...
...
@@ -130,7 +130,7 @@ public class EmbeddedWebApplicationContext extends GenericWebApplicationContext
if
(
this
.
embeddedServletContainer
==
null
&&
getServletContext
()
==
null
)
{
EmbeddedServletContainerFactory
containerFactory
=
getEmbeddedServletContainerFactory
();
this
.
embeddedServletContainer
=
containerFactory
.
getEmb
d
eddedServletContainer
(
getSelfInitializer
());
.
getEmbeddedServletContainer
(
getSelfInitializer
());
}
else
if
(
getServletContext
()
!=
null
)
{
try
{
getSelfInitializer
().
onStartup
(
getServletContext
());
...
...
spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java
View file @
19c2a076
...
...
@@ -94,7 +94,7 @@ public class JettyEmbeddedServletContainerFactory extends
}
@Override
public
EmbeddedServletContainer
getEmb
d
eddedServletContainer
(
public
EmbeddedServletContainer
getEmbeddedServletContainer
(
ServletContextInitializer
...
initializers
)
{
if
(
getPort
()
==
0
)
{
return
EmbeddedServletContainer
.
NONE
;
...
...
spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java
View file @
19c2a076
...
...
@@ -105,7 +105,7 @@ public class TomcatEmbeddedServletContainerFactory extends
}
@Override
public
EmbeddedServletContainer
getEmb
d
eddedServletContainer
(
public
EmbeddedServletContainer
getEmbeddedServletContainer
(
ServletContextInitializer
...
initializers
)
{
if
(
getPort
()
==
0
)
{
return
EmbeddedServletContainer
.
NONE
;
...
...
@@ -339,7 +339,7 @@ public class TomcatEmbeddedServletContainerFactory extends
return
new
TomcatEmbeddedServletContainerFactory
()
{
@Override
public
EmbeddedServletContainer
getEmb
d
eddedServletContainer
(
public
EmbeddedServletContainer
getEmbeddedServletContainer
(
ServletContextInitializer
...
initializers
)
{
if
(
getPort
()
==
0
)
{
...
...
spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java
View file @
19c2a076
...
...
@@ -81,7 +81,7 @@ public abstract class AbstractEmbeddedServletContainerFactoryTests {
public
void
startServlet
()
throws
Exception
{
ConfigurableEmbeddedServletContainerFactory
factory
=
getFactory
();
this
.
container
=
factory
.
getEmb
d
eddedServletContainer
(
exampleServletRegistration
());
.
getEmbeddedServletContainer
(
exampleServletRegistration
());
assertThat
(
getResponse
(
"http://localhost:8080/hello"
),
equalTo
(
"Hello World"
));
}
...
...
@@ -90,7 +90,7 @@ public abstract class AbstractEmbeddedServletContainerFactoryTests {
ConfigurableEmbeddedServletContainerFactory
factory
=
getFactory
();
factory
.
setPort
(
0
);
this
.
container
=
factory
.
getEmb
d
eddedServletContainer
(
exampleServletRegistration
());
.
getEmbeddedServletContainer
(
exampleServletRegistration
());
this
.
thrown
.
expect
(
ConnectException
.
class
);
this
.
thrown
.
expectMessage
(
"Connection refused"
);
getResponse
(
"http://localhost:8080/hello"
);
...
...
@@ -100,7 +100,7 @@ public abstract class AbstractEmbeddedServletContainerFactoryTests {
public
void
stopServlet
()
throws
Exception
{
ConfigurableEmbeddedServletContainerFactory
factory
=
getFactory
();
this
.
container
=
factory
.
getEmb
d
eddedServletContainer
(
exampleServletRegistration
());
.
getEmbeddedServletContainer
(
exampleServletRegistration
());
this
.
container
.
stop
();
this
.
thrown
.
expect
(
ConnectException
.
class
);
getResponse
(
"http://localhost:8080/hello"
);
...
...
@@ -111,7 +111,7 @@ public abstract class AbstractEmbeddedServletContainerFactoryTests {
public
void
restartWithKeepAlive
()
throws
Exception
{
ConfigurableEmbeddedServletContainerFactory
factory
=
getFactory
();
this
.
container
=
factory
.
getEmb
d
eddedServletContainer
(
exampleServletRegistration
());
.
getEmbeddedServletContainer
(
exampleServletRegistration
());
MultiThreadedHttpConnectionManager
connectionManager
=
new
MultiThreadedHttpConnectionManager
();
HttpClient
client
=
new
HttpClient
(
connectionManager
);
...
...
@@ -121,7 +121,7 @@ public abstract class AbstractEmbeddedServletContainerFactoryTests {
this
.
container
.
stop
();
this
.
container
=
factory
.
getEmb
d
eddedServletContainer
(
exampleServletRegistration
());
.
getEmbeddedServletContainer
(
exampleServletRegistration
());
GetMethod
get2
=
new
GetMethod
(
"http://localhost:8080/hello"
);
assertThat
(
client
.
executeMethod
(
get2
),
equalTo
(
200
));
...
...
@@ -131,7 +131,7 @@ public abstract class AbstractEmbeddedServletContainerFactoryTests {
@Test
public
void
startServletAndFilter
()
throws
Exception
{
ConfigurableEmbeddedServletContainerFactory
factory
=
getFactory
();
this
.
container
=
factory
.
getEmb
d
eddedServletContainer
(
this
.
container
=
factory
.
getEmbeddedServletContainer
(
exampleServletRegistration
(),
new
FilterRegistrationBean
(
new
ExampleFilter
()));
assertThat
(
getResponse
(
"http://localhost:8080/hello"
),
equalTo
(
"[Hello World]"
));
...
...
@@ -143,7 +143,7 @@ public abstract class AbstractEmbeddedServletContainerFactoryTests {
ConfigurableEmbeddedServletContainerFactory
factory
=
getFactory
();
final
Date
[]
date
=
new
Date
[
1
];
this
.
container
=
factory
.
getEmb
d
eddedServletContainer
(
new
ServletContextInitializer
()
{
.
getEmbeddedServletContainer
(
new
ServletContextInitializer
()
{
@Override
public
void
onStartup
(
ServletContext
servletContext
)
throws
ServletException
{
...
...
@@ -163,7 +163,7 @@ public abstract class AbstractEmbeddedServletContainerFactoryTests {
ConfigurableEmbeddedServletContainerFactory
factory
=
getFactory
();
factory
.
setPort
(
8081
);
this
.
container
=
factory
.
getEmb
d
eddedServletContainer
(
exampleServletRegistration
());
.
getEmbeddedServletContainer
(
exampleServletRegistration
());
assertThat
(
getResponse
(
"http://localhost:8081/hello"
),
equalTo
(
"Hello World"
));
}
...
...
@@ -172,7 +172,7 @@ public abstract class AbstractEmbeddedServletContainerFactoryTests {
ConfigurableEmbeddedServletContainerFactory
factory
=
getFactory
();
factory
.
setContextPath
(
"/say"
);
this
.
container
=
factory
.
getEmb
d
eddedServletContainer
(
exampleServletRegistration
());
.
getEmbeddedServletContainer
(
exampleServletRegistration
());
assertThat
(
getResponse
(
"http://localhost:8080/say/hello"
),
equalTo
(
"Hello World"
));
}
...
...
@@ -202,7 +202,7 @@ public abstract class AbstractEmbeddedServletContainerFactoryTests {
public
void
doubleStop
()
throws
Exception
{
ConfigurableEmbeddedServletContainerFactory
factory
=
getFactory
();
this
.
container
=
factory
.
getEmb
d
eddedServletContainer
(
exampleServletRegistration
());
.
getEmbeddedServletContainer
(
exampleServletRegistration
());
this
.
container
.
stop
();
this
.
container
.
stop
();
}
...
...
@@ -216,7 +216,7 @@ public abstract class AbstractEmbeddedServletContainerFactoryTests {
}
factory
.
setInitializers
(
Arrays
.
asList
(
initializers
[
2
],
initializers
[
3
]));
factory
.
addInitializers
(
initializers
[
4
],
initializers
[
5
]);
this
.
container
=
factory
.
getEmb
d
eddedServletContainer
(
initializers
[
0
],
this
.
container
=
factory
.
getEmbeddedServletContainer
(
initializers
[
0
],
initializers
[
1
]);
InOrder
ordered
=
inOrder
((
Object
[])
initializers
);
for
(
ServletContextInitializer
initializer
:
initializers
)
{
...
...
@@ -230,7 +230,7 @@ public abstract class AbstractEmbeddedServletContainerFactoryTests {
new
FileWriter
(
this
.
temporaryFolder
.
newFile
(
"test.txt"
)));
AbstractEmbeddedServletContainerFactory
factory
=
getFactory
();
factory
.
setDocumentRoot
(
this
.
temporaryFolder
.
getRoot
());
this
.
container
=
factory
.
getEmb
d
eddedServletContainer
();
this
.
container
=
factory
.
getEmbeddedServletContainer
();
assertThat
(
getResponse
(
"http://localhost:8080/test.txt"
),
equalTo
(
"test"
));
}
...
...
spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/MockEmbeddedServletContainerFactory.java
View file @
19c2a076
...
...
@@ -49,7 +49,7 @@ public class MockEmbeddedServletContainerFactory extends
private
MockEmbeddedServletContainer
container
;
@Override
public
EmbeddedServletContainer
getEmb
d
eddedServletContainer
(
public
EmbeddedServletContainer
getEmbeddedServletContainer
(
ServletContextInitializer
...
initializers
)
{
this
.
container
=
spy
(
new
MockEmbeddedServletContainer
(
initializers
,
getPort
()));
return
this
.
container
;
...
...
spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java
View file @
19c2a076
...
...
@@ -47,7 +47,7 @@ public class JettyEmbeddedServletContainerFactoryTests extends
}
factory
.
setConfigurations
(
Arrays
.
asList
(
configurations
[
0
],
configurations
[
1
]));
factory
.
addConfigurations
(
configurations
[
2
],
configurations
[
3
]);
this
.
container
=
factory
.
getEmb
d
eddedServletContainer
();
this
.
container
=
factory
.
getEmbeddedServletContainer
();
InOrder
ordered
=
inOrder
((
Object
[])
configurations
);
for
(
Configuration
configuration
:
configurations
)
{
ordered
.
verify
(
configuration
).
configure
((
WebAppContext
)
anyObject
());
...
...
spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java
View file @
19c2a076
...
...
@@ -48,7 +48,7 @@ public class TomcatEmbeddedServletContainerFactoryTests extends
}
factory
.
setContextLifecycleListeners
(
Arrays
.
asList
(
listeners
[
0
],
listeners
[
1
]));
factory
.
addContextLifecycleListeners
(
listeners
[
2
],
listeners
[
3
]);
this
.
container
=
factory
.
getEmb
d
eddedServletContainer
();
this
.
container
=
factory
.
getEmbeddedServletContainer
();
InOrder
ordered
=
inOrder
((
Object
[])
listeners
);
for
(
LifecycleListener
listener
:
listeners
)
{
ordered
.
verify
(
listener
).
lifecycleEvent
((
LifecycleEvent
)
anyObject
());
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment