cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [2/3] cxf git commit: CXF-4692 - Allow customization of Request Security Token Response
Date Fri, 24 Mar 2017 10:04:20 GMT
CXF-4692 - Allow customization of Request Security Token Response

# Conflicts:
#	services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenCancelOperation.java
#	services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenRenewOperation.java
#	services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenValidateOperation.java


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

Branch: refs/heads/3.1.x-fixes
Commit: 8945d914dcf9592c5d30be4a04db30682a0bbd71
Parents: a5cd9d3
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Fri Mar 24 09:56:11 2017 +0000
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Fri Mar 24 09:56:51 2017 +0000

----------------------------------------------------------------------
 .../java/org/apache/cxf/sts/operation/TokenCancelOperation.java | 5 +++++
 .../java/org/apache/cxf/sts/operation/TokenIssueOperation.java  | 2 +-
 .../java/org/apache/cxf/sts/operation/TokenRenewOperation.java  | 5 +++++
 .../org/apache/cxf/sts/operation/TokenValidateOperation.java    | 5 +++++
 4 files changed, 16 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/8945d914/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenCancelOperation.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenCancelOperation.java
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenCancelOperation.java
index 8db75c3..974c7b0 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenCancelOperation.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenCancelOperation.java
@@ -150,8 +150,13 @@ public class TokenCancelOperation extends AbstractOperation implements
CancelOpe
         }
     }
 
+<<<<<<< HEAD
     
     private RequestSecurityTokenResponseType createResponse(
+=======
+
+    protected RequestSecurityTokenResponseType createResponse(
+>>>>>>> 4824bfe... CXF-4692 - Allow customization of Request Security
Token Response
         TokenRequirements tokenRequirements
     ) throws WSSecurityException {
         RequestSecurityTokenResponseType response = 

http://git-wip-us.apache.org/repos/asf/cxf/blob/8945d914/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenIssueOperation.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenIssueOperation.java
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenIssueOperation.java
index 455a9ae..cffd284 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenIssueOperation.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenIssueOperation.java
@@ -253,7 +253,7 @@ public class TokenIssueOperation extends AbstractOperation implements
IssueOpera
                                   validateTarget, tokenPrincipal, tokenRoles);
     }
 
-    private RequestSecurityTokenResponseType createResponse(
+    protected RequestSecurityTokenResponseType createResponse(
             EncryptionProperties encryptionProperties,
             TokenProviderResponse tokenResponse, 
             TokenRequirements tokenRequirements,

http://git-wip-us.apache.org/repos/asf/cxf/blob/8945d914/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenRenewOperation.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenRenewOperation.java
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenRenewOperation.java
index b73c108..7011e61 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenRenewOperation.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenRenewOperation.java
@@ -199,8 +199,13 @@ public class TokenRenewOperation extends AbstractOperation implements
RenewOpera
             throw ex;
         }            
     }
+<<<<<<< HEAD
    
     private RequestSecurityTokenResponseType createResponse(
+=======
+
+    protected RequestSecurityTokenResponseType createResponse(
+>>>>>>> 4824bfe... CXF-4692 - Allow customization of Request Security
Token Response
             EncryptionProperties encryptionProperties,
             TokenRenewerResponse tokenRenewerResponse, 
             TokenRequirements tokenRequirements,

http://git-wip-us.apache.org/repos/asf/cxf/blob/8945d914/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenValidateOperation.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenValidateOperation.java
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenValidateOperation.java
index e74cd65..0d09a73 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenValidateOperation.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenValidateOperation.java
@@ -183,8 +183,13 @@ public class TokenValidateOperation extends AbstractOperation implements
Validat
             throw ex;
         }            
     }
+<<<<<<< HEAD
     
     private RequestSecurityTokenResponseType createResponse(
+=======
+
+    protected RequestSecurityTokenResponseType createResponse(
+>>>>>>> 4824bfe... CXF-4692 - Allow customization of Request Security
Token Response
         TokenValidatorResponse tokenResponse,
         TokenProviderResponse tokenProviderResponse,
         TokenRequirements tokenRequirements


Mime
View raw message