Extract OSGI configuration to new package ui.config (#3434)

* Extract OSGI configuration to new package ui.config
Adobe-Consulting-Services · Oct 1, 2024 · 3f222f7 · 3f222f7
1 parent d9229bb
commit 3f222f7
Show file tree

Hide file tree

Showing 19 changed files with 363 additions and 5 deletions.
diff --git a/all/pom.xml b/all/pom.xml
@@ -35,7 +35,7 @@
     <artifactId>acs-aem-commons-all</artifactId>
     <name>ACS AEM Commons Container Package (All)</name>
     <description>ACS AEM Commons container content package which delivers acs-aem-commons-ui.apps,
-        acs-aem-commons-ui.content, the OSGi bundle and configuration.
+        acs-aem-commons-ui.content, acs-aem-commons-ui.config and the OSGi bundle.
     </description>
     <packaging>content-package</packaging>
 
@@ -47,6 +47,7 @@
                 <inherited>false</inherited>
                 <configuration>
                     <packageType>container</packageType>
+                    <excludes>**/META-INF/*,**/thumbnail.png</excludes>
                 </configuration>
                 <executions>
                     <execution>
@@ -86,6 +87,13 @@
                                     <filter>true</filter>
                                     <isAllVersionsFilter>true</isAllVersionsFilter>
                                 </embedded>
+                                <embedded>
+                                    <groupId>${project.groupId}</groupId>
+                                    <artifactId>acs-aem-commons-ui.config</artifactId>
+                                    <target>/apps/acs-commons/install</target>
+                                    <filter>true</filter>
+                                    <isAllVersionsFilter>true</isAllVersionsFilter>
+                                </embedded>
                             </embeddeds>
                         </configuration>
                     </execution>
@@ -210,6 +218,13 @@
             <type>zip</type>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>acs-aem-commons-ui.config</artifactId>
+            <version>${project.version}</version>
+            <type>zip</type>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
     <profiles>
@@ -292,6 +307,13 @@
                                             <filter>true</filter>
                                             <isAllVersionsFilter>true</isAllVersionsFilter>
                                         </embedded>
+                                        <embedded>
+                                            <groupId>${project.groupId}</groupId>
+                                            <artifactId>acs-aem-commons-ui.config</artifactId>
+                                            <target>/apps/acs-commons/install</target>
+                                            <filter>true</filter>
+                                            <isAllVersionsFilter>true</isAllVersionsFilter>
+                                        </embedded>
                                     </embeddeds>
                                 </configuration>
                             </execution>

diff --git a/all/src/main/content/META-INF/vault/filter.xml b/all/src/main/content/META-INF/vault/filter.xml
@@ -18,8 +18,5 @@
   -->
 
 <workspaceFilter version="1.0">
-    <filter root="/apps/acs-commons/config"/>
-    <filter root="/apps/acs-commons/config.author"/>
-    <filter root="/apps/acs-commons/config.publish"/>
-    <filter root="/apps/acs-commons/config.rde" type="cleanup"/>
+    <filter root="/apps/acs-commons/install"/>
 </workspaceFilter>
diff --git a/pom.xml b/pom.xml
@@ -943,6 +943,7 @@ Bundle-DocURL: https://adobe-consulting-services.github.io/acs-aem-commons/
         <module>oakpal-checks</module>
         <module>ui.apps</module>
         <module>ui.content</module>
+        <module>ui.config</module>
         <module>all</module>
     </modules>
 </project>
diff --git a/ui.config/.gitignore b/ui.config/.gitignore
@@ -0,0 +1 @@
+/nbactions-autoInstallPackage.xml
diff --git a/ui.config/pom.xml b/ui.config/pom.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ ACS AEM Commons
+  ~
+  ~ Copyright (C) 2013 - 2023 Adobe
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<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/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <!-- ====================================================================== -->
+    <!-- P A R E N T P R O J E C T D E S C R I P T I O N -->
+    <!-- ====================================================================== -->
+    <parent>
+        <groupId>com.adobe.acs</groupId>
+        <artifactId>acs-aem-commons</artifactId>
+        <version>6.7.0-SNAPSHOT</version>
+    </parent>
+
+    <!-- ====================================================================== -->
+    <!-- P R O J E C T D E S C R I P T I O N -->
+    <!-- ====================================================================== -->
+
+    <artifactId>acs-aem-commons-ui.config</artifactId>
+    <name>ACS AEM Commons UI.Config Package</name>
+    <description>ACS AEM Commons content package containing configs.</description>
+    <packaging>content-package</packaging>
+
+    <build>
+
+        <plugins>
+            <plugin>
+                <groupId>org.apache.jackrabbit</groupId>
+                <artifactId>filevault-package-maven-plugin</artifactId>
+                <configuration>
+                    <packageType>container</packageType>
+                </configuration>
+            </plugin>
+
+        </plugins>
+    </build>
+    <profiles>
+        <profile>
+            <id>autoInstallUiConfigPackage</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>com.day.jcr.vault</groupId>
+                        <artifactId>content-package-maven-plugin</artifactId>
+                        <configuration>
+                            <packageFile>${contentPackageFile}</packageFile>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>install-content-package</id>
+                                <phase>install</phase>
+                                <goals>
+                                    <goal>install</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+</project>
diff --git a/ui.config/src/main/content/META-INF/vault/filter.xml b/ui.config/src/main/content/META-INF/vault/filter.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ ACS AEM Commons
+  ~
+  ~ Copyright (C) 2013 - 2023 Adobe
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<workspaceFilter version="1.0">
+    <filter root="/apps/acs-commons/config"/>
+    <filter root="/apps/acs-commons/config.author"/>
+    <filter root="/apps/acs-commons/config.publish"/>
+    <filter root="/apps/acs-commons/config.rde" type="cleanup"/>
+</workspaceFilter>
diff --git a/...monsConsoleAuthoringUIModeFilter.cfg.json → ...monsConsoleAuthoringUIModeFilter.cfg.json b/...monsConsoleAuthoringUIModeFilter.cfg.json → ...monsConsoleAuthoringUIModeFilter.cfg.json
diff --git a/...pl.AcsCommonsConsoleEditorFilter.cfg.json → ...pl.AcsCommonsConsoleEditorFilter.cfg.json b/...pl.AcsCommonsConsoleEditorFilter.cfg.json → ...pl.AcsCommonsConsoleEditorFilter.cfg.json
diff --git a/...be.acs.commons.wcm.impl.QrCodeServlet.xml → ...be.acs.commons.wcm.impl.QrCodeServlet.xml b/...be.acs.commons.wcm.impl.QrCodeServlet.xml → ...be.acs.commons.wcm.impl.QrCodeServlet.xml
diff --git a/...toryInitializer-acs-commons-author.config → ...toryInitializer-acs-commons-author.config b/...toryInitializer-acs-commons-author.config → ...toryInitializer-acs-commons-author.config
diff --git a/...perImpl.amended-acs-commons-author.config → ...perImpl.amended-acs-commons-author.config b/...perImpl.amended-acs-commons-author.config → ...perImpl.amended-acs-commons-author.config
diff --git a/...oryInitializer-acs-commons-publish.config → ...oryInitializer-acs-commons-publish.config b/...oryInitializer-acs-commons-publish.config → ...oryInitializer-acs-commons-publish.config
diff --git a/...uration~package-garbage-collection.config → ...uration~package-garbage-collection.config b/...uration~package-garbage-collection.config → ...uration~package-garbage-collection.config
diff --git a/...ositoryInitializer-acs-commons-all.config → ...ositoryInitializer-acs-commons-all.config b/...ositoryInitializer-acs-commons-all.config → ...ositoryInitializer-acs-commons-all.config
diff --git a/...MapperImpl.amended-acs-commons-all.config → ...MapperImpl.amended-acs-commons-all.config b/...MapperImpl.amended-acs-commons-all.config → ...MapperImpl.amended-acs-commons-all.config
diff --git a/ui.config/src/main/resources/META-INF/COPYRIGHT b/ui.config/src/main/resources/META-INF/COPYRIGHT
@@ -0,0 +1,15 @@
+Copyright 2013 Adobe
+
+Adobe holds the copyright for all the files found in this repository.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.