date:20211006

[tomcat] branch main updated: Refactor JNI out of bean classes

2021-10-06 Thread remm

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

remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/main by this push:
 new 1a43053  Refactor JNI out of bean classes
1a43053 is described below

commit 1a430530cdf1ed19e966b9c83791937942c2baf3
Author: remm 
AuthorDate: Wed Oct 6 16:59:59 2021 +0200

Refactor JNI out of bean classes

They are used in SSLHostConfig, so this ties everything to the JNI code.
---
 .../tomcat/util/net/openssl/OpenSSLConf.java   | 91 --
 .../tomcat/util/net/openssl/OpenSSLContext.java| 88 -
 2 files changed, 86 insertions(+), 93 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/openssl/OpenSSLConf.java 
b/java/org/apache/tomcat/util/net/openssl/OpenSSLConf.java
index 8ab720c..f234e03 100644
--- a/java/org/apache/tomcat/util/net/openssl/OpenSSLConf.java
+++ b/java/org/apache/tomcat/util/net/openssl/OpenSSLConf.java
@@ -20,18 +20,10 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.juli.logging.Log;
-import org.apache.juli.logging.LogFactory;
-import org.apache.tomcat.jni.SSLConf;
-import org.apache.tomcat.util.res.StringManager;
-
 public class OpenSSLConf implements Serializable {
 
 private static final long serialVersionUID = 1L;
 
-private static final Log log = LogFactory.getLog(OpenSSLConf.class);
-private static final StringManager sm = 
StringManager.getManager(OpenSSLConf.class);
-
 private final List commands = new ArrayList<>();
 
 public void addCmd(OpenSSLConfCmd cmd) {
@@ -42,87 +34,4 @@ public class OpenSSLConf implements Serializable {
 return commands;
 }
 
-public boolean check(long cctx) throws Exception {
-boolean result = true;
-OpenSSLConfCmd cmd;
-String name;
-String value;
-int rc;
-for (OpenSSLConfCmd command : commands) {
-cmd = command;
-name = cmd.getName();
-value = cmd.getValue();
-if (name == null) {
-log.error(sm.getString("opensslconf.noCommandName", value));
-result = false;
-continue;
-}
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("opensslconf.checkCommand", name, 
value));
-}
-try {
-rc = SSLConf.check(cctx, name, value);
-} catch (Exception e) {
-log.error(sm.getString("opensslconf.checkFailed"));
-return false;
-}
-if (rc <= 0) {
-log.error(sm.getString("opensslconf.failedCommand", name, 
value,
-Integer.toString(rc)));
-result = false;
-} else if (log.isDebugEnabled()) {
-log.debug(sm.getString("opensslconf.resultCommand", name, 
value,
-Integer.toString(rc)));
-}
-}
-if (!result) {
-log.error(sm.getString("opensslconf.checkFailed"));
-}
-return result;
-}
-
-public boolean apply(long cctx, long ctx) throws Exception {
-boolean result = true;
-SSLConf.assign(cctx, ctx);
-OpenSSLConfCmd cmd;
-String name;
-String value;
-int rc;
-for (OpenSSLConfCmd command : commands) {
-cmd = command;
-name = cmd.getName();
-value = cmd.getValue();
-if (name == null) {
-log.error(sm.getString("opensslconf.noCommandName", value));
-result = false;
-continue;
-}
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("opensslconf.applyCommand", name, 
value));
-}
-try {
-rc = SSLConf.apply(cctx, name, value);
-} catch (Exception e) {
-log.error(sm.getString("opensslconf.applyFailed"));
-return false;
-}
-if (rc <= 0) {
-log.error(sm.getString("opensslconf.failedCommand", name, 
value,
-Integer.toString(rc)));
-result = false;
-} else if (log.isDebugEnabled()) {
-log.debug(sm.getString("opensslconf.resultCommand", name, 
value,
-Integer.toString(rc)));
-}
-}
-rc = SSLConf.finish(cctx);
-if (rc <= 0) {
-log.error(sm.getString("opensslconf.finishFailed", 
Integer.toString(rc)));
-result = false;
-}
-if (!result) {
-log.error(sm.getString("opensslconf.applyFailed"));
-}
-return result;
-}
 }
diff --git a/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java 
b/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.j

[tomcat] branch 10.0.x updated: Refactor JNI out of bean classes

2021-10-06 Thread remm

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

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


The following commit(s) were added to refs/heads/10.0.x by this push:
 new 3c4a8f3  Refactor JNI out of bean classes
3c4a8f3 is described below

commit 3c4a8f3fbb8d7ecee516de53365884b20395b280
Author: remm 
AuthorDate: Wed Oct 6 16:59:59 2021 +0200

Refactor JNI out of bean classes

They are used in SSLHostConfig, so this ties everything to the JNI code.
---
 .../tomcat/util/net/openssl/OpenSSLConf.java   | 91 --
 .../tomcat/util/net/openssl/OpenSSLContext.java| 88 -
 2 files changed, 86 insertions(+), 93 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/openssl/OpenSSLConf.java 
b/java/org/apache/tomcat/util/net/openssl/OpenSSLConf.java
index 8ab720c..f234e03 100644
--- a/java/org/apache/tomcat/util/net/openssl/OpenSSLConf.java
+++ b/java/org/apache/tomcat/util/net/openssl/OpenSSLConf.java
@@ -20,18 +20,10 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.juli.logging.Log;
-import org.apache.juli.logging.LogFactory;
-import org.apache.tomcat.jni.SSLConf;
-import org.apache.tomcat.util.res.StringManager;
-
 public class OpenSSLConf implements Serializable {
 
 private static final long serialVersionUID = 1L;
 
-private static final Log log = LogFactory.getLog(OpenSSLConf.class);
-private static final StringManager sm = 
StringManager.getManager(OpenSSLConf.class);
-
 private final List commands = new ArrayList<>();
 
 public void addCmd(OpenSSLConfCmd cmd) {
@@ -42,87 +34,4 @@ public class OpenSSLConf implements Serializable {
 return commands;
 }
 
-public boolean check(long cctx) throws Exception {
-boolean result = true;
-OpenSSLConfCmd cmd;
-String name;
-String value;
-int rc;
-for (OpenSSLConfCmd command : commands) {
-cmd = command;
-name = cmd.getName();
-value = cmd.getValue();
-if (name == null) {
-log.error(sm.getString("opensslconf.noCommandName", value));
-result = false;
-continue;
-}
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("opensslconf.checkCommand", name, 
value));
-}
-try {
-rc = SSLConf.check(cctx, name, value);
-} catch (Exception e) {
-log.error(sm.getString("opensslconf.checkFailed"));
-return false;
-}
-if (rc <= 0) {
-log.error(sm.getString("opensslconf.failedCommand", name, 
value,
-Integer.toString(rc)));
-result = false;
-} else if (log.isDebugEnabled()) {
-log.debug(sm.getString("opensslconf.resultCommand", name, 
value,
-Integer.toString(rc)));
-}
-}
-if (!result) {
-log.error(sm.getString("opensslconf.checkFailed"));
-}
-return result;
-}
-
-public boolean apply(long cctx, long ctx) throws Exception {
-boolean result = true;
-SSLConf.assign(cctx, ctx);
-OpenSSLConfCmd cmd;
-String name;
-String value;
-int rc;
-for (OpenSSLConfCmd command : commands) {
-cmd = command;
-name = cmd.getName();
-value = cmd.getValue();
-if (name == null) {
-log.error(sm.getString("opensslconf.noCommandName", value));
-result = false;
-continue;
-}
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("opensslconf.applyCommand", name, 
value));
-}
-try {
-rc = SSLConf.apply(cctx, name, value);
-} catch (Exception e) {
-log.error(sm.getString("opensslconf.applyFailed"));
-return false;
-}
-if (rc <= 0) {
-log.error(sm.getString("opensslconf.failedCommand", name, 
value,
-Integer.toString(rc)));
-result = false;
-} else if (log.isDebugEnabled()) {
-log.debug(sm.getString("opensslconf.resultCommand", name, 
value,
-Integer.toString(rc)));
-}
-}
-rc = SSLConf.finish(cctx);
-if (rc <= 0) {
-log.error(sm.getString("opensslconf.finishFailed", 
Integer.toString(rc)));
-result = false;
-}
-if (!result) {
-log.error(sm.getString("opensslconf.applyFailed"));
-}
-return result;
-}
 }
diff --git a/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java 
b/java/org/apache/tomcat/util/net/openssl/OpenSSLConte

[tomcat] branch 9.0.x updated: Refactor JNI out of bean classes

2021-10-06 Thread 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 b47051a  Refactor JNI out of bean classes
b47051a is described below

commit b47051ae2c6e085490f194545e067e2556e9c9a9
Author: remm 
AuthorDate: Wed Oct 6 16:59:59 2021 +0200

Refactor JNI out of bean classes

They are used in SSLHostConfig, so this ties everything to the JNI code.
---
 .../tomcat/util/net/openssl/OpenSSLConf.java   | 91 --
 .../tomcat/util/net/openssl/OpenSSLContext.java| 88 -
 2 files changed, 86 insertions(+), 93 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/openssl/OpenSSLConf.java 
b/java/org/apache/tomcat/util/net/openssl/OpenSSLConf.java
index 8ab720c..f234e03 100644
--- a/java/org/apache/tomcat/util/net/openssl/OpenSSLConf.java
+++ b/java/org/apache/tomcat/util/net/openssl/OpenSSLConf.java
@@ -20,18 +20,10 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.juli.logging.Log;
-import org.apache.juli.logging.LogFactory;
-import org.apache.tomcat.jni.SSLConf;
-import org.apache.tomcat.util.res.StringManager;
-
 public class OpenSSLConf implements Serializable {
 
 private static final long serialVersionUID = 1L;
 
-private static final Log log = LogFactory.getLog(OpenSSLConf.class);
-private static final StringManager sm = 
StringManager.getManager(OpenSSLConf.class);
-
 private final List commands = new ArrayList<>();
 
 public void addCmd(OpenSSLConfCmd cmd) {
@@ -42,87 +34,4 @@ public class OpenSSLConf implements Serializable {
 return commands;
 }
 
-public boolean check(long cctx) throws Exception {
-boolean result = true;
-OpenSSLConfCmd cmd;
-String name;
-String value;
-int rc;
-for (OpenSSLConfCmd command : commands) {
-cmd = command;
-name = cmd.getName();
-value = cmd.getValue();
-if (name == null) {
-log.error(sm.getString("opensslconf.noCommandName", value));
-result = false;
-continue;
-}
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("opensslconf.checkCommand", name, 
value));
-}
-try {
-rc = SSLConf.check(cctx, name, value);
-} catch (Exception e) {
-log.error(sm.getString("opensslconf.checkFailed"));
-return false;
-}
-if (rc <= 0) {
-log.error(sm.getString("opensslconf.failedCommand", name, 
value,
-Integer.toString(rc)));
-result = false;
-} else if (log.isDebugEnabled()) {
-log.debug(sm.getString("opensslconf.resultCommand", name, 
value,
-Integer.toString(rc)));
-}
-}
-if (!result) {
-log.error(sm.getString("opensslconf.checkFailed"));
-}
-return result;
-}
-
-public boolean apply(long cctx, long ctx) throws Exception {
-boolean result = true;
-SSLConf.assign(cctx, ctx);
-OpenSSLConfCmd cmd;
-String name;
-String value;
-int rc;
-for (OpenSSLConfCmd command : commands) {
-cmd = command;
-name = cmd.getName();
-value = cmd.getValue();
-if (name == null) {
-log.error(sm.getString("opensslconf.noCommandName", value));
-result = false;
-continue;
-}
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("opensslconf.applyCommand", name, 
value));
-}
-try {
-rc = SSLConf.apply(cctx, name, value);
-} catch (Exception e) {
-log.error(sm.getString("opensslconf.applyFailed"));
-return false;
-}
-if (rc <= 0) {
-log.error(sm.getString("opensslconf.failedCommand", name, 
value,
-Integer.toString(rc)));
-result = false;
-} else if (log.isDebugEnabled()) {
-log.debug(sm.getString("opensslconf.resultCommand", name, 
value,
-Integer.toString(rc)));
-}
-}
-rc = SSLConf.finish(cctx);
-if (rc <= 0) {
-log.error(sm.getString("opensslconf.finishFailed", 
Integer.toString(rc)));
-result = false;
-}
-if (!result) {
-log.error(sm.getString("opensslconf.applyFailed"));
-}
-return result;
-}
 }
diff --git a/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java 
b/java/org/apache/tomcat/util/net/openssl/OpenSSLContext

[tomcat] branch 8.5.x updated: Refactor JNI out of bean classes

2021-10-06 Thread remm

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

remm 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 11cd5a2  Refactor JNI out of bean classes
11cd5a2 is described below

commit 11cd5a276592c64927337a6f643642c8c292b244
Author: remm 
AuthorDate: Wed Oct 6 16:59:59 2021 +0200

Refactor JNI out of bean classes

They are used in SSLHostConfig, so this ties everything to the JNI code.
---
 .../tomcat/util/net/openssl/OpenSSLConf.java   | 91 --
 .../tomcat/util/net/openssl/OpenSSLContext.java| 88 -
 2 files changed, 86 insertions(+), 93 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/openssl/OpenSSLConf.java 
b/java/org/apache/tomcat/util/net/openssl/OpenSSLConf.java
index 8ab720c..f234e03 100644
--- a/java/org/apache/tomcat/util/net/openssl/OpenSSLConf.java
+++ b/java/org/apache/tomcat/util/net/openssl/OpenSSLConf.java
@@ -20,18 +20,10 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.juli.logging.Log;
-import org.apache.juli.logging.LogFactory;
-import org.apache.tomcat.jni.SSLConf;
-import org.apache.tomcat.util.res.StringManager;
-
 public class OpenSSLConf implements Serializable {
 
 private static final long serialVersionUID = 1L;
 
-private static final Log log = LogFactory.getLog(OpenSSLConf.class);
-private static final StringManager sm = 
StringManager.getManager(OpenSSLConf.class);
-
 private final List commands = new ArrayList<>();
 
 public void addCmd(OpenSSLConfCmd cmd) {
@@ -42,87 +34,4 @@ public class OpenSSLConf implements Serializable {
 return commands;
 }
 
-public boolean check(long cctx) throws Exception {
-boolean result = true;
-OpenSSLConfCmd cmd;
-String name;
-String value;
-int rc;
-for (OpenSSLConfCmd command : commands) {
-cmd = command;
-name = cmd.getName();
-value = cmd.getValue();
-if (name == null) {
-log.error(sm.getString("opensslconf.noCommandName", value));
-result = false;
-continue;
-}
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("opensslconf.checkCommand", name, 
value));
-}
-try {
-rc = SSLConf.check(cctx, name, value);
-} catch (Exception e) {
-log.error(sm.getString("opensslconf.checkFailed"));
-return false;
-}
-if (rc <= 0) {
-log.error(sm.getString("opensslconf.failedCommand", name, 
value,
-Integer.toString(rc)));
-result = false;
-} else if (log.isDebugEnabled()) {
-log.debug(sm.getString("opensslconf.resultCommand", name, 
value,
-Integer.toString(rc)));
-}
-}
-if (!result) {
-log.error(sm.getString("opensslconf.checkFailed"));
-}
-return result;
-}
-
-public boolean apply(long cctx, long ctx) throws Exception {
-boolean result = true;
-SSLConf.assign(cctx, ctx);
-OpenSSLConfCmd cmd;
-String name;
-String value;
-int rc;
-for (OpenSSLConfCmd command : commands) {
-cmd = command;
-name = cmd.getName();
-value = cmd.getValue();
-if (name == null) {
-log.error(sm.getString("opensslconf.noCommandName", value));
-result = false;
-continue;
-}
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("opensslconf.applyCommand", name, 
value));
-}
-try {
-rc = SSLConf.apply(cctx, name, value);
-} catch (Exception e) {
-log.error(sm.getString("opensslconf.applyFailed"));
-return false;
-}
-if (rc <= 0) {
-log.error(sm.getString("opensslconf.failedCommand", name, 
value,
-Integer.toString(rc)));
-result = false;
-} else if (log.isDebugEnabled()) {
-log.debug(sm.getString("opensslconf.resultCommand", name, 
value,
-Integer.toString(rc)));
-}
-}
-rc = SSLConf.finish(cctx);
-if (rc <= 0) {
-log.error(sm.getString("opensslconf.finishFailed", 
Integer.toString(rc)));
-result = false;
-}
-if (!result) {
-log.error(sm.getString("opensslconf.applyFailed"));
-}
-return result;
-}
 }
diff --git a/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java 
b/java/org/apache/tomcat/util/net/openssl/OpenSSLContext

[VOTE][RESULT] Release Apache Tomcat 8.5.72

2021-10-06 Thread Christopher Schultz


The following votes were cast:

Binding:
+1: isapir, kkolinko, remm, schultz

No other votes were cast, therefore the vote passes.

Thanks to everyone who contributed to this release.

-chris

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

svn commit: r50303 - /dev/tomcat/tomcat-8/v8.5.72/ /release/tomcat/tomcat-8/v8.5.72/

2021-10-06 Thread schultz

Author: schultz
Date: Wed Oct  6 19:17:24 2021
New Revision: 50303

Log:
Promote release candidate

Added:
release/tomcat/tomcat-8/v8.5.72/
  - copied from r50302, dev/tomcat/tomcat-8/v8.5.72/
Removed:
dev/tomcat/tomcat-8/v8.5.72/


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

[tomcat] branch main updated: Refactor JNI out of bean classes

[tomcat] branch 10.0.x updated: Refactor JNI out of bean classes

[tomcat] branch 9.0.x updated: Refactor JNI out of bean classes

[tomcat] branch 8.5.x updated: Refactor JNI out of bean classes

[VOTE][RESULT] Release Apache Tomcat 8.5.72

svn commit: r50303 - /dev/tomcat/tomcat-8/v8.5.72/ /release/tomcat/tomcat-8/v8.5.72/

6 matches

Site Navigation

Mail list logo

Footer information