Repository: cxf Updated Branches: refs/heads/2.7.x-fixes d604b4fcf -> 983e083a0
Change from last commit Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/983e083a Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/983e083a Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/983e083a Branch: refs/heads/2.7.x-fixes Commit: 983e083a089ac968dced58393e913e198b8a26ec Parents: d604b4f Author: Colm O hEigeartaigh <[email protected]> Authored: Wed Apr 2 15:59:30 2014 +0100 Committer: Colm O hEigeartaigh <[email protected]> Committed: Wed Apr 2 15:59:30 2014 +0100 ---------------------------------------------------------------------- .../cxf/sts/token/provider/DefaultConditionsProvider.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/983e083a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/DefaultConditionsProvider.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/DefaultConditionsProvider.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/DefaultConditionsProvider.java index 7c3d317..2b2dbdf 100644 --- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/DefaultConditionsProvider.java +++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/DefaultConditionsProvider.java @@ -26,14 +26,9 @@ import java.util.logging.Logger; import org.apache.cxf.common.logging.LogUtils; import org.apache.cxf.sts.request.Lifetime; import org.apache.cxf.ws.security.sts.provider.STSException; -<<<<<<< HEAD +import org.apache.ws.security.saml.ext.bean.AudienceRestrictionBean; import org.apache.ws.security.saml.ext.bean.ConditionsBean; import org.apache.ws.security.util.XmlSchemaDateFormat; -======= -import org.apache.wss4j.common.saml.bean.AudienceRestrictionBean; -import org.apache.wss4j.common.saml.bean.ConditionsBean; -import org.apache.wss4j.dom.util.XmlSchemaDateFormat; ->>>>>>> e50e87d... [CXF-5664] - CXF STS does not support wst:Participants import org.joda.time.DateTime; /**
