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>
