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 E8FACD6D3 for ; Tue, 18 Sep 2012 06:28:06 +0000 (UTC) Received: (qmail 31729 invoked by uid 500); 18 Sep 2012 06:28:06 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 31547 invoked by uid 500); 18 Sep 2012 06:28:01 -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 31514 invoked by uid 99); 18 Sep 2012 06:28:00 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Sep 2012 06:28:00 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Sep 2012 06:27:57 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 62B85238897F; Tue, 18 Sep 2012 06:27:13 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1386999 - in /camel/trunk: components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ parent/ Date: Tue, 18 Sep 2012 06:27:13 -0000 To: commits@camel.apache.org From: davsclaus@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120918062713.62B85238897F@eris.apache.org> Author: davsclaus Date: Tue Sep 18 06:27:12 2012 New Revision: 1386999 URL: http://svn.apache.org/viewvc?rev=1386999&view=rev Log: CAMEL-5594: Upgraded to Jetty 7.6.7 Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpAuthMethodPriorityTest.java camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBasicAuthComponentConfiguredTest.java camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBasicAuthTest.java camel/trunk/parent/pom.xml Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpAuthMethodPriorityTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpAuthMethodPriorityTest.java?rev=1386999&r1=1386998&r2=1386999&view=diff ============================================================================== --- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpAuthMethodPriorityTest.java (original) +++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpAuthMethodPriorityTest.java Tue Sep 18 06:27:12 2012 @@ -28,12 +28,12 @@ import org.apache.camel.RuntimeCamelExce import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.http.HttpOperationFailedException; import org.apache.camel.impl.JndiRegistry; -import org.eclipse.jetty.http.security.Constraint; import org.eclipse.jetty.security.ConstraintMapping; import org.eclipse.jetty.security.ConstraintSecurityHandler; import org.eclipse.jetty.security.HashLoginService; import org.eclipse.jetty.security.SecurityHandler; import org.eclipse.jetty.security.authentication.BasicAuthenticator; +import org.eclipse.jetty.util.security.Constraint; import org.junit.Test; /** Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBasicAuthComponentConfiguredTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBasicAuthComponentConfiguredTest.java?rev=1386999&r1=1386998&r2=1386999&view=diff ============================================================================== --- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBasicAuthComponentConfiguredTest.java (original) +++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBasicAuthComponentConfiguredTest.java Tue Sep 18 06:27:12 2012 @@ -28,12 +28,12 @@ import org.apache.camel.component.http.A import org.apache.camel.component.http.HttpComponent; import org.apache.camel.component.http.HttpConfiguration; import org.apache.camel.impl.JndiRegistry; -import org.eclipse.jetty.http.security.Constraint; import org.eclipse.jetty.security.ConstraintMapping; import org.eclipse.jetty.security.ConstraintSecurityHandler; import org.eclipse.jetty.security.HashLoginService; import org.eclipse.jetty.security.SecurityHandler; import org.eclipse.jetty.security.authentication.BasicAuthenticator; +import org.eclipse.jetty.util.security.Constraint; import org.junit.Test; /** Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBasicAuthTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBasicAuthTest.java?rev=1386999&r1=1386998&r2=1386999&view=diff ============================================================================== --- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBasicAuthTest.java (original) +++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBasicAuthTest.java Tue Sep 18 06:27:12 2012 @@ -28,12 +28,12 @@ import org.apache.camel.RuntimeCamelExce import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.http.HttpOperationFailedException; import org.apache.camel.impl.JndiRegistry; -import org.eclipse.jetty.http.security.Constraint; import org.eclipse.jetty.security.ConstraintMapping; import org.eclipse.jetty.security.ConstraintSecurityHandler; import org.eclipse.jetty.security.HashLoginService; import org.eclipse.jetty.security.SecurityHandler; import org.eclipse.jetty.security.authentication.BasicAuthenticator; +import org.eclipse.jetty.util.security.Constraint; import org.junit.Test; /** Modified: camel/trunk/parent/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1386999&r1=1386998&r2=1386999&view=diff ============================================================================== --- camel/trunk/parent/pom.xml (original) +++ camel/trunk/parent/pom.xml Tue Sep 18 06:27:12 2012 @@ -168,7 +168,7 @@ 1.4.0 1.1_4 1.1.3 - 7.5.4.v20111024 + 7.6.7.v20120910 6.1.26_4 1.3.2 2.4.2_4 @@ -324,7 +324,7 @@ org.apache.commons.httpclient.*;version="[3.1,4.0)", org.apache.velocity.*;version="[1.6.2,2)", org.apache.xmlbeans.*;version="[2.4,3)", - org.eclipse.jetty.*;version="[7.4,8.2)", + org.eclipse.jetty.*;version="[7.5,8.2)", com.thoughtworks.xstream.*;version="[1.3,2)", org.antlr.stringtemplate.*;version="[3.0,4)", org.jivesoftware.smack.*;version="[3.0,4)",