Re: sources repository for taglibs-standard-impl/specs-1.2.5-migrated-0.0.1

[Olivier Lamy]

Just in case I created rdc as well https://github.com/olamy/taglibs-rdc




On Thu, 9 Apr 2020 at 10:53, Olivier Lamy  wrote:

> Hi
> Migration results are available here:
> - https://github.com/olamy/taglibs-standard
> - https://github.com/olamy/taglibs-parent
> - https://github.com/olamy/taglibs-site
>
> Please note taglibs-standard include some strange tags probably coming
> from csv2svn migration but they were already there in svn.
>
> Let me know if you are ok with that and I can creation of the git repos
> under the ASF namespace.
>
> cheers
> Olivier
>
>
>
> On Tue, 7 Apr 2020 at 18:23, Mark Thomas  wrote:
>
>> On 07/04/2020 00:44, Olivier Lamy wrote:
>> > Hi
>> > This weekend I have started running this on a server
>> >
>> > svn2git https://svn.apache.org/repos/asf/tomcat/taglibs/standard/
>> >
>> > It may take few days to finish...
>> >
>> > Working with a svndump might be easier. Do you know if INFRA can provide
>> > this?
>>
>> http://svn-dump.apache.org/
>>
>> Before you go that route, let me explore doing a dump locally on one of
>> the svn servers.
>>
>> Mark
>>
>>
>> >
>> >
>> > On Sat, 28 Mar 2020 at 20:58, Olivier Lamy > > > wrote:
>> >
>> >
>> >
>> > On Fri, 27 Mar 2020 at 20:01, Mark Thomas > > > wrote:
>> >
>> > On 27/03/2020 04:58, Olivier Lamy wrote:
>> > > Hi
>> > > We have to move
>> > this https://svn.apache.org/repos/asf/tomcat/taglibs/
>> > > to git.
>> > > As it's few separate Maven projects, maybe we could create one
>> > git repo
>> > > per project:
>> > > - https://github.com/apache/tomcat-taglibs-site
>> > > - https://github.com/apache/tomcat-taglibs-standard
>> > (standard-examples
>> > > can be integrated in standard source tree but not part of the
>> > release
>> > > just here for documentation purpose)
>> > > - https://github.com/apache/tomcat-taglibs-parent
>> > >
>> > > - https://github.com/apache/tomcat-taglibs can contain some
>> > modules to
>> > > ease clone of only git repo (or maybe we simply put the site
>> > here) I
>> > > don't have strong opinion for this
>> > >
>> > > Do we still need rdc?
>> >
>> > The above seems reasonable to me but I have never worked on
>> > taglibs so
>> > my opinion shouldn't count for much.
>> >
>> > > during the migration each tags/branches (if any) will be
>> > integrated in
>> > > the created git repo
>> >
>> > This is the bit that interests me. I know from experience with
>> > previous
>> > Tomcat projects that the svn -> git migration for a project
>> that has
>> > previously gone through an cvs -> svn migration is very slow. It
>> > took
>> > over a week to process the Tomcat Connectors project. This is
>> > because
>> > the migration tool ends up searching back through the history
>> > repeatedly
>> > for each tag.
>> >
>> > I might be able to help put by running the migration directly on
>> > one of
>> > the ASF servers. I'll need to talk to infra if we want to try
>> > that route.
>> >
>> >
>> > Great. Let me know if you need any help?
>> >
>> >
>> >
>> > Mark
>> >
>> >
>>  -
>> > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
>> > 
>> > For additional commands, e-mail: dev-h...@tomcat.apache.org
>> > 
>> >
>> >
>> >
>> > --
>> > Olivier Lamy
>> > http://twitter.com/olamy | http://linkedin.com/in/olamy
>> >
>> >
>> >
>> > --
>> > Olivier Lamy
>> > http://twitter.com/olamy | http://linkedin.com/in/olamy
>>
>>
>> -
>> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
>> For additional commands, e-mail: dev-h...@tomcat.apache.org
>>
>>
>
> --
> Olivier Lamy
> http://twitter.com/olamy | http://linkedin.com/in/olamy
>


-- 
Olivier Lamy
http://twitter.com/olamy | http://linkedin.com/in/olamy

Re: sources repository for taglibs-standard-impl/specs-1.2.5-migrated-0.0.1

[Olivier Lamy]

Hi
Migration results are available here:
- https://github.com/olamy/taglibs-standard
- https://github.com/olamy/taglibs-parent
- https://github.com/olamy/taglibs-site

Please note taglibs-standard include some strange tags probably coming from
csv2svn migration but they were already there in svn.

Let me know if you are ok with that and I can creation of the git repos
under the ASF namespace.

cheers
Olivier



On Tue, 7 Apr 2020 at 18:23, Mark Thomas  wrote:

> On 07/04/2020 00:44, Olivier Lamy wrote:
> > Hi
> > This weekend I have started running this on a server
> >
> > svn2git https://svn.apache.org/repos/asf/tomcat/taglibs/standard/
> >
> > It may take few days to finish...
> >
> > Working with a svndump might be easier. Do you know if INFRA can provide
> > this?
>
> http://svn-dump.apache.org/
>
> Before you go that route, let me explore doing a dump locally on one of
> the svn servers.
>
> Mark
>
>
> >
> >
> > On Sat, 28 Mar 2020 at 20:58, Olivier Lamy  > > wrote:
> >
> >
> >
> > On Fri, 27 Mar 2020 at 20:01, Mark Thomas  > > wrote:
> >
> > On 27/03/2020 04:58, Olivier Lamy wrote:
> > > Hi
> > > We have to move
> > this https://svn.apache.org/repos/asf/tomcat/taglibs/
> > > to git.
> > > As it's few separate Maven projects, maybe we could create one
> > git repo
> > > per project:
> > > - https://github.com/apache/tomcat-taglibs-site
> > > - https://github.com/apache/tomcat-taglibs-standard
> > (standard-examples
> > > can be integrated in standard source tree but not part of the
> > release
> > > just here for documentation purpose)
> > > - https://github.com/apache/tomcat-taglibs-parent
> > >
> > > - https://github.com/apache/tomcat-taglibs can contain some
> > modules to
> > > ease clone of only git repo (or maybe we simply put the site
> > here) I
> > > don't have strong opinion for this
> > >
> > > Do we still need rdc?
> >
> > The above seems reasonable to me but I have never worked on
> > taglibs so
> > my opinion shouldn't count for much.
> >
> > > during the migration each tags/branches (if any) will be
> > integrated in
> > > the created git repo
> >
> > This is the bit that interests me. I know from experience with
> > previous
> > Tomcat projects that the svn -> git migration for a project that
> has
> > previously gone through an cvs -> svn migration is very slow. It
> > took
> > over a week to process the Tomcat Connectors project. This is
> > because
> > the migration tool ends up searching back through the history
> > repeatedly
> > for each tag.
> >
> > I might be able to help put by running the migration directly on
> > one of
> > the ASF servers. I'll need to talk to infra if we want to try
> > that route.
> >
> >
> > Great. Let me know if you need any help?
> >
> >
> >
> > Mark
> >
> >
>  -
> > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> > 
> > For additional commands, e-mail: dev-h...@tomcat.apache.org
> > 
> >
> >
> >
> > --
> > Olivier Lamy
> > http://twitter.com/olamy | http://linkedin.com/in/olamy
> >
> >
> >
> > --
> > Olivier Lamy
> > http://twitter.com/olamy | http://linkedin.com/in/olamy
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>

-- 
Olivier Lamy
http://twitter.com/olamy | http://linkedin.com/in/olamy

[tomcat-jakartaee-migration] branch master updated (54c1fe1 -> 70a9455)

[ebourg]

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

ebourg pushed a change to branch master
in repository 
https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git.


from 54c1fe1  Avoid deprecation warning
 new 0a52c66  Split the CLI handling from the main migration class
 new 44521e8  Ant task for the migration tool
 new 75de6b5  Test with an invalid profile
 new 70a9455  Wrap the lines in the README file

The 4 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:
 README.md  | 17 ++--
 pom.xml| 14 +++-
 .../org/apache/tomcat/jakartaee/AntHandler.java| 67 
 .../org/apache/tomcat/jakartaee/Migration.java | 63 ---
 .../org/apache/tomcat/jakartaee/MigrationCLI.java  | 92 ++
 .../org/apache/tomcat/jakartaee/MigrationTask.java | 82 +++
 .../org/apache/tomcat/jakartaee/antlib.xml |  4 +
 src/main/scripts/migrate.sh|  2 +-
 .../apache/tomcat/jakartaee/MigrationTaskTest.java | 81 +++
 .../org/apache/tomcat/jakartaee/MigrationTest.java | 21 -
 src/test/resources/testbuild.xml   | 13 +++
 11 files changed, 382 insertions(+), 74 deletions(-)
 create mode 100644 src/main/java/org/apache/tomcat/jakartaee/AntHandler.java
 create mode 100644 src/main/java/org/apache/tomcat/jakartaee/MigrationCLI.java
 create mode 100644 src/main/java/org/apache/tomcat/jakartaee/MigrationTask.java
 create mode 100644 src/main/resources/org/apache/tomcat/jakartaee/antlib.xml
 create mode 100644 
src/test/java/org/apache/tomcat/jakartaee/MigrationTaskTest.java
 create mode 100644 src/test/resources/testbuild.xml


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

[tomcat-jakartaee-migration] 04/04: Wrap the lines in the README file

[ebourg]

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

ebourg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git

commit 70a94559e5a288d30f0794210c100e21d950d40b
Author: Emmanuel Bourg 
AuthorDate: Wed Apr 8 23:22:45 2020 +0200

Wrap the lines in the README file
---
 README.md | 17 -
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 6ae92c4..2890a27 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,9 @@
 
 This tool is a work in progress.
 
-The aim of the tool is to take a web application written for Java EE 8 that 
runs on Apache Tomcat 9 and convert it automatically so it runs on Apache 
Tomcat 10 which implements Jakarta EE 9.
+The aim of the tool is to take a web application written for Java EE 8 that
+runs on Apache Tomcat 9 and convert it automatically so it runs on Apache
+Tomcat 10 which implements Jakarta EE 9.
 
 ## Usage
 
@@ -20,16 +22,20 @@ Migrate your Servlet application with:
 
 java -jar target/jakartaee-migration-*-shaded.jar  
 
-The source should be a path to a compressed archive, a folder or an individual 
file. The destination will be created at the specified path as a resource of 
the same type as the source.
+The source should be a path to a compressed archive, a folder or an individual
+file. The destination will be created at the specified path as a resource of
+the same type as the source.
 
 > **INFO**
-> This tool will remove cryptographic signatures from JAR files contained in 
the *source*, as the changed resources would not match them anymore.
+> This tool will remove cryptographic signatures from JAR files contained
+> in the *source*, as the changed resources would not match them anymore.
 >
 > A warning will be logged for each JAR file where the signature has been 
 > removed.
 
 ## Differences between Java EE 8 and Jakarta EE 9
 
-Jakarta EE 9 is still under development and there are some details that remain 
to be worked out.
+Jakarta EE 9 is still under development and there are some details that remain
+to be worked out.
 
 The differences currently supported by this tool are:
 
@@ -39,6 +45,7 @@ The differences yet to be implemented by this tool are:
 
 * Remaining issues once resolved
 
-The issues still to be resolved by the Jakarta EE projects that will impact 
this tool are:
+The issues still to be resolved by the Jakarta EE projects that will impact
+this tool are:
 
 * XML schemas


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

[tomcat-jakartaee-migration] 02/04: Ant task for the migration tool

[ebourg]

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

ebourg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git

commit 44521e8f1f4beb84ce1e7780481eb3ee19e7e2bd
Author: Emmanuel Bourg 
AuthorDate: Wed Apr 8 22:46:02 2020 +0200

Ant task for the migration tool
---
 pom.xml| 12 
 .../org/apache/tomcat/jakartaee/AntHandler.java| 67 ++
 .../org/apache/tomcat/jakartaee/MigrationTask.java | 82 ++
 .../org/apache/tomcat/jakartaee/antlib.xml |  4 ++
 .../apache/tomcat/jakartaee/MigrationTaskTest.java | 81 +
 src/test/resources/testbuild.xml   | 13 
 6 files changed, 259 insertions(+)

diff --git a/pom.xml b/pom.xml
index f6bd9d3..c094b75 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,6 +76,12 @@
   commons-io
   2.6
 
+
+  org.apache.ant
+  ant
+  1.10.7
+  provided
+
 
 
 
@@ -95,6 +101,12 @@

 
   
+maven-surefire-plugin
+
+  false
+
+  
+  
 maven-jar-plugin
 
   
diff --git a/src/main/java/org/apache/tomcat/jakartaee/AntHandler.java 
b/src/main/java/org/apache/tomcat/jakartaee/AntHandler.java
new file mode 100644
index 000..e7747b7
--- /dev/null
+++ b/src/main/java/org/apache/tomcat/jakartaee/AntHandler.java
@@ -0,0 +1,67 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.tomcat.jakartaee;
+
+import java.util.logging.Handler;
+import java.util.logging.Level;
+import java.util.logging.LogRecord;
+
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Task;
+
+/**
+ * JUL log handler redirecting the messages logged to Ant.
+ */
+ class AntHandler extends Handler {
+
+private final Task task;
+
+public AntHandler(Task task) {
+this.task = task;
+}
+
+@Override
+public void publish(LogRecord record) {
+task.log(record.getMessage(), record.getThrown(), 
toAntLevel(record.getLevel()));
+}
+
+@Override
+public void flush() {
+}
+
+@Override
+public void close() throws SecurityException {
+}
+
+/**
+ * Convert the JUL level to the equivalent Ant one.
+ */
+private int toAntLevel(Level level) {
+if (level.intValue() >= Level.SEVERE.intValue()) {
+return Project.MSG_ERR;
+} else if (level.intValue() >= Level.WARNING.intValue()) {
+return Project.MSG_WARN;
+} else if (level.intValue() >= Level.INFO.intValue()) {
+return Project.MSG_INFO;
+} else if (level.intValue() >= Level.FINE.intValue()) {
+return Project.MSG_VERBOSE;
+} else {
+return Project.MSG_DEBUG;
+}
+}
+}
diff --git a/src/main/java/org/apache/tomcat/jakartaee/MigrationTask.java 
b/src/main/java/org/apache/tomcat/jakartaee/MigrationTask.java
new file mode 100644
index 000..4d7d967
--- /dev/null
+++ b/src/main/java/org/apache/tomcat/jakartaee/MigrationTask.java
@@ -0,0 +1,82 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tomcat.jakartaee;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.logging.Handler;
+import java.util.logging.Logger;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Task;
+
+/**
+ * Ant task for th

[tomcat-jakartaee-migration] 01/04: Split the CLI handling from the main migration class

[ebourg]

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

ebourg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git

commit 0a52c66b751e3245fad11faf85f7dbfa4343bac9
Author: Emmanuel Bourg 
AuthorDate: Wed Apr 8 18:55:17 2020 +0200

Split the CLI handling from the main migration class
---
 pom.xml|  2 +-
 .../org/apache/tomcat/jakartaee/Migration.java | 63 ---
 .../org/apache/tomcat/jakartaee/MigrationCLI.java  | 92 ++
 src/main/scripts/migrate.sh|  2 +-
 .../org/apache/tomcat/jakartaee/MigrationTest.java |  8 +-
 5 files changed, 98 insertions(+), 69 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2d4ddd8..f6bd9d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -100,7 +100,7 @@
   
 
   true
-  org.apache.tomcat.jakartaee.Migration
+  org.apache.tomcat.jakartaee.MigrationCLI
 
   
 
diff --git a/src/main/java/org/apache/tomcat/jakartaee/Migration.java 
b/src/main/java/org/apache/tomcat/jakartaee/Migration.java
index 68a8fc2..44efc5a 100644
--- a/src/main/java/org/apache/tomcat/jakartaee/Migration.java
+++ b/src/main/java/org/apache/tomcat/jakartaee/Migration.java
@@ -24,7 +24,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -270,68 +269,6 @@ public class Migration {
 }
 }
 
-private static final String PROFILE_ARG = "-profile=";
-
-public static void main(String[] args) {
-System.setProperty("java.util.logging.SimpleFormatter.format", 
"%5$s%n");
-
-List arguments = new ArrayList<>(Arrays.asList(args));
-if (arguments.contains("-verbose")) {
-
Logger.getGlobal().getParent().getHandlers()[0].setLevel(Level.FINE);
-Logger.getGlobal().getParent().setLevel(Level.FINE);
-arguments.remove("-verbose");
-}
-
-Migration migration = new Migration();
-
-boolean valid = false;
-String source = null;
-String dest = null;
-if (arguments.size() == 3) {
-if (arguments.get(0).startsWith(PROFILE_ARG)) {
-source = arguments.get(1);
-dest = arguments.get(2);
-valid = true;
-try {
-
migration.setEESpecProfile(EESpecProfile.valueOf(arguments.get(0).substring(PROFILE_ARG.length(;
-} catch (IllegalArgumentException e) {
-// Invalid profile value
-valid = false;
-}
-}
-}
-if (arguments.size() == 2) {
-source = arguments.get(0);
-dest = arguments.get(1);
-valid = true;
-}
-if (!valid) {
-usage();
-System.exit(1);
-}
-
-migration.setSource(new File(source));
-migration.setDestination(new File(dest));
-boolean result = false;
-try {
-result = migration.execute();
-} catch (IOException e) {
-logger.log(Level.SEVERE, sm.getString("migration.error"), e);
-result = false;
-}
-
-// Signal caller that migration failed
-if (!result) {
-System.exit(1);
-}
-}
-
-
-private static void usage() {
-System.out.println(sm.getString("migration.usage"));
-}
-
-
 private static boolean isArchive(String fileName) {
 return fileName.endsWith(".jar") || fileName.endsWith(".war") || 
fileName.endsWith(".zip");
 }
diff --git a/src/main/java/org/apache/tomcat/jakartaee/MigrationCLI.java 
b/src/main/java/org/apache/tomcat/jakartaee/MigrationCLI.java
new file mode 100644
index 000..1b6dc80
--- /dev/null
+++ b/src/main/java/org/apache/tomcat/jakartaee/MigrationCLI.java
@@ -0,0 +1,92 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tomcat.jakartaee;
+
+import java.io.File;
+import java.io.IOExce

[tomcat-jakartaee-migration] 03/04: Test with an invalid profile

[ebourg]

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

ebourg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git

commit 75de6b5d61afac8e13621cffe63df892e602df26
Author: Emmanuel Bourg 
AuthorDate: Wed Apr 8 23:18:23 2020 +0200

Test with an invalid profile
---
 .../java/org/apache/tomcat/jakartaee/MigrationTest.java | 13 +
 1 file changed, 13 insertions(+)

diff --git a/src/test/java/org/apache/tomcat/jakartaee/MigrationTest.java 
b/src/test/java/org/apache/tomcat/jakartaee/MigrationTest.java
index e77925f..813ca55 100644
--- a/src/test/java/org/apache/tomcat/jakartaee/MigrationTest.java
+++ b/src/test/java/org/apache/tomcat/jakartaee/MigrationTest.java
@@ -90,4 +90,17 @@ public class MigrationTest {
 assertEquals("error code", "1", e.getMessage());
 }
 }
+
+@Test
+public void testInvalidProfile() throws Exception {
+File sourceFile = new File("target/test-classes/HelloServlet.java");
+File migratedFile = new 
File("target/test-classes/HelloServlet.migrated.java");
+
+try {
+MigrationCLI.main(new String[] {"-profile=JSERV", 
sourceFile.getAbsolutePath(), migratedFile.getAbsolutePath()});
+fail("No error code returned");
+} catch (SecurityException e) {
+assertEquals("error code", "1", e.getMessage());
+}
+}
 }


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

[Bug 64311] org.apache.tomcat.jni.TestSocketServerAnyLocalAddress locks entire testbed run under certain conditions

[bugzilla]

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

--- Comment #7 from Michael Osipov  ---
What do you think about the erratic behavior of APR in regards of the address
family when this feature is enabled or disabled? Our fault or APR's?

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

[Bug 64311] org.apache.tomcat.jni.TestSocketServerAnyLocalAddress locks entire testbed run under certain conditions

[bugzilla]

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

--- Comment #6 from Mark Thomas  ---
Yes, I think that check is safe to remove.

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

[Bug 64311] org.apache.tomcat.jni.TestSocketServerAnyLocalAddress locks entire testbed run under certain conditions

[bugzilla]

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

--- Comment #5 from Michael Osipov  ---
Since all tests pass, this check for threading support can be dropped sooner or
later? The threading support is required for OpenSSL < 1.1.0 only.

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

[GitHub] [tomcat] ChristopherSchultz commented on issue #269: Use parameterized collection constructors where possible

[GitBox]

ChristopherSchultz commented on issue #269: Use parameterized collection 
constructors where possible
URL: https://github.com/apache/tomcat/pull/269#issuecomment-611038366
 
 
   Many of these instances are to protect private collections from being 
modified. For example, in `ServletSecurityElement.getHttpMethodConstraints()`, 
a new collection is being returned to avoid having the internal collection 
modified. Would it be safe-enough to return e.g. 
`Collections.unmodifiableSet(methodConstraints.values())` from that method, or 
is that too dangerous, as the "unmodifiable" collection includes a reference to 
the actual, potentially modifiable collection?


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


With regards,
Apache Git Services

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

Re: API Change - Connector.java Constructor

[Rémy Maucherat]

On Tue, Apr 7, 2020 at 8:42 PM Mark Thomas  wrote:

> On 07/04/2020 19:03, Filip Hanik wrote:
> >
> >
> > On Tue, Apr 7, 2020 at 9:35 AM Rémy Maucherat  > > wrote:
> >
> >
> > Does the connector need to know about the actual implementations?
> >
> >
> > Ideally no, but it removes the reflection you say is bad for Graal.
> >
> >
> > Correct. Turns out that the connectors use setProperty/getProperty via
> > reflection (IntrospectionUtils.setProperty/getProperty), so changing
> > only this constructor would achieve a mini step.
> > Before we commit any changes, I'd like to evaluate the scope of
> > reflection we're dealing with.
> >
> > Then I can come back. I'll close the PR for now, as it only touches the
> > surface.
> >
> > sound fair?
>
> Sounds reasonable. I'm happy for any obvious clean-up to stay though.
>
> On a similar note, the ProtocolHandler calls setProperty() on the
> Endpoint which then also uses reflection.
>
> I think I have a way around this but it is not great for maintenance.
>

If we want to improve on the Connector situation regarding duplication and
reflection abuse, the only solution is to expose the different objects
involved.

Since an example is usually better, I'll give one using server.xml.

A typical Connector with TLS is at the moment:







And it would become:


  
  

  





Each individual object is now created by the digester using normal bean
rules, and I suppose it will become wired up by the Connector during init.
Embedded can then do the same as the digester instead of having to go
through the Connector object.

Rémy


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

Nexus: Promotion Completed

[Nexus Repository Manager]

Message from: https://repository.apache.orgDeployer properties:"userAgent" = "maven-artifact/2.2.1 (Java 1.7.0_80; Windows 8.1 6.3)""userId" = "markt""ip" = "86.190.55.221"Details:The following artifacts have been promoted to the "Releases" [id=releases] repository/org/apache/tomcat/tomcat-i18n-de/8.5.54/tomcat-i18n-de-8.5.54.pom(SHA1: 6c14fa977318213855dbd85942422b44f5e3e102)/org/apache/tomcat/tomcat-i18n-de/8.5.54/tomcat-i18n-de-8.5.54.jar(SHA1: 36d777f00e7450c15bda68095ad516e41a56eab8)/org/apache/tomcat/tomcat-i18n-de/8.5.54/tomcat-i18n-de-8.5.54.jar.asc(SHA1: 1f05781d9ed7055b26ad5b14436622ae40c81ee5)/org/apache/tomcat/tomcat-i18n-de/8.5.54/tomcat-i18n-de-8.5.54.pom.asc(SHA1: b7fc2fcbf483ca680010975f345405d7cb03e196)/org/apache/tomcat/tomcat-jni/8.5.54/tomcat-jni-8.5.54.jar(SHA1: 4d9b9576671446b5fe34047bf3f867da6db045c3)/org/apache/tomcat/tomcat-jni/8.5.54/tomcat-jni-8.5.54.pom(SHA1: c99e04bc3389729ed5f315b9c737c347c56687d2)/org/apache/tomcat/tomcat-jni/8.5.54/tomcat-jni-8.5.54.jar.asc(SHA1: e860f9e28db0944a5cc90c9456f5936127bcea0c)/org/apache/tomcat/tomcat-jni/8.5.54/tomcat-jni-8.5.54-sources.jar.asc(SHA1: fd94628db5691eed06d5468c75cbe6f6c2c35321)/org/apache/tomcat/tomcat-jni/8.5.54/tomcat-jni-8.5.54.pom.asc(SHA1: 0fe417aff144f22dd9f15f194b60a9fa867d516d)/org/apache/tomcat/tomcat-jni/8.5.54/tomcat-jni-8.5.54-sources.jar(SHA1: 7ef0fea21b06216496dd09dd6e146d8de56c3a4d)/org/apache/tomcat/tomcat-juli/8.5.54/tomcat-juli-8.5.54-sources.jar(SHA1: 67c4e22dd4fc03c3f0b6ca203adfad3df009c313)/org/apache/tomcat/tomcat-juli/8.5.54/tomcat-juli-8.5.54-sources.jar.asc(SHA1: 62e761ef93dc4b6c922a42d21ac759a85a53fda5)/org/apache/tomcat/tomcat-juli/8.5.54/tomcat-juli-8.5.54.pom(SHA1: efe712f8964ecc4caf253dcc2f8e259be0975353)/org/apache/tomcat/tomcat-juli/8.5.54/tomcat-juli-8.5.54.jar(SHA1: 677fc8881c4aea41b38c1955e27acade5edf8aaf)/org/apache/tomcat/tomcat-juli/8.5.54/tomcat-juli-8.5.54.pom.asc(SHA1: 8caf6387e3c9ce450a176029b16bb8731953ec2c)/org/apache/tomcat/tomcat-juli/8.5.54/tomcat-juli-8.5.54.jar.asc(SHA1: 391f62055b4eada7172e11e3d0173588bf1bb132)/org/apache/tomcat/tomcat-util/8.5.54/tomcat-util-8.5.54-sources.jar.asc(SHA1: 230e5212a0a55e3d5e25e42e918bcb13b0b15df6)/org/apache/tomcat/tomcat-util/8.5.54/tomcat-util-8.5.54.pom.asc(SHA1: d74f98b222340a79479468ca27bc215516c7a815)/org/apache/tomcat/tomcat-util/8.5.54/tomcat-util-8.5.54.pom(SHA1: b8cf76dd46e6c48b2c3cef205221108ccc8c6522)/org/apache/tomcat/tomcat-util/8.5.54/tomcat-util-8.5.54-sources.jar(SHA1: 2b8ce355bb7ec6895afbc3cd82e7810fa72915c1)/org/apache/tomcat/tomcat-util/8.5.54/tomcat-util-8.5.54.jar.asc(SHA1: 26e805bbe31e73d67eecb50aee59d9321bb3173f)/org/apache/tomcat/tomcat-util/8.5.54/tomcat-util-8.5.54.jar(SHA1: 24d6667671bb7ed638a41c2e547a10927deeebce)/org/apache/tomcat/tomcat-catalina/8.5.54/tomcat-catalina-8.5.54.pom.asc(SHA1: e9a465f1524b425c8d50fe08e9686c7b67a25877)/org/apache/tomcat/tomcat-catalina/8.5.54/tomcat-catalina-8.5.54-sources.jar.asc(SHA1: 6d809a203a37377a6f49139d1eceef9fce77bdb9)/org/apache/tomcat/tomcat-catalina/8.5.54/tomcat-catalina-8.5.54.jar.asc(SHA1: f9aea5f2558b5cb8e26f77d944b832ead299f9ec)/org/apache/tomcat/tomcat-catalina/8.5.54/tomcat-catalina-8.5.54.pom(SHA1: ab12103d35cadf506ca667dab3055db47bd17c1a)/org/apache/tomcat/tomcat-catalina/8.5.54/tomcat-catalina-8.5.54.jar(SHA1: 91f61e5735bc4f0c9a989696bfa2e02f7d250ff3)/org/apache/tomcat/tomcat-catalina/8.5.54/tomcat-catalina-8.5.54-sources.jar(SHA1: 9208f8dfea3509e4f1bc9f22cc0772ee0a4a601b)/org/apache/tomcat/tomcat-catalina-ws/8.5.54/tomcat-catalina-ws-8.5.54.jar(SHA1: c4287a047d15248f3ff6497de332903d3aa63486)/org/apache/tomcat/tomcat-catalina-ws/8.5.54/tomcat-catalina-ws-8.5.54-sources.jar.asc(SHA1: 960eb139f63e115e617b4864154971b2fe553c83)/org/apache/tomcat/tomcat-catalina-ws/8.5.54/tomcat-catalina-ws-8.5.54.jar.asc(SHA1: fa7ac37c8c6b594e90fc4b5358a0c7b96e6f9a8a)/org/apache/tomcat/tomcat-catalina-ws/8.5.54/tomcat-catalina-ws-8.5.54.pom.asc(SHA1: a47af3faa5d081b317efe00abafbef984ef7731b)/org/apache/tomcat/tomcat-catalina-ws/8.5.54/tomcat-catalina-ws-8.5.54-sources.jar(SHA1: 1919adb6531fdac2b69cdf93b5be3165dfc06411)/org/apache/tomcat/tomcat-catalina-ws/8.5.54/tomcat-catalina-ws-8.5.54.pom(SHA1: c17a0251dc4b2e94b25f3f359df697e13dafa548)/org/apache/tomcat/tomcat-i18n-fr/8.5.54/tomcat-i18n-fr-8.5.54.jar.asc(SHA1: 65c01eefe4042dab57705c50ed79423483cd0363)/org/apache/tomcat/tomcat-i18n-fr/8.5.54/tomcat-i18n-fr-8.5.54.pom.asc(SHA1: 717053617df35b43a8dee2ce87493991490096f2)/org/apache/tomcat/tomcat-i18n-fr/8.5.54/tomcat-i18n-fr-8.5.54.pom(SHA1: a59f05fda7fcc8efe1248363310e2f17310a1901)/org/apache/tomcat/tomcat-i18n-fr/8.5.54/tomcat-i18n-fr-8.5.54.jar(SHA1: b74fba22f6c298e2f0040039b90663f2b5978ec8)/org/apache/tomcat/tomcat-jdbc/8.5.54/tomcat-jdbc-8.5.54.pom(SHA1: 82b2a48ab363205bf36802abab8056b03af6e5d4)/org/apache/tomcat/tomcat-jdbc/8.5.54/tomcat-jdbc-8.5.54-sources.jar.asc(SHA1: 77068d7996b3c7843a2602a0cbb5bbb4868628b4)/org/apache/tomcat/tomcat-jdbc/8.5.54/tomcat-jdbc-8.5.54.jar.asc(SHA1: 506fd34

svn commit: r38860 - /dev/tomcat/tomcat-8/v8.5.54/ /release/tomcat/tomcat-8/v8.5.54/

[markt]

Author: markt
Date: Wed Apr  8 15:45:34 2020
New Revision: 38860

Log:
Release Apache Tomcat 8.5.54

Added:
release/tomcat/tomcat-8/v8.5.54/
  - copied from r38859, dev/tomcat/tomcat-8/v8.5.54/
Removed:
dev/tomcat/tomcat-8/v8.5.54/


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

[VOTE][RESULT] Release Apache Tomcat 8.5.54

[Mark Thomas]

The following votes were cast:

Binding:
+1: mgrigorov, remm, schultz

No other votes were cast.

The vote therefore passes.

Thanks to everyone who contributed to this release.

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

svn commit: r38859 - /dev/tomcat/tomcat-9/v9.0.34/ /release/tomcat/tomcat-9/v9.0.34/

[markt]

Author: markt
Date: Wed Apr  8 15:43:00 2020
New Revision: 38859

Log:
Release Apache Tomcat 9.0.34

Added:
release/tomcat/tomcat-9/v9.0.34/
  - copied from r38858, dev/tomcat/tomcat-9/v9.0.34/
Removed:
dev/tomcat/tomcat-9/v9.0.34/


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

Nexus: Promotion Completed

[Nexus Repository Manager]

Message from: https://repository.apache.orgDeployer properties:"userAgent" = "maven-artifact/2.2.1 (Java 1.8.0_242; Windows 10 10.0)""userId" = "markt""ip" = "86.190.55.221"Details:The following artifacts have been promoted to the "Releases" [id=releases] repository/org/apache/tomcat/tomcat-i18n-de/9.0.34/tomcat-i18n-de-9.0.34.pom(SHA1: 6607494c2b2c5a3f76b3664c5dd432bb8f442914)/org/apache/tomcat/tomcat-i18n-de/9.0.34/tomcat-i18n-de-9.0.34.jar(SHA1: 3095eb27c1e6d75c2d66a78f52d772b107e50682)/org/apache/tomcat/tomcat-i18n-de/9.0.34/tomcat-i18n-de-9.0.34.jar.asc(SHA1: 24ea22609a6dfe4ccfa3442e615a440ef839a04c)/org/apache/tomcat/tomcat-i18n-de/9.0.34/tomcat-i18n-de-9.0.34.pom.asc(SHA1: 0fa93622b70b94a43726ecd5029d9749540c5102)/org/apache/tomcat/tomcat-jni/9.0.34/tomcat-jni-9.0.34.pom.asc(SHA1: 92d008e5be815e0699448a36f20042284e0fb00f)/org/apache/tomcat/tomcat-jni/9.0.34/tomcat-jni-9.0.34.jar(SHA1: 5616e268c634872572bbc4af2a1600fd77d5b8d1)/org/apache/tomcat/tomcat-jni/9.0.34/tomcat-jni-9.0.34.jar.asc(SHA1: 3ef97172d73cb500db718ecc14ada41698c46642)/org/apache/tomcat/tomcat-jni/9.0.34/tomcat-jni-9.0.34.pom(SHA1: a26c272fd8368b49b18aa259c9350cfcf7c35e6e)/org/apache/tomcat/tomcat-jni/9.0.34/tomcat-jni-9.0.34-sources.jar.asc(SHA1: b1953c1fdcd74116f5da6bfcf2e76c2fee465f44)/org/apache/tomcat/tomcat-jni/9.0.34/tomcat-jni-9.0.34-sources.jar(SHA1: 0299da3c77723965103e7fbe887504b664b29e95)/org/apache/tomcat/tomcat-juli/9.0.34/tomcat-juli-9.0.34.jar(SHA1: 7f095b3bcde2472c5284a279a5c0874a5504ae77)/org/apache/tomcat/tomcat-juli/9.0.34/tomcat-juli-9.0.34-sources.jar.asc(SHA1: 50b727f05a17ed3ad93e712852d0aa6b0de01e04)/org/apache/tomcat/tomcat-juli/9.0.34/tomcat-juli-9.0.34.jar.asc(SHA1: 118a174811afde6ee77907824660bef4cde41856)/org/apache/tomcat/tomcat-juli/9.0.34/tomcat-juli-9.0.34.pom.asc(SHA1: 9ea2f48a11541332555c4e9bfc4ca6e2348fe1a9)/org/apache/tomcat/tomcat-juli/9.0.34/tomcat-juli-9.0.34.pom(SHA1: b9a079f0ce5c90c58df95ad2a1c8f1b26dbaf451)/org/apache/tomcat/tomcat-juli/9.0.34/tomcat-juli-9.0.34-sources.jar(SHA1: d88eee84e889f6af6b04a4c8ed93daaf3b14eb26)/org/apache/tomcat/tomcat-util/9.0.34/tomcat-util-9.0.34-sources.jar.asc(SHA1: 5faf722b80792ef64f4d0cec7519a1f56a158ebf)/org/apache/tomcat/tomcat-util/9.0.34/tomcat-util-9.0.34.pom.asc(SHA1: 754ae869bbfd10bec701cc347aeac636e065022b)/org/apache/tomcat/tomcat-util/9.0.34/tomcat-util-9.0.34.pom(SHA1: ea9529409eddae6de095b03e8fbd0edd79b54356)/org/apache/tomcat/tomcat-util/9.0.34/tomcat-util-9.0.34.jar(SHA1: 00e4717dd1597715e5ecd483e9dbd6fa3744a46b)/org/apache/tomcat/tomcat-util/9.0.34/tomcat-util-9.0.34.jar.asc(SHA1: 9c0d7eeb33f6a84157809db9e9f4e425cba060c9)/org/apache/tomcat/tomcat-util/9.0.34/tomcat-util-9.0.34-sources.jar(SHA1: 0605365a2824c2ec9c2c8072f87b02c188dda495)/org/apache/tomcat/tomcat-catalina/9.0.34/tomcat-catalina-9.0.34.jar.asc(SHA1: c22990cdb2ef9bdb9bb25173a034261bfaa5b7fc)/org/apache/tomcat/tomcat-catalina/9.0.34/tomcat-catalina-9.0.34.pom(SHA1: 94b5f9e8320ef546ba32f3a728a5b29cc93e0771)/org/apache/tomcat/tomcat-catalina/9.0.34/tomcat-catalina-9.0.34.pom.asc(SHA1: 7b31171ebb541aa9a6da30a7db23f415a7071037)/org/apache/tomcat/tomcat-catalina/9.0.34/tomcat-catalina-9.0.34-sources.jar(SHA1: 5734d31192e4fab1dff646dafd76aa200f534e18)/org/apache/tomcat/tomcat-catalina/9.0.34/tomcat-catalina-9.0.34.jar(SHA1: 7574087f119d9dedc307a0d8c8025de130f1ec97)/org/apache/tomcat/tomcat-catalina/9.0.34/tomcat-catalina-9.0.34-sources.jar.asc(SHA1: 491be3b4409705704ab3b87276156fe45aca69be)/org/apache/tomcat/tomcat-i18n-fr/9.0.34/tomcat-i18n-fr-9.0.34.pom(SHA1: e8396590678f8c83d3470be134ae8625358bfc82)/org/apache/tomcat/tomcat-i18n-fr/9.0.34/tomcat-i18n-fr-9.0.34.pom.asc(SHA1: c9ea66c72b0227e793d39c28625427d026ffb97b)/org/apache/tomcat/tomcat-i18n-fr/9.0.34/tomcat-i18n-fr-9.0.34.jar.asc(SHA1: 01a4b43af7ceda6ca624d2415ce2ca851ab767a0)/org/apache/tomcat/tomcat-i18n-fr/9.0.34/tomcat-i18n-fr-9.0.34.jar(SHA1: 81899c98a4dc189eb5a63cd77de1726e917eb236)/org/apache/tomcat/tomcat-i18n-cs/9.0.34/tomcat-i18n-cs-9.0.34.jar(SHA1: a60cac71ce3f27a8e66a4e348b16c4ef903c8362)/org/apache/tomcat/tomcat-i18n-cs/9.0.34/tomcat-i18n-cs-9.0.34.pom(SHA1: a80cad2ada32d5ad394f708f8a99adfa9f88fc5a)/org/apache/tomcat/tomcat-i18n-cs/9.0.34/tomcat-i18n-cs-9.0.34.pom.asc(SHA1: 732dc5fe7df2c16792a63a501a9ae151ce5bc997)/org/apache/tomcat/tomcat-i18n-cs/9.0.34/tomcat-i18n-cs-9.0.34.jar.asc(SHA1: 104456f2b3df9401919b6557fffc69e111d16fa8)/org/apache/tomcat/tomcat-jdbc/9.0.34/tomcat-jdbc-9.0.34-sources.jar(SHA1: 4edeab9fa0f9f7ac2b110d47dfd24cfbd6a6a5c7)/org/apache/tomcat/tomcat-jdbc/9.0.34/tomcat-jdbc-9.0.34.jar.asc(SHA1: a041df48917afd8c79f6717132a82d0051b80004)/org/apache/tomcat/tomcat-jdbc/9.0.34/tomcat-jdbc-9.0.34.jar(SHA1: 79b6fcd8b73a592a96b9e42ced087fea5a795383)/org/apache/tomcat/tomcat-jdbc/9.0.34/tomcat-jdbc-9.0.34-sources.jar.asc(SHA1: 11fe37d972e399c40d913e0010bcfd992cfa8780)/org/apache/tomcat/tomcat-jdbc/9.0.34/tomcat-jdbc-9.0.34.pom(SHA1: 037a65cfa6a3f6e72bf1a802011581fa7bd5c2b8)/org/apache/tomcat/tomcat-jdbc/9.0.34

[VOTE][RESULT] Release Apache Tomcat 9.0.34

[Mark Thomas]

The following votes were cast:

Binding:
+1: remm, mgrigorov, eboourg, csutherl

No other votes were cast.

The vote therefore passes.

Thanks to everyone who contributed to this release.

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

svn commit: r38858 - /dev/tomcat/tomcat-10/v10.0.0-M4/ /release/tomcat/tomcat-10/v10.0.0-M4/

[markt]

Author: markt
Date: Wed Apr  8 15:39:20 2020
New Revision: 38858

Log:
Release Apache Tomcat 10.0.0-M4

Added:
release/tomcat/tomcat-10/v10.0.0-M4/
  - copied from r38857, dev/tomcat/tomcat-10/v10.0.0-M4/
Removed:
dev/tomcat/tomcat-10/v10.0.0-M4/


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

Nexus: Promotion Completed

[Nexus Repository Manager]

Message from: https://repository.apache.orgDeployer properties:"userAgent" = "maven-artifact/2.2.1 (Java 1.8.0_242; Windows 10 10.0)""userId" = "markt""ip" = "86.190.55.221"Details:The following artifacts have been promoted to the "Releases" [id=releases] repository/org/apache/tomcat/tomcat-i18n-de/10.0.0-M4/tomcat-i18n-de-10.0.0-M4.pom.asc(SHA1: 00451c156e0dbd358ca4a27f6c971ba1d7ef2d24)/org/apache/tomcat/tomcat-i18n-de/10.0.0-M4/tomcat-i18n-de-10.0.0-M4.jar(SHA1: bda2267b02310f6e2b16baa4ba24fd1660beab26)/org/apache/tomcat/tomcat-i18n-de/10.0.0-M4/tomcat-i18n-de-10.0.0-M4.pom(SHA1: 50121333bbd66414ae53bd59718907db524a4997)/org/apache/tomcat/tomcat-i18n-de/10.0.0-M4/tomcat-i18n-de-10.0.0-M4.jar.asc(SHA1: 3cdc8ed7a9136f1a16ec76ec753159f4aebc9162)/org/apache/tomcat/tomcat-jni/10.0.0-M4/tomcat-jni-10.0.0-M4.jar(SHA1: 4cbc608f77327dee2fcf2461495c74da6c84647e)/org/apache/tomcat/tomcat-jni/10.0.0-M4/tomcat-jni-10.0.0-M4.pom(SHA1: a81424fd1193ab1d049f79ec7cb5cc9d490cbb77)/org/apache/tomcat/tomcat-jni/10.0.0-M4/tomcat-jni-10.0.0-M4.jar.asc(SHA1: f388b602a7e807ff55318624ddfa54f8f512817b)/org/apache/tomcat/tomcat-jni/10.0.0-M4/tomcat-jni-10.0.0-M4.pom.asc(SHA1: 7c5523d2653259521ad383376f1bdb2ae310bd3b)/org/apache/tomcat/tomcat-jni/10.0.0-M4/tomcat-jni-10.0.0-M4-sources.jar(SHA1: a5822485afd00aeb2eb0fd2c834d2e5ee56cc8f5)/org/apache/tomcat/tomcat-jni/10.0.0-M4/tomcat-jni-10.0.0-M4-sources.jar.asc(SHA1: cd58967006ec77a4bc2407bb18a874c8773f56b9)/org/apache/tomcat/tomcat-juli/10.0.0-M4/tomcat-juli-10.0.0-M4.jar(SHA1: 02fea581e680b46f07e9ab9bf8f88d0aad9e618b)/org/apache/tomcat/tomcat-juli/10.0.0-M4/tomcat-juli-10.0.0-M4-sources.jar(SHA1: 1fc7dfd99563f86a378fa05375a3e237b0d2957d)/org/apache/tomcat/tomcat-juli/10.0.0-M4/tomcat-juli-10.0.0-M4.jar.asc(SHA1: 257ff2c520644943ea9a612826c71405e851536a)/org/apache/tomcat/tomcat-juli/10.0.0-M4/tomcat-juli-10.0.0-M4.pom(SHA1: cdf2cef6ac6be1299dd859592338abfa4a74b77c)/org/apache/tomcat/tomcat-juli/10.0.0-M4/tomcat-juli-10.0.0-M4.pom.asc(SHA1: 02dea393fa886595b769b408ce8c1b15e0b8753e)/org/apache/tomcat/tomcat-juli/10.0.0-M4/tomcat-juli-10.0.0-M4-sources.jar.asc(SHA1: 2e6858d3b55a3bde521d1f687ca8965b06df39aa)/org/apache/tomcat/tomcat-util/10.0.0-M4/tomcat-util-10.0.0-M4-sources.jar(SHA1: c7ba7b7e8370fceb17b7e16548b0f0148f5dc588)/org/apache/tomcat/tomcat-util/10.0.0-M4/tomcat-util-10.0.0-M4-sources.jar.asc(SHA1: 9a3dbe5c2016153225f9c8c42a416f294d319c07)/org/apache/tomcat/tomcat-util/10.0.0-M4/tomcat-util-10.0.0-M4.jar.asc(SHA1: be8421a8e5fd319893374fd03ba42e007f960eb3)/org/apache/tomcat/tomcat-util/10.0.0-M4/tomcat-util-10.0.0-M4.pom.asc(SHA1: dc87204f5c37b5a626062e10e2f05d8d5e2f9dde)/org/apache/tomcat/tomcat-util/10.0.0-M4/tomcat-util-10.0.0-M4.jar(SHA1: ad688e7dba13cd6d50f5be0c1bcc1ba8f0e5fc89)/org/apache/tomcat/tomcat-util/10.0.0-M4/tomcat-util-10.0.0-M4.pom(SHA1: a23446256b6a535f73453469ca9f99a24cb645d2)/org/apache/tomcat/tomcat-catalina/10.0.0-M4/tomcat-catalina-10.0.0-M4.pom.asc(SHA1: 05fb469e6ec000e78aa29a21d90e607e422a46e5)/org/apache/tomcat/tomcat-catalina/10.0.0-M4/tomcat-catalina-10.0.0-M4-sources.jar(SHA1: 4da7df2f2143d0e7a10db82ba85466d4bb4af252)/org/apache/tomcat/tomcat-catalina/10.0.0-M4/tomcat-catalina-10.0.0-M4-sources.jar.asc(SHA1: 07d421611b9af889d4642ca9c7bbd1deaf08ff5c)/org/apache/tomcat/tomcat-catalina/10.0.0-M4/tomcat-catalina-10.0.0-M4.jar(SHA1: 48b91b6904e60114959650e9e75b4c8e95be7027)/org/apache/tomcat/tomcat-catalina/10.0.0-M4/tomcat-catalina-10.0.0-M4.jar.asc(SHA1: f865fa395bbdfe74c4625c2d0ed77b5b7a678fda)/org/apache/tomcat/tomcat-catalina/10.0.0-M4/tomcat-catalina-10.0.0-M4.pom(SHA1: a29b451174e26d6672d9af95ff1a7802103d0ddd)/org/apache/tomcat/tomcat-i18n-fr/10.0.0-M4/tomcat-i18n-fr-10.0.0-M4.jar(SHA1: b3cb41c6ea1254a4bdf7ab05198d3d9adfa44e86)/org/apache/tomcat/tomcat-i18n-fr/10.0.0-M4/tomcat-i18n-fr-10.0.0-M4.jar.asc(SHA1: 2e38d49c61ddbf2c206a1d27928404042bf6e63e)/org/apache/tomcat/tomcat-i18n-fr/10.0.0-M4/tomcat-i18n-fr-10.0.0-M4.pom(SHA1: 0899ad1371e0c1efd3ccb683414aa4e6356176a6)/org/apache/tomcat/tomcat-i18n-fr/10.0.0-M4/tomcat-i18n-fr-10.0.0-M4.pom.asc(SHA1: 448258c412fead9642dfb019fd87b3dc9adc7484)/org/apache/tomcat/tomcat-i18n-cs/10.0.0-M4/tomcat-i18n-cs-10.0.0-M4.jar.asc(SHA1: cf2677200801647f079589fac023b144f8848a2a)/org/apache/tomcat/tomcat-i18n-cs/10.0.0-M4/tomcat-i18n-cs-10.0.0-M4.jar(SHA1: 8442e9c9b6344cadd3ef51a3ea8365307a699df9)/org/apache/tomcat/tomcat-i18n-cs/10.0.0-M4/tomcat-i18n-cs-10.0.0-M4.pom(SHA1: e25e08ac2fea426fbdbc1d5861dbf4621cc8cf38)/org/apache/tomcat/tomcat-i18n-cs/10.0.0-M4/tomcat-i18n-cs-10.0.0-M4.pom.asc(SHA1: 777b18bd31aa9f3e332f7019f0d97884a8d899a8)/org/apache/tomcat/tomcat-jdbc/10.0.0-M4/tomcat-jdbc-10.0.0-M4.jar.asc(SHA1: f6d93f98082f522edacc14b1bc87c01887581106)/org/apache/tomcat/tomcat-jdbc/10.0.0-M4/tomcat-jdbc-10.0.0-M4-sources.jar(SHA1: 0ecbe65acdb98c37d88b9e6a53f2daf9e356b656)/org/apache/tomcat/tomcat-jdbc/10.0.0-M4/tomcat-jdbc-10.0.0-M4.pom.asc(SHA1: feabb18be36e6249d4282ec1dfd9af23fe23ca2c)/org/apache/tomcat/tomcat-j

[VOTE][RESULT] Release Apache Tomcat 10.0.0-M4

[Mark Thomas]

The following votes were cast:

Binding:
+1: remm, mgrigorov, eboourg, csutherl

No other votes were cast.

The vote therefore passes.

Thanks to everyone who contributed to this release.

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

[Bug 64311] org.apache.tomcat.jni.TestSocketServerAnyLocalAddress locks entire testbed run under certain conditions

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #4 from Mark Thomas  ---
Fixed in:
- master for 10.0.0-M5 onwards
- 9.0.x for 9.0.35 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] 01/03: BZ 64311 - Prevent test from hanging if client fails to connect

[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 ddf1dc84147d023bd3a9560f7c49e35628383187
Author: Mark Thomas 
AuthorDate: Wed Apr 8 15:46:01 2020 +0100

BZ 64311 - Prevent test from hanging if client fails to connect
---
 test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java 
b/test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java
index 866ba77..b13b116 100644
--- a/test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java
+++ b/test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java
@@ -146,6 +146,9 @@ public class TestSocketServerAnyLocalAddress extends 
AbstractJniTest {
 sock.close();
 } catch (Exception e) {
 e.printStackTrace();
+// Prevent the test from hanging on Socket.accept(serverSocket)
+// if the client fails
+Socket.shutdown(serverSocket, Socket.APR_SHUTDOWN_READWRITE);
 }
 }
 


-
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 (5e0dd5d -> f83a992)

[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 5e0dd5d  Add an extra field to keep around the configured protocol
 new ddf1dc8  BZ 64311 - Prevent test from hanging if client fails to 
connect
 new 9e05ecd  BZ 64311 Add debug logging to aid investigation of test 
failures
 new f83a992  BZ 64311. Allow for java.net.preferIPv4Stack in APR 
AnyLocalAddress test

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:
 .../apache/tomcat/jni/TestSocketServerAnyLocalAddress.java | 14 --
 1 file changed, 12 insertions(+), 2 deletions(-)


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

[tomcat] 02/03: BZ 64311 Add debug logging to aid investigation of test failures

[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 9e05ecd57dab026964df496d238f446cc1ceaeb1
Author: Mark Thomas 
AuthorDate: Wed Apr 8 15:47:47 2020 +0100

BZ 64311 Add debug logging to aid investigation of test failures
---
 test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java 
b/test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java
index b13b116..e1f78d6 100644
--- a/test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java
+++ b/test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java
@@ -124,6 +124,7 @@ public class TestSocketServerAnyLocalAddress extends 
AbstractJniTest {
 
 try {
 InetSocketAddress connectAddress = 
getConnectAddress(serverSocket);
+System.out.println("Client attempting to connect to [" + 
connectAddress + "]");
 java.net.Socket sock = new java.net.Socket();
 sock.connect(connectAddress, TIMEOUT_MICROSECONDS);
 sock.setSoTimeout(TIMEOUT_MICROSECONDS);
@@ -165,6 +166,7 @@ public class TestSocketServerAnyLocalAddress extends 
AbstractJniTest {
 } else {
 localAddress = new InetSocketAddress("0.0.0.0", addr.port);
 }
+System.out.println("Server is listening at [" + localAddress + 
"]");
 
 // Need a local address of the same type (IPv4 or IPV6) as the
 // configured bind address since the connector may be configured


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

[tomcat] 03/03: BZ 64311. Allow for java.net.preferIPv4Stack in APR AnyLocalAddress test

[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 f83a9928c1dc0c4e34d96c2e1c44deecc68475a8
Author: Mark Thomas 
AuthorDate: Wed Apr 8 16:10:20 2020 +0100

BZ 64311. Allow for java.net.preferIPv4Stack in APR AnyLocalAddress test

Fixes https://bz.apache.org/bugzilla/show_bug.cgi?id=64311
---
 test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java 
b/test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java
index e1f78d6..0023db2 100644
--- a/test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java
+++ b/test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java
@@ -43,8 +43,13 @@ public class TestSocketServerAnyLocalAddress extends 
AbstractJniTest {
 @Before
 public void init() throws Exception {
 long serverPool = Pool.create(0);
-long inetAddress = Address.info(null, Socket.APR_UNSPEC,
-0, 0, serverPool);
+int family;
+if (Boolean.getBoolean("java.net.preferIPv4Stack")) {
+family = Socket.APR_INET;
+} else {
+family = Socket.APR_UNSPEC;
+}
+long inetAddress = Address.info(null, family, 0, 0, serverPool);
 serverSocket = Socket.create(Address.getInfo(inetAddress).family, 
Socket.SOCK_STREAM,
Socket.APR_PROTO_TCP, serverPool);
 if (OS.IS_UNIX) {


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

[tomcat] branch master updated: BZ 64311. Allow for java.net.preferIPv4Stack in APR AnyLocalAddress test

[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 765f944  BZ 64311. Allow for java.net.preferIPv4Stack in APR 
AnyLocalAddress test
765f944 is described below

commit 765f94482637d31cf1e5b561504107288ad498ea
Author: Mark Thomas 
AuthorDate: Wed Apr 8 16:10:20 2020 +0100

BZ 64311. Allow for java.net.preferIPv4Stack in APR AnyLocalAddress test

Fixes https://bz.apache.org/bugzilla/show_bug.cgi?id=64311
---
 test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java 
b/test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java
index e1f78d6..0023db2 100644
--- a/test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java
+++ b/test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java
@@ -43,8 +43,13 @@ public class TestSocketServerAnyLocalAddress extends 
AbstractJniTest {
 @Before
 public void init() throws Exception {
 long serverPool = Pool.create(0);
-long inetAddress = Address.info(null, Socket.APR_UNSPEC,
-0, 0, serverPool);
+int family;
+if (Boolean.getBoolean("java.net.preferIPv4Stack")) {
+family = Socket.APR_INET;
+} else {
+family = Socket.APR_UNSPEC;
+}
+long inetAddress = Address.info(null, family, 0, 0, serverPool);
 serverSocket = Socket.create(Address.getInfo(inetAddress).family, 
Socket.SOCK_STREAM,
Socket.APR_PROTO_TCP, serverPool);
 if (OS.IS_UNIX) {


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

[Bug 64311] org.apache.tomcat.jni.TestSocketServerAnyLocalAddress locks entire testbed run under certain conditions

[bugzilla]

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

--- Comment #3 from Mark Thomas  ---
Ah. That explains it. I can reproduce this now. I've fixed the hang on failure.
I'll look at the failure next.

-- 
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] 02/02: BZ 64311 Add debug logging to aid investigation of test failures

[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 4c456b17c49ef9bdeef49af96f273e07b9c5db00
Author: Mark Thomas 
AuthorDate: Wed Apr 8 15:47:47 2020 +0100

BZ 64311 Add debug logging to aid investigation of test failures
---
 test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java 
b/test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java
index b13b116..e1f78d6 100644
--- a/test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java
+++ b/test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java
@@ -124,6 +124,7 @@ public class TestSocketServerAnyLocalAddress extends 
AbstractJniTest {
 
 try {
 InetSocketAddress connectAddress = 
getConnectAddress(serverSocket);
+System.out.println("Client attempting to connect to [" + 
connectAddress + "]");
 java.net.Socket sock = new java.net.Socket();
 sock.connect(connectAddress, TIMEOUT_MICROSECONDS);
 sock.setSoTimeout(TIMEOUT_MICROSECONDS);
@@ -165,6 +166,7 @@ public class TestSocketServerAnyLocalAddress extends 
AbstractJniTest {
 } else {
 localAddress = new InetSocketAddress("0.0.0.0", addr.port);
 }
+System.out.println("Server is listening at [" + localAddress + 
"]");
 
 // Need a local address of the same type (IPv4 or IPV6) as the
 // configured bind address since the connector may be configured


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

[tomcat] branch master updated (8cdd497 -> 4c456b1)

[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 8cdd497  Add an extra field to keep around the configured protocol
 new 01d748c  BZ 64311 - Prevent test from hanging if client fails to 
connect
 new 4c456b1  BZ 64311 Add debug logging to aid investigation of test 
failures

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java | 5 +
 1 file changed, 5 insertions(+)


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

[tomcat] 01/02: BZ 64311 - Prevent test from hanging if client fails to connect

[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 01d748c1d51c5e568cdb3cc6540527708e7c3e59
Author: Mark Thomas 
AuthorDate: Wed Apr 8 15:46:01 2020 +0100

BZ 64311 - Prevent test from hanging if client fails to connect
---
 test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java 
b/test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java
index 866ba77..b13b116 100644
--- a/test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java
+++ b/test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java
@@ -146,6 +146,9 @@ public class TestSocketServerAnyLocalAddress extends 
AbstractJniTest {
 sock.close();
 } catch (Exception e) {
 e.printStackTrace();
+// Prevent the test from hanging on Socket.accept(serverSocket)
+// if the client fails
+Socket.shutdown(serverSocket, Socket.APR_SHUTDOWN_READWRITE);
 }
 }
 


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

[GitHub] [tomcat] biya-bi commented on issue #266: Fix typo in exception message about quote character in repository path

[GitBox]

biya-bi commented on issue #266: Fix typo in exception message about quote 
character in repository path
URL: https://github.com/apache/tomcat/pull/266#issuecomment-610995670
 
 
   All the pleasure is mine Mark!


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


With regards,
Apache Git Services

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

[GitHub] [tomcat] larsgrefer commented on a change in pull request #272: Loop can be terminated after condition is met

[GitBox]

larsgrefer commented on a change in pull request #272: Loop can be terminated 
after condition is met
URL: https://github.com/apache/tomcat/pull/272#discussion_r405473870
 
 

 ##
 File path: java/org/apache/catalina/realm/RealmBase.java
 ##
 @@ -756,10 +756,11 @@ public void backgroundProcess() {
 }
 
 boolean matched = false;
-for(int k=0; k < patterns.length && !matched; k++) {
+for(int k = 0; k < patterns.length; k++) {
 
 Review comment:
   see #273 


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


With regards,
Apache Git Services

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

[GitHub] [tomcat] larsgrefer opened a new pull request #273: Use enhanced for loops where possible

[GitBox]

larsgrefer opened a new pull request #273: Use enhanced for loops where possible
URL: https://github.com/apache/tomcat/pull/273
 
 
   


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


With regards,
Apache Git Services

-
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: Add an extra field to keep around the configured protocol

[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 5e0dd5d  Add an extra field to keep around the configured protocol
5e0dd5d is described below

commit 5e0dd5d91ca3b9eb85d79fca2b9ce9313d90083c
Author: remm 
AuthorDate: Wed Apr 8 10:43:46 2020 +0200

Add an extra field to keep around the configured protocol

This is simpler and more accurate that converting it back from the class
name.
---
 java/org/apache/catalina/connector/Connector.java | 10 +-
 java/org/apache/coyote/ProtocolHandler.java   | 17 -
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/java/org/apache/catalina/connector/Connector.java 
b/java/org/apache/catalina/connector/Connector.java
index f30f26e..eefb6aa 100644
--- a/java/org/apache/catalina/connector/Connector.java
+++ b/java/org/apache/catalina/connector/Connector.java
@@ -79,6 +79,7 @@ public class Connector extends LifecycleMBeanBase  {
 
 
 public Connector(String protocol) {
+configuredProtocol = protocol;
 boolean apr = AprLifecycleListener.isAprAvailable() &&
 AprLifecycleListener.getUseAprConnector();
 ProtocolHandler p = null;
@@ -102,6 +103,7 @@ public class Connector extends LifecycleMBeanBase  {
 
 public Connector(ProtocolHandler protocolHandler) {
 protocolHandlerClassName = protocolHandler.getClass().getName();
+configuredProtocol = protocolHandlerClassName;
 this.protocolHandler = protocolHandler;
 // Default for Connector depends on this system property
 
setThrowOnFailure(Boolean.getBoolean("org.apache.catalina.startup.EXIT_ON_INIT_FAILURE"));
@@ -247,6 +249,12 @@ public class Connector extends LifecycleMBeanBase  {
 
 
 /**
+ * Name of the protocol that was configured.
+ */
+protected final String configuredProtocol;
+
+
+/**
  * Coyote protocol handler.
  */
 protected final ProtocolHandler protocolHandler;
@@ -608,7 +616,7 @@ public class Connector extends LifecycleMBeanBase  {
  * @return the Coyote protocol handler in use.
  */
 public String getProtocol() {
-return ProtocolHandler.getProtocol(getProtocolHandlerClassName(), 
AprLifecycleListener.getUseAprConnector());
+return configuredProtocol;
 }
 
 
diff --git a/java/org/apache/coyote/ProtocolHandler.java 
b/java/org/apache/coyote/ProtocolHandler.java
index acdf202..34bd47f 100644
--- a/java/org/apache/coyote/ProtocolHandler.java
+++ b/java/org/apache/coyote/ProtocolHandler.java
@@ -233,21 +233,4 @@ public interface ProtocolHandler {
 }
 
 
-/**
- * Get the protocol name associated with the protocol class.
- * @param protocolClassName the protocol class name
- * @param apr if true the APR protcol handler will be used
- * @return the protocol name
- */
-public static String getProtocol(String protocolClassName, boolean apr) {
-if ((!apr && 
org.apache.coyote.http11.Http11NioProtocol.class.getName().equals(protocolClassName))
-|| (apr && 
org.apache.coyote.http11.Http11AprProtocol.class.getName().equals(protocolClassName)))
 {
-return "HTTP/1.1";
-} else if ((!apr && 
org.apache.coyote.ajp.AjpNioProtocol.class.getName().equals(protocolClassName))
-|| (apr && 
org.apache.coyote.ajp.AjpAprProtocol.class.getName().equals(protocolClassName)))
 {
-return "AJP/1.3";
-}
-return protocolClassName;
-}
-
 }


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

[tomcat] branch master updated: Add an extra field to keep around the configured protocol

[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 8cdd497  Add an extra field to keep around the configured protocol
8cdd497 is described below

commit 8cdd49767214d68721c34cdaf838b4164fd62ead
Author: remm 
AuthorDate: Wed Apr 8 10:37:16 2020 +0200

Add an extra field to keep around the configured protocol

This is simpler and more accurate that converting it back from the class
name.
---
 java/org/apache/catalina/connector/Connector.java | 10 +-
 java/org/apache/coyote/ProtocolHandler.java   | 14 --
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/java/org/apache/catalina/connector/Connector.java 
b/java/org/apache/catalina/connector/Connector.java
index f529161..2a56d16 100644
--- a/java/org/apache/catalina/connector/Connector.java
+++ b/java/org/apache/catalina/connector/Connector.java
@@ -73,6 +73,7 @@ public class Connector extends LifecycleMBeanBase  {
 
 
 public Connector(String protocol) {
+configuredProtocol = protocol;
 ProtocolHandler p = null;
 try {
 p = ProtocolHandler.create(protocol);
@@ -94,6 +95,7 @@ public class Connector extends LifecycleMBeanBase  {
 
 public Connector(ProtocolHandler protocolHandler) {
 protocolHandlerClassName = protocolHandler.getClass().getName();
+configuredProtocol = protocolHandlerClassName;
 this.protocolHandler = protocolHandler;
 // Default for Connector depends on this system property
 
setThrowOnFailure(Boolean.getBoolean("org.apache.catalina.startup.EXIT_ON_INIT_FAILURE"));
@@ -259,6 +261,12 @@ public class Connector extends LifecycleMBeanBase  {
 
 
 /**
+ * Name of the protocol that was configured.
+ */
+protected final String configuredProtocol;
+
+
+/**
  * Coyote protocol handler.
  */
 protected final ProtocolHandler protocolHandler;
@@ -651,7 +659,7 @@ public class Connector extends LifecycleMBeanBase  {
  * @return the Coyote protocol handler in use.
  */
 public String getProtocol() {
-return ProtocolHandler.getProtocol(getProtocolHandlerClassName());
+return configuredProtocol;
 }
 
 
diff --git a/java/org/apache/coyote/ProtocolHandler.java 
b/java/org/apache/coyote/ProtocolHandler.java
index 902e86e..c6e1565 100644
--- a/java/org/apache/coyote/ProtocolHandler.java
+++ b/java/org/apache/coyote/ProtocolHandler.java
@@ -222,18 +222,4 @@ public interface ProtocolHandler {
 }
 
 
-/**
- * Get the protocol name associated with the protocol class.
- * @param protocolClassName the protocol class name
- * @return the protocol name
- */
-public static String getProtocol(String protocolClassName) {
-if 
(org.apache.coyote.http11.Http11NioProtocol.class.getName().equals(protocolClassName))
 {
-return "HTTP/1.1";
-} else if 
(org.apache.coyote.ajp.AjpNioProtocol.class.getName().equals(protocolClassName))
 {
-return "AJP/1.3";
-}
-return protocolClassName;
-}
-
 }


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

[GitHub] [tomcat] larsgrefer commented on issue #270: Bulk operation can be used instead of iteration

[GitBox]

larsgrefer commented on issue #270: Bulk operation can be used instead of 
iteration
URL: https://github.com/apache/tomcat/pull/270#issuecomment-610789454
 
 
   Using `addAll` allows the target collection to grow to the correct size in 
advance.


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


With regards,
Apache Git Services

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

[GitHub] [tomcat] michael-o commented on a change in pull request #270: Bulk operation can be used instead of iteration

[GitBox]

michael-o commented on a change in pull request #270: Bulk operation can be 
used instead of iteration
URL: https://github.com/apache/tomcat/pull/270#discussion_r405300164
 
 

 ##
 File path: java/org/apache/catalina/core/ApplicationContext.java
 ##
 @@ -1350,9 +1350,7 @@ protected void clearAttributes() {
 
 // Create list of attributes to be removed
 List list = new ArrayList<>();
 
 Review comment:
   Why not pass to the constructor directly?


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


With regards,
Apache Git Services

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