Rename Wildfly Web to Wildfly Servlet

wildfly · May 21, 2015 · 8c0e73d · 8c0e73d
1 parent eab63df
commit 8c0e73d
Show file tree

Hide file tree

Showing 94 changed files with 479 additions and 30 deletions.
diff --git a/...esources/org/jboss/as/clustering/jgroups/subsystem/subsystem-jgroups-transform-reject.xml b/...esources/org/jboss/as/clustering/jgroups/subsystem/subsystem-jgroups-transform-reject.xml
@@ -56,4 +56,4 @@
             <transport type="UDP"/>
         </stack>
     </stacks>
-</subsystem>
+</subsystem>
diff --git a/feature-pack/feature-pack-build.xml b/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 -->

diff --git a/feature-pack/pom.xml b/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>

diff --git a/iiop-openjdk/src/test/resources/org/wildfly/iiop/openjdk/subsystem-1.0-security-client.xml b/iiop-openjdk/src/test/resources/org/wildfly/iiop/openjdk/subsystem-1.0-security-client.xml
@@ -8,4 +8,4 @@
     <properties>
         <property name="some_property" value="some_value"/>
     </properties>
-</subsystem>
+</subsystem>
diff --git a/iiop-openjdk/src/test/resources/org/wildfly/iiop/openjdk/subsystem-1.0-security-identity.xml b/iiop-openjdk/src/test/resources/org/wildfly/iiop/openjdk/subsystem-1.0-security-identity.xml
@@ -8,4 +8,4 @@
     <properties>
         <property name="some_property" value="some_value"/>
     </properties>
-</subsystem>
+</subsystem>
diff --git a/iiop-openjdk/src/test/resources/org/wildfly/iiop/openjdk/subsystem-1.0.xml b/iiop-openjdk/src/test/resources/org/wildfly/iiop/openjdk/subsystem-1.0.xml
@@ -14,4 +14,4 @@
     <properties>
         <property name="some_property" value="some_value"/>
     </properties>
-</subsystem>
+</subsystem>
diff --git a/legacy/web/src/test/resources/org/jboss/as/web/test/subsystem-2.2.0.xml b/legacy/web/src/test/resources/org/jboss/as/web/test/subsystem-2.2.0.xml
@@ -96,4 +96,4 @@
                <param param-name="param-name1" param-value="${prop.valve-param:some-value}"/>
                <param param-name="param-name2" param-value="${prop.valve-param:some-value}"/>
             </valve>
-        </subsystem>
+        </subsystem>
diff --git a/mail/src/test/resources/org/jboss/as/mail/extension/subsystem_1_2.xml b/mail/src/test/resources/org/jboss/as/mail/extension/subsystem_1_2.xml
@@ -26,4 +26,4 @@
             <property name="custom_prop" value="some-custom-prop-value"/>
         </custom-server>
     </mail-session>
-</subsystem>
+</subsystem>
diff --git a/naming/src/main/resources/subsystem-templates/naming.xml b/naming/src/main/resources/subsystem-templates/naming.xml
@@ -11,4 +11,4 @@
        </replacement>
     </supplement>
     <supplement name="web-build" />
-</config>
+</config>
diff --git a/picketlink/src/main/resources/subsystem-templates/picketlink-federation.xml b/picketlink/src/main/resources/subsystem-templates/picketlink-federation.xml
@@ -104,4 +104,4 @@
             </service-providers>
         </federation>
     </subsystem>
-</config>
+</config>
diff --git a/picketlink/src/main/resources/subsystem-templates/picketlink-identity-management.xml b/picketlink/src/main/resources/subsystem-templates/picketlink-identity-management.xml
@@ -167,4 +167,4 @@
 
     </subsystem>
 
-</config>
+</config>
diff --git a/.../org/wildfly/extension/picketlink/subsystem/identity-management-subsystem-example-2.0.xml b/.../org/wildfly/extension/picketlink/subsystem/identity-management-subsystem-example-2.0.xml
@@ -162,4 +162,4 @@
             </identity-configuration>
         </partition-manager>
 
-</subsystem>
+</subsystem>
diff --git a/pom.xml b/pom.xml
@@ -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>
@@ -1457,14 +1457,14 @@
 
             <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>

diff --git a/security/subsystem/src/main/resources/subsystem-templates/security.xml b/security/subsystem/src/main/resources/subsystem-templates/security.xml
@@ -51,4 +51,4 @@
        </replacement>
    </supplement>
    <supplement name="web-build"/>
-</config>
+</config>
diff --git a/web-build/assembly.xml → servlet-build/assembly.xml b/web-build/assembly.xml → servlet-build/assembly.xml
diff --git a/servlet-build/pom.xml b/servlet-build/pom.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ JBoss, Home of Professional Open Source.
+  ~ Copyright 2010, Red Hat, Inc., and individual contributors
+  ~ as indicated by the @author tags. See the copyright.txt file in the
+  ~ distribution for a full listing of individual contributors.
+  ~
+  ~ This is free software; you can redistribute it and/or modify it
+  ~ under the terms of the GNU Lesser General Public License as
+  ~ published by the Free Software Foundation; either version 2.1 of
+  ~ the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  ~ Lesser General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU Lesser General Public
+  ~ License along with this software; if not, write to the Free
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.wildfly</groupId>
+        <artifactId>wildfly-parent</artifactId>
+        <version>10.0.0.Alpha2-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>wildfly-servlet-build</artifactId>
+
+    <name>WildFly: Servlet Build</name>
+    <packaging>pom</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.wildfly.core</groupId>
+            <artifactId>wildfly-request-controller</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.wildfly</groupId>
+            <artifactId>wildfly-servlet-feature-pack</artifactId>
+            <type>zip</type>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>${server.output.dir.prefix}-web-${project.version}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.wildfly.build</groupId>
+                <artifactId>wildfly-server-provisioning-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>server-provisioning</id>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                        <phase>compile</phase>
+                        <configuration>
+                            <config-file>server-provisioning.xml</config-file>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>assemble</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>assembly.xml</descriptor>
+                            </descriptors>
+                            <recompressZippedFiles>true</recompressZippedFiles>
+                            <finalName>${server.output.dir.prefix}-web-${project.version}</finalName>
+                            <appendAssemblyId>false</appendAssemblyId>
+                            <outputDirectory>${project.build.directory}</outputDirectory>
+                            <workDirectory>${project.build.directory}/assembly/work</workDirectory>
+                            <tarLongFileMode>gnu</tarLongFileMode>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/web-build/server-provisioning.xml → servlet-build/server-provisioning.xml b/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>
diff --git a/servlet-build/web-build/assembly.xml b/servlet-build/web-build/assembly.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~
+  ~ JBoss, Home of Professional Open Source.
+  ~ Copyright 2013, Red Hat, Inc., and individual contributors
+  ~ as indicated by the @author tags. See the copyright.txt file in the
+  ~ distribution for a full listing of individual contributors.
+  ~
+  ~ This is free software; you can redistribute it and/or modify it
+  ~ under the terms of the GNU Lesser General Public License as
+  ~ published by the Free Software Foundation; either version 2.1 of
+  ~ the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  ~ Lesser General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU Lesser General Public
+  ~ License along with this software; if not, write to the Free
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  ~
+  -->
+
+<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>thin-server</id>
+    <formats>
+       <format>zip</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <fileSets>
+        <fileSet>
+            <directory>target</directory>
+            <outputDirectory/>
+            <includes>
+                <include>${server.output.dir.prefix}-web-${project.version}/**</include>
+            </includes>
+        </fileSet>
+    </fileSets>
+</assembly>
diff --git a/web-build/pom.xml → servlet-build/web-build/pom.xml b/web-build/pom.xml → servlet-build/web-build/pom.xml
@@ -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>

diff --git a/servlet-build/web-build/server-provisioning.xml b/servlet-build/web-build/server-provisioning.xml
@@ -0,0 +1,26 @@
+<!--
+  ~ JBoss, Home of Professional Open Source.
+  ~ Copyright 2014, Red Hat, Inc., and individual contributors
+  ~ as indicated by the @author tags. See the copyright.txt file in the
+  ~ distribution for a full listing of individual contributors.
+  ~
+  ~ This is free software; you can redistribute it and/or modify it
+  ~ under the terms of the GNU Lesser General Public License as
+  ~ published by the Free Software Foundation; either version 2.1 of
+  ~ the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  ~ Lesser General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU Lesser General Public
+  ~ License along with this software; if not, write to the Free
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  -->
+<server-provisioning xmlns="urn:wildfly:server-provisioning:1.0">
+    <feature-packs>
+        <feature-pack groupId="org.wildfly" artifactId="wildfly-servlet-feature-pack" version="${project.version}"/>
+    </feature-packs>
+</server-provisioning>
diff --git a/web-dist/assembly-src.xml → servlet-dist/assembly-src.xml b/web-dist/assembly-src.xml → servlet-dist/assembly-src.xml
diff --git a/web-dist/assembly.xml → servlet-dist/assembly.xml b/web-dist/assembly.xml → servlet-dist/assembly.xml