Index: assembly/pom.xml
===================================================================
--- assembly/pom.xml	(revision 1026463)
+++ assembly/pom.xml	(working copy)
@@ -280,9 +280,48 @@
             <optional>true</optional>
         </dependency>
         <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.jetty-bundle</artifactId>
-            <optional>true</optional>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-util</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-io</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-http</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-continuation</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-server</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-security</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-servlet</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-xml</artifactId>
+        </dependency>
+        <dependency>
+        	<groupId>org.objectweb.asm</groupId>
+<artifactId>com.springsource.org.objectweb.asm</artifactId>
+        </dependency>
+        <dependency>
+        	<groupId>org.objectweb.asm</groupId>
+<artifactId>com.springsource.org.objectweb.asm.tree</artifactId>
+        </dependency>
+        <dependency>
+        	<groupId>org.objectweb.asm</groupId>
+<artifactId>com.springsource.org.objectweb.asm.commons</artifactId>
         </dependency>
         <dependency>
             <groupId>org.ops4j.pax.web</groupId>
@@ -319,6 +358,11 @@
             <artifactId>pax-web-extender-whiteboard</artifactId>
             <optional>true</optional>
         </dependency>
+         <dependency>
+            <groupId>org.ops4j.pax.web</groupId>
+            <artifactId>pax-web-deployer</artifactId>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
     <build>
         <resources>
Index: assembly/src/main/filtered-resources/features.xml
===================================================================
--- assembly/src/main/filtered-resources/features.xml	(revision 1026463)
+++ assembly/src/main/filtered-resources/features.xml	(working copy)
@@ -58,10 +58,21 @@
     <feature name="http" version="${project.version}">
         <config name="org.ops4j.pax.web">
             org.osgi.service.http.port=8181
+            org.ops4j.pax.web.config.file=${karaf.base}/etc/jetty.xml
         </config>
-        <bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${geronimo.servlet.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty-bundle/${jetty.bundle.version}</bundle>
-        <bundle>mvn:org.ops4j.pax.web/pax-web-api/${pax.web.version}</bundle>
+        <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${geronimo.servlet.version}</bundle>
+        <bundle dependency='true'>mvn:org.objectweb.asm/com.springsource.org.objectweb.asm/${asm.version}</bundle>
+	    <bundle dependency='true'>mvn:org.objectweb.asm/com.springsource.org.objectweb.asm.tree/${asm.version}</bundle>
+	    <bundle dependency='true'>mvn:org.objectweb.asm/com.springsource.org.objectweb.asm.commons/${asm.version}</bundle>
+	    <bundle>mvn:org.eclipse.jetty/jetty-util/${jetty.bundle.version}</bundle>
+	    <bundle>mvn:org.eclipse.jetty/jetty-io/${jetty.bundle.version}</bundle>
+	    <bundle>mvn:org.eclipse.jetty/jetty-http/${jetty.bundle.version}</bundle>
+	    <bundle>mvn:org.eclipse.jetty/jetty-continuation/${jetty.bundle.version}</bundle>
+	    <bundle>mvn:org.eclipse.jetty/jetty-server/${jetty.bundle.version}</bundle>
+	    <bundle>mvn:org.eclipse.jetty/jetty-security/${jetty.bundle.version}</bundle>
+	    <bundle>mvn:org.eclipse.jetty/jetty-servlet/${jetty.bundle.version}</bundle>
+    	<bundle>mvn:org.eclipse.jetty/jetty-xml/${jetty.bundle.version}</bundle>
+    	<bundle>mvn:org.ops4j.pax.web/pax-web-api/${pax.web.version}</bundle>
         <bundle>mvn:org.ops4j.pax.web/pax-web-spi/${pax.web.version}</bundle>
         <bundle>mvn:org.ops4j.pax.web/pax-web-runtime/${pax.web.version}</bundle>
         <bundle>mvn:org.ops4j.pax.web/pax-web-jetty/${pax.web.version}</bundle>
@@ -71,8 +82,8 @@
         <bundle>mvn:org.ops4j.pax.web/pax-web-jsp/${pax.web.version}</bundle>
         <bundle>mvn:org.ops4j.pax.web/pax-web-extender-war/${pax.web.version}</bundle>
         <bundle>mvn:org.ops4j.pax.web/pax-web-extender-whiteboard/${pax.web.version}</bundle>
+        <bundle>mvn:org.ops4j.pax.web/pax-web-deployer/${pax.web.version}</bundle>
         <bundle>mvn:org.ops4j.pax.url/pax-url-war/${pax.url.version}</bundle>
-        <bundle>mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.war/${project.version}</bundle>
     </feature>
     <feature name="kar" version="${project.version}">
         <bundle>mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.kar/${project.version}</bundle>
Index: pom.xml
===================================================================
--- pom.xml	(revision 1026463)
+++ pom.xml	(working copy)
@@ -106,7 +106,7 @@
         <commons-codec.bundle.version>1.3_3</commons-codec.bundle.version>
         <commons-lang.bundle.version>2.4_4</commons-lang.bundle.version>
         <jasypt.bundle.version>1.6_1</jasypt.bundle.version>
-        <jetty.bundle.version>6.1.22_2</jetty.bundle.version>
+        <jetty.bundle.version>7.1.6.v20100715</jetty.bundle.version>
         <junit.bundle.version>4.7_1</junit.bundle.version>
 
         <commons.logging.version>1.1.1</commons.logging.version>
@@ -132,13 +132,14 @@
         <jline.version>2.4</jline.version>
         <jsw.version>3.2.3</jsw.version>
         <log4j.version>1.2.16</log4j.version>
+        <asm.version>3.1.0</asm.version>
         <maven.version>2.0.9</maven.version>
         <mina.version>2.0.0-RC1</mina.version>
         <pax.exam.version>1.2.2</pax.exam.version>
         <pax.logging.version>1.5.3</pax.logging.version>
         <pax.runner.version>1.5.0</pax.runner.version>
         <pax.url.version>1.1.3</pax.url.version>
-        <pax.web.version>0.7.3</pax.web.version>
+        <pax.web.version>0.8.0-SNAPSHOT</pax.web.version>
         <pax.tinybundles.version>1.3.0</pax.tinybundles.version>
         <servlet.api.version>2.5</servlet.api.version>
         <spring.osgi.version>1.2.0</spring.osgi.version>
@@ -612,11 +613,61 @@
                 <version>${junit.bundle.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.servicemix.bundles</groupId>
-                <artifactId>org.apache.servicemix.bundles.jetty-bundle</artifactId>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-util</artifactId>
+                <version>${jetty.bundle.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-io</artifactId>
+                <version>${jetty.bundle.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-http</artifactId>
+                <version>${jetty.bundle.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-continuation</artifactId>
+                <version>${jetty.bundle.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-server</artifactId>
+                <version>${jetty.bundle.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-security</artifactId>
+                <version>${jetty.bundle.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-servlet</artifactId>
+                <version>${jetty.bundle.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-xml</artifactId>
                 <version>${jetty.bundle.version}</version>
             </dependency>
             <dependency>
+            	<groupId>org.objectweb.asm</groupId>
+				<artifactId>com.springsource.org.objectweb.asm</artifactId>
+				<version>${asm.version}</version>
+            </dependency>
+            <dependency>
+            	<groupId>org.objectweb.asm</groupId>
+				<artifactId>com.springsource.org.objectweb.asm.tree</artifactId>
+				<version>${asm.version}</version>
+            </dependency>
+            <dependency>
+            	<groupId>org.objectweb.asm</groupId>
+				<artifactId>com.springsource.org.objectweb.asm.commons</artifactId>
+				<version>${asm.version}</version>
+            </dependency>
+            <dependency>
                 <groupId>log4j</groupId>
                 <artifactId>log4j</artifactId>
                 <version>${log4j.version}</version>
@@ -820,6 +871,11 @@
             </dependency>
             <dependency>
                 <groupId>org.ops4j.pax.web</groupId>
+                <artifactId>pax-web-deployer</artifactId>
+                <version>${pax.web.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.ops4j.pax.web</groupId>
                 <artifactId>pax-web-extender-war</artifactId>
                 <version>${pax.web.version}</version>
             </dependency>