buildbot success in on tomcat-85-trunk
The Buildbot has detected a restored build on builder tomcat-85-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-85-trunk/builds/2671 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-85-commit' triggered this build Build Source Stamp: [branch 8.5.x] 2a034819f4c6136ea3b090296e66ac6aa9c19f29 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-9-trunk
The Buildbot has detected a restored build on builder tomcat-9-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-9-trunk/builds/710 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] 30a1eaf2372fe7a083389e4284a7322e1f59ea4a 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
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/5763 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] c14c86c78889675ba73819cc5a92f37105214b94 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 failure in on tomcat-9-trunk
The Buildbot has detected a new failure on builder tomcat-9-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-9-trunk/builds/709 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] 6c0c0c70d39518945c5277523e389dd405aac48d Blamelist: Mark Thomas BUILD FAILED: failed compile_1 Sincerely, -The Buildbot - 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 NPE
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 2a03481 Fix NPE
2a03481 is described below
commit 2a034819f4c6136ea3b090296e66ac6aa9c19f29
Author: Mark Thomas
AuthorDate: Fri Mar 26 18:45:48 2021 +
Fix NPE
---
.../tribes/group/interceptors/TestNonBlockingCoordinator.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
b/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
index 2927dc4..f196a7a 100644
---
a/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
+++
b/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
@@ -43,7 +43,7 @@ public class TestNonBlockingCoordinator {
@Before
public void setUp() throws Exception {
LogManager.getLogManager().getLogger(
-
"org.apache.catalina.tribes.group.interceptors.NonBlockingCoordinator").setLevel(Level.ALL);
+
"org.apache.catalina.tribes.group.interceptors.TestNonBlockingCoordinator").setLevel(Level.ALL);
try {
log.info("Setup");
channels = new GroupChannel[CHANNEL_COUNT];
@@ -97,7 +97,7 @@ public class TestNonBlockingCoordinator {
}
} finally {
LogManager.getLogManager().getLogger(
-
"org.apache.catalina.tribes.group.interceptors.NonBlockingCoordinator").setLevel(Level.INFO);
+
"org.apache.catalina.tribes.group.interceptors.TestNonBlockingCoordinator").setLevel(Level.INFO);
}
}
-
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 NPE
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 30a1eaf Fix NPE
30a1eaf is described below
commit 30a1eaf2372fe7a083389e4284a7322e1f59ea4a
Author: Mark Thomas
AuthorDate: Fri Mar 26 18:45:48 2021 +
Fix NPE
---
.../tribes/group/interceptors/TestNonBlockingCoordinator.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
b/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
index 2927dc4..f196a7a 100644
---
a/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
+++
b/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
@@ -43,7 +43,7 @@ public class TestNonBlockingCoordinator {
@Before
public void setUp() throws Exception {
LogManager.getLogManager().getLogger(
-
"org.apache.catalina.tribes.group.interceptors.NonBlockingCoordinator").setLevel(Level.ALL);
+
"org.apache.catalina.tribes.group.interceptors.TestNonBlockingCoordinator").setLevel(Level.ALL);
try {
log.info("Setup");
channels = new GroupChannel[CHANNEL_COUNT];
@@ -97,7 +97,7 @@ public class TestNonBlockingCoordinator {
}
} finally {
LogManager.getLogManager().getLogger(
-
"org.apache.catalina.tribes.group.interceptors.NonBlockingCoordinator").setLevel(Level.INFO);
+
"org.apache.catalina.tribes.group.interceptors.TestNonBlockingCoordinator").setLevel(Level.INFO);
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Fix NPE
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 c14c86c Fix NPE
c14c86c is described below
commit c14c86c78889675ba73819cc5a92f37105214b94
Author: Mark Thomas
AuthorDate: Fri Mar 26 18:45:48 2021 +
Fix NPE
---
.../tribes/group/interceptors/TestNonBlockingCoordinator.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
b/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
index 2927dc4..f196a7a 100644
---
a/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
+++
b/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
@@ -43,7 +43,7 @@ public class TestNonBlockingCoordinator {
@Before
public void setUp() throws Exception {
LogManager.getLogManager().getLogger(
-
"org.apache.catalina.tribes.group.interceptors.NonBlockingCoordinator").setLevel(Level.ALL);
+
"org.apache.catalina.tribes.group.interceptors.TestNonBlockingCoordinator").setLevel(Level.ALL);
try {
log.info("Setup");
channels = new GroupChannel[CHANNEL_COUNT];
@@ -97,7 +97,7 @@ public class TestNonBlockingCoordinator {
}
} finally {
LogManager.getLogManager().getLogger(
-
"org.apache.catalina.tribes.group.interceptors.NonBlockingCoordinator").setLevel(Level.INFO);
+
"org.apache.catalina.tribes.group.interceptors.TestNonBlockingCoordinator").setLevel(Level.INFO);
}
}
-
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
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/5762 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] d76786f7639cfc3327a69a8635c5e04c3b8055e3 Blamelist: Mark Thomas BUILD FAILED: failed compile_1 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-85-trunk
The Buildbot has detected a new failure on builder tomcat-85-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-85-trunk/builds/2670 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-85-commit' triggered this build Build Source Stamp: [branch 8.5.x] 42620fd5c31b34901037045bb93d1649b1301c05 Blamelist: Mark Thomas BUILD FAILED: failed compile_1 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-9-trunk
The Buildbot has detected a restored build on builder tomcat-9-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-9-trunk/builds/708 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] 99639ff29845e978ea27e4468ee2d4dd570d2558 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] 02/02: Enable debug logging for intermittently failing tests on CI systems
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 42620fd5c31b34901037045bb93d1649b1301c05
Author: Mark Thomas
AuthorDate: Fri Mar 26 16:46:21 2021 +
Enable debug logging for intermittently failing tests on CI systems
---
.../interceptors/TestNonBlockingCoordinator.java | 100 +++--
1 file changed, 55 insertions(+), 45 deletions(-)
diff --git
a/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
b/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
index 9f9ed42..2927dc4 100644
---
a/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
+++
b/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
@@ -16,6 +16,9 @@
*/
package org.apache.catalina.tribes.group.interceptors;
+import java.util.logging.Level;
+import java.util.logging.LogManager;
+
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -39,55 +42,62 @@ public class TestNonBlockingCoordinator {
@Before
public void setUp() throws Exception {
-log.info("Setup");
-channels = new GroupChannel[CHANNEL_COUNT];
-coordinators = new NonBlockingCoordinator[CHANNEL_COUNT];
-Thread[] threads = new Thread[CHANNEL_COUNT];
-for ( int i=0; i
[tomcat] 01/02: Add additional debug logging - required to investigate CI failures
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit c6413a0e17d8997408610bde440800f765469e1c
Author: Mark Thomas
AuthorDate: Fri Mar 26 16:45:38 2021 +
Add additional debug logging - required to investigate CI failures
---
.../tribes/group/interceptors/NonBlockingCoordinator.java| 12 +---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git
a/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
b/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
index ab26140..6e947cd 100644
---
a/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
+++
b/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
@@ -760,9 +760,15 @@ public class NonBlockingCoordinator extends
ChannelInterceptorBase {
@Override
public void fireInterceptorEvent(InterceptorEvent event) {
-if (event instanceof CoordinationEvent &&
-((CoordinationEvent)event).type == CoordinationEvent.EVT_CONF_RX)
-log.info(event);
+if (event instanceof CoordinationEvent) {
+if (((CoordinationEvent) event).type ==
CoordinationEvent.EVT_CONF_RX) {
+log.info(event);
+} else {
+if (log.isDebugEnabled()) {
+log.debug(event);
+}
+}
+}
}
public static class CoordinationEvent implements InterceptorEvent {
-
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 (b8af61c -> 42620fd)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git. from b8af61c Use logging framework rather than stdout new c6413a0 Add additional debug logging - required to investigate CI failures new 42620fd Enable debug logging for intermittently failing tests on CI systems 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: .../group/interceptors/NonBlockingCoordinator.java | 12 ++- .../interceptors/TestNonBlockingCoordinator.java | 100 +++-- 2 files changed, 64 insertions(+), 48 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Enable debug logging for intermittently failing tests on CI systems
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 d76786f7639cfc3327a69a8635c5e04c3b8055e3
Author: Mark Thomas
AuthorDate: Fri Mar 26 16:46:21 2021 +
Enable debug logging for intermittently failing tests on CI systems
---
.../interceptors/TestNonBlockingCoordinator.java | 100 +++--
1 file changed, 55 insertions(+), 45 deletions(-)
diff --git
a/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
b/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
index 9f9ed42..2927dc4 100644
---
a/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
+++
b/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
@@ -16,6 +16,9 @@
*/
package org.apache.catalina.tribes.group.interceptors;
+import java.util.logging.Level;
+import java.util.logging.LogManager;
+
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -39,55 +42,62 @@ public class TestNonBlockingCoordinator {
@Before
public void setUp() throws Exception {
-log.info("Setup");
-channels = new GroupChannel[CHANNEL_COUNT];
-coordinators = new NonBlockingCoordinator[CHANNEL_COUNT];
-Thread[] threads = new Thread[CHANNEL_COUNT];
-for ( int i=0; i
[tomcat] branch 9.0.x updated (99639ff -> 6c0c0c7)
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 99639ff Use logging framework rather than stdout add 7b7ae71 Add additional debug logging - required to investigate CI failures add 6c0c0c7 Enable debug logging for intermittently failing tests on CI systems No new revisions were added by this update. Summary of changes: .../group/interceptors/NonBlockingCoordinator.java | 11 ++- .../interceptors/TestNonBlockingCoordinator.java | 100 +++-- 2 files changed, 63 insertions(+), 48 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/02: Add additional debug logging - required to investigate CI failures
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 e31335ae25c327910d3be5d8e73a7a3747f2561f
Author: Mark Thomas
AuthorDate: Fri Mar 26 16:45:38 2021 +
Add additional debug logging - required to investigate CI failures
---
.../tribes/group/interceptors/NonBlockingCoordinator.java | 11 ---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git
a/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
b/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
index a187805..71db650 100644
---
a/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
+++
b/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
@@ -760,9 +760,14 @@ public class NonBlockingCoordinator extends
ChannelInterceptorBase {
@Override
public void fireInterceptorEvent(InterceptorEvent event) {
-if (event instanceof CoordinationEvent &&
-((CoordinationEvent)event).type == CoordinationEvent.EVT_CONF_RX) {
-log.info(event);
+if (event instanceof CoordinationEvent) {
+if (((CoordinationEvent) event).type ==
CoordinationEvent.EVT_CONF_RX) {
+log.info(event);
+} else {
+if (log.isDebugEnabled()) {
+log.debug(event);
+}
+}
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated (b5ff071 -> d76786f)
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 b5ff071 Use logging framework rather than stdout new e31335a Add additional debug logging - required to investigate CI failures new d76786f Enable debug logging for intermittently failing tests on CI systems 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: .../group/interceptors/NonBlockingCoordinator.java | 11 ++- .../interceptors/TestNonBlockingCoordinator.java | 100 +++-- 2 files changed, 63 insertions(+), 48 deletions(-) - 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: Use logging framework rather than stdout
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 b8af61c Use logging framework rather than stdout
b8af61c is described below
commit b8af61ceb64c377d2391293fe0d22e9aa9378687
Author: Mark Thomas
AuthorDate: Fri Mar 26 16:32:26 2021 +
Use logging framework rather than stdout
---
.../tribes/group/interceptors/TestNonBlockingCoordinator.java | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git
a/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
b/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
index 8c611b4..9f9ed42 100644
---
a/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
+++
b/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
@@ -113,11 +113,11 @@ public class TestNonBlockingCoordinator {
public void testCoord2() throws Exception {
// Stop current coordinator to trigger new election
Member member = coordinators[1].getCoordinator();
-System.out.println("Coordinator[2a] is:" + member);
+log.info("Coordinator[2a] is:" + member);
int index = -1;
for (int i = 0; i < CHANNEL_COUNT; i++) {
if (channels[i].getLocalMember(false).equals(member)) {
-System.out.println("Shutting down:" +
channels[i].getLocalMember(true).toString());
+log.info("Shutting down:" +
channels[i].getLocalMember(true).toString());
channels[i].stop(Channel.DEFAULT);
index = i;
break;
@@ -152,19 +152,19 @@ public class TestNonBlockingCoordinator {
count++;
}
-System.out.println("Member
count:"+channels[index].getMembers().length);
+log.info("Member count:"+channels[index].getMembers().length);
member = coordinators[index].getCoordinator();
for (int i = 1; i < CHANNEL_COUNT; i++) {
if (i != dead) {
Assert.assertEquals(member, coordinators[i].getCoordinator());
}
}
-System.out.println("Coordinator[2b] is:" + member);
+log.info("Coordinator[2b] is:" + member);
}
@After
public void tearDown() throws Exception {
-System.out.println("tearDown");
+log.info("tearDown");
for ( int i=0; i
[tomcat] branch 9.0.x updated (a4fdf93 -> 99639ff)
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 a4fdf93 No functional change. Aligning 10.0.x/9.0.x/8.5.x add 99639ff Use logging framework rather than stdout No new revisions were added by this update. Summary of changes: .../tribes/group/interceptors/TestNonBlockingCoordinator.java | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Use logging framework rather than stdout
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 b5ff071 Use logging framework rather than stdout
b5ff071 is described below
commit b5ff0716b4383cfab92daad219721e07c85089bd
Author: Mark Thomas
AuthorDate: Fri Mar 26 16:32:26 2021 +
Use logging framework rather than stdout
---
.../tribes/group/interceptors/TestNonBlockingCoordinator.java | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git
a/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
b/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
index 8c611b4..9f9ed42 100644
---
a/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
+++
b/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
@@ -113,11 +113,11 @@ public class TestNonBlockingCoordinator {
public void testCoord2() throws Exception {
// Stop current coordinator to trigger new election
Member member = coordinators[1].getCoordinator();
-System.out.println("Coordinator[2a] is:" + member);
+log.info("Coordinator[2a] is:" + member);
int index = -1;
for (int i = 0; i < CHANNEL_COUNT; i++) {
if (channels[i].getLocalMember(false).equals(member)) {
-System.out.println("Shutting down:" +
channels[i].getLocalMember(true).toString());
+log.info("Shutting down:" +
channels[i].getLocalMember(true).toString());
channels[i].stop(Channel.DEFAULT);
index = i;
break;
@@ -152,19 +152,19 @@ public class TestNonBlockingCoordinator {
count++;
}
-System.out.println("Member
count:"+channels[index].getMembers().length);
+log.info("Member count:"+channels[index].getMembers().length);
member = coordinators[index].getCoordinator();
for (int i = 1; i < CHANNEL_COUNT; i++) {
if (i != dead) {
Assert.assertEquals(member, coordinators[i].getCoordinator());
}
}
-System.out.println("Coordinator[2b] is:" + member);
+log.info("Coordinator[2b] is:" + member);
}
@After
public void tearDown() throws Exception {
-System.out.println("tearDown");
+log.info("tearDown");
for ( int i=0; i
[GitHub] [tomcat-jakartaee-migration] markt-asf closed issue #17: Can I migrate oracle ords.war using this tool
markt-asf closed issue #17: URL: https://github.com/apache/tomcat-jakartaee-migration/issues/17 -- 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-jakartaee-migration] markt-asf commented on issue #17: Can I migrate oracle ords.war using this tool
markt-asf commented on issue #17: URL: https://github.com/apache/tomcat-jakartaee-migration/issues/17#issuecomment-808352270 This is a question for the Tomcat users mailing list. -- 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-jakartaee-migration] daxlai opened a new issue #17: Can I migrate oracle ords.war using this tool
daxlai opened a new issue #17: URL: https://github.com/apache/tomcat-jakartaee-migration/issues/17 I wish to deploy oracle ords.war on tomcat 10 can I migrate ords.war and deploy on it. Because ords not working when department on tomcat 10. Any 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
Re: [VOTE] Release Apache Tomcat Native 1.2.27
On Fri, Mar 26, 2021 at 12:10 PM Mark Thomas wrote: > Version 1.2.27 includes the following changes compared to 1.2.26 > > - Windows binaries built using 1.1.1k > > - BZ 65181 - Improved support for OpenSSL engines with proprietary key >formats > > The proposed release artefacts can be found at [1], > and the build was done using tag [2]. > > The Apache Tomcat Native 1.2.27 release is > [X] Stable, go ahead and release > [ ] Broken because of ... > Rémy > > Thanks, > > Mark > > > [1] > > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-connectors/native/1.2.27 > [2] > > https://gitbox.apache.org/repos/asf?p=tomcat-native.git;a=commit;h=c7c22b9c7f96869aa8f04e6692518aa5323a467b > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > >
[Bug 65204] LinkageError AuthConfigFactoryImpl
https://bz.apache.org/bugzilla/show_bug.cgi?id=65204 --- Comment #8 from Lukas Vasek --- Hello, so finally it wasn't that hard. Here is an example https://github.com/bilak-poc/spring-boot-tomcat-issue We are using jmockit (agent?) https://github.com/bilak-poc/spring-boot-tomcat-issue/blob/main/pom.xml#L71 so probably this is causing also some issues. If we switch the tomcat to 9.0.41 https://github.com/bilak-poc/spring-boot-tomcat-issue/blob/main/pom.xml#L21 then it's working, but with current 9.0.43 it's not. Do you think such thing can be fixed on tomcat site or do I have to contact jmockit owner? Thanks -- 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 Native 1.2.27
On 26/03/2021 11:10, Mark Thomas wrote: Version 1.2.27 includes the following changes compared to 1.2.26 - Windows binaries built using 1.1.1k - BZ 65181 - Improved support for OpenSSL engines with proprietary key formats The proposed release artefacts can be found at [1], and the build was done using tag [2]. The Apache Tomcat Native 1.2.27 release is [X] Stable, go ahead and release [ ] Broken because of ... Tomcat 10.0.x tests pass on 64-bit Windows with Tomcat Native 1.2.27 and the APR/Native connector. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-native] branch master updated: Increment version to 1.2.28 for next development cycle
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-native.git
The following commit(s) were added to refs/heads/master by this push:
new 08b803b Increment version to 1.2.28 for next development cycle
08b803b is described below
commit 08b803bd236f946cf64216ec82d8fa60535ec64a
Author: Mark Thomas
AuthorDate: Fri Mar 26 11:38:50 2021 +
Increment version to 1.2.28 for next development cycle
---
build.properties.default | 2 +-
native/include/tcn_version.h | 2 +-
native/os/win32/libtcnative.rc| 6 +++---
xdocs/miscellaneous/changelog.xml | 2 ++
4 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index e0c9c2c..849219b 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -18,7 +18,7 @@
# - Version Control Flags -
version.major=1
version.minor=2
-version.build=27
+version.build=28
version.patch=0
version.suffix=-dev
diff --git a/native/include/tcn_version.h b/native/include/tcn_version.h
index 3f14a15..c753fa9 100644
--- a/native/include/tcn_version.h
+++ b/native/include/tcn_version.h
@@ -63,7 +63,7 @@ extern "C" {
#define TCN_MINOR_VERSION 2
/** patch level */
-#define TCN_PATCH_VERSION 27
+#define TCN_PATCH_VERSION 28
/**
* This symbol is defined for internal, "development" copies of TCN. This
diff --git a/native/os/win32/libtcnative.rc b/native/os/win32/libtcnative.rc
index 8c26f6d..85cb83d 100644
--- a/native/os/win32/libtcnative.rc
+++ b/native/os/win32/libtcnative.rc
@@ -20,7 +20,7 @@ LANGUAGE 0x9,0x1
"See the License for the specific language governing " \
"permissions and limitations under the License."
-#define TCN_VERSION "1.2.27"
+#define TCN_VERSION "1.2.28"
1000 ICON "apache.ico"
1001 DIALOGEX 0, 0, 252, 51
@@ -36,8 +36,8 @@ BEGIN
END
1 VERSIONINFO
- FILEVERSION 1,2,27,0
- PRODUCTVERSION 1,2,27,0
+ FILEVERSION 1,2,28,0
+ PRODUCTVERSION 1,2,28,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
diff --git a/xdocs/miscellaneous/changelog.xml
b/xdocs/miscellaneous/changelog.xml
index ff5fce1..3a09b9c 100644
--- a/xdocs/miscellaneous/changelog.xml
+++ b/xdocs/miscellaneous/changelog.xml
@@ -34,6 +34,8 @@
This is the Changelog for Tomcat Native 1.2.
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[VOTE] Release Apache Tomcat Native 1.2.27
Version 1.2.27 includes the following changes compared to 1.2.26 - Windows binaries built using 1.1.1k - BZ 65181 - Improved support for OpenSSL engines with proprietary key formats The proposed release artefacts can be found at [1], and the build was done using tag [2]. The Apache Tomcat Native 1.2.27 release is [ ] Stable, go ahead and release [ ] Broken because of ... Thanks, Mark [1] https://dist.apache.org/repos/dist/dev/tomcat/tomcat-connectors/native/1.2.27 [2] https://gitbox.apache.org/repos/asf?p=tomcat-native.git;a=commit;h=c7c22b9c7f96869aa8f04e6692518aa5323a467b - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r46749 - in /dev/tomcat/tomcat-connectors/native/1.2.27: ./ binaries/ source/
Author: markt Date: Fri Mar 26 11:07:03 2021 New Revision: 46749 Log: Upload Tomcat Native 1.2.27 for voting Added: dev/tomcat/tomcat-connectors/native/1.2.27/ dev/tomcat/tomcat-connectors/native/1.2.27/binaries/ dev/tomcat/tomcat-connectors/native/1.2.27/binaries/tomcat-native-1.2.27-openssl-1.1.1k-ocsp-win32-bin.zip (with props) dev/tomcat/tomcat-connectors/native/1.2.27/binaries/tomcat-native-1.2.27-openssl-1.1.1k-ocsp-win32-bin.zip.asc dev/tomcat/tomcat-connectors/native/1.2.27/binaries/tomcat-native-1.2.27-openssl-1.1.1k-ocsp-win32-bin.zip.sha512 dev/tomcat/tomcat-connectors/native/1.2.27/binaries/tomcat-native-1.2.27-openssl-1.1.1k-win32-bin.zip (with props) dev/tomcat/tomcat-connectors/native/1.2.27/binaries/tomcat-native-1.2.27-openssl-1.1.1k-win32-bin.zip.asc dev/tomcat/tomcat-connectors/native/1.2.27/binaries/tomcat-native-1.2.27-openssl-1.1.1k-win32-bin.zip.sha512 dev/tomcat/tomcat-connectors/native/1.2.27/source/ dev/tomcat/tomcat-connectors/native/1.2.27/source/tomcat-native-1.2.27-src.tar.gz (with props) dev/tomcat/tomcat-connectors/native/1.2.27/source/tomcat-native-1.2.27-src.tar.gz.asc dev/tomcat/tomcat-connectors/native/1.2.27/source/tomcat-native-1.2.27-src.tar.gz.sha512 dev/tomcat/tomcat-connectors/native/1.2.27/source/tomcat-native-1.2.27-win32-src.zip (with props) dev/tomcat/tomcat-connectors/native/1.2.27/source/tomcat-native-1.2.27-win32-src.zip.asc dev/tomcat/tomcat-connectors/native/1.2.27/source/tomcat-native-1.2.27-win32-src.zip.sha512 Added: dev/tomcat/tomcat-connectors/native/1.2.27/binaries/tomcat-native-1.2.27-openssl-1.1.1k-ocsp-win32-bin.zip == Binary file - no diff available. Propchange: dev/tomcat/tomcat-connectors/native/1.2.27/binaries/tomcat-native-1.2.27-openssl-1.1.1k-ocsp-win32-bin.zip -- svn:executable = * Propchange: dev/tomcat/tomcat-connectors/native/1.2.27/binaries/tomcat-native-1.2.27-openssl-1.1.1k-ocsp-win32-bin.zip -- svn:mime-type = application/octet-stream Added: dev/tomcat/tomcat-connectors/native/1.2.27/binaries/tomcat-native-1.2.27-openssl-1.1.1k-ocsp-win32-bin.zip.asc == --- dev/tomcat/tomcat-connectors/native/1.2.27/binaries/tomcat-native-1.2.27-openssl-1.1.1k-ocsp-win32-bin.zip.asc (added) +++ dev/tomcat/tomcat-connectors/native/1.2.27/binaries/tomcat-native-1.2.27-openssl-1.1.1k-ocsp-win32-bin.zip.asc Fri Mar 26 11:07:03 2021 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Comment: GPGTools - http://gpgtools.org + +iQIzBAABCgAdFiEEqcXfTSLpmZjZh1pREMAcWi9gWecFAmBdv+8ACgkQEMAcWi9g +WecKvA//WtSZi4QfFq1dv4Sn9pcZvyrge47gPfh5RZ7TE5RhyRc81Pjv3KItK6vT +YvxuyLNYeVCMuyyLQ5DZ7uZB9XzRdJaphpMeGWyDXCOEVlcYj4/BsjohZRWLlnWL +UoVKfn1d345KrmXzq1RBzdxfSnq7cgJ4NL6ULEPIz1WRujM43CPWfye8hBUscwSY +8FrRbeckA3R7Ghy4XPgPi6lKgYEUDNtKapB0F8qXjeZ3s1JvyObDXMFCQhTIsXUb +UwXnDgQwDMxHxAAhHisbqjEYPe9VA06eUlldiDiUxIcT5j8I+DSCltvzozWna06U +diF4v1S0RBKfzetWFhVmRIpX2JN25u1DXM05riL14fRoElBMbRolLOdPvBjtAj47 +VcaMpo7srK2xU24EIVxpIMiKRNH16a0Tt+aj0khrbCsjI1ikmoBbVvexpGcR6f5c +Xg3RSVXc/DlRxfcR4mH4la6p7+r/RBx9uDk8szjYxu68x6D7bonklmwnClaVyLFW +pdoWqdtGHgDZT8x/nQ058xkAGx2GFT9ljNxMPYgTFFT7rg0m3IUTMRecYA7eyjxN +nAWrxc8VL4w2txcamW2IqaHyLcLg8tbCFWMHvIjJawV1q83ezBh2vRMxVIDZeoUw +/28lS+mCXr8DSB3dXY6AzXDG9NqTxJDrm11x6faU3Lhs/6w+aRk= +=OCuM +-END PGP SIGNATURE- Added: dev/tomcat/tomcat-connectors/native/1.2.27/binaries/tomcat-native-1.2.27-openssl-1.1.1k-ocsp-win32-bin.zip.sha512 == --- dev/tomcat/tomcat-connectors/native/1.2.27/binaries/tomcat-native-1.2.27-openssl-1.1.1k-ocsp-win32-bin.zip.sha512 (added) +++ dev/tomcat/tomcat-connectors/native/1.2.27/binaries/tomcat-native-1.2.27-openssl-1.1.1k-ocsp-win32-bin.zip.sha512 Fri Mar 26 11:07:03 2021 @@ -0,0 +1 @@ +7d0c90ae5f91c921f0037755f728fc0ab22336cf40d9fa0d51d6433debee7f2cad2482f59d1b50424e29016daf4fcd130fb4ff5320ff592e245602d94b9b7b85 *tomcat-native-1.2.27-openssl-1.1.1k-ocsp-win32-bin.zip \ No newline at end of file Added: dev/tomcat/tomcat-connectors/native/1.2.27/binaries/tomcat-native-1.2.27-openssl-1.1.1k-win32-bin.zip == Binary file - no diff available. Propchange: dev/tomcat/tomcat-connectors/native/1.2.27/binaries/tomcat-native-1.2.27-openssl-1.1.1k-win32-bin.zip -- svn:executable = * Propchange: dev/tomcat/tomcat-connectors/native/1.2.27/binaries/tomcat-native-1.2.27-openssl-1.1.1k-win32-bin.zip --
svn commit: r46748 - /release/tomcat/tomcat-connectors/native/README.html
Author: markt Date: Fri Mar 26 11:06:16 2021 New Revision: 46748 Log: Correct latest version of Tomcat Native Modified: release/tomcat/tomcat-connectors/native/README.html Modified: release/tomcat/tomcat-connectors/native/README.html == --- release/tomcat/tomcat-connectors/native/README.html (original) +++ release/tomcat/tomcat-connectors/native/README.html Fri Mar 26 11:06:16 2021 @@ -1,4 +1,4 @@ The Apache Tomcat Native -The latest release version is 1.2.25 +The latest release version is 1.2.26 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-jakartaee-migration] branch master updated: Improve on the load check
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-jakartaee-migration.git
The following commit(s) were added to refs/heads/master by this push:
new 1e14545 Improve on the load check
1e14545 is described below
commit 1e14545fb4403131ffb5d964eb0e6d88561a3674
Author: remm
AuthorDate: Fri Mar 26 11:12:19 2021 +0100
Improve on the load check
getResource should be a good alternative.
Also account for generics.
---
.../java/org/apache/tomcat/jakartaee/ClassConverter.java | 12 +---
.../org/apache/tomcat/jakartaee/LocalStrings.properties | 1 +
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/apache/tomcat/jakartaee/ClassConverter.java
b/src/main/java/org/apache/tomcat/jakartaee/ClassConverter.java
index 1ef8993..9b3cbd9 100644
--- a/src/main/java/org/apache/tomcat/jakartaee/ClassConverter.java
+++ b/src/main/java/org/apache/tomcat/jakartaee/ClassConverter.java
@@ -118,16 +118,14 @@ public class ClassConverter implements Converter,
ClassFileTransformer {
if (newString != str) {
// Since this is runtime conversion, the idea is to
only convert to
// Jakarta EE specification classes that exist in the
container
-String[] split = newString.split(";");
+String[] split = newString.split(";|<");
for (String current : split) {
int pos = current.indexOf("jakarta/");
if (pos >= 0) {
-boolean found = false;
-try {
-
loader.loadClass(current.substring(pos).replace('/', '.'));
-found = true;
-} catch (Exception e) {}
-if (!found) {
+if (loader.getResource(current.substring(pos)
+ ".class") == null) {
+if (logger.isLoggable(Level.FINE)) {
+logger.log(Level.FINE,
sm.getString("classConverter.skipName", current.substring(pos)));
+}
// Cancel the replacement as the
replacement does not exist
String originalFragment =
current.replace("jakarta/", "javax/");
newString = newString.replace(current,
originalFragment);
diff --git
a/src/main/resources/org/apache/tomcat/jakartaee/LocalStrings.properties
b/src/main/resources/org/apache/tomcat/jakartaee/LocalStrings.properties
index 3614cfc..e46a8d8 100644
--- a/src/main/resources/org/apache/tomcat/jakartaee/LocalStrings.properties
+++ b/src/main/resources/org/apache/tomcat/jakartaee/LocalStrings.properties
@@ -15,6 +15,7 @@
classConverter.converted=Migrated class [{0}]
classConverter.noConversion=No conversion necessary for [{0}]
+classConverter.skipName=Skip conversion of class [{0}] as it is not accessible
to the classloader
migration.archive.complete=Migration finished for archive [{0}]
migration.archive.memory=Migration starting for archive [{0}] using in memory
copy
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-native] tag 1.2.27 created (now c7c22b9)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to tag 1.2.27 in repository https://gitbox.apache.org/repos/asf/tomcat-native.git. at c7c22b9 (commit) This tag includes the following new commits: new c7c22b9 Tag 1.2.27 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-native] 01/01: Tag 1.2.27
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to tag 1.2.27
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git
commit c7c22b9c7f96869aa8f04e6692518aa5323a467b
Author: Mark Thomas
AuthorDate: Fri Mar 26 09:57:01 2021 +
Tag 1.2.27
---
build.properties.default | 2 +-
native/include/tcn_version.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index e0c9c2c..ef924c9 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -20,7 +20,7 @@ version.major=1
version.minor=2
version.build=27
version.patch=0
-version.suffix=-dev
+version.suffix=
# - Default Base Path for Dependent Packages -
# Please note this path must be absolute, not relative,
diff --git a/native/include/tcn_version.h b/native/include/tcn_version.h
index 3f14a15..68d1a53 100644
--- a/native/include/tcn_version.h
+++ b/native/include/tcn_version.h
@@ -69,7 +69,7 @@ extern "C" {
* This symbol is defined for internal, "development" copies of TCN. This
* symbol will be #undef'd for releases.
*/
-#define TCN_IS_DEV_VERSION 1
+#define TCN_IS_DEV_VERSION 0
/** The formatted string of APU's version */
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-native] 02/02: Estimate 1.2.27 release date as 29 Mar 2021
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-native.git commit e913c1000e3181049319fdf9bed1eb4f9f2188fa Author: Mark Thomas AuthorDate: Fri Mar 26 09:50:08 2021 + Estimate 1.2.27 release date as 29 Mar 2021 --- xdocs/index.xml | 4 ++-- xdocs/miscellaneous/project.xml | 1 + xdocs/news/2021.xml | 39 +++ xdocs/news/project.xml | 1 + xdocs/project.xml | 1 + 5 files changed, 44 insertions(+), 2 deletions(-) diff --git a/xdocs/index.xml b/xdocs/index.xml index f778e5c..11432cf 100644 --- a/xdocs/index.xml +++ b/xdocs/index.xml @@ -60,10 +60,10 @@ -21 Dec 2020 - TC-Native-1.2.26 +29 Mar 2021 - TC-Native-1.2.27 released The Apache Tomcat team is proud to announce the immediate availability of -Tomcat Native 1.2.26 Stable. +Tomcat Native 1.2.27 Stable. The sources and the binaries for selected platforms are available from the Download page. diff --git a/xdocs/miscellaneous/project.xml b/xdocs/miscellaneous/project.xml index c73abc8..36e85fd 100644 --- a/xdocs/miscellaneous/project.xml +++ b/xdocs/miscellaneous/project.xml @@ -34,6 +34,7 @@ + diff --git a/xdocs/news/2021.xml b/xdocs/news/2021.xml new file mode 100644 index 000..e3afc7a --- /dev/null +++ b/xdocs/news/2021.xml @@ -0,0 +1,39 @@ + + + +]> + + + + + +2021 News and Status + + + + + + + The Apache Tomcat team is proud to announce the immediate availability of + Tomcat Native 1.2.27. This is a bugfix release. + + + + + diff --git a/xdocs/news/project.xml b/xdocs/news/project.xml index 5e76d93..939d6fb 100644 --- a/xdocs/news/project.xml +++ b/xdocs/news/project.xml @@ -34,6 +34,7 @@ + diff --git a/xdocs/project.xml b/xdocs/project.xml index 2eb025c..15d0932 100644 --- a/xdocs/project.xml +++ b/xdocs/project.xml @@ -34,6 +34,7 @@ + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-native] 01/02: Update java code to align with 10.0.x
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-native.git
commit 825fc23733a82c28f005c365caa7e724fa437b5a
Author: Mark Thomas
AuthorDate: Fri Mar 26 09:44:32 2021 +
Update java code to align with 10.0.x
---
java/org/apache/tomcat/jni/SSLContext.java | 9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/tomcat/jni/SSLContext.java
b/java/org/apache/tomcat/jni/SSLContext.java
index e0759b3..1810571 100644
--- a/java/org/apache/tomcat/jni/SSLContext.java
+++ b/java/org/apache/tomcat/jni/SSLContext.java
@@ -17,6 +17,7 @@
package org.apache.tomcat.jni;
+import java.util.Locale;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -416,7 +417,10 @@ public final class SSLContext {
if (sniCallBack == null) {
return 0;
}
-return sniCallBack.getSslContext(sniHostName);
+// Can't be sure OpenSSL is going to provide the SNI value in lower
case
+// so convert it before looking up the SSLContext
+String hostName = (sniHostName == null) ? null :
sniHostName.toLowerCase(Locale.ENGLISH);
+return sniCallBack.getSslContext(hostName);
}
/**
@@ -470,7 +474,8 @@ public final class SSLContext {
* This callback is made during the TLS handshake when the client uses
* the SNI extension to request a specific TLS host.
*
- * @param sniHostName The host name requested by the client
+ * @param sniHostName The host name requested by the client - must be
in
+ *lower case
*
* @return The Java representation of the pointer to the OpenSSL
* SSLContext to use for the given host or zero if no
SSLContext
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-native] branch master updated (2bfb564 -> e913c10)
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-native.git.
from 2bfb564 Update recommended OpenSSL version to 1.1.1k or later
new 825fc23 Update java code to align with 10.0.x
new e913c10 Estimate 1.2.27 release date as 29 Mar 2021
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:
java/org/apache/tomcat/jni/SSLContext.java | 9 +++--
xdocs/index.xml| 4 ++--
xdocs/miscellaneous/project.xml| 1 +
xdocs/news/{2019.xml => 2021.xml} | 15 +--
xdocs/news/project.xml | 1 +
xdocs/project.xml | 1 +
6 files changed, 17 insertions(+), 14 deletions(-)
copy xdocs/news/{2019.xml => 2021.xml} (69%)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 64496] Calling [asyncPostProcess()] is not valid for a request with Async state [ERROR]
https://bz.apache.org/bugzilla/show_bug.cgi?id=64496 soic changed: What|Removed |Added Status|NEEDINFO|RESOLVED Resolution|--- |FIXED --- Comment #13 from soic --- Hello. After trying your advice, the bug no longer occurs! I change the status of the ticket to 'Resolved'. Thanks. -- 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-native] branch master updated: Update recommended OpenSSL version to 1.1.1k or later
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-native.git The following commit(s) were added to refs/heads/master by this push: new 2bfb564 Update recommended OpenSSL version to 1.1.1k or later 2bfb564 is described below commit 2bfb564141df4fe9a6bf6ee0acdc770e8f1f8e1e Author: Mark Thomas AuthorDate: Thu Mar 25 20:34:56 2021 + Update recommended OpenSSL version to 1.1.1k or later --- download_deps.sh | 2 +- native/srclib/VERSIONS| 2 +- xdocs/miscellaneous/changelog.xml | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/download_deps.sh b/download_deps.sh index 80613a6..558cd15 100755 --- a/download_deps.sh +++ b/download_deps.sh @@ -3,7 +3,7 @@ # Small script to get a recent openssl, with npn support # Will run configure and build_libs to generate the .s files -SSL=openssl-1.1.1i.tar.gz +SSL=openssl-1.1.1k.tar.gz APR=apr-1.7.0.tar.gz mkdir -p deps diff --git a/native/srclib/VERSIONS b/native/srclib/VERSIONS index 3ea7339..cbb4ac3 100644 --- a/native/srclib/VERSIONS +++ b/native/srclib/VERSIONS @@ -5,7 +5,7 @@ The current minimum versions are: The following version of the libraries are recommended: - APR 1.7.0 or later, http://apr.apache.org -- OpenSSL 1.1.1i or later, http://www.openssl.org +- OpenSSL 1.1.1k or later, http://www.openssl.org Older versions should also work but are not as thoroughly tested by the Tomcat Native team diff --git a/xdocs/miscellaneous/changelog.xml b/xdocs/miscellaneous/changelog.xml index f9874cc..ff5fce1 100644 --- a/xdocs/miscellaneous/changelog.xml +++ b/xdocs/miscellaneous/changelog.xml @@ -40,6 +40,9 @@ 65181: Improve support for using OpenSSL Engines that use proprietary key formats. Patch provided by Edin Hodizc. (markt) + + Update recommended OpenSSL version to 1.1.1k or later. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 60030] Run away CPU with JSSE / OpenSSL with IE8
https://bz.apache.org/bugzilla/show_bug.cgi?id=60030 --- Comment #5 from doni iskan --- Agen poker online indonesia terbaik dan terpercaya dan hanya di website game dewapoker dan poker88, Dapatkan bonus jutaan rupiah di undi setiap hari tampa syarat hanya main saja dapet bonus gede !!! segera daftarkan diri anda!!! https://199.188.206.214 https://199.192.31.67 https://199.192.26.4 -- 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
