summaryrefslogtreecommitdiffstats
path: root/documentation/installing
diff options
context:
space:
mode:
authorPekka Hyvönen <pekka@vaadin.com>2017-01-02 13:40:48 +0200
committerGitHub <noreply@github.com>2017-01-02 13:40:48 +0200
commit9c6831bab067ccdb47c3063f2e77d3c0e7fe3440 (patch)
tree190002e96b0d76fe4ac2ebaa9b21cc31fd7bd406 /documentation/installing
parent6adc887b7f94f5fb6e83c34822358e2240018147 (diff)
downloadvaadin-framework-9c6831bab067ccdb47c3063f2e77d3c0e7fe3440.tar.gz
vaadin-framework-9c6831bab067ccdb47c3063f2e77d3c0e7fe3440.zip
Update documentation, BoV chapters 1 - 5.3 (#8085)
* Update documentation chapters 1 - 5.3 Images and diagrams have not been updated, but unnecessary images have been removed. * Sync application declarative and architecture sections source code. Screenshot image is updated to match the source code. * Old datamodel image is removed. * Ivy install image is removed. * Remove unnecessary linking / reference
Diffstat (limited to 'documentation/installing')
-rw-r--r--documentation/installing/installing-eclipse.adoc8
-rw-r--r--documentation/installing/installing-java.adoc8
-rw-r--r--documentation/installing/installing-server.adoc7
-rw-r--r--documentation/installing/installing-toolchain.adoc2
4 files changed, 9 insertions, 16 deletions
diff --git a/documentation/installing/installing-eclipse.adoc b/documentation/installing/installing-eclipse.adoc
index 7f175d7164..4acfb086fb 100644
--- a/documentation/installing/installing-eclipse.adoc
+++ b/documentation/installing/installing-eclipse.adoc
@@ -79,7 +79,7 @@ incompatibility issues with Eclipse plugins installed by the package management
of the operating system.
[[installing.eclipse.plugin]]
-== Installing the Vaadin Plugin
+== Installing the Vaadin Eclipse Plugin
You can install the plugin as follows:
@@ -90,9 +90,9 @@ You can install the plugin as follows:
image::img/plugin-install-addsite.png[]
+
Enter a name such as "Vaadin Update Site" and the URL of the update site:
-http://vaadin.com/eclipse. If you want or need to use the latest unstable
+https://vaadin.com/eclipse. If you want or need to use the latest unstable
plugin, which is usually more compatible with development and beta releases of
-Vaadin, you can use http://vaadin.com/eclipse/experimental and give it a
+Vaadin Framework, you can use https://vaadin.com/eclipse/experimental and give it a
distinctive name such as "Vaadin Experimental Site". Then click [guibutton]#OK#.
The Vaadin site should now appear in the [guilabel]#Available Software# window.
@@ -112,7 +112,7 @@ Then, click [guibutton]#Next#.
[guibutton]#Restart#.
More installation instructions for the Eclipse plugin can be found at
-http://vaadin.com/eclipse.
+https://vaadin.com/eclipse.
diff --git a/documentation/installing/installing-java.adoc b/documentation/installing/installing-java.adoc
index adee81c05a..daca224953 100644
--- a/documentation/installing/installing-java.adoc
+++ b/documentation/installing/installing-java.adoc
@@ -8,7 +8,7 @@ layout: page
= Installing Java SDK
A Java SDK is required by Vaadin and also by any of the Java IDEs.
-Vaadin is compatible with Java 1.6 and later editions, be we recommend using Java 8 for Vaadin development.
+Vaadin Framework 8 requires Java 8.
Java EE 7 is required for proper server push support with WebSockets.
[[installing.java.windows]]
@@ -27,12 +27,10 @@ The default options are fine.
Most Linux systems either have JDK preinstalled or allow installing it through a
package management system. Notice however that they have OpenJDK as the default
-Java implementation. While it is known to have worked with Vaadin and possibly
+Java implementation. While it is known to have worked with Vaadin Framework and possibly
also with the development toolchain, we do not especially support it.
-Regarding OS X, notice that JDK 1.6 or newer is included in OS X 10.6 and newer.
-
-Otherwise:
+Depending on your OS distribution, you may have to download Java JDK 8:
. Download Oracle Java SE 8.0 from
link:http://www.oracle.com/technetwork/java/javase/downloads/index.html[http://www.oracle.com/technetwork/java/javase/downloads/]
diff --git a/documentation/installing/installing-server.adoc b/documentation/installing/installing-server.adoc
index 59874ab154..c1e7e7cb98 100644
--- a/documentation/installing/installing-server.adoc
+++ b/documentation/installing/installing-server.adoc
@@ -7,15 +7,10 @@ layout: page
[[installing.server]]
= Installing a Web Server
-You can run Vaadin applications in any Java servlet container that supports at least Servlet API 2.4.
-However, a server supporting Servlet API 3.0 is recommended.
-It is required for using Vaadin CDI, for which also a CDI container is required, a standard feature in Java EE 6 or newer servers.
-It is also required by the Vaadin Spring add-on.
+You can run Vaadin applications in any Java servlet container that supports at least Servlet API 3.0.
Server push can benefit from using communication modes, such as WebSocket, enabled by features in some latest servers.
For Java EE containers, at least Wildfly, Glassfish, and Apache TomEE Web Profile are recommended.
-Also, if you use Java 8 for Vaadin development, you need to make sure that the server supports it.
-
Some Java IDEs have server integration, so we describe installation of the server before the IDEs.
Some IDE bundles also include a development server; for example, NetBeans IDE includes GlassFish and Apache Tomcat.
diff --git a/documentation/installing/installing-toolchain.adoc b/documentation/installing/installing-toolchain.adoc
index 802c15ad96..f0df202fbf 100644
--- a/documentation/installing/installing-toolchain.adoc
+++ b/documentation/installing/installing-toolchain.adoc
@@ -16,7 +16,7 @@ In this example, we use the following toolchain:
* link:http://www.oracle.com/technetwork/java/javase/downloads/index.html[Oracle Java SE 8]
* link:http://www.eclipse.org/downloads/[Eclipse IDE for Java EE Developers]
* link:http://tomcat.apache.org/[Apache Tomcat 8.0 (Core)]
-* link:http://www.getfirefox.com/[Mozilla Firefox] browser
+* link:https://www.google.com/chrome/[Google Chrome] browser
* link:http://vaadin.com/download/[Vaadin Framework]
The above reference toolchain is a good choice of tools, but you can use almost