SMXCOMP-981 - update components to use jetty 8
git-svn-id: https://svn.apache.org/repos/asf/servicemix/components/trunk@1586054 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/bindings/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/ListServiceHandler.java b/bindings/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/ListServiceHandler.java
index 54abd38..a67b68d 100644
--- a/bindings/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/ListServiceHandler.java
+++ b/bindings/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/ListServiceHandler.java
@@ -34,7 +34,7 @@
import org.apache.cxf.transport.http_jetty.JettyHTTPServerEngine;
import org.eclipse.jetty.http.HttpMethods;
import org.eclipse.jetty.http.MimeTypes;
-import org.eclipse.jetty.server.HttpConnection;
+import org.eclipse.jetty.server.AbstractHttpConnection;
import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.handler.AbstractHandler;
import org.eclipse.jetty.util.ByteArrayISO8859Writer;
@@ -60,7 +60,7 @@
HttpServletResponse response, int dispatch) throws IOException,
ServletException {
if (response.isCommitted()
- || HttpConnection.getCurrentConnection().getRequest()
+ || AbstractHttpConnection.getCurrentConnection().getRequest()
.isHandled()) {
return;
}
diff --git a/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/jetty/JettyContextManager.java b/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/jetty/JettyContextManager.java
index ec68664..f13df89 100644
--- a/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/jetty/JettyContextManager.java
+++ b/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/jetty/JettyContextManager.java
@@ -21,7 +21,7 @@
import org.apache.servicemix.http.*;
import org.eclipse.jetty.http.HttpMethods;
import org.eclipse.jetty.http.MimeTypes;
-import org.eclipse.jetty.http.security.Constraint;
+import org.eclipse.jetty.util.security.Constraint;
import org.eclipse.jetty.jmx.MBeanContainer;
import org.eclipse.jetty.security.ConstraintMapping;
import org.eclipse.jetty.security.ConstraintSecurityHandler;
@@ -382,7 +382,7 @@
protected class DisplayServiceHandler extends AbstractHandler {
public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
- if (response.isCommitted() || HttpConnection.getCurrentConnection().getRequest().isHandled()) {
+ if (response.isCommitted() || AbstractHttpConnection.getCurrentConnection().getRequest().isHandled()) {
return;
}
diff --git a/pom.xml b/pom.xml
index 30c0f4f..662c68d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -130,7 +130,7 @@
<jaxb-xjc.version>2.1.12</jaxb-xjc.version>
<jdom.version>1.1</jdom.version>
<jencks.version>2.2</jencks.version>
- <jetty.version>7.5.4.v20111024</jetty.version>
+ <jetty.version>8.1.9.v20130131</jetty.version>
<junit.version>4.7</junit.version>
<log4j.version>1.2.16</log4j.version>
<mx4j.version>3.0.1</mx4j.version>
