Fixing merge
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/08462ef5 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/08462ef5 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/08462ef5 Branch: refs/heads/3.0.x-fixes Commit: 08462ef5bd1b19d8aa5d1e18c54124d08435f5c3 Parents: fd4787f Author: Colm O hEigeartaigh <[email protected]> Authored: Mon Oct 17 10:33:12 2016 +0100 Committer: Colm O hEigeartaigh <[email protected]> Committed: Mon Oct 17 10:33:12 2016 +0100 ---------------------------------------------------------------------- .../systest/kerberos/jaxrs/kerberos/JAXRSKerberosBookTest.java | 6 +----- .../cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java | 6 +----- .../cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java | 6 +----- 3 files changed, 3 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/08462ef5/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/jaxrs/kerberos/JAXRSKerberosBookTest.java ---------------------------------------------------------------------- diff --git a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/jaxrs/kerberos/JAXRSKerberosBookTest.java b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/jaxrs/kerberos/JAXRSKerberosBookTest.java index 3c12166..17df9f8 100644 --- a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/jaxrs/kerberos/JAXRSKerberosBookTest.java +++ b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/jaxrs/kerberos/JAXRSKerberosBookTest.java @@ -77,12 +77,8 @@ import org.junit.runner.RunWith; @CreateKdcServer( transports = { -<<<<<<< HEAD // @CreateTransport(protocol = "TCP", address = "127.0.0.1", port=1024) - @CreateTransport(protocol = "UDP", address = "127.0.0.1") -======= - @CreateTransport(protocol = "KRB", address = "localhost") ->>>>>>> b72e2b5... Use localhost instead of 127.0.0.1 for the Kerberos tests + @CreateTransport(protocol = "UDP", address = "localhost") }, primaryRealm = "service.ws.apache.org", kdcPrincipal = "krbtgt/[email protected]" http://git-wip-us.apache.org/repos/asf/cxf/blob/08462ef5/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java ---------------------------------------------------------------------- diff --git a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java index d5d1b20..385eb2a 100644 --- a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java +++ b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java @@ -80,12 +80,8 @@ import org.junit.runner.RunWith; @CreateKdcServer( transports = { -<<<<<<< HEAD // @CreateTransport(protocol = "TCP", address = "127.0.0.1", port=1024) - @CreateTransport(protocol = "UDP", address = "127.0.0.1") -======= - @CreateTransport(protocol = "KRB", address = "localhost") ->>>>>>> b72e2b5... Use localhost instead of 127.0.0.1 for the Kerberos tests + @CreateTransport(protocol = "UDP", address = "localhost") }, primaryRealm = "service.ws.apache.org", kdcPrincipal = "krbtgt/[email protected]" http://git-wip-us.apache.org/repos/asf/cxf/blob/08462ef5/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java ---------------------------------------------------------------------- diff --git a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java index 8d93fdf..571c76c 100644 --- a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java +++ b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java @@ -77,12 +77,8 @@ import org.junit.runner.RunWith; @CreateKdcServer( transports = { -<<<<<<< HEAD // @CreateTransport(protocol = "TCP", address = "127.0.0.1", port=1024) - @CreateTransport(protocol = "UDP", address = "127.0.0.1") -======= - @CreateTransport(protocol = "KRB", address = "localhost") ->>>>>>> b72e2b5... Use localhost instead of 127.0.0.1 for the Kerberos tests + @CreateTransport(protocol = "UDP", address = "localhost") }, primaryRealm = "service.ws.apache.org", kdcPrincipal = "krbtgt/[email protected]"
