diff options
author | Marko Gronroos <magi@vaadin.com> | 2016-02-11 19:48:45 +0200 |
---|---|---|
committer | Marko Grönroos <magi@vaadin.com> | 2016-02-22 14:44:58 +0000 |
commit | 0dee5602cacb46e1120bc2339464c89bea34ddaa (patch) | |
tree | b05c8b300048054f00cfb4faf318e3e1e05abe53 /documentation/application/application-environment.asciidoc | |
parent | 4a4d1532cd2a844051301cc0d8b23a80fa011fd7 (diff) | |
download | vaadin-framework-0dee5602cacb46e1120bc2339464c89bea34ddaa.tar.gz vaadin-framework-0dee5602cacb46e1120bc2339464c89bea34ddaa.zip |
Fixed critically broken comment blocks, broken emphasis and escaping, and some other formatting, and moved book preface, chapter structure, and index to the docs repository.
Change-Id: If9299da4415f3181d59b8384e5ac96f940bd5229
Diffstat (limited to 'documentation/application/application-environment.asciidoc')
-rw-r--r-- | documentation/application/application-environment.asciidoc | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/documentation/application/application-environment.asciidoc b/documentation/application/application-environment.asciidoc index 5a2bf7ecbf..8907222a24 100644 --- a/documentation/application/application-environment.asciidoc +++ b/documentation/application/application-environment.asciidoc @@ -120,37 +120,37 @@ Servlet 2.4 application. You simply specify the UI class with the [parameter]#UI# parameter for the [classname]#com.vaadin.server.VaadinServlet#. The servlet is then mapped to a URL path in a standard way for Java Servlets. -[subs="normal"] +[subs="verbatim,replacements,quotes"] ---- <?xml version="1.0" encoding="UTF-8"?> <web-app id="WebApp_ID" version="2.4" - xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> <servlet> - <servlet-name>**myservlet**</servlet-name> + <servlet-name>[replaceable]##myservlet##</servlet-name> <servlet-class> - com.vaadin.server.VaadinServlet + [replaceable]##com.vaadin.server.VaadinServlet## </servlet-class> <init-param> <param-name>UI</param-name> - <param-value>**com.ex.myprj.MyUI**</param-value> + <param-value>[replaceable]##com.ex.myprj.MyUI##</param-value> </init-param> <!-- If not using the default widget set--> <init-param> <param-name>widgetset</param-name> - <param-value>**com.ex.myprj.MyWidgetSet**</param-value> + <param-value>[replaceable]##com.ex.myprj.MyWidgetSet##</param-value> </init-param> </servlet> <servlet-mapping> - <servlet-name>**myservlet**</servlet-name> - <url-pattern>/*</url-pattern> + <servlet-name>[replaceable]##myservlet##</servlet-name> + <url-pattern>[replaceable]##/*##</url-pattern> </servlet-mapping> </web-app> ---- @@ -170,8 +170,8 @@ such as Servlet 3.0, you should use: ---- <web-app id="WebApp_ID" version="**3.0**" - xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="**http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd**"> ---- Servlet 3.0 support is useful for at least server push. @@ -496,7 +496,3 @@ You can also access other [classname]#HttpSession# and [classname]#PortletSession# session properties through the interface, such as set and read session attributes that are shared by all servlets belonging to a particular servlet or portlet session. - - - - |