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 2018/04/19 13:45:14 UTC
[cxf] branch 3.1.x-fixes updated (92710d5 -> 5b8d8dc)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a change to branch 3.1.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from 92710d5 Recording .gitmergeinfo Changes
new 93e2197 Removing printStackTrace from STS code
new 5b8d8dc Recording .gitmergeinfo Changes
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:
.gitmergeinfo | 9 +++++++++
.../org/apache/cxf/sts/token/provider/jwt/JWTTokenProvider.java | 1 -
.../org/apache/cxf/sts/token/provider/SAMLProviderActAsTest.java | 5 +----
3 files changed, 10 insertions(+), 5 deletions(-)
--
To stop receiving notification emails like this one, please contact
coheigea@apache.org.
[cxf] 02/02: 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.1.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 5b8d8dc7c5e8d83fc5e761aeafc4550429c964b6
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Thu Apr 19 14:39:07 2018 +0100
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 04ce8ac..7f666ee 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -142,6 +142,7 @@ B 269e96752b11aeb3e911da76bd3074d768860968
B 26f43025348e101e981e3f64ecc3ddf483ad7fb3
B 27057bcdfe2e2a90100a75413fc22ed4bc58ebae
B 2705f4dde2ec6cf3e1102c7c7b4a7063f110fce5
+B 278d9185150d743ff4b411d070b023e8758d372e
B 27bba67eb336ac27eb1dbf75e6fdcff03320687f
B 27c37bffde998b284f5fa635c49b608cc72e7b43
B 27e3a631dd57cec3e3742beed1cebd32c8d19ad4
@@ -398,6 +399,7 @@ B 79244372958dc1a9e382db4e1740e248bc8e2538
B 7974c5c33b3f92b046f0c50f798f9bc9b711422c
B 79b00e8ff8584f431df4311b614ed843feea1f04
B 7a5e2690c36914ba481570c811f23d6e6b80bc07
+B 7aec1effe947366c8821a2f90d2ce8864ad29290
B 7b175a5708571f993f592e0c25a5a054c1984bfb
B 7b7629682d15345518e66d46e575bf1ac334cf00
B 7b8184c9772834053d33cb39d809652a339225f6
@@ -439,6 +441,7 @@ B 88bc4167e5a43211458d7c9b83cfd43ab83876ad
B 89a588e9b4ab33d5e095ae889c4dbb2db7478195
B 89ae972bcc621be990531ce809ffa6f6e2c40ab8
B 8a15cad27deaea3510d49968791fbae13b6a409a
+B 8a1adaeb07799a077153cd67fd4ec4769fe8b16a
B 8a4e85b24d6d5b438ceb28257c53773d46b5816d
B 8b39de81d1ff03ef00fb2baf41f2e8a5b6e9df15
B 8b5cc1a7f7b1308932189546f458e8d1115dec43
@@ -503,6 +506,7 @@ B a05d75086453fa18ca4f4733f7cc8819693c786b
B a0b83f3c9d8259709e2f22cbf15641e3207d4af3
B a219766354d6aee53c7f7a4da91f434af552b437
B a261507ebd3104b1a00298801ec9815ed1e7a728
+B a26e9feb89ed5ba81c9ab5b336cfb78eecd34edc
B a2821b8349b556c9e35ac8ba5a58422da20a5348
B a2aad4fcecfc390c7004fc5d806816d0a9e7257d
B a2c912b418831967b49f59b2c8bf33a9eb53e281
@@ -510,6 +514,7 @@ B a38da9e8f15fb158bf0982c61750ef48e5814792
B a3cd2a98ac535da0f0d256a70f718b68fcc2b1ba
B a3d58867210694c82f791de32af4043d4227fb12
B a4167fb84baa1834bbe86be8a749c385f1af8c82
+B a4a93414e7cc1ce8d844b146ba8559c7f2485c0c
B a4b794b55b1ea258e9168a58f05794f37aeeb049
B a4b98454d147437ff71b92355d60e8bd48d56448
B a55635031f4e86124269df880bd3182b1b2dd78d
@@ -535,6 +540,7 @@ B abfd5936fee6562b1b5c49d7522f0975390bcfed
B ad579cdefe5ec49066ebc9d41db6c7b79eceb2c4
B adc783c79ca4417599458598442a26f34656d1dc
B adcfa17d94da4b27deb8ba952d0bd4dcfcf6972b
+B ae0e2ba3df88cc33c9d5ba0b212a230491c56b1a
B ae83629e6291538e72d300fb35d7f6df7cf064a1
B aed1b1d45ea12b1b1a7f083f756c27ed914ad9b7
B aeeb4df2e5c4133164014e15ebf221a2dcd02eec
@@ -688,6 +694,7 @@ B dd2df2ff4b76722f13c6a35f5790624d2f22e1ac
B dd2ef496df36ef8967b5274c0a5928f5594469be
B dd723f846949d66e24ab103c2efde426ea9fb141
B dd81c1eb76d853f735b2265a18653ab862298468
+B ddc5633a62972882588ef3f3f3ab3cff6aa813a4
B de61a48bf953950e16d67038247903b747c4e7ae
B de675431040a434c2bd1ef66667472fb4a49a9ab
B df41960292388518c42c4440d80d962c509dda6c
@@ -715,6 +722,7 @@ B e61a83d4ac18fc760fc5d4bc8fb19d6072aaac52
B e636c50b0d5f9bd811896bd21e20f58d7942b96e
B e6586d42d02b5457f4d077b0889d57dd5f8ec6be
B e6695098373dc39037384bae2544e7b5051d9f2e
+B e677408bc243a8494d711ff93be05a159f692144
B e6d84cf9f3ac669003402d122178a55e8b7e4493
B e6ec5b785e67bbd2464796119a9cdcacf59598c8
B e6f0722615190861192972a51b3986b34efd1f0e
@@ -1257,6 +1265,7 @@ M fa973bd7ab43099151f83beea351b80c7140eaab
M fade9b81dabe27f864ca38e7b40f28fb44d6f165
M faf461150f178f7f7ae89a3b7c345671e53b8b04
M fca2253915f5285a36360b48cb7e1b1c7a95982e
+M fd178bcf4805ca01d77afe07b70cfe93e1bc25c9
M fd6689948bc7ad153ccfd7f64554eafbf64b20d6
M fe55813cc934667664863117921ff8ea08b9ff24
M fe89bf0fb8379428667f66312e6942e906142d6f
--
To stop receiving notification emails like this one, please contact
coheigea@apache.org.
[cxf] 01/02: Removing printStackTrace from STS code
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.1.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 93e2197a5ebcfd8780e39b1f0d62501f421352f9
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Thu Apr 19 09:57:27 2018 +0100
Removing printStackTrace from STS code
(cherry picked from commit fd178bcf4805ca01d77afe07b70cfe93e1bc25c9)
# Conflicts:
# services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderActAsTest.java
---
.../java/org/apache/cxf/sts/token/provider/jwt/JWTTokenProvider.java | 1 -
.../org/apache/cxf/sts/token/provider/SAMLProviderActAsTest.java | 5 +----
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/jwt/JWTTokenProvider.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/jwt/JWTTokenProvider.java
index d668ca3..c262607 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/jwt/JWTTokenProvider.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/jwt/JWTTokenProvider.java
@@ -155,7 +155,6 @@ public class JWTTokenProvider implements TokenProvider {
LOG.fine("JWT Token successfully created");
return response;
} catch (Exception e) {
- e.printStackTrace();
LOG.log(Level.WARNING, "", e);
throw new STSException("Can't serialize JWT token", e, STSException.REQUEST_FAILED);
}
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderActAsTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderActAsTest.java
index adcff6b..454f563 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderActAsTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderActAsTest.java
@@ -351,10 +351,7 @@ public class SAMLProviderActAsTest extends org.junit.Assert {
token = (Element)providerResponse.getToken();
assertion = new SamlAssertionWrapper(token);
Assert.assertEquals("service-A", assertion.getSubjectName());
-
- String tokenString = DOM2Writer.nodeToString(token);
- System.out.println(tokenString);
-
+
boolean foundBob = false;
boolean foundTechnical = false;
for (org.opensaml.saml.saml2.core.AttributeStatement attributeStatement
--
To stop receiving notification emails like this one, please contact
coheigea@apache.org.