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 2014/04/14 16:31:30 UTC
git commit: Adding back in some commented out code
Repository: cxf
Updated Branches:
refs/heads/master 6155656f8 -> c6015afd8
Adding back in some commented out code
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c6015afd
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c6015afd
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c6015afd
Branch: refs/heads/master
Commit: c6015afd8cd32a8cc1d5c7eb381d3c6303dc7fd2
Parents: 6155656
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Mon Apr 14 15:31:11 2014 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Mon Apr 14 15:31:11 2014 +0100
----------------------------------------------------------------------
.../java/org/apache/cxf/sts/operation/TokenIssueOperation.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/c6015afd/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 1de4480..17bf7a1 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
@@ -68,6 +68,9 @@ import org.apache.wss4j.common.saml.SamlAssertionWrapper;
import org.apache.wss4j.dom.WSSecurityEngineResult;
import org.apache.wss4j.dom.handler.WSHandlerConstants;
import org.apache.wss4j.dom.handler.WSHandlerResult;
+import org.apache.wss4j.stax.securityEvent.WSSecurityEventConstants;
+import org.apache.wss4j.stax.securityToken.SamlSecurityToken;
+import org.apache.xml.security.exceptions.XMLSecurityException;
/**
* An implementation of the IssueOperation interface.
@@ -400,8 +403,6 @@ public class TokenIssueOperation extends AbstractOperation implements IssueOpera
}
// Now try steaming results
- /*
- * TODO Uncomment this after we release a beta/RC
try {
org.apache.xml.security.stax.securityToken.SecurityToken securityToken =
findInboundSecurityToken(WSSecurityEventConstants.SamlToken, messageContext);
@@ -413,7 +414,6 @@ public class TokenIssueOperation extends AbstractOperation implements IssueOpera
LOG.log(Level.FINE, e.getMessage(), e);
return null;
}
- */
return null;
}