Re: [tomcat] branch master updated: Add UDS test case
On Fri, Jan 22, 2021 at 9:31 AM Martin Grigorov
wrote:
> On Mon, Jan 18, 2021 at 1:07 PM wrote:
>
> > This is an automated email from the ASF dual-hosted git repository.
> >
> > remm pushed a commit to branch master
> > in repository https://gitbox.apache.org/repos/asf/tomcat.git
> >
> >
> > The following commit(s) were added to refs/heads/master by this push:
> > new 16e3ef4 Add UDS test case
> > new bda7cbb Merge branch 'master' of g...@github.com:
> > apache/tomcat.git
> > 16e3ef4 is described below
> >
> > commit 16e3ef43f2fd3aa4ac9dcf14a8e985ef0754022c
> > Author: remm
> > AuthorDate: Mon Jan 18 12:06:22 2021 +0100
> >
> > Add UDS test case
> >
> > And a Java 16 compat flag.
> > ---
> > java/org/apache/tomcat/util/compat/JreCompat.java | 9 +++
> > .../apache/tomcat/util/net/TestXxxEndpoint.java| 29
> > ++
> > 2 files changed, 38 insertions(+)
> >
> > diff --git a/java/org/apache/tomcat/util/compat/JreCompat.java
> > b/java/org/apache/tomcat/util/compat/JreCompat.java
> > index b8b3b48..d58c1a0 100644
> > --- a/java/org/apache/tomcat/util/compat/JreCompat.java
> > +++ b/java/org/apache/tomcat/util/compat/JreCompat.java
> > @@ -45,6 +45,7 @@ public class JreCompat {
> >
> > private static final JreCompat instance;
> > private static final boolean graalAvailable;
> > +private static final boolean jre16Available;
> > private static final boolean jre11Available;
> > private static final boolean jre9Available;
> > private static final StringManager sm =
> > StringManager.getManager(JreCompat.class);
> > @@ -69,12 +70,15 @@ public class JreCompat {
> > if (Jre16Compat.isSupported()) {
> > instance = new Jre16Compat();
> > jre9Available = true;
> > +jre16Available = true;
> > } else if (Jre9Compat.isSupported()) {
> > instance = new Jre9Compat();
> > jre9Available = true;
> > +jre16Available = false;
> > } else {
> > instance = new JreCompat();
> > jre9Available = false;
> > +jre16Available = false;
> > }
> > jre11Available = instance.jarFileRuntimeMajorVersion() >= 11;
> >
> > @@ -116,6 +120,11 @@ public class JreCompat {
> > }
> >
> >
> > +public static boolean isJre16Available() {
> > +return jre16Available;
> > +}
> > +
> > +
> > // Java 8 implementation of Java 9 methods
> >
> > /**
> > diff --git a/test/org/apache/tomcat/util/net/TestXxxEndpoint.java
> > b/test/org/apache/tomcat/util/net/TestXxxEndpoint.java
> > index 2db184f..12a4015 100644
> > --- a/test/org/apache/tomcat/util/net/TestXxxEndpoint.java
> > +++ b/test/org/apache/tomcat/util/net/TestXxxEndpoint.java
> > @@ -19,8 +19,12 @@ package org.apache.tomcat.util.net;
> > import java.io.File;
> > import java.net.InetAddress;
> > import java.net.ServerSocket;
> > +import java.net.SocketAddress;
> > +import java.nio.ByteBuffer;
> > +import java.nio.channels.SocketChannel;
> >
> > import org.junit.Assert;
> > +import org.junit.Assume;
> > import org.junit.Test;
> >
> > import org.apache.catalina.connector.Connector;
> > @@ -29,6 +33,7 @@ import org.apache.catalina.startup.TomcatBaseTest;
> > import org.apache.tomcat.jni.Error;
> > import org.apache.tomcat.jni.Library;
> > import org.apache.tomcat.jni.Pool;
> > +import org.apache.tomcat.util.compat.JreCompat;
> >
> > /**
> > * Test case for the Endpoint implementations. The testing framework
> will
> > ensure
> > @@ -206,4 +211,28 @@ public class TestXxxEndpoint extends TomcatBaseTest
> {
> > Assert.assertNull(e);
> > tomcat.getConnector().start();
> > }
> > +
> > +@Test
> > +public void testUnixDomainSocket() throws Exception {
> > +
> >
>
> maybe move Assume.assumeTrue("JDK 16 is
> required", JreCompat.isJre16Available()); here ? Before starting Tomcat
> instance
>
>
> > +Tomcat tomcat = getTomcatInstance();
> > +Connector c = tomcat.getConnector();
> > +Assume.assumeTrue("SSL renegotiation has to be supported for
> this
> > test",
> >
>
> Is this copy/paste error ?
> The SSL renegotiation message seems unrelated.
>
>
> > +c.getProtocolHandlerClassName().contains("Nio")
> > +&& JreCompat.isJre16Available());
> > +
> > +final String unixDomainSocketPath = "/tmp/testUnixDomainSocket";
> > +Assert.assertTrue(c.setProperty("unixDomainSocketPath",
> > unixDomainSocketPath));
> > +tomcat.start();
> > +
> > +SocketAddress sa =
> > JreCompat.getInstance().getUnixDomainSocketAddress(unixDomainSocketPath);
> > +ByteBuffer response = ByteBuffer.allocate(1024);
> > +try (SocketChannel socket =
> > JreCompat.getInstance().openUnixDomainSocketChannel()) {
> > +socket.connect(sa);
> > +socket.write(ByteBuffer.wrap("OPTIONS *
> > HTTP/1.0\r\n\r\n".getBytes()));
> >
>
> Is
Re: [tomcat] branch master updated: Happy New Year 2021
On Tue, Jan 19, 2021 at 7:55 PM Mark Thomas wrote:
> On 19/01/2021 17:26, Christopher Schultz wrote:
> > Mark,
> >
> > It seems like this could be easier if we defined a string constant or
> > two somewhere and referenced it from everywhere.
>
> Another of life's constants appears to be that there is an XKCD for
> every situation:
>
> https://xkcd.com/1205/
>
> Given how easy the IDE makes find and replace, I'm happy with the manual
> approach at the moment. But I won't complain if someone wants to make it
> easier.
>
> > For the JSP files, perhaps the Manager web application could stuff the
> > copyright notice into the servlet (application) context on startup and
> > the JSP could pull the values out and into the elements.
>
> Apart from the NOTICE files (which I think would have to stay manual)
> the rest are in strings so I think source code filtering might be
> another option.
>
Or just use LocalDate.now().getYear() ?
>
> Mark
>
> >
> > -chris
> >
> > On 1/17/21 12:51, ma...@apache.org wrote:
> >> This is an automated email from the ASF dual-hosted git repository.
> >>
> >> markt pushed a commit to branch master
> >> in repository https://gitbox.apache.org/repos/asf/tomcat.git
> >>
> >>
> >> The following commit(s) were added to refs/heads/master by this push:
> >> new c58fe9a Happy New Year 2021
> >> c58fe9a is described below
> >>
> >> commit c58fe9a378bb23ad202f91780b4cd936e6e8a3c5
> >> Author: Mark Thomas
> >> AuthorDate: Sun Jan 17 17:49:51 2021 +
> >>
> >> Happy New Year 2021
> >> ---
> >> NOTICE | 2 +-
> >> java/org/apache/catalina/manager/Constants.java | 2 +-
> >> java/org/apache/catalina/manager/HTMLManagerServlet.java | 2 +-
> >> java/org/apache/catalina/manager/host/Constants.java | 2 +-
> >> modules/jdbc-pool/NOTICE | 2 +-
> >> webapps/manager/WEB-INF/jsp/connectorCerts.jsp | 2 +-
> >> webapps/manager/WEB-INF/jsp/connectorCiphers.jsp | 2 +-
> >> webapps/manager/WEB-INF/jsp/connectorTrustedCerts.jsp| 2 +-
> >> webapps/manager/WEB-INF/jsp/sessionDetail.jsp| 2 +-
> >> webapps/manager/WEB-INF/jsp/sessionsList.jsp | 2 +-
> >> 10 files changed, 10 insertions(+), 10 deletions(-)
> >>
> >> diff --git a/NOTICE b/NOTICE
> >> index 7480ff4..43bc6be 100644
> >> --- a/NOTICE
> >> +++ b/NOTICE
> >> @@ -1,5 +1,5 @@
> >> Apache Tomcat
> >> -Copyright 1999-2020 The Apache Software Foundation
> >> +Copyright 1999-2021 The Apache Software Foundation
> >> This product includes software developed at
> >> The Apache Software Foundation (https://www.apache.org/).
> >> diff --git a/java/org/apache/catalina/manager/Constants.java
> >> b/java/org/apache/catalina/manager/Constants.java
> >> index c17eafc..c92998b 100644
> >> --- a/java/org/apache/catalina/manager/Constants.java
> >> +++ b/java/org/apache/catalina/manager/Constants.java
> >> @@ -131,7 +131,7 @@ public class Constants {
> >> HTML_TAIL_SECTION =
> >> "\n" +
> >> "\n" +
> >> -" Copyright 1999-2020, Apache Software
> >> Foundation" +
> >> +" Copyright 1999-2021, Apache Software
> >> Foundation" +
> >> "\n" +
> >> "\n" +
> >> "\n" +
> >> diff --git a/java/org/apache/catalina/manager/HTMLManagerServlet.java
> >> b/java/org/apache/catalina/manager/HTMLManagerServlet.java
> >> index c2e5179..749ab83 100644
> >> --- a/java/org/apache/catalina/manager/HTMLManagerServlet.java
> >> +++ b/java/org/apache/catalina/manager/HTMLManagerServlet.java
> >> @@ -798,7 +798,7 @@ public final class HTMLManagerServlet extends
> >> ManagerServlet {
> >>*/
> >> @Override
> >> public String getServletInfo() {
> >> -return "HTMLManagerServlet, Copyright (c) 1999-2020, The
> >> Apache Software Foundation";
> >> +return "HTMLManagerServlet, Copyright (c) 1999-2021, The
> >> Apache Software Foundation";
> >> }
> >> /**
> >> diff --git a/java/org/apache/catalina/manager/host/Constants.java
> >> b/java/org/apache/catalina/manager/host/Constants.java
> >> index eccdead..3d768c1 100644
> >> --- a/java/org/apache/catalina/manager/host/Constants.java
> >> +++ b/java/org/apache/catalina/manager/host/Constants.java
> >> @@ -81,7 +81,7 @@ public class Constants {
> >> public static final String HTML_TAIL_SECTION =
> >> "\n" +
> >> "\n" +
> >> -" Copyright 1999-2020, Apache Software
> >> Foundation" +
> >> +" Copyright 1999-2021, Apache Software
> >> Foundation" +
> >> "\n" +
> >> "\n" +
> >> "\n" +
> >> diff --git a/modules/jdbc-pool/NOTICE b/modules/jdbc-pool/NOTICE
> >> index 0767528..ad8a327 100644
> >> --- a/modules/jdbc-pool/NOTICE
> >> +++ b/modules/jdbc-pool/NOTICE
> >> @@ -1,5 +1,5 @@
> >> Apache Tomcat JDBC Pool
> >> -Copyright 2008-2020 The Apache Software
Re: [tomcat] branch master updated: Add UDS test case
On Mon, Jan 18, 2021 at 1:07 PM wrote:
> This is an automated email from the ASF dual-hosted git repository.
>
> remm pushed a commit to branch master
> in repository https://gitbox.apache.org/repos/asf/tomcat.git
>
>
> The following commit(s) were added to refs/heads/master by this push:
> new 16e3ef4 Add UDS test case
> new bda7cbb Merge branch 'master' of g...@github.com:
> apache/tomcat.git
> 16e3ef4 is described below
>
> commit 16e3ef43f2fd3aa4ac9dcf14a8e985ef0754022c
> Author: remm
> AuthorDate: Mon Jan 18 12:06:22 2021 +0100
>
> Add UDS test case
>
> And a Java 16 compat flag.
> ---
> java/org/apache/tomcat/util/compat/JreCompat.java | 9 +++
> .../apache/tomcat/util/net/TestXxxEndpoint.java| 29
> ++
> 2 files changed, 38 insertions(+)
>
> diff --git a/java/org/apache/tomcat/util/compat/JreCompat.java
> b/java/org/apache/tomcat/util/compat/JreCompat.java
> index b8b3b48..d58c1a0 100644
> --- a/java/org/apache/tomcat/util/compat/JreCompat.java
> +++ b/java/org/apache/tomcat/util/compat/JreCompat.java
> @@ -45,6 +45,7 @@ public class JreCompat {
>
> private static final JreCompat instance;
> private static final boolean graalAvailable;
> +private static final boolean jre16Available;
> private static final boolean jre11Available;
> private static final boolean jre9Available;
> private static final StringManager sm =
> StringManager.getManager(JreCompat.class);
> @@ -69,12 +70,15 @@ public class JreCompat {
> if (Jre16Compat.isSupported()) {
> instance = new Jre16Compat();
> jre9Available = true;
> +jre16Available = true;
> } else if (Jre9Compat.isSupported()) {
> instance = new Jre9Compat();
> jre9Available = true;
> +jre16Available = false;
> } else {
> instance = new JreCompat();
> jre9Available = false;
> +jre16Available = false;
> }
> jre11Available = instance.jarFileRuntimeMajorVersion() >= 11;
>
> @@ -116,6 +120,11 @@ public class JreCompat {
> }
>
>
> +public static boolean isJre16Available() {
> +return jre16Available;
> +}
> +
> +
> // Java 8 implementation of Java 9 methods
>
> /**
> diff --git a/test/org/apache/tomcat/util/net/TestXxxEndpoint.java
> b/test/org/apache/tomcat/util/net/TestXxxEndpoint.java
> index 2db184f..12a4015 100644
> --- a/test/org/apache/tomcat/util/net/TestXxxEndpoint.java
> +++ b/test/org/apache/tomcat/util/net/TestXxxEndpoint.java
> @@ -19,8 +19,12 @@ package org.apache.tomcat.util.net;
> import java.io.File;
> import java.net.InetAddress;
> import java.net.ServerSocket;
> +import java.net.SocketAddress;
> +import java.nio.ByteBuffer;
> +import java.nio.channels.SocketChannel;
>
> import org.junit.Assert;
> +import org.junit.Assume;
> import org.junit.Test;
>
> import org.apache.catalina.connector.Connector;
> @@ -29,6 +33,7 @@ import org.apache.catalina.startup.TomcatBaseTest;
> import org.apache.tomcat.jni.Error;
> import org.apache.tomcat.jni.Library;
> import org.apache.tomcat.jni.Pool;
> +import org.apache.tomcat.util.compat.JreCompat;
>
> /**
> * Test case for the Endpoint implementations. The testing framework will
> ensure
> @@ -206,4 +211,28 @@ public class TestXxxEndpoint extends TomcatBaseTest {
> Assert.assertNull(e);
> tomcat.getConnector().start();
> }
> +
> +@Test
> +public void testUnixDomainSocket() throws Exception {
> +
>
maybe move Assume.assumeTrue("JDK 16 is
required", JreCompat.isJre16Available()); here ? Before starting Tomcat
instance
> +Tomcat tomcat = getTomcatInstance();
> +Connector c = tomcat.getConnector();
> +Assume.assumeTrue("SSL renegotiation has to be supported for this
> test",
>
Is this copy/paste error ?
The SSL renegotiation message seems unrelated.
> +c.getProtocolHandlerClassName().contains("Nio")
> +&& JreCompat.isJre16Available());
> +
> +final String unixDomainSocketPath = "/tmp/testUnixDomainSocket";
> +Assert.assertTrue(c.setProperty("unixDomainSocketPath",
> unixDomainSocketPath));
> +tomcat.start();
> +
> +SocketAddress sa =
> JreCompat.getInstance().getUnixDomainSocketAddress(unixDomainSocketPath);
> +ByteBuffer response = ByteBuffer.allocate(1024);
> +try (SocketChannel socket =
> JreCompat.getInstance().openUnixDomainSocketChannel()) {
> +socket.connect(sa);
> +socket.write(ByteBuffer.wrap("OPTIONS *
> HTTP/1.0\r\n\r\n".getBytes()));
>
Is HTTP/1.0 intentional ? Because the assertion below checks for 1.1
> +socket.read(response);
> +}
> +
> +Assert.assertTrue((new String(response.array(), 0,
> response.position()).startsWith("HTTP/1.1 200")));
> +}
> }
>
>
> -
> To
[tomcat] branch master updated: Fix message about UDS available
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 68746c4 Fix message about UDS available
68746c4 is described below
commit 68746c4aceb4f596f0ed3129668c6f63bcc0ed5a
Author: remm
AuthorDate: Fri Jan 22 10:41:20 2021 +0100
Fix message about UDS available
---
test/org/apache/tomcat/util/net/TestXxxEndpoint.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/test/org/apache/tomcat/util/net/TestXxxEndpoint.java
b/test/org/apache/tomcat/util/net/TestXxxEndpoint.java
index 12a4015..bc9b1f3 100644
--- a/test/org/apache/tomcat/util/net/TestXxxEndpoint.java
+++ b/test/org/apache/tomcat/util/net/TestXxxEndpoint.java
@@ -214,10 +214,9 @@ public class TestXxxEndpoint extends TomcatBaseTest {
@Test
public void testUnixDomainSocket() throws Exception {
-
Tomcat tomcat = getTomcatInstance();
Connector c = tomcat.getConnector();
-Assume.assumeTrue("SSL renegotiation has to be supported for this
test",
+Assume.assumeTrue("NIO Unix domain sockets have to be supported for
this test",
c.getProtocolHandlerClassName().contains("Nio")
&& JreCompat.isJre16Available());
-
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 message about UDS available
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 ae7361e Fix message about UDS available
ae7361e is described below
commit ae7361e30ae38bba998eacd340f8fdbbbf23a72f
Author: remm
AuthorDate: Fri Jan 22 10:41:20 2021 +0100
Fix message about UDS available
---
test/org/apache/tomcat/util/net/TestXxxEndpoint.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/test/org/apache/tomcat/util/net/TestXxxEndpoint.java
b/test/org/apache/tomcat/util/net/TestXxxEndpoint.java
index 4cbd8b2..9b9476f 100644
--- a/test/org/apache/tomcat/util/net/TestXxxEndpoint.java
+++ b/test/org/apache/tomcat/util/net/TestXxxEndpoint.java
@@ -203,10 +203,9 @@ public class TestXxxEndpoint extends TomcatBaseTest {
@Test
public void testUnixDomainSocket() throws Exception {
-
Tomcat tomcat = getTomcatInstance();
Connector c = tomcat.getConnector();
-Assume.assumeTrue("SSL renegotiation has to be supported for this
test",
+Assume.assumeTrue("NIO Unix domain sockets have to be supported for
this test",
c.getProtocolHandlerClassName().contains("Nio")
&& JreCompat.isJre16Available());
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Update to Commons Daemon 1.2.4
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 0c23b7e Update to Commons Daemon 1.2.4
0c23b7e is described below
commit 0c23b7edb38435c1a5872073173aefdc2645af8f
Author: Mark Thomas
AuthorDate: Fri Jan 22 09:57:32 2021 +
Update to Commons Daemon 1.2.4
---
build.properties.default | 12 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 9ffa4a2..4819376 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -171,20 +171,20 @@
nsis.nsdialogs.dll=${nsis.home}/Plugins/${nsis.arch.dir}nsDialogs.dll
nsis.loc=${base-sf.loc}/nsis/nsis-${nsis.version}.zip
# - Commons Daemon, version 1.2.0 or later -
-commons-daemon.version=1.2.3
+commons-daemon.version=1.2.4
-# checksum for commons-daemon-1.2.3-bin.tar.gz
+# checksum for commons-daemon-1.2.4-bin.tar.gz
commons-daemon.bin.checksum.enabled=true
commons-daemon.bin.checksum.algorithm=SHA-512
-commons-daemon.bin.checksum.value=0d7ced8f5d6fd3e8781146ee47c37046c6ccd2f364138f89d137eea5f0255e1b2afae5faf7005164c077087cb08203fd44478d5c14c57c7df449feb324443447
+commons-daemon.bin.checksum.value=66c33091fa51b6845ce45f326708419ef20ecd4a60bc175b94620a708f398843d9d53cfa8bfd2f5ab924c30b7034af602cb65e3e1cf164a5f687353f755919fe
-# checksums for commons-daemon-1.2.3-native-src.tar.gz,
commons-daemon-1.2.3-bin-windows.zip
+# checksums for commons-daemon-1.2.4-native-src.tar.gz,
commons-daemon-1.2.4-bin-windows.zip
commons-daemon.native.src.checksum.enabled=true
commons-daemon.native.src.checksum.algorithm=SHA-512
-commons-daemon.native.src.checksum.value=5f223ee3c133f673fe698f575d7cfb15f27fbbb8acf2e6db292e0e1690a20d636b35312187aa1091b315062f2434788eec9cde167e2ae1d7e673ebdd2ddb41f6
+commons-daemon.native.src.checksum.value=655f5b106238f6ac7f6e42dd32acfc553b302aa2c248b839528abdc9872bad5c80da3ef15399a7ff8c414427aafea9c4e9656b2887d98be4584f3926ac02ca23
commons-daemon.native.win.checksum.enabled=true
commons-daemon.native.win.checksum.algorithm=SHA-512
-commons-daemon.native.win.checksum.value=c79ee31a367addc5d49db474aabe084cebcd4f7f0f0f9ddc7999c02d4de5cd6ace6d5f55a230f399cfaaf780179b6f9808739efc7500b18c27cdb963daaef8d5
+commons-daemon.native.win.checksum.value=9c2bc010828826acbde5613aaf2de303471b33f2cb655b0ac91574e27123b8bcbe59e987d9e47d5835c171a5db31922b1458ed2e4fef840fd06c048f61f1e62b
commons-daemon.home=${base.path}/commons-daemon-${commons-daemon.version}
commons-daemon.jar=${commons-daemon.home}/commons-daemon-${commons-daemon.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 4ff2839..9553dad 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -233,6 +233,9 @@
Use java.nio.file.Path to test for one directory being a
sub-directory of another in a consistent way. (markt)
+
+Update to Commons Daemon 1.2.4. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Attempt to debug CI failures at GitHub
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 52612b8 Attempt to debug CI failures at GitHub
52612b8 is described below
commit 52612b8d850692a060d628b179eef89e64244f33
Author: Mark Thomas
AuthorDate: Fri Jan 22 10:33:02 2021 +
Attempt to debug CI failures at GitHub
---
test/org/apache/catalina/connector/TestSendFile.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/test/org/apache/catalina/connector/TestSendFile.java
b/test/org/apache/catalina/connector/TestSendFile.java
index 73db2a5..dc8ce08 100644
--- a/test/org/apache/catalina/connector/TestSendFile.java
+++ b/test/org/apache/catalina/connector/TestSendFile.java
@@ -80,7 +80,9 @@ public class TestSendFile extends TomcatBaseTest {
Assert.assertEquals(HttpServletResponse.SC_OK, rc);
System.out.println("Client received " + bc.getLength() + "
bytes in "
+ (System.currentTimeMillis() - start) + " ms.");
-Assert.assertEquals(EXPECTED_CONTENT_LENGTH * (i + 1L),
bc.getLength());
+Assert.assertEquals("Expected [" + EXPECTED_CONTENT_LENGTH *
(i + 1L) +
+"], was [" + bc.getLength() + "]",
+EXPECTED_CONTENT_LENGTH * (i + 1L), bc.getLength());
bc.recycle();
}
-
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: Attempt to debug CI failures at GitHub
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
The following commit(s) were added to refs/heads/9.0.x by this push:
new 642f031 Attempt to debug CI failures at GitHub
642f031 is described below
commit 642f0311a47743a55127ebe54ea7754da5fefbe1
Author: Mark Thomas
AuthorDate: Fri Jan 22 10:33:02 2021 +
Attempt to debug CI failures at GitHub
---
test/org/apache/catalina/connector/TestSendFile.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/test/org/apache/catalina/connector/TestSendFile.java
b/test/org/apache/catalina/connector/TestSendFile.java
index f71367f..6392d97 100644
--- a/test/org/apache/catalina/connector/TestSendFile.java
+++ b/test/org/apache/catalina/connector/TestSendFile.java
@@ -80,7 +80,9 @@ public class TestSendFile extends TomcatBaseTest {
Assert.assertEquals(HttpServletResponse.SC_OK, rc);
System.out.println("Client received " + bc.getLength() + "
bytes in "
+ (System.currentTimeMillis() - start) + " ms.");
-Assert.assertEquals(EXPECTED_CONTENT_LENGTH * (i + 1L),
bc.getLength());
+Assert.assertEquals("Expected [" + EXPECTED_CONTENT_LENGTH *
(i + 1L) +
+"], was [" + bc.getLength() + "]",
+EXPECTED_CONTENT_LENGTH * (i + 1L), bc.getLength());
bc.recycle();
}
-
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: Update to Commons Daemon 1.2.4
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
The following commit(s) were added to refs/heads/9.0.x by this push:
new 0f2e7e0 Update to Commons Daemon 1.2.4
0f2e7e0 is described below
commit 0f2e7e0b92d8e7203f0e4b08b226e8c84cd4f6dc
Author: Mark Thomas
AuthorDate: Fri Jan 22 09:57:32 2021 +
Update to Commons Daemon 1.2.4
---
build.properties.default | 12 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 4bb6b2f..96c46bd 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -171,20 +171,20 @@
nsis.nsdialogs.dll=${nsis.home}/Plugins/${nsis.arch.dir}nsDialogs.dll
nsis.loc=${base-sf.loc}/nsis/nsis-${nsis.version}.zip
# - Commons Daemon, version 1.2.0 or later -
-commons-daemon.version=1.2.3
+commons-daemon.version=1.2.4
-# checksum for commons-daemon-1.2.3-bin.tar.gz
+# checksum for commons-daemon-1.2.4-bin.tar.gz
commons-daemon.bin.checksum.enabled=true
commons-daemon.bin.checksum.algorithm=SHA-512
-commons-daemon.bin.checksum.value=0d7ced8f5d6fd3e8781146ee47c37046c6ccd2f364138f89d137eea5f0255e1b2afae5faf7005164c077087cb08203fd44478d5c14c57c7df449feb324443447
+commons-daemon.bin.checksum.value=66c33091fa51b6845ce45f326708419ef20ecd4a60bc175b94620a708f398843d9d53cfa8bfd2f5ab924c30b7034af602cb65e3e1cf164a5f687353f755919fe
-# checksums for commons-daemon-1.2.3-native-src.tar.gz,
commons-daemon-1.2.3-bin-windows.zip
+# checksums for commons-daemon-1.2.4-native-src.tar.gz,
commons-daemon-1.2.4-bin-windows.zip
commons-daemon.native.src.checksum.enabled=true
commons-daemon.native.src.checksum.algorithm=SHA-512
-commons-daemon.native.src.checksum.value=5f223ee3c133f673fe698f575d7cfb15f27fbbb8acf2e6db292e0e1690a20d636b35312187aa1091b315062f2434788eec9cde167e2ae1d7e673ebdd2ddb41f6
+commons-daemon.native.src.checksum.value=655f5b106238f6ac7f6e42dd32acfc553b302aa2c248b839528abdc9872bad5c80da3ef15399a7ff8c414427aafea9c4e9656b2887d98be4584f3926ac02ca23
commons-daemon.native.win.checksum.enabled=true
commons-daemon.native.win.checksum.algorithm=SHA-512
-commons-daemon.native.win.checksum.value=c79ee31a367addc5d49db474aabe084cebcd4f7f0f0f9ddc7999c02d4de5cd6ace6d5f55a230f399cfaaf780179b6f9808739efc7500b18c27cdb963daaef8d5
+commons-daemon.native.win.checksum.value=9c2bc010828826acbde5613aaf2de303471b33f2cb655b0ac91574e27123b8bcbe59e987d9e47d5835c171a5db31922b1458ed2e4fef840fd06c048f61f1e62b
commons-daemon.home=${base.path}/commons-daemon-${commons-daemon.version}
commons-daemon.jar=${commons-daemon.home}/commons-daemon-${commons-daemon.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index c9010e8..aa1dd31 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -233,6 +233,9 @@
Use java.nio.file.Path to test for one directory being a
sub-directory of another in a consistent way. (markt)
+
+Update to Commons Daemon 1.2.4. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot exception in on tomcat-7-trunk
The Buildbot has detected a build exception on builder tomcat-7-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-7-trunk/builds/1841 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' triggered this build Build Source Stamp: [branch 7.0.x] e03cd0f26eb964a2df049d3d256f46529cde8b9c Blamelist: Mark Thomas BUILD FAILED: exception compile upload_2 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot exception in on tomcat-85-trunk
The Buildbot has detected a build exception on builder tomcat-85-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-85-trunk/builds/2592 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-85-commit' triggered this build Build Source Stamp: [branch 8.5.x] 5c73b8a8857cd1b7dc2908cbf1cbb1f8db4fad7f Blamelist: Mark Thomas BUILD FAILED: exception compile upload_2 Sincerely, -The Buildbot - 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: BZ 64872 Optimised StringInterpreter for Enum Values
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
The following commit(s) were added to refs/heads/9.0.x by this push:
new 6fc94f2 BZ 64872 Optimised StringInterpreter for Enum Values
6fc94f2 is described below
commit 6fc94f243c4a5890b2d679acd5b7fa0611d7985d
Author: Mark Thomas
AuthorDate: Wed Nov 25 12:15:23 2020 +
BZ 64872 Optimised StringInterpreter for Enum Values
This is not strictly spec compliant hence it isn't enabled by
default but it should work for many applicaitons.
https://bz.apache.org/bugzilla/show_bug.cgi?id=64872
---
.../optimizations/StringInterpreterEnum.java | 37 +++
.../optimizations/TestELInterpreterTagSetters.java | 3 +
.../TestStringInterpreterTagSetters.java | 120 +
test/webapp/bug6/bug64872-timeunit.jsp | 3 -
...ug64872-timeunit.jsp => bug64872b-timeunit.jsp} | 10 +-
webapps/docs/jasper-howto.xml | 7 ++
6 files changed, 170 insertions(+), 10 deletions(-)
diff --git a/java/org/apache/jasper/optimizations/StringInterpreterEnum.java
b/java/org/apache/jasper/optimizations/StringInterpreterEnum.java
new file mode 100644
index 000..b85f339
--- /dev/null
+++ b/java/org/apache/jasper/optimizations/StringInterpreterEnum.java
@@ -0,0 +1,37 @@
+/*
+ * 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.
+ */
+package org.apache.jasper.optimizations;
+
+import
org.apache.jasper.compiler.StringInterpreterFactory.DefaultStringInterpreter;
+
+/**
+ * Provides an optimised conversion of string values to Enums. It bypasses the
+ * check for registered PropertyEditor.
+ */
+public class StringInterpreterEnum extends DefaultStringInterpreter {
+
+@Override
+protected String coerceToOtherType(Class c, String s, boolean
isNamedAttribute) {
+if (c.isEnum() && !isNamedAttribute) {
+@SuppressWarnings({ "unchecked", "rawtypes" })
+Enum enumValue = Enum.valueOf((Class) c, s);
+return c.getName() + "." + enumValue.name();
+}
+
+return null;
+}
+}
diff --git
a/test/org/apache/jasper/optimizations/TestELInterpreterTagSetters.java
b/test/org/apache/jasper/optimizations/TestELInterpreterTagSetters.java
index 5a6cf8f..ac66ddd 100644
--- a/test/org/apache/jasper/optimizations/TestELInterpreterTagSetters.java
+++ b/test/org/apache/jasper/optimizations/TestELInterpreterTagSetters.java
@@ -40,6 +40,7 @@ import org.apache.catalina.startup.TomcatBaseTest;
import org.apache.jasper.JspCompilationContext;
import org.apache.jasper.compiler.ELInterpreter;
import org.apache.jasper.compiler.ELInterpreterFactory;
+import org.apache.jasper.compiler.StringInterpreter;
import org.apache.tomcat.util.buf.ByteChunk;
@RunWith(Parameterized.class)
@@ -112,6 +113,8 @@ public class TestELInterpreterTagSetters extends
TomcatBaseTest {
Context ctxt = (Context) tomcat.getHost().findChild("/test");
ctxt.getServletContext().setAttribute(ELInterpreter.class.getCanonicalName(),
elInterpreter);
+
ctxt.getServletContext().setAttribute(StringInterpreter.class.getCanonicalName(),
new StringInterpreterEnum());
+
ByteChunk bc = getUrl("http://localhost:; + getPort() +
"/test/bug6/bug64872-" + target + ".jsp");
String actual = bc.toString();
diff --git
a/test/org/apache/jasper/optimizations/TestStringInterpreterTagSetters.java
b/test/org/apache/jasper/optimizations/TestStringInterpreterTagSetters.java
new file mode 100644
index 000..3a75b75
--- /dev/null
+++ b/test/org/apache/jasper/optimizations/TestStringInterpreterTagSetters.java
@@ -0,0 +1,120 @@
+/*
+ * 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
+ *
+ *
[tomcat] branch 8.5.x updated: Attempt to debug CI failures at GitHub
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 5c73b8a Attempt to debug CI failures at GitHub
5c73b8a is described below
commit 5c73b8a8857cd1b7dc2908cbf1cbb1f8db4fad7f
Author: Mark Thomas
AuthorDate: Fri Jan 22 10:33:02 2021 +
Attempt to debug CI failures at GitHub
---
test/org/apache/catalina/connector/TestSendFile.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/test/org/apache/catalina/connector/TestSendFile.java
b/test/org/apache/catalina/connector/TestSendFile.java
index 688bcbd..d01867d 100644
--- a/test/org/apache/catalina/connector/TestSendFile.java
+++ b/test/org/apache/catalina/connector/TestSendFile.java
@@ -80,7 +80,9 @@ public class TestSendFile extends TomcatBaseTest {
Assert.assertEquals(HttpServletResponse.SC_OK, rc);
System.out.println("Client received " + bc.getLength() + "
bytes in "
+ (System.currentTimeMillis() - start) + " ms.");
-Assert.assertEquals(EXPECTED_CONTENT_LENGTH * (i + 1L),
bc.getLength());
+Assert.assertEquals("Expected [" + EXPECTED_CONTENT_LENGTH *
(i + 1L) +
+"], was [" + bc.getLength() + "]",
+EXPECTED_CONTENT_LENGTH * (i + 1L), bc.getLength());
bc.recycle();
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 7.0.x updated: Attempt to debug CI failures at GitHub
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/7.0.x by this push:
new e03cd0f Attempt to debug CI failures at GitHub
e03cd0f is described below
commit e03cd0f26eb964a2df049d3d256f46529cde8b9c
Author: Mark Thomas
AuthorDate: Fri Jan 22 10:33:02 2021 +
Attempt to debug CI failures at GitHub
---
test/org/apache/catalina/connector/TestSendFile.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/test/org/apache/catalina/connector/TestSendFile.java
b/test/org/apache/catalina/connector/TestSendFile.java
index a4003cb..ede2121 100644
--- a/test/org/apache/catalina/connector/TestSendFile.java
+++ b/test/org/apache/catalina/connector/TestSendFile.java
@@ -80,7 +80,9 @@ public class TestSendFile extends TomcatBaseTest {
Assert.assertEquals(HttpServletResponse.SC_OK, rc);
System.out.println("Client received " + bc.getLength() + "
bytes in "
+ (System.currentTimeMillis() - start) + " ms.");
-Assert.assertEquals(EXPECTED_CONTENT_LENGTH * (i + 1L),
bc.getLength());
+Assert.assertEquals("Expected [" + EXPECTED_CONTENT_LENGTH *
(i + 1L) +
+"], was [" + bc.getLength() + "]",
+EXPECTED_CONTENT_LENGTH * (i + 1L), bc.getLength());
bc.recycle();
}
-
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: New StringInterpreter to allow optimised String -> Type conversions
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
The following commit(s) were added to refs/heads/9.0.x by this push:
new de149b4 New StringInterpreter to allow optimised String -> Type
conversions
de149b4 is described below
commit de149b490976caec050e22aeb9f53a993b1f68c5
Author: Mark Thomas
AuthorDate: Fri Jan 22 11:22:09 2021 +
New StringInterpreter to allow optimised String -> Type conversions
This is the additional hook required to provide the optimisations
proposed in https://bz.apache.org/bugzilla/show_bug.cgi?id=64872
---
java/org/apache/jasper/compiler/Generator.java | 91 ++-
.../apache/jasper/compiler/StringInterpreter.java | 49 ++
.../jasper/compiler/StringInterpreterFactory.java | 178 +
.../jasper/resources/LocalStrings.properties | 1 +
webapps/docs/changelog.xml | 6 +
5 files changed, 248 insertions(+), 77 deletions(-)
diff --git a/java/org/apache/jasper/compiler/Generator.java
b/java/org/apache/jasper/compiler/Generator.java
index 7f8f7d6..7be9edb 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -129,6 +129,8 @@ class Generator {
private final ELInterpreter elInterpreter;
+private final StringInterpreter stringInterpreter;
+
/**
* @param s
*the input string
@@ -3022,7 +3024,7 @@ class Generator {
} else if (attr.isNamedAttribute()) {
if (!n.checkIfAttributeIsJspFragment(attr.getName())
&& !attr.isDynamic()) {
-attrValue = convertString(c[0], attrValue, localName,
+attrValue = stringInterpreter.convertString(c[0],
attrValue, localName,
handlerInfo.getPropertyEditorClass(localName),
true);
}
} else if (attr.isELInterpreterInput()) {
@@ -3125,7 +3127,7 @@ class Generator {
this.isTagFile, attrValue, c[0], mapName);
}
} else {
-attrValue = convertString(c[0], attrValue, localName,
+attrValue = stringInterpreter.convertString(c[0], attrValue,
localName,
handlerInfo.getPropertyEditorClass(localName), false);
}
return attrValue;
@@ -3271,81 +3273,6 @@ class Generator {
}
/*
- * @param c
- * The target class to which to coerce the given string
- * @param s
- * The string value
- * @param attrName
- * The name of the attribute whose value is being supplied
- * @param propEditorClass
- * The property editor for the given attribute
- * @param isNamedAttribute
- * true if the given attribute is a named attribute (that
- * is, specified using the jsp:attribute standard action),
- * and false otherwise
- */
-private String convertString(Class c, String s, String attrName,
-Class propEditorClass, boolean isNamedAttribute) {
-
-String quoted = s;
-if (!isNamedAttribute) {
-quoted = quote(s);
-}
-
-if (propEditorClass != null) {
-String className = c.getCanonicalName();
-return "("
-+ className
-+
")org.apache.jasper.runtime.JspRuntimeLibrary.getValueFromBeanInfoPropertyEditor("
-+ className + ".class, \"" + attrName + "\", " + quoted
-+ ", " + propEditorClass.getCanonicalName() +
".class)";
-} else if (c == String.class) {
-return quoted;
-} else if (c == boolean.class) {
-return JspUtil.coerceToPrimitiveBoolean(s, isNamedAttribute);
-} else if (c == Boolean.class) {
-return JspUtil.coerceToBoolean(s, isNamedAttribute);
-} else if (c == byte.class) {
-return JspUtil.coerceToPrimitiveByte(s, isNamedAttribute);
-} else if (c == Byte.class) {
-return JspUtil.coerceToByte(s, isNamedAttribute);
-} else if (c == char.class) {
-return JspUtil.coerceToChar(s, isNamedAttribute);
-} else if (c == Character.class) {
-return JspUtil.coerceToCharacter(s, isNamedAttribute);
-} else if (c == double.class) {
-return JspUtil.coerceToPrimitiveDouble(s, isNamedAttribute);
-} else if (c == Double.class) {
-return JspUtil.coerceToDouble(s, isNamedAttribute);
-} else if (c == float.class) {
-return
[tomcat] branch master updated: New StringInterpreter to allow optimised String -> Type conversions
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 03a3edf New StringInterpreter to allow optimised String -> Type
conversions
03a3edf is described below
commit 03a3edf5572e8336321d49bb3db3f4d663b7f935
Author: Mark Thomas
AuthorDate: Fri Jan 22 11:22:09 2021 +
New StringInterpreter to allow optimised String -> Type conversions
This is the additional hook required to provide the optimisations
proposed in https://bz.apache.org/bugzilla/show_bug.cgi?id=64872
---
java/org/apache/jasper/compiler/Generator.java | 91 ++-
.../apache/jasper/compiler/StringInterpreter.java | 49 ++
.../jasper/compiler/StringInterpreterFactory.java | 178 +
.../jasper/resources/LocalStrings.properties | 1 +
webapps/docs/changelog.xml | 6 +
5 files changed, 248 insertions(+), 77 deletions(-)
diff --git a/java/org/apache/jasper/compiler/Generator.java
b/java/org/apache/jasper/compiler/Generator.java
index 21593d8..efd5485 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -113,6 +113,8 @@ class Generator {
private final ELInterpreter elInterpreter;
+private final StringInterpreter stringInterpreter;
+
/**
* @param s
*the input string
@@ -3009,7 +3011,7 @@ class Generator {
} else if (attr.isNamedAttribute()) {
if (!n.checkIfAttributeIsJspFragment(attr.getName())
&& !attr.isDynamic()) {
-attrValue = convertString(c[0], attrValue, localName,
+attrValue = stringInterpreter.convertString(c[0],
attrValue, localName,
handlerInfo.getPropertyEditorClass(localName),
true);
}
} else if (attr.isELInterpreterInput()) {
@@ -3112,7 +3114,7 @@ class Generator {
this.isTagFile, attrValue, c[0], mapName);
}
} else {
-attrValue = convertString(c[0], attrValue, localName,
+attrValue = stringInterpreter.convertString(c[0], attrValue,
localName,
handlerInfo.getPropertyEditorClass(localName), false);
}
return attrValue;
@@ -3258,81 +3260,6 @@ class Generator {
}
/*
- * @param c
- * The target class to which to coerce the given string
- * @param s
- * The string value
- * @param attrName
- * The name of the attribute whose value is being supplied
- * @param propEditorClass
- * The property editor for the given attribute
- * @param isNamedAttribute
- * true if the given attribute is a named attribute (that
- * is, specified using the jsp:attribute standard action),
- * and false otherwise
- */
-private String convertString(Class c, String s, String attrName,
-Class propEditorClass, boolean isNamedAttribute) {
-
-String quoted = s;
-if (!isNamedAttribute) {
-quoted = quote(s);
-}
-
-if (propEditorClass != null) {
-String className = c.getCanonicalName();
-return "("
-+ className
-+
")org.apache.jasper.runtime.JspRuntimeLibrary.getValueFromBeanInfoPropertyEditor("
-+ className + ".class, \"" + attrName + "\", " + quoted
-+ ", " + propEditorClass.getCanonicalName() +
".class)";
-} else if (c == String.class) {
-return quoted;
-} else if (c == boolean.class) {
-return JspUtil.coerceToPrimitiveBoolean(s, isNamedAttribute);
-} else if (c == Boolean.class) {
-return JspUtil.coerceToBoolean(s, isNamedAttribute);
-} else if (c == byte.class) {
-return JspUtil.coerceToPrimitiveByte(s, isNamedAttribute);
-} else if (c == Byte.class) {
-return JspUtil.coerceToByte(s, isNamedAttribute);
-} else if (c == char.class) {
-return JspUtil.coerceToChar(s, isNamedAttribute);
-} else if (c == Character.class) {
-return JspUtil.coerceToCharacter(s, isNamedAttribute);
-} else if (c == double.class) {
-return JspUtil.coerceToPrimitiveDouble(s, isNamedAttribute);
-} else if (c == Double.class) {
-return JspUtil.coerceToDouble(s, isNamedAttribute);
-} else if (c == float.class) {
-return
[tomcat] branch 9.0.x updated: Fix backport (Jakarta -> Java EE)
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
The following commit(s) were added to refs/heads/9.0.x by this push:
new 2045758 Fix backport (Jakarta -> Java EE)
2045758 is described below
commit 2045758d71aa199283cc85a9aa3303e02329c56c
Author: Mark Thomas
AuthorDate: Fri Jan 22 11:50:23 2021 +
Fix backport (Jakarta -> Java EE)
---
java/org/apache/jasper/compiler/StringInterpreterFactory.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/jasper/compiler/StringInterpreterFactory.java
b/java/org/apache/jasper/compiler/StringInterpreterFactory.java
index b035752..1e5bcc5 100644
--- a/java/org/apache/jasper/compiler/StringInterpreterFactory.java
+++ b/java/org/apache/jasper/compiler/StringInterpreterFactory.java
@@ -16,7 +16,7 @@
*/
package org.apache.jasper.compiler;
-import jakarta.servlet.ServletContext;
+import javax.servlet.ServletContext;
/**
* Provides {@link StringInterpreter} instances for JSP compilation.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Remove trailing space
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/master by this push: new db727e9 Remove trailing space db727e9 is described below commit db727e926b2746496f69088558bad5cff726f46d Author: Mark Thomas AuthorDate: Fri Jan 22 12:47:35 2021 + Remove trailing space --- webapps/docs/jasper-howto.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/webapps/docs/jasper-howto.xml b/webapps/docs/jasper-howto.xml index a9c3750..9ad677b 100644 --- a/webapps/docs/jasper-howto.xml +++ b/webapps/docs/jasper-howto.xml @@ -496,7 +496,7 @@ alternative EL interpreter. A alternative interpreter primarily targetting tag settings is provided at org.apache.jasper.optimizations.ELInterpreterTagSetters. See the javadoc for details of the optimisations and the impact they have on -specification compliance. +specification compliance. @@ -504,7 +504,8 @@ An extension point is also provided for coercion of String values to Enums. It is provided at org.apache.jasper.optimizations.StringInterpreterEnum. See the javadoc for details of the optimisations and the impact they have on -specification compliance. +specification compliance. + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/02: BZ 64872 Optimised ELInterpreter for literal booleans & strings
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit faa236fab5f93f8bbb93dd20e6dfd25907cd2ebb
Author: Mark Thomas
AuthorDate: Mon Nov 16 17:27:27 2020 +
BZ 64872 Optimised ELInterpreter for literal booleans & strings
This is not strictly spec compliant hence it isn't enabled by
default but it should work for many applicaitons.
https://bz.apache.org/bugzilla/show_bug.cgi?id=64872
---
.../optimizations/ELInterpreterTagSetters.java | 268 ++
.../optimizations/TestELInterpreterTagSetters.java | 547 +
test/webapp/WEB-INF/tag-setters.tld| 245 +
test/webapp/bug6/bug64872-bigdecimal.jsp | 30 ++
test/webapp/bug6/bug64872-biginteger.jsp | 30 ++
test/webapp/bug6/bug64872-boolean.jsp | 37 ++
test/webapp/bug6/bug64872-byte.jsp | 32 ++
test/webapp/bug6/bug64872-character.jsp| 30 ++
test/webapp/bug6/bug64872-double.jsp | 30 ++
test/webapp/bug6/bug64872-float.jsp| 30 ++
test/webapp/bug6/bug64872-integer.jsp | 30 ++
test/webapp/bug6/bug64872-long.jsp | 30 ++
.../webapp/bug6/bug64872-primitive-boolean.jsp | 37 ++
test/webapp/bug6/bug64872-primitive-byte.jsp | 32 ++
.../bug6/bug64872-primitive-character.jsp | 30 ++
test/webapp/bug6/bug64872-primitive-double.jsp | 30 ++
test/webapp/bug6/bug64872-primitive-float.jsp | 30 ++
.../webapp/bug6/bug64872-primitive-integer.jsp | 30 ++
test/webapp/bug6/bug64872-primitive-long.jsp | 30 ++
test/webapp/bug6/bug64872-primitive-short.jsp | 30 ++
test/webapp/bug6/bug64872-short.jsp| 30 ++
test/webapp/bug6/bug64872-string.jsp | 33 ++
test/webapp/bug6/bug64872-timeunit.jsp | 33 ++
webapps/docs/jasper-howto.xml | 7 +-
24 files changed, 1690 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/jasper/optimizations/ELInterpreterTagSetters.java
b/java/org/apache/jasper/optimizations/ELInterpreterTagSetters.java
new file mode 100644
index 000..38feb96
--- /dev/null
+++ b/java/org/apache/jasper/optimizations/ELInterpreterTagSetters.java
@@ -0,0 +1,268 @@
+/*
+ * 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.
+ */
+package org.apache.jasper.optimizations;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.el.ELResolver;
+
+import org.apache.jasper.JspCompilationContext;
+import org.apache.jasper.compiler.ELInterpreter;
+import org.apache.jasper.compiler.JspUtil;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
+
+/**
+ * A non-specification compliant {@link ELInterpreter} that optimizes a subset
+ * of setters for tag attributes.
+ *
+ * The cases optimized by this implementation are:
+ *
+ * expressions that are solely a literal boolean
+ * expressions that are solely a constant string used (with coercion where
+ * necessary) with a setter that accepts:
+ *
+ * boolean / Boolean
+ * char / Character
+ * BigDecimal
+ * long / Long
+ * int / Integer
+ * short / Short
+ * byte / Byte
+ * double / Double
+ * float / Float
+ * BigInteger
+ * Enum
+ * String
+ *
+ *
+ * The specification compliance issue is that it essentially skips the first
+ * three {@link ELResolver}s listed in section JSP.2.9 and effectively hard
+ * codes the use of the 4th {@link ELResolver} in that list.
+ *
+ * @see "https://bz.apache.org/bugzilla/show_bug.cgi?id=64872;
+ */
+public class ELInterpreterTagSetters implements ELInterpreter {
+
+// Can't be static
+private final Log log = LogFactory.getLog(ELInterpreterTagSetters.class);
+
+private final Pattern PATTERN_BOOLEAN =
Pattern.compile("[$][{]([\"']?)(true|false)\\1[}]");
+private final Pattern PATTERN_STRING_CONSTANT =
Pattern.compile("[$][{]([\"'])(\\w+)\\1[}]");
+private final Pattern PATTERN_NUMERIC =
[tomcat] 02/02: BZ 64872 Optimised StringInterpreter for Enum Values
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 616949edde000602ba52368bc935207f85f07af7
Author: Mark Thomas
AuthorDate: Wed Nov 25 12:15:23 2020 +
BZ 64872 Optimised StringInterpreter for Enum Values
This is not strictly spec compliant hence it isn't enabled by
default but it should work for many applicaitons.
https://bz.apache.org/bugzilla/show_bug.cgi?id=64872
---
.../optimizations/StringInterpreterEnum.java | 37 +++
.../optimizations/TestELInterpreterTagSetters.java | 3 +
.../TestStringInterpreterTagSetters.java | 120 +
test/webapp/bug6/bug64872-timeunit.jsp | 3 -
...ug64872-timeunit.jsp => bug64872b-timeunit.jsp} | 10 +-
webapps/docs/jasper-howto.xml | 7 ++
6 files changed, 170 insertions(+), 10 deletions(-)
diff --git a/java/org/apache/jasper/optimizations/StringInterpreterEnum.java
b/java/org/apache/jasper/optimizations/StringInterpreterEnum.java
new file mode 100644
index 000..b85f339
--- /dev/null
+++ b/java/org/apache/jasper/optimizations/StringInterpreterEnum.java
@@ -0,0 +1,37 @@
+/*
+ * 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.
+ */
+package org.apache.jasper.optimizations;
+
+import
org.apache.jasper.compiler.StringInterpreterFactory.DefaultStringInterpreter;
+
+/**
+ * Provides an optimised conversion of string values to Enums. It bypasses the
+ * check for registered PropertyEditor.
+ */
+public class StringInterpreterEnum extends DefaultStringInterpreter {
+
+@Override
+protected String coerceToOtherType(Class c, String s, boolean
isNamedAttribute) {
+if (c.isEnum() && !isNamedAttribute) {
+@SuppressWarnings({ "unchecked", "rawtypes" })
+Enum enumValue = Enum.valueOf((Class) c, s);
+return c.getName() + "." + enumValue.name();
+}
+
+return null;
+}
+}
diff --git
a/test/org/apache/jasper/optimizations/TestELInterpreterTagSetters.java
b/test/org/apache/jasper/optimizations/TestELInterpreterTagSetters.java
index 5a6cf8f..ac66ddd 100644
--- a/test/org/apache/jasper/optimizations/TestELInterpreterTagSetters.java
+++ b/test/org/apache/jasper/optimizations/TestELInterpreterTagSetters.java
@@ -40,6 +40,7 @@ import org.apache.catalina.startup.TomcatBaseTest;
import org.apache.jasper.JspCompilationContext;
import org.apache.jasper.compiler.ELInterpreter;
import org.apache.jasper.compiler.ELInterpreterFactory;
+import org.apache.jasper.compiler.StringInterpreter;
import org.apache.tomcat.util.buf.ByteChunk;
@RunWith(Parameterized.class)
@@ -112,6 +113,8 @@ public class TestELInterpreterTagSetters extends
TomcatBaseTest {
Context ctxt = (Context) tomcat.getHost().findChild("/test");
ctxt.getServletContext().setAttribute(ELInterpreter.class.getCanonicalName(),
elInterpreter);
+
ctxt.getServletContext().setAttribute(StringInterpreter.class.getCanonicalName(),
new StringInterpreterEnum());
+
ByteChunk bc = getUrl("http://localhost:; + getPort() +
"/test/bug6/bug64872-" + target + ".jsp");
String actual = bc.toString();
diff --git
a/test/org/apache/jasper/optimizations/TestStringInterpreterTagSetters.java
b/test/org/apache/jasper/optimizations/TestStringInterpreterTagSetters.java
new file mode 100644
index 000..3a75b75
--- /dev/null
+++ b/test/org/apache/jasper/optimizations/TestStringInterpreterTagSetters.java
@@ -0,0 +1,120 @@
+/*
+ * 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
[tomcat] branch 8.5.x updated (01c08ff -> 616949e)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from 01c08ff New StringInterpreter to allow optimised String -> Type
conversions
new faa236f BZ 64872 Optimised ELInterpreter for literal booleans &
strings
new 616949e BZ 64872 Optimised StringInterpreter for Enum Values
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:
.../optimizations/ELInterpreterTagSetters.java | 268 ++
.../optimizations/StringInterpreterEnum.java} | 30 +-
.../optimizations/TestELInterpreterTagSetters.java | 550 +
.../TestStringInterpreterTagSetters.java | 120 +
test/webapp/WEB-INF/tag-setters.tld| 245 +
.../bug64872-bigdecimal.jsp} | 16 +-
.../bug64872-biginteger.jsp} | 16 +-
.../bug56147.jsp => bug6/bug64872-boolean.jsp} | 28 +-
.../{bug46381.jsp => bug6/bug64872-byte.jsp} | 18 +-
.../bug64872-character.jsp}| 16 +-
.../{bug46381.jsp => bug6/bug64872-double.jsp} | 16 +-
.../{bug46381.jsp => bug6/bug64872-float.jsp} | 16 +-
.../bug64872-integer.jsp} | 16 +-
.../{bug46381.jsp => bug6/bug64872-long.jsp} | 16 +-
.../bug64872-primitive-boolean.jsp}| 28 +-
.../bug64872-primitive-byte.jsp} | 18 +-
.../bug64872-primitive-character.jsp} | 16 +-
.../bug64872-primitive-double.jsp} | 16 +-
.../bug64872-primitive-float.jsp} | 16 +-
.../bug64872-primitive-integer.jsp}| 16 +-
.../bug64872-primitive-long.jsp} | 16 +-
.../bug64872-primitive-short.jsp} | 16 +-
.../{bug46381.jsp => bug6/bug64872-short.jsp} | 16 +-
.../{bug46381.jsp => bug6/bug64872-string.jsp} | 19 +-
.../bug64872-timeunit.jsp} | 16 +-
.../bug64872b-timeunit.jsp}| 13 +-
webapps/docs/jasper-howto.xml | 14 +-
27 files changed, 1419 insertions(+), 172 deletions(-)
create mode 100644
java/org/apache/jasper/optimizations/ELInterpreterTagSetters.java
copy java/{javax/el/Expression.java =>
org/apache/jasper/optimizations/StringInterpreterEnum.java} (58%)
create mode 100644
test/org/apache/jasper/optimizations/TestELInterpreterTagSetters.java
create mode 100644
test/org/apache/jasper/optimizations/TestStringInterpreterTagSetters.java
create mode 100644 test/webapp/WEB-INF/tag-setters.tld
copy test/webapp/{bug46381.jsp => bug6/bug64872-bigdecimal.jsp} (71%)
copy test/webapp/{bug46381.jsp => bug6/bug64872-biginteger.jsp} (71%)
copy test/webapp/{bug5/bug56147.jsp => bug6/bug64872-boolean.jsp} (54%)
copy test/webapp/{bug46381.jsp => bug6/bug64872-byte.jsp} (65%)
copy test/webapp/{bug46381.jsp => bug6/bug64872-character.jsp} (71%)
copy test/webapp/{bug46381.jsp => bug6/bug64872-double.jsp} (71%)
copy test/webapp/{bug46381.jsp => bug6/bug64872-float.jsp} (72%)
copy test/webapp/{bug46381.jsp => bug6/bug64872-integer.jsp} (71%)
copy test/webapp/{bug46381.jsp => bug6/bug64872-long.jsp} (72%)
copy test/webapp/{bug5/bug56147.jsp =>
bug6/bug64872-primitive-boolean.jsp} (52%)
copy test/webapp/{bug46381.jsp => bug6/bug64872-primitive-byte.jsp} (63%)
copy test/webapp/{bug46381.jsp => bug6/bug64872-primitive-character.jsp}
(70%)
copy test/webapp/{bug46381.jsp => bug6/bug64872-primitive-double.jsp} (70%)
copy test/webapp/{bug46381.jsp => bug6/bug64872-primitive-float.jsp} (70%)
copy test/webapp/{bug46381.jsp => bug6/bug64872-primitive-integer.jsp}
(70%)
copy test/webapp/{bug46381.jsp => bug6/bug64872-primitive-long.jsp} (71%)
copy test/webapp/{bug46381.jsp => bug6/bug64872-primitive-short.jsp} (71%)
copy test/webapp/{bug46381.jsp => bug6/bug64872-short.jsp} (72%)
copy test/webapp/{bug46381.jsp => bug6/bug64872-string.jsp} (67%)
copy test/webapp/{bug46381.jsp => bug6/bug64872-timeunit.jsp} (71%)
copy test/webapp/{bug5/bug51544.jsp => bug6/bug64872b-timeunit.jsp}
(76%)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: buildbot exception in on tomcat-85-trunk
On 22/01/2021 11:25, build...@apache.org wrote: > The Buildbot has detected a build exception on builder tomcat-85-trunk while > building tomcat. Full details are available at: > https://ci.apache.org/builders/tomcat-85-trunk/builds/2592 > > Buildbot URL: https://ci.apache.org/ > > Buildslave for this Build: asf946_ubuntu > > Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-85-commit' > triggered this build > Build Source Stamp: [branch 8.5.x] 5c73b8a8857cd1b7dc2908cbf1cbb1f8db4fad7f > Blamelist: Mark Thomas > > BUILD FAILED: exception compile upload_2 Download failure. I'll get this fixed. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Update to Commons Daemon 1.2.4
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 07346c1 Update to Commons Daemon 1.2.4
07346c1 is described below
commit 07346c177a0ad6b07076f97e47170dd481c9e57b
Author: Mark Thomas
AuthorDate: Fri Jan 22 09:57:32 2021 +
Update to Commons Daemon 1.2.4
---
build.properties.default | 12 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 9451b57..23c9de4 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -175,20 +175,20 @@
nsis.nsdialogs.dll=${nsis.home}/Plugins/${nsis.arch.dir}nsDialogs.dll
nsis.loc=${base-sf.loc}/nsis/nsis-${nsis.version}.zip
# - Commons Daemon, version 1.2.0 or later -
-commons-daemon.version=1.2.3
+commons-daemon.version=1.2.4
-# checksum for commons-daemon-1.2.3-bin.tar.gz
+# checksum for commons-daemon-1.2.4-bin.tar.gz
commons-daemon.bin.checksum.enabled=true
commons-daemon.bin.checksum.algorithm=SHA-512
-commons-daemon.bin.checksum.value=0d7ced8f5d6fd3e8781146ee47c37046c6ccd2f364138f89d137eea5f0255e1b2afae5faf7005164c077087cb08203fd44478d5c14c57c7df449feb324443447
+commons-daemon.bin.checksum.value=66c33091fa51b6845ce45f326708419ef20ecd4a60bc175b94620a708f398843d9d53cfa8bfd2f5ab924c30b7034af602cb65e3e1cf164a5f687353f755919fe
-# checksums for commons-daemon-1.2.3-native-src.tar.gz,
commons-daemon-1.2.3-bin-windows.zip
+# checksums for commons-daemon-1.2.4-native-src.tar.gz,
commons-daemon-1.2.4-bin-windows.zip
commons-daemon.native.src.checksum.enabled=true
commons-daemon.native.src.checksum.algorithm=SHA-512
-commons-daemon.native.src.checksum.value=5f223ee3c133f673fe698f575d7cfb15f27fbbb8acf2e6db292e0e1690a20d636b35312187aa1091b315062f2434788eec9cde167e2ae1d7e673ebdd2ddb41f6
+commons-daemon.native.src.checksum.value=655f5b106238f6ac7f6e42dd32acfc553b302aa2c248b839528abdc9872bad5c80da3ef15399a7ff8c414427aafea9c4e9656b2887d98be4584f3926ac02ca23
commons-daemon.native.win.checksum.enabled=true
commons-daemon.native.win.checksum.algorithm=SHA-512
-commons-daemon.native.win.checksum.value=c79ee31a367addc5d49db474aabe084cebcd4f7f0f0f9ddc7999c02d4de5cd6ace6d5f55a230f399cfaaf780179b6f9808739efc7500b18c27cdb963daaef8d5
+commons-daemon.native.win.checksum.value=9c2bc010828826acbde5613aaf2de303471b33f2cb655b0ac91574e27123b8bcbe59e987d9e47d5835c171a5db31922b1458ed2e4fef840fd06c048f61f1e62b
commons-daemon.home=${base.path}/commons-daemon-${commons-daemon.version}
commons-daemon.jar=${commons-daemon.home}/commons-daemon-${commons-daemon.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 937e544..6099920 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -230,6 +230,9 @@
Use java.nio.file.Path to test for one directory being a
sub-directory of another in a consistent way. (markt)
+
+Update to Commons Daemon 1.2.4. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated (03a3edf -> deac802)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from 03a3edf New StringInterpreter to allow optimised String -> Type
conversions
add 8d5f79b BZ 64872 Optimised ELInterpreter for literal booleans &
strings
add deac802 BZ 64872 Optimised StringInterpreter for Enum Values
No new revisions were added by this update.
Summary of changes:
.../optimizations/ELInterpreterTagSetters.java | 268 ++
.../optimizations/StringInterpreterEnum.java} | 30 +-
.../optimizations/TestELInterpreterTagSetters.java | 550 +
.../TestStringInterpreterTagSetters.java | 120 +
test/webapp/WEB-INF/tag-setters.tld| 245 +
.../bug64872-bigdecimal.jsp} | 16 +-
.../bug64872-biginteger.jsp} | 16 +-
.../bug56147.jsp => bug6/bug64872-boolean.jsp} | 28 +-
.../{bug46381.jsp => bug6/bug64872-byte.jsp} | 18 +-
.../bug64872-character.jsp}| 16 +-
.../{bug46381.jsp => bug6/bug64872-double.jsp} | 16 +-
.../{bug46381.jsp => bug6/bug64872-float.jsp} | 16 +-
.../bug64872-integer.jsp} | 16 +-
.../{bug46381.jsp => bug6/bug64872-long.jsp} | 16 +-
.../bug64872-primitive-boolean.jsp}| 28 +-
.../bug64872-primitive-byte.jsp} | 18 +-
.../bug64872-primitive-character.jsp} | 16 +-
.../bug64872-primitive-double.jsp} | 16 +-
.../bug64872-primitive-float.jsp} | 16 +-
.../bug64872-primitive-integer.jsp}| 16 +-
.../bug64872-primitive-long.jsp} | 16 +-
.../bug64872-primitive-short.jsp} | 16 +-
.../{bug46381.jsp => bug6/bug64872-short.jsp} | 16 +-
.../{bug46381.jsp => bug6/bug64872-string.jsp} | 19 +-
.../bug64872-timeunit.jsp} | 16 +-
.../bug64872b-timeunit.jsp}| 13 +-
webapps/docs/jasper-howto.xml | 13 +-
27 files changed, 1418 insertions(+), 172 deletions(-)
create mode 100644
java/org/apache/jasper/optimizations/ELInterpreterTagSetters.java
copy java/{jakarta/el/Expression.java =>
org/apache/jasper/optimizations/StringInterpreterEnum.java} (58%)
create mode 100644
test/org/apache/jasper/optimizations/TestELInterpreterTagSetters.java
create mode 100644
test/org/apache/jasper/optimizations/TestStringInterpreterTagSetters.java
create mode 100644 test/webapp/WEB-INF/tag-setters.tld
copy test/webapp/{bug46381.jsp => bug6/bug64872-bigdecimal.jsp} (71%)
copy test/webapp/{bug46381.jsp => bug6/bug64872-biginteger.jsp} (71%)
copy test/webapp/{bug5/bug56147.jsp => bug6/bug64872-boolean.jsp} (54%)
copy test/webapp/{bug46381.jsp => bug6/bug64872-byte.jsp} (65%)
copy test/webapp/{bug46381.jsp => bug6/bug64872-character.jsp} (71%)
copy test/webapp/{bug46381.jsp => bug6/bug64872-double.jsp} (71%)
copy test/webapp/{bug46381.jsp => bug6/bug64872-float.jsp} (72%)
copy test/webapp/{bug46381.jsp => bug6/bug64872-integer.jsp} (71%)
copy test/webapp/{bug46381.jsp => bug6/bug64872-long.jsp} (72%)
copy test/webapp/{bug5/bug56147.jsp =>
bug6/bug64872-primitive-boolean.jsp} (52%)
copy test/webapp/{bug46381.jsp => bug6/bug64872-primitive-byte.jsp} (63%)
copy test/webapp/{bug46381.jsp => bug6/bug64872-primitive-character.jsp}
(70%)
copy test/webapp/{bug46381.jsp => bug6/bug64872-primitive-double.jsp} (70%)
copy test/webapp/{bug46381.jsp => bug6/bug64872-primitive-float.jsp} (70%)
copy test/webapp/{bug46381.jsp => bug6/bug64872-primitive-integer.jsp}
(70%)
copy test/webapp/{bug46381.jsp => bug6/bug64872-primitive-long.jsp} (71%)
copy test/webapp/{bug46381.jsp => bug6/bug64872-primitive-short.jsp} (71%)
copy test/webapp/{bug46381.jsp => bug6/bug64872-short.jsp} (72%)
copy test/webapp/{bug46381.jsp => bug6/bug64872-string.jsp} (67%)
copy test/webapp/{bug46381.jsp => bug6/bug64872-timeunit.jsp} (71%)
copy test/webapp/{bug5/bug51544.jsp => bug6/bug64872b-timeunit.jsp}
(76%)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 7.0.x updated: Update to Commons Daemon 1.2.4
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/7.0.x by this push:
new 80141a0 Update to Commons Daemon 1.2.4
80141a0 is described below
commit 80141a0964cb308c40ef5c806bd5dcbaa479b2db
Author: Mark Thomas
AuthorDate: Fri Jan 22 09:57:32 2021 +
Update to Commons Daemon 1.2.4
---
build.properties.default | 12 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 9bb07bd..8656694 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -216,20 +216,20 @@
nsis.nsdialogs.dll=${nsis.home}/Plugins/${nsis.arch.dir}nsDialogs.dll
nsis.loc=${base-sf.loc}/nsis/nsis-${nsis.version}.zip
# - Commons Daemon, version 1.2.0 or later -
-commons-daemon.version=1.2.3
+commons-daemon.version=1.2.4
-# checksum for commons-daemon-1.2.3-bin.tar.gz
+# checksum for commons-daemon-1.2.4-bin.tar.gz
commons-daemon.bin.checksum.enabled=true
commons-daemon.bin.checksum.algorithm=SHA-512
-commons-daemon.bin.checksum.value=0d7ced8f5d6fd3e8781146ee47c37046c6ccd2f364138f89d137eea5f0255e1b2afae5faf7005164c077087cb08203fd44478d5c14c57c7df449feb324443447
+commons-daemon.bin.checksum.value=66c33091fa51b6845ce45f326708419ef20ecd4a60bc175b94620a708f398843d9d53cfa8bfd2f5ab924c30b7034af602cb65e3e1cf164a5f687353f755919fe
-# checksums for commons-daemon-1.2.3-native-src.tar.gz,
commons-daemon-1.2.3-bin-windows.zip
+# checksums for commons-daemon-1.2.4-native-src.tar.gz,
commons-daemon-1.2.4-bin-windows.zip
commons-daemon.native.src.checksum.enabled=true
commons-daemon.native.src.checksum.algorithm=SHA-512
-commons-daemon.native.src.checksum.value=5f223ee3c133f673fe698f575d7cfb15f27fbbb8acf2e6db292e0e1690a20d636b35312187aa1091b315062f2434788eec9cde167e2ae1d7e673ebdd2ddb41f6
+commons-daemon.native.src.checksum.value=655f5b106238f6ac7f6e42dd32acfc553b302aa2c248b839528abdc9872bad5c80da3ef15399a7ff8c414427aafea9c4e9656b2887d98be4584f3926ac02ca23
commons-daemon.native.win.checksum.enabled=true
commons-daemon.native.win.checksum.algorithm=SHA-512
-commons-daemon.native.win.checksum.value=c79ee31a367addc5d49db474aabe084cebcd4f7f0f0f9ddc7999c02d4de5cd6ace6d5f55a230f399cfaaf780179b6f9808739efc7500b18c27cdb963daaef8d5
+commons-daemon.native.win.checksum.value=9c2bc010828826acbde5613aaf2de303471b33f2cb655b0ac91574e27123b8bcbe59e987d9e47d5835c171a5db31922b1458ed2e4fef840fd06c048f61f1e62b
commons-daemon.home=${base.path}/commons-daemon-${commons-daemon.version}
commons-daemon.jar=${commons-daemon.home}/commons-daemon-${commons-daemon.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index a238399..b2f5da7 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -209,6 +209,9 @@
Migrate to new code signing service. (markt)
+
+Update to Commons Daemon 1.2.4. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: New StringInterpreter to allow optimised String -> Type conversions
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 01c08ff New StringInterpreter to allow optimised String -> Type
conversions
01c08ff is described below
commit 01c08fff3054dc20fe181dd72742bbdb97d3603d
Author: Mark Thomas
AuthorDate: Fri Jan 22 11:22:09 2021 +
New StringInterpreter to allow optimised String -> Type conversions
This is the additional hook required to provide the optimisations
proposed in https://bz.apache.org/bugzilla/show_bug.cgi?id=64872
---
java/org/apache/jasper/compiler/Generator.java | 85 ++
.../apache/jasper/compiler/StringInterpreter.java | 49 ++
.../jasper/compiler/StringInterpreterFactory.java | 178 +
.../jasper/resources/LocalStrings.properties | 1 +
webapps/docs/changelog.xml | 6 +
5 files changed, 248 insertions(+), 71 deletions(-)
diff --git a/java/org/apache/jasper/compiler/Generator.java
b/java/org/apache/jasper/compiler/Generator.java
index b0797a1..ef445da 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -129,6 +129,8 @@ class Generator {
private final ELInterpreter elInterpreter;
+private final StringInterpreter stringInterpreter;
+
/**
* @param s
*the input string
@@ -3014,7 +3016,7 @@ class Generator {
} else if (attr.isNamedAttribute()) {
if (!n.checkIfAttributeIsJspFragment(attr.getName())
&& !attr.isDynamic()) {
-attrValue = convertString(c[0], attrValue, localName,
+attrValue = stringInterpreter.convertString(c[0],
attrValue, localName,
handlerInfo.getPropertyEditorClass(localName),
true);
}
} else if (attr.isELInterpreterInput()) {
@@ -3117,7 +3119,7 @@ class Generator {
this.isTagFile, attrValue, c[0], mapName);
}
} else {
-attrValue = convertString(c[0], attrValue, localName,
+attrValue = stringInterpreter.convertString(c[0], attrValue,
localName,
handlerInfo.getPropertyEditorClass(localName), false);
}
return attrValue;
@@ -3263,75 +3265,6 @@ class Generator {
}
/*
- * @param c The target class to which to coerce the given string @param
- * s The string value @param attrName The name of the attribute whose
- * value is being supplied @param propEditorClass The property editor
- * for the given attribute @param isNamedAttribute true if the given
- * attribute is a named attribute (that is, specified using the
- * jsp:attribute standard action), and false otherwise
- */
-private String convertString(Class c, String s, String attrName,
-Class propEditorClass, boolean isNamedAttribute) {
-
-String quoted = s;
-if (!isNamedAttribute) {
-quoted = quote(s);
-}
-
-if (propEditorClass != null) {
-String className = c.getCanonicalName();
-return "("
-+ className
-+
")org.apache.jasper.runtime.JspRuntimeLibrary.getValueFromBeanInfoPropertyEditor("
-+ className + ".class, \"" + attrName + "\", " + quoted
-+ ", " + propEditorClass.getCanonicalName() +
".class)";
-} else if (c == String.class) {
-return quoted;
-} else if (c == boolean.class) {
-return JspUtil.coerceToPrimitiveBoolean(s, isNamedAttribute);
-} else if (c == Boolean.class) {
-return JspUtil.coerceToBoolean(s, isNamedAttribute);
-} else if (c == byte.class) {
-return JspUtil.coerceToPrimitiveByte(s, isNamedAttribute);
-} else if (c == Byte.class) {
-return JspUtil.coerceToByte(s, isNamedAttribute);
-} else if (c == char.class) {
-return JspUtil.coerceToChar(s, isNamedAttribute);
-} else if (c == Character.class) {
-return JspUtil.coerceToCharacter(s, isNamedAttribute);
-} else if (c == double.class) {
-return JspUtil.coerceToPrimitiveDouble(s, isNamedAttribute);
-} else if (c == Double.class) {
-return JspUtil.coerceToDouble(s, isNamedAttribute);
-} else if (c == float.class) {
-return JspUtil.coerceToPrimitiveFloat(s, isNamedAttribute);
-} else if (c == Float.class) {
-return JspUtil.coerceToFloat(s, isNamedAttribute);
-
[tomcat] branch 9.0.x updated: BZ 64872 Optimised ELInterpreter for literal booleans & strings
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
The following commit(s) were added to refs/heads/9.0.x by this push:
new 5c05bfa BZ 64872 Optimised ELInterpreter for literal booleans &
strings
5c05bfa is described below
commit 5c05bfae51ce3690621ba72eda51b86b492345b1
Author: Mark Thomas
AuthorDate: Mon Nov 16 17:27:27 2020 +
BZ 64872 Optimised ELInterpreter for literal booleans & strings
This is not strictly spec compliant hence it isn't enabled by
default but it should work for many applicaitons.
https://bz.apache.org/bugzilla/show_bug.cgi?id=64872
---
.../optimizations/ELInterpreterTagSetters.java | 268 ++
.../optimizations/TestELInterpreterTagSetters.java | 547 +
test/webapp/WEB-INF/tag-setters.tld| 245 +
test/webapp/bug6/bug64872-bigdecimal.jsp | 30 ++
test/webapp/bug6/bug64872-biginteger.jsp | 30 ++
test/webapp/bug6/bug64872-boolean.jsp | 37 ++
test/webapp/bug6/bug64872-byte.jsp | 32 ++
test/webapp/bug6/bug64872-character.jsp| 30 ++
test/webapp/bug6/bug64872-double.jsp | 30 ++
test/webapp/bug6/bug64872-float.jsp| 30 ++
test/webapp/bug6/bug64872-integer.jsp | 30 ++
test/webapp/bug6/bug64872-long.jsp | 30 ++
.../webapp/bug6/bug64872-primitive-boolean.jsp | 37 ++
test/webapp/bug6/bug64872-primitive-byte.jsp | 32 ++
.../bug6/bug64872-primitive-character.jsp | 30 ++
test/webapp/bug6/bug64872-primitive-double.jsp | 30 ++
test/webapp/bug6/bug64872-primitive-float.jsp | 30 ++
.../webapp/bug6/bug64872-primitive-integer.jsp | 30 ++
test/webapp/bug6/bug64872-primitive-long.jsp | 30 ++
test/webapp/bug6/bug64872-primitive-short.jsp | 30 ++
test/webapp/bug6/bug64872-short.jsp| 30 ++
test/webapp/bug6/bug64872-string.jsp | 33 ++
test/webapp/bug6/bug64872-timeunit.jsp | 33 ++
webapps/docs/jasper-howto.xml | 7 +-
24 files changed, 1690 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/jasper/optimizations/ELInterpreterTagSetters.java
b/java/org/apache/jasper/optimizations/ELInterpreterTagSetters.java
new file mode 100644
index 000..38feb96
--- /dev/null
+++ b/java/org/apache/jasper/optimizations/ELInterpreterTagSetters.java
@@ -0,0 +1,268 @@
+/*
+ * 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.
+ */
+package org.apache.jasper.optimizations;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.el.ELResolver;
+
+import org.apache.jasper.JspCompilationContext;
+import org.apache.jasper.compiler.ELInterpreter;
+import org.apache.jasper.compiler.JspUtil;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
+
+/**
+ * A non-specification compliant {@link ELInterpreter} that optimizes a subset
+ * of setters for tag attributes.
+ *
+ * The cases optimized by this implementation are:
+ *
+ * expressions that are solely a literal boolean
+ * expressions that are solely a constant string used (with coercion where
+ * necessary) with a setter that accepts:
+ *
+ * boolean / Boolean
+ * char / Character
+ * BigDecimal
+ * long / Long
+ * int / Integer
+ * short / Short
+ * byte / Byte
+ * double / Double
+ * float / Float
+ * BigInteger
+ * Enum
+ * String
+ *
+ *
+ * The specification compliance issue is that it essentially skips the first
+ * three {@link ELResolver}s listed in section JSP.2.9 and effectively hard
+ * codes the use of the 4th {@link ELResolver} in that list.
+ *
+ * @see "https://bz.apache.org/bugzilla/show_bug.cgi?id=64872;
+ */
+public class ELInterpreterTagSetters implements ELInterpreter {
+
+// Can't be static
+private final Log log = LogFactory.getLog(ELInterpreterTagSetters.class);
+
+private final Pattern PATTERN_BOOLEAN =
Pattern.compile("[$][{]([\"']?)(true|false)\\1[}]");
buildbot failure in on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-trunk/builds/5641 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch master] db727e926b2746496f69088558bad5cff726f46d Blamelist: Mark Thomas BUILD FAILED: failed compile Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in on tomcat-85-trunk
The Buildbot has detected a restored build on builder tomcat-85-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-85-trunk/builds/2593 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-85-commit' triggered this build Build Source Stamp: [branch 8.5.x] 616949edde000602ba52368bc935207f85f07af7 Blamelist: Mark Thomas Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 64872] Inefficient enum resolution in JSPs
https://bz.apache.org/bugzilla/show_bug.cgi?id=64872 --- Comment #31 from John Engebretson --- Wondeful, thank you very much! And the non-static Logger does make sense as a safety measure. -- 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
buildbot failure in on tomcat-9-trunk
The Buildbot has detected a new failure on builder tomcat-9-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-9-trunk/builds/615 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-9-commit' triggered this build Build Source Stamp: [branch 9.0.x] 6fc94f243c4a5890b2d679acd5b7fa0611d7985d Blamelist: Mark Thomas BUILD FAILED: failed compile Sincerely, -The Buildbot - 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: Fixes. Javadoc and class visibility
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
The following commit(s) were added to refs/heads/9.0.x by this push:
new c232657 Fixes. Javadoc and class visibility
c232657 is described below
commit c2326575bae0285e600eb207671f4d187761be83
Author: Mark Thomas
AuthorDate: Fri Jan 22 16:34:31 2021 +
Fixes. Javadoc and class visibility
---
java/org/apache/jasper/optimizations/ELInterpreterTagSetters.java | 4 ++--
res/bnd/jasper.jar.tmp.bnd| 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/jasper/optimizations/ELInterpreterTagSetters.java
b/java/org/apache/jasper/optimizations/ELInterpreterTagSetters.java
index 38feb96..5f9ce6c 100644
--- a/java/org/apache/jasper/optimizations/ELInterpreterTagSetters.java
+++ b/java/org/apache/jasper/optimizations/ELInterpreterTagSetters.java
@@ -38,7 +38,7 @@ import org.apache.juli.logging.LogFactory;
* expressions that are solely a literal boolean
* expressions that are solely a constant string used (with coercion where
* necessary) with a setter that accepts:
- *
+ *
* boolean / Boolean
* char / Character
* BigDecimal
@@ -51,7 +51,7 @@ import org.apache.juli.logging.LogFactory;
* BigInteger
* Enum
* String
- *
+ *
*
* The specification compliance issue is that it essentially skips the first
* three {@link ELResolver}s listed in section JSP.2.9 and effectively hard
diff --git a/res/bnd/jasper.jar.tmp.bnd b/res/bnd/jasper.jar.tmp.bnd
index de170d2..d235799 100644
--- a/res/bnd/jasper.jar.tmp.bnd
+++ b/res/bnd/jasper.jar.tmp.bnd
@@ -22,6 +22,7 @@ Export-Package: \
org.apache.jasper.compiler,\
org.apache.jasper.compiler.tagplugin,\
org.apache.jasper.el,\
+org.apache.jasper.optimizations,\
org.apache.jasper.runtime,\
org.apache.jasper.security,\
org.apache.jasper.servlet,\
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Fixes. Javadoc and class visibility
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 563fdaa Fixes. Javadoc and class visibility
563fdaa is described below
commit 563fdaa1369afb3ca0cb27275c708a795eeb95ac
Author: Mark Thomas
AuthorDate: Fri Jan 22 16:34:31 2021 +
Fixes. Javadoc and class visibility
---
java/org/apache/jasper/optimizations/ELInterpreterTagSetters.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/jasper/optimizations/ELInterpreterTagSetters.java
b/java/org/apache/jasper/optimizations/ELInterpreterTagSetters.java
index 38feb96..5f9ce6c 100644
--- a/java/org/apache/jasper/optimizations/ELInterpreterTagSetters.java
+++ b/java/org/apache/jasper/optimizations/ELInterpreterTagSetters.java
@@ -38,7 +38,7 @@ import org.apache.juli.logging.LogFactory;
* expressions that are solely a literal boolean
* expressions that are solely a constant string used (with coercion where
* necessary) with a setter that accepts:
- *
+ *
* boolean / Boolean
* char / Character
* BigDecimal
@@ -51,7 +51,7 @@ import org.apache.juli.logging.LogFactory;
* BigInteger
* Enum
* String
- *
+ *
*
* The specification compliance issue is that it essentially skips the first
* three {@link ELResolver}s listed in section JSP.2.9 and effectively hard
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 64872] Inefficient enum resolution in JSPs
https://bz.apache.org/bugzilla/show_bug.cgi?id=64872 Mark Thomas changed: What|Removed |Added Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #30 from Mark Thomas --- Fixed in: - 10.0.x for 10.0.1 onwards - 9.0.x for 9.0.42 onwards - 8.5.x for 8.5.62 onwards Regarding the non-static logger, nearly all the logs in Jasper are non-static to avoid issues with memory leaks on web application reload (the explanation for that is a longish story - ask on dev@ if interested). The impact is a small increase in memory footprint if more than one web application is deployed on a Tomcat instance. -- 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
buildbot success in on tomcat-9-trunk
The Buildbot has detected a restored build on builder tomcat-9-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-9-trunk/builds/616 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-9-commit' triggered this build Build Source Stamp: [branch 9.0.x] c2326575bae0285e600eb207671f4d187761be83 Blamelist: Mark Thomas Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Comment out / make configurable the performance aspects of these tests
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 12360e3 Comment out / make configurable the performance aspects of
these tests
12360e3 is described below
commit 12360e3064789e42e25b79bb17416a0e24d6b530
Author: Mark Thomas
AuthorDate: Fri Jan 22 17:51:48 2021 +
Comment out / make configurable the performance aspects of these tests
---
.../optimizations/TestELInterpreterTagSetters.java | 17 +++--
test/webapp/bug6/bug64872-bigdecimal.jsp| 2 +-
test/webapp/bug6/bug64872-biginteger.jsp| 2 +-
test/webapp/bug6/bug64872-boolean.jsp | 2 +-
test/webapp/bug6/bug64872-byte.jsp | 2 +-
test/webapp/bug6/bug64872-character.jsp | 2 +-
test/webapp/bug6/bug64872-double.jsp| 2 +-
test/webapp/bug6/bug64872-float.jsp | 2 +-
test/webapp/bug6/bug64872-integer.jsp | 2 +-
test/webapp/bug6/bug64872-long.jsp | 2 +-
test/webapp/bug6/bug64872-primitive-boolean.jsp | 2 +-
test/webapp/bug6/bug64872-primitive-byte.jsp| 2 +-
test/webapp/bug6/bug64872-primitive-character.jsp | 2 +-
test/webapp/bug6/bug64872-primitive-double.jsp | 2 +-
test/webapp/bug6/bug64872-primitive-float.jsp | 2 +-
test/webapp/bug6/bug64872-primitive-integer.jsp | 2 +-
test/webapp/bug6/bug64872-primitive-long.jsp| 2 +-
test/webapp/bug6/bug64872-primitive-short.jsp | 2 +-
test/webapp/bug6/bug64872-short.jsp | 2 +-
test/webapp/bug6/bug64872-string.jsp| 2 +-
test/webapp/bug6/bug64872-timeunit.jsp | 2 +-
21 files changed, 31 insertions(+), 26 deletions(-)
diff --git
a/test/org/apache/jasper/optimizations/TestELInterpreterTagSetters.java
b/test/org/apache/jasper/optimizations/TestELInterpreterTagSetters.java
index 0b9f87f..df58bed 100644
--- a/test/org/apache/jasper/optimizations/TestELInterpreterTagSetters.java
+++ b/test/org/apache/jasper/optimizations/TestELInterpreterTagSetters.java
@@ -55,14 +55,15 @@ public class TestELInterpreterTagSetters extends
TomcatBaseTest {
List parameterSets = new ArrayList<>();
ELInterpreter[] elInterpreters = new ELInterpreter[] {
-// Warm-up
// First call will trigger compilation (and therefore be
slower)
-// Call both to ensure both are warmed up
-new ELInterpreterWrapper(true, "TagSetters"),
-new ELInterpreterWrapper(false, "Default"),
-// Compare times of these test runs
+// For performance tests call each once to warm-up and once to
+// test
new ELInterpreterWrapper(true, "TagSetters"),
new ELInterpreterWrapper(false, "Default"),
+// Uncomment for a performance test and compare times of these
+// test runs
+//new ELInterpreterWrapper(true, "TagSetters"),
+//new ELInterpreterWrapper(false, "Default"),
};
for (ELInterpreter elInterpreter : elInterpreters) {
@@ -115,7 +116,11 @@ public class TestELInterpreterTagSetters extends
TomcatBaseTest {
ctxt.getServletContext().setAttribute(StringInterpreter.class.getCanonicalName(),
new StringInterpreterEnum());
-ByteChunk bc = getUrl("http://localhost:; + getPort() +
"/test/bug6/bug64872-" + target + ".jsp");
+// Change this to 100 to test performance
+String iterations = "1";
+
+ByteChunk bc = getUrl("http://localhost:; + getPort() +
+"/test/bug6/bug64872-" + target + ".jsp?iterations=" +
iterations);
String actual = bc.toString();
diff --git a/test/webapp/bug6/bug64872-bigdecimal.jsp
b/test/webapp/bug6/bug64872-bigdecimal.jsp
index 9bd18ed..9279a04 100644
--- a/test/webapp/bug6/bug64872-bigdecimal.jsp
+++ b/test/webapp/bug6/bug64872-bigdecimal.jsp
@@ -19,7 +19,7 @@
Bug 64872 BigDecimal test case
<%
- for (int i=0; i < 100; i++) {
+ for (int i=0; i < Integer.parseInt(request.getParameter("iterations")); i++)
{
%>
01 The value of foo is []
02 The value of foo is []
diff --git a/test/webapp/bug6/bug64872-biginteger.jsp
b/test/webapp/bug6/bug64872-biginteger.jsp
index 0fcd1c6..a81d995 100644
--- a/test/webapp/bug6/bug64872-biginteger.jsp
+++ b/test/webapp/bug6/bug64872-biginteger.jsp
@@ -19,7 +19,7 @@
Bug 64872 BigInteger test case
<%
- for (int i=0; i < 100; i++) {
+ for (int i=0; i < Integer.parseInt(request.getParameter("iterations")); i++)
{
%>
01 The value of foo is []
02 The
[tomcat] branch 8.5.x updated: Comment out / make configurable the performance aspects of these tests
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new d7a7c40 Comment out / make configurable the performance aspects of
these tests
d7a7c40 is described below
commit d7a7c40676db3a8daed1c19f17e2c2bb36d23377
Author: Mark Thomas
AuthorDate: Fri Jan 22 17:51:48 2021 +
Comment out / make configurable the performance aspects of these tests
---
.../optimizations/TestELInterpreterTagSetters.java | 17 +++--
test/webapp/bug6/bug64872-bigdecimal.jsp| 2 +-
test/webapp/bug6/bug64872-biginteger.jsp| 2 +-
test/webapp/bug6/bug64872-boolean.jsp | 2 +-
test/webapp/bug6/bug64872-byte.jsp | 2 +-
test/webapp/bug6/bug64872-character.jsp | 2 +-
test/webapp/bug6/bug64872-double.jsp| 2 +-
test/webapp/bug6/bug64872-float.jsp | 2 +-
test/webapp/bug6/bug64872-integer.jsp | 2 +-
test/webapp/bug6/bug64872-long.jsp | 2 +-
test/webapp/bug6/bug64872-primitive-boolean.jsp | 2 +-
test/webapp/bug6/bug64872-primitive-byte.jsp| 2 +-
test/webapp/bug6/bug64872-primitive-character.jsp | 2 +-
test/webapp/bug6/bug64872-primitive-double.jsp | 2 +-
test/webapp/bug6/bug64872-primitive-float.jsp | 2 +-
test/webapp/bug6/bug64872-primitive-integer.jsp | 2 +-
test/webapp/bug6/bug64872-primitive-long.jsp| 2 +-
test/webapp/bug6/bug64872-primitive-short.jsp | 2 +-
test/webapp/bug6/bug64872-short.jsp | 2 +-
test/webapp/bug6/bug64872-string.jsp| 2 +-
test/webapp/bug6/bug64872-timeunit.jsp | 2 +-
21 files changed, 31 insertions(+), 26 deletions(-)
diff --git
a/test/org/apache/jasper/optimizations/TestELInterpreterTagSetters.java
b/test/org/apache/jasper/optimizations/TestELInterpreterTagSetters.java
index ac66ddd..05b1a4f 100644
--- a/test/org/apache/jasper/optimizations/TestELInterpreterTagSetters.java
+++ b/test/org/apache/jasper/optimizations/TestELInterpreterTagSetters.java
@@ -55,14 +55,15 @@ public class TestELInterpreterTagSetters extends
TomcatBaseTest {
List parameterSets = new ArrayList<>();
ELInterpreter[] elInterpreters = new ELInterpreter[] {
-// Warm-up
// First call will trigger compilation (and therefore be
slower)
-// Call both to ensure both are warmed up
-new ELInterpreterWrapper(true, "TagSetters"),
-new ELInterpreterWrapper(false, "Default"),
-// Compare times of these test runs
+// For performance tests call each once to warm-up and once to
+// test
new ELInterpreterWrapper(true, "TagSetters"),
new ELInterpreterWrapper(false, "Default"),
+// Uncomment for a performance test and compare times of these
+// test runs
+//new ELInterpreterWrapper(true, "TagSetters"),
+//new ELInterpreterWrapper(false, "Default"),
};
for (ELInterpreter elInterpreter : elInterpreters) {
@@ -115,7 +116,11 @@ public class TestELInterpreterTagSetters extends
TomcatBaseTest {
ctxt.getServletContext().setAttribute(StringInterpreter.class.getCanonicalName(),
new StringInterpreterEnum());
-ByteChunk bc = getUrl("http://localhost:; + getPort() +
"/test/bug6/bug64872-" + target + ".jsp");
+// Change this to 100 to test performance
+String iterations = "1";
+
+ByteChunk bc = getUrl("http://localhost:; + getPort() +
+"/test/bug6/bug64872-" + target + ".jsp?iterations=" +
iterations);
String actual = bc.toString();
diff --git a/test/webapp/bug6/bug64872-bigdecimal.jsp
b/test/webapp/bug6/bug64872-bigdecimal.jsp
index 9bd18ed..9279a04 100644
--- a/test/webapp/bug6/bug64872-bigdecimal.jsp
+++ b/test/webapp/bug6/bug64872-bigdecimal.jsp
@@ -19,7 +19,7 @@
Bug 64872 BigDecimal test case
<%
- for (int i=0; i < 100; i++) {
+ for (int i=0; i < Integer.parseInt(request.getParameter("iterations")); i++)
{
%>
01 The value of foo is []
02 The value of foo is []
diff --git a/test/webapp/bug6/bug64872-biginteger.jsp
b/test/webapp/bug6/bug64872-biginteger.jsp
index 0fcd1c6..a81d995 100644
--- a/test/webapp/bug6/bug64872-biginteger.jsp
+++ b/test/webapp/bug6/bug64872-biginteger.jsp
@@ -19,7 +19,7 @@
Bug 64872 BigInteger test case
<%
- for (int i=0; i < 100; i++) {
+ for (int i=0; i < Integer.parseInt(request.getParameter("iterations")); i++)
{
%>
01 The value of foo is []
02 The
[tomcat] branch 9.0.x updated: Comment out / make configurable the performance aspects of these tests
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
The following commit(s) were added to refs/heads/9.0.x by this push:
new e12eb8e Comment out / make configurable the performance aspects of
these tests
e12eb8e is described below
commit e12eb8ec2305db71389db6a94fcf2f9a0317b8fd
Author: Mark Thomas
AuthorDate: Fri Jan 22 17:51:48 2021 +
Comment out / make configurable the performance aspects of these tests
---
.../optimizations/TestELInterpreterTagSetters.java | 17 +++--
test/webapp/bug6/bug64872-bigdecimal.jsp| 2 +-
test/webapp/bug6/bug64872-biginteger.jsp| 2 +-
test/webapp/bug6/bug64872-boolean.jsp | 2 +-
test/webapp/bug6/bug64872-byte.jsp | 2 +-
test/webapp/bug6/bug64872-character.jsp | 2 +-
test/webapp/bug6/bug64872-double.jsp| 2 +-
test/webapp/bug6/bug64872-float.jsp | 2 +-
test/webapp/bug6/bug64872-integer.jsp | 2 +-
test/webapp/bug6/bug64872-long.jsp | 2 +-
test/webapp/bug6/bug64872-primitive-boolean.jsp | 2 +-
test/webapp/bug6/bug64872-primitive-byte.jsp| 2 +-
test/webapp/bug6/bug64872-primitive-character.jsp | 2 +-
test/webapp/bug6/bug64872-primitive-double.jsp | 2 +-
test/webapp/bug6/bug64872-primitive-float.jsp | 2 +-
test/webapp/bug6/bug64872-primitive-integer.jsp | 2 +-
test/webapp/bug6/bug64872-primitive-long.jsp| 2 +-
test/webapp/bug6/bug64872-primitive-short.jsp | 2 +-
test/webapp/bug6/bug64872-short.jsp | 2 +-
test/webapp/bug6/bug64872-string.jsp| 2 +-
test/webapp/bug6/bug64872-timeunit.jsp | 2 +-
21 files changed, 31 insertions(+), 26 deletions(-)
diff --git
a/test/org/apache/jasper/optimizations/TestELInterpreterTagSetters.java
b/test/org/apache/jasper/optimizations/TestELInterpreterTagSetters.java
index ac66ddd..05b1a4f 100644
--- a/test/org/apache/jasper/optimizations/TestELInterpreterTagSetters.java
+++ b/test/org/apache/jasper/optimizations/TestELInterpreterTagSetters.java
@@ -55,14 +55,15 @@ public class TestELInterpreterTagSetters extends
TomcatBaseTest {
List parameterSets = new ArrayList<>();
ELInterpreter[] elInterpreters = new ELInterpreter[] {
-// Warm-up
// First call will trigger compilation (and therefore be
slower)
-// Call both to ensure both are warmed up
-new ELInterpreterWrapper(true, "TagSetters"),
-new ELInterpreterWrapper(false, "Default"),
-// Compare times of these test runs
+// For performance tests call each once to warm-up and once to
+// test
new ELInterpreterWrapper(true, "TagSetters"),
new ELInterpreterWrapper(false, "Default"),
+// Uncomment for a performance test and compare times of these
+// test runs
+//new ELInterpreterWrapper(true, "TagSetters"),
+//new ELInterpreterWrapper(false, "Default"),
};
for (ELInterpreter elInterpreter : elInterpreters) {
@@ -115,7 +116,11 @@ public class TestELInterpreterTagSetters extends
TomcatBaseTest {
ctxt.getServletContext().setAttribute(StringInterpreter.class.getCanonicalName(),
new StringInterpreterEnum());
-ByteChunk bc = getUrl("http://localhost:; + getPort() +
"/test/bug6/bug64872-" + target + ".jsp");
+// Change this to 100 to test performance
+String iterations = "1";
+
+ByteChunk bc = getUrl("http://localhost:; + getPort() +
+"/test/bug6/bug64872-" + target + ".jsp?iterations=" +
iterations);
String actual = bc.toString();
diff --git a/test/webapp/bug6/bug64872-bigdecimal.jsp
b/test/webapp/bug6/bug64872-bigdecimal.jsp
index 9bd18ed..9279a04 100644
--- a/test/webapp/bug6/bug64872-bigdecimal.jsp
+++ b/test/webapp/bug6/bug64872-bigdecimal.jsp
@@ -19,7 +19,7 @@
Bug 64872 BigDecimal test case
<%
- for (int i=0; i < 100; i++) {
+ for (int i=0; i < Integer.parseInt(request.getParameter("iterations")); i++)
{
%>
01 The value of foo is []
02 The value of foo is []
diff --git a/test/webapp/bug6/bug64872-biginteger.jsp
b/test/webapp/bug6/bug64872-biginteger.jsp
index 0fcd1c6..a81d995 100644
--- a/test/webapp/bug6/bug64872-biginteger.jsp
+++ b/test/webapp/bug6/bug64872-biginteger.jsp
@@ -19,7 +19,7 @@
Bug 64872 BigInteger test case
<%
- for (int i=0; i < 100; i++) {
+ for (int i=0; i < Integer.parseInt(request.getParameter("iterations")); i++)
{
%>
01 The value of foo is []
02 The
[tomcat] branch master updated: Fixes. Javadoc and class visibility
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 419cd04 Fixes. Javadoc and class visibility
419cd04 is described below
commit 419cd04e808d503bb46d507db175f4d25d08117a
Author: Mark Thomas
AuthorDate: Fri Jan 22 16:34:31 2021 +
Fixes. Javadoc and class visibility
---
java/org/apache/jasper/optimizations/ELInterpreterTagSetters.java | 4 ++--
res/bnd/jasper.jar.tmp.bnd| 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/jasper/optimizations/ELInterpreterTagSetters.java
b/java/org/apache/jasper/optimizations/ELInterpreterTagSetters.java
index b76d7db..8a345b2 100644
--- a/java/org/apache/jasper/optimizations/ELInterpreterTagSetters.java
+++ b/java/org/apache/jasper/optimizations/ELInterpreterTagSetters.java
@@ -38,7 +38,7 @@ import org.apache.juli.logging.LogFactory;
* expressions that are solely a literal boolean
* expressions that are solely a constant string used (with coercion where
* necessary) with a setter that accepts:
- *
+ *
* boolean / Boolean
* char / Character
* BigDecimal
@@ -51,7 +51,7 @@ import org.apache.juli.logging.LogFactory;
* BigInteger
* Enum
* String
- *
+ *
*
* The specification compliance issue is that it essentially skips the first
* three {@link ELResolver}s listed in section JSP.2.9 and effectively hard
diff --git a/res/bnd/jasper.jar.tmp.bnd b/res/bnd/jasper.jar.tmp.bnd
index de170d2..d235799 100644
--- a/res/bnd/jasper.jar.tmp.bnd
+++ b/res/bnd/jasper.jar.tmp.bnd
@@ -22,6 +22,7 @@ Export-Package: \
org.apache.jasper.compiler,\
org.apache.jasper.compiler.tagplugin,\
org.apache.jasper.el,\
+org.apache.jasper.optimizations,\
org.apache.jasper.runtime,\
org.apache.jasper.security,\
org.apache.jasper.servlet,\
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 64830] HTTP2 : GOAWAY sent with Protocol Error and Frame Size Error
https://bz.apache.org/bugzilla/show_bug.cgi?id=64830 Mark Thomas changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |FIXED --- Comment #22 from Mark Thomas --- I am going to assume that the recent commit fixed this. If this is not the case please do re-open but I think we'd need a new test case in that case as I can no longer trigger any errors with this one. -- 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
[Bug 65051] [HTTP/2] The socket [*] associated with this connection has been closed.
https://bz.apache.org/bugzilla/show_bug.cgi?id=65051 Mark Thomas changed: What|Removed |Added Resolution|--- |INVALID Status|NEEDINFO|RESOLVED --- Comment #4 from Mark Thomas --- Resolving this as invalid as all the indications so far is that this is inefficient framing on the client that Tomcat is detecting as a DoS attempt. Please use the users mailing list for further assistance. http://tomcat.apache.org/lists.html#tomcat-users This issue can be re-opened if on list discussions determine there is a bug here. -- 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
buildbot success in on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-trunk/builds/5643 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch master] 12360e3064789e42e25b79bb17416a0e24d6b530 Blamelist: Mark Thomas Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
