From cd71e474595a1ee5b739c71df920ac1ffa702a36 Mon Sep 17 00:00:00 2001
From: Olivier Lamy <oliver.lamy@gmail.com>
Date: Wed, 15 Sep 2021 21:23:55 +1000
Subject: [PATCH] filtering of mod files using directory config template

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
---
 .../jetty-gcloud-session-manager/pom.xml      | 19 +-----
 .../src/main/assembly/config.xml              |  2 +-
 .../infinispan-embedded-query/pom.xml         | 19 +-----
 .../src/main/assembly/config.xml              |  2 +-
 .../infinispan-remote-query/pom.xml           | 19 +-----
 .../src/main/assembly/config.xml              |  2 +-
 jetty-infinispan/infinispan-remote/pom.xml    | 20 +-----
 .../src/main/assembly/config.xml              |  2 +-
 .../jetty-unixsocket-server/pom.xml           | 21 +-----
 .../src/main/assembly/config.xml              |  4 +-
 pom.xml                                       | 64 +++++++++++++++++--
 11 files changed, 71 insertions(+), 103 deletions(-)

diff --git a/jetty-gcloud/jetty-gcloud-session-manager/pom.xml b/jetty-gcloud/jetty-gcloud-session-manager/pom.xml
index 59664838eddb..6282b856208a 100644
--- a/jetty-gcloud/jetty-gcloud-session-manager/pom.xml
+++ b/jetty-gcloud/jetty-gcloud-session-manager/pom.xml
@@ -140,7 +140,7 @@
             <configuration>
               <target>
                 <concat destfile="${project.build.directory}/gcloud-datastore.mod">
-                  <fileset file="src/main/config-template/modules/gcloud-datastore.mod" />
+                  <fileset file="${project.build.directory}/jetty-config-files/modules/gcloud-datastore.mod" />
                   <fileset file="${project.build.directory}/deps.txt" />
                 </concat>
               </target>
@@ -148,23 +148,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-            <configuration>
-              <descriptors>
-                <descriptor>src/main/assembly/config.xml</descriptor>
-              </descriptors>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 
diff --git a/jetty-gcloud/jetty-gcloud-session-manager/src/main/assembly/config.xml b/jetty-gcloud/jetty-gcloud-session-manager/src/main/assembly/config.xml
index 29e5be1228af..5b9f812e8004 100644
--- a/jetty-gcloud/jetty-gcloud-session-manager/src/main/assembly/config.xml
+++ b/jetty-gcloud/jetty-gcloud-session-manager/src/main/assembly/config.xml
@@ -7,7 +7,7 @@
   </formats>
   <fileSets>
     <fileSet>
-      <directory>src/main/config-template</directory>
+      <directory>target/jetty-config-files</directory>
       <outputDirectory></outputDirectory>
       <includes>
         <include>**</include>
diff --git a/jetty-infinispan/infinispan-embedded-query/pom.xml b/jetty-infinispan/infinispan-embedded-query/pom.xml
index 9ed4d852e390..7dfb812127b9 100644
--- a/jetty-infinispan/infinispan-embedded-query/pom.xml
+++ b/jetty-infinispan/infinispan-embedded-query/pom.xml
@@ -60,7 +60,7 @@
             <configuration>
               <target>
                 <concat destfile="${project.build.directory}/infinispan-embedded-query-libs.mod">
-                  <fileset file="src/main/config-template/modules/sessions/infinispan/embedded/infinispan-embedded-query-libs.mod" />
+                  <fileset file="${project.build.directory}/jetty-config-files/modules/sessions/infinispan/embedded/infinispan-embedded-query-libs.mod" />
                   <fileset file="${project.build.directory}/deps.txt" />
                 </concat>
               </target>
@@ -68,23 +68,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-            <configuration>
-              <descriptors>
-                <descriptor>src/main/assembly/config.xml</descriptor>
-              </descriptors>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
   <dependencies>
diff --git a/jetty-infinispan/infinispan-embedded-query/src/main/assembly/config.xml b/jetty-infinispan/infinispan-embedded-query/src/main/assembly/config.xml
index d9db9a74ef21..499e2b0f61f9 100644
--- a/jetty-infinispan/infinispan-embedded-query/src/main/assembly/config.xml
+++ b/jetty-infinispan/infinispan-embedded-query/src/main/assembly/config.xml
@@ -7,7 +7,7 @@
   </formats>
   <fileSets>
     <fileSet>
-      <directory>src/main/config-template</directory>
+      <directory>target/jetty-config-files</directory>
       <outputDirectory></outputDirectory>
       <includes>
         <include>**</include>
diff --git a/jetty-infinispan/infinispan-remote-query/pom.xml b/jetty-infinispan/infinispan-remote-query/pom.xml
index f112ee9e748b..954dd0e8a3e4 100644
--- a/jetty-infinispan/infinispan-remote-query/pom.xml
+++ b/jetty-infinispan/infinispan-remote-query/pom.xml
@@ -61,7 +61,7 @@
             <configuration>
               <target>
                 <concat destfile="${project.build.directory}/infinispan-remote-query-libs.mod">
-                  <fileset file="src/main/config-template/modules/sessions/infinispan/remote/infinispan-remote-query-libs.mod" />
+                  <fileset file="${project.build.directory}/jetty-config-files/modules/sessions/infinispan/remote/infinispan-remote-query-libs.mod" />
                   <fileset file="${project.build.directory}/deps.txt" />
                 </concat>
               </target>
@@ -69,23 +69,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-            <configuration>
-              <descriptors>
-                <descriptor>src/main/assembly/config.xml</descriptor>
-              </descriptors>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
diff --git a/jetty-infinispan/infinispan-remote-query/src/main/assembly/config.xml b/jetty-infinispan/infinispan-remote-query/src/main/assembly/config.xml
index 270dcfad3825..fd4d89a9b6be 100644
--- a/jetty-infinispan/infinispan-remote-query/src/main/assembly/config.xml
+++ b/jetty-infinispan/infinispan-remote-query/src/main/assembly/config.xml
@@ -7,7 +7,7 @@
   </formats>
   <fileSets>
     <fileSet>
-      <directory>src/main/config-template</directory>
+      <directory>target/jetty-config-files</directory>
       <outputDirectory></outputDirectory>
       <includes>
         <include>**</include>
diff --git a/jetty-infinispan/infinispan-remote/pom.xml b/jetty-infinispan/infinispan-remote/pom.xml
index 4e471c141825..852acc8f4179 100644
--- a/jetty-infinispan/infinispan-remote/pom.xml
+++ b/jetty-infinispan/infinispan-remote/pom.xml
@@ -62,7 +62,7 @@
             <configuration>
               <target>
                 <concat destfile="${project.build.directory}/infinispan-remote-libs.mod">
-                  <fileset file="src/main/config-template/modules/sessions/infinispan/remote/infinispan-remote-libs.mod" />
+                  <fileset file="${project.build.directory}/jetty-config-files/modules/sessions/infinispan/remote/infinispan-remote-libs.mod" />
                   <fileset file="${project.build.directory}/deps.txt" />
                 </concat>
               </target>
@@ -70,24 +70,6 @@
           </execution>
         </executions>
       </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-            <configuration>
-              <descriptors>
-                <descriptor>src/main/assembly/config.xml</descriptor>
-              </descriptors>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
   <dependencies>
diff --git a/jetty-infinispan/infinispan-remote/src/main/assembly/config.xml b/jetty-infinispan/infinispan-remote/src/main/assembly/config.xml
index 802f815d6aa5..a678d79f018b 100644
--- a/jetty-infinispan/infinispan-remote/src/main/assembly/config.xml
+++ b/jetty-infinispan/infinispan-remote/src/main/assembly/config.xml
@@ -7,7 +7,7 @@
   </formats>
   <fileSets>
     <fileSet>
-      <directory>src/main/config-template</directory>
+      <directory>target/jetty-config-files</directory>
       <outputDirectory></outputDirectory>
       <includes>
         <include>**</include>
diff --git a/jetty-unixsocket/jetty-unixsocket-server/pom.xml b/jetty-unixsocket/jetty-unixsocket-server/pom.xml
index 10953befda1c..d66a096e389e 100644
--- a/jetty-unixsocket/jetty-unixsocket-server/pom.xml
+++ b/jetty-unixsocket/jetty-unixsocket-server/pom.xml
@@ -76,32 +76,15 @@
                 <replaceregexp file="${project.build.directory}/deps.txt" match=" *(.*):(.*):jar:(.*):.*$" replace="maven://\1/\2/\3|lib/jnr/\2-\3.jar" byline="true" />
                 <replaceregexp file="${project.build.directory}/deps.txt" match="The following files have been resolved:" replace="[files]" />
                 <concat destfile="${project.build.directory}/unixsocket.mod">
-                  <fileset file="src/main/config-template/modules/unixsocket-prefix.mod" />
+                  <fileset file="${project.build.directory}/jetty-config-files/modules/unixsocket-prefix.mod" />
                   <fileset file="${project.build.directory}/deps.txt" />
-                  <fileset file="src/main/config-template/modules/unixsocket-suffix.mod" />
+                  <fileset file="${project.build.directory}/jetty-config-files/modules/unixsocket-suffix.mod" />
                 </concat>
               </target>
             </configuration>
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-            <configuration>
-              <descriptors>
-                <descriptor>src/main/assembly/config.xml</descriptor>
-              </descriptors>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/jetty-unixsocket/jetty-unixsocket-server/src/main/assembly/config.xml b/jetty-unixsocket/jetty-unixsocket-server/src/main/assembly/config.xml
index 3c97242ba281..f4dd8865b05b 100644
--- a/jetty-unixsocket/jetty-unixsocket-server/src/main/assembly/config.xml
+++ b/jetty-unixsocket/jetty-unixsocket-server/src/main/assembly/config.xml
@@ -7,7 +7,7 @@
   </formats>
   <fileSets>
     <fileSet>
-      <directory>src/main/config-template</directory>
+      <directory>${project.build.directory}/jetty-config-files</directory>
       <outputDirectory></outputDirectory>
       <includes>
         <include>**</include>
@@ -18,7 +18,7 @@
       </excludes>
     </fileSet>
     <fileSet>
-      <directory>target</directory>
+      <directory>${project.build.directory}</directory>
       <outputDirectory>modules</outputDirectory>
       <includes>
         <include>unixsocket.mod</include>
diff --git a/pom.xml b/pom.xml
index 1928cf166f6b..fdb3619a36a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1445,11 +1445,6 @@
                     <resource>
                       <directory>src/main/config</directory>
                       <filtering>true</filtering>
-<!--                      <includes>-->
-<!--                        <include>**/*.mod</include>-->
-<!--                        <include>**/.xml</include>-->
-<!--                        <include>**/*.properties</include>-->
-<!--                      </includes>-->
                       <excludes>
                         <exclude>**/*.p12</exclude>
                       </excludes>
@@ -1480,6 +1475,65 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>config-template</id>
+      <activation>
+        <file>
+          <exists>src/main/config-template</exists>
+        </file>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-resources-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>copy-resources</id>
+                <phase>process-resources</phase>
+                <goals>
+                  <goal>copy-resources</goal>
+                </goals>
+                <configuration>
+                  <encoding>UTF-8</encoding>
+                  <useDefaultDelimiters>false</useDefaultDelimiters>
+                  <delimiters>
+                    <delimiter>@</delimiter>
+                  </delimiters>
+                  <outputDirectory>${project.build.directory}/jetty-config-files</outputDirectory>
+                  <resources>
+                    <resource>
+                      <directory>src/main/config-template</directory>
+                      <filtering>true</filtering>
+                      <excludes>
+                        <exclude>**/*.p12</exclude>
+                      </excludes>
+                    </resource>
+                  </resources>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-assembly-plugin</artifactId>
+            <executions>
+              <execution>
+                <phase>package</phase>
+                <goals>
+                  <goal>single</goal>
+                </goals>
+                <configuration>
+                  <descriptors>
+                    <descriptor>src/main/assembly/config.xml</descriptor>
+                  </descriptors>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
     <profile>
       <id>eclipse-release</id>
       <modules>