Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3594A1835A for ; Fri, 23 Oct 2015 11:11:26 +0000 (UTC) Received: (qmail 14576 invoked by uid 500); 23 Oct 2015 11:11:26 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 14511 invoked by uid 500); 23 Oct 2015 11:11:26 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 14489 invoked by uid 99); 23 Oct 2015 11:11:26 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 Oct 2015 11:11:26 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D6B6DDFF30; Fri, 23 Oct 2015 11:11:25 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: coheigea@apache.org To: commits@cxf.apache.org Date: Fri, 23 Oct 2015 11:11:26 -0000 Message-Id: <481fa327ac094b208c74297e3a6e6e27@git.apache.org> In-Reply-To: <4ec4a197b1bd4bae83039077e8ac2af2@git.apache.org> References: <4ec4a197b1bd4bae83039077e8ac2af2@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] cxf git commit: Remove LDAP server set up from the Kerberos tests Remove LDAP server set up from the Kerberos tests Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a24b8912 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a24b8912 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a24b8912 Branch: refs/heads/3.0.x-fixes Commit: a24b89126236aa77173f18d88eff10afed2b821d Parents: 61d0690 Author: Colm O hEigeartaigh Authored: Fri Oct 23 11:59:44 2015 +0100 Committer: Colm O hEigeartaigh Committed: Fri Oct 23 12:08:00 2015 +0100 ---------------------------------------------------------------------- .../kerberos/jaxrs/kerberos/JAXRSKerberosBookTest.java | 7 ------- .../systest/kerberos/wssec/kerberos/KerberosTokenTest.java | 7 ------- .../cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java | 7 ------- 3 files changed, 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/a24b8912/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 32c59da..cda826c 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 @@ -34,7 +34,6 @@ import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; import org.apache.cxf.transport.http.auth.HttpAuthHeader; import org.apache.cxf.transport.http.auth.SpnegoAuthSupplier; import org.apache.directory.server.annotations.CreateKdcServer; -import org.apache.directory.server.annotations.CreateLdapServer; import org.apache.directory.server.annotations.CreateTransport; import org.apache.directory.server.core.annotations.ApplyLdifFiles; import org.apache.directory.server.core.annotations.CreateDS; @@ -76,12 +75,6 @@ import org.junit.runner.RunWith; } ) -@CreateLdapServer( - transports = { - @CreateTransport(protocol = "LDAP") - } -) - @CreateKdcServer( transports = { // @CreateTransport(protocol = "TCP", address = "127.0.0.1", port=1024) http://git-wip-us.apache.org/repos/asf/cxf/blob/a24b8912/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 f9c00ef..2545b1f 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 @@ -37,7 +37,6 @@ import org.apache.cxf.systest.kerberos.wssec.sts.StaxSTSServer; import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; import org.apache.cxf.testutil.common.TestUtil; import org.apache.directory.server.annotations.CreateKdcServer; -import org.apache.directory.server.annotations.CreateLdapServer; import org.apache.directory.server.annotations.CreateTransport; import org.apache.directory.server.core.annotations.ApplyLdifFiles; import org.apache.directory.server.core.annotations.CreateDS; @@ -79,12 +78,6 @@ import org.junit.runner.RunWith; } ) -@CreateLdapServer( - transports = { - @CreateTransport(protocol = "LDAP") - } -) - @CreateKdcServer( transports = { // @CreateTransport(protocol = "TCP", address = "127.0.0.1", port=1024) http://git-wip-us.apache.org/repos/asf/cxf/blob/a24b8912/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 29380a7..c7d50aa 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 @@ -34,7 +34,6 @@ import org.apache.cxf.systest.kerberos.common.SecurityTestUtil; import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; import org.apache.cxf.testutil.common.TestUtil; import org.apache.directory.server.annotations.CreateKdcServer; -import org.apache.directory.server.annotations.CreateLdapServer; import org.apache.directory.server.annotations.CreateTransport; import org.apache.directory.server.core.annotations.ApplyLdifFiles; import org.apache.directory.server.core.annotations.CreateDS; @@ -76,12 +75,6 @@ import org.junit.runner.RunWith; } ) -@CreateLdapServer( - transports = { - @CreateTransport(protocol = "LDAP") - } -) - @CreateKdcServer( transports = { // @CreateTransport(protocol = "TCP", address = "127.0.0.1", port=1024)