You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2020/05/01 11:23:38 UTC
[cxf] branch 3.3.x-fixes updated (6154de4 -> bf0db56)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a change to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from 6154de4 Recording .gitmergeinfo Changes
new 2e31d92 support xbean-asm8 shade
new 3135dd0 fix: pass 'maxInactiveInterval' though overloaded methods (#667)
new bf0db56 Recording .gitmergeinfo Changes
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:
.gitmergeinfo | 2 ++
core/src/main/java/org/apache/cxf/common/util/ASMHelper.java | 1 +
.../main/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtils.java | 4 ++--
3 files changed, 5 insertions(+), 2 deletions(-)
[cxf] 03/03: Recording .gitmergeinfo Changes
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit bf0db565fe03d11386494febb4c4cd46bff7d0dc
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Fri May 1 11:22:00 2020 +0100
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 1b50bfb..9db5c08 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -48,6 +48,7 @@ B 2851ffc7f9980fb03b5bd498ee837749414c8664
B 2bd5324d6d09e35345af4013bb5f4f07113b03d2
B 2cff3ce96abb43a5171d047984a47a37c1c2ea68
B 2d159906f9b9fd756a4a94053b360552a679cf9d
+B 2d2e3846b04fa64ca25e61900b478b429778c479
B 2e7278c35f3fadc94e03dcf8c9b10a5f46053fce
B 2e7df5d8cdbc5b1bb596ced069e80d85b0284b10
B 2f47c807b37758e10fb2d6c7746fd3f40451b566
@@ -66,6 +67,7 @@ B 407eeb0dea157eaa0635d0c37a7ed95463b5638f
B 4081929343f61ee4a1a54de157ba4aa713a6494f
B 411fb51bccd3869a97e9e807f14f50ca6b1f2a10
B 4213f7508f14d7cc8c489981831458619418921b
+B 428a40a1aae000304642dcc6647a9f8f27a4a2c7
B 432c6a3cbc9bb5db99a0c7822c80001338746e08
B 44a930752c799a6e784ad598079b80bd99efa362
B 47ac71e69df225baf6dbf2e201810c5b87072af8
[cxf] 01/03: support xbean-asm8 shade
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 2e31d92338e7bc0deda8fd4e5badd425ed2917e7
Author: Romain Manni-Bucau <rm...@gmail.com>
AuthorDate: Fri May 1 09:02:13 2020 +0200
support xbean-asm8 shade
(cherry picked from commit ffb3dd02e3f97f379b3f78a543dd915548e71789)
---
core/src/main/java/org/apache/cxf/common/util/ASMHelper.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/core/src/main/java/org/apache/cxf/common/util/ASMHelper.java b/core/src/main/java/org/apache/cxf/common/util/ASMHelper.java
index c3afe46..fcb3a98 100644
--- a/core/src/main/java/org/apache/cxf/common/util/ASMHelper.java
+++ b/core/src/main/java/org/apache/cxf/common/util/ASMHelper.java
@@ -93,6 +93,7 @@ public class ASMHelper {
if (cwClass == null) {
//try the "real" asm first, then the others
tryClass("org.objectweb.asm.ClassWriter");
+ tryClass("org.apache.xbean.asm8.ClassWriter");
tryClass("org.apache.xbean.asm7.ClassWriter");
tryClass("org.apache.xbean.asm5.ClassWriter");
tryClass("org.apache.xbean.asm6.ClassWriter");
[cxf] 02/03: fix: pass 'maxInactiveInterval' though overloaded
methods (#667)
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 3135dd0516466448b9d3aa90a000c146b5e45b62
Author: ParanoidUser <pi...@gmail.com>
AuthorDate: Fri May 1 01:42:41 2020 -0700
fix: pass 'maxInactiveInterval' though overloaded methods (#667)
Specify custom session timeout for javax.servlet.http.HttpSession
(cherry picked from commit d6be151f1902e50021cc806fc1ddf5673a50fa7f)
---
.../main/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtils.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtils.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtils.java
index 6a2ca81..f311661 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtils.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtils.java
@@ -167,13 +167,13 @@ public final class OAuthUtils {
return setSessionToken(mc, 0);
}
public static String setSessionToken(MessageContext mc, int maxInactiveInterval) {
- return setSessionToken(mc, generateRandomTokenKey());
+ return setSessionToken(mc, generateRandomTokenKey(), maxInactiveInterval);
}
public static String setSessionToken(MessageContext mc, String sessionToken) {
return setSessionToken(mc, sessionToken, 0);
}
public static String setSessionToken(MessageContext mc, String sessionToken, int maxInactiveInterval) {
- return setSessionToken(mc, sessionToken, null, 0);
+ return setSessionToken(mc, sessionToken, null, maxInactiveInterval);
}
public static String setSessionToken(MessageContext mc, String sessionToken,
String attribute, int maxInactiveInterval) {