Rename Wildfly Web to Wildfly Servlet

feature-pack/feature-pack-build.xml

@@ -22,7 +22,7 @@
 
 <build xmlns="urn:wildfly:feature-pack-build:1.0">
     <dependencies>
-    	<artifact name="org.wildfly:wildfly-web-feature-pack" />        
+    	<artifact name="org.wildfly:wildfly-servlet-feature-pack" />
     </dependencies>
     <config>
         <!-- Core configs -->

feature-pack/pom.xml

@@ -98,7 +98,7 @@
 
         <dependency>
             <groupId>org.wildfly</groupId>
-            <artifactId>wildfly-web-feature-pack</artifactId>
+            <artifactId>wildfly-servlet-feature-pack</artifactId>
             <type>zip</type>
             <exclusions>
                 <exclusion>

pom.xml

@@ -241,7 +241,7 @@
 
         <server.output.dir.prefix>wildfly</server.output.dir.prefix>
         <wildfly.build.output.dir>dist/target/${server.output.dir.prefix}-${jboss.as.release.version}</wildfly.build.output.dir>
-        <wildfly.web.build.output.dir>web-dist/target/${server.output.dir.prefix}-web-${jboss.as.release.version}</wildfly.web.build.output.dir>
+        <wildfly.web.build.output.dir>servlet-dist/target/${server.output.dir.prefix}-web-${jboss.as.release.version}</wildfly.web.build.output.dir>
 
         <!--
             See ChildFirstClassLoaderBuilder in model-test for the explanation of the org.jboss.model.test.cache.root and org.jboss.model.test.classpath.cache properties.
@@ -292,10 +292,10 @@
         <module>spec-api</module>
         <module>transactions</module>
         <module>undertow</module>
-        <module>web-build</module>
+        <module>servlet-build</module>
         <module>web-common</module>
-        <module>web-dist</module>
-        <module>web-feature-pack</module>
+        <module>servlet-dist</module>
+        <module>servlet-feature-pack</module>
         <module>webservices</module>
         <module>weld</module>
         <module>xts</module>
@@ -1450,21 +1450,21 @@
 
             <dependency>
                 <groupId>org.wildfly</groupId>
-                <artifactId>wildfly-web-dist</artifactId>
+                <artifactId>wildfly-servlet-dist</artifactId>
                 <version>${project.version}</version>
                 <type>pom</type>
             </dependency>
 
             <dependency>
                 <groupId>org.wildfly</groupId>
-                <artifactId>wildfly-web-feature-pack</artifactId>
+                <artifactId>wildfly-servlet-feature-pack</artifactId>
                 <type>pom</type>
                 <version>${project.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>org.wildfly</groupId>
-                <artifactId>wildfly-web-feature-pack</artifactId>
+                <artifactId>wildfly-servlet-feature-pack</artifactId>
                 <type>zip</type>
                 <version>${project.version}</version>
             </dependency>

web-build/assembly.xml → servlet-build/assembly.xml

@@ -35,7 +35,7 @@
             <directory>target</directory>
             <outputDirectory/>
             <includes>
-                <include>${server.output.dir.prefix}-web-${project.version}/**</include>
+                <include>${server.output.dir.prefix}-servlet-${project.version}/**</include>
             </includes>
         </fileSet>
     </fileSets>

web-build/pom.xml → servlet-build/pom.xml

@@ -33,9 +33,9 @@
         <version>9.0.0.CR2-SNAPSHOT</version>
     </parent>
 
-    <artifactId>wildfly-web-build</artifactId>
+    <artifactId>wildfly-servlet-build</artifactId>
 
-    <name>WildFly: Build Web</name>
+    <name>WildFly: Servlet Build</name>
     <packaging>pom</packaging>
 
     <dependencies>
@@ -45,7 +45,7 @@
         </dependency>
         <dependency>
             <groupId>org.wildfly</groupId>
-            <artifactId>wildfly-web-feature-pack</artifactId>
+            <artifactId>wildfly-servlet-feature-pack</artifactId>
             <type>zip</type>
             <exclusions>
                 <exclusion>
@@ -57,7 +57,7 @@
     </dependencies>
 
     <build>
-        <finalName>${server.output.dir.prefix}-web-${project.version}</finalName>
+        <finalName>${server.output.dir.prefix}-servlet-${project.version}</finalName>
         <plugins>
             <plugin>
                 <groupId>org.wildfly.build</groupId>

web-build/server-provisioning.xml → servlet-build/server-provisioning.xml

@@ -21,6 +21,6 @@
   -->
 <server-provisioning xmlns="urn:wildfly:server-provisioning:1.0">
     <feature-packs>
-        <feature-pack groupId="org.wildfly" artifactId="wildfly-web-feature-pack" version="${project.version}"/>
+        <feature-pack groupId="org.wildfly" artifactId="wildfly-servlet-feature-pack" version="${project.version}"/>
     </feature-packs>
 </server-provisioning>

web-dist/assembly-src.xml → servlet-dist/assembly-src.xml

@@ -34,7 +34,7 @@
     <fileSets>
         <fileSet>
             <directory>..</directory>
-            <outputDirectory>${server.output.dir.prefix}-web-${project.version}-src</outputDirectory>
+            <outputDirectory>${server.output.dir.prefix}-servlet-${project.version}-src</outputDirectory>
             <includes>
                 <include>**/*.xml</include>
                 <include>**/src/**</include>

web-dist/assembly.xml → servlet-dist/assembly.xml

@@ -23,7 +23,7 @@
 
 <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
-    <id>web-distro</id>
+    <id>servlet-distro</id>
     <formats>
        <format>zip</format>
        <format>tar.gz</format>
@@ -34,7 +34,7 @@
             <directory>target</directory>
             <outputDirectory/>
             <includes>
-                <include>${server.output.dir.prefix}-web-${version}/**</include>
+                <include>${server.output.dir.prefix}-servlet-${version}/**</include>
             </includes>
         </fileSet>
     </fileSets>

web-dist/pom.xml → servlet-dist/pom.xml

@@ -33,19 +33,19 @@
         <version>9.0.0.CR2-SNAPSHOT</version>
     </parent>
 
-    <artifactId>wildfly-web-dist</artifactId>
-    <name>WildFly: Web Distribution</name>
+    <artifactId>wildfly-servlet-dist</artifactId>
+    <name>WildFly: Servlet Distribution</name>
     <packaging>jar</packaging>
     <dependencies>
         <dependency>
             <groupId>org.wildfly</groupId>
-            <artifactId>wildfly-web-feature-pack</artifactId>
+            <artifactId>wildfly-servlet-feature-pack</artifactId>
             <type>pom</type>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.wildfly</groupId>
-            <artifactId>wildfly-web-feature-pack</artifactId>
+            <artifactId>wildfly-servlet-feature-pack</artifactId>
             <type>zip</type>
             <exclusions>
                 <exclusion>
@@ -58,7 +58,7 @@
 
 
     <build>
-        <finalName>${server.output.dir.prefix}-web-${project.version}</finalName>
+        <finalName>${server.output.dir.prefix}-servlet-${project.version}</finalName>
         <plugins>
             <plugin>
                 <groupId>org.wildfly.build</groupId>

web-dist/server-provisioning.xml → servlet-dist/server-provisioning.xml

@@ -21,6 +21,6 @@
   -->
 <server-provisioning xmlns="urn:wildfly:server-provisioning:1.0" extract-schemas="true" copy-module-artifacts="true">
     <feature-packs>
-        <feature-pack groupId="org.wildfly" artifactId="wildfly-web-feature-pack" version="${project.version}"/>
+        <feature-pack groupId="org.wildfly" artifactId="wildfly-servlet-feature-pack" version="${project.version}"/>
     </feature-packs>
 </server-provisioning>

web-feature-pack/assembly.xml → servlet-feature-pack/assembly.xml

@@ -25,14 +25,14 @@
 
 <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
-    <id>web-feature-pack</id>
+    <id>servlet-feature-pack</id>
     <formats>
        <format>zip</format>
     </formats>
     <includeBaseDirectory>false</includeBaseDirectory>
     <fileSets>
         <fileSet>
-            <directory>target/${server.output.dir.prefix}-web-${project.version}</directory>
+            <directory>target/${server.output.dir.prefix}-servlet-${project.version}</directory>
             <outputDirectory/>
         </fileSet>
     </fileSets>

web-feature-pack/pom.xml → servlet-feature-pack/pom.xml

@@ -33,9 +33,9 @@
         <version>9.0.0.CR2-SNAPSHOT</version>
     </parent>
 
-    <artifactId>wildfly-web-feature-pack</artifactId>
+    <artifactId>wildfly-servlet-feature-pack</artifactId>
 
-    <name>WildFly: Web Feature Pack</name>
+    <name>WildFly: Servlet Feature Pack</name>
     <packaging>pom</packaging>
 
     <dependencies>
@@ -385,7 +385,7 @@
     </dependencies>
 
     <build>
-        <finalName>${server.output.dir.prefix}-web-${project.version}</finalName>
+        <finalName>${server.output.dir.prefix}-servlet-${project.version}</finalName>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -424,7 +424,7 @@
                                 <descriptor>assembly.xml</descriptor>
                             </descriptors>
                             <recompressZippedFiles>true</recompressZippedFiles>
-                            <finalName>${server.output.dir.prefix}-web-feature-pack-${project.version}</finalName>
+                            <finalName>${server.output.dir.prefix}-servlet-feature-pack-${project.version}</finalName>
                             <appendAssemblyId>false</appendAssemblyId>
                             <outputDirectory>${project.build.directory}</outputDirectory>
                             <workDirectory>${project.build.directory}/assembly/work</workDirectory>

testsuite/shared/pom.xml

@@ -44,7 +44,7 @@
         </dependency>
         <dependency>
             <groupId>org.wildfly</groupId>
-            <artifactId>wildfly-web-feature-pack</artifactId>
+            <artifactId>wildfly-servlet-feature-pack</artifactId>
             <type>pom</type>
         </dependency>
         <dependency>