Use localhost instead of 127.0.0.1 for the Kerberos tests # Conflicts: # systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/jaxrs/kerberos/JAXRSKerberosBookTest.java # systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java # systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a384601e Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a384601e Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a384601e Branch: refs/heads/3.0.x-fixes Commit: a384601e90700736873caee89380ccb09af3856e Parents: 2617839 Author: Colm O hEigeartaigh <cohei...@apache.org> Authored: Mon Oct 17 09:55:15 2016 +0100 Committer: Colm O hEigeartaigh <cohei...@apache.org> Committed: Mon Oct 17 10:04:17 2016 +0100 ---------------------------------------------------------------------- .../systest/kerberos/jaxrs/kerberos/JAXRSKerberosBookTest.java | 4 ++++ .../org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java | 2 +- .../cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java | 4 ++++ .../cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java | 4 ++++ 4 files changed, 13 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/a384601e/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 cda826c..3c12166 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,8 +77,12 @@ 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 }, primaryRealm = "service.ws.apache.org", kdcPrincipal = "krbtgt/service.ws.apache....@service.ws.apache.org" http://git-wip-us.apache.org/repos/asf/cxf/blob/a384601e/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java ---------------------------------------------------------------------- diff --git a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java index b365ae3..08fc7f9 100644 --- a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java +++ b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java @@ -78,7 +78,7 @@ import org.springframework.util.Assert; @CreateLdapServer( transports = { - @CreateTransport(protocol = "LDAP", address = "127.0.0.1") + @CreateTransport(protocol = "LDAP", address = "localhost") } ) http://git-wip-us.apache.org/repos/asf/cxf/blob/a384601e/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 2545b1f..d5d1b20 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,8 +80,12 @@ 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 }, primaryRealm = "service.ws.apache.org", kdcPrincipal = "krbtgt/service.ws.apache....@service.ws.apache.org" http://git-wip-us.apache.org/repos/asf/cxf/blob/a384601e/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 c7d50aa..8d93fdf 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,8 +77,12 @@ 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 }, primaryRealm = "service.ws.apache.org", kdcPrincipal = "krbtgt/service.ws.apache....@service.ws.apache.org"
