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 --- .../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 +++++++------------- 4 files changed, 1136 insertions(+), 2001 deletions(-) create mode 100644 documentation/architecture/original-drawings/Makefile (limited to 'documentation/architecture') 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 + + + -- cgit v1.2.3