This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new e34d8e05c7 Use shorthand for activate
e34d8e05c7 is described below
commit e34d8e05c700f22f26e766d88e51169a2792c7e8
Author: Mark Thomas <[email protected]>
AuthorDate: Fri Sep 6 17:16:27 2024 +0100
Use shorthand for activate
a -> b: message()
activate b
is shortened to
a -> b ++: message()
---
.../docs/architecture/startup/1_overview.plantuml | 33 ++++++---------
webapps/docs/architecture/startup/1_overview.png | Bin 45967 -> 46300 bytes
.../architecture/startup/2_catalina_init.plantuml | 37 ++++++-----------
.../docs/architecture/startup/2_catalina_init.png | Bin 114189 -> 114163 bytes
.../startup/3_catalina_start_1.plantuml | 45 +++++++--------------
.../architecture/startup/3_catalina_start_1.png | Bin 158971 -> 158947 bytes
6 files changed, 41 insertions(+), 74 deletions(-)
diff --git a/webapps/docs/architecture/startup/1_overview.plantuml
b/webapps/docs/architecture/startup/1_overview.plantuml
index 6c55c1c9b4..fe7dcf58a0 100644
--- a/webapps/docs/architecture/startup/1_overview.plantuml
+++ b/webapps/docs/architecture/startup/1_overview.plantuml
@@ -23,22 +23,18 @@ Bootstrap -> Bootstrap: initClassLoaders()
Bootstrap -->> Catalina ** : newInstance()
-Bootstrap -> Catalina: setParentClassLoader()
-activate Catalina
+Bootstrap -> Catalina ++: setParentClassLoader()
|||
Bootstrap <<-- Catalina:
deactivate Catalina
-Bootstrap -> Catalina: start()
-activate Catalina
+Bootstrap -> Catalina ++: start()
-Catalina -> Catalina: load()
-activate Catalina
+Catalina -> Catalina ++: load()
Catalina -> Catalina: initNaming()
-Catalina -> Catalina: parseServerXml()
-activate Catalina
+Catalina -> Catalina ++: parseServerXml()
Catalina -->> Digester ** :
note right of Digester
@@ -49,8 +45,7 @@ note right of Digester
simplicity
end note
-Catalina -> Digester: parse()
-activate Digester
+Catalina -> Digester ++: parse()
|||
Digester -->> Server ** :
@@ -63,8 +58,7 @@ deactivate Catalina
Catalina -> Catalina: initStream()
-Catalina -> Server: init()
-activate Server
+Catalina -> Server ++: init()
|||
Catalina <<-- Server:
deactivate Server
@@ -72,12 +66,11 @@ deactivate Server
Catalina -->> Catalina:
deactivate Catalina
-Catalina -> Server: start()
-activate Server
+Catalina -> Server ++: start()
Catalina <<-- Server:
+deactivate Server
-Catalina -> Catalina: await()
-activate Catalina
+Catalina -> Catalina ++: await()
note right of Catalina
This is where Tomcat spends
time serving requests
@@ -85,13 +78,13 @@ end note
Catalina -->> Catalina:
deactivate Catalina
-Catalina -> Catalina: stop()
-activate Catalina
+Catalina -> Catalina ++: stop()
-Catalina -> Server: stop()
+Catalina -> Server ++: stop()
Catalina <<-- Server:
+deactivate Server
-Catalina -> Server: destroy()
+Catalina -> Server ++: destroy()
Catalina <<-- Server:
deactivate Server
diff --git a/webapps/docs/architecture/startup/1_overview.png
b/webapps/docs/architecture/startup/1_overview.png
index c35fc974bf..b94efeef18 100644
Binary files a/webapps/docs/architecture/startup/1_overview.png and
b/webapps/docs/architecture/startup/1_overview.png differ
diff --git a/webapps/docs/architecture/startup/2_catalina_init.plantuml
b/webapps/docs/architecture/startup/2_catalina_init.plantuml
index bf260d7cb8..6010e7b1e7 100644
--- a/webapps/docs/architecture/startup/2_catalina_init.plantuml
+++ b/webapps/docs/architecture/startup/2_catalina_init.plantuml
@@ -20,16 +20,13 @@ skinparam style strictuml
activate Catalina
-Catalina -> Server: init()
-activate Server
+Catalina -> Server ++: init()
Server -> Server: fireLifecycleEvent(\n BEFORE_INIT_EVENT)
-Server -> Server: initInternal()
-activate Server
+Server -> Server ++: initInternal()
-Server -> "Global\nNaming\nResources" as GNR: init()
-activate GNR
+Server -> "Global\nNaming\nResources" as GNR ++: init()
GNR -> GNR: fireLifecycleEvent(\n BEFORE_INIT_EVENT)
GNR -> GNR: initInternal()
@@ -38,16 +35,13 @@ GNR -> GNR: fireLifecycleEvent(\n AFTER_INIT_EVENT)
Server <<-- GNR
deactivate GNR
-Server -> "Service(s)" as Services: init()
-activate Services
+Server -> "Service(s)" as Services ++: init()
Services -> Services: fireLifecycleEvent(\n BEFORE_INIT_EVENT)
-Services -> Services: initInternal()
-activate Services
+Services -> Services ++: initInternal()
-Services -> Engine: init()
-activate Engine
+Services -> Engine ++: init()
Engine -> Engine: fireLifecycleEvent(\n BEFORE_INIT_EVENT)
Engine -> Engine: initInternal()
@@ -56,8 +50,7 @@ Engine -> Engine: fireLifecycleEvent(\n AFTER_INIT_EVENT)
Services <<-- Engine
deactivate Engine
-Services -> "Executor(s)" as Executors: init()
-activate Executors
+Services -> "Executor(s)" as Executors ++: init()
Executors -> Executors: fireLifecycleEvent(\n BEFORE_INIT_EVENT)
Executors -> Executors: initInternal()
@@ -66,8 +59,7 @@ Executors -> Executors: fireLifecycleEvent(\n
AFTER_INIT_EVENT)
Services <<-- Executors
deactivate Executors
-Services -> "Mapper\nListener" as MapperListener: init()
-activate MapperListener
+Services -> "Mapper\nListener" as MapperListener ++: init()
MapperListener -> MapperListener: fireLifecycleEvent(\n BEFORE_INIT_EVENT)
MapperListener -> MapperListener: initInternal()
@@ -76,22 +68,19 @@ MapperListener -> MapperListener: fireLifecycleEvent(\n
AFTER_INIT_EVENT)
Services <<-- MapperListener
deactivate MapperListener
-Services -> "Connector(s)" as Connectors: init()
-activate Connectors
+Services -> "Connector(s)" as Connectors ++: init()
Connectors -> Connectors: fireLifecycleEvent(\n BEFORE_INIT_EVENT)
-Connectors -> Connectors: initInternal()
-activate Connectors
+
+Connectors -> Connectors ++: initInternal()
Connectors -->> CoyoteAdapter **
-Connectors -> Protocol: setAdapter()
-activate Protocol
+Connectors -> Protocol ++: setAdapter()
Connectors <<-- Protocol
deactivate Protocol
-Connectors -> Protocol: init()
-activate Protocol
+Connectors -> Protocol ++: init()
Connectors <<-- Protocol
deactivate Protocol
diff --git a/webapps/docs/architecture/startup/2_catalina_init.png
b/webapps/docs/architecture/startup/2_catalina_init.png
index efc4632bea..55f9889a62 100644
Binary files a/webapps/docs/architecture/startup/2_catalina_init.png and
b/webapps/docs/architecture/startup/2_catalina_init.png differ
diff --git a/webapps/docs/architecture/startup/3_catalina_start_1.plantuml
b/webapps/docs/architecture/startup/3_catalina_start_1.plantuml
index 2872395dd4..1fe3659e6d 100644
--- a/webapps/docs/architecture/startup/3_catalina_start_1.plantuml
+++ b/webapps/docs/architecture/startup/3_catalina_start_1.plantuml
@@ -20,23 +20,19 @@ skinparam style strictuml
activate Catalina
-Catalina -> Server: start()
-activate Server
+Catalina -> Server ++: start()
Server -> Server: fireLifecycleEvent(\n BEFORE_START_EVENT)
-Server -> Server: startInternal()
-activate Server
+Server -> Server ++: startInternal()
Server -> Server: fireLifecycleEvent(\n CONFIGURE_START_EVENT)
Server -> Server: fireLifecycleEvent(\n START_EVENT)
-Server -> "Global\nNaming\nResources" as GNR: start()
-activate GNR
+Server -> "Global\nNaming\nResources" as GNR ++: start()
GNR -> GNR: fireLifecycleEvent(\n BEFORE_START_EVENT)
-GNR -> GNR: startInternal()
-activate GNR
+GNR -> GNR ++: startInternal()
GNR -> GNR: fireLifecycleEvent(\n CONFIGURE_START_EVENT)
GNR -> GNR: fireLifecycleEvent(\n START_EVENT)
@@ -49,23 +45,19 @@ GNR -> GNR: fireLifecycleEvent(\n AFTER_START_EVENT)
Server <<-- GNR
deactivate GNR
-Server -> "Service(s)" as Services: start()
-activate Services
+Server -> "Service(s)" as Services ++: start()
Services -> Services: fireLifecycleEvent(\n BEFORE_START_EVENT)
-Services -> Services: startInternal()
-activate Services
+Services -> Services ++: startInternal()
Services -> Services: fireLifecycleEvent(\n START_EVENT)
-Services -> Engine: start()
-activate Engine
+Services -> Engine ++: start()
Engine -> Engine: fireLifecycleEvent(\n BEFORE_START_EVENT)
-Engine -> Engine: startInternal()
-activate Engine
+Engine -> Engine ++: startInternal()
Engine -> Engine: fireLifecycleEvent(\n START_EVENT)
@@ -77,13 +69,11 @@ Engine -> Engine: fireLifecycleEvent(\n
AFTER_START_EVENT)
Services <<-- Engine
deactivate Engine
-Services -> "Executor(s)" as Executors: start()
-activate Executors
+Services -> "Executor(s)" as Executors ++: start()
Executors -> Executors: fireLifecycleEvent(\n BEFORE_START_EVENT)
-Executors -> Executors: startInternal()
-activate Executors
+Executors -> Executors ++: startInternal()
Executors -> Executors: fireLifecycleEvent(\n START_EVENT)
@@ -95,13 +85,11 @@ Executors -> Executors: fireLifecycleEvent(\n
AFTER_START_EVENT)
Services <<-- Executors
deactivate Executors
-Services -> "Mapper\nListener" as MapperListener: start()
-activate MapperListener
+Services -> "Mapper\nListener" as MapperListener ++: start()
MapperListener -> MapperListener: fireLifecycleEvent(\n BEFORE_START_EVENT)
-MapperListener -> MapperListener: startInternal()
-activate MapperListener
+MapperListener -> MapperListener ++: startInternal()
MapperListener -> MapperListener: fireLifecycleEvent(\n START_EVENT)
@@ -113,17 +101,14 @@ MapperListener -> MapperListener: fireLifecycleEvent(\n
AFTER_START_EVENT)
Services <<-- MapperListener
deactivate MapperListener
-Services -> "Connector(s)" as Connectors: start()
-activate Connectors
+Services -> "Connector(s)" as Connectors ++: start()
Connectors -> Connectors: fireLifecycleEvent(\n BEFORE_START_EVENT)
-Connectors -> Connectors: startInternal()
-activate Connectors
+Connectors -> Connectors ++: startInternal()
Connectors -> Connectors: fireLifecycleEvent(\n START_EVENT)
-Connectors -> Protocol: start()
-activate Protocol
+Connectors -> Protocol ++: start()
Connectors <<-- Protocol
deactivate Protocol
diff --git a/webapps/docs/architecture/startup/3_catalina_start_1.png
b/webapps/docs/architecture/startup/3_catalina_start_1.png
index 3d8d57fbaa..b276e0e0c7 100644
Binary files a/webapps/docs/architecture/startup/3_catalina_start_1.png and
b/webapps/docs/architecture/startup/3_catalina_start_1.png differ
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
