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 ++++++++------------ 6 files changed, 2052 insertions(+), 1810 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 (limited to 'documentation/application') 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 + + -- cgit v1.2.3