From 8bbe02b1eaa91618a2661a248fb1a70ea5ad4200 Mon Sep 17 00:00:00 2001 From: Marko Gronroos Date: Wed, 1 Jun 2016 18:21:58 +0300 Subject: Revised diagrams in intro, installation, architecture, and application chapters. #19897 Change-Id: I42673cabcd171dd560dfe84fd84eb86e7ba11733 --- .../application/application-overview.asciidoc | 2 +- .../img/application-architecture-hi.png | Bin 284431 -> 119092 bytes .../img/application-architecture-lo.png | Bin 74634 -> 0 bytes .../application/img/application-architecture.svg | 970 +++ .../application/original-drawings/Makefile | 18 + .../original-drawings/application-architecture.svg | 2872 +++------ .../architecture/architecture-overview.asciidoc | 4 +- .../architecture/img/architecture-detailed-hi.png | Bin 272529 -> 133827 bytes .../architecture/original-drawings/Makefile | 18 + .../original-drawings/architecture-detailed.svg | 3115 ++++----- .../components/components-fields.asciidoc | 13 +- documentation/components/img/field-diagram-hi.png | Bin 108186 -> 90096 bytes .../components/img/field-interface-v8-hi.png | Bin 0 -> 28017 bytes .../components/original-drawings/Makefile | 13 + .../components/original-drawings/field-diagram.svg | 3641 ++++++----- .../original-drawings/field-interface-v8.svg | 276 + .../installing/img/installation-eclipse-hi.png | Bin 64185 -> 66687 bytes .../installing/img/installation-intellij-hi.png | Bin 0 -> 67099 bytes .../installing/img/installation-netbeans-hi.png | Bin 34582 -> 31988 bytes .../installing/img/installation-steps-hi.png | Bin 65439 -> 57166 bytes documentation/installing/img/toolchain-hi.png | Bin 227400 -> 87735 bytes documentation/installing/img/toolchain-lo.png | Bin 58261 -> 0 bytes documentation/installing/installing-eclipse.adoc | 4 +- documentation/installing/installing-idea.asciidoc | 3 + .../installing/installing-netbeans.asciidoc | 2 +- documentation/installing/installing-other.adoc | 4 +- documentation/installing/installing-overview.adoc | 2 +- documentation/installing/installing-toolchain.adoc | 2 +- .../installing/original-drawings/Makefile | 21 +- .../original-drawings/installation-eclipse.svg | 900 ++- .../original-drawings/installation-intellij.svg | 382 ++ .../original-drawings/installation-netbeans.svg | 481 +- .../original-drawings/installation-steps.svg | 1127 ++-- .../original-drawings/steps-constellation.png | Bin 55123 -> 0 bytes .../original-drawings/steps-constellation.svg | 6812 -------------------- .../installing/original-drawings/toolchain.svg | 2022 +++--- .../introduction/img/architecture-vaadin7-hi.png | Bin 105306 -> 0 bytes .../introduction/img/architecture-vaadin7-lo.png | Bin 23570 -> 0 bytes documentation/introduction/img/architecture.png | Bin 0 -> 89782 bytes .../introduction/img/intro-themes-faded-hi.png | Bin 175732 -> 0 bytes .../introduction/img/intro-themes-faded-lo.png | Bin 51462 -> 0 bytes documentation/introduction/intro-overview.asciidoc | 4 +- .../introduction/original-drawings/Makefile | 16 + .../original-drawings/architecture-vaadin7.svg | 826 --- .../original-drawings/architecture.svg | 1494 +++-- .../original-drawings/intro-layout-capture-1.png | Bin 22465 -> 0 bytes .../original-drawings/intro-themes-faded.svg | 143 - 47 files changed, 9163 insertions(+), 16024 deletions(-) delete mode 100644 documentation/application/img/application-architecture-lo.png create mode 100644 documentation/application/img/application-architecture.svg create mode 100644 documentation/application/original-drawings/Makefile create mode 100644 documentation/architecture/original-drawings/Makefile create mode 100644 documentation/components/img/field-interface-v8-hi.png create mode 100644 documentation/components/original-drawings/Makefile create mode 100644 documentation/components/original-drawings/field-interface-v8.svg create mode 100644 documentation/installing/img/installation-intellij-hi.png delete mode 100644 documentation/installing/img/toolchain-lo.png create mode 100644 documentation/installing/original-drawings/installation-intellij.svg delete mode 100644 documentation/installing/original-drawings/steps-constellation.png delete mode 100644 documentation/installing/original-drawings/steps-constellation.svg delete mode 100644 documentation/introduction/img/architecture-vaadin7-hi.png delete mode 100644 documentation/introduction/img/architecture-vaadin7-lo.png create mode 100644 documentation/introduction/img/architecture.png delete mode 100644 documentation/introduction/img/intro-themes-faded-hi.png delete mode 100644 documentation/introduction/img/intro-themes-faded-lo.png create mode 100644 documentation/introduction/original-drawings/Makefile delete mode 100644 documentation/introduction/original-drawings/architecture-vaadin7.svg delete mode 100644 documentation/introduction/original-drawings/intro-layout-capture-1.png delete mode 100644 documentation/introduction/original-drawings/intro-themes-faded.svg (limited to 'documentation') diff --git a/documentation/application/application-overview.asciidoc b/documentation/application/application-overview.asciidoc index f1a792a60e..eff86864b2 100644 --- a/documentation/application/application-overview.asciidoc +++ b/documentation/application/application-overview.asciidoc @@ -19,7 +19,7 @@ by the application server or the application itself. [[figure.application.architecture]] .Server-Side Application Architecture -image::img/application-architecture-hi.png[width=70%, scaledwidth=100%] +image::img/application-architecture-hi.png[width=75%, scaledwidth=90%] <> illustrates the basic architecture of an application made with the Vaadin Framework, with all the major elements, which diff --git a/documentation/application/img/application-architecture-hi.png b/documentation/application/img/application-architecture-hi.png index 12c41648c6..fdba007806 100644 Binary files a/documentation/application/img/application-architecture-hi.png and b/documentation/application/img/application-architecture-hi.png differ diff --git a/documentation/application/img/application-architecture-lo.png b/documentation/application/img/application-architecture-lo.png deleted file mode 100644 index 907dae33e0..0000000000 Binary files a/documentation/application/img/application-architecture-lo.png and /dev/null differ diff --git a/documentation/application/img/application-architecture.svg b/documentation/application/img/application-architecture.svg new file mode 100644 index 0000000000..cd72a67230 --- /dev/null +++ b/documentation/application/img/application-architecture.svg @@ -0,0 +1,970 @@ + +image/svg+xml \ No newline at end of file diff --git a/documentation/application/original-drawings/Makefile b/documentation/application/original-drawings/Makefile new file mode 100644 index 0000000000..a2f48c722b --- /dev/null +++ b/documentation/application/original-drawings/Makefile @@ -0,0 +1,18 @@ +SVG = +RASTERIMAGES = application-architecture + +RASTERSRCIMAGES := $(foreach file, $(RASTERIMAGES), $(file).svg) +RASTERIMAGES_HI := $(foreach file, $(RASTERIMAGES), ../img/$(file)-hi.png) +RASTERIMAGES_LO := $(foreach file, $(RASTERIMAGES), ../img/$(file)-lo.png) +SVGTRGIMAGES := $(foreach file, $(SVG), ../img/$(file).svg) + +images: $(RASTERIMAGES_HI) $(SVGTRGIMAGES) FORCE +# Just do low now $(TRGIMAGES_LO) + +$(RASTERIMAGES_HI): ../img/%-hi.png: %.svg + inkscape --export-png $@ --export-dpi=300 --export-area-drawing $< + +$(SVGTRGIMAGES): ../img/%.svg: %.svg FORCE + inkscape $< --export-text-to-path -l $@ + +FORCE: diff --git a/documentation/application/original-drawings/application-architecture.svg b/documentation/application/original-drawings/application-architecture.svg index eabd1c8d86..8622942947 100644 --- a/documentation/application/original-drawings/application-architecture.svg +++ b/documentation/application/original-drawings/application-architecture.svg @@ -1,1809 +1,1063 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - Web BrowserClient-Side Engine - - - VaadinService - - - VaadinSession - - - ApplicationUI - - - Back-End Business Logic, persistence, database, ... - - Application ServerJava Web Application - - Web Page - - - UI - - - - - UIComponent - - - EventListener - - - - - UI Changes UI Events - - DataModel - - - ApplicationTheme - - - DefaultTheme - - - - - - - - n 1 n - «extends» - - - DataBinding - n - - - HTTP - - VaadinServlet/Portlet - - 1 - - - - - - - AJAX Requests HTTP «extends» - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + HasValue<T> «interface» + + + + + <String> + + + <LocalDate> + + + Client-side engine + + + + Java Web Application + + + + Business LogicPersistenceDatabase + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + HTTP Ajax Requests + Data binding + UI Events + UI Changes + «extends» + «extends» + 1 + 1 + n + n + n + HTTP + + + + + + + + + + + WEB BROWSER + APPLICATION SERVER + VAADINSERVLET + BACK END + VAADINSERVICE + DEFAULTTHEME + WEB PAGE + VAADINSESSION + UI + APPLICATIONUI + UICOMPONENT + EVENTLISTENER + DATAMODEL + APPLICATIONTHEME + + diff --git a/documentation/architecture/architecture-overview.asciidoc b/documentation/architecture/architecture-overview.asciidoc index 3e4e7552b1..c35235e7b1 100644 --- a/documentation/architecture/architecture-overview.asciidoc +++ b/documentation/architecture/architecture-overview.asciidoc @@ -17,8 +17,8 @@ in the browser. The two models can share their UI widgets, themes, and back-end code and services, and can be mixed together easily. [[figure.architecture.detailed]] -.Vaadin Runtime Architecture -image::img/architecture-detailed-hi.png[width=70%, scaledwidth=100%] +.Vaadin runtime architecture +image::img/architecture-detailed-hi.png[width=80%, scaledwidth=100%] <> gives a basic illustration of the client-side and server-side communications, in a running situation where the page with the diff --git a/documentation/architecture/img/architecture-detailed-hi.png b/documentation/architecture/img/architecture-detailed-hi.png index 190e4adac0..aa563cf6cd 100644 Binary files a/documentation/architecture/img/architecture-detailed-hi.png and b/documentation/architecture/img/architecture-detailed-hi.png differ diff --git a/documentation/architecture/original-drawings/Makefile b/documentation/architecture/original-drawings/Makefile new file mode 100644 index 0000000000..812217dbf1 --- /dev/null +++ b/documentation/architecture/original-drawings/Makefile @@ -0,0 +1,18 @@ +SVG = +RASTERIMAGES = architecture-detailed + +RASTERSRCIMAGES := $(foreach file, $(RASTERIMAGES), $(file).svg) +RASTERIMAGES_HI := $(foreach file, $(RASTERIMAGES), ../img/$(file)-hi.png) +RASTERIMAGES_LO := $(foreach file, $(RASTERIMAGES), ../img/$(file)-lo.png) +SVGTRGIMAGES := $(foreach file, $(SVG), ../img/$(file).svg) + +images: $(RASTERIMAGES_HI) $(SVGTRGIMAGES) FORCE +# Just do low now $(TRGIMAGES_LO) + +$(RASTERIMAGES_HI): ../img/%-hi.png: %.svg + inkscape --export-png $@ --export-dpi=300 --export-area-drawing $< + +$(SVGTRGIMAGES): ../img/%.svg: %.svg FORCE + inkscape $< --export-text-to-path -l $@ + +FORCE: diff --git a/documentation/architecture/original-drawings/architecture-detailed.svg b/documentation/architecture/original-drawings/architecture-detailed.svg index 504ba28ac4..9a94b101fe 100644 --- a/documentation/architecture/original-drawings/architecture-detailed.svg +++ b/documentation/architecture/original-drawings/architecture-detailed.svg @@ -1,1999 +1,1116 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - Web Application - - Server - - - - Web Browser - - Vaadin Client-Side Engine(Widget Set) - - - Client-Side UI - - - - - - Built-inWidgets - - - Add-onWidgets - - - CustomWidgets - - - - - Vaadin Servlet (or Portlet) - - - UserInterface - - - - Back-end - - Web Service - - - EJB - - - Persistence - - - BusinessLogic - - - Database - - HTTP(S) - - - - - - Built-inComponents - - - Add-onComponents - - - CustomComponents - - UI Changes - - - Themes - - Built-inThemes - - - UserTheme - - - - - - - - - - Custom Servlet - - Service - - - - - - - - - - UI Events - - - - - - - DataBinding - - - - Request Response - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + Business LogicPersistenceDatabase + BACK END + + + + + + + + + + + + USERINTERFACE + + + + + + + BUILT-INWIDGETS + + + + ADD-ONWIDGETS + + CLIENT-SIDE ENGINE + + + CUSTOMWIDGETS + + (Widget Set) + + WEB BROWSER + + + + + + SERVICE + + CUSTOM SERVLET + + + + + + BUILT-INTHEMES + + + + + + BUILT-INTHEMES + + + + + + + DataBinding + + HTTP(S) + Request + Response + UI Events + UIChanges + + + + APPLICATION SERVER + + + BUILT-INCOMPONENTS + + WEB APPLICATION + VAADIN SERVLET + + + ADD-ONCOMPONENTS + + + + + + CUSTOMCOMPONENTS + + THEMES + + + CLIENT-SIDEUI + + + diff --git a/documentation/components/components-fields.asciidoc b/documentation/components/components-fields.asciidoc index 3083e331ac..dc44c6ef49 100644 --- a/documentation/components/components-fields.asciidoc +++ b/documentation/components/components-fields.asciidoc @@ -9,14 +9,13 @@ layout: page ((("[classname]#Field#", id="term.components.fields", range="startofrange"))) - -__Fields__ are components that have a value that the user can change through the -user interface. <> illustrates the inheritance -relationships and the important interfaces and base classes. +_Fields_ are components that have a value that the user can change through the +user interface. +<> illustrates the inheritance relationships and the important interfaces and base classes. [[figure.components.fields]] .Field components -image::img/field-diagram-hi.png[width=60%, scaledwidth=100%] +image::img/field-diagram-hi.png[width=80%, scaledwidth=100%] Field components are built upon the framework defined in the [classname]#Field# interface and the [classname]#AbstractField# base class. @@ -29,6 +28,10 @@ addition to the component features inherited from The description of the field interfaces and base classes is broken down in the following sections. +[[figure.components.fields.hasvalue]] +.Field components having values +image::img/field-interface-v8-hi.png[width=60%, scaledwidth=100%] + [[components.fields.field]] == The [classname]#Field# Interface diff --git a/documentation/components/img/field-diagram-hi.png b/documentation/components/img/field-diagram-hi.png index d4da08dfa2..a438436c61 100644 Binary files a/documentation/components/img/field-diagram-hi.png and b/documentation/components/img/field-diagram-hi.png differ diff --git a/documentation/components/img/field-interface-v8-hi.png b/documentation/components/img/field-interface-v8-hi.png new file mode 100644 index 0000000000..8301d0fc7d Binary files /dev/null and b/documentation/components/img/field-interface-v8-hi.png differ diff --git a/documentation/components/original-drawings/Makefile b/documentation/components/original-drawings/Makefile new file mode 100644 index 0000000000..a351918743 --- /dev/null +++ b/documentation/components/original-drawings/Makefile @@ -0,0 +1,13 @@ +IMAGES = slider-example1 field-interface-v8 field-diagram + +SRCIMAGES := $(foreach file, $(IMAGES), $(file).svg) +TRGIMAGES_HI := $(foreach file, $(IMAGES), ../img/$(file)-hi.png) +TRGIMAGES_LO := $(foreach file, $(IMAGES), ../img/$(file)-lo.png) + +images: $(TRGIMAGES_HI) FORCE +# Just do low now $(TRGIMAGES_LO) + +$(TRGIMAGES_HI): ../img/%-hi.png: %.svg + inkscape --export-png $@ --export-dpi=300 --export-area-page $< + +FORCE: diff --git a/documentation/components/original-drawings/field-diagram.svg b/documentation/components/original-drawings/field-diagram.svg index f838704abb..8c1ce159ce 100644 --- a/documentation/components/original-drawings/field-diagram.svg +++ b/documentation/components/original-drawings/field-diagram.svg @@ -1,1488 +1,2153 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - Property - - - Editor - - - ValueChangeListener - - - - - - Component - - - - AbstractComponent - - - - - - Focusable - - - - Field - - - - - AbstractField - - - - Button - - - - CheckBox - - - TextField - - - - RichTextArea - - - - DateField - - - - InlineDateField - - - - - PopupDateField - - - - - AbstractSelect - - - - Form - - - Slider - - - ProgressIndicator - - - - ListSelect - - - NativeSelect - - - TwinColSelect - - - - OptionGroup - - - - Table - - - - Tree - - - - - - Select - - - - ComboBox - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + Component + + + AbstractComponent + + + HasValue<T> + + + AbstractField + + + Button + + + CheckBox + + + TextField + + + RichTextArea + + + + DateField + + + InlineDateField + + + + PopupDateField + + + + AbstractSelect + + + ProgressIndicator + + + + ListSelect + + + NativeSelect + + + TwinColSelect + + + + OptionGroup + + + + Table + + + + Tree + + + + + Select + + + ComboBox + + + + + + Slider + + + + + + + + + + + + + + + + + + diff --git a/documentation/components/original-drawings/field-interface-v8.svg b/documentation/components/original-drawings/field-interface-v8.svg new file mode 100644 index 0000000000..f1164ce103 --- /dev/null +++ b/documentation/components/original-drawings/field-interface-v8.svg @@ -0,0 +1,276 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + HasValue<T> «interface» + + + + + <String> + + + <LocalDate> + + + TextField + + + DateField + + diff --git a/documentation/installing/img/installation-eclipse-hi.png b/documentation/installing/img/installation-eclipse-hi.png index cf2b4efb04..6e4936aa9f 100644 Binary files a/documentation/installing/img/installation-eclipse-hi.png and b/documentation/installing/img/installation-eclipse-hi.png differ diff --git a/documentation/installing/img/installation-intellij-hi.png b/documentation/installing/img/installation-intellij-hi.png new file mode 100644 index 0000000000..49fc631a04 Binary files /dev/null and b/documentation/installing/img/installation-intellij-hi.png differ diff --git a/documentation/installing/img/installation-netbeans-hi.png b/documentation/installing/img/installation-netbeans-hi.png index c0a54f544f..9d2260149d 100644 Binary files a/documentation/installing/img/installation-netbeans-hi.png and b/documentation/installing/img/installation-netbeans-hi.png differ diff --git a/documentation/installing/img/installation-steps-hi.png b/documentation/installing/img/installation-steps-hi.png index 06089e1e46..50e7fb2e21 100644 Binary files a/documentation/installing/img/installation-steps-hi.png and b/documentation/installing/img/installation-steps-hi.png differ diff --git a/documentation/installing/img/toolchain-hi.png b/documentation/installing/img/toolchain-hi.png index 88d9dfcc4c..d60dbd0c28 100644 Binary files a/documentation/installing/img/toolchain-hi.png and b/documentation/installing/img/toolchain-hi.png differ diff --git a/documentation/installing/img/toolchain-lo.png b/documentation/installing/img/toolchain-lo.png deleted file mode 100644 index e42b94bc2f..0000000000 Binary files a/documentation/installing/img/toolchain-lo.png and /dev/null differ diff --git a/documentation/installing/installing-eclipse.adoc b/documentation/installing/installing-eclipse.adoc index b68644a35d..7f175d7164 100644 --- a/documentation/installing/installing-eclipse.adoc +++ b/documentation/installing/installing-eclipse.adoc @@ -16,8 +16,8 @@ Using Eclipse IDE for Vaadin development requires installing the IDE itself and You are adviced to also configure a web server in Eclipse. You can then use the server for running the Vaadin applications that you create. -.Installation of the Eclipse IDE toolchain -image::img/installation-eclipse-hi.png[] +.Installing the Eclipse IDE toolchain +image::img/installation-eclipse-hi.png[width=90%, scaledwidth=100%] Vaadin Designer is a visual design tool for professional developers. It allows for easy creation of declarative designs. diff --git a/documentation/installing/installing-idea.asciidoc b/documentation/installing/installing-idea.asciidoc index 3533a3feb1..15c9363cb3 100644 --- a/documentation/installing/installing-idea.asciidoc +++ b/documentation/installing/installing-idea.asciidoc @@ -10,6 +10,9 @@ layout: page With IntelliJ IDEA, you have two choices: use the commercial Ultimate Edition or the free Community Edition. In the following, we cover the installation and configuration of them both. +.Installing the IntelliJ IDEA toolchain +image::img/installation-intellij-hi.png[width=100%, scaledwidth=100%] + The Ultimate Edition:: The Ultimate Edition includes built-in support for creating Vaadin applications and running or debugging them in an integrated application server. diff --git a/documentation/installing/installing-netbeans.asciidoc b/documentation/installing/installing-netbeans.asciidoc index bee2d02979..cdb6ca168c 100644 --- a/documentation/installing/installing-netbeans.asciidoc +++ b/documentation/installing/installing-netbeans.asciidoc @@ -12,7 +12,7 @@ The Vaadin Plug-in for NetBeans supports creating Vaadin projects, updating Vaad It also allows directly downloading Vaadin add-ons from the Vaadin Directory. .Installation of the NetBeans IDE toolchain -image::img/installation-netbeans-hi.png[width=80%, scaledwidth=80%] +image::img/installation-netbeans-hi.png[width=100%, scaledwidth=100%] The installation bundle includes a web server, so you do not need that. diff --git a/documentation/installing/installing-other.adoc b/documentation/installing/installing-other.adoc index 4101509673..d223841a30 100644 --- a/documentation/installing/installing-other.adoc +++ b/documentation/installing/installing-other.adoc @@ -28,8 +28,8 @@ After Firebug is installed, it can be enabled at any time from the Firefox toolbar. <> shows Firebug in action. [[figure.firebug.calc]] -.Firebug Debugger for Firefox -image::img/firebug.png[scaledwidth=100%] +.Firebug debugger for Firefox +image::img/firebug.png[width=100%, scaledwidth=100%] The most important feature in Firebug is inspecting HTML elements. Right-click on an element and select [guilabel]#Inspect Element with Firebug# to inspect it. diff --git a/documentation/installing/installing-overview.adoc b/documentation/installing/installing-overview.adoc index 3b2a60f767..5b93ce3742 100644 --- a/documentation/installing/installing-overview.adoc +++ b/documentation/installing/installing-overview.adoc @@ -13,7 +13,7 @@ You can use Vaadin with any Java IDE or no IDE at all. Vaadin has special support for the Eclipse and NetBeans IDEs, as well as for IntelliJ IDEA. .Vaadin installation steps -image::img/installation-steps.svg[scaledwidth=100%] +image::img/installation-steps-hi.png[width=100%, scaledwidth=100%] Managing Vaadin and other Java libraries can get tedious to do manually, so using a build system that manages dependencies automatically is adviced. Vaadin is distributed in the Maven central repository, and can be used with any build or dependency management system that can access Maven repositories, such as Ivy or Gradle, in addition to Maven. diff --git a/documentation/installing/installing-toolchain.adoc b/documentation/installing/installing-toolchain.adoc index 414bc8033f..80fc2c82ad 100644 --- a/documentation/installing/installing-toolchain.adoc +++ b/documentation/installing/installing-toolchain.adoc @@ -28,7 +28,7 @@ your entire toolchain supports it. [[figure.toolchain]] .Development Toolchain and Process -image::img/toolchain-hi.png[width=70%, scaledwidth=100%] +image::img/toolchain-hi.png[width=80%, scaledwidth=100%] <> illustrates the development toolchain. You develop your application as an Eclipse project. The project must include, in addition to your diff --git a/documentation/installing/original-drawings/Makefile b/documentation/installing/original-drawings/Makefile index 44e9b07461..cbfec2e008 100644 --- a/documentation/installing/original-drawings/Makefile +++ b/documentation/installing/original-drawings/Makefile @@ -1,13 +1,18 @@ -IMAGES = installation-steps installation-eclipse installation-netbeans +SVG = +RASTERIMAGES = installation-steps installation-eclipse installation-netbeans \ + installation-intellij toolchain -SRCIMAGES := $(foreach file, $(IMAGES), $(file).svg) -TRGIMAGES_HI := $(foreach file, $(IMAGES), ../img/$(file)-hi.png) -TRGIMAGES_LO := $(foreach file, $(IMAGES), ../img/$(file)-lo.png) +RASTERSRCIMAGES := $(foreach file, $(RASTERIMAGES), $(file).svg) +RASTERIMAGES_HI := $(foreach file, $(RASTERIMAGES), ../img/$(file)-hi.png) +SVGTRGIMAGES := $(foreach file, $(SVG), ../img/$(file).svg) -images: $(TRGIMAGES_HI) FORCE -# Just do low now $(TRGIMAGES_LO) +images: $(RASTERIMAGES_HI) $(SVGTRGIMAGES) FORCE +# Just do low now $(TRGIMAGES_LO) -$(TRGIMAGES_HI): ../img/%-hi.png: %.svg - inkscape --export-png $@ --export-dpi=150 --export-area-drawing $< +$(RASTERIMAGES_HI): ../img/%-hi.png: %.svg + inkscape --export-png $@ --export-dpi=300 --export-area-page $< + +$(SVGTRGIMAGES): ../img/%.svg: %.svg FORCE + inkscape $< --export-text-to-path -l $@ FORCE: diff --git a/documentation/installing/original-drawings/installation-eclipse.svg b/documentation/installing/original-drawings/installation-eclipse.svg index 40baf66dd5..ea7db26534 100644 --- a/documentation/installing/original-drawings/installation-eclipse.svg +++ b/documentation/installing/original-drawings/installation-eclipse.svg @@ -7,13 +7,14 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="1052.3622" - height="744.09448" + width="82mm" + height="41mm" id="svg1901" sodipodi:version="0.32" - inkscape:version="0.48.4 r9939" + inkscape:version="0.91 r" sodipodi:docname="installation-eclipse.svg" version="1.1"> + inkscape:guide-bbox="true" + units="mm"> - - + spacingx="3.5433071" + spacingy="3.5433071" + units="mm" /> @@ -78,459 +73,438 @@ inkscape:label="Taso 1" inkscape:groupmode="layer" id="layer1" - transform="translate(0,-308.2677)"> - + transform="translate(0,-907.08661)"> + + + + + + + + InstallEclipse - - - OnWindows - - - OnOS X - - - OnLinux - - - - - - - InstallEclipse - - - - - - + id="g4392-4" + transform="translate(49.606296,116.92921)"> + y="818.50391" + x="56.692913" + height="21.259813" + width="49.606297" + id="rect4347-8" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#00b4f0;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> Install theVaadin Plugin + transform="translate(2.6821639,0.70806943)" + id="flowRoot4367-1" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.25px;line-height:125%;font-family:Montserrat;-inkscape-font-specification:'Montserrat, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve">Install theVaadin Plugin + STARTHERE + Install Vaadin Designer - + transform="translate(2.6821639,1.591953)" + id="flowRoot4367-0" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5px;line-height:100%;font-family:Montserrat;-inkscape-font-specification:'Montserrat, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve">On Windows - - - ApacheTomcat - - - TomEE - - - Wildfly - - - GlassFish - - - Other - - - - + id="g4392-4-4" + transform="translate(106.2992,116.92922)"> + y="818.50391" + x="56.692913" + height="21.259834" + width="35.433071" + id="rect4347-8-7" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#00b4f0;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> Configurea Server - + transform="translate(2.6821639,0.70806943)" + id="flowRoot4367-1-5" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.25px;line-height:125%;font-family:Montserrat;-inkscape-font-specification:'Montserrat, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve">Configure a Server + GoCreate a Project - StartHere + id="flowRoot4608" + style="font-style:normal;font-variant:normal;font-weight:200;font-stretch:normal;font-size:7.5px;line-height:100%;font-family:Montserrat;-inkscape-font-specification:'Montserrat, Ultra-Light';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#00b4f0;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + transform="translate(-8.7799417,886.00829)">GO CREATE A PROJECT + + OnOS X + + + OnLinux + + + + + + ApacheTomcat + + + TomEE + + + Wildfly + + + + Glassfish + + + Other + + + Install Vaadin Designer + + + + Configure theNotificationCenter + + diff --git a/documentation/installing/original-drawings/installation-intellij.svg b/documentation/installing/original-drawings/installation-intellij.svg new file mode 100644 index 0000000000..64cdd4ffde --- /dev/null +++ b/documentation/installing/original-drawings/installation-intellij.svg @@ -0,0 +1,382 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + Install IntelliJCommunityEdition + + + Install theVaadin Plugin + STARTHERE + GO CREATE A PROJECT + + + + Install Vaadin Designer + + + + + + + Install IntelliJUltimateEdition + + + Install theVaadin Plugin + + + Configure a Server + + + + + + Install Vaadin Designer + + + diff --git a/documentation/installing/original-drawings/installation-netbeans.svg b/documentation/installing/original-drawings/installation-netbeans.svg index d1f66a3852..704aa39911 100644 --- a/documentation/installing/original-drawings/installation-netbeans.svg +++ b/documentation/installing/original-drawings/installation-netbeans.svg @@ -7,13 +7,14 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="1052.3622" - height="744.09448" + width="82mm" + height="31mm" id="svg1901" sodipodi:version="0.32" - inkscape:version="0.48.4 r9939" + inkscape:version="0.91 r" sodipodi:docname="installation-netbeans.svg" version="1.1"> + inkscape:guide-bbox="true" + units="mm"> - - + spacingx="3.5433071" + spacingy="3.5433071" + units="mm" /> @@ -78,257 +73,215 @@ inkscape:label="Taso 1" inkscape:groupmode="layer" id="layer1" - transform="translate(0,-308.2677)"> - + transform="translate(0,-942.51968)"> + + + + + + + InstallNetBeans - - - OnWindows - - - OnOS X - - - OnLinux - - - - - - - InstallNetBeans - - - - - - + id="g4392-4" + transform="translate(81.496059,152.36229)"> + y="818.50391" + x="56.692913" + height="21.259813" + width="49.606297" + id="rect4347-8" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#00b4f0;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> Install theVaadin Plugin - + transform="translate(2.6821639,0.70806943)" + id="flowRoot4367-1" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.25px;line-height:125%;font-family:Montserrat;-inkscape-font-specification:'Montserrat, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve">Install theVaadin Plugin GoCreate a Project + transform="translate(-48.969489,130.5586)" + id="flowRoot4367-1-7" + style="font-style:normal;font-variant:normal;font-weight:200;font-stretch:normal;font-size:7.5px;line-height:100%;font-family:Montserrat;-inkscape-font-specification:'Montserrat, Ultra-Light';text-align:end;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:end;fill:#5b686b;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve">STARTHERE + + On Windows + StartHere + id="flowRoot4608" + style="font-style:normal;font-variant:normal;font-weight:200;font-stretch:normal;font-size:7.5px;line-height:100%;font-family:Montserrat;-inkscape-font-specification:'Montserrat, Ultra-Light';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#00b4f0;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + transform="translate(-26.496477,921.44139)">GO CREATE A PROJECT + + OnOS X + + + OnLinux + + + diff --git a/documentation/installing/original-drawings/installation-steps.svg b/documentation/installing/original-drawings/installation-steps.svg index 713f4d5877..bb0ecebd06 100644 --- a/documentation/installing/original-drawings/installation-steps.svg +++ b/documentation/installing/original-drawings/installation-steps.svg @@ -7,13 +7,14 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="561" - height="231" + width="82mm" + height="41mm" id="svg1901" sodipodi:version="0.32" - inkscape:version="0.48.4 r9939" + inkscape:version="0.91 r" sodipodi:docname="installation-steps.svg" version="1.1"> + units="mm"> - - + spacingx="3.5433071" + spacingy="3.5433071" + units="mm" /> @@ -97,587 +86,531 @@ inkscape:label="Taso 1" inkscape:groupmode="layer" id="layer1" - transform="translate(-124.5,-526.86145)"> - + transform="translate(0,-907.08661)"> + + + + + + + + + InstallJDK - - - OnWindows - - - OnOS X - - - OnLinux - - - - - - - InstallJDK - - - - - EclipseIDE - - - NetBeansIDE - - - IntelliJIDEA - - - - + id="g4392-4" + transform="translate(42.519689,116.92919)"> + + Install anIDE + STARTHERE + y="818.50391" + x="56.692913" + height="17.716536" + width="28.346457" + id="rect4347-0" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#a1b6bb;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> Install an IDE + transform="translate(2.6821639,1.591953)" + id="flowRoot4367-0" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5px;line-height:100%;font-family:Montserrat;-inkscape-font-specification:'Montserrat, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve">On Windows - - - ApacheTomcat - - - TomEE - - - Wildfly - - - GlassFish - - - Other - - - - + id="g4392-4-4" + transform="translate(81.496067,116.92919)"> + y="818.50391" + x="56.692913" + height="21.259834" + width="35.433071" + id="rect4347-8-7" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#00b4f0;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> Install aServer + transform="translate(2.6821639,0.70806943)" + id="flowRoot4367-1-5" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.25px;line-height:125%;font-family:Montserrat;-inkscape-font-specification:'Montserrat, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve">Install aServer - - - Firebug - - - - - - - Other Tools - - - GoCreate a Project + id="g4392-4-4-2" + transform="translate(120.47244,116.92916)" + style="stroke-width:0.70866144;stroke-miterlimit:4;stroke-dasharray:0.70866144, 0.70866144;stroke-dashoffset:0"> + + OtherTools + StartHere + id="flowRoot4608" + style="font-style:normal;font-variant:normal;font-weight:200;font-stretch:normal;font-size:7.5px;line-height:100%;font-family:Montserrat;-inkscape-font-specification:'Montserrat, Ultra-Light';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#00b4f0;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + transform="translate(-8.7799417,886.00829)">GO CREATE A PROJECT + + OnOS X + + + OnLinux + + + + + + + EclipseIDE + + + + NetbeansIDE + + + IntelliJIDEA + + + ApacheTomcat + + + TomEE + + + Wildfly + + + + Glassfish + + + Other + + + Firebug + + diff --git a/documentation/installing/original-drawings/steps-constellation.png b/documentation/installing/original-drawings/steps-constellation.png deleted file mode 100644 index 5e760d6fbe..0000000000 Binary files a/documentation/installing/original-drawings/steps-constellation.png and /dev/null differ diff --git a/documentation/installing/original-drawings/steps-constellation.svg b/documentation/installing/original-drawings/steps-constellation.svg deleted file mode 100644 index 33cc6ec4a0..0000000000 --- a/documentation/installing/original-drawings/steps-constellation.svg +++ /dev/null @@ -1,6812 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - You Are Here - FireBug Apache Tomcat TomEE Wildfly GlassFish Other - - - - - - - - - - - - - - - - - - - - - - - - - - - Windows OS χ Linux InstallJDK Eclipse NetBeans IntelliJ IDEA Install an IDE Install aServer InstallOtherTools Start Here FireBug - diff --git a/documentation/installing/original-drawings/toolchain.svg b/documentation/installing/original-drawings/toolchain.svg index 63148883f3..39044be263 100644 --- a/documentation/installing/original-drawings/toolchain.svg +++ b/documentation/installing/original-drawings/toolchain.svg @@ -1,1149 +1,873 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - User Project Developer Tools - - - - Eclipse IDE (optional) - - - Java SDK - Web Application (WAR) - - VaadinLibrary & Themes - - - UserSources & Themes - - - VaadinLibrary & Themes - - - User Executable& Themes - - - Apache Tomcat or any other web container - Application Server - - - Mozilla Firefox or any otherbrowser - - - Firebug Plugin (optional) - - - - - Vaadin Plugin (optional) - Deploy and Control Compile and Package - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + DEVELOPER TOOLS + + + + IDE + + + + + + VAADINPLUGIN + + + + APPLICATION SERVER + + + + VAADINLIBRARIES + + + + + + APPLICATIONSOURCES + + + + USER PROJECT + + + + VAADINLIBRARIES + + + + + + APPLICATIONEXECUTABLE + + + + + JAVA SDK + + + + BROWSER + + WEB APPLICATION + + CompileandPackage + + + + DeployandControl + + diff --git a/documentation/introduction/img/architecture-vaadin7-hi.png b/documentation/introduction/img/architecture-vaadin7-hi.png deleted file mode 100644 index a28e5be7c6..0000000000 Binary files a/documentation/introduction/img/architecture-vaadin7-hi.png and /dev/null differ diff --git a/documentation/introduction/img/architecture-vaadin7-lo.png b/documentation/introduction/img/architecture-vaadin7-lo.png deleted file mode 100644 index 5ef0c0bea0..0000000000 Binary files a/documentation/introduction/img/architecture-vaadin7-lo.png and /dev/null differ diff --git a/documentation/introduction/img/architecture.png b/documentation/introduction/img/architecture.png new file mode 100644 index 0000000000..c624f27942 Binary files /dev/null and b/documentation/introduction/img/architecture.png differ diff --git a/documentation/introduction/img/intro-themes-faded-hi.png b/documentation/introduction/img/intro-themes-faded-hi.png deleted file mode 100644 index e7f4653232..0000000000 Binary files a/documentation/introduction/img/intro-themes-faded-hi.png and /dev/null differ diff --git a/documentation/introduction/img/intro-themes-faded-lo.png b/documentation/introduction/img/intro-themes-faded-lo.png deleted file mode 100644 index b9c4b5724f..0000000000 Binary files a/documentation/introduction/img/intro-themes-faded-lo.png and /dev/null differ diff --git a/documentation/introduction/intro-overview.asciidoc b/documentation/introduction/intro-overview.asciidoc index 22ccc06c10..beed28ac6f 100644 --- a/documentation/introduction/intro-overview.asciidoc +++ b/documentation/introduction/intro-overview.asciidoc @@ -23,8 +23,8 @@ browser and the server. With the Vaadin approach, you do not need to learn and deal directly with browser technologies, such as HTML or JavaScript. [[figure.intro.architecture]] -.Vaadin Application Architecture -image::img/architecture-vaadin7-hi.png[scaledwidth=100%] +.Vaadin application architecture +image::img/architecture.png[width=100%, scaledwidth=100%] <> illustrates the basic architectures of web applications made with Vaadin. The server-side application architecture consists diff --git a/documentation/introduction/original-drawings/Makefile b/documentation/introduction/original-drawings/Makefile new file mode 100644 index 0000000000..8d49864253 --- /dev/null +++ b/documentation/introduction/original-drawings/Makefile @@ -0,0 +1,16 @@ +SVG = +RASTERIMAGES = architecture + +RASTERSRCIMAGES := $(foreach file, $(RASTERIMAGES), $(file).svg) +RASTERIMAGES := $(foreach file, $(RASTERIMAGES), ../img/$(file).png) +SVGTRGIMAGES := $(foreach file, $(SVG), ../img/$(file).svg) + +images: $(RASTERIMAGES) $(SVGTRGIMAGES) FORCE + +$(RASTERIMAGES): ../img/%.png: %.svg + inkscape --export-png $@ --export-dpi=300 --export-area-page $< + +$(SVGTRGIMAGES): ../img/%.svg: %.svg FORCE + inkscape $< --export-text-to-path -l $@ + +FORCE: diff --git a/documentation/introduction/original-drawings/architecture-vaadin7.svg b/documentation/introduction/original-drawings/architecture-vaadin7.svg deleted file mode 100644 index 581fb7aa04..0000000000 --- a/documentation/introduction/original-drawings/architecture-vaadin7.svg +++ /dev/null @@ -1,826 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - UI Logic - - - - - - - - - - - - - - - - - Components - - - - Built-inComponents - - - Add-onComponents - - - CustomComponents - - - - - - - - - - - - - - - - - - - Back-End BusinessLogicPersistence - - - - - - - - - - - - - - - - - - - Browser - - - - Built-inWidgets - - - Add-onWidgets - - - CustomWidgets - - - - - - - - - - - - Client-SideUI - - - - - - - - - Client-Side Engine - - - Service - - - - - - - - - - - - - Web Server / Portal - diff --git a/documentation/introduction/original-drawings/architecture.svg b/documentation/introduction/original-drawings/architecture.svg index 674cd0b959..d3b421b670 100644 --- a/documentation/introduction/original-drawings/architecture.svg +++ b/documentation/introduction/original-drawings/architecture.svg @@ -1,449 +1,1045 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - Client-SideEngine WebBrowser - - - - - - - - - - - JavaWebServer - - - - - - - - - - - YourUI - - - - - - - - - - - VaadinServer-SideFramework - - - - - - - - - - - Back-End Business LogicPersistenceDatabase - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + Client-SideWidgets Server-SideComponents USERINTERFACE BROWSER Built-in + + Application Theme THEME BACK-ENDSERVICE + + + BusinessLogic Database EJB Add-on Custom + Base Theme + + + + + + + + + diff --git a/documentation/introduction/original-drawings/intro-layout-capture-1.png b/documentation/introduction/original-drawings/intro-layout-capture-1.png deleted file mode 100644 index 0823787f00..0000000000 Binary files a/documentation/introduction/original-drawings/intro-layout-capture-1.png and /dev/null differ diff --git a/documentation/introduction/original-drawings/intro-themes-faded.svg b/documentation/introduction/original-drawings/intro-themes-faded.svg deleted file mode 100644 index fdeb1e9ef1..0000000000 --- a/documentation/introduction/original-drawings/intro-themes-faded.svg +++ /dev/null @@ -1,143 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - -- cgit v1.2.3