diff --git a/ccm-bundle-devel-thorntail/pom.xml b/ccm-bundle-devel-thorntail/pom.xml
index 6178bfbf9..8882c9e6a 100644
--- a/ccm-bundle-devel-thorntail/pom.xml
+++ b/ccm-bundle-devel-thorntail/pom.xml
@@ -123,6 +123,12 @@
             <artifactId>undertow</artifactId>
         </dependency>
         
+        <dependency>
+            <groupId>org.libreccm</groupId>
+            <artifactId>ccm-wildfly</artifactId>
+            <version>7.0.0-SNAPSHOT</version>
+        </dependency>
+        
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
diff --git a/ccm-bundle-devel-wildfly/pom.xml b/ccm-bundle-devel-wildfly/pom.xml
index 3b5274fa5..d8ff7fd71 100644
--- a/ccm-bundle-devel-wildfly/pom.xml
+++ b/ccm-bundle-devel-wildfly/pom.xml
@@ -24,6 +24,12 @@
     <url>http://www.libreccm.org/modules/web/wildfly</url>
     
     <dependencies>
+        <dependency>
+            <groupId>org.libreccm</groupId>
+            <artifactId>ccm-wildfly</artifactId>
+            <version>7.0.0-SNAPSHOT</version>
+        </dependency>
+        
         <dependency>
             <groupId>org.webjars</groupId>
             <artifactId>font-awesome</artifactId>
diff --git a/ccm-core/pom.xml b/ccm-core/pom.xml
index e4b86ea4f..75349003c 100644
--- a/ccm-core/pom.xml
+++ b/ccm-core/pom.xml
@@ -398,6 +398,7 @@
                     <author>true</author>
                     <keywords>true</keywords>
                     <failOnError>false</failOnError>
+                    <additionalOptions>--frames</additionalOptions>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/ccm-wildfly/pom.xml b/ccm-wildfly/pom.xml
new file mode 100644
index 000000000..24c449f77
--- /dev/null
+++ b/ccm-wildfly/pom.xml
@@ -0,0 +1,173 @@
+<?xml version="1.0"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    
+    <modelVersion>4.0.0</modelVersion>
+    
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <timestamp>${maven.build.timestamp}</timestamp>
+        <maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ss'Z'Z</maven.build.timestamp.format>
+    </properties>
+    
+    <parent>
+        <groupId>org.libreccm</groupId>
+        <artifactId>libreccm-parent</artifactId>
+        <version>7.0.0-SNAPSHOT</version>
+    </parent>
+    
+    <groupId>org.libreccm</groupId>
+    <artifactId>ccm-wildfly</artifactId>
+    <version>7.0.0-SNAPSHOT</version>
+    <name>CCM Wildfly Integration</name>
+    <description>
+        Wildfly specific stuff for CCM.
+    </description>
+    
+    <url>http://maven.apache.org</url>
+    
+    <licenses>
+        <license>
+            <name>Lesser GPL 2.1</name>
+            <url>http://www.gnu.org/licenses/old-licenses/lgpl-2.1</url>
+        </license>
+    </licenses>
+    
+    <dependencies>
+        <dependency>
+            <groupId>javax.mvc</groupId>
+            <artifactId>javax.mvc-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.krazo</groupId>
+            <artifactId>krazo-resteasy</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    
+    <build>
+        <finalName>ccm-wildfly</finalName>
+        
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                    <optimize>true</optimize>
+                    <debug>true</debug>
+                    <encoding>${project.build.sourceEncoding}</encoding>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <groups>org.libreccm.tests.categories.UnitTest</groups>
+                    <trimStackTrace>false</trimStackTrace>
+                </configuration>
+            </plugin>
+        </plugins>
+        
+    </build>
+    
+    <reporting>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <configuration>
+                    <detectLinks>false</detectLinks>
+                    <detectJavaApiLinks>false</detectJavaApiLinks>
+                    <show>private</show>
+                    <docfilessubdirs>true</docfilessubdirs>
+                    <charset>UTF-8</charset>
+                    <encoding>UTF-8</encoding>
+                    <docencoding>UTF-8</docencoding>
+                    <breakiterator>true</breakiterator>
+                    <version>true</version>
+                    <author>true</author>
+                    <keywords>true</keywords>
+                    <failOnError>false</failOnError>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jxr-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-report-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+            </plugin>
+
+            <plugin>
+                <groupId>com.github.spotbugs</groupId>
+                <artifactId>spotbugs-maven-plugin</artifactId>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-pmd-plugin</artifactId>
+                <configuration>
+                    <linkXref>true</linkXref>
+                    <sourceEncoding>utf-8</sourceEncoding>
+                    <targetJdk>1.8</targetJdk>
+                    <!--                    <rulesets>
+                        <ruleset>/rulesets/java/basic.xml</ruleset>
+                        <ruleset>/rulesets/java/braces.xml</ruleset>
+                        <ruleset>/rulesets/java/clone.xml</ruleset>
+                        <ruleset>/rulesets/java/codesize.xml</ruleset>
+                        <ruleset>/rulesets/java/design.xml</ruleset>
+                        <ruleset>/rulesets/java/empty.xml</ruleset>
+                        <ruleset>/rulesets/java/finalizers.xml</ruleset>
+                        <ruleset>/rulesets/java/imports.xml</ruleset>
+                        <ruleset>/rulesets/java/junit.xml</ruleset>
+                        <ruleset>/rulesets/java/naming.xml</ruleset>
+                        <ruleset>/rulesets/java/optimizations.xml</ruleset>
+                        <ruleset>/rulesets/java/strictexception.xml</ruleset>
+                        <ruleset>/rulesets/java/strings.xml</ruleset>
+                        <ruleset>/rulesets/java/sunsecure.xml</ruleset>
+                        <ruleset>/rulesets/java/typeresolution.xml</ruleset>
+                        <ruleset>/rulesets/java/unnecessary.xml</ruleset>
+                        <ruleset>/rulesets/java/unusedcode.xml</ruleset>
+                    </rulesets>-->
+                </configuration>
+            </plugin>
+            <!--<plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>javancss-maven-plugin</artifactId>
+            </plugin>-->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-project-info-reports-plugin</artifactId>
+                <reportSets>
+                    <reportSet>
+                        <reports>
+                            <report>dependencies</report>
+                            <!--<report>project-team</report>
+                            <report>mailing-list</report>
+                            <report>cim</report>
+                            <report>issue-tracking</report>-->
+                            <report>licenses</report>
+                            <!--<report>scm</report>-->
+                        </reports>
+                    </reportSet>
+                </reportSets>
+                <configuration>
+                    <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
+                </configuration>
+            </plugin>
+        </plugins>
+    </reporting>
+    
+</project>
diff --git a/pom.xml b/pom.xml
index e691dcc52..484336ed1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -95,8 +95,8 @@
         <module>ccm-cms-archetype-contenttype</module>
         
         <!--<module>ccm-cms-js</module>-->
-        
-    </modules>
+    <module>ccm-wildfly</module>
+  </modules>
 
     <reporting>
         <excludeDefaults>true</excludeDefaults>
@@ -532,6 +532,38 @@
                 <artifactId>jaxb-runtime</artifactId>
                 <version>2.4.0-b180830.0438</version>
             </dependency>
+            
+            <!--
+                Jakarta MVC is a thin layer ontop of JAX-RS providing a
+                MVC framework for Jakarta EE: https://www.mvc-spec.org
+                
+                The reference implementation Krazo is available for
+                all major application servers. Krazo all provides several 
+                extensions for template engines. 
+            -->
+            <dependency>
+                <groupId>javax.mvc</groupId>
+                <artifactId>javax.mvc-api</artifactId>
+                <version>1.0.0</version>
+            </dependency>
+            <!-- Krazo for Glassfish/Papaya -->
+            <dependency>
+                <groupId>org.eclipse.krazo</groupId>
+                <artifactId>krazo-jersey</artifactId>
+                <version>1.1.0-M1</version>
+            </dependency>
+            <!-- Krazo for Wildfly and JBoss EAP -->
+            <dependency>
+                <groupId>org.eclipse.krazo</groupId>
+                <artifactId>krazo-resteasy</artifactId>
+                <version>1.1.0-M1</version>
+            </dependency>
+            <!-- Krazo support for Freemarker -->
+            <dependency>
+                <groupId>org.eclipse.krazo.ext</groupId>
+                <artifactId>krazo-freemarker</artifactId>
+                <version>1.1.0-M1</version>
+            </dependency>
 
             <!-- Shiro lib for security stuff -->
             <dependency>
@@ -912,4 +944,4 @@
         </dependencies>
     </dependencyManagement>
 
-</project>
+</project>
\ No newline at end of file