diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java index 6483d3bcfd..ea548d05d6 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java @@ -214,7 +214,7 @@ public class ServerProperties { public class Servlet { /** - * ServletContext parameters. + * Servlet context init parameters. */ private final Map contextParameters = new HashMap<>(); diff --git a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc index c5e251d99d..6eb1e9f8bf 100644 --- a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc +++ b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc @@ -148,8 +148,6 @@ content into your application; rather pick only the properties that you need. server.compression.mime-types= # Comma-separated list of MIME types that should be compressed. For instance `text/html,text/css,application/json` server.compression.min-response-size= # Minimum response size that is required for compression to be performed. For instance 2048 server.connection-timeout= # Time in milliseconds that connectors will wait for another HTTP request before closing the connection. When not set, the connector's container-specific default will be used. Use a value of -1 to indicate no (i.e. infinite) timeout. - server.context-parameters.*= # Servlet context init parameters. For instance `server.context-parameters.a=alpha` - server.context-path= # Context path of the application. server.display-name=application # Display name of the application. server.max-http-header-size=0 # Maximum size in bytes of the HTTP message header. server.error.include-stacktrace=never # When to include a "stacktrace" attribute. @@ -158,13 +156,15 @@ content into your application; rather pick only the properties that you need. server.jetty.acceptors= # Number of acceptor threads to use. server.jetty.max-http-post-size=0 # Maximum size in bytes of the HTTP post or put content. server.jetty.selectors= # Number of selector threads to use. - server.jsp-servlet.class-name=org.apache.jasper.servlet.JspServlet # The class name of the JSP servlet. - server.jsp-servlet.init-parameters.*= # Init parameters used to configure the JSP servlet - server.jsp-servlet.registered=true # Whether or not the JSP servlet is registered server.port=8080 # Server HTTP port. server.server-header= # Value to use for the Server response header (no header is sent if empty) - server.servlet-path=/ # Path of the main dispatcher servlet. server.use-forward-headers= # If X-Forwarded-* headers should be applied to the HttpRequest. + server.servlet.context-parameters.*= # Servlet context init parameters + server.servlet.context-path= # Context path of the application. + server.servlet.jsp.class-name=org.apache.jasper.servlet.JspServlet # The class name of the JSP servlet. + server.servlet.jsp.init-parameters.*= # Init parameters used to configure the JSP servlet + server.servlet.jsp.registered=true # Whether or not the JSP servlet is registered + server.servlet.path=/ # Path of the main dispatcher servlet. server.session.cookie.comment= # Comment for the session cookie. server.session.cookie.domain= # Domain for the session cookie. server.session.cookie.http-only= # "HttpOnly" flag for the session cookie. @@ -682,7 +682,6 @@ content into your application; rather pick only the properties that you need. spring.jpa.hibernate.ddl-auto= # DDL mode. This is actually a shortcut for the "hibernate.hbm2ddl.auto" property. Default to "create-drop" when using an embedded database, "none" otherwise. spring.jpa.hibernate.naming.implicit-strategy= # Hibernate 5 implicit naming strategy fully qualified name. spring.jpa.hibernate.naming.physical-strategy= # Hibernate 5 physical naming strategy fully qualified name. - spring.jpa.hibernate.naming.strategy= # Hibernate 4 naming strategy fully qualified name. Not supported with Hibernate 5. spring.jpa.hibernate.use-new-id-generator-mappings= # Use Hibernate's newer IdentifierGenerator for AUTO, TABLE and SEQUENCE. spring.jpa.open-in-view=true # Register OpenEntityManagerInViewInterceptor. Binds a JPA EntityManager to the thread for the entire processing of the request. spring.jpa.properties.*= # Additional native properties to set on the JPA provider. @@ -1140,26 +1139,6 @@ content into your application; rather pick only the properties that you need. management.info.git.enabled=true # Enable git info. management.info.git.mode=simple # Mode to use to expose git information. - # REMOTE SHELL ({sc-spring-boot-actuator}/autoconfigure/ShellProperties.{sc-ext}[ShellProperties]) - management.shell.auth.type=simple # Authentication type. Auto-detected according to the environment. - management.shell.auth.jaas.domain=my-domain # JAAS domain. - management.shell.auth.key.path= # Path to the authentication key. This should point to a valid ".pem" file. - management.shell.auth.simple.user.name=user # Login user. - management.shell.auth.simple.user.password= # Login password. - management.shell.auth.spring.roles=ACTUATOR # Comma-separated list of required roles to login to the CRaSH console. - management.shell.command-path-patterns=classpath*:/commands/**,classpath*:/crash/commands/** # Patterns to use to look for commands. - management.shell.command-refresh-interval=-1 # Scan for changes and update the command if necessary (in seconds). - management.shell.config-path-patterns=classpath*:/crash/* # Patterns to use to look for configurations. - management.shell.disabled-commands=jpa*,jdbc*,jndi* # Comma-separated list of commands to disable. - management.shell.disabled-plugins= # Comma-separated list of plugins to disable. Certain plugins are disabled by default based on the environment. - management.shell.ssh.auth-timeout = # Number of milliseconds after user will be prompted to login again. - management.shell.ssh.enabled=true # Enable CRaSH SSH support. - management.shell.ssh.idle-timeout = # Number of milliseconds after which unused connections are closed. - management.shell.ssh.key-path= # Path to the SSH server key. - management.shell.ssh.port=2000 # SSH port. - management.shell.telnet.enabled=false # Enable CRaSH telnet support. Enabled by default if the TelnetPlugin is available. - management.shell.telnet.port=5000 # Telnet port. - # TRACING ({sc-spring-boot-actuator}/trace/TraceProperties.{sc-ext}[TraceProperties]) management.trace.include=request-headers,response-headers,cookies,errors # Items to be included in the trace.