Fixing merge
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c5a654b6 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c5a654b6 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c5a654b6 Branch: refs/heads/3.1.x-fixes Commit: c5a654b65bf0e327ac39935a09c4960a094a83cd Parents: de7c92c Author: Colm O hEigeartaigh <[email protected]> Authored: Fri Mar 24 10:04:11 2017 +0000 Committer: Colm O hEigeartaigh <[email protected]> Committed: Fri Mar 24 10:04:11 2017 +0000 ---------------------------------------------------------------------- .../org/apache/cxf/sts/operation/TokenCancelOperation.java | 6 ------ .../java/org/apache/cxf/sts/operation/TokenRenewOperation.java | 5 ----- .../org/apache/cxf/sts/operation/TokenValidateOperation.java | 5 ----- 3 files changed, 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/c5a654b6/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 974c7b0..1c8b990 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,13 +150,7 @@ 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/c5a654b6/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 7011e61..a21a1f0 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,13 +199,8 @@ 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/c5a654b6/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 0d09a73..4976356 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,13 +183,8 @@ 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
