reorganise patches to make it easier to change in the future
Signed-off-by: geraldo netto <geraldone...@gmail.com>
---
tomcat/patches/perf/0001-add-admin-user.patch | 32 +++++++++++++++++++
.../perf/0001-configure-web-admin-user.patch | 31 ------------------
.../0002-grant-admin-gui-to-tomcat-user.patch | 26 +++++++++++++++
...assign-admin-gui-role-to-tomcat-user.patch | 25 ---------------
...grant-manager-script-to-tomcat-user.patch} | 21 ++++++------
...004-disable-jasper-development-mode.patch} | 17 +++++-----
...ch => 0005-change-http-port-to-8081.patch} | 19 +++++------
... => 0006-increase-number-of-threads.patch} | 17 +++++-----
...ch => 0007-force-HTTP-NIO-connector.patch} | 21 ++++++------
...patch => 0008-disable-AJP-connector.patch} | 17 ++++++----
10 files changed, 119 insertions(+), 107 deletions(-)
create mode 100644 tomcat/patches/perf/0001-add-admin-user.patch
delete mode 100644 tomcat/patches/perf/0001-configure-web-admin-user.patch
create mode 100644
tomcat/patches/perf/0002-grant-admin-gui-to-tomcat-user.patch
delete mode 100644
tomcat/patches/perf/0003-assign-admin-gui-role-to-tomcat-user.patch
rename
tomcat/patches/perf/{0006-Add-script-managment-role-to-tomcat-user.patch =>
0003-grant-manager-script-to-tomcat-user.patch} (56%)
rename tomcat/patches/perf/{0004-disable-Jasper-development-mode.patch =>
0004-disable-jasper-development-mode.patch} (57%)
rename tomcat/patches/perf/{0002-change-http-port-to-8081.patch =>
0005-change-http-port-to-8081.patch} (54%)
rename tomcat/patches/perf/{0005-bump-up-number-of-threads.patch =>
0006-increase-number-of-threads.patch} (56%)
rename tomcat/patches/perf/{0007-Use-bio-connector-explicitly.patch =>
0007-force-HTTP-NIO-connector.patch} (53%)
rename tomcat/patches/perf/{0008-Do-not-enable-AJP-connector.patch =>
0008-disable-AJP-connector.patch} (59%)
diff --git a/tomcat/patches/perf/0001-add-admin-user.patch
b/tomcat/patches/perf/0001-add-admin-user.patch
new file mode 100644
index 0000000..33318f7
--- /dev/null
+++ b/tomcat/patches/perf/0001-add-admin-user.patch
@@ -0,0 +1,32 @@
+From 64efcb7d8aa8279cf80b10accf09ba4fdff1027d Mon Sep 17 00:00:00 2001
+From: geraldo netto <geraldone...@gmail.com>
+Date: Tue, 4 Sep 2018 13:22:13 -0300
+Subject: [PATCH 1/8] add admin user
+
+original patch from Tomasz Grabiec
+
+Signed-off-by: geraldo netto <geraldone...@gmail.com>
+---
+ conf/tomcat-users.xml | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/conf/tomcat-users.xml b/conf/tomcat-users.xml
+index aef66d0..18c3d07 100644
+--- a/conf/tomcat-users.xml
++++ b/conf/tomcat-users.xml
+@@ -35,10 +35,11 @@
+ them. You will also need to set the passwords to something appropriate.
+ -->
+ <!--
+- <role rolename="tomcat"/>
+ <role rolename="role1"/>
+ <user username="tomcat" password="<must-be-changed>" roles="tomcat"/>
+ <user username="both" password="<must-be-changed>" roles="tomcat,role1"/>
+ <user username="role1" password="<must-be-changed>" roles="role1"/>
+ -->
++ <role rolename="tomcat"/>
++ <user username="tomcat" password="tomcat" roles="manager-gui"/>
+ </tomcat-users>
+--
+2.17.1
+
diff --git a/tomcat/patches/perf/0001-configure-web-admin-user.patch
b/tomcat/patches/perf/0001-configure-web-admin-user.patch
deleted file mode 100644
index d445541..0000000
--- a/tomcat/patches/perf/0001-configure-web-admin-user.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 08dea01a79210846ae959f05ccc2d85a9a78e92e Mon Sep 17 00:00:00 2001
-From: Tomasz Grabiec <tgrab...@cloudius-systems.com>
-Date: Thu, 17 Oct 2013 15:34:25 +0200
-Subject: [PATCH 1/5] configure web admin user
-
-
-Signed-off-by: Tomasz Grabiec <tgrab...@cloudius-systems.com>
----
- conf/tomcat-users.xml | 7 +------
- 1 file changed, 1 insertion(+), 6 deletions(-)
-
-diff --git a/conf/tomcat-users.xml b/conf/tomcat-users.xml
-index 7f022ff..2f9579c 100644
---- a/conf/tomcat-users.xml
-+++ b/conf/tomcat-users.xml
-@@ -26,11 +26,6 @@
- and thus are ignored when reading this file. Do not forget to remove
- <!.. ..> that surrounds them.
- -->
--<!--
- <role rolename="tomcat"/>
-- <role rolename="role1"/>
-- <user username="tomcat" password="tomcat" roles="tomcat"/>
-- <user username="both" password="tomcat" roles="tomcat,role1"/>
-- <user username="role1" password="tomcat" roles="role1"/>
---->
-+ <user username="tomcat" password="tomcat" roles="manager-gui"/>
- </tomcat-users>
---
-1.8.1.2
-
diff --git a/tomcat/patches/perf/0002-grant-admin-gui-to-tomcat-user.patch
b/tomcat/patches/perf/0002-grant-admin-gui-to-tomcat-user.patch
new file mode 100644
index 0000000..8811cf0
--- /dev/null
+++ b/tomcat/patches/perf/0002-grant-admin-gui-to-tomcat-user.patch
@@ -0,0 +1,26 @@
+From e9dc960c8baff6de21da552f41812a8875e9b53c Mon Sep 17 00:00:00 2001
+From: geraldo netto <geraldone...@gmail.com>
+Date: Tue, 4 Sep 2018 13:23:20 -0300
+Subject: [PATCH 2/8] grant admin-gui to tomcat user
+
+original patch from Tomasz Grabiec
+
+Signed-off-by: geraldo netto <geraldone...@gmail.com>
+---
+ conf/tomcat-users.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/conf/tomcat-users.xml b/conf/tomcat-users.xml
+index 18c3d07..fff2786 100644
+--- a/conf/tomcat-users.xml
++++ b/conf/tomcat-users.xml
+@@ -41,5 +41,5 @@
+ <user username="role1" password="<must-be-changed>" roles="role1"/>
+ -->
+ <role rolename="tomcat"/>
+- <user username="tomcat" password="tomcat" roles="manager-gui"/>
++ <user username="tomcat" password="tomcat" roles="manager-gui,admin-gui"/>
+ </tomcat-users>
+--
+2.17.1
+
diff --git
a/tomcat/patches/perf/0003-assign-admin-gui-role-to-tomcat-user.patch
b/tomcat/patches/perf/0003-assign-admin-gui-role-to-tomcat-user.patch
deleted file mode 100644
index 27ed2ae..0000000
--- a/tomcat/patches/perf/0003-assign-admin-gui-role-to-tomcat-user.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 4da61bbd4d8e54db1da9b77c16f5bb02c91bce60 Mon Sep 17 00:00:00 2001
-From: Tomasz Grabiec <tgrab...@cloudius-systems.com>
-Date: Wed, 20 Nov 2013 09:11:31 +0100
-Subject: [PATCH 3/5] assign admin-gui role to tomcat user
-
-
-Signed-off-by: Tomasz Grabiec <tgrab...@cloudius-systems.com>
----
- conf/tomcat-users.xml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/conf/tomcat-users.xml b/conf/tomcat-users.xml
-index 2f9579c..bcf840a 100644
---- a/conf/tomcat-users.xml
-+++ b/conf/tomcat-users.xml
-@@ -27,5 +27,5 @@
- <!.. ..> that surrounds them.
- -->
- <role rolename="tomcat"/>
-- <user username="tomcat" password="tomcat" roles="manager-gui"/>
-+ <user username="tomcat" password="tomcat" roles="manager-gui,admin-gui"/>
- </tomcat-users>
---
-1.8.1.2
-
diff --git
a/tomcat/patches/perf/0006-Add-script-managment-role-to-tomcat-user.patch
b/tomcat/patches/perf/0003-grant-manager-script-to-tomcat-user.patch
similarity index 56%
rename from
tomcat/patches/perf/0006-Add-script-managment-role-to-tomcat-user.patch
rename to tomcat/patches/perf/0003-grant-manager-script-to-tomcat-user.patch
index 9c068f4..6438538 100644
--- a/tomcat/patches/perf/0006-Add-script-managment-role-to-tomcat-user.patch
+++ b/tomcat/patches/perf/0003-grant-manager-script-to-tomcat-user.patch
@@ -1,28 +1,29 @@
-From 51a02c65793bcc15be484b19c20a807cf6dc954f Mon Sep 17 00:00:00 2001
-Message-Id:
<51a02c65793bcc15be484b19c20a807cf6dc954f.1394978410.git....@cloudius-systems.com>
-From: Avi Kivity <a...@cloudius-systems.com>
-Date: Sun, 16 Mar 2014 15:58:34 +0200
-Subject: [PATCH] Add script managment role to tomcat user
+From a42a7d69c26ca15c04cff1f9808b9fdedd5c60fb Mon Sep 17 00:00:00 2001
+From: geraldo netto <geraldone...@gmail.com>
+Date: Tue, 4 Sep 2018 13:24:51 -0300
+Subject: [PATCH 3/8] grant manager-script to tomcat user
The manual recommends against having the same user having both gui and script
roles, but since the user/password is well-known, it doesn't matter here.
-Signed-off-by: Avi Kivity <a...@cloudius-systems.com>
+original patch from Avi Kivity
+
+Signed-off-by: geraldo netto <geraldone...@gmail.com>
---
conf/tomcat-users.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/conf/tomcat-users.xml b/conf/tomcat-users.xml
-index bcf840a..aad3acb 100644
+index fff2786..a5089f6 100644
--- a/conf/tomcat-users.xml
+++ b/conf/tomcat-users.xml
-@@ -27,5 +27,5 @@
- <!.. ..> that surrounds them.
+@@ -41,5 +41,5 @@
+ <user username="role1" password="<must-be-changed>" roles="role1"/>
-->
<role rolename="tomcat"/>
- <user username="tomcat" password="tomcat" roles="manager-gui,admin-gui"/>
+ <user username="tomcat" password="tomcat"
roles="manager-gui,admin-gui,manager-script"/>
</tomcat-users>
--
-1.8.5.3
+2.17.1
diff --git a/tomcat/patches/perf/0004-disable-Jasper-development-mode.patch
b/tomcat/patches/perf/0004-disable-jasper-development-mode.patch
similarity index 57%
rename from tomcat/patches/perf/0004-disable-Jasper-development-mode.patch
rename to tomcat/patches/perf/0004-disable-jasper-development-mode.patch
index 8fe4612..4c5690c 100644
--- a/tomcat/patches/perf/0004-disable-Jasper-development-mode.patch
+++ b/tomcat/patches/perf/0004-disable-jasper-development-mode.patch
@@ -1,19 +1,20 @@
-From 210e530f69c5053326a644c23414a7f835402ebe Mon Sep 17 00:00:00 2001
-From: Tomasz Grabiec <tgrab...@cloudius-systems.com>
-Date: Tue, 19 Nov 2013 17:24:05 +0100
-Subject: [PATCH 4/5] disable Jasper development mode
+From 660ec3061d31be334ddd10f1e1a32d429cbcfd54 Mon Sep 17 00:00:00 2001
+From: geraldo netto <geraldone...@gmail.com>
+Date: Tue, 4 Sep 2018 13:16:56 -0300
+Subject: [PATCH 4/8] disable jasper development mode
+original patch from Tomasz Grabiec
-Signed-off-by: Tomasz Grabiec <tgrab...@cloudius-systems.com>
+Signed-off-by: geraldo netto <geraldone...@gmail.com>
---
conf/web.xml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/conf/web.xml b/conf/web.xml
-index 696101a..8ec0ece 100644
+index b3ebce2..92b40ed 100644
--- a/conf/web.xml
+++ b/conf/web.xml
-@@ -238,6 +238,10 @@
+@@ -270,6 +270,10 @@
<param-name>xpoweredBy</param-name>
<param-value>false</param-value>
</init-param>
@@ -25,5 +26,5 @@ index 696101a..8ec0ece 100644
</servlet>
--
-1.8.1.2
+2.17.1
diff --git a/tomcat/patches/perf/0002-change-http-port-to-8081.patch
b/tomcat/patches/perf/0005-change-http-port-to-8081.patch
similarity index 54%
rename from tomcat/patches/perf/0002-change-http-port-to-8081.patch
rename to tomcat/patches/perf/0005-change-http-port-to-8081.patch
index dc9cf22..78372f4 100644
--- a/tomcat/patches/perf/0002-change-http-port-to-8081.patch
+++ b/tomcat/patches/perf/0005-change-http-port-to-8081.patch
@@ -1,21 +1,22 @@
-From 151795f23e5733676c71423c615a6196d0107595 Mon Sep 17 00:00:00 2001
-From: Tomasz Grabiec <tgrab...@cloudius-systems.com>
-Date: Wed, 20 Nov 2013 09:11:12 +0100
-Subject: [PATCH 2/5] change http port to 8081
+From 9606a3eab4e1638d96fef363c67098c022d5ca51 Mon Sep 17 00:00:00 2001
+From: geraldo netto <geraldone...@gmail.com>
+Date: Tue, 4 Sep 2018 13:02:21 -0300
+Subject: [PATCH 5/8] change http port to 8081
+original patch from Tomasz Grabiec
-Signed-off-by: Tomasz Grabiec <tgrab...@cloudius-systems.com>
+Signed-off-by: geraldo netto <geraldone...@gmail.com>
---
conf/server.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/conf/server.xml b/conf/server.xml
-index ea36bde..ae4949a 100644
+index fce8922..6fcd9c2 100644
--- a/conf/server.xml
+++ b/conf/server.xml
-@@ -67,7 +67,7 @@
+@@ -66,7 +66,7 @@
APR (HTTP/AJP) Connector: /docs/apr.html
- Define a non-SSL HTTP/1.1 Connector on port 8080
+ Define a non-SSL/TLS HTTP/1.1 Connector on port 8080
-->
- <Connector port="8080" protocol="HTTP/1.1"
+ <Connector port="8081" protocol="HTTP/1.1"
@@ -23,5 +24,5 @@ index ea36bde..ae4949a 100644
redirectPort="8443" />
<!-- A "Connector" using the shared thread pool-->
--
-1.8.1.2
+2.17.1
diff --git a/tomcat/patches/perf/0005-bump-up-number-of-threads.patch
b/tomcat/patches/perf/0006-increase-number-of-threads.patch
similarity index 56%
rename from tomcat/patches/perf/0005-bump-up-number-of-threads.patch
rename to tomcat/patches/perf/0006-increase-number-of-threads.patch
index fcfa23a..8ef61c1 100644
--- a/tomcat/patches/perf/0005-bump-up-number-of-threads.patch
+++ b/tomcat/patches/perf/0006-increase-number-of-threads.patch
@@ -1,19 +1,20 @@
-From 350f89f7b0a43a9227a7c637d8a478d80743f124 Mon Sep 17 00:00:00 2001
-From: Tomasz Grabiec <tgrab...@cloudius-systems.com>
-Date: Tue, 19 Nov 2013 20:26:48 +0100
-Subject: [PATCH 5/5] bump up number of threads
+From 10c379cba7dfb69ebc6db73cb98af65778f803be Mon Sep 17 00:00:00 2001
+From: geraldo netto <geraldone...@gmail.com>
+Date: Tue, 4 Sep 2018 13:10:07 -0300
+Subject: [PATCH 6/8] increase number of threads
+original patch from Tomasz Grabiec
-Signed-off-by: Tomasz Grabiec <tgrab...@cloudius-systems.com>
+Signed-off-by: geraldo netto <geraldone...@gmail.com>
---
conf/server.xml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/conf/server.xml b/conf/server.xml
-index ae4949a..cd04bc2 100644
+index 6fcd9c2..fefb906 100644
--- a/conf/server.xml
+++ b/conf/server.xml
-@@ -69,6 +69,8 @@
+@@ -68,6 +68,8 @@
-->
<Connector port="8081" protocol="HTTP/1.1"
connectionTimeout="20000"
@@ -23,5 +24,5 @@ index ae4949a..cd04bc2 100644
<!-- A "Connector" using the shared thread pool-->
<!--
--
-1.8.1.2
+2.17.1
diff --git a/tomcat/patches/perf/0007-Use-bio-connector-explicitly.patch
b/tomcat/patches/perf/0007-force-HTTP-NIO-connector.patch
similarity index 53%
rename from tomcat/patches/perf/0007-Use-bio-connector-explicitly.patch
rename to tomcat/patches/perf/0007-force-HTTP-NIO-connector.patch
index 8c94c70..5bed50e 100644
--- a/tomcat/patches/perf/0007-Use-bio-connector-explicitly.patch
+++ b/tomcat/patches/perf/0007-force-HTTP-NIO-connector.patch
@@ -1,25 +1,28 @@
-From 7fd558c61e1d5fd91d506e5346318b4bbcf19a5b Mon Sep 17 00:00:00 2001
-From: Asias He <as...@cloudius-systems.com>
-Date: Wed, 16 Jul 2014 10:14:37 +0800
-Subject: [PATCH 1/2] Use bio connector explicitly
+From a89d408a4cdfe114ac9ccfed7cd1952b20762f59 Mon Sep 17 00:00:00 2001
+From: geraldo netto <geraldone...@gmail.com>
+Date: Tue, 4 Sep 2018 13:13:09 -0300
+Subject: [PATCH 7/8] force HTTP NIO connector
+original patch from Asias He
+
+Signed-off-by: geraldo netto <geraldone...@gmail.com>
---
conf/server.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/conf/server.xml b/conf/server.xml
-index d5f8369..8f21a71 100644
+index fefb906..ec152fc 100644
--- a/conf/server.xml
+++ b/conf/server.xml
-@@ -67,7 +67,7 @@
+@@ -66,7 +66,7 @@
APR (HTTP/AJP) Connector: /docs/apr.html
- Define a non-SSL HTTP/1.1 Connector on port 8080
+ Define a non-SSL/TLS HTTP/1.1 Connector on port 8080
-->
- <Connector port="8081" protocol="HTTP/1.1"
-+ <Connector port="8081" protocol="org.apache.coyote.http11.Http11Protocol"
++ <Connector port="8081"
protocol="org.apache.coyote.http11.Http11NioProtocol"
connectionTimeout="20000"
maxThreads="800"
minSpareThreads="256"
--
-1.8.5.1
+2.17.1
diff --git a/tomcat/patches/perf/0008-Do-not-enable-AJP-connector.patch
b/tomcat/patches/perf/0008-disable-AJP-connector.patch
similarity index 59%
rename from tomcat/patches/perf/0008-Do-not-enable-AJP-connector.patch
rename to tomcat/patches/perf/0008-disable-AJP-connector.patch
index 2feaf11..68702bf 100644
--- a/tomcat/patches/perf/0008-Do-not-enable-AJP-connector.patch
+++ b/tomcat/patches/perf/0008-disable-AJP-connector.patch
@@ -1,17 +1,20 @@
-From 4252b1f642068aeb71482555586319d28c5e143d Mon Sep 17 00:00:00 2001
-From: Asias He <as...@cloudius-systems.com>
-Date: Wed, 16 Jul 2014 10:14:57 +0800
-Subject: [PATCH 2/2] Do not enable AJP connector
+From 5dcfd8914a6fa58d5dd217d060bc2abbc944d248 Mon Sep 17 00:00:00 2001
+From: geraldo netto <geraldone...@gmail.com>
+Date: Tue, 4 Sep 2018 13:15:17 -0300
+Subject: [PATCH 8/8] disable AJP connector
+original patch from Asias He
+
+Signed-off-by: geraldo netto <geraldone...@gmail.com>
---
conf/server.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/conf/server.xml b/conf/server.xml
-index 8f21a71..65bd09e 100644
+index ec152fc..a7d32a8 100644
--- a/conf/server.xml
+++ b/conf/server.xml
-@@ -91,7 +91,7 @@
+@@ -115,7 +115,7 @@
-->
<!-- Define an AJP 1.3 Connector on port 8009 -->
@@ -21,5 +24,5 @@ index 8f21a71..65bd09e 100644
<!-- An Engine represents the entry point (within Catalina) that processes
--
-1.8.5.1
+2.17.1
--
2.17.1
--
You received this message because you are subscribed to the Google Groups "OSv
Development" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to osv-dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
