Return-Path: 
 <commits-return-18246-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org>
X-Original-To: apmail-activemq-commits-archive@www.apache.org
Delivered-To: apmail-activemq-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 BC7F49140
	for <apmail-activemq-commits-archive@www.apache.org>;
 Fri, 24 Feb 2012 21:37:03 +0000 (UTC)
Received: (qmail 44928 invoked by uid 500); 24 Feb 2012 21:37:03 -0000
Delivered-To: apmail-activemq-commits-archive@activemq.apache.org
Received: (qmail 44898 invoked by uid 500); 24 Feb 2012 21:37:03 -0000
Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@activemq.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@activemq.apache.org>
List-Post: <mailto:commits@activemq.apache.org>
List-Id: <commits.activemq.apache.org>
Reply-To: dev@activemq.apache.org
Delivered-To: mailing list commits@activemq.apache.org
Received: (qmail 44891 invoked by uid 99); 24 Feb 2012 21:37:03 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Feb 2012 21:37:03 +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; Fri, 24 Feb 2012 21:37:01 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 0FA60238889B
	for <commits@activemq.apache.org>; Fri, 24 Feb 2012 21:36:40 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1293432 - in /activemq/trunk:
 activemq-optional/src/main/java/org/apache/activemq/transport/https/Krb5AndCertsSslSocketConnector.java
 assembly/src/release/conf/jetty.xml pom.xml
Date: Fri, 24 Feb 2012 21:36:39 -0000
To: commits@activemq.apache.org
From: tabish@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120224213640.0FA60238889B@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: tabish
Date: Fri Feb 24 21:36:39 2012
New Revision: 1293432

URL: http://svn.apache.org/viewvc?rev=1293432&view=rev
Log:
fix for: https://issues.apache.org/jira/browse/AMQ-3693
fix for: https://issues.apache.org/jira/browse/AMQ-3508

Upgrades Jetty to v7.6.1

Modified:
    activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/https/Krb5AndCertsSslSocketConnector.java
    activemq/trunk/assembly/src/release/conf/jetty.xml
    activemq/trunk/pom.xml

Modified: activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/https/Krb5AndCertsSslSocketConnector.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/https/Krb5AndCertsSslSocketConnector.java?rev=1293432&r1=1293431&r2=1293432&view=diff
==============================================================================
--- activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/https/Krb5AndCertsSslSocketConnector.java (original)
+++ activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/https/Krb5AndCertsSslSocketConnector.java Fri Feb 24 21:36:39 2012
@@ -22,22 +22,22 @@ import java.security.KeyManagementExcept
 import java.security.NoSuchAlgorithmException;
 import java.security.NoSuchProviderException;
 import java.security.Principal;
-import java.util.List;
 import java.util.Collections;
+import java.util.List;
 import java.util.Random;
 
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLServerSocket;
 import javax.net.ssl.SSLSocket;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.eclipse.jetty.http.HttpSchemes;
-import org.eclipse.jetty.http.ssl.SslContextFactory;
 import org.eclipse.jetty.io.EndPoint;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.ssl.ServletSSL;
 import org.eclipse.jetty.server.ssl.SslSocketConnector;
+import org.eclipse.jetty.util.ssl.SslContextFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Extend Jetty's {@link SslSocketConnector} to optionally also provide

Modified: activemq/trunk/assembly/src/release/conf/jetty.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/conf/jetty.xml?rev=1293432&r1=1293431&r2=1293432&view=diff
==============================================================================
--- activemq/trunk/assembly/src/release/conf/jetty.xml (original)
+++ activemq/trunk/assembly/src/release/conf/jetty.xml Fri Feb 24 21:36:39 2012
@@ -25,7 +25,7 @@
         <property name="config" value="${activemq.conf}/jetty-realm.properties" />
     </bean>
 
-    <bean id="securityConstraint" class="org.eclipse.jetty.http.security.Constraint">
+    <bean id="securityConstraint" class="org.eclipse.jetty.util.security.Constraint">
         <property name="name" value="BASIC" />
         <property name="roles" value="admin" />
         <property name="authenticate" value="false" />

Modified: activemq/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/pom.xml?rev=1293432&r1=1293431&r2=1293432&view=diff
==============================================================================
--- activemq/trunk/pom.xml (original)
+++ activemq/trunk/pom.xml Fri Feb 24 21:36:39 2012
@@ -67,7 +67,7 @@
     <hsqldb-version>1.7.2.2</hsqldb-version>
     <jasypt-version>1.8</jasypt-version>
     <jdom-version>1.0</jdom-version>
-    <jetty-version>7.5.1.v20110908</jetty-version>
+    <jetty-version>7.6.1.v20120215</jetty-version>
     <jsp-version>2.1.v20100127</jsp-version>
     <jstl-version>1.1.2</jstl-version>
     <jettison-version>1.3</jettison-version>