Author: coheigea Date: Tue Jun 26 11:13:35 2012 New Revision: 1353951 URL: http://svn.apache.org/viewvc?rev=1353951&view=rev Log: Merged revisions 1353935 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
........ r1353935 | coheigea | 2012-06-26 11:57:08 +0100 (Tue, 26 Jun 2012) | 10 lines Merged revisions 1353923 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes ........ r1353923 | coheigea | 2012-06-26 11:32:46 +0100 (Tue, 26 Jun 2012) | 2 lines Fixing build ........ ........ Modified: cxf/branches/2.4.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java Modified: cxf/branches/2.4.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java?rev=1353951&r1=1353950&r2=1353951&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java (original) +++ cxf/branches/2.4.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java Tue Jun 26 11:13:35 2012 @@ -25,6 +25,7 @@ import javax.crypto.Cipher; import javax.crypto.SecretKey; import javax.crypto.spec.SecretKeySpec; import javax.xml.namespace.QName; +import javax.xml.ws.BindingProvider; import javax.xml.ws.Service; import org.apache.cxf.Bus; @@ -34,6 +35,7 @@ import org.apache.cxf.frontend.ClientPro import org.apache.cxf.systest.ws.ut.SecurityHeaderCacheInterceptor; import org.apache.cxf.systest.ws.x509.server.Server; import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; +import org.apache.cxf.ws.security.SecurityConstants; import org.example.contract.doubleit.DoubleItPortType;
