From e6240e458cc449bc39da17f86c148f913f1c9f6a Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Sun, 13 Sep 2020 16:50:49 +0200
Subject: [PATCH] Integration of EE MVC

Former-commit-id: 8b06dc6cb268d9f80f8ac27f8d1167c2cc7fd453
---
 ccm-bundle-devel-wildfly/pom.xml              | 19 +++++++++++++++++++
 .../src/main/webapp/WEB-INF/faces-config.xml  |  3 +++
 ccm-core/pom.xml                              | 15 +++++++++++++++
 ccm-wildfly/pom.xml                           |  4 ++++
 .../org/libreccm/wildfly/LibreCcmWildfly.java | 17 +++++++++++++++++
 pom.xml                                       |  9 +++++++++
 6 files changed, 67 insertions(+)
 create mode 100644 ccm-wildfly/src/main/java/org/libreccm/wildfly/LibreCcmWildfly.java

diff --git a/ccm-bundle-devel-wildfly/pom.xml b/ccm-bundle-devel-wildfly/pom.xml
index d8ff7fd71..fe0fefee9 100644
--- a/ccm-bundle-devel-wildfly/pom.xml
+++ b/ccm-bundle-devel-wildfly/pom.xml
@@ -208,6 +208,22 @@
                                 <include>assets/</include>
                             </includes>
                         </overlay>
+                        <overlay>
+                            <groupId>org.libreccm</groupId>
+                            <artifactId>ccm-core</artifactId>
+                            <type>jar</type>
+                            <includes>
+                                <include>views/</include>
+                            </includes>
+                        </overlay>
+                        <overlay>
+                            <groupId>org.libreccm</groupId>
+                            <artifactId>ccm-core</artifactId>
+                            <type>jar</type>
+                            <includes>
+                                <include>resources/</include>
+                            </includes>
+                        </overlay>
                         <overlay>
                             <groupId>org.librecms</groupId>
                             <artifactId>ccm-cms</artifactId>
@@ -250,6 +266,9 @@
                 <configuration>
                     <skip>false</skip>
                     <propertiesFile>${project.basedir}/wildfly.properties</propertiesFile>
+                    <java-opts>
+                        <java-opt>-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8787</java-opt>
+                    </java-opts>
                 </configuration>
             </plugin>
 
diff --git a/ccm-bundle-devel-wildfly/src/main/webapp/WEB-INF/faces-config.xml b/ccm-bundle-devel-wildfly/src/main/webapp/WEB-INF/faces-config.xml
index 59d6547c7..a1999da81 100644
--- a/ccm-bundle-devel-wildfly/src/main/webapp/WEB-INF/faces-config.xml
+++ b/ccm-bundle-devel-wildfly/src/main/webapp/WEB-INF/faces-config.xml
@@ -4,4 +4,7 @@
               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
                                   http://xmlns.jcp.org/xml/ns/javaee/web-facesconfig_2_2.xsd">
+    <application>
+        <resource-handler>org.libreccm.ui.CcmFaceletsResourceHandler</resource-handler>
+    </application>
 </faces-config>
diff --git a/ccm-core/pom.xml b/ccm-core/pom.xml
index 75349003c..1c5e2aae8 100644
--- a/ccm-core/pom.xml
+++ b/ccm-core/pom.xml
@@ -102,6 +102,21 @@
             <scope>provided</scope>
         </dependency>
         
+        <dependency>
+            <groupId>javax.mvc</groupId>
+            <artifactId>javax.mvc-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.krazo</groupId>
+            <artifactId>krazo-core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+         <dependency>
+            <groupId>org.eclipse.krazo.ext</groupId>
+            <artifactId>krazo-freemarker</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        
         <!--
             Flyway framework for database schema migrations
         -->
diff --git a/ccm-wildfly/pom.xml b/ccm-wildfly/pom.xml
index 24c449f77..b52f5806a 100644
--- a/ccm-wildfly/pom.xml
+++ b/ccm-wildfly/pom.xml
@@ -42,6 +42,10 @@
             <groupId>org.eclipse.krazo</groupId>
             <artifactId>krazo-resteasy</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.krazo.ext</groupId>
+            <artifactId>krazo-freemarker</artifactId>
+        </dependency>
         
         <dependency>
             <groupId>junit</groupId>
diff --git a/ccm-wildfly/src/main/java/org/libreccm/wildfly/LibreCcmWildfly.java b/ccm-wildfly/src/main/java/org/libreccm/wildfly/LibreCcmWildfly.java
new file mode 100644
index 000000000..8e156c242
--- /dev/null
+++ b/ccm-wildfly/src/main/java/org/libreccm/wildfly/LibreCcmWildfly.java
@@ -0,0 +1,17 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.libreccm.wildfly;
+
+/**
+ * Does nothing, only reuquired to get the Maven JAR working.
+ * 
+ * To be removed when other classes are added to this module.
+ * 
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+public class LibreCcmWildfly {
+    
+}
diff --git a/pom.xml b/pom.xml
index 484336ed1..017bab17b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -546,6 +546,15 @@
                 <artifactId>javax.mvc-api</artifactId>
                 <version>1.0.0</version>
             </dependency>
+            <!-- 
+                Krazo core dependency. Should be used with the `provided` scope 
+                if a module needs access to internals of Krazo
+            -->
+            <dependency>
+                <groupId>org.eclipse.krazo</groupId>
+                <artifactId>krazo-core</artifactId>
+                <version>1.1.0-M1</version>
+            </dependency>
             <!-- Krazo for Glassfish/Papaya -->
             <dependency>
                 <groupId>org.eclipse.krazo</groupId>