You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2024/09/02 13:49:47 UTC
(tomcat) branch 11.0.x updated (2933368a8b -> 0eed9e0f0c)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
from 2933368a8b Fix unfortunate typo ("no" was missing)
new 5d339a72c2 Switch diagram 1 to use PlantUML
new 0eed9e0f0c Switch to PlantUML for the second diagram
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
webapps/docs/architecture/startup/1_overview.png | Bin 73297 -> 45967 bytes
webapps/docs/architecture/startup/1_overview.uml | 105 +++++++++++++++++++++
webapps/docs/architecture/startup/1_overview.vpd | 1 -
.../docs/architecture/startup/2_catalina_init.png | Bin 59658 -> 30440 bytes
.../docs/architecture/startup/2_catalina_init.uml | 47 +++++++++
.../docs/architecture/startup/2_catalina_init.vpd | 1 -
6 files changed, 152 insertions(+), 2 deletions(-)
create mode 100644 webapps/docs/architecture/startup/1_overview.uml
delete mode 100644 webapps/docs/architecture/startup/1_overview.vpd
create mode 100644 webapps/docs/architecture/startup/2_catalina_init.uml
delete mode 100644 webapps/docs/architecture/startup/2_catalina_init.vpd
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
(tomcat) 01/02: Switch diagram 1 to use PlantUML
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 5d339a72c2001a5c1be85fec5fbf98aa0870d1de
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Sep 2 14:20:51 2024 +0100
Switch diagram 1 to use PlantUML
---
webapps/docs/architecture/startup/1_overview.png | Bin 73297 -> 45967 bytes
webapps/docs/architecture/startup/1_overview.uml | 105 +++++++++++++++++++++++
webapps/docs/architecture/startup/1_overview.vpd | 1 -
3 files changed, 105 insertions(+), 1 deletion(-)
diff --git a/webapps/docs/architecture/startup/1_overview.png b/webapps/docs/architecture/startup/1_overview.png
index 5f0d8737d6..c35fc974bf 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/1_overview.uml b/webapps/docs/architecture/startup/1_overview.uml
new file mode 100644
index 0000000000..6c55c1c9b4
--- /dev/null
+++ b/webapps/docs/architecture/startup/1_overview.uml
@@ -0,0 +1,105 @@
+@startuml
+
+' Licensed to the Apache Software Foundation (ASF) under one or more
+' contributor license agreements. See the NOTICE file distributed with
+' this work for additional information regarding copyright ownership.
+' The ASF licenses this file to You under the Apache License, Version 2.0
+' (the "License"); you may not use this file except in compliance with
+' the License. You may obtain a copy of the License at
+'
+' http://www.apache.org/licenses/LICENSE-2.0
+'
+' Unless required by applicable law or agreed to in writing, software
+' distributed under the License is distributed on an "AS IS" BASIS,
+' WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+' See the License for the specific language governing permissions and
+' limitations under the License.
+
+hide footbox
+skinparam style strictuml
+
+activate Bootstrap
+Bootstrap -> Bootstrap: initClassLoaders()
+
+Bootstrap -->> Catalina ** : newInstance()
+
+Bootstrap -> Catalina: setParentClassLoader()
+activate Catalina
+|||
+Bootstrap <<-- Catalina:
+deactivate Catalina
+
+Bootstrap -> Catalina: start()
+activate Catalina
+
+Catalina -> Catalina: load()
+activate Catalina
+
+Catalina -> Catalina: initNaming()
+
+Catalina -> Catalina: parseServerXml()
+activate Catalina
+
+Catalina -->> Digester ** :
+note right of Digester
+ The digester creates all
+ of the objects defined in
+ //server.xml// but only the
+ Server is shown here for
+ simplicity
+end note
+
+Catalina -> Digester: parse()
+activate Digester
+|||
+
+Digester -->> Server ** :
+
+Catalina <<-- Digester:
+deactivate Digester
+
+Catalina -->> Catalina:
+deactivate Catalina
+
+Catalina -> Catalina: initStream()
+
+Catalina -> Server: init()
+activate Server
+|||
+Catalina <<-- Server:
+deactivate Server
+
+Catalina -->> Catalina:
+deactivate Catalina
+
+Catalina -> Server: start()
+activate Server
+Catalina <<-- Server:
+
+Catalina -> Catalina: await()
+activate Catalina
+note right of Catalina
+ This is where Tomcat spends
+ time serving requests
+end note
+Catalina -->> Catalina:
+deactivate Catalina
+
+Catalina -> Catalina: stop()
+activate Catalina
+
+Catalina -> Server: stop()
+Catalina <<-- Server:
+
+Catalina -> Server: destroy()
+Catalina <<-- Server:
+deactivate Server
+
+Catalina -->> Catalina:
+deactivate Catalina
+
+Bootstrap <<-- Catalina:
+deactivate Catalina
+
+deactivate Bootstrap
+@enduml
\ No newline at end of file
diff --git a/webapps/docs/architecture/startup/1_overview.vpd b/webapps/docs/architecture/startup/1_overview.vpd
deleted file mode 100644
index aa619ca7bb..0000000000
--- a/webapps/docs/architecture/startup/1_overview.vpd
+++ /dev/null
@@ -1 +0,0 @@
-3cU2FsdmGVkX1G9lGiDGWIZePui7nIAiLz8pDroYNYtiSY/PFf1Mc=m8sqgIz5FbyD9nX9nb0Sae+5K7EEHK6RDaeQ6Elk40MURCeLHRyntwSfkMtsBA7nPw/x+R60gdX8/fq6y+KSoib1HzcyJb/tFUt2ABlU5ZQo0fie6al/VJCSRALcwgrRmuDjGFK8EIXCOjj//EeARnwcsVt9zuht4iKqQ5cfMz1pEWpRWZkYsAtiT72xCgFbzMV2guoYrVXBsrGM+CmZi59xV+EbFg9jfYwdAwLifyO4HsoqvGGPSUUtmr58bm7cZu7UOMDKbTtjwcscz3vs2yDv1QkswATo40ChiJiw1T4Q2YFz9YAjSNZ8INIrDKWnESG3q4cyhfcAa2ENwQayXbd4buwuQhII2UgNEE+K9m3iTfXzEgPUzoMUfUfGUXytL3yRWGXdc4d7qZHTrFjceW+59hsRlJemeTAgEs5VVfYPzs5jn2rrap [...]
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
(tomcat) 02/02: Switch to PlantUML for the second diagram
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 0eed9e0f0c5cd7321a80e7806cf0e3a53bf636e6
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Sep 2 14:46:31 2024 +0100
Switch to PlantUML for the second diagram
---
.../docs/architecture/startup/2_catalina_init.png | Bin 59658 -> 30440 bytes
.../docs/architecture/startup/2_catalina_init.uml | 47 +++++++++++++++++++++
.../docs/architecture/startup/2_catalina_init.vpd | 1 -
3 files changed, 47 insertions(+), 1 deletion(-)
diff --git a/webapps/docs/architecture/startup/2_catalina_init.png b/webapps/docs/architecture/startup/2_catalina_init.png
index 3da81b7722..9c8aef0ef8 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/2_catalina_init.uml b/webapps/docs/architecture/startup/2_catalina_init.uml
new file mode 100644
index 0000000000..b02d57f5a3
--- /dev/null
+++ b/webapps/docs/architecture/startup/2_catalina_init.uml
@@ -0,0 +1,47 @@
+@startuml
+
+' Licensed to the Apache Software Foundation (ASF) under one or more
+' contributor license agreements. See the NOTICE file distributed with
+' this work for additional information regarding copyright ownership.
+' The ASF licenses this file to You under the Apache License, Version 2.0
+' (the "License"); you may not use this file except in compliance with
+' the License. You may obtain a copy of the License at
+'
+' http://www.apache.org/licenses/LICENSE-2.0
+'
+' Unless required by applicable law or agreed to in writing, software
+' distributed under the License is distributed on an "AS IS" BASIS,
+' WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+' See the License for the specific language governing permissions and
+' limitations under the License.
+
+hide footbox
+skinparam style strictuml
+
+activate Catalina
+activate Server
+activate "Global\nNaming\nResources"
+activate Services
+activate Engine
+activate Executors
+activate MapperListener
+activate Connectors
+activate Protocol
+
+Catalina -> Server: init()
+
+Server -> "Global\nNaming\nResources" : init()
+Server -> "Service(s)" as Services: init()
+
+Services -> Engine: init()
+Services -> "Executor(s)" as Executors: init()
+Services -> "Mapper\nListener" as MapperListener: init()
+Services -> "Connector(s)" as Connectors: init()
+
+Connectors -->> CoyoteAdapter **
+activate CoyoteAdapter
+
+Connectors -> Protocol: setAdapter()
+Connectors -> Protocol: init()
+
+@enduml
\ No newline at end of file
diff --git a/webapps/docs/architecture/startup/2_catalina_init.vpd b/webapps/docs/architecture/startup/2_catalina_init.vpd
deleted file mode 100644
index ed00fb378d..0000000000
--- a/webapps/docs/architecture/startup/2_catalina_init.vpd
+++ /dev/null
@@ -1 +0,0 @@
-3cU2FsdKGVkX1t9tZy9VJxXYPh6Tpp90wtnKkkdoiOukuZAl8Wa4E=H8rXYII5c+76D6BMUaAe5Fky3ZKdelZm7wh7w/bFDhk4slXP3WGSsiGEH4B3hPR3QOu4btmIj/tyDU+RGpVmR1LlosBA1yC0XU/RkqBx5y1gqypY7Lj42mEiM6uFVWgy1c/wvVnLMcN1sGCet+9bs6qm1kRgpydSOOwcdJ1mKYvCEXP3FoIG5ka8ElC2kswwhz8tuyHkKiIHW8sdEiWLi4gm1x8Bc4N33z1RAKsCzSL5X7LiR0PATJqpbhhAtZBYBuY4fW0ZJc7dFvTTer9XGhoJso4OPOTY/eopXwOz0MYyxicaVCSS58EE+SI2u8J/8e53dnuPygIwZgGQsZTsR0PtYy6ilm2ETaSDoV+vUvhgqmlWU+g/j8fHd1B5qgKpAzYzzvX2V5T3Fl7Fs/BF4g5tZgMbyNlSUs45h5TRXOjZ0FdzEDnnXY [...]
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org