You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2016/01/14 18:02:37 UTC
cxf-fediz git commit: Fixing merge
Repository: cxf-fediz
Updated Branches:
refs/heads/1.2.x-fixes e0d2b1c40 -> 46b05ed9a
Fixing merge
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/46b05ed9
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/46b05ed9
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/46b05ed9
Branch: refs/heads/1.2.x-fixes
Commit: 46b05ed9a478d58bfbf90cfa90cd9121e566e55d
Parents: e0d2b1c
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Thu Jan 14 17:02:16 2016 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Thu Jan 14 17:02:16 2016 +0000
----------------------------------------------------------------------
.../java/org/apache/cxf/fediz/integrationtests/KerberosTest.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/46b05ed9/systests/kerberos/src/test/java/org/apache/cxf/fediz/integrationtests/KerberosTest.java
----------------------------------------------------------------------
diff --git a/systests/kerberos/src/test/java/org/apache/cxf/fediz/integrationtests/KerberosTest.java b/systests/kerberos/src/test/java/org/apache/cxf/fediz/integrationtests/KerberosTest.java
index a414bdb..3dda898 100644
--- a/systests/kerberos/src/test/java/org/apache/cxf/fediz/integrationtests/KerberosTest.java
+++ b/systests/kerberos/src/test/java/org/apache/cxf/fediz/integrationtests/KerberosTest.java
@@ -94,7 +94,8 @@ import org.junit.runner.RunWith;
@CreateKdcServer(
transports = {
- @CreateTransport(protocol = "KRB", address = "127.0.0.1")
+ // @CreateTransport(protocol = "TCP", address = "127.0.0.1", port=1024)
+ @CreateTransport(protocol = "UDP", address = "127.0.0.1")
},
primaryRealm = "service.ws.apache.org",
kdcPrincipal = "krbtgt/service.ws.apache.org@service.ws.apache.org"