From 48c69461bdf95fa5eadbc9e3e992fdb3b88dfc34 Mon Sep 17 00:00:00 2001 From: Konrad Windszus Date: Mon, 17 Feb 2020 11:52:16 +0100 Subject: [PATCH] Switch to filevault-package-maven-plugin WIP, using latest SNAPSHOT version and some outstanding issues This closes #2043 --- content/pom.xml | 71 +++----- .../main/content/META-INF/vault/config.xml | 77 -------- .../main/content/META-INF/vault/filter.xml | 2 + .../content/META-INF/vault/properties.xml | 13 -- ...obe.acs.commons.wcm.impl.QrCodeServlet.xml | 0 ...users.impl.EnsureServiceUser-FileFetch.xml | 0 ...rs.impl.EnsureServiceUser-RemoteAssets.xml | 0 ...viceUserMapperImpl.amended-acs-commons.xml | 0 pom.xml | 36 +++- ui.apps/pom.xml | 51 +----- .../main/content/META-INF/vault/config.xml | 93 ---------- .../META-INF/vault/definition/.content.xml | 24 --- .../main/content/META-INF/vault/filter.xml | 4 +- .../main/content/META-INF/vault/nodetypes.cnd | 165 ------------------ .../content/META-INF/vault/privileges.xml | 21 --- .../content/META-INF/vault/properties.xml | 8 - .../content/jcr_root/META-INF/MANIFEST.MF | 3 + .../generic-list-console/.content.xml | 2 - .../configs/paths-list/.content.xml | 0 .../paths-list/_cq_dialog/.content.xml | 0 .../configs/paths-list/paths-list.jsp | 0 ui.content/pom.xml | 52 +----- .../main/content/META-INF/vault/config.xml | 77 -------- .../META-INF/vault/definition/.content.xml | 24 --- .../main/content/META-INF/vault/nodetypes.cnd | 67 ------- .../content/META-INF/vault/privileges.xml | 19 -- .../content/META-INF/vault/properties.xml | 13 -- .../content/jcr_root/META-INF/MANIFEST.MF | 3 + 28 files changed, 78 insertions(+), 747 deletions(-) delete mode 100644 content/src/main/content/META-INF/vault/config.xml delete mode 100644 content/src/main/content/META-INF/vault/properties.xml rename {ui.apps => content}/src/main/content/jcr_root/apps/acs-commons/config.author/com.adobe.acs.commons.wcm.impl.QrCodeServlet.xml (100%) rename {ui.apps => content}/src/main/content/jcr_root/apps/acs-commons/config/com.adobe.acs.commons.users.impl.EnsureServiceUser-FileFetch.xml (100%) rename {ui.apps => content}/src/main/content/jcr_root/apps/acs-commons/config/com.adobe.acs.commons.users.impl.EnsureServiceUser-RemoteAssets.xml (100%) rename {ui.apps => content}/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-acs-commons.xml (100%) delete mode 100644 ui.apps/src/main/content/META-INF/vault/config.xml delete mode 100644 ui.apps/src/main/content/META-INF/vault/definition/.content.xml delete mode 100644 ui.apps/src/main/content/META-INF/vault/nodetypes.cnd delete mode 100644 ui.apps/src/main/content/META-INF/vault/privileges.xml delete mode 100644 ui.apps/src/main/content/META-INF/vault/properties.xml create mode 100644 ui.apps/src/main/content/jcr_root/META-INF/MANIFEST.MF rename {content => ui.apps}/src/main/content/jcr_root/apps/acs-commons/components/utilities/report-builder/configs/paths-list/.content.xml (100%) rename {content => ui.apps}/src/main/content/jcr_root/apps/acs-commons/components/utilities/report-builder/configs/paths-list/_cq_dialog/.content.xml (100%) rename {content => ui.apps}/src/main/content/jcr_root/apps/acs-commons/components/utilities/report-builder/configs/paths-list/paths-list.jsp (100%) delete mode 100644 ui.content/src/main/content/META-INF/vault/config.xml delete mode 100644 ui.content/src/main/content/META-INF/vault/definition/.content.xml delete mode 100644 ui.content/src/main/content/META-INF/vault/nodetypes.cnd delete mode 100644 ui.content/src/main/content/META-INF/vault/privileges.xml delete mode 100644 ui.content/src/main/content/META-INF/vault/properties.xml create mode 100644 ui.content/src/main/content/jcr_root/META-INF/MANIFEST.MF diff --git a/content/pom.xml b/content/pom.xml index 4fe51518e6..d1735bd22d 100644 --- a/content/pom.xml +++ b/content/pom.xml @@ -17,54 +17,24 @@ acs-aem-commons-content ACS AEM Commons Package content-package + ACS AEM Commons container content package which delivers acs-aem-commons-ui.apps and acs-aem-commons-ui.content. - - - src/main/content/jcr_root - - **/.vlt - **/.vltignore - - - - src/main/content/META-INF/vault/definition - ../vault-work/META-INF/vault/definition - - - src/main/content/META-INF/vault - - nodetypes.cnd - privileges.xml - - ../vault-work/META-INF/vault - - - src/main/resources/META-INF - ../vault-work/META-INF - - - - - org.apache.maven.plugins - maven-resources-plugin - - true - - - com.day.jcr.vault - content-package-maven-plugin - true + org.apache.jackrabbit + filevault-package-maven-plugin - adobe/consulting - - ACS AEM Commons container content package which delivers acs-aem-commons-ui.apps and acs-aem-commons-ui.content. - - src/main/content/META-INF/vault/filter.xml - http://${crx.host}:${crx.port}${crx.contextRoot}/crx/packmgr/service.jsp + container + + + acs-aem-commons-bundle + /apps/acs-commons/install + true + true + + @@ -72,16 +42,16 @@ - ${project.groupId} acs-aem-commons-ui.apps - runtime + true + true - ${project.groupId} acs-aem-commons-ui.content - runtime + true + true @@ -96,16 +66,17 @@ ${project.build.finalName}-min - ${project.groupId} acs-aem-commons-ui.apps min true + true ${project.groupId} acs-aem-commons-ui.content min true + true @@ -292,6 +263,12 @@ min provided + + ${project.groupId} + acs-aem-commons-bundle + ${project.version} + provided + diff --git a/content/src/main/content/META-INF/vault/config.xml b/content/src/main/content/META-INF/vault/config.xml deleted file mode 100644 index 941af6c2ed..0000000000 --- a/content/src/main/content/META-INF/vault/config.xml +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/content/src/main/content/META-INF/vault/filter.xml b/content/src/main/content/META-INF/vault/filter.xml index f9330f8183..823e1e6e9b 100644 --- a/content/src/main/content/META-INF/vault/filter.xml +++ b/content/src/main/content/META-INF/vault/filter.xml @@ -1,3 +1,5 @@ + + diff --git a/content/src/main/content/META-INF/vault/properties.xml b/content/src/main/content/META-INF/vault/properties.xml deleted file mode 100644 index f775c92f84..0000000000 --- a/content/src/main/content/META-INF/vault/properties.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - -FileVault Package Properties -1 -0.0.1-SNAPSHOT - -2 -ACS AEM Commons Package -day_internal/consulting -acs-aem-commons-content -/etc/packages/day_internal/consulting/acs-aem-commons-content-0.0.1-SNAPSHOT.zip - diff --git a/ui.apps/src/main/content/jcr_root/apps/acs-commons/config.author/com.adobe.acs.commons.wcm.impl.QrCodeServlet.xml b/content/src/main/content/jcr_root/apps/acs-commons/config.author/com.adobe.acs.commons.wcm.impl.QrCodeServlet.xml similarity index 100% rename from ui.apps/src/main/content/jcr_root/apps/acs-commons/config.author/com.adobe.acs.commons.wcm.impl.QrCodeServlet.xml rename to content/src/main/content/jcr_root/apps/acs-commons/config.author/com.adobe.acs.commons.wcm.impl.QrCodeServlet.xml diff --git a/ui.apps/src/main/content/jcr_root/apps/acs-commons/config/com.adobe.acs.commons.users.impl.EnsureServiceUser-FileFetch.xml b/content/src/main/content/jcr_root/apps/acs-commons/config/com.adobe.acs.commons.users.impl.EnsureServiceUser-FileFetch.xml similarity index 100% rename from ui.apps/src/main/content/jcr_root/apps/acs-commons/config/com.adobe.acs.commons.users.impl.EnsureServiceUser-FileFetch.xml rename to content/src/main/content/jcr_root/apps/acs-commons/config/com.adobe.acs.commons.users.impl.EnsureServiceUser-FileFetch.xml diff --git a/ui.apps/src/main/content/jcr_root/apps/acs-commons/config/com.adobe.acs.commons.users.impl.EnsureServiceUser-RemoteAssets.xml b/content/src/main/content/jcr_root/apps/acs-commons/config/com.adobe.acs.commons.users.impl.EnsureServiceUser-RemoteAssets.xml similarity index 100% rename from ui.apps/src/main/content/jcr_root/apps/acs-commons/config/com.adobe.acs.commons.users.impl.EnsureServiceUser-RemoteAssets.xml rename to content/src/main/content/jcr_root/apps/acs-commons/config/com.adobe.acs.commons.users.impl.EnsureServiceUser-RemoteAssets.xml diff --git a/ui.apps/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-acs-commons.xml b/content/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-acs-commons.xml similarity index 100% rename from ui.apps/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-acs-commons.xml rename to content/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-acs-commons.xml diff --git a/pom.xml b/pom.xml index 78818ed05a..ee74543b47 100644 --- a/pom.xml +++ b/pom.xml @@ -102,10 +102,44 @@ maven-sling-plugin 2.3.8 + + + org.apache.jackrabbit + filevault-package-maven-plugin + 1.1.1-SNAPSHOT + true + + adobe/consulting + src/main/content/META-INF/vault/filter.xml + + + + WARN + + + + + true + + + + + + + org.apache.jackrabbit.vault + vault-validation + 3.4.3-SNAPSHOT + + + + com.day.jcr.vault content-package-maven-plugin - 0.0.24 + 1.0.2 + + http://${crx.host}:${crx.port}${crx.contextRoot}/crx/packmgr/service.jsp + maven-javadoc-plugin diff --git a/ui.apps/pom.xml b/ui.apps/pom.xml index c784379ce5..bb63f02f8a 100644 --- a/ui.apps/pom.xml +++ b/ui.apps/pom.xml @@ -17,62 +17,20 @@ acs-aem-commons-ui.apps ACS AEM Commons UI.Apps Package content-package + ACS AEM Commons content package containing code (/apps). - - - src/main/content/jcr_root - - **/.vlt - **/.vltignore - - - - src/main/content/META-INF/vault/definition - ../vault-work/META-INF/vault/definition - - - src/main/content/META-INF/vault - - nodetypes.cnd - privileges.xml - - ../vault-work/META-INF/vault - - - src/main/resources/META-INF - ../vault-work/META-INF - - - org.apache.maven.plugins - maven-resources-plugin + org.apache.jackrabbit + filevault-package-maven-plugin - true - - - - - com.day.jcr.vault - content-package-maven-plugin - true - - adobe/consulting + application - ACS AEM Commons content package containing code (/apps). merge - src/main/content/META-INF/vault/filter.xml - - - ${project.groupId} - acs-aem-commons-bundle - /apps/acs-commons/install - - day/cq60/product @@ -80,7 +38,6 @@ [6.3.64,) - http://${crx.host}:${crx.port}${crx.contextRoot}/crx/packmgr/service.jsp diff --git a/ui.apps/src/main/content/META-INF/vault/config.xml b/ui.apps/src/main/content/META-INF/vault/config.xml deleted file mode 100644 index b525f1c5f3..0000000000 --- a/ui.apps/src/main/content/META-INF/vault/config.xml +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ui.apps/src/main/content/META-INF/vault/definition/.content.xml b/ui.apps/src/main/content/META-INF/vault/definition/.content.xml deleted file mode 100644 index a90ddd7bd5..0000000000 --- a/ui.apps/src/main/content/META-INF/vault/definition/.content.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - diff --git a/ui.apps/src/main/content/META-INF/vault/filter.xml b/ui.apps/src/main/content/META-INF/vault/filter.xml index 259eb3782a..c7cfd295ac 100644 --- a/ui.apps/src/main/content/META-INF/vault/filter.xml +++ b/ui.apps/src/main/content/META-INF/vault/filter.xml @@ -11,10 +11,12 @@ + + - + diff --git a/ui.apps/src/main/content/META-INF/vault/nodetypes.cnd b/ui.apps/src/main/content/META-INF/vault/nodetypes.cnd deleted file mode 100644 index b29ec0be48..0000000000 --- a/ui.apps/src/main/content/META-INF/vault/nodetypes.cnd +++ /dev/null @@ -1,165 +0,0 @@ -<'sling'='http://sling.apache.org/jcr/sling/1.0'> -<'nt'='http://www.jcp.org/jcr/nt/1.0'> -<'cq'='http://www.day.com/jcr/cq/1.0'> -<'mix'='http://www.jcp.org/jcr/mix/1.0'> -<'jcr'='http://www.jcp.org/jcr/1.0'> - -[sling:Folder] > nt:folder - - * (undefined) multiple - - * (undefined) - + * (nt:base) = sling:Folder version - -[sling:ResourceSuperType] - mixin - - sling:resourceSuperType (string) - -[sling:OsgiConfig] > nt:hierarchyNode, nt:unstructured - -[cq:InplaceEditingConfig] > nt:unstructured - orderable - - editorType (string) - - configPath (string) - - active (boolean) - + config (nt:unstructured) = nt:unstructured - -[cq:EditListenersConfig] - - afteredit (string) - - aftermove (string) - - afterremove (string) - - afterinsert (string) - - * (undefined) - - afterdelete (string) - - * (undefined) multiple - - aftercreate (string) - + * (nt:base) = nt:base multiple version - -[cq:EditConfig] > nt:hierarchyNode, nt:unstructured - orderable - - cq:dialogMode (string) < 'auto', 'floating', 'inline' - - cq:emptyText (string) - - cq:layout (string) < 'editbar', 'rollover', 'auto' - - cq:inherit (boolean) - - cq:actions (string) multiple - + cq:inplaceEditing (cq:InplaceEditingConfig) = cq:InplaceEditingConfig - + cq:actionConfigs (nt:base) = nt:unstructured - + cq:listeners (nt:base) = cq:EditListenersConfig - + cq:formParameters (nt:base) = nt:unstructured - + cq:dropTargets (nt:base) = nt:unstructured - -[cq:Component] > mix:title, nt:folder, sling:ResourceSuperType - - * (undefined) - - allowedChildren (string) multiple - - dialogPath (string) - - * (undefined) multiple - - cq:isContainer (boolean) - - cq:noDecoration (boolean) - - cq:cellName (string) - - allowedParents (string) multiple - - componentGroup (string) - + cq:childEditConfig (cq:EditConfig) = cq:EditConfig - + design_dialog (nt:base) = nt:unstructured - + * (nt:base) = nt:base multiple version - + cq:infoProviders (nt:base) = nt:unstructured - + virtual (nt:base) = sling:Folder - + dialog (nt:base) = nt:unstructured - + cq:htmlTag (nt:base) = nt:unstructured - + cq:editConfig (cq:EditConfig) = cq:EditConfig - + icon.png (nt:file) - + thumbnail.png (nt:file) - -[cq:Widget] > nt:unstructured - orderable - - name (string) - - xtype (string) - - title (string) - + items (nt:base) = cq:WidgetCollection - -[cq:Dialog] > cq:Widget - orderable - -[cq:WidgetCollection] > nt:unstructured - orderable - + * (cq:Widget) = cq:Widget - -[cq:DropTargetConfig] > nt:unstructured - orderable - - propertyName (string) - - accept (string) multiple - - groups (string) multiple - + parameters (nt:base) = nt:unstructured - -[cq:ClientLibraryFolder] > sling:Folder - - dependencies (string) multiple - - categories (string) multiple - - embed (string) multiple - - channels (string) multiple - -[cq:Panel] > cq:Widget - orderable - -[cq:TabPanel] > cq:Panel - orderable - - activeTab (long) - -[cq:Template] > mix:title, nt:hierarchyNode - - allowedParents (string) multiple - - allowedChildren (string) multiple - - ranking (long) - - * (undefined) multiple - - * (undefined) - + * (nt:base) = nt:base multiple version - + icon.png (nt:file) - + thumbnail.png (nt:file) - + workflows (nt:base) - + jcr:content (nt:base) - -[cq:Page] > nt:hierarchyNode - orderable primaryitem jcr:content - + * (nt:base) = nt:base version - + jcr:content (nt:base) = nt:unstructured - -[sling:VanityPath] - mixin - - sling:vanityPath (string) multiple - - sling:redirect (boolean) - - sling:vanityOrder (long) - - sling:redirectStatus (long) - -[sling:Resource] - mixin - - sling:resourceType (string) - -[cq:ReplicationStatus] - mixin - - cq:lastReplicatedBy (string) ignore - - cq:lastPublished (date) ignore - - cq:lastReplicationStatus (string) ignore - - cq:lastPublishedBy (string) ignore - - cq:lastReplicationAction (string) ignore - - cq:lastReplicated (date) ignore - -[cq:Taggable] - mixin - - cq:tags (string) multiple - -[cq:OwnerTaggable] > cq:Taggable - mixin - -[cq:PageContent] > cq:OwnerTaggable, cq:ReplicationStatus, mix:created, mix:title, nt:unstructured, sling:Resource, sling:VanityPath - orderable - - pageTitle (string) - - cq:lastModified (date) - - jcr:language (string) - - offTime (date) - - cq:lastModifiedBy (string) - - hideInNav (boolean) - - cq:designPath (string) - - cq:template (string) - - onTime (date) - - navTitle (string) - - cq:allowedTemplates (string) multiple - -[sling:OrderedFolder] > sling:Folder - orderable - + * (nt:base) = sling:OrderedFolder version - diff --git a/ui.apps/src/main/content/META-INF/vault/privileges.xml b/ui.apps/src/main/content/META-INF/vault/privileges.xml deleted file mode 100644 index ad10fa31ef..0000000000 --- a/ui.apps/src/main/content/META-INF/vault/privileges.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/ui.apps/src/main/content/META-INF/vault/properties.xml b/ui.apps/src/main/content/META-INF/vault/properties.xml deleted file mode 100644 index 2ff125a5dc..0000000000 --- a/ui.apps/src/main/content/META-INF/vault/properties.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - -FileVault Package Properties -2 -admin -2019-09-07T17:34:57.490-05:00 - diff --git a/ui.apps/src/main/content/jcr_root/META-INF/MANIFEST.MF b/ui.apps/src/main/content/jcr_root/META-INF/MANIFEST.MF new file mode 100644 index 0000000000..5e9495128c --- /dev/null +++ b/ui.apps/src/main/content/jcr_root/META-INF/MANIFEST.MF @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + diff --git a/ui.apps/src/main/content/jcr_root/apps/acs-commons/components/utilities/generic-list-console/.content.xml b/ui.apps/src/main/content/jcr_root/apps/acs-commons/components/utilities/generic-list-console/.content.xml index e76f1885d1..3d9b2fa2f2 100644 --- a/ui.apps/src/main/content/jcr_root/apps/acs-commons/components/utilities/generic-list-console/.content.xml +++ b/ui.apps/src/main/content/jcr_root/apps/acs-commons/components/utilities/generic-list-console/.content.xml @@ -278,10 +278,8 @@ sling:resourceType="granite/ui/components/coral/foundation/panel/railpanel"/> - - \ No newline at end of file diff --git a/content/src/main/content/jcr_root/apps/acs-commons/components/utilities/report-builder/configs/paths-list/.content.xml b/ui.apps/src/main/content/jcr_root/apps/acs-commons/components/utilities/report-builder/configs/paths-list/.content.xml similarity index 100% rename from content/src/main/content/jcr_root/apps/acs-commons/components/utilities/report-builder/configs/paths-list/.content.xml rename to ui.apps/src/main/content/jcr_root/apps/acs-commons/components/utilities/report-builder/configs/paths-list/.content.xml diff --git a/content/src/main/content/jcr_root/apps/acs-commons/components/utilities/report-builder/configs/paths-list/_cq_dialog/.content.xml b/ui.apps/src/main/content/jcr_root/apps/acs-commons/components/utilities/report-builder/configs/paths-list/_cq_dialog/.content.xml similarity index 100% rename from content/src/main/content/jcr_root/apps/acs-commons/components/utilities/report-builder/configs/paths-list/_cq_dialog/.content.xml rename to ui.apps/src/main/content/jcr_root/apps/acs-commons/components/utilities/report-builder/configs/paths-list/_cq_dialog/.content.xml diff --git a/content/src/main/content/jcr_root/apps/acs-commons/components/utilities/report-builder/configs/paths-list/paths-list.jsp b/ui.apps/src/main/content/jcr_root/apps/acs-commons/components/utilities/report-builder/configs/paths-list/paths-list.jsp similarity index 100% rename from content/src/main/content/jcr_root/apps/acs-commons/components/utilities/report-builder/configs/paths-list/paths-list.jsp rename to ui.apps/src/main/content/jcr_root/apps/acs-commons/components/utilities/report-builder/configs/paths-list/paths-list.jsp diff --git a/ui.content/pom.xml b/ui.content/pom.xml index 0ba4f3a561..0e0cd18243 100644 --- a/ui.content/pom.xml +++ b/ui.content/pom.xml @@ -17,62 +17,18 @@ acs-aem-commons-ui.content ACS AEM Commons UI.Content Package content-package + ACS AEM Commons content package containing content and configuration. - - - src/main/content/jcr_root - - **/.vlt - **/.vltignore - - - - src/main/content/META-INF/vault/definition - ../vault-work/META-INF/vault/definition - - - src/main/content/META-INF/vault - - nodetypes.cnd - privileges.xml - - ../vault-work/META-INF/vault - - - src/main/resources/META-INF - ../vault-work/META-INF - - - - org.apache.maven.plugins - maven-resources-plugin - - true - - - - - com.day.jcr.vault - content-package-maven-plugin - true + org.apache.jackrabbit + filevault-package-maven-plugin - adobe/consulting - src/main/content/META-INF/vault/filter.xml + content - ACS AEM Commons content package containing content and configuration. merge - - - adobe/consulting - acs-aem-commons-ui.apps - ${project.version} - - - http://${crx.host}:${crx.port}${crx.contextRoot}/crx/packmgr/service.jsp diff --git a/ui.content/src/main/content/META-INF/vault/config.xml b/ui.content/src/main/content/META-INF/vault/config.xml deleted file mode 100644 index 941af6c2ed..0000000000 --- a/ui.content/src/main/content/META-INF/vault/config.xml +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 deleted file mode 100644 index a90ddd7bd5..0000000000 --- a/ui.content/src/main/content/META-INF/vault/definition/.content.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - diff --git a/ui.content/src/main/content/META-INF/vault/nodetypes.cnd b/ui.content/src/main/content/META-INF/vault/nodetypes.cnd deleted file mode 100644 index 83efbdaec9..0000000000 --- a/ui.content/src/main/content/META-INF/vault/nodetypes.cnd +++ /dev/null @@ -1,67 +0,0 @@ -<'sling'='http://sling.apache.org/jcr/sling/1.0'> -<'nt'='http://www.jcp.org/jcr/nt/1.0'> -<'cq'='http://www.day.com/jcr/cq/1.0'> -<'mix'='http://www.jcp.org/jcr/mix/1.0'> -<'jcr'='http://www.jcp.org/jcr/1.0'> - -[sling:Folder] > nt:folder - - * (undefined) multiple - - * (undefined) - + * (nt:base) = sling:Folder version - -[cq:ClientLibraryFolder] > sling:Folder - - dependencies (string) multiple - - categories (string) multiple - - embed (string) multiple - - channels (string) multiple - -[cq:Taggable] - mixin - - cq:tags (string) multiple - -[cq:OwnerTaggable] > cq:Taggable - mixin - -[cq:ReplicationStatus] - mixin - - cq:lastReplicatedBy (string) ignore - - cq:lastPublished (date) ignore - - cq:lastReplicationStatus (string) ignore - - cq:lastPublishedBy (string) ignore - - cq:lastReplicationAction (string) ignore - - cq:lastReplicated (date) ignore - -[sling:Resource] - mixin - - sling:resourceType (string) - -[sling:VanityPath] - mixin - - sling:vanityPath (string) multiple - - sling:redirect (boolean) - - sling:vanityOrder (long) - - sling:redirectStatus (long) - -[cq:PageContent] > cq:OwnerTaggable, cq:ReplicationStatus, mix:created, mix:title, nt:unstructured, sling:Resource, sling:VanityPath - orderable - - cq:lastModified (date) - - cq:template (string) - - pageTitle (string) - - offTime (date) - - hideInNav (boolean) - - cq:lastModifiedBy (string) - - onTime (date) - - jcr:language (string) - - cq:allowedTemplates (string) multiple - - cq:designPath (string) - - navTitle (string) - -[cq:Page] > nt:hierarchyNode - orderable primaryitem jcr:content - + jcr:content (nt:base) = nt:unstructured - + * (nt:base) = nt:base version - -[sling:OrderedFolder] > sling:Folder - orderable - + * (nt:base) = sling:OrderedFolder version - diff --git a/ui.content/src/main/content/META-INF/vault/privileges.xml b/ui.content/src/main/content/META-INF/vault/privileges.xml deleted file mode 100644 index 4d1cf1b82d..0000000000 --- a/ui.content/src/main/content/META-INF/vault/privileges.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - diff --git a/ui.content/src/main/content/META-INF/vault/properties.xml b/ui.content/src/main/content/META-INF/vault/properties.xml deleted file mode 100644 index f775c92f84..0000000000 --- a/ui.content/src/main/content/META-INF/vault/properties.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - -FileVault Package Properties -1 -0.0.1-SNAPSHOT - -2 -ACS AEM Commons Package -day_internal/consulting -acs-aem-commons-content -/etc/packages/day_internal/consulting/acs-aem-commons-content-0.0.1-SNAPSHOT.zip - diff --git a/ui.content/src/main/content/jcr_root/META-INF/MANIFEST.MF b/ui.content/src/main/content/jcr_root/META-INF/MANIFEST.MF new file mode 100644 index 0000000000..5e9495128c --- /dev/null +++ b/ui.content/src/main/content/jcr_root/META-INF/MANIFEST.MF @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: +