[tomcat] branch BZ-63905/9.0.x created (now de12b4d)

classic Classic list List threaded Threaded
7 messages Options
Reply | Threaded
Open this post in threaded view
|

[tomcat] branch BZ-63905/9.0.x created (now de12b4d)

Michael Osipov
This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a change to branch BZ-63905/9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


      at de12b4d  BZ 63905: Clean up Tomcat CSS

This branch includes the following new commits:

     new de12b4d  BZ 63905: Clean up Tomcat CSS

The 1 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.



---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

[tomcat] 01/01: BZ 63905: Clean up Tomcat CSS

Michael Osipov
This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a commit to branch BZ-63905/9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit de12b4dac518f3b6a7d0a5c3b6c24eb80d1699e8
Author: Michael Osipov <[hidden email]>
AuthorDate: Thu Nov 7 22:21:27 2019 +0100

    BZ 63905: Clean up Tomcat CSS
   
    Remove duplication in Tomcat CSS which applies both ErrorReportValve and
    DefaultServlet as well as update incorrect documentation.
---
 java/org/apache/catalina/util/TomcatCSS.java | 16 +++++++---------
 webapps/docs/config/valve.xml                |  5 ++---
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/java/org/apache/catalina/util/TomcatCSS.java b/java/org/apache/catalina/util/TomcatCSS.java
index c4f6da3..93f15a9 100644
--- a/java/org/apache/catalina/util/TomcatCSS.java
+++ b/java/org/apache/catalina/util/TomcatCSS.java
@@ -22,15 +22,13 @@ package org.apache.catalina.util;
 public class TomcatCSS {
 
     public static final String TOMCAT_CSS =
-        "h1 {font-family:Tahoma,Arial,sans-serif;color:white;background-color:#525D76;font-size:22px;} " +
-        "h2 {font-family:Tahoma,Arial,sans-serif;color:white;background-color:#525D76;font-size:16px;} " +
-        "h3 {font-family:Tahoma,Arial,sans-serif;color:white;background-color:#525D76;font-size:14px;} " +
-        "body {font-family:Tahoma,Arial,sans-serif;color:black;background-color:white;} " +
-        "b {font-family:Tahoma,Arial,sans-serif;color:white;background-color:#525D76;} " +
-        "p {font-family:Tahoma,Arial,sans-serif;background:white;color:black;font-size:12px;} " +
+        "body {font-family:Tahoma,Arial,sans-serif;} " +
+        "h1, h2, h3, b {color:white;background-color:#525D76;} " +
+        "h1 {font-size:22px;} " +
+        "h2 {font-size:16px;} " +
+        "h3 {font-size:14px;} " +
+        "p {font-size:12px;} " +
         "a {color:black;} " +
-        "a.name {color:black;} " +
         ".line {height:1px;background-color:#525D76;border:none;}";
 
-
-}
\ No newline at end of file
+}
diff --git a/webapps/docs/config/valve.xml b/webapps/docs/config/valve.xml
index 5e05287..72f0584 100644
--- a/webapps/docs/config/valve.xml
+++ b/webapps/docs/config/valve.xml
@@ -1900,8 +1900,7 @@
     status codes and/or exception types.</p>
 
     <p><strong>NOTE:</strong> Disabling both showServerInfo and showReport will
-    only return the HTTP status code and remove all CSS from the default
-    response.</p>
+    only return the HTTP status code.</p>
 
   </subsection>
 
@@ -1922,7 +1921,7 @@
         <p>The location of the UTF-8 encoded HTML file to return for the HTTP
         error code represented by <code>nnn</code>. For example,
         <code>errorCode.404</code> specifies the file to return for an HTTP 404
-        error. The location may be relative or absolule. If relative, it must be
+        error. The location may be relative or absolute. If relative, it must be
         relative to <code>$CATALINA_BASE</code>. The special value of
         <code>errorCode.0</code> may be used to define a default error page to
         be used if no error page is defined for a status code. If no matching


---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

Re: [tomcat] branch BZ-63905/9.0.x created (now de12b4d)

Rémy Maucherat
In reply to this post by Michael Osipov
On Thu, Nov 7, 2019 at 10:22 PM <[hidden email]> wrote:
This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a change to branch BZ-63905/9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


      at de12b4d  BZ 63905: Clean up Tomcat CSS

This branch includes the following new commits:

     new de12b4d  BZ 63905: Clean up Tomcat CSS

The 1 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.

As has been voted by the community, please refrain from using branches for trivial reasons. Thanks.

Rémy

Reply | Threaded
Open this post in threaded view
|

Re: [tomcat] branch BZ-63905/9.0.x created (now de12b4d)

Michael Osipov
Am 2019-11-07 um 22:44 schrieb Rémy Maucherat:

> On Thu, Nov 7, 2019 at 10:22 PM <[hidden email]> wrote:
>
>> This is an automated email from the ASF dual-hosted git repository.
>>
>> michaelo pushed a change to branch BZ-63905/9.0.x
>> in repository https://gitbox.apache.org/repos/asf/tomcat.git.
>>
>>
>>        at de12b4d  BZ 63905: Clean up Tomcat CSS
>>
>> This branch includes the following new commits:
>>
>>       new de12b4d  BZ 63905: Clean up Tomcat CSS
>>
>> The 1 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.
>>
>
> As has been voted by the community, please refrain from using branches for
> trivial reasons. Thanks.

What is the trivial reason?

Citing yourself:

>
> So the community is rather split even if the result leans on the negative
> side, and many liked the idea of feature branches. I think it's not enough
> to completely forbid branch use beyond the main release branches.

Moreover, no one formally responded to your subsequent proposal.

I don't intend to push n commits to master for unfinished work. I am
truly convinced that you don't understand the purpose of feature
branches in a canonical repo. Your Git bits are limited to tomcat.git
only. Please take a look at other Git repos at ASF, e.g.,
https://github.com/apache/maven/branches/all.

Michael


---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

Re: [tomcat] branch BZ-63905/9.0.x created (now de12b4d)

Konstantin Kolinko
In reply to this post by Rémy Maucherat
пт, 8 нояб. 2019 г. в 00:44, Rémy Maucherat <[hidden email]>:

>
> On Thu, Nov 7, 2019 at 10:22 PM <[hidden email]> wrote:
>>
>> This is an automated email from the ASF dual-hosted git repository.
>>
>> michaelo pushed a change to branch BZ-63905/9.0.x
>> in repository https://gitbox.apache.org/repos/asf/tomcat.git.
>>
>>
>>       at de12b4d  BZ 63905: Clean up Tomcat CSS
>>
>> This branch includes the following new commits:
>>
>>      new de12b4d  BZ 63905: Clean up Tomcat CSS
>>
>> The 1 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.
>
>
> As has been voted by the community, please refrain from using branches for trivial reasons. Thanks.
>
> Rémy

Remy,

You are misinterpreting the results of the vote that you started.
The voices were split. There is no decisive result from that vote.

(I think further discussion belongs to that vote thread.)

Best regards,
Konstantin Kolinko

---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

Re: [tomcat] branch BZ-63905/9.0.x created (now de12b4d)

Rémy Maucherat
In reply to this post by Michael Osipov
On Thu, Nov 7, 2019 at 11:01 PM Michael Osipov <[hidden email]> wrote:
Am 2019-11-07 um 22:44 schrieb Rémy Maucherat:
> On Thu, Nov 7, 2019 at 10:22 PM <[hidden email]> wrote:
>
>> This is an automated email from the ASF dual-hosted git repository.
>>
>> michaelo pushed a change to branch BZ-63905/9.0.x
>> in repository https://gitbox.apache.org/repos/asf/tomcat.git.
>>
>>
>>        at de12b4d  BZ 63905: Clean up Tomcat CSS
>>
>> This branch includes the following new commits:
>>
>>       new de12b4d  BZ 63905: Clean up Tomcat CSS
>>
>> The 1 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.
>>
>
> As has been voted by the community, please refrain from using branches for
> trivial reasons. Thanks.

What is the trivial reason?

Citing yourself:

>
> So the community is rather split even if the result leans on the negative
> side, and many liked the idea of feature branches. I think it's not enough
> to completely forbid branch use beyond the main release branches.

Moreover, no one formally responded to your subsequent proposal.

So this means the middle ground solution isn't very interesting to people in this community, and custom branches are simply not allowed since the vote was negative.
 

I don't intend to push n commits to master for unfinished work. I am
truly convinced that you don't understand the purpose of feature
branches in a canonical repo. Your Git bits are limited to tomcat.git
only. Please take a look at other Git repos at ASF, e.g.,
https://github.com/apache/maven/branches/all.

It should be quite obvious different communities have different processes.

Your commit should be pushed to master, this is how it works in Tomcat since it is using a simple CTR process. Using a branch means this simple commit will now generate at least 4 commit emails, plus a useless redundant discussion about the process. Also, nobody will bother testing until it gets to master where the CTR rule will still apply even if you used a branch first.

Rémy

Reply | Threaded
Open this post in threaded view
|

Re: [tomcat] branch BZ-63905/9.0.x created (now de12b4d)

Rémy Maucherat
In reply to this post by Konstantin Kolinko
On Thu, Nov 7, 2019 at 11:21 PM Konstantin Kolinko <[hidden email]> wrote:
пт, 8 нояб. 2019 г. в 00:44, Rémy Maucherat <[hidden email]>:
>
> On Thu, Nov 7, 2019 at 10:22 PM <[hidden email]> wrote:
>>
>> This is an automated email from the ASF dual-hosted git repository.
>>
>> michaelo pushed a change to branch BZ-63905/9.0.x
>> in repository https://gitbox.apache.org/repos/asf/tomcat.git.
>>
>>
>>       at de12b4d  BZ 63905: Clean up Tomcat CSS
>>
>> This branch includes the following new commits:
>>
>>      new de12b4d  BZ 63905: Clean up Tomcat CSS
>>
>> The 1 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.
>
>
> As has been voted by the community, please refrain from using branches for trivial reasons. Thanks.
>
> Rémy

Remy,

You are misinterpreting the results of the vote that you started.
The voices were split. There is no decisive result from that vote.

(I think further discussion belongs to that vote thread.)

3 Yes and 4 No was the final tally, so it's quite split indeed as I noted, but it's still a no at the moment. I expected more discussion as well, but it hasn't happened yet, feel free to follow up there.

Rémy