subject:"\[2\/6\] cxf git commit\: Refactor of STS Transport test config"

[2/6] cxf git commit: Refactor of STS Transport test config

2016-08-03 Thread coheigea

Refactor of STS Transport test config


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/4d70ca30
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4d70ca30
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4d70ca30

Branch: refs/heads/3.1.x-fixes
Commit: 4d70ca30e5bac4940b469f4a3162521341a71a35
Parents: 736e7d4
Author: Colm O hEigeartaigh 
Authored: Wed Aug 3 16:10:38 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Wed Aug 3 18:05:04 2016 +0100

--
 .../systest/sts/common/SAMLRealmCNCodec.java|  6 ++-
 .../systest/sts/deployment/cxf-transport.xml| 47 ++--
 .../sts/deployment/stax-cxf-transport.xml   | 47 ++--
 3 files changed, 13 insertions(+), 87 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/4d70ca30/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/common/SAMLRealmCNCodec.java
--
diff --git 
a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/common/SAMLRealmCNCodec.java
 
b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/common/SAMLRealmCNCodec.java
index 18fe09d..c3c9346 100644
--- 
a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/common/SAMLRealmCNCodec.java
+++ 
b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/common/SAMLRealmCNCodec.java
@@ -25,7 +25,11 @@ public class SAMLRealmCNCodec implements SAMLRealmCodec {
 
 @Override
 public String getRealmFromToken(SamlAssertionWrapper assertion) {
-return assertion.getIssuerString();
+String issuer = assertion.getIssuerString();
+if (issuer != null && issuer.contains("a-issuer")) {
+return issuer;
+}
+return null;
 }
 }
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/4d70ca30/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-transport.xml
--
diff --git 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-transport.xml
 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-transport.xml
index 8d721d9..0a6548d 100644
--- 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-transport.xml
+++ 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-transport.xml
@@ -35,34 +35,6 @@
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
 
 
@@ -85,8 +57,10 @@
 
 
 
+
 
 
+
 
 
 
@@ -133,26 +107,13 @@
 
 
 
-http://docs.oasis-open.org/ws-sx/ws-trust/200512/; 
id="transportSTS-realmB" implementor="#transportSTSProviderBean2" 
address="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/b-issuer/Transport;
 
wsdlLocation="src/test/resources/org/apache/cxf/systest/sts/deployment/ws-trust-1.4-service.wsdl"
 serviceName="ns1:SecurityTokenService" endpointName="ns1:Transport_SAML_Port" 
depends-on="ClientAuthHttpsSettings">
+http://docs.oasis-open.org/ws-sx/ws-trust/200512/; 
id="transportSTS-realmB" implementor="#transportSTSProviderBean" 
address="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/b-issuer/Transport;
 
wsdlLocation="src/test/resources/org/apache/cxf/systest/sts/deployment/ws-trust-1.4-service.wsdl"
 serviceName="ns1:SecurityTokenService" endpointName="ns1:Transport_SAML_Port" 
depends-on="ClientAuthHttpsSettings">
 
 
 
 
 
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/4d70ca30/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-transport.xml
--
diff --git 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-transport.xml
 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-transport.xml
index 8405022..07dbc64 100644
--- 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-transport.xml
+++ 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-transport.xml
@@ -28,33 +28,6 @@
 
 
 
-
-
-
-
-
-
-
-

[2/6] cxf git commit: Refactor of STS Transport test config

2016-08-03 Thread coheigea

Refactor of STS Transport test config


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/00377a68
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/00377a68
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/00377a68

Branch: refs/heads/master
Commit: 00377a6880d88c7f45e5e0d7c3c3c79d4e6ac860
Parents: 78e7e8d
Author: Colm O hEigeartaigh 
Authored: Wed Aug 3 16:10:38 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Wed Aug 3 16:10:38 2016 +0100

--
 .../systest/sts/common/SAMLRealmCNCodec.java|  6 ++-
 .../systest/sts/deployment/cxf-transport.xml| 47 ++--
 .../sts/deployment/stax-cxf-transport.xml   | 47 ++--
 3 files changed, 13 insertions(+), 87 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/00377a68/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/common/SAMLRealmCNCodec.java
--
diff --git 
a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/common/SAMLRealmCNCodec.java
 
b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/common/SAMLRealmCNCodec.java
index 18fe09d..c3c9346 100644
--- 
a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/common/SAMLRealmCNCodec.java
+++ 
b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/common/SAMLRealmCNCodec.java
@@ -25,7 +25,11 @@ public class SAMLRealmCNCodec implements SAMLRealmCodec {
 
 @Override
 public String getRealmFromToken(SamlAssertionWrapper assertion) {
-return assertion.getIssuerString();
+String issuer = assertion.getIssuerString();
+if (issuer != null && issuer.contains("a-issuer")) {
+return issuer;
+}
+return null;
 }
 }
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/00377a68/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-transport.xml
--
diff --git 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-transport.xml
 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-transport.xml
index 8d721d9..0a6548d 100644
--- 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-transport.xml
+++ 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-transport.xml
@@ -35,34 +35,6 @@
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
 
 
@@ -85,8 +57,10 @@
 
 
 
+
 
 
+
 
 
 
@@ -133,26 +107,13 @@
 
 
 
-http://docs.oasis-open.org/ws-sx/ws-trust/200512/; 
id="transportSTS-realmB" implementor="#transportSTSProviderBean2" 
address="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/b-issuer/Transport;
 
wsdlLocation="src/test/resources/org/apache/cxf/systest/sts/deployment/ws-trust-1.4-service.wsdl"
 serviceName="ns1:SecurityTokenService" endpointName="ns1:Transport_SAML_Port" 
depends-on="ClientAuthHttpsSettings">
+http://docs.oasis-open.org/ws-sx/ws-trust/200512/; 
id="transportSTS-realmB" implementor="#transportSTSProviderBean" 
address="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/b-issuer/Transport;
 
wsdlLocation="src/test/resources/org/apache/cxf/systest/sts/deployment/ws-trust-1.4-service.wsdl"
 serviceName="ns1:SecurityTokenService" endpointName="ns1:Transport_SAML_Port" 
depends-on="ClientAuthHttpsSettings">
 
 
 
 
 
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/00377a68/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-transport.xml
--
diff --git 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-transport.xml
 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-transport.xml
index 8405022..07dbc64 100644
--- 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-transport.xml
+++ 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-transport.xml
@@ -28,33 +28,6 @@
 
 
 
-
-
-
-
-
-
-
-

[2/6] cxf git commit: Refactor of STS Transport test config

[2/6] cxf git commit: Refactor of STS Transport test config

2 matches

Site Navigation

Mail list logo

Footer information