From d51e48649f71d4476481f6c67291805c20cc339f Mon Sep 17 00:00:00 2001 From: Pekka Hyvönen Date: Mon, 19 Dec 2016 17:25:45 +0200 Subject: Fix application documentation for 8 (#8045) * Fix application documentation for 8 Updated where only small changes, mention not updated when more changes. --- .../application/application-architecture.asciidoc | 2 ++ .../application/application-declarative.asciidoc | 6 +++--- .../application/application-lifecycle.asciidoc | 25 ++-------------------- 3 files changed, 7 insertions(+), 26 deletions(-) (limited to 'documentation/application') diff --git a/documentation/application/application-architecture.asciidoc b/documentation/application/application-architecture.asciidoc index 15f0dcbafb..8a019f7b41 100644 --- a/documentation/application/application-architecture.asciidoc +++ b/documentation/application/application-architecture.asciidoc @@ -7,6 +7,8 @@ layout: page [[application.architecture]] = Building the UI +*_This section has not yet been updated to Vaadin Framework 8_* + Vaadin user interfaces are built hierarchically from components, so that the leaf components are contained within layout components and other component containers. Building the hierarchy starts from the top (or bottom - whichever diff --git a/documentation/application/application-declarative.asciidoc b/documentation/application/application-declarative.asciidoc index b741cf1cab..dd6523ca86 100644 --- a/documentation/application/application-declarative.asciidoc +++ b/documentation/application/application-declarative.asciidoc @@ -191,8 +191,8 @@ documentation of Vaadin. Component properties are directly mapped to the attributes of the HTML elements according to the names of the properties. Attributes are written in lower-case letters and dash is used for word separation instead of upper-case letters in -the Java methods, so that [literal]#++input-prompt++# attribute is equivalent to -[methodname]#setInputPrompt()#. +the Java methods, so that [literal]#++placeholder++# attribute is equivalent to +[methodname]#setPlaceholder()#. For example, the __caption__ property, which you can set with [methodname]#setCaption()#, is represented as [literal]#++caption++# attribute. @@ -203,7 +203,7 @@ classes. [source, html] ---- - + ---- diff --git a/documentation/application/application-lifecycle.asciidoc b/documentation/application/application-lifecycle.asciidoc index 8ce552c663..7bace1cdfc 100644 --- a/documentation/application/application-lifecycle.asciidoc +++ b/documentation/application/application-lifecycle.asciidoc @@ -19,8 +19,8 @@ Before a Vaadin application can be used, it has to be deployed to a Java web server, as described in <>. Deploying reads the servlet classes annotated with the -[literal]#++@WebServlet++# annotation (Servlet 3.0) or the [filename]#web.xml# -deployment descriptor (Servlet 2.4) in the application to register servlets for +[literal]#++@WebServlet++# annotation or the [filename]#web.xml# +deployment descriptor in the application to register servlets for specific URL paths and loads the classes. Deployment does not yet normally run any code in the application, although static blocks in classes are executed when they are loaded. @@ -103,20 +103,6 @@ public class MyServlet extends VaadinServlet { To add custom functionality around request handling, you can override the [methodname]#service()# method. -To use the custom servlet class in a Servlet 2.4 project, you need to define it -in the [filename]#web.xml# deployment descriptor instead of the regular -[classname]#VaadinServlet# class, as described in -<>. - - -ifdef::web[] -[[application.lifecycle.servlet-service.portletcustomization]] -=== Customizing Vaadin Portlet - -__To Be Done__ - -endif::web[] ifdef::web[] [[application.lifecycle.servlet-service.servicecustomization]] @@ -195,13 +181,6 @@ public class MyServlet extends VaadinServlet } ---- -If using Servlet 2.4, you need to configure the custom servlet class in the -[parameter]#servlet-class# parameter in the [filename]#web.xml# descriptor -instead of the [classname]#VaadinServlet#, as described in -<>. - - [[application.lifecycle.ui]] == Loading a UI -- cgit v1.2.3