svn commit: r1170876 - in /cxf/branches/2.4.x-fixes: ./ rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SpnegoContextTokenBuilder.java

[dkulp]

Author: dkulp
Date: Wed Sep 14 22:44:01 2011
New Revision: 1170876

URL: http://svn.apache.org/viewvc?rev=1170876&view=rev
Log:
Merged revisions 1170825 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1170825 | dkulp | 2011-09-14 15:59:19 -0400 (Wed, 14 Sep 2011) | 1 line
  
  Fix method signature
........

Modified:
    cxf/branches/2.4.x-fixes/   (props changed)
    
cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SpnegoContextTokenBuilder.java

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SpnegoContextTokenBuilder.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SpnegoContextTokenBuilder.java?rev=1170876&r1=1170875&r2=1170876&view=diff
==============================================================================
--- 
cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SpnegoContextTokenBuilder.java
 (original)
+++ 
cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SpnegoContextTokenBuilder.java
 Wed Sep 14 22:44:01 2011
@@ -23,7 +23,6 @@ import javax.xml.namespace.QName;
 import org.w3c.dom.Element;
 
 import org.apache.cxf.helpers.DOMUtils;
-import org.apache.cxf.ws.policy.PolicyAssertion;
 import org.apache.cxf.ws.policy.PolicyBuilder;
 import org.apache.cxf.ws.policy.PolicyConstants;
 import org.apache.cxf.ws.security.policy.SP11Constants;
@@ -31,6 +30,7 @@ import org.apache.cxf.ws.security.policy
 import org.apache.cxf.ws.security.policy.SPConstants;
 import org.apache.cxf.ws.security.policy.model.SpnegoContextToken;
 
+import org.apache.neethi.Assertion;
 import org.apache.neethi.AssertionBuilderFactory;
 import org.apache.neethi.Constants;
 import org.apache.neethi.builders.AssertionBuilder;
@@ -48,7 +48,7 @@ public class SpnegoContextTokenBuilder i
         return new QName[]{SP11Constants.SPNEGO_CONTEXT_TOKEN, 
SP12Constants.SPNEGO_CONTEXT_TOKEN};
     }
     
-    public PolicyAssertion build(Element element, AssertionBuilderFactory 
factory)
+    public Assertion build(Element element, AssertionBuilderFactory factory)
         throws IllegalArgumentException {
         SPConstants consts = 
SP11Constants.SP_NS.equals(element.getNamespaceURI())
                 ? SP11Constants.INSTANCE : SP12Constants.INSTANCE;