[sling-org-apache-sling-app-cms] 04/05: Fixing issue with components being copied under /component

[dk...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dklco pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git

commit 39711e7f71773d3e7e7367d41cd26b88e6bed6b0
Author: Dan Klco <dk...@apache.org>
AuthorDate: Mon Feb 24 23:09:04 2020 -0500

    Fixing issue with components being copied under /component
---
 reference/bnd.bnd | 10 ++--------
 ui/bnd.bnd        |  2 +-
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/reference/bnd.bnd b/reference/bnd.bnd
index be8e267..0860294 100644
--- a/reference/bnd.bnd
+++ b/reference/bnd.bnd
@@ -1,8 +1,2 @@
-Sling-Initial-Content: jcr_root,jcr_root/apps/reference;overwrite:=true;
- uninstall:=true;path:=/apps/reference,jcr_root/content/apache;overwrite
- :=false;uninstall:=false;path:=/content/apache,jcr_root/etc/taxonomy/re
- ference;overwrite:=false;uninstall:=false;path:=/etc/taxonomy/reference
- ,jcr_root/static/clientlibs/reference;overwrite=true;ignoreImportProvid
- ers:=xml;path:=/static/clientlibs/reference
-Sling-Model-Packages: org.apache.sling.cms.reference.models,org.apache.s
- ling.cms.reference.forms.impl,
+Sling-Initial-Content: jcr_root/apps/reference;overwrite:=true;uninstall:=true;path:=/apps/reference,jcr_root/content/apache;overwrite:=false;uninstall:=false;path:=/content/apache,jcr_root/etc/taxonomy/reference;overwrite:=false;uninstall:=false;path:=/etc/taxonomy/reference,jcr_root/static/clientlibs/reference;overwrite=true;ignoreImportProviders:=xml;path:=/static/clientlibs/reference
+Sling-Model-Packages: org.apache.sling.cms.reference.models,org.apache.sling.cms.reference.forms.impl,
diff --git a/ui/bnd.bnd b/ui/bnd.bnd
index 68cff48..0fa7eaa 100644
--- a/ui/bnd.bnd
+++ b/ui/bnd.bnd
@@ -1,4 +1,4 @@
 Sling-Nodetypes: SLING-INF/nodetypes/nodetypes.cnd
-Sling-Initial-Content: jcr_root;ignoreImportProviders:=xml,jcr_root/oak%3Aindex;overwrite:=false;uninstall:=true;path:=/oak:index,jcr_root/conf/global;overwrite:=false;uninstall:=true;path:=/conf/global,jcr_root/etc/clientlibs;overwrite=true;ignoreImportProviders:=xml;path:=/etc/clientlibs,jcr_root/etc/taxonomy;overwrite:=false;uninstall:=true;path:=/etc/taxonomy,jcr_root/libs/sling/servlet/errorhandler;overwriteProperties:=true;overwrite:=true;uninstall:=true;path:=/libs/sling/servlet/e [...]
+Sling-Initial-Content: jcr_root/oak%3Aindex;overwrite:=false;uninstall:=true;path:=/oak:index,jcr_root/conf/global;overwrite:=false;uninstall:=true;path:=/conf/global,jcr_root/etc/clientlibs;overwrite=true;ignoreImportProviders:=xml;path:=/etc/clientlibs,jcr_root/etc/taxonomy;overwrite:=false;uninstall:=true;path:=/etc/taxonomy,jcr_root/libs/sling/servlet/errorhandler;overwriteProperties:=true;overwrite:=true;uninstall:=true;path:=/libs/sling/servlet/errorhandler,jcr_root/libs/sling-cms; [...]
 
 -includeresource: target/frontend/dist