Move configuration of Weekly Maintenance Tasks to /apps/settings

Remove obsolete ui.content and ui.apps.structure modules This closes #225
valtech · Nov 22, 2023 · 34fe873 · 34fe873
1 parent 891f68c
commit 34fe873
Show file tree

Hide file tree

Showing 25 changed files with 2 additions and 295 deletions.
diff --git a/complete-cloud/pom.xml b/complete-cloud/pom.xml
@@ -58,10 +58,6 @@
                             <groupId>de.valtech.aecu</groupId>
                             <artifactId>aecu.ui.apps</artifactId>
                         </embedded>
-                        <embedded>
-                            <groupId>de.valtech.aecu</groupId>
-                            <artifactId>aecu.ui.content</artifactId>
-                        </embedded>
                     </embeddeds>
                 </configuration>
             </plugin>

diff --git a/complete/pom.xml b/complete/pom.xml
@@ -44,11 +44,6 @@
                             <artifactId>aecu.ui.apps</artifactId>
                             <filter>true</filter>
                         </subPackage>
-                        <subPackage>
-                            <groupId>de.valtech.aecu</groupId>
-                            <artifactId>aecu.ui.content</artifactId>
-                            <filter>true</filter>
-                        </subPackage>
                         <subPackage>
                             <groupId>de.valtech.aecu</groupId>
                             <artifactId>aecu.oak.index</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -13,9 +13,7 @@
         <module>api</module>
         <module>core</module>
         <module>cloud.startup.hook</module>
-        <module>ui.apps.structure</module>
         <module>ui.apps</module>
-        <module>ui.content</module>
         <module>oak.index</module>
         <module>complete</module>
         <module>complete-cloud</module>

diff --git a/ui.apps.structure/.gitignore b/ui.apps.structure/.gitignore
diff --git a/ui.apps.structure/pom.xml b/ui.apps.structure/pom.xml
diff --git a/ui.apps/pom.xml b/ui.apps/pom.xml
@@ -29,7 +29,7 @@
                     <validatorsSettings>
                         <jackrabbit-filter>
                             <options>
-                                <validRoots>/apps,/apps/valtech,/apps/cq/core/content/nav/tools,/apps/settings/granite/operations/hc</validRoots>
+                                <validRoots>/apps,/apps/valtech,/apps/cq/core/content/nav/tools,/apps/settings/granite/operations/hc,/apps/settings/granite/operations/maintenance/granite_weekly</validRoots>
                             </options>
                         </jackrabbit-filter>
                     </validatorsSettings>

diff --git a/ui.apps/src/main/content/META-INF/vault/filter.xml b/ui.apps/src/main/content/META-INF/vault/filter.xml
@@ -3,4 +3,5 @@
     <filter root="/apps/valtech/aecu"/>
     <filter root="/apps/cq/core/content/nav/tools/aecu"/>
     <filter root="/apps/settings/granite/operations/hc/aecu"/>
+    <filter root="/apps/settings/granite/operations/maintenance/granite_weekly/aecu_history_purge"/>
 </workspaceFilter>
diff --git a/...anite/operations/maintenance/.content.xml → ...anite/operations/maintenance/.content.xml b/...anite/operations/maintenance/.content.xml → ...anite/operations/maintenance/.content.xml
diff --git a/...s/maintenance/granite_weekly/.content.xml → ...s/maintenance/granite_weekly/.content.xml b/...s/maintenance/granite_weekly/.content.xml → ...s/maintenance/granite_weekly/.content.xml
diff --git a/...te_weekly/aecu_history_purge/.content.xml → ...te_weekly/aecu_history_purge/.content.xml b/...te_weekly/aecu_history_purge/.content.xml → ...te_weekly/aecu_history_purge/.content.xml
diff --git a/ui.content/pom.xml b/ui.content/pom.xml
diff --git a/ui.content/src/main/.gitignore b/ui.content/src/main/.gitignore
diff --git a/ui.content/src/main/content/META-INF/vault/definition/.content.xml b/ui.content/src/main/content/META-INF/vault/definition/.content.xml
diff --git a/ui.content/src/main/content/META-INF/vault/definition/screenshots/.content.xml b/ui.content/src/main/content/META-INF/vault/definition/screenshots/.content.xml
diff --git a/ui.content/src/main/content/META-INF/vault/definition/screenshots/screenshot1/file b/ui.content/src/main/content/META-INF/vault/definition/screenshots/screenshot1/file
diff --git a/.../src/main/content/META-INF/vault/definition/screenshots/screenshot1/file.dir/.content.xml b/.../src/main/content/META-INF/vault/definition/screenshots/screenshot1/file.dir/.content.xml
diff --git a/ui.content/src/main/content/META-INF/vault/definition/screenshots/screenshot2/file b/ui.content/src/main/content/META-INF/vault/definition/screenshots/screenshot2/file
diff --git a/.../src/main/content/META-INF/vault/definition/screenshots/screenshot2/file.dir/.content.xml b/.../src/main/content/META-INF/vault/definition/screenshots/screenshot2/file.dir/.content.xml
diff --git a/ui.content/src/main/content/META-INF/vault/definition/screenshots/screenshot3/file b/ui.content/src/main/content/META-INF/vault/definition/screenshots/screenshot3/file
diff --git a/.../src/main/content/META-INF/vault/definition/screenshots/screenshot3/file.dir/.content.xml b/.../src/main/content/META-INF/vault/definition/screenshots/screenshot3/file.dir/.content.xml
diff --git a/ui.content/src/main/content/META-INF/vault/definition/thumbnail.png b/ui.content/src/main/content/META-INF/vault/definition/thumbnail.png
diff --git a/ui.content/src/main/content/META-INF/vault/filter.xml b/ui.content/src/main/content/META-INF/vault/filter.xml
diff --git a/ui.content/src/main/content/jcr_root/conf/global/settings/.content.xml b/ui.content/src/main/content/jcr_root/conf/global/settings/.content.xml
diff --git a/ui.content/src/main/content/jcr_root/conf/global/settings/granite/.content.xml b/ui.content/src/main/content/jcr_root/conf/global/settings/granite/.content.xml
diff --git a/ui.content/src/main/content/jcr_root/conf/global/settings/granite/operations/.content.xml b/ui.content/src/main/content/jcr_root/conf/global/settings/granite/operations/.content.xml