Return-Path: X-Original-To: apmail-camel-commits-archive@www.apache.org Delivered-To: apmail-camel-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 75601C048 for ; Wed, 7 Jan 2015 17:04:44 +0000 (UTC) Received: (qmail 45201 invoked by uid 500); 7 Jan 2015 17:04:45 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 45148 invoked by uid 500); 7 Jan 2015 17:04:45 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 45139 invoked by uid 99); 7 Jan 2015 17:04:45 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Jan 2015 17:04:45 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 1378CA26C6F; Wed, 7 Jan 2015 17:04:45 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: coheigea@apache.org To: commits@camel.apache.org Message-Id: <30dfecb9f01a4757a2c1450b296260ee@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: camel git commit: Upgrading Apache DS version for the LDAP component testing Date: Wed, 7 Jan 2015 17:04:45 +0000 (UTC) Repository: camel Updated Branches: refs/heads/master 955658b8d -> e2a945d70 Upgrading Apache DS version for the LDAP component testing Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e2a945d7 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e2a945d7 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e2a945d7 Branch: refs/heads/master Commit: e2a945d70e13f0848a5f1af2c76263ce42bce7c2 Parents: 955658b Author: Colm O hEigeartaigh Authored: Wed Jan 7 17:04:02 2015 +0000 Committer: Colm O hEigeartaigh Committed: Wed Jan 7 17:04:02 2015 +0000 ---------------------------------------------------------------------- .../java/org/apache/camel/component/ldap/LdapRouteTest.java | 6 ++---- parent/pom.xml | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/e2a945d7/components/camel-ldap/src/test/java/org/apache/camel/component/ldap/LdapRouteTest.java ---------------------------------------------------------------------- diff --git a/components/camel-ldap/src/test/java/org/apache/camel/component/ldap/LdapRouteTest.java b/components/camel-ldap/src/test/java/org/apache/camel/component/ldap/LdapRouteTest.java index 405d7b6..6d3d474 100644 --- a/components/camel-ldap/src/test/java/org/apache/camel/component/ldap/LdapRouteTest.java +++ b/components/camel-ldap/src/test/java/org/apache/camel/component/ldap/LdapRouteTest.java @@ -36,7 +36,6 @@ import org.apache.directory.server.annotations.CreateTransport; import org.apache.directory.server.core.annotations.ApplyLdifFiles; import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; -import org.apache.directory.server.ldap.LdapServer; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -55,7 +54,6 @@ import static org.junit.Assert.assertTrue; @ApplyLdifFiles("org/apache/camel/component/ldap/LdapRouteTest.ldif") public class LdapRouteTest extends AbstractLdapTestUnit { - public static LdapServer ldapServer; private CamelContext camel; private ProducerTemplate template; private int port; @@ -63,7 +61,7 @@ public class LdapRouteTest extends AbstractLdapTestUnit { @Before public void setup() throws Exception { // you can assign port number in the @CreateTransport annotation - port = ldapServer.getPort(); + port = super.getLdapServer().getPort(); LdapContext ctx = getWiredContext(ldapServer); @@ -77,7 +75,7 @@ public class LdapRouteTest extends AbstractLdapTestUnit { public void tearDown() throws Exception { camel.stop(); } - + @Test public void testLdapRouteStandard() throws Exception { camel.addRoutes(createRouteBuilder("ldap:localhost:" + port + "?base=ou=system")); http://git-wip-us.apache.org/repos/asf/camel/blob/e2a945d7/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index ee34be9..2c46164 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -41,7 +41,7 @@ 3.4_1 3.4_2 1.0_6 - 1.5.7 + 2.0.0-M19 0.4 0.7.2 1.0.0