svn commit: r1586054 - in /servicemix/components/trunk: bindings/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/ListServiceHandler.java bindings/servicemix-http/src/main/java/org/apache/servicemix/http/jetty/JettyContextManager.java pom.xml

[ja...@apache.org]

Author: janstey
Date: Wed Apr  9 17:51:21 2014
New Revision: 1586054

URL: http://svn.apache.org/r1586054
Log:
SMXCOMP-981 - update components to use jetty 8

Modified:
    servicemix/components/trunk/bindings/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/ListServiceHandler.java
    servicemix/components/trunk/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/jetty/JettyContextManager.java
    servicemix/components/trunk/pom.xml

Modified: servicemix/components/trunk/bindings/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/ListServiceHandler.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/ListServiceHandler.java?rev=1586054&r1=1586053&r2=1586054&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/ListServiceHandler.java (original)
+++ servicemix/components/trunk/bindings/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/ListServiceHandler.java Wed Apr  9 17:51:21 2014
@@ -34,7 +34,7 @@ import org.apache.cxf.transport.http_jet
 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 @@ public class ListServiceHandler extends 
             HttpServletResponse response, int dispatch) throws IOException,
             ServletException {
         if (response.isCommitted()
-                || HttpConnection.getCurrentConnection().getRequest()
+                || AbstractHttpConnection.getCurrentConnection().getRequest()
                         .isHandled()) {
             return;
         }

Modified: servicemix/components/trunk/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/jetty/JettyContextManager.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/jetty/JettyContextManager.java?rev=1586054&r1=1586053&r2=1586054&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/jetty/JettyContextManager.java (original)
+++ servicemix/components/trunk/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/jetty/JettyContextManager.java Wed Apr  9 17:51:21 2014
@@ -21,7 +21,7 @@ import org.apache.servicemix.common.secu
 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 @@ public class JettyContextManager impleme
     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;
             }
 

Modified: servicemix/components/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/pom.xml?rev=1586054&r1=1586053&r2=1586054&view=diff
==============================================================================
--- servicemix/components/trunk/pom.xml (original)
+++ servicemix/components/trunk/pom.xml Wed Apr  9 17:51:21 2014
@@ -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>