Re: [tomcat] branch 9.0.x updated: Fix BZ66246 https://bz.apache.org/bugzilla/show_bug.cgi?id=66246

2022-08-31 Thread Han Li



> 2022年8月31日 14:28,Mark Thomas  写道:
> 
> On 31/08/2022 02:57, li...@apache.org wrote:
>> This is an automated email from the ASF dual-hosted git repository.
>> lihan 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 971038192b Fix BZ66246 
>> https://bz.apache.org/bugzilla/show_bug.cgi?id=66246
>> 971038192b is described below
>> commit 971038192b1d747810de71e4dac8559d4c04d7a3
>> Author: lihan 
>> AuthorDate: Wed Aug 31 09:56:36 2022 +0800
>> Fix BZ66246
>> https://bz.apache.org/bugzilla/show_bug.cgi?id=66246
>> ---
>>  java/org/apache/jasper/resources/LocalStrings.properties | 2 +-
>>  webapps/docs/changelog.xml   | 3 +++
>>  2 files changed, 4 insertions(+), 1 deletion(-)
>> diff --git a/java/org/apache/jasper/resources/LocalStrings.properties 
>> b/java/org/apache/jasper/resources/LocalStrings.properties
>> index 4339d968da..6e4496378f 100644
>> --- a/java/org/apache/jasper/resources/LocalStrings.properties
>> +++ b/java/org/apache/jasper/resources/LocalStrings.properties
>> @@ -389,7 +389,7 @@ jspc.webxml.footer=\n\
>>  \n\
>>  \n
>>  jspc.webxml.header=\n\
>> -http://xmlns.jcp.org/xml/ns/javaee"\n\
>> +http://xmlns.jcp.org/xml/ns/javaee"\n\
>>  \  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
>>  \  xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee\n\
>>  \  
>> http://xmlns.jcp.org/xml/ns/javaee/web-fragment_4_0.xsd"\n\
> 
> The schema location needs to be updated as well.

OK, I will update it later.

Han
> 
> Mark
> 
> 
>> diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
>> index 0831e26371..9322c11152 100644
>> --- a/webapps/docs/changelog.xml
>> +++ b/webapps/docs/changelog.xml
>> @@ -239,6 +239,9 @@
>>  type conversion fails during an EL arithmetic operation. This is an 
>> EL
>>  error so ELException seems more appropriate. (markt)
>>
>> +  
>> +66246: Fix JspC generates invalid web.xml due to 
>> incorrect header. (lihan)
>> +  
>>  
>>
>>
>> -
>> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
>> For additional commands, e-mail: dev-h...@tomcat.apache.org
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
> 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: [tomcat] branch 9.0.x updated: Fix BZ66246 https://bz.apache.org/bugzilla/show_bug.cgi?id=66246

2022-08-31 Thread Mark Thomas

On 31/08/2022 02:57, li...@apache.org wrote:

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

lihan 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 971038192b Fix BZ66246 
https://bz.apache.org/bugzilla/show_bug.cgi?id=66246
971038192b is described below

commit 971038192b1d747810de71e4dac8559d4c04d7a3
Author: lihan 
AuthorDate: Wed Aug 31 09:56:36 2022 +0800

 Fix BZ66246
 https://bz.apache.org/bugzilla/show_bug.cgi?id=66246
---
  java/org/apache/jasper/resources/LocalStrings.properties | 2 +-
  webapps/docs/changelog.xml   | 3 +++
  2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/jasper/resources/LocalStrings.properties 
b/java/org/apache/jasper/resources/LocalStrings.properties
index 4339d968da..6e4496378f 100644
--- a/java/org/apache/jasper/resources/LocalStrings.properties
+++ b/java/org/apache/jasper/resources/LocalStrings.properties
@@ -389,7 +389,7 @@ jspc.webxml.footer=\n\
  \n\
  \n
  jspc.webxml.header=\n\
-http://xmlns.jcp.org/xml/ns/javaee"\n\
+http://xmlns.jcp.org/xml/ns/javaee"\n\
  \  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
  \  xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee\n\
  \  
http://xmlns.jcp.org/xml/ns/javaee/web-fragment_4_0.xsd"\n\


The schema location needs to be updated as well.

Mark



diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 0831e26371..9322c11152 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -239,6 +239,9 @@
  type conversion fails during an EL arithmetic operation. This is an EL
  error so ELException seems more appropriate. (markt)

+  
+66246: Fix JspC generates invalid web.xml due to incorrect 
header. (lihan)
+  
  




-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org