Fixing CDI module behavior

jetty-cdi/cdi-servlet/src/main/config/etc/jetty-cdi.xml

@@ -10,7 +10,7 @@
     <Call name="addLifeCycleBinding">
       <Arg>
         <New
-          class="org.eclipse.jetty.cdi.WeldDeploymentBinding">
+          class="org.eclipse.jetty.cdi.servlet.WeldDeploymentBinding">
         </New>
       </Arg>
     </Call>

jetty-cdi/cdi-servlet/src/main/config/modules/cdi.mod

@@ -10,12 +10,13 @@ plus
 jsp
 
 [files]
-lib/weld/
-maven://org.jboss.weld.servlet/weld-servlet/2.2.9.Final|lib/weld/weld-servlet-2.2.9.Final.jar
+lib/cdi/
+maven://org.jboss.weld.servlet/weld-servlet/2.2.9.Final|lib/cdi/weld-servlet-2.2.9.Final.jar
 
 [lib]
-lib/weld/weld-servlet-2.2.9.Final.jar
-lib/jetty-cdi-${jetty.version}.jar
+lib/cdi/weld-servlet-2.2.9.Final.jar
+lib/cdi/cdi-core-${jetty.version}.jar
+lib/cdi/cdi-servlet-${jetty.version}.jar
 
 [xml]
 etc/jetty-cdi.xml

jetty-distribution/pom.xml

@@ -431,6 +431,19 @@
               <outputDirectory>${assembly-directory}/lib/jndi</outputDirectory>
             </configuration>
           </execution>
+          <execution>
+            <id>copy-cdi-deps</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>copy-dependencies</goal>
+            </goals>
+            <configuration>
+              <includeGroupIds>org.eclipse.jetty.cdi</includeGroupIds>
+              <!-- includeArtifactIds>cdi-core,cdi-servlet,cdi-websocket</includeArtifactIds -->
+              <includeTypes>jar</includeTypes>
+              <outputDirectory>${assembly-directory}/lib/cdi</outputDirectory>
+            </configuration>
+          </execution>
           <execution>
             <id>copy-jndi-deps</id>
             <phase>generate-resources</phase>
@@ -738,8 +751,13 @@
     </dependency>
 -->
     <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-cdi</artifactId>
+      <groupId>org.eclipse.jetty.cdi</groupId>
+      <artifactId>cdi-servlet</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty.cdi</groupId>
+      <artifactId>cdi-websocket</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>