(tomcat) branch main updated: Fix unfortunate typo ("no" was missing)
This is an automated email from the ASF dual-hosted git repository.
remm 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 21f4886ed6 Fix unfortunate typo ("no" was missing)
21f4886ed6 is described below
commit 21f4886ed6d4f57c2147b9bbe365df1fe0754883
Author: remm
AuthorDate: Mon Sep 2 15:16:40 2024 +0200
Fix unfortunate typo ("no" was missing)
Now flagged by Coverity, so still thinking about how to do it better if
feasible.
---
java/org/apache/catalina/core/StandardContext.java | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/catalina/core/StandardContext.java
b/java/org/apache/catalina/core/StandardContext.java
index 27406d6a86..f4fb6f8bf0 100644
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -2128,10 +2128,8 @@ public class StandardContext extends ContainerBase
implements Context, Notificat
@Override
public ServletContext getServletContext() {
-/*
- * This method is called (multiple times) during context start which
is single threaded so there is concurrency
- * issue here.
- */
+// This method is called multiple times during context start which is
single threaded
+// so there is no concurrency issue
if (context == null) {
context = new ApplicationContext(this);
if (altDDName != null) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 11.0.x updated: Fix unfortunate typo ("no" was missing)
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/11.0.x by this push:
new 2933368a8b Fix unfortunate typo ("no" was missing)
2933368a8b is described below
commit 2933368a8b50ea217012b2b34dbcc4cc32e1476d
Author: remm
AuthorDate: Mon Sep 2 15:16:40 2024 +0200
Fix unfortunate typo ("no" was missing)
Now flagged by Coverity, so still thinking about how to do it better if
feasible.
---
java/org/apache/catalina/core/StandardContext.java | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/catalina/core/StandardContext.java
b/java/org/apache/catalina/core/StandardContext.java
index 27406d6a86..f4fb6f8bf0 100644
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -2128,10 +2128,8 @@ public class StandardContext extends ContainerBase
implements Context, Notificat
@Override
public ServletContext getServletContext() {
-/*
- * This method is called (multiple times) during context start which
is single threaded so there is concurrency
- * issue here.
- */
+// This method is called multiple times during context start which is
single threaded
+// so there is no concurrency issue
if (context == null) {
context = new ApplicationContext(this);
if (altDDName != null) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 10.1.x updated: Fix unfortunate typo ("no" was missing)
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 0a40f40e12 Fix unfortunate typo ("no" was missing)
0a40f40e12 is described below
commit 0a40f40e1266fdb4b3bff5456446323ce6f13373
Author: remm
AuthorDate: Mon Sep 2 15:16:40 2024 +0200
Fix unfortunate typo ("no" was missing)
Now flagged by Coverity, so still thinking about how to do it better if
feasible.
---
java/org/apache/catalina/core/StandardContext.java | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/catalina/core/StandardContext.java
b/java/org/apache/catalina/core/StandardContext.java
index d181a99a7b..3b7b61dc4f 100644
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -2136,10 +2136,8 @@ public class StandardContext extends ContainerBase
implements Context, Notificat
@Override
public ServletContext getServletContext() {
-/*
- * This method is called (multiple times) during context start which
is single threaded so there is concurrency
- * issue here.
- */
+// This method is called multiple times during context start which is
single threaded
+// so there is no concurrency issue
if (context == null) {
context = new ApplicationContext(this);
if (altDDName != null) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 9.0.x updated: Fix unfortunate typo ("no" was missing)
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 3d6776fdad Fix unfortunate typo ("no" was missing)
3d6776fdad is described below
commit 3d6776fdadcfeb9c66b8f3c19ef2d2974b911a59
Author: remm
AuthorDate: Mon Sep 2 15:16:40 2024 +0200
Fix unfortunate typo ("no" was missing)
Now flagged by Coverity, so still thinking about how to do it better if
feasible.
---
java/org/apache/catalina/core/StandardContext.java | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/catalina/core/StandardContext.java
b/java/org/apache/catalina/core/StandardContext.java
index 96c2368234..5ea6b01308 100644
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -2066,10 +2066,8 @@ public class StandardContext extends ContainerBase
implements Context, Notificat
@Override
public ServletContext getServletContext() {
-/*
- * This method is called (multiple times) during context start which
is single threaded so there is concurrency
- * issue here.
- */
+// This method is called multiple times during context start which is
single threaded
+// so there is no concurrency issue
if (context == null) {
context = new ApplicationContext(this);
if (altDDName != null) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 02/02: Switch to PlantUML for the second diagram
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 commit 69c38fd512f7ea0b1d352ba2efa78c1b8502515b Author: Mark Thomas 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 00..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..00 --- 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-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 01/02: Switch diagram 1 to use PlantUML
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 commit cd562bccbcc33cc42c2e310f53332e3d31f6ae08 Author: Mark Thomas 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 00..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..00 --- 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-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 01/02: Switch diagram 1 to use PlantUML
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 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 00..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..00 --- 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-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(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-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 02/02: Switch to PlantUML for the second diagram
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 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 00..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..00 --- 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-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated (21f4886ed6 -> 69c38fd512)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
from 21f4886ed6 Fix unfortunate typo ("no" was missing)
new cd562bccbc Switch diagram 1 to use PlantUML
new 69c38fd512 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-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 10.1.x updated (0a40f40e12 -> 7a950406c8)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
from 0a40f40e12 Fix unfortunate typo ("no" was missing)
new 73ff5245d5 Switch diagram 1 to use PlantUML
new 7a950406c8 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-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 01/02: Switch diagram 1 to use PlantUML
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 73ff5245d513cc3a85407bb15c22eea6efb99a9e Author: Mark Thomas 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 00..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..00 --- 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-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 02/02: Switch to PlantUML for the second diagram
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 7a950406c835bfe58c74ab09c99d956b58a867eb Author: Mark Thomas 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 00..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..00 --- 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-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 9.0.x updated (3d6776fdad -> ddbd69bade)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
from 3d6776fdad Fix unfortunate typo ("no" was missing)
new 5330a8e2a0 Switch to PlantUML for the second diagram
new ddbd69bade Switch diagram 1 to use PlantUML
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-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 02/02: Switch diagram 1 to use PlantUML
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit ddbd69badee0714a3c0b3768d48854255fc02e65 Author: Mark Thomas 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 00..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..00 --- 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-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 01/02: Switch to PlantUML for the second diagram
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 5330a8e2a02f30bb43e0f84950c3d54bf8f3b071 Author: Mark Thomas 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 00..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..00 --- 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-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 69302] ReadListener#onError not called on read exception during async processing with read timeout
https://bz.apache.org/bugzilla/show_bug.cgi?id=69302 --- Comment #1 from Mark Thomas --- There is a lof of useful background in the Servlet specification issue that is discussing how issues like this should be handled: https://github.com/jakartaee/servlet/issues/433 I've looked at this some more and I going to start work on an approach based around Stream.receiveReset(long). On first look, it appears that that fits nicely with what Stuart was proposing in the Servlet issue. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
