This is an automated email from the ASF dual-hosted git repository.
rmannibucau pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwebbeans-meecrowave.git
The following commit(s) were added to refs/heads/master by this push:
new 2508719 minor change to replace deprecated API by up to date ones
2508719 is described below
commit 2508719673a8dc75e8992b20e43aeca595d3a2a4
Author: Romain Manni-Bucau
AuthorDate: Tue Mar 23 20:30:03 2021 +0100
minor change to replace deprecated API by up to date ones
---
.../java/org/apache/meecrowave/Meecrowave.java | 92 +++---
.../meecrowave/johnzon/JohnzonBufferTest.java | 8 +-
.../apache/meecrowave/doc/generator/Downloads.java | 3 +-
.../letencrypt/LetsEncryptReloadLifecycle.java | 42 +-
.../meecrowave/maven/MeecrowaveBundleMojo.java | 67
5 files changed, 103 insertions(+), 109 deletions(-)
diff --git
a/meecrowave-core/src/main/java/org/apache/meecrowave/Meecrowave.java
b/meecrowave-core/src/main/java/org/apache/meecrowave/Meecrowave.java
index 450cd79..705567f 100644
--- a/meecrowave-core/src/main/java/org/apache/meecrowave/Meecrowave.java
+++ b/meecrowave-core/src/main/java/org/apache/meecrowave/Meecrowave.java
@@ -617,8 +617,8 @@ public class Meecrowave implements AutoCloseable {
if (tomcat.getRawConnector() == null && !configuration.isSkipHttp()) {
final Connector connector = createConnector();
connector.setPort(configuration.getHttpPort());
-if (connector.getAttribute("connectionTimeout") == null) {
-connector.setAttribute("connectionTimeout", "3000");
+if (connector.getProperty("connectionTimeout") == null) {
+connector.setProperty("connectionTimeout", "3000");
}
tomcat.getService().addConnector(connector);
@@ -636,7 +636,7 @@ public class Meecrowave implements AutoCloseable {
configuration.getProperties().setProperty("connector.sslhostconfig.sslProtocol",
configuration.getSslProtocol());
}
if
(configuration.getProperties().getProperty("connector.sslhostconfig.hostName")
!= null) {
-httpsConnector.setAttribute("defaultSSLHostConfigName",
configuration.getProperties().getProperty("connector.sslhostconfig.hostName"));
+httpsConnector.setProperty("defaultSSLHostConfigName",
configuration.getProperties().getProperty("connector.sslhostconfig.hostName"));
}
if (configuration.getKeystoreFile() != null) {
configuration.getProperties().setProperty("connector.sslhostconfig.certificateKeystoreFile",
configuration.getKeystoreFile());
@@ -646,7 +646,7 @@ public class Meecrowave implements AutoCloseable {
}
configuration.getProperties().setProperty("connector.sslhostconfig.certificateKeystoreType",
configuration.getKeystoreType());
if (configuration.getClientAuth() != null) {
-httpsConnector.setAttribute("clientAuth",
configuration.getClientAuth());
+httpsConnector.setProperty("clientAuth",
configuration.getClientAuth());
}
if (configuration.getKeyAlias() != null) {
@@ -683,7 +683,7 @@ public class Meecrowave implements AutoCloseable {
buildSslHostConfig.forEach(httpsConnector::addSslHostConfig);
if (configuration.getDefaultSSLHostConfigName() != null) {
-httpsConnector.setAttribute("defaultSSLHostConfigName",
configuration.getDefaultSSLHostConfigName());
+httpsConnector.setProperty("defaultSSLHostConfigName",
configuration.getDefaultSSLHostConfigName());
}
tomcat.getService().addConnector(httpsConnector);
if (configuration.isSkipHttp()) {
@@ -783,8 +783,8 @@ public class Meecrowave implements AutoCloseable {
String::equalsIgnoreCase : String::equals;
return certificate != null && !(new File(certificate).exists())
&& !equals.test(
-
Paths.get(System.getProperty("user.home")).resolve(".keystore").toAbsolutePath().normalize().toString(),
-
Paths.get(certificate).toAbsolutePath().normalize().toString());
+
Paths.get(System.getProperty("user.home")).resolve(".keystore").toAbsolutePath().normalize().toString(),
+
Paths.get(certificate).toAbsolutePath().normalize().toString());
}
private void copyCertificateToConfDir(String certificate) {
@@ -816,6 +816,7 @@ public class Meecrowave implements AutoCloseable {
/**
* Store away the current system property for restoring it later
* during shutdown.
+ *
* @param backupPropertyMap a Map to store away the previous value before
setting the newValue
* @param propertyKey
* @param newValue
@@ -880,12 +881,12 @@ public
