buildbot success in on tomcat-9-trunk

[buildbot]

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/453

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] 33e874fa31e6c411421ad1304dfa65f30bd58958
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

buildbot success in on tomcat-trunk

[buildbot]

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/5443

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] 33bab4ff14883047b1cd3e667323969fdde23486
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

Re: [tomcat] branch 9.0.x updated: Fix Javadoc build error and ensure 'ant clean javadoc' works

[Mark Thomas]

On 18/09/2020 22:37, ma...@apache.org wrote:
> 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 33e874f  Fix Javadoc build error and ensure 'ant clean javadoc' works
> 33e874f is described below
> 
> commit 33e874fa31e6c411421ad1304dfa65f30bd58958
> Author: Mark Thomas 
> AuthorDate: Fri Sep 18 22:27:15 2020 +0100
> 
> Fix Javadoc build error and ensure 'ant clean javadoc' works



> diff --git a/build.xml b/build.xml
> index 7c65d25..8c0e40c 100644
> --- a/build.xml
> +++ b/build.xml
> @@ -222,6 +222,7 @@
>
>
>  
> +
>  
>  
>  



In case you are wondering, this doesn't impact the license or notice
files because:
- it is only used by the Javadoc task to avoid a warning
- it is ALv2 licensed

Mark

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

[tomcat] branch master updated (129d0be -> 33bab4f)

[markt]

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 129d0be  bnd is now required for compilation
 add 33bab4f  Fix Javadoc build error and ensure 'ant clean javadoc' works

No new revisions were added by this update.

Summary of changes:
 build.properties.default | 13 +
 build.xml| 18 +++---
 2 files changed, 28 insertions(+), 3 deletions(-)


-
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 Javadoc build error and ensure 'ant clean javadoc' works

[markt]

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 33e874f  Fix Javadoc build error and ensure 'ant clean javadoc' works
33e874f is described below

commit 33e874fa31e6c411421ad1304dfa65f30bd58958
Author: Mark Thomas 
AuthorDate: Fri Sep 18 22:27:15 2020 +0100

Fix Javadoc build error and ensure 'ant clean javadoc' works
---
 build.properties.default | 13 +
 build.xml| 18 +++---
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 2d65f9d..e1a18ad 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -298,3 +298,16 @@ 
bnd.checksum.value=0dc5ff0af222ef075b5b0dd488f6aeac|0e542cf0f928107c17ce65f3c68d
 bnd.home=${base.path}/bnd-${bnd.version}
 bnd.jar=${bnd.home}/biz.aQute.bnd-${bnd.version}.jar
 
bnd.loc=${base-maven.loc}/biz/aQute/bnd/biz.aQute.bnd/${bnd.version}/biz.aQute.bnd-${bnd.version}.jar
+
+# - OSGi annotations bundle, version 1.0.0 or later-
+# - required to avoid Javadoc error when using bnd annotations -
+osgi-annotations.version=1.0.0
+
+# checksums for biz.aQute.bnd-5.1.1.jar
+osgi-annotations.checksum.enabled=true
+osgi-annotations.checksum.algorithm=MD5|SHA-1
+osgi-annotations.checksum.value=153054f987534244f95a399539b11375|b6e802bceba0682353466abf8fadbbd662b2f7f8
+
+osgi-annotations.home=${base.path}/osgi-annotations-${osgi-annotations.version}
+osgi-annotations.jar=${osgi-annotations.home}/org.osgi.annotation.bundle-${osgi-annotations.version}.jar
+osgi-annotations.loc=${base-maven.loc}/org/osgi/org.osgi.annotation.bundle/${osgi-annotations.version}/org.osgi.annotation.bundle-${osgi-annotations.version}.jar
diff --git a/build.xml b/build.xml
index 7c65d25..8c0e40c 100644
--- a/build.xml
+++ b/build.xml
@@ -222,6 +222,7 @@
   
   
 
+
 
 
 
@@ -940,7 +941,7 @@
 
   
 
-  
+  
 
 
 
-  
 
 
 
+   
   
   
   
@@ -3052,7 +3054,8 @@ skip.installer property in build.properties" />
   
 
   
+  description="Download components necessary to compile"
+ depends="setup-bnd">
 
 
 
@@ -3597,6 +3600,15 @@ Read the Building page on the Apache Tomcat 
documentation site for details on ho
   
   
 
+
+
+  
+  
+  
+  
+  
+  
+
   
 
   


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

[Bug 64751] Incomplete module info descriptor

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=64751

--- Comment #3 from Guy Veraghtert  ---
I did a quick test with the 9.0.x branch. All our application tests are running
again, and [Apache Tomcat/9.0.39-dev] started successfully.

I will do some more testing over the weekend and let you know when I run into
other problems.

-- 
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

[buildbot]

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/451

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] b18898ed814dc142ecc0ec8b369b28efc444826f
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 failure in on tomcat-trunk

[buildbot]

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/5441

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] 2c8fdae4abab9e949cef94b8fd44d4f3b819a65b
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 master updated: bnd is now required for compilation

[markt]

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 129d0be  bnd is now required for compilation
129d0be is described below

commit 129d0be9ff4b0eb7a85720b93a2ff24af43cbdee
Author: Mark Thomas 
AuthorDate: Fri Sep 18 21:19:47 2020 +0100

bnd is now required for compilation
---
 build.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.xml b/build.xml
index da0e448..25ded66 100644
--- a/build.xml
+++ b/build.xml
@@ -943,7 +943,7 @@
 
   
 
-  
+  
 
 
 
-  
+  
 

[tomcat] branch 9.0.x updated: bnd is now required for compilation

[markt]

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 139232b  bnd is now required for compilation
139232b is described below

commit 139232b864fd5cce52db9bf0c9e04ce501cd16b6
Author: Mark Thomas 
AuthorDate: Fri Sep 18 21:19:47 2020 +0100

bnd is now required for compilation
---
 build.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.xml b/build.xml
index 8c57f68..7c65d25 100644
--- a/build.xml
+++ b/build.xml
@@ -940,7 +940,7 @@
 
   
 
-  
+  
 
 
 
-  
+  
 

[Bug 64751] Incomplete module info descriptor

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=64751

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #2 from Mark Thomas  ---
Fixed in:
- master for 10.0.0-M9 onwards
- 9.0.x for 9.0.39 onwards

You may want to build with source and test this. I checked the very obvious but
I wouldn't be surprised if there were other code paths that had issues under
JPMS.

-- 
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

[tomcat] 03/03: It appears these need to be exported else reflection doesn't work

[markt]

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

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

commit b18898ed814dc142ecc0ec8b369b28efc444826f
Author: Mark Thomas 
AuthorDate: Fri Sep 18 21:12:23 2020 +0100

It appears these need to be exported else reflection doesn't work
---
 res/bnd/tomcat-embed-core.jar.tmp.bnd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/bnd/tomcat-embed-core.jar.tmp.bnd 
b/res/bnd/tomcat-embed-core.jar.tmp.bnd
index 1ae652d..d43c774 100644
--- a/res/bnd/tomcat-embed-core.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-core.jar.tmp.bnd
@@ -73,11 +73,13 @@ Export-Package: \
 org.apache.tomcat.util.http,\
 org.apache.tomcat.util.http.fileupload,\
 org.apache.tomcat.util.http.fileupload.disk,\
+org.apache.tomcat.util.http.fileupload.impl,\
 org.apache.tomcat.util.http.fileupload.servlet,\
 org.apache.tomcat.util.http.fileupload.util,\
 org.apache.tomcat.util.http.parser,\
 org.apache.tomcat.util.log,\
 org.apache.tomcat.util.modeler,\
+org.apache.tomcat.util.modeler.modules,\
 org.apache.tomcat.util.net,\
 org.apache.tomcat.util.net.openssl,\
 org.apache.tomcat.util.net.openssl.ciphers,\
@@ -89,10 +91,8 @@ Export-Package: \
 -includepackage: \
 org.apache.naming.factory.webservices,\
 org.apache.tomcat.util.bcel,\
-org.apache.tomcat.util.http.fileupload.impl,\
 org.apache.tomcat.util.http.fileupload.util.mime,\
 org.apache.tomcat.util.json,\
-org.apache.tomcat.util.modeler.modules,\
 org.apache.tomcat.util.net.jsse,\
 org.apache.tomcat.util.threads.res
 


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

[tomcat] 01/03: Fix 64751 - Correct JPMS descriptor for embedded

[markt]

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

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

commit d1f4d8712ddb52857f40a8cc4a82bf8b8e013f88
Author: Mark Thomas 
AuthorDate: Fri Sep 18 18:44:07 2020 +0100

Fix 64751 - Correct JPMS descriptor for embedded
---
 build.xml| 3 ++-
 java/org/apache/juli/logging/LogFactory.java | 3 +++
 res/checkstyle/org-import-control.xml| 1 +
 res/ide-support/eclipse/eclipse.classpath| 1 +
 res/ide-support/idea/tomcat.iml  | 9 +
 res/ide-support/netbeans/project.xml | 2 +-
 webapps/docs/changelog.xml   | 4 
 7 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/build.xml b/build.xml
index 0a9e785..ca46710 100644
--- a/build.xml
+++ b/build.xml
@@ -221,6 +221,7 @@
 
   
   
+
 
 
 
@@ -1587,7 +1588,7 @@
 
   
   
+depends="build-manifests,setup-bnd,compile,package" >
 
 
 
diff --git a/java/org/apache/juli/logging/LogFactory.java 
b/java/org/apache/juli/logging/LogFactory.java
index 3cd4562..56c805a 100644
--- a/java/org/apache/juli/logging/LogFactory.java
+++ b/java/org/apache/juli/logging/LogFactory.java
@@ -21,6 +21,8 @@ import java.nio.file.FileSystems;
 import java.util.ServiceLoader;
 import java.util.logging.LogManager;
 
+import aQute.bnd.annotation.spi.ServiceConsumer;
+
 /**
  * This is a modified LogFactory that uses a simple {@link ServiceLoader} based
  * discovery mechanism with a default of using JDK based logging. An
@@ -61,6 +63,7 @@ import java.util.logging.LogManager;
  * @author Costin Manolache
  * @author Richard A. Sitze
  */
+@ServiceConsumer(value=org.apache.juli.logging.Log.class)
 public class LogFactory {
 
 private static final LogFactory singleton = new LogFactory();
diff --git a/res/checkstyle/org-import-control.xml 
b/res/checkstyle/org-import-control.xml
index afa3e61..839ed8d 100644
--- a/res/checkstyle/org-import-control.xml
+++ b/res/checkstyle/org-import-control.xml
@@ -35,6 +35,7 @@
   
   
   
+  
   
 
 
diff --git a/res/ide-support/eclipse/eclipse.classpath 
b/res/ide-support/eclipse/eclipse.classpath
index 216c5d4..73e459e 100644
--- a/res/ide-support/eclipse/eclipse.classpath
+++ b/res/ide-support/eclipse/eclipse.classpath
@@ -29,5 +29,6 @@
 
 
 
+
 
 
diff --git a/res/ide-support/idea/tomcat.iml b/res/ide-support/idea/tomcat.iml
index 7d3e246..22834db 100644
--- a/res/ide-support/idea/tomcat.iml
+++ b/res/ide-support/idea/tomcat.iml
@@ -110,6 +110,15 @@
 
   
 
+
+  
+
+  
+
+
+
+  
+
 
   
 
diff --git a/res/ide-support/netbeans/project.xml 
b/res/ide-support/netbeans/project.xml
index 084b8f5..a78164c 100644
--- a/res/ide-support/netbeans/project.xml
+++ b/res/ide-support/netbeans/project.xml
@@ -178,7 +178,7 @@
 -->
 
 java
-${base.path}/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar:${base.path}/wsdl4j-1.6.3/wsdl4j-1.6.3.jar:${base.path}/ecj-4.15/ecj-4.15.jar:${ant.includes}/
+${base.path}/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar:${base.path}/wsdl4j-1.6.3/wsdl4j-1.6.3.jar:${base.path}/ecj-4.15/ecj-4.15.jar:${base.path}/bnd-5.1.1/biz.aQute.bnd-5.1.1.jar:${ant.includes}/
 1.7
 
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 333f115..3b4d63b 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -70,6 +70,10 @@
 Allow using the utility executor for annotation scanning. Patch
 provided by Jatin Kamnani. (remm)
   
+  
+64751: Correct the JPMS module descriptor so the embedded
+JARs may be used with JPMS. (markt)
+  
 
   
   


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

[tomcat] 02/03: Fix unwanted JPMS dependency of embed-core on embed-jasper

[markt]

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

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

commit 96e1d96e20defbc0825771c6ce7bee32e54d4c8c
Author: Mark Thomas 
AuthorDate: Fri Sep 18 19:55:16 2020 +0100

Fix unwanted JPMS dependency of embed-core on embed-jasper

This wasn't happening with a clean/release build. It was with an
incremental build because the embed-jasper JAR was then present when
embed-core was processed. Moving these classes, which are only used by
Japser, ensures this dependency is not created.
---
 build.xml   | 2 ++
 res/bnd/tomcat-embed-core.jar.tmp.bnd   | 1 -
 res/bnd/tomcat-embed-jasper.jar.tmp.bnd | 3 ++-
 webapps/docs/changelog.xml  | 4 
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/build.xml b/build.xml
index ca46710..8c57f68 100644
--- a/build.xml
+++ b/build.xml
@@ -742,11 +742,13 @@
 
 
 
+
   
 
   
 
 
+
   
 
   
diff --git a/res/bnd/tomcat-embed-core.jar.tmp.bnd 
b/res/bnd/tomcat-embed-core.jar.tmp.bnd
index a834809..1ae652d 100644
--- a/res/bnd/tomcat-embed-core.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-core.jar.tmp.bnd
@@ -67,7 +67,6 @@ Export-Package: \
 org.apache.tomcat.util.compat,\
 org.apache.tomcat.util.descriptor,\
 org.apache.tomcat.util.descriptor.tagplugin,\
-org.apache.tomcat.util.descriptor.tld,\
 org.apache.tomcat.util.descriptor.web,\
 org.apache.tomcat.util.digester,\
 org.apache.tomcat.util.file,\
diff --git a/res/bnd/tomcat-embed-jasper.jar.tmp.bnd 
b/res/bnd/tomcat-embed-jasper.jar.tmp.bnd
index 5284827..d9cf762 100644
--- a/res/bnd/tomcat-embed-jasper.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-jasper.jar.tmp.bnd
@@ -28,7 +28,8 @@ Export-Package: \
 org.apache.jasper.servlet,\
 org.apache.jasper.tagplugins.jstl,\
 org.apache.jasper.tagplugins.jstl.core,\
-org.apache.jasper.util
+org.apache.jasper.util,\
+org.apache.tomcat.util.descriptor.tld
 
 -includepackage: \
 org.apache.jasper.resources
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 3b4d63b..b8da6d8 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -74,6 +74,10 @@
 64751: Correct the JPMS module descriptor so the embedded
 JARs may be used with JPMS. (markt)
   
+  
+When performing an incremental build, ensure bdn does not create
+unwanted JPMS dependencies between embedded JARs. (markt)
+  
 
   
   


-
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 (514ef4e -> b18898e)

[markt]

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

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


from 514ef4e  Remove noop pool shutdown code
 new d1f4d87  Fix 64751 - Correct JPMS descriptor for embedded
 new 96e1d96  Fix unwanted JPMS dependency of embed-core on embed-jasper
 new b18898e  It appears these need to be exported else reflection doesn't 
work

The 3 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:
 build.xml| 5 -
 java/org/apache/juli/logging/LogFactory.java | 3 +++
 res/bnd/tomcat-embed-core.jar.tmp.bnd| 5 ++---
 res/bnd/tomcat-embed-jasper.jar.tmp.bnd  | 3 ++-
 res/checkstyle/org-import-control.xml| 1 +
 res/ide-support/eclipse/eclipse.classpath| 1 +
 res/ide-support/idea/tomcat.iml  | 9 +
 res/ide-support/netbeans/project.xml | 2 +-
 webapps/docs/changelog.xml   | 8 
 9 files changed, 31 insertions(+), 6 deletions(-)


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

[tomcat] 01/03: Fix 64751 - Correct JPMS descriptor for embedded

[markt]

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

commit 57463377fdc13556f80d8ac8f524dbf9684ca377
Author: Mark Thomas 
AuthorDate: Fri Sep 18 18:44:07 2020 +0100

Fix 64751 - Correct JPMS descriptor for embedded
---
 build.xml| 3 ++-
 java/org/apache/juli/logging/LogFactory.java | 3 +++
 res/checkstyle/org-import-control.xml| 1 +
 res/ide-support/eclipse/eclipse.classpath| 1 +
 res/ide-support/idea/tomcat.iml  | 9 +
 res/ide-support/netbeans/project.xml | 2 +-
 webapps/docs/changelog.xml   | 4 
 7 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/build.xml b/build.xml
index b165c5f..4badeed 100644
--- a/build.xml
+++ b/build.xml
@@ -225,6 +225,7 @@
 
   
   
+
 
 
 
@@ -1596,7 +1597,7 @@
 
   
   
+depends="build-manifests,setup-bnd,compile,package" >
 
 
 
diff --git a/java/org/apache/juli/logging/LogFactory.java 
b/java/org/apache/juli/logging/LogFactory.java
index 3cd4562..56c805a 100644
--- a/java/org/apache/juli/logging/LogFactory.java
+++ b/java/org/apache/juli/logging/LogFactory.java
@@ -21,6 +21,8 @@ import java.nio.file.FileSystems;
 import java.util.ServiceLoader;
 import java.util.logging.LogManager;
 
+import aQute.bnd.annotation.spi.ServiceConsumer;
+
 /**
  * This is a modified LogFactory that uses a simple {@link ServiceLoader} based
  * discovery mechanism with a default of using JDK based logging. An
@@ -61,6 +63,7 @@ import java.util.logging.LogManager;
  * @author Costin Manolache
  * @author Richard A. Sitze
  */
+@ServiceConsumer(value=org.apache.juli.logging.Log.class)
 public class LogFactory {
 
 private static final LogFactory singleton = new LogFactory();
diff --git a/res/checkstyle/org-import-control.xml 
b/res/checkstyle/org-import-control.xml
index fc69cef..a67ffa2 100644
--- a/res/checkstyle/org-import-control.xml
+++ b/res/checkstyle/org-import-control.xml
@@ -37,6 +37,7 @@
   
   
   
+  
   
 
 
diff --git a/res/ide-support/eclipse/eclipse.classpath 
b/res/ide-support/eclipse/eclipse.classpath
index 216c5d4..73e459e 100644
--- a/res/ide-support/eclipse/eclipse.classpath
+++ b/res/ide-support/eclipse/eclipse.classpath
@@ -29,5 +29,6 @@
 
 
 
+
 
 
diff --git a/res/ide-support/idea/tomcat.iml b/res/ide-support/idea/tomcat.iml
index 7d3e246..22834db 100644
--- a/res/ide-support/idea/tomcat.iml
+++ b/res/ide-support/idea/tomcat.iml
@@ -110,6 +110,15 @@
 
   
 
+
+  
+
+  
+
+
+
+  
+
 
   
 
diff --git a/res/ide-support/netbeans/project.xml 
b/res/ide-support/netbeans/project.xml
index 084b8f5..a78164c 100644
--- a/res/ide-support/netbeans/project.xml
+++ b/res/ide-support/netbeans/project.xml
@@ -178,7 +178,7 @@
 -->
 
 java
-${base.path}/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar:${base.path}/wsdl4j-1.6.3/wsdl4j-1.6.3.jar:${base.path}/ecj-4.15/ecj-4.15.jar:${ant.includes}/
+${base.path}/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar:${base.path}/wsdl4j-1.6.3/wsdl4j-1.6.3.jar:${base.path}/ecj-4.15/ecj-4.15.jar:${base.path}/bnd-5.1.1/biz.aQute.bnd-5.1.1.jar:${ant.includes}/
 1.7
 
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index f1d7a76..26605a0 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -71,6 +71,10 @@
 Allow using the utility executor for annotation scanning. Patch
 provided by Jatin Kamnani. (remm)
   
+  
+64751: Correct the JPMS module descriptor so the embedded
+JARs may be used with JPMS. (markt)
+  
 
   
   


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

[tomcat] 03/03: It appears these need to be exported else reflection doesn't work

[markt]

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

commit 2c8fdae4abab9e949cef94b8fd44d4f3b819a65b
Author: Mark Thomas 
AuthorDate: Fri Sep 18 21:12:23 2020 +0100

It appears these need to be exported else reflection doesn't work
---
 res/bnd/tomcat-embed-core.jar.tmp.bnd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/bnd/tomcat-embed-core.jar.tmp.bnd 
b/res/bnd/tomcat-embed-core.jar.tmp.bnd
index aab93ea..40e7f17 100644
--- a/res/bnd/tomcat-embed-core.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-core.jar.tmp.bnd
@@ -73,11 +73,13 @@ Export-Package: \
 org.apache.tomcat.util.http,\
 org.apache.tomcat.util.http.fileupload,\
 org.apache.tomcat.util.http.fileupload.disk,\
+org.apache.tomcat.util.http.fileupload.impl,\
 org.apache.tomcat.util.http.fileupload.servlet,\
 org.apache.tomcat.util.http.fileupload.util,\
 org.apache.tomcat.util.http.parser,\
 org.apache.tomcat.util.log,\
 org.apache.tomcat.util.modeler,\
+org.apache.tomcat.util.modeler.modules,\
 org.apache.tomcat.util.net,\
 org.apache.tomcat.util.net.openssl,\
 org.apache.tomcat.util.net.openssl.ciphers,\
@@ -89,10 +91,8 @@ Export-Package: \
 -includepackage: \
 org.apache.naming.factory.webservices,\
 org.apache.tomcat.util.bcel,\
-org.apache.tomcat.util.http.fileupload.impl,\
 org.apache.tomcat.util.http.fileupload.util.mime,\
 org.apache.tomcat.util.json,\
-org.apache.tomcat.util.modeler.modules,\
 org.apache.tomcat.util.net.jsse,\
 org.apache.tomcat.util.threads.res
 


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

[tomcat] branch master updated (bbe29a8 -> 2c8fdae)

[markt]

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 bbe29a8  Remove noop pool shutdown code
 new 5746337  Fix 64751 - Correct JPMS descriptor for embedded
 new 3815b49  Fix unwanted JPMS dependency of embed-core on embed-jasper
 new 2c8fdae  It appears these need to be exported else reflection doesn't 
work

The 3 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:
 build.xml| 5 -
 java/org/apache/juli/logging/LogFactory.java | 3 +++
 res/bnd/tomcat-embed-core.jar.tmp.bnd| 5 ++---
 res/bnd/tomcat-embed-jasper.jar.tmp.bnd  | 3 ++-
 res/checkstyle/org-import-control.xml| 1 +
 res/ide-support/eclipse/eclipse.classpath| 1 +
 res/ide-support/idea/tomcat.iml  | 9 +
 res/ide-support/netbeans/project.xml | 2 +-
 webapps/docs/changelog.xml   | 8 
 9 files changed, 31 insertions(+), 6 deletions(-)


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

[tomcat] 02/03: Fix unwanted JPMS dependency of embed-core on embed-jasper

[markt]

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

commit 3815b4951eb3acd30a0b77aafa75fbdb928d5782
Author: Mark Thomas 
AuthorDate: Fri Sep 18 19:55:16 2020 +0100

Fix unwanted JPMS dependency of embed-core on embed-jasper

This wasn't happening with a clean/release build. It was with an
incremental build because the embed-jasper JAR was then present when
embed-core was processed. Moving these classes, which are only used by
Japser, ensures this dependency is not created.
---
 build.xml   | 2 ++
 res/bnd/tomcat-embed-core.jar.tmp.bnd   | 1 -
 res/bnd/tomcat-embed-jasper.jar.tmp.bnd | 3 ++-
 webapps/docs/changelog.xml  | 4 
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/build.xml b/build.xml
index 4badeed..da0e448 100644
--- a/build.xml
+++ b/build.xml
@@ -745,11 +745,13 @@
 
 
 
+
   
 
   
 
 
+
   
 
   
diff --git a/res/bnd/tomcat-embed-core.jar.tmp.bnd 
b/res/bnd/tomcat-embed-core.jar.tmp.bnd
index 5d4f84e..aab93ea 100644
--- a/res/bnd/tomcat-embed-core.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-core.jar.tmp.bnd
@@ -67,7 +67,6 @@ Export-Package: \
 org.apache.tomcat.util.compat,\
 org.apache.tomcat.util.descriptor,\
 org.apache.tomcat.util.descriptor.tagplugin,\
-org.apache.tomcat.util.descriptor.tld,\
 org.apache.tomcat.util.descriptor.web,\
 org.apache.tomcat.util.digester,\
 org.apache.tomcat.util.file,\
diff --git a/res/bnd/tomcat-embed-jasper.jar.tmp.bnd 
b/res/bnd/tomcat-embed-jasper.jar.tmp.bnd
index ba66fad..20ae1e4 100644
--- a/res/bnd/tomcat-embed-jasper.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-jasper.jar.tmp.bnd
@@ -28,7 +28,8 @@ Export-Package: \
 org.apache.jasper.servlet,\
 org.apache.jasper.tagplugins.jstl,\
 org.apache.jasper.tagplugins.jstl.core,\
-org.apache.jasper.util
+org.apache.jasper.util,\
+org.apache.tomcat.util.descriptor.tld
 
 -includepackage: \
 org.apache.jasper.resources
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 26605a0..b8124a8 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -75,6 +75,10 @@
 64751: Correct the JPMS module descriptor so the embedded
 JARs may be used with JPMS. (markt)
   
+  
+When performing an incremental build, ensure bdn does not create
+unwanted JPMS dependencies between embedded JARs. (markt)
+  
 
   
   


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

[GitHub] [tomcat] ChristopherSchultz edited a comment on pull request #351: Remove White Spaces from the JSP files

[GitBox]

ChristopherSchultz edited a comment on pull request #351:
URL: https://github.com/apache/tomcat/pull/351#issuecomment-695046168


   Playing the devil's advocate, here, for a moment:
   
   1. `gzip` is not a solution, here, because it "hides" the problem instead of 
solving it. If the whitespace is unwanted, then remove the whitespace. You can 
then `gzip` and get even better compression!
   2. This is an issue for any source code where source-indentation is valuable 
for the programmer/debugger, but useless in the output. I have the same problem 
with Velocity templates. Any structure which looks like this produces hude 
amounts of useless whitespace in the output:
   
   ```
   foreach(thing) {
   for(thing.otherThing) {
   if(foo) {
   whatever
   } else {
   something else
   }
   }
   }
   ```
   
   What you'd love to have in the output is a series of these:
   
   whatever
   something else
   whatever
   something else
   something else
   whatever
   something else
   something else
   
   But instead, you get all of the above _plus_ the indentation from each of 
those foreach/if/else/close-brace lines which are here to make sure the 
programmer doesn't go crazy.
   
   So there is something to be said for the removal of the whitespace. I'm not 
100% convinced this is the right approach, but the problem definitely exists 
and it would be nice to have a solution.



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



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

[GitHub] [tomcat] ChristopherSchultz edited a comment on pull request #351: Remove White Spaces from the JSP files

[GitBox]

ChristopherSchultz edited a comment on pull request #351:
URL: https://github.com/apache/tomcat/pull/351#issuecomment-695046168


   Playing the devil's advocate, here, for a moment:
   
   1. `gzip` is not a solution, here, because it "hides" the problem instead of 
solving it. If the whitespace is unwanted, then remove the whitespace. You can 
then `gzip` and get even better compression!
   2. This is an issue for any source code where source-indentation is valuable 
for the programmer/debugger, but useless in the output. I have the same problem 
with Velocity templates. Any structure which looks like this produces hude 
amounts of useless whitespace in the output:
   
   ```
foreach(thing) {
for(thing.otherThing) {
if(foo) {
whatever
} else {
something else
}
}
}
   ```
   
   What you'd love to have in the output is a series of these:
   
   whatever
   something else
   whatever
   something else
   something else
   whatever
   something else
   something else
   
   But instead, you get all of the above _plus_ the indentation from each of 
those foreach/if/else/close-brace lines which are here to make sure the 
programmer doesn't go crazy.
   
   So there is something to be said for the removal of the whitespace. I'm not 
100% convinced this is the right approach, but the problem definitely exists 
and it would be nice to have a solution.



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



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

[GitHub] [tomcat] ChristopherSchultz edited a comment on pull request #351: Remove White Spaces from the JSP files

[GitBox]

ChristopherSchultz edited a comment on pull request #351:
URL: https://github.com/apache/tomcat/pull/351#issuecomment-695046168


   Playing the devil's advocate, here, for a moment:
   
   1. `gzip` is not a solution, here, because it "hides" the problem instead of 
solving it. If the whitespace is unwanted, then remove the whitespace. You can 
then `gzip` and get even better compression!
   2. This is an issue for any source code where source-indentation is valuable 
for the programmer/debugger, but useless in the output. I have the same problem 
with Velocity templates. Any structure which looks like this produces hude 
amounts of useless whitespace in the output:
   
   `
foreach(thing) {
for(thing.otherThing) {
if(foo) {
whatever
} else {
something else
}
}
}
   `
   
   What you'd love to have in the output is a series of these:
   
   whatever
   something else
   whatever
   something else
   something else
   whatever
   something else
   something else
   
   But instead, you get all of the above _plus_ the indentation from each of 
those foreach/if/else/close-brace lines which are here to make sure the 
programmer doesn't go crazy.
   
   So there is something to be said for the removal of the whitespace. I'm not 
100% convinced this is the right approach, but the problem definitely exists 
and it would be nice to have a solution.



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



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

[GitHub] [tomcat] ChristopherSchultz edited a comment on pull request #351: Remove White Spaces from the JSP files

[GitBox]

ChristopherSchultz edited a comment on pull request #351:
URL: https://github.com/apache/tomcat/pull/351#issuecomment-695046168







This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



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

[GitHub] [tomcat] ChristopherSchultz commented on pull request #351: Remove White Spaces from the JSP files

[GitBox]

ChristopherSchultz commented on pull request #351:
URL: https://github.com/apache/tomcat/pull/351#issuecomment-695046168


   Playing the devil's advocate, here, for a moment:
   
   1. `gzip` is not a solution, here, because it "hides" the problem instead of 
solving it. If the whitespace is unwanted, then remove the whitespace. You can 
then `gzip` and get even better compression!
   2. This is an issue for any source code where source-indentation is valuable 
for the programmer/debugger, but useless in the output. I have the same problem 
with Velocity templates. Any structure which looks like this produces hude 
amounts of useless whitespace in the output:
   
   foreach(thing) {
   for(thing.otherThing) {
   if(foo) {
   whatever
   } else {
   something else
   }
   }
   }
   
   What you'd love to have in the output is a series of these:
   
   whatever
   something else
   whatever
   something else
   something else
   whatever
   something else
   something else
   
   But instead, you get all of the above _plus_ the indentation from each of 
those foreach/if/else/close-brace lines which are here to make sure the 
programmer doesn't go crazy.
   
   So there is something to be said for the removal of the whitespace. I'm not 
100% convinced this is the right approach, but the problem definitely exists 
and it would be nice to have a solution.



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



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

[GitHub] [tomcat] kamnani commented on pull request #351: Remove White Spaces from the JSP files

[GitBox]

kamnani commented on pull request #351:
URL: https://github.com/apache/tomcat/pull/351#issuecomment-695044633


   > Have you considered using gzip compression for such big responses? It'd 
help much better that the white space stripping.
   > […](#)
   > On Fri, Sep 18, 2020, 20:39 kamnani ***@***.***> wrote: <%@ taglib 
uri="http://java.sun.com/jsp/jstl/core; prefix="c"%> <%@ taglib 
uri="http://java.sun.com/jsp/jstl/functions; prefix="fn" %>  

  
  ${feature.featureName}:jsp-exec-time  <%-- PLEASE ENSURE ANY CHANGES MADE HERE ARE KEPT IN SYNC WITH 
/WEB-INF/views/jsp/ajax/.jsp --%>
   


 ${module.content} 

   
  
 
  ${feature.content}
 ${feature.content} 
   <%@ include 
file="criticalFeatureLogging.jsp" %>

   ${jspError} 
id="${feature.featureName}-module-error" style="display: 
 > none;">${module.moduleError}id="${feature.featureName}-view-model" style="display: 
 > none;">${requestScope[feature.featureName]} 
 >   <%@ include 
 > file="/WEB-INF/views/jsp/features/debug/includeIsDebugJs.jsp" %>  
 >  1. This is from a real file in a critical application but we 
 > stripped(or even marked ***) out certain proprietary lines. If there is an 
 > error or such that's why. 2. The indented tags such as line 12 results in 
 > white space on the html output. This white space is eliminated via this 
 > change. 3. Our application is filled with neatly-formatted JSPs that output 
 > waste such as that. One public-facing HTML page became 20% smaller after 
 > implementing this. — You are receiving this because you wer
 e mentioned. Reply to this email directly, view it on GitHub <[#351 
(comment)](https://github.com/apache/tomcat/pull/351#issuecomment-694997270)>, 
or unsubscribe 

 .
   
   GZIP compression is good for interleaved whitespace (90+%), however good is 
neither free nor complete (100%).



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



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

[GitHub] [tomcat] martin-g commented on pull request #351: Remove White Spaces from the JSP files

[GitBox]

martin-g commented on pull request #351:
URL: https://github.com/apache/tomcat/pull/351#issuecomment-695042633


   Have you considered using gzip compression for such big responses?
   It'd help much better that the white space stripping.
   
   On Fri, Sep 18, 2020, 20:39 kamnani  wrote:
   
   > <%@ taglib uri="http://java.sun.com/jsp/jstl/core; prefix="c"%>
   > <%@ taglib uri="http://java.sun.com/jsp/jstl/functions; prefix="fn" %>
   >
   > 
   >
   > 
   > 
   > 
   > 
   > 
   > 
   > 
   > 
   > 
   > 
   > 
   > 
   > 
   > 
   > 
   > 
   > 
   > 
   > 
   > 
   > 
   > 
   > 
   > 
   >
   > ${feature.featureName}:jsp-exec-time
   >
   > 
   > <%-- PLEASE ENSURE ANY CHANGES MADE HERE ARE KEPT IN SYNC WITH 
/WEB-INF/views/jsp/ajax/.jsp --%>
   >
   > 
   > 
   > 
   > 
   > 
   > 
   > 
   > 
   > 
   > 
   > 
   > 
   > 
   > 
   > 
   > 
   > 
   > 
   > 
   > ${module.content}
   > 
   > 
   > 
   > 
   > 
   > 
   > 
   > 
   > 
   > 
   > 
   > 
   > 
   > 
   > 
   > 
   > 
   > 
   > 
   > 
   > 
   > 
   > 
   > 
   > ${feature.content}
   > 
   > 
   > 
   > ${feature.content}
   > 
   >
   > 
   > 
   >
   > <%@ include file="criticalFeatureLogging.jsp" %>
   >
   > 
   >
   > 
   > 
   > 
   > 
   > 
   > 
   >
   > 
   > 
   > 
   > ${jspError}
   > 
   > 
   > 
   > ${module.moduleError}
   > 
   > 
   > ${requestScope[feature.featureName]}
   > 
   > 
   > 
   > 
   > 
   > 
   >
   > <%@ include 
file="/WEB-INF/views/jsp/features/debug/includeIsDebugJs.jsp" %>
   > 
   >
   > 
   >
   >
   >1. This is from a real file in a critical application but we
   >stripped(or even marked ***) out certain proprietary lines. If there is 
an
   >error or such that's why.
   >2. The indented tags such as line 12 results in white space on the
   >html output. This white space is eliminated via this change.
   >3. Our application is filled with neatly-formatted JSPs that output
   >waste such as that. One public-facing HTML page became 20% smaller after
   >implementing this.
   >
   > —
   > You are receiving this because you were mentioned.
   > Reply to this email directly, view it on GitHub
   > , or
   > unsubscribe
   > 

   > .
   >
   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



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

Re: [VOTE] Release Apache Tomcat 7.0.106

[Felix Schumacher]

Am 16.09.20 um 13:26 schrieb Violeta Georgieva:
> The proposed Apache Tomcat 7.0.106 release is now available for voting.
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.106/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1279/
> The git tag is:
> https://github.com/apache/tomcat/tree/7.0.106
> c5d9010a75e99a69f59ba11cc1116d039a113979
>
> The proposed 7.0.106 release is:
> [ ] Broken - do not release
> [x] Stable - go ahead and release as 7.0.106 Stable
Felix
>
> Regards,
> Violeta
>

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

[GitHub] [tomcat] kamnani edited a comment on pull request #351: Remove White Spaces from the JSP files

[GitBox]

kamnani edited a comment on pull request #351:
URL: https://github.com/apache/tomcat/pull/351#issuecomment-694997270


   @markt-asf 
   ```
   <%@ taglib uri="http://java.sun.com/jsp/jstl/core; prefix="c"%>
   <%@ taglib uri="http://java.sun.com/jsp/jstl/functions; prefix="fn" %>
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   ${feature.featureName}:jsp-exec-time
   
   
   <%-- PLEASE ENSURE ANY CHANGES MADE HERE ARE KEPT IN SYNC WITH 
/WEB-INF/views/jsp/ajax/.jsp --%>
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   ${module.content}
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   ${feature.content}
   
   
   
   ${feature.content}
   
   
   
   
   
   <%@ include file="criticalFeatureLogging.jsp" %>
   
   
   
   
   
   
   
   
   
   
   
   
   
   ${jspError}
   
   
   
   ${module.moduleError}
   
   
   ${requestScope[feature.featureName]}
   
   
   
   
   
   
   
   <%@ include 
file="/WEB-INF/views/jsp/features/debug/includeIsDebugJs.jsp" %>
   
   
   
   ```
   
   
   1) This is from a real file in a critical application but we stripped(or 
even marked ***) out certain proprietary lines.  If there is an error or such 
that's why.
   2) The indented tags such as line 12  results in white space on the html 
output.  This white space is eliminated via this change.
   3) Our application is filled with neatly-formatted JSPs that output waste 
such as that.  One public-facing HTML page became 20% smaller after 
implementing this.



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



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

[GitHub] [tomcat] kamnani commented on pull request #351: Remove White Spaces from the JSP files

[GitBox]

kamnani commented on pull request #351:
URL: https://github.com/apache/tomcat/pull/351#issuecomment-694997270


   ```
   <%@ taglib uri="http://java.sun.com/jsp/jstl/core; prefix="c"%>
   <%@ taglib uri="http://java.sun.com/jsp/jstl/functions; prefix="fn" %>
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   ${feature.featureName}:jsp-exec-time
   
   
   <%-- PLEASE ENSURE ANY CHANGES MADE HERE ARE KEPT IN SYNC WITH 
/WEB-INF/views/jsp/ajax/.jsp --%>
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   ${module.content}
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   ${feature.content}
   
   
   
   ${feature.content}
   
   
   
   
   
   <%@ include file="criticalFeatureLogging.jsp" %>
   
   
   
   
   
   
   
   
   
   
   
   
   
   ${jspError}
   
   
   
   ${module.moduleError}
   
   
   ${requestScope[feature.featureName]}
   
   
   
   
   
   
   
   <%@ include 
file="/WEB-INF/views/jsp/features/debug/includeIsDebugJs.jsp" %>
   
   
   
   ```
   
   
   1) This is from a real file in a critical application but we stripped(or 
even marked ***) out certain proprietary lines.  If there is an error or such 
that's why.
   2) The indented tags such as line 12  results in white space on the html 
output.  This white space is eliminated via this change.
   3) Our application is filled with neatly-formatted JSPs that output waste 
such as that.  One public-facing HTML page became 20% smaller after 
implementing this.



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



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

[GitHub] [tomcat] kamnani removed a comment on pull request #351: Remove White Spaces from the JSP files

[GitBox]

kamnani removed a comment on pull request #351:
URL: https://github.com/apache/tomcat/pull/351#issuecomment-694991720


   ```
   <%@ taglib uri="http://java.sun.com/jsp/jstl/core; prefix="c"%>
   <%@ taglib uri="http://java.sun.com/jsp/jstl/functions; prefix="fn" %>
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   ${feature.featureName}:jsp-exec-time
   
   
   <%-- PLEASE ENSURE ANY CHANGES MADE HERE ARE KEPT IN SYNC WITH 
/WEB-INF/views/jsp/ajax/.jsp --%>
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   ${module.content}
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   ${feature.content}
   
   
   
   ${feature.content}
   
   
   
   
   
   <%@ include file="criticalFeatureLogging.jsp" %>
   
   
   
   
   
   
   
   
   
   
   
   
   
   ${jspError}
   
   
   
   ${module.moduleError}
   
   
   ${requestScope[feature.featureName]}
   
   
   
   
   
   
   
   <%@ include 
file="/WEB-INF/views/jsp/features/debug/includeIsDebugJs.jsp" %>
   
   
   
   ```
   
   
   1) This is from a real file in a critical application but we stripped(or 
even marked ***) out certain proprietary lines.  If there is an error or such 
that's why.
   2) The indented tags such as line 12  results in white space on the html 
output.  This white space is eliminated via this change.
   3) Our application is filled with neatly-formatted JSPs that output waste 
such as that.  One public-facing HTML page became 20% smaller after 
implementing this.



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



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

[GitHub] [tomcat] kamnani commented on pull request #351: Remove White Spaces from the JSP files

[GitBox]

kamnani commented on pull request #351:
URL: https://github.com/apache/tomcat/pull/351#issuecomment-694991720


   ```
   <%@ taglib uri="http://java.sun.com/jsp/jstl/core; prefix="c"%>
   <%@ taglib uri="http://java.sun.com/jsp/jstl/functions; prefix="fn" %>
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   ${feature.featureName}:jsp-exec-time
   
   
   <%-- PLEASE ENSURE ANY CHANGES MADE HERE ARE KEPT IN SYNC WITH 
/WEB-INF/views/jsp/ajax/.jsp --%>
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   ${module.content}
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   ${feature.content}
   
   
   
   ${feature.content}
   
   
   
   
   
   <%@ include file="criticalFeatureLogging.jsp" %>
   
   
   
   
   
   
   
   
   
   
   
   
   
   ${jspError}
   
   
   
   ${module.moduleError}
   
   
   ${requestScope[feature.featureName]}
   
   
   
   
   
   
   
   <%@ include 
file="/WEB-INF/views/jsp/features/debug/includeIsDebugJs.jsp" %>
   
   
   
   ```
   
   
   1) This is from a real file in a critical application but we stripped(or 
even marked ***) out certain proprietary lines.  If there is an error or such 
that's why.
   2) The indented tags such as line 12  results in white space on the html 
output.  This white space is eliminated via this change.
   3) Our application is filled with neatly-formatted JSPs that output waste 
such as that.  One public-facing HTML page became 20% smaller after 
implementing this.



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



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

[GitHub] [tomcat] markt-asf commented on pull request #351: Remove White Spaces from the JSP files

[GitBox]

markt-asf commented on pull request #351:
URL: https://github.com/apache/tomcat/pull/351#issuecomment-694971997


   That is an example of output. I'd like to see the original JSP please.



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



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

[GitHub] [tomcat] kamnani commented on pull request #351: Remove White Spaces from the JSP files

[GitBox]

kamnani commented on pull request #351:
URL: https://github.com/apache/tomcat/pull/351#issuecomment-694967799


   The primary aim of this PR is to trim off the white spaces. I can give you 
an example here. 
   
   Optimized
   ```
     | 
   -- | --
     | 
     | Quick Servlet Demo
     | 
     | 
     | Tomcat 9 Test app
     | This has over 1000 Jar Files
     | FastStartup Flag: true
     | OptimizeJSPs Flag: true
     | To see server Logs: Click Here
     | To see Optimized Render times of tags: Click Here
     | 
     | 
   ```
   Unoptimized:
   
   ```
   
   --
     | 
     | Quick Servlet Demo
     | 
     | 
     | Tomcat 9 Test app
     | This has over 1000 Jar Files
     |  
     | FastStartup Flag: false
     | OptimizeJSPs Flag: false
     | To see server Logs: Click 
Here
     | To see Optimized Render times of tags: Click Here
     |  
     |  
     |  
     |  
     |  
     |  
     | 
     | 
   ```
   
   For large JSP files these white spaces are tremendous and also useless when 
passed over the network. The white spaces are good for readability for the 
user, and are not necessarily needed as source-compiled files. 
   Removing these white spaces result in fewer writes to internal buffers and 
fewer flushes to the network and thus results in lower latency.



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



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

[GitHub] [tomcat] kamnani edited a comment on pull request #351: Remove White Spaces from the JSP files

[GitBox]

kamnani edited a comment on pull request #351:
URL: https://github.com/apache/tomcat/pull/351#issuecomment-694967799


   @markt-asf Thanks for replying on this thread.
   The primary aim of this PR is to trim off the white spaces. I can give you 
an example here. 
   
   Optimized
   ```
     | 
   -- | --
     | 
     | Quick Servlet Demo
     | 
     | 
     | Tomcat 9 Test app
     | This has over 1000 Jar Files
     | FastStartup Flag: true
     | OptimizeJSPs Flag: true
     | To see server Logs: Click Here
     | To see Optimized Render times of tags: Click Here
     | 
     | 
   ```
   Unoptimized:
   
   ```
   
   --
     | 
     | Quick Servlet Demo
     | 
     | 
     | Tomcat 9 Test app
     | This has over 1000 Jar Files
     |  
     | FastStartup Flag: false
     | OptimizeJSPs Flag: false
     | To see server Logs: Click 
Here
     | To see Optimized Render times of tags: Click Here
     |  
     |  
     |  
     |  
     |  
     |  
     | 
     | 
   ```
   
   For large JSP files these white spaces are tremendous and also useless when 
passed over the network. The white spaces are good for readability for the 
user, and are not necessarily needed as source-compiled files. 
   Removing these white spaces result in fewer writes to internal buffers and 
fewer flushes to the network and thus results in lower latency.



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



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

[GitHub] [tomcat] markt-asf commented on pull request #351: Remove White Spaces from the JSP files

[GitBox]

markt-asf commented on pull request #351:
URL: https://github.com/apache/tomcat/pull/351#issuecomment-694962456


   Before this PR goes any further I would like to see an example of a JSP that 
exhibits the problem that this PR is intended to solve.



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



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

Re: Application-accesible Executors

[Romain Manni-Bucau]

Hi Chris,

Isn't it EE concurrency utilities?
executors are injectable and designed to be used by the app and managed by
the container.
you can find an impl (for sample purposes) in
https://github.com/apache/tomee/tree/master/container/openejb-core/src/main/java/org/apache/openejb/threads,
then it is just a matter of defining it as resources in tomcat and do a
lookup in any init method to get it I think, we can.
Code is trivially extractable from tomee if it is what you have in mind and
Apache Geronimo can be a "shared" home for such lib by "design".

Hope it makes sense.

Romain Manni-Bucau
@rmannibucau  |  Blog
 | Old Blog
 | Github  |
LinkedIn  | Book



Le ven. 18 sept. 2020 à 18:10, Christopher Schultz <
ch...@christopherschultz.net> a écrit :

> All,
>
> I've recently been thinking about application uses of servlet-async and
> Websocket for long-running operations, or really for any interactions
> where you want to allow the request-processing thread to go back into
> the pool, but the application is still doing useful things and therefore
> needs its own thread.
>
> I'm thinking of something like SwingUtilities.invokeLater, though that
> does something very specific that is AWT-related, of course.
>
> I don't believe there is a (JavaEE/JakartaEE) standard for this, so I'm
> interested in what others think might be a good idea from a Tomcat
> standpoint.
>
>
> It's fairly easy to do something like this in one's own web application,
> maybe using a ServletContextListener:
>
> public class ExecutorProvider
>   implements ServletContextListener
> {
>   public static final EXECUTOR_SERVICE_KEY = "executor-service";
>
>   private ExecutorService _svc;
>
>   public void contextInitialized(ServletContext ctx) {
> _svc = Executors.newFixedThreadPool(10); // ?
>
> ctx.setAttribute(EXECUTOR_SERVICE_KEY, _svc);
>   }
>
>   public void contextDestroyed(ServletContext ctx) {
> ctx.removeAttribute(EXECUTOR_SERVICE_KEY);
> _svc.shutdown();
>   }
> }
>
> Then in a servlet, etc. you could:
>
>
> ((ExecutorService)ctx.getAttribute(ExecutorProvider.EXECUTOR_SERVICE_KEY)).submit(new
> Runnable() {
> public void run() {
> // your code goes here
> }
> });
>
> I'm wondering if there is scope here for Tomcat to provide this kind of
> service for applications that want to opt-into one. Maybe the above is
> so trivial as to not be worth it at all. But maybe it would be a nice
> service to provide to web applications, or maybe across multiple web
> applications in some kind of group. Or it might survive context restarts
> for some reason.
>
> Having this provided by Tomcat would allow admins to maybe override the
> sizes of the thread pools and other details that the application then
> wouldn't need to worry about.
>
> It might even tie-into Tomcat's utility-executor if that makes any sense
> 0-- though we'd have to make sure it executes in the right ClassLoader
> and/or security context.
>
> Any thoughts on this? Or is it really such a trivial thing as to not
> really be useful to anyone. Maybe simply providing a
> ServletContextListener class like the one above (with obvious robustness
> improvements) that anyone could configure for their own application
> would be sufficient/useful to users.
>
> -chris
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>

[GitHub] [tomcat] kamnani commented on pull request #351: Remove White Spaces from the JSP files

[GitBox]

kamnani commented on pull request #351:
URL: https://github.com/apache/tomcat/pull/351#issuecomment-694957263


   @martin-g This PR is also sitting stagnant since a few days now although all 
comments have been resolved. Can you provide some update on this too ? 



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



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

Application-accesible Executors

[Christopher Schultz]

All,

I've recently been thinking about application uses of servlet-async and
Websocket for long-running operations, or really for any interactions
where you want to allow the request-processing thread to go back into
the pool, but the application is still doing useful things and therefore
needs its own thread.

I'm thinking of something like SwingUtilities.invokeLater, though that
does something very specific that is AWT-related, of course.

I don't believe there is a (JavaEE/JakartaEE) standard for this, so I'm
interested in what others think might be a good idea from a Tomcat
standpoint.


It's fairly easy to do something like this in one's own web application,
maybe using a ServletContextListener:

public class ExecutorProvider
  implements ServletContextListener
{
  public static final EXECUTOR_SERVICE_KEY = "executor-service";

  private ExecutorService _svc;

  public void contextInitialized(ServletContext ctx) {
_svc = Executors.newFixedThreadPool(10); // ?

ctx.setAttribute(EXECUTOR_SERVICE_KEY, _svc);
  }

  public void contextDestroyed(ServletContext ctx) {
ctx.removeAttribute(EXECUTOR_SERVICE_KEY);
_svc.shutdown();
  }
}

Then in a servlet, etc. you could:

((ExecutorService)ctx.getAttribute(ExecutorProvider.EXECUTOR_SERVICE_KEY)).submit(new
Runnable() {
public void run() {
// your code goes here
}
});

I'm wondering if there is scope here for Tomcat to provide this kind of
service for applications that want to opt-into one. Maybe the above is
so trivial as to not be worth it at all. But maybe it would be a nice
service to provide to web applications, or maybe across multiple web
applications in some kind of group. Or it might survive context restarts
for some reason.

Having this provided by Tomcat would allow admins to maybe override the
sizes of the thread pools and other details that the application then
wouldn't need to worry about.

It might even tie-into Tomcat's utility-executor if that makes any sense
0-- though we'd have to make sure it executes in the right ClassLoader
and/or security context.

Any thoughts on this? Or is it really such a trivial thing as to not
really be useful to anyone. Maybe simply providing a
ServletContextListener class like the one above (with obvious robustness
improvements) that anyone could configure for their own application
would be sufficient/useful to users.

-chris

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

[GitHub] [tomcat] kamnani commented on pull request #352: Optimizing Resource Lookup using Bloom Filter

[GitBox]

kamnani commented on pull request #352:
URL: https://github.com/apache/tomcat/pull/352#issuecomment-694947975


   @rmaucher Thanks for the comment. 
   We tested this optimization on an application with 3500+ jars which 
performed 60,000+ class loads. This sliced off 180+ seconds from the startup 
time. I am sure this is a really good optimizations for large applications. 
   I can add those flags to the Context as you did with the other PR. 



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



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

[GitHub] [tomcat] rmaucher commented on pull request #352: Optimizing Resource Lookup using Bloom Filter

[GitBox]

rmaucher commented on pull request #352:
URL: https://github.com/apache/tomcat/pull/352#issuecomment-694943835


   I am rather skeptical on this PR overall.
   As with your other PR, please remove all the changes to the Host, the flag 
should be on the Context. Things are then much simpler without any unnecessary 
API changes.



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



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

[GitHub] [tomcat] kamnani commented on pull request #352: Optimizing Resource Lookup using Bloom Filter

[GitBox]

kamnani commented on pull request #352:
URL: https://github.com/apache/tomcat/pull/352#issuecomment-694940080


   @martin-g Thanks for your valuable feedback. 
   I have added the test cases and marked the conversations as resolved after 
the latest commits. Do we have anything else on this PR?



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



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

[GitHub] [tomcat] kamnani commented on pull request #354: Optimize Server startup time using multi-threading for annotation scanning

[GitBox]

kamnani commented on pull request #354:
URL: https://github.com/apache/tomcat/pull/354#issuecomment-694934337


   Thank you @rmaucher @martin-g to get this moving fast  . 
   Will this be backported to version 9 ?  



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



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

[Bug 64751] Incomplete module info descriptor

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=64751

--- Comment #1 from Mark Thomas  ---
Thanks for the report. This looks like a regression in 64548.

I have this issue fixed locally but that has uncovered another issue (Jasper is
required). I'm currently working on the Jasper issue.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [VOTE] Release Apache Tomcat 7.0.106

[Martin Grigorov]

On Wed, Sep 16, 2020 at 2:26 PM Violeta Georgieva 
wrote:

> The proposed Apache Tomcat 7.0.106 release is now available for voting.
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.106/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1279/
> The git tag is:
> https://github.com/apache/tomcat/tree/7.0.106
> c5d9010a75e99a69f59ba11cc1116d039a113979
>
> The proposed 7.0.106 release is:
> [ ] Broken - do not release
> [ X ] Stable - go ahead and release as 7.0.106 Stable
>

Tested with Apache Wicket 9.x examples.

Regards,
Martin


>
> Regards,
> Violeta
>

[tomcat] branch 9.0.x updated: Remove noop pool shutdown code

[remm]

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 514ef4e  Remove noop pool shutdown code
514ef4e is described below

commit 514ef4e7063a507b7e23cfd26f19a70dc3284ba6
Author: remm 
AuthorDate: Fri Sep 18 12:41:38 2020 +0200

Remove noop pool shutdown code

The utility executor shutdown is protected by a facade, so it just
worked fine.
---
 .../org/apache/catalina/startup/ContextConfig.java | 26 +-
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/java/org/apache/catalina/startup/ContextConfig.java 
b/java/org/apache/catalina/startup/ContextConfig.java
index f80bd1e..355dea3 100644
--- a/java/org/apache/catalina/startup/ContextConfig.java
+++ b/java/org/apache/catalina/startup/ContextConfig.java
@@ -2211,24 +2211,18 @@ public class ContextConfig implements LifecycleListener 
{
 Map javaClassCache) {
 Server s = getServer();
 ExecutorService pool = null;
+pool = s.getUtilityExecutor();
+List> futures = new ArrayList<>(fragments.size());
+for (WebXml fragment : fragments) {
+Runnable task = new AnnotationScanTask(fragment, handlesTypesOnly, 
javaClassCache);
+futures.add(pool.submit(task));
+}
 try {
-pool = s.getUtilityExecutor();
-List> futures = new ArrayList<>(fragments.size());
-for (WebXml fragment : fragments) {
-Runnable task = new AnnotationScanTask(fragment, 
handlesTypesOnly, javaClassCache);
-futures.add(pool.submit(task));
-}
-try {
-for (Future future : futures) {
-future.get();
-}
-} catch (Exception e) {
-throw new 
RuntimeException(sm.getString("contextConfig.processAnnotationsInParallelFailure"),
 e);
-}
-} finally {
-if (pool != null) {
-pool.shutdownNow();
+for (Future future : futures) {
+future.get();
 }
+} catch (Exception e) {
+throw new 
RuntimeException(sm.getString("contextConfig.processAnnotationsInParallelFailure"),
 e);
 }
 }
 


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

[tomcat] branch master updated: Remove noop pool shutdown code

[remm]

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 bbe29a8  Remove noop pool shutdown code
bbe29a8 is described below

commit bbe29a8c2d36b869996f2504032d666c49185362
Author: remm 
AuthorDate: Fri Sep 18 12:41:38 2020 +0200

Remove noop pool shutdown code

The utility executor shutdown is protected by a facade, so it just
worked fine.
---
 .../org/apache/catalina/startup/ContextConfig.java | 26 +-
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/java/org/apache/catalina/startup/ContextConfig.java 
b/java/org/apache/catalina/startup/ContextConfig.java
index e0c1edd..f47a8bd 100644
--- a/java/org/apache/catalina/startup/ContextConfig.java
+++ b/java/org/apache/catalina/startup/ContextConfig.java
@@ -2211,24 +2211,18 @@ public class ContextConfig implements LifecycleListener 
{
 Map javaClassCache) {
 Server s = getServer();
 ExecutorService pool = null;
+pool = s.getUtilityExecutor();
+List> futures = new ArrayList<>(fragments.size());
+for (WebXml fragment : fragments) {
+Runnable task = new AnnotationScanTask(fragment, handlesTypesOnly, 
javaClassCache);
+futures.add(pool.submit(task));
+}
 try {
-pool = s.getUtilityExecutor();
-List> futures = new ArrayList<>(fragments.size());
-for (WebXml fragment : fragments) {
-Runnable task = new AnnotationScanTask(fragment, 
handlesTypesOnly, javaClassCache);
-futures.add(pool.submit(task));
-}
-try {
-for (Future future : futures) {
-future.get();
-}
-} catch (Exception e) {
-throw new 
RuntimeException(sm.getString("contextConfig.processAnnotationsInParallelFailure"),
 e);
-}
-} finally {
-if (pool != null) {
-pool.shutdownNow();
+for (Future future : futures) {
+future.get();
 }
+} catch (Exception e) {
+throw new 
RuntimeException(sm.getString("contextConfig.processAnnotationsInParallelFailure"),
 e);
 }
 }
 


-
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

[buildbot]

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/5439

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] 3607b4daae3b81ed372b73494701f5c334d257b9
Blamelist: remm 

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 64751] New: Incomplete module info descriptor

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=64751

Bug ID: 64751
   Summary: Incomplete module info descriptor
   Product: Tomcat 9
   Version: 9.0.38
  Hardware: PC
OS: Mac OS X 10.1
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: guy.veraght...@gmail.com
  Target Milestone: -

Since version 9.0.38 tomcat-embedded-core is no longer usable in a jpms module
context. Following exception occurs at startup:

Caused by: java.util.ServiceConfigurationError: org.apache.juli.logging.Log:
module org.apache.tomcat.embed.core does not declare `uses`
at java.base/java.util.ServiceLoader.fail(ServiceLoader.java:588)
~[na:na]
at
java.base/java.util.ServiceLoader.checkCaller(ServiceLoader.java:574) ~[na:na]
at java.base/java.util.ServiceLoader.(ServiceLoader.java:503)
~[na:na]
at java.base/java.util.ServiceLoader.load(ServiceLoader.java:1691)
~[na:na]
at
org.apache.tomcat.embed.core@9.0.38/org.apache.juli.logging.LogFactory.(LogFactory.java:89)
~[tomcat-embed-core-9.0.38.jar:na]
at
org.apache.tomcat.embed.core@9.0.38/org.apache.juli.logging.LogFactory.(LogFactory.java:66)
~[tomcat-embed-core-9.0.38.jar:na]
at
org.apache.tomcat.embed.core@9.0.38/org.apache.catalina.core.AprLifecycleListener.(AprLifecycleListener.java:48)
~[tomcat-embed-core-9.0.38.jar:na]
at
spring.boot@2.3.4.RELEASE/org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory.getDefaultLifecycleListeners(TomcatServletWebServerFactory.java:167)
~[spring-boot-2.3.4.RELEASE.jar:na]


The ServiceLoader API is used, but this is not correctly declared in the
module-info.java file.

-- 
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

Re: [tomcat] branch master updated: Use utility executor for scanning

[Rémy Maucherat]

On Fri, Sep 18, 2020 at 12:06 PM Mark Thomas  wrote:

> On 18/09/2020 10:40, r...@apache.org 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 27bb36b  Use utility executor for scanning
> > 27bb36b is described below
> >
> > commit 27bb36bdaa56d62fdcc28d3b8e3d4c25f4a44a50
> > Author: remm 
> > AuthorDate: Fri Sep 18 11:40:17 2020 +0200
> >
> > Use utility executor for scanning
> >
> > PR354 submitted by Jatin Kamnani.
> > The flag in on the context, as that's where it belongs. Defaults to
> > false, can be configured through the context defaults or per context.
>
> 
>
> > +protected void processAnnotationsInParallel(Set fragments,
> boolean handlesTypesOnly,
> > +Map JavaClassCacheEntry> javaClassCache) {
> > +Server s = getServer();
> > +ExecutorService pool = null;
> > +try {
> > +pool = s.getUtilityExecutor();
> > +List> futures = new ArrayList<>(fragments.size());
> > +for (WebXml fragment : fragments) {
> > +Runnable task = new AnnotationScanTask(fragment,
> handlesTypesOnly, javaClassCache);
> > +futures.add(pool.submit(task));
> > +}
> > +try {
> > +for (Future future : futures) {
> > +future.get();
> > +}
> > +} catch (Exception e) {
> > +throw new
> RuntimeException(sm.getString("contextConfig.processAnnotationsInParallelFailure"),
> e);
> > +}
> > +} finally {
> > +if (pool != null) {
> > +pool.shutdownNow();
> > +}
> >  }
> >  }
>
> Why is the executor being shutdown here? What about other Tomcat
> components that might be using it or want to use it in the future?
>

I forgot to remove that. It does nothing since there's a facade for the
executor which does a noop there.

Rémy

[Bug 58242] Scanning jars in classpath to get annotations in parallel instead of synchronously

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=58242

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #4 from Mark Thomas  ---
Implemented via https://github.com/apache/tomcat/pull/354

Fixed in:
- master for 10.0.0-M9 onwards
- 9.0.x for 9.0.39 onwards

-- 
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

Re: [tomcat] branch master updated: Use utility executor for scanning

[Mark Thomas]

On 18/09/2020 10:40, r...@apache.org 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 27bb36b  Use utility executor for scanning
> 27bb36b is described below
> 
> commit 27bb36bdaa56d62fdcc28d3b8e3d4c25f4a44a50
> Author: remm 
> AuthorDate: Fri Sep 18 11:40:17 2020 +0200
> 
> Use utility executor for scanning
> 
> PR354 submitted by Jatin Kamnani.
> The flag in on the context, as that's where it belongs. Defaults to
> false, can be configured through the context defaults or per context.



> +protected void processAnnotationsInParallel(Set fragments, 
> boolean handlesTypesOnly,
> +Map JavaClassCacheEntry> javaClassCache) {
> +Server s = getServer();
> +ExecutorService pool = null;
> +try {
> +pool = s.getUtilityExecutor();
> +List> futures = new ArrayList<>(fragments.size());
> +for (WebXml fragment : fragments) {
> +Runnable task = new AnnotationScanTask(fragment, 
> handlesTypesOnly, javaClassCache);
> +futures.add(pool.submit(task));
> +}
> +try {
> +for (Future future : futures) {
> +future.get();
> +}
> +} catch (Exception e) {
> +throw new 
> RuntimeException(sm.getString("contextConfig.processAnnotationsInParallelFailure"),
>  e);
> +}
> +} finally {
> +if (pool != null) {
> +pool.shutdownNow();
> +}
>  }
>  }

Why is the executor being shutdown here? What about other Tomcat
components that might be using it or want to use it in the future?

Mark

-
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: Javadoc fix

[remm]

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 3c4971b  Javadoc fix
3c4971b is described below

commit 3c4971ba8919e6dedac0654dd330d4b77664eda2
Author: remm 
AuthorDate: Fri Sep 18 11:52:09 2020 +0200

Javadoc fix
---
 java/org/apache/catalina/startup/ContextConfig.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/java/org/apache/catalina/startup/ContextConfig.java 
b/java/org/apache/catalina/startup/ContextConfig.java
index 3dc1638..f80bd1e 100644
--- a/java/org/apache/catalina/startup/ContextConfig.java
+++ b/java/org/apache/catalina/startup/ContextConfig.java
@@ -2205,6 +2205,7 @@ public class ContextConfig implements LifecycleListener {
  *
  * @param fragmentsSet of parallelizable scans
  * @param handlesTypesOnly Important parameter for the underlying scan
+ * @param javaClassCache The class cache
  */
 protected void processAnnotationsInParallel(Set fragments, boolean 
handlesTypesOnly,
 Map javaClassCache) {


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

[tomcat] branch master updated: Javadoc fix

[remm]

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 3607b4d  Javadoc fix
3607b4d is described below

commit 3607b4daae3b81ed372b73494701f5c334d257b9
Author: remm 
AuthorDate: Fri Sep 18 11:52:09 2020 +0200

Javadoc fix
---
 java/org/apache/catalina/startup/ContextConfig.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/java/org/apache/catalina/startup/ContextConfig.java 
b/java/org/apache/catalina/startup/ContextConfig.java
index a3cfcb8..e0c1edd 100644
--- a/java/org/apache/catalina/startup/ContextConfig.java
+++ b/java/org/apache/catalina/startup/ContextConfig.java
@@ -2205,6 +2205,7 @@ public class ContextConfig implements LifecycleListener {
  *
  * @param fragmentsSet of parallelizable scans
  * @param handlesTypesOnly Important parameter for the underlying scan
+ * @param javaClassCache The class cache
  */
 protected void processAnnotationsInParallel(Set fragments, boolean 
handlesTypesOnly,
 Map javaClassCache) {


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

[GitHub] [tomcat] rmaucher commented on pull request #354: Optimize Server startup time using multi-threading for annotation scanning

[GitBox]

rmaucher commented on pull request #354:
URL: https://github.com/apache/tomcat/pull/354#issuecomment-694771979


   I merged the PR with some changes and a minor fix. The flag was moved to the 
Context since that's where it belongs, and it avoids the unnecessary API 
changes.



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



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

[GitHub] [tomcat] rmaucher closed pull request #354: Optimize Server startup time using multi-threading for annotation scanning

[GitBox]

rmaucher closed pull request #354:
URL: https://github.com/apache/tomcat/pull/354


   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



-
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: Use utility executor for scanning

[remm]

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 101476c  Use utility executor for scanning
101476c is described below

commit 101476c3536ac09a105d0b603b2c51dd0f3770e9
Author: remm 
AuthorDate: Fri Sep 18 11:40:17 2020 +0200

Use utility executor for scanning

PR354 submitted by Jatin Kamnani.
The flag in on the context, as that's where it belongs. Defaults to
false, can be configured through the context defaults or per context.
---
 java/org/apache/catalina/Context.java  |  14 +++
 java/org/apache/catalina/core/StandardContext.java |  19 
 .../apache/catalina/core/mbeans-descriptors.xml|   4 +
 .../org/apache/catalina/startup/ContextConfig.java | 116 +
 .../org/apache/catalina/startup/FailedContext.java |   6 ++
 .../catalina/startup/LocalStrings.properties   |   1 +
 test/org/apache/tomcat/unittest/TesterContext.java |   6 ++
 webapps/docs/changelog.xml |   4 +
 webapps/docs/config/context.xml|   8 ++
 9 files changed, 156 insertions(+), 22 deletions(-)

diff --git a/java/org/apache/catalina/Context.java 
b/java/org/apache/catalina/Context.java
index 3e647dc..5aac225 100644
--- a/java/org/apache/catalina/Context.java
+++ b/java/org/apache/catalina/Context.java
@@ -761,6 +761,20 @@ public interface Context extends Container, ContextBind {
 public String getContainerSciFilter();
 
 
+/**
+ * @return the value of the parallel annotation scanning flag.  If true,
+ * it will dispatch scanning to the utility executor.
+ */
+public boolean isParallelAnnotationScanning();
+
+/**
+ * Set the parallel annotation scanning value.
+ *
+ * @param parallelAnnotationScanning new parallel annotation scanning flag
+ */
+public void setParallelAnnotationScanning(boolean 
parallelAnnotationScanning);
+
+
 // - Public Methods
 
 /**
diff --git a/java/org/apache/catalina/core/StandardContext.java 
b/java/org/apache/catalina/core/StandardContext.java
index 12641d7..06f7621 100644
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -828,6 +828,8 @@ public class StandardContext extends ContainerBase
 private boolean createUploadTargets = false;
 
 
+private boolean parallelAnnotationScanning = false;
+
 // - Context Properties
 
 @Override
@@ -1404,6 +1406,23 @@ public class StandardContext extends ContainerBase
 }
 
 
+@Override
+public void setParallelAnnotationScanning(boolean 
parallelAnnotationScanning) {
+
+boolean oldParallelAnnotationScanning = 
this.parallelAnnotationScanning;
+this.parallelAnnotationScanning = parallelAnnotationScanning;
+support.firePropertyChange("parallelAnnotationScanning", 
oldParallelAnnotationScanning,
+this.parallelAnnotationScanning);
+
+}
+
+
+@Override
+public boolean isParallelAnnotationScanning() {
+return this.parallelAnnotationScanning;
+}
+
+
 /**
  * @return the Locale to character set mapper for this Context.
  */
diff --git a/java/org/apache/catalina/core/mbeans-descriptors.xml 
b/java/org/apache/catalina/core/mbeans-descriptors.xml
index 1c0733f..50be99f 100644
--- a/java/org/apache/catalina/core/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/core/mbeans-descriptors.xml
@@ -208,6 +208,10 @@
description="The name of this Context"
type="java.lang.String"/>
 
+
+
 
diff --git a/java/org/apache/catalina/startup/ContextConfig.java 
b/java/org/apache/catalina/startup/ContextConfig.java
index d7b5a77..3dc1638 100644
--- a/java/org/apache/catalina/startup/ContextConfig.java
+++ b/java/org/apache/catalina/startup/ContextConfig.java
@@ -39,6 +39,8 @@ import java.util.Map.Entry;
 import java.util.Properties;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
 
 import javax.servlet.MultipartConfigElement;
 import javax.servlet.ServletContainerInitializer;
@@ -122,7 +124,6 @@ public class ContextConfig implements LifecycleListener {
 
 private static final Log log = LogFactory.getLog(ContextConfig.class);
 
-
 /**
  * The string resources for this package.
  */
@@ -1374,7 +1375,14 @@ public class ContextConfig implements LifecycleListener {
 protected void processClasses(WebXml webXml, Set orderedFragments) 
{
 // Step 4. Process /WEB-INF/classes for annotations and
 // @HandlesTypes matches
-Map javaClassCache = new HashMap<>();
+
+Map javaClassCache;
+
+if 

buildbot failure in on tomcat-trunk

[buildbot]

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/5438

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] 27bb36bdaa56d62fdcc28d3b8e3d4c25f4a44a50
Blamelist: remm 

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 master updated: Use utility executor for scanning

[remm]

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 27bb36b  Use utility executor for scanning
27bb36b is described below

commit 27bb36bdaa56d62fdcc28d3b8e3d4c25f4a44a50
Author: remm 
AuthorDate: Fri Sep 18 11:40:17 2020 +0200

Use utility executor for scanning

PR354 submitted by Jatin Kamnani.
The flag in on the context, as that's where it belongs. Defaults to
false, can be configured through the context defaults or per context.
---
 java/org/apache/catalina/Context.java  |  14 +++
 java/org/apache/catalina/core/StandardContext.java |  19 
 .../apache/catalina/core/mbeans-descriptors.xml|   4 +
 .../org/apache/catalina/startup/ContextConfig.java | 116 +
 .../org/apache/catalina/startup/FailedContext.java |   5 +
 .../catalina/startup/LocalStrings.properties   |   1 +
 test/org/apache/tomcat/unittest/TesterContext.java |   5 +
 webapps/docs/changelog.xml |   4 +
 webapps/docs/config/context.xml|   8 ++
 9 files changed, 154 insertions(+), 22 deletions(-)

diff --git a/java/org/apache/catalina/Context.java 
b/java/org/apache/catalina/Context.java
index b8f55a0..4cf844c 100644
--- a/java/org/apache/catalina/Context.java
+++ b/java/org/apache/catalina/Context.java
@@ -762,6 +762,20 @@ public interface Context extends Container, ContextBind {
 public String getContainerSciFilter();
 
 
+/**
+ * @return the value of the parallel annotation scanning flag.  If true,
+ * it will dispatch scanning to the utility executor.
+ */
+public boolean isParallelAnnotationScanning();
+
+/**
+ * Set the parallel annotation scanning value.
+ *
+ * @param parallelAnnotationScanning new parallel annotation scanning flag
+ */
+public void setParallelAnnotationScanning(boolean 
parallelAnnotationScanning);
+
+
 // - Public Methods
 
 /**
diff --git a/java/org/apache/catalina/core/StandardContext.java 
b/java/org/apache/catalina/core/StandardContext.java
index ce51d6c..a34f14e 100644
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -833,6 +833,8 @@ public class StandardContext extends ContainerBase
 
 private boolean dispatcherWrapsSameObject = 
Globals.STRICT_SERVLET_COMPLIANCE;
 
+private boolean parallelAnnotationScanning = false;
+
 // - Context Properties
 
 @Override
@@ -1447,6 +1449,23 @@ public class StandardContext extends ContainerBase
 }
 
 
+@Override
+public void setParallelAnnotationScanning(boolean 
parallelAnnotationScanning) {
+
+boolean oldParallelAnnotationScanning = 
this.parallelAnnotationScanning;
+this.parallelAnnotationScanning = parallelAnnotationScanning;
+support.firePropertyChange("parallelAnnotationScanning", 
oldParallelAnnotationScanning,
+this.parallelAnnotationScanning);
+
+}
+
+
+@Override
+public boolean isParallelAnnotationScanning() {
+return this.parallelAnnotationScanning;
+}
+
+
 /**
  * @return the Locale to character set mapper for this Context.
  */
diff --git a/java/org/apache/catalina/core/mbeans-descriptors.xml 
b/java/org/apache/catalina/core/mbeans-descriptors.xml
index 1c0733f..50be99f 100644
--- a/java/org/apache/catalina/core/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/core/mbeans-descriptors.xml
@@ -208,6 +208,10 @@
description="The name of this Context"
type="java.lang.String"/>
 
+
+
 
diff --git a/java/org/apache/catalina/startup/ContextConfig.java 
b/java/org/apache/catalina/startup/ContextConfig.java
index c1fe029..a3cfcb8 100644
--- a/java/org/apache/catalina/startup/ContextConfig.java
+++ b/java/org/apache/catalina/startup/ContextConfig.java
@@ -39,6 +39,8 @@ import java.util.Map.Entry;
 import java.util.Properties;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
 
 import jakarta.servlet.MultipartConfigElement;
 import jakarta.servlet.ServletContainerInitializer;
@@ -122,7 +124,6 @@ public class ContextConfig implements LifecycleListener {
 
 private static final Log log = LogFactory.getLog(ContextConfig.class);
 
-
 /**
  * The string resources for this package.
  */
@@ -1374,7 +1375,14 @@ public class ContextConfig implements LifecycleListener {
 protected void processClasses(WebXml webXml, Set orderedFragments) 
{
 // Step 4. Process /WEB-INF/classes for annotations and
 // @HandlesTypes matches
-Map javaClassCache = new HashMap<>();
+
+  

[tomcat] branch 8.5.x updated: Servlet 4 preview has been removed

[markt]

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 dd0aa8a  Servlet 4 preview has been removed
dd0aa8a is described below

commit dd0aa8aaf3fbb1b36d0c4f7b518a72d495ccf236
Author: Mark Thomas 
AuthorDate: Fri Sep 18 10:40:16 2020 +0100

Servlet 4 preview has been removed
---
 conf/catalina.policy | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/conf/catalina.policy b/conf/catalina.policy
index 4a5af06..ffa348d 100644
--- a/conf/catalina.policy
+++ b/conf/catalina.policy
@@ -183,9 +183,6 @@ grant {
 // Applications using WebSocket need to be able to access these packages
 permission java.lang.RuntimePermission 
"accessClassInPackage.org.apache.tomcat.websocket";
 permission java.lang.RuntimePermission 
"accessClassInPackage.org.apache.tomcat.websocket.server";
-
-// Applications need to access these packages to use the Servlet 4.0 
Preview
-permission java.lang.RuntimePermission 
"accessClassInPackage.org.apache.catalina.servlet4preview.http";
 };
 
 


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

buildbot success in on tomcat-7-trunk

[buildbot]

The Buildbot has detected a restored build on builder tomcat-7-trunk while 
building tomcat. Full details are available at:
https://ci.apache.org/builders/tomcat-7-trunk/builds/1780

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] 222d832e0b908637925b48364f42dfd03bcf0388
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 7.0.x updated: Increment minimum Ant version to 1.9.1

[markt]

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 222d832  Increment minimum Ant version to 1.9.1
222d832 is described below

commit 222d832e0b908637925b48364f42dfd03bcf0388
Author: Mark Thomas 
AuthorDate: Fri Sep 18 10:11:49 2020 +0100

Increment minimum Ant version to 1.9.1
---
 BUILDING.txt   | 4 ++--
 build.xml  | 3 ++-
 webapps/docs/building.xml  | 6 +++---
 webapps/docs/changelog.xml | 4 
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/BUILDING.txt b/BUILDING.txt
index 742c72c..2c085e2 100644
--- a/BUILDING.txt
+++ b/BUILDING.txt
@@ -82,9 +82,9 @@ source distribution, do the following:
   JSR-356 (Java WebSocket 1.1) support.
 
 
-(2) Install Apache Ant version 1.8.2 or later on your computer
+(2) Install Apache Ant version 1.9.1 or later on your computer
 
- 1. If Apache Ant version 1.8.2 or later is already installed on your 
computer, skip to (3).
+ 1. If Apache Ant version 1.9.1 or later is already installed on your 
computer, skip to (3).
 
  2. Download a binary distribution of Ant from:
 
diff --git a/build.xml b/build.xml
index 9095535..3c0cf4a 100644
--- a/build.xml
+++ b/build.xml
@@ -15,7 +15,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
+
 
   
 
diff --git a/webapps/docs/building.xml b/webapps/docs/building.xml
index af1682a..eb3ba23 100644
--- a/webapps/docs/building.xml
+++ b/webapps/docs/building.xml
@@ -66,10 +66,10 @@ The following is a quick step by step guide.
 
 
 
-
+
 
 
-Download a binary distribution of Ant 1.8.2 or later from
+Download a binary distribution of Ant 1.9.1 or later from
 https://ant.apache.org/bindownload.cgi;>here.
 
 
@@ -260,7 +260,7 @@ Variables to add two new Classpath Variables:
 
  TOMCAT_LIBS_BASEThe same location as the 
base.path
   setting in build.properties, where the binary dependencies have 
been downloaded
- ANT_HOMEthe base path of Ant 1.8.2 or later
+ ANT_HOMEthe base path of Ant 1.9.1 or later
 
 
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 4b41a9d..1148dd4 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -82,6 +82,10 @@
 Expand coverage of Russian translations. Pull request provided by
 Nikolay Gribanov. (markt)
   
+  
+Updated to Ant 1.9.1. The build now requires a minimum of Ant 1.9.1.
+(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: Fix backport

[markt]

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 6644164  Fix backport
6644164 is described below

commit 66441642f9a3e5607f05780120e693812179b0f2
Author: Mark Thomas 
AuthorDate: Fri Sep 18 09:22:24 2020 +0100

Fix backport
---
 .../authenticator/TestJaspicCallbackHandlerInAuthenticator.java  | 5 +
 1 file changed, 5 insertions(+)

diff --git 
a/test/org/apache/catalina/authenticator/TestJaspicCallbackHandlerInAuthenticator.java
 
b/test/org/apache/catalina/authenticator/TestJaspicCallbackHandlerInAuthenticator.java
index cd63ed8..45fdc26 100644
--- 
a/test/org/apache/catalina/authenticator/TestJaspicCallbackHandlerInAuthenticator.java
+++ 
b/test/org/apache/catalina/authenticator/TestJaspicCallbackHandlerInAuthenticator.java
@@ -180,6 +180,11 @@ public class TestJaspicCallbackHandlerInAuthenticator {
 protected Principal getPrincipal(String username) {
 return new GenericPrincipal(username, null, null);
 }
+
+@Override
+protected String getName() {
+return "Test Realm";
+}
 }
 }
 


-
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: Fix BZ 64715. Add PasswordValidationCallback support.

[markt]

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 bb88e99  Fix BZ 64715. Add PasswordValidationCallback support.
bb88e99 is described below

commit bb88e9995aff950bdd73fbed949f3396f2c89b01
Author: Mark Thomas 
AuthorDate: Fri Sep 18 09:12:53 2020 +0100

Fix BZ 64715. Add PasswordValidationCallback support.

https://bz.apache.org/bugzilla/show_bug.cgi?id=64715
Patch provided by Robert Rodewald
---
 .../catalina/authenticator/AuthenticatorBase.java  |  55 +
 .../authenticator/jaspic/CallbackHandlerImpl.java  |  52 +
 .../authenticator/jaspic/LocalStrings.properties   |   2 +
 .../TestJaspicCallbackHandlerInAuthenticator.java  | 129 +++--
 webapps/docs/changelog.xml |   4 +
 5 files changed, 190 insertions(+), 52 deletions(-)

diff --git a/java/org/apache/catalina/authenticator/AuthenticatorBase.java 
b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
index b053e49..b20b4b6 100644
--- a/java/org/apache/catalina/authenticator/AuthenticatorBase.java
+++ b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
@@ -42,6 +42,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.catalina.Authenticator;
+import org.apache.catalina.Contained;
 import org.apache.catalina.Container;
 import org.apache.catalina.Context;
 import org.apache.catalina.Globals;
@@ -50,7 +51,6 @@ import org.apache.catalina.Realm;
 import org.apache.catalina.Session;
 import org.apache.catalina.TomcatPrincipal;
 import org.apache.catalina.Valve;
-import org.apache.catalina.authenticator.jaspic.CallbackHandlerImpl;
 import org.apache.catalina.authenticator.jaspic.MessageInfoImpl;
 import org.apache.catalina.connector.Request;
 import org.apache.catalina.connector.Response;
@@ -221,7 +221,7 @@ public abstract class AuthenticatorBase extends ValveBase
  * default {@link 
org.apache.catalina.authenticator.jaspic.CallbackHandlerImpl}
  * will be used.
  */
-protected String jaspicCallbackHandlerClass = null;
+protected String jaspicCallbackHandlerClass = 
"org.apache.catalina.authenticator.jaspic.CallbackHandlerImpl";
 
 /**
  * Should the auth information (remote user and auth type) be returned as 
response
@@ -248,6 +248,7 @@ public abstract class AuthenticatorBase extends ValveBase
 
 private volatile String jaspicAppContextID = null;
 private volatile AuthConfigProvider jaspicProvider = null;
+private volatile CallbackHandler jaspicCallbackHandler = null;
 
 
 // - Properties
@@ -774,7 +775,7 @@ public abstract class AuthenticatorBase extends ValveBase
 new MessageInfoImpl(request.getRequest(), 
response.getResponse(), authMandatory);
 
 try {
-CallbackHandler callbackHandler = createCallbackHandler();
+CallbackHandler callbackHandler = getCallbackHandler();
 ServerAuthConfig serverAuthConfig = 
jaspicProvider.getServerAuthConfig(
 "HttpServlet", jaspicAppContextID, callbackHandler);
 String authContextID = 
serverAuthConfig.getAuthContextID(jaspicState.messageInfo);
@@ -788,29 +789,41 @@ public abstract class AuthenticatorBase extends ValveBase
 return jaspicState;
 }
 
+
+private CallbackHandler getCallbackHandler() {
+CallbackHandler handler = jaspicCallbackHandler;
+if (handler == null) {
+handler = createCallbackHandler();
+}
+return handler;
+}
+
+
 private CallbackHandler createCallbackHandler() {
 CallbackHandler callbackHandler = null;
-if (jaspicCallbackHandlerClass == null) {
-callbackHandler = CallbackHandlerImpl.getInstance();
-} else {
-Class clazz = null;
-try {
-clazz = Class.forName(jaspicCallbackHandlerClass, true,
-Thread.currentThread().getContextClassLoader());
-} catch (ClassNotFoundException e) {
-// Proceed with the retry below
-}
 
-try {
-if (clazz == null) {
-clazz = Class.forName(jaspicCallbackHandlerClass);
-}
-callbackHandler = 
(CallbackHandler)clazz.getConstructor().newInstance();
-} catch (ReflectiveOperationException e) {
-throw new SecurityException(e);
+Class clazz = null;
+try {
+clazz = Class.forName(jaspicCallbackHandlerClass, true,
+Thread.currentThread().getContextClassLoader());
+} catch (ClassNotFoundException e) {
+// Proceed with the retry below
+}
+
+try {
+

[Bug 64715] PasswordValidationCallback not supported

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=64715

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #18 from Mark Thomas  ---
Thanks for the work on this, and especially the patches. These have now been
applied (with minor tweaks) and will be in the next set of releases.

Fixed in:
- master for 10.0.0-M9 onwards
- 9.0.x for 9.0.39 onwards
- 8.5.x for 8.5.59 onwards

-- 
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

[tomcat] branch 9.0.x updated: Fix BZ 64715. Add PasswordValidationCallback support.

[markt]

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 0d7e6fe  Fix BZ 64715. Add PasswordValidationCallback support.
0d7e6fe is described below

commit 0d7e6fe578d67df12ed259608c8cc28aebbedcea
Author: Mark Thomas 
AuthorDate: Fri Sep 18 09:12:53 2020 +0100

Fix BZ 64715. Add PasswordValidationCallback support.

https://bz.apache.org/bugzilla/show_bug.cgi?id=64715
Patch provided by Robert Rodewald
---
 .../catalina/authenticator/AuthenticatorBase.java  |  55 +
 .../authenticator/jaspic/CallbackHandlerImpl.java  |  52 +
 .../authenticator/jaspic/LocalStrings.properties   |   2 +
 .../TestJaspicCallbackHandlerInAuthenticator.java  | 129 +++--
 webapps/docs/changelog.xml |   4 +
 5 files changed, 190 insertions(+), 52 deletions(-)

diff --git a/java/org/apache/catalina/authenticator/AuthenticatorBase.java 
b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
index f8377a4..b1c3070 100644
--- a/java/org/apache/catalina/authenticator/AuthenticatorBase.java
+++ b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
@@ -42,6 +42,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.catalina.Authenticator;
+import org.apache.catalina.Contained;
 import org.apache.catalina.Container;
 import org.apache.catalina.Context;
 import org.apache.catalina.Globals;
@@ -50,7 +51,6 @@ import org.apache.catalina.Realm;
 import org.apache.catalina.Session;
 import org.apache.catalina.TomcatPrincipal;
 import org.apache.catalina.Valve;
-import org.apache.catalina.authenticator.jaspic.CallbackHandlerImpl;
 import org.apache.catalina.authenticator.jaspic.MessageInfoImpl;
 import org.apache.catalina.connector.Request;
 import org.apache.catalina.connector.Response;
@@ -219,7 +219,7 @@ public abstract class AuthenticatorBase extends ValveBase
  * default {@link 
org.apache.catalina.authenticator.jaspic.CallbackHandlerImpl}
  * will be used.
  */
-protected String jaspicCallbackHandlerClass = null;
+protected String jaspicCallbackHandlerClass = 
"org.apache.catalina.authenticator.jaspic.CallbackHandlerImpl";
 
 /**
  * Should the auth information (remote user and auth type) be returned as 
response
@@ -246,6 +246,7 @@ public abstract class AuthenticatorBase extends ValveBase
 
 private volatile String jaspicAppContextID = null;
 private volatile Optional jaspicProvider = null;
+private volatile CallbackHandler jaspicCallbackHandler = null;
 
 
 // - Properties
@@ -772,7 +773,7 @@ public abstract class AuthenticatorBase extends ValveBase
 new MessageInfoImpl(request.getRequest(), 
response.getResponse(), authMandatory);
 
 try {
-CallbackHandler callbackHandler = createCallbackHandler();
+CallbackHandler callbackHandler = getCallbackHandler();
 ServerAuthConfig serverAuthConfig = 
jaspicProvider.getServerAuthConfig(
 "HttpServlet", jaspicAppContextID, callbackHandler);
 String authContextID = 
serverAuthConfig.getAuthContextID(jaspicState.messageInfo);
@@ -786,29 +787,41 @@ public abstract class AuthenticatorBase extends ValveBase
 return jaspicState;
 }
 
+
+private CallbackHandler getCallbackHandler() {
+CallbackHandler handler = jaspicCallbackHandler;
+if (handler == null) {
+handler = createCallbackHandler();
+}
+return handler;
+}
+
+
 private CallbackHandler createCallbackHandler() {
 CallbackHandler callbackHandler = null;
-if (jaspicCallbackHandlerClass == null) {
-callbackHandler = CallbackHandlerImpl.getInstance();
-} else {
-Class clazz = null;
-try {
-clazz = Class.forName(jaspicCallbackHandlerClass, true,
-Thread.currentThread().getContextClassLoader());
-} catch (ClassNotFoundException e) {
-// Proceed with the retry below
-}
 
-try {
-if (clazz == null) {
-clazz = Class.forName(jaspicCallbackHandlerClass);
-}
-callbackHandler = 
(CallbackHandler)clazz.getConstructor().newInstance();
-} catch (ReflectiveOperationException e) {
-throw new SecurityException(e);
+Class clazz = null;
+try {
+clazz = Class.forName(jaspicCallbackHandlerClass, true,
+Thread.currentThread().getContextClassLoader());
+} catch (ClassNotFoundException e) {
+// Proceed with the retry below
+}
+
+try {
+if 

[tomcat] branch master updated: Fix BZ 64715. Add PasswordValidationCallback support.

[markt]

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 6a927fc  Fix BZ 64715. Add PasswordValidationCallback support.
6a927fc is described below

commit 6a927fcc3e3f1fdd40be4106e56f888bfebf04b8
Author: Mark Thomas 
AuthorDate: Fri Sep 18 09:12:53 2020 +0100

Fix BZ 64715. Add PasswordValidationCallback support.

https://bz.apache.org/bugzilla/show_bug.cgi?id=64715
Patch provided by Robert Rodewald
---
 .../catalina/authenticator/AuthenticatorBase.java  |  55 +
 .../authenticator/jaspic/CallbackHandlerImpl.java  |  52 +
 .../authenticator/jaspic/LocalStrings.properties   |   2 +
 .../TestJaspicCallbackHandlerInAuthenticator.java  | 129 +++--
 webapps/docs/changelog.xml |   5 +
 5 files changed, 191 insertions(+), 52 deletions(-)

diff --git a/java/org/apache/catalina/authenticator/AuthenticatorBase.java 
b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
index 0911152..faf98cb 100644
--- a/java/org/apache/catalina/authenticator/AuthenticatorBase.java
+++ b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
@@ -43,6 +43,7 @@ import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 
 import org.apache.catalina.Authenticator;
+import org.apache.catalina.Contained;
 import org.apache.catalina.Container;
 import org.apache.catalina.Context;
 import org.apache.catalina.Globals;
@@ -51,7 +52,6 @@ import org.apache.catalina.Realm;
 import org.apache.catalina.Session;
 import org.apache.catalina.TomcatPrincipal;
 import org.apache.catalina.Valve;
-import org.apache.catalina.authenticator.jaspic.CallbackHandlerImpl;
 import org.apache.catalina.authenticator.jaspic.MessageInfoImpl;
 import org.apache.catalina.connector.Request;
 import org.apache.catalina.connector.Response;
@@ -220,7 +220,7 @@ public abstract class AuthenticatorBase extends ValveBase
  * default {@link 
org.apache.catalina.authenticator.jaspic.CallbackHandlerImpl}
  * will be used.
  */
-protected String jaspicCallbackHandlerClass = null;
+protected String jaspicCallbackHandlerClass = 
"org.apache.catalina.authenticator.jaspic.CallbackHandlerImpl";
 
 /**
  * Should the auth information (remote user and auth type) be returned as 
response
@@ -247,6 +247,7 @@ public abstract class AuthenticatorBase extends ValveBase
 
 private volatile String jaspicAppContextID = null;
 private volatile Optional jaspicProvider = null;
+private volatile CallbackHandler jaspicCallbackHandler = null;
 
 
 // - Properties
@@ -773,7 +774,7 @@ public abstract class AuthenticatorBase extends ValveBase
 new MessageInfoImpl(request.getRequest(), 
response.getResponse(), authMandatory);
 
 try {
-CallbackHandler callbackHandler = createCallbackHandler();
+CallbackHandler callbackHandler = getCallbackHandler();
 ServerAuthConfig serverAuthConfig = 
jaspicProvider.getServerAuthConfig(
 "HttpServlet", jaspicAppContextID, callbackHandler);
 String authContextID = 
serverAuthConfig.getAuthContextID(jaspicState.messageInfo);
@@ -787,29 +788,41 @@ public abstract class AuthenticatorBase extends ValveBase
 return jaspicState;
 }
 
+
+private CallbackHandler getCallbackHandler() {
+CallbackHandler handler = jaspicCallbackHandler;
+if (handler == null) {
+handler = createCallbackHandler();
+}
+return handler;
+}
+
+
 private CallbackHandler createCallbackHandler() {
 CallbackHandler callbackHandler = null;
-if (jaspicCallbackHandlerClass == null) {
-callbackHandler = CallbackHandlerImpl.getInstance();
-} else {
-Class clazz = null;
-try {
-clazz = Class.forName(jaspicCallbackHandlerClass, true,
-Thread.currentThread().getContextClassLoader());
-} catch (ClassNotFoundException e) {
-// Proceed with the retry below
-}
 
-try {
-if (clazz == null) {
-clazz = Class.forName(jaspicCallbackHandlerClass);
-}
-callbackHandler = 
(CallbackHandler)clazz.getConstructor().newInstance();
-} catch (ReflectiveOperationException e) {
-throw new SecurityException(e);
+Class clazz = null;
+try {
+clazz = Class.forName(jaspicCallbackHandlerClass, true,
+Thread.currentThread().getContextClassLoader());
+} catch (ClassNotFoundException e) {
+// Proceed with the retry below
+}
+
+try {
+