From fa2497f0c63855545b68b29b53d35b17406bf6f2 Mon Sep 17 00:00:00 2001
From: Marko Gronroos <magi@vaadin.com>
Date: Thu, 17 Mar 2016 15:58:58 +0200
Subject: Reorganized the Getting Started chapter to separate installation and
 project creation chapters. #19639

Change-Id: I4aab29b8b9ab23091903016e9cc91850c4ca3b93
---
 .../getting-started/getting-started-idea.asciidoc  | 74 ++++------------------
 1 file changed, 12 insertions(+), 62 deletions(-)

(limited to 'documentation/getting-started/getting-started-idea.asciidoc')

diff --git a/documentation/getting-started/getting-started-idea.asciidoc b/documentation/getting-started/getting-started-idea.asciidoc
index c0961dc534..c573770755 100644
--- a/documentation/getting-started/getting-started-idea.asciidoc
+++ b/documentation/getting-started/getting-started-idea.asciidoc
@@ -1,17 +1,15 @@
 ---
-title: Creating a Project with IntelliJ IDEA
-order: 8
+title: Creating a Project in IntelliJ
+order: 120
 layout: page
 ---
 
 [[getting-started.idea]]
 = Creating a Project with IntelliJ IDEA
 
-The Ultimate Edition of IntelliJ IDEA includes support for creating Vaadin
-applications and running or debugging them in an integrated application server.
-With the Community Edition, you can create a Vaadin application most easily with
-a Maven archetype and deploy it to a server with a Maven run/debug
-configuration.
+The Ultimate Edition of IntelliJ IDEA includes support for creating Vaadin applications and running or debugging them in an integrated application server.
+
+With the Community Edition, you can create a Vaadin application most easily with a Maven archetype and deploy it to a server with a Maven run/debug configuration.
 
 ifdef::web[]
 For more information, see the article "
@@ -20,66 +18,24 @@ a simple Web application and deploying it to Tomcat]" in the IntelliJ IDEA
 Encyclopedia wiki.
 endif::web[]
 
-[[getting-started.idea.server]]
-== Configuring an Application Server
-
-To run the application during development in the Ultimate Edition of IntelliJ
-IDEA, you first need to install and configure an application server that is
-integrated with the IDE. The edition includes integration with many commonly
-used application servers.
-
-In the following, we configure Apache Tomcat:
-
-. Download and extract Tomcat installation package to a local directory, as
-instructed in <<dummy/../../../framework/getting-started/getting-started-environment#getting-started.environment.tomcat,"Installing Apache Tomcat">>.
-
-. Select "Configure > Settings".
-
-. Select "IDE Settings > Application Servers".
-
-. Click [guibutton]#+# and select [guilabel]#Tomcat Server# to add a Tomcat server, or any of the other supported servers.
-A WebSocket-enabled server, such as Glassfish or TomEE, is required for server push.
-
-. In the Tomcat Server dialog, specify the home directory for the server.
-
-+
-image::img/idea-server-1.png[]
-
-+
-Click [guibutton]#OK#.
-
-. Review the application server settings page to check that it is OK.
-
-+
-image::img/idea-server-2.png[]
-
-+
-Then, click [guibutton]#OK#.
-
-
-
 [[getting-started.idea.project]]
 == Creating a Vaadin Web Application Project
 
 In the welcome page, do the following:
 
-. Download and exctract the Vaadin installation package to a local folder, as
-instructed in
-<<dummy/../../../framework/getting-started/getting-started-package#getting-started.package,"Vaadin
-Installation Package">>.
+. Download and extract the Vaadin installation package to a local folder, as
+instructed in <<dummy/../../../framework/getting-started/getting-started-package#getting-started.package,"Vaadin Installation Package">>.
 
 . Select [menuchoice]#New Project#
 
 . In the [guilabel]#New Project# window, select [menuchoice]#Java#
 
 . Enter a [guilabel]#Project name# and [guilabel]#Project location#, and select
-the [guilabel]#Java SDK# to be used for the project. Vaadin requires at least
-Java 6. If you have not configured a Java SDK previously, you can configure it
-here.
-
+the [guilabel]#Java SDK# to be used for the project.
+Vaadin requires at least Java 6.
+If you have not configured a Java SDK previously, you can configure it here.
 +
 image::img/idea-newproject-1.png[]
-
 +
 Click [guibutton]#Next#.
 
@@ -88,16 +44,13 @@ Click [guibutton]#Next#.
 . Select Vaadin [guilabel]#Version# and [guilabel]#Distribution# installation
 path. You probably also want an application stub, so select [guilabel]#Create
 sample application# and give a name for the generated UI class.
-
 +
 image::img/idea-newproject-2.png[]
-
 +
 Do __not__ click [guibutton]#Finish# yet.
 
-. Select [guilabel]#Application Server# in the same window. Set it as an
-integrated server that you have configured in IntelliJ IDEA, as described
-previously in <<getting-started.idea.server>>.
+. Select [guilabel]#Application Server# in the same window.
+Set it as an integrated server that you have configured in IntelliJ IDEA, as described previously in <<DUMMY/../../../framework/installing/installing-idea#installing.idea.ultimate.server, "Configuring an Application Server">>.
 
 ifdef::web[]
 +
@@ -106,7 +59,6 @@ endif::web[]
 
 . Click [guibutton]#Finish#.
 
-
 The project is created with the UI class stub and a [filename]#web.xml#
 deployment descriptor.
 
@@ -124,8 +76,6 @@ To deploy the application to the integrated web server, right-click the
 'index.jsp'#. This starts the integrated server, if it was not already running,
 and launches the default browser with the application page.
 
-
-
 [[getting-started.idea.maven]]
 == Creating a Maven Project
 
-- 
cgit v1.2.3

