From 5b9c569ac8d11d71876a638eb7f44e76624f75eb Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 8 Dec 2023 10:49:01 +0100
Subject: [PATCH] Move CND files to JCR-specific locations

---
 org.argeo.app.api/bnd.bnd                             |  5 -----
 org.argeo.app.core/bnd.bnd                            |  8 --------
 org.argeo.app.jcr/bnd.bnd                             | 11 ++++++++++-
 org.argeo.app.jcr/build.properties                    |  3 ++-
 .../src/org/argeo/app/jcr}/docbook/docbook-full.cnd   |  0
 .../src/org/argeo/app/jcr}/docbook/docbook.cnd        |  0
 .../src/org/argeo/app/jcr}/entity.cnd                 |  0
 .../src/org/argeo/app/jcr}/odk/odk.cnd                |  0
 .../src/org/argeo/app/jcr/xforms/XFormsJcrUtils.java  | 10 ++++++++++
 .../src/org/argeo/app/jcr}/xforms/xforms.cnd          |  0
 10 files changed, 22 insertions(+), 15 deletions(-)
 rename {org.argeo.app.core/src/org/argeo/app => org.argeo.app.jcr/src/org/argeo/app/jcr}/docbook/docbook-full.cnd (100%)
 rename {org.argeo.app.core/src/org/argeo/app => org.argeo.app.jcr/src/org/argeo/app/jcr}/docbook/docbook.cnd (100%)
 rename {org.argeo.app.api/src/org/argeo/app/api => org.argeo.app.jcr/src/org/argeo/app/jcr}/entity.cnd (100%)
 rename {org.argeo.app.core/src/org/argeo/app => org.argeo.app.jcr/src/org/argeo/app/jcr}/odk/odk.cnd (100%)
 create mode 100644 org.argeo.app.jcr/src/org/argeo/app/jcr/xforms/XFormsJcrUtils.java
 rename {org.argeo.app.core/src/org/argeo/app => org.argeo.app.jcr/src/org/argeo/app/jcr}/xforms/xforms.cnd (100%)

diff --git a/org.argeo.app.api/bnd.bnd b/org.argeo.app.api/bnd.bnd
index bfacd6e..e69de29 100644
--- a/org.argeo.app.api/bnd.bnd
+++ b/org.argeo.app.api/bnd.bnd
@@ -1,5 +0,0 @@
-Require-Capability:\
-cms.datamodel;filter:="(name=jcrx)"
-
-Provide-Capability:\
-cms.datamodel; name=entity; cnd=/org/argeo/app/api/entity.cnd
diff --git a/org.argeo.app.core/bnd.bnd b/org.argeo.app.core/bnd.bnd
index 7671c88..88c59a9 100644
--- a/org.argeo.app.core/bnd.bnd
+++ b/org.argeo.app.core/bnd.bnd
@@ -10,11 +10,3 @@ org.osgi.service.useradmin,\
 tech.units.indriya.unit,\
 org.argeo.cms.acr,\
 *
-
-Require-Capability:\
-cms.datamodel;filter:="(name=entity)"
-
-Provide-Capability:\
-cms.datamodel; name=xforms; cnd=/org/argeo/app/xforms/xforms.cnd; abstract=true,\
-cms.datamodel; name=odk; cnd=/org/argeo/app/odk/odk.cnd; abstract=true,\
-cms.datamodel; name=docbook; cnd=/org/argeo/app/docbook/docbook.cnd; abstract=true,\
diff --git a/org.argeo.app.jcr/bnd.bnd b/org.argeo.app.jcr/bnd.bnd
index b190cf4..087215f 100644
--- a/org.argeo.app.jcr/bnd.bnd
+++ b/org.argeo.app.jcr/bnd.bnd
@@ -8,4 +8,13 @@ javax.jcr.nodetype,\
 javax.jcr.security,\
 org.apache.jackrabbit.*;version="[1,4)",\
 org.argeo.cms.acr,\
-*
\ No newline at end of file
+*
+
+Require-Capability:\
+cms.datamodel;filter:="(name=jcrx)"
+
+Provide-Capability:\
+cms.datamodel; name=entity; cnd=/org/argeo/app/jcr/entity.cnd,\
+cms.datamodel; name=xforms; cnd=/org/argeo/app/jcr/xforms/xforms.cnd; abstract=true,\
+cms.datamodel; name=odk; cnd=/org/argeo/app/jcr/odk/odk.cnd; abstract=true,\
+cms.datamodel; name=docbook; cnd=/org/argeo/app/jcr/docbook/docbook.cnd; abstract=true,\
diff --git a/org.argeo.app.jcr/build.properties b/org.argeo.app.jcr/build.properties
index 34d2e4d..c58ea21 100644
--- a/org.argeo.app.jcr/build.properties
+++ b/org.argeo.app.jcr/build.properties
@@ -1,4 +1,5 @@
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
-               .
+               .,\
+               OSGI-INF/
diff --git a/org.argeo.app.core/src/org/argeo/app/docbook/docbook-full.cnd b/org.argeo.app.jcr/src/org/argeo/app/jcr/docbook/docbook-full.cnd
similarity index 100%
rename from org.argeo.app.core/src/org/argeo/app/docbook/docbook-full.cnd
rename to org.argeo.app.jcr/src/org/argeo/app/jcr/docbook/docbook-full.cnd
diff --git a/org.argeo.app.core/src/org/argeo/app/docbook/docbook.cnd b/org.argeo.app.jcr/src/org/argeo/app/jcr/docbook/docbook.cnd
similarity index 100%
rename from org.argeo.app.core/src/org/argeo/app/docbook/docbook.cnd
rename to org.argeo.app.jcr/src/org/argeo/app/jcr/docbook/docbook.cnd
diff --git a/org.argeo.app.api/src/org/argeo/app/api/entity.cnd b/org.argeo.app.jcr/src/org/argeo/app/jcr/entity.cnd
similarity index 100%
rename from org.argeo.app.api/src/org/argeo/app/api/entity.cnd
rename to org.argeo.app.jcr/src/org/argeo/app/jcr/entity.cnd
diff --git a/org.argeo.app.core/src/org/argeo/app/odk/odk.cnd b/org.argeo.app.jcr/src/org/argeo/app/jcr/odk/odk.cnd
similarity index 100%
rename from org.argeo.app.core/src/org/argeo/app/odk/odk.cnd
rename to org.argeo.app.jcr/src/org/argeo/app/jcr/odk/odk.cnd
diff --git a/org.argeo.app.jcr/src/org/argeo/app/jcr/xforms/XFormsJcrUtils.java b/org.argeo.app.jcr/src/org/argeo/app/jcr/xforms/XFormsJcrUtils.java
new file mode 100644
index 0000000..890cac0
--- /dev/null
+++ b/org.argeo.app.jcr/src/org/argeo/app/jcr/xforms/XFormsJcrUtils.java
@@ -0,0 +1,10 @@
+package org.argeo.app.jcr.xforms;
+
+/** Empty for the time being. */
+public class XFormsJcrUtils {
+
+	/** singleton */
+	private XFormsJcrUtils() {
+	}
+
+}
diff --git a/org.argeo.app.core/src/org/argeo/app/xforms/xforms.cnd b/org.argeo.app.jcr/src/org/argeo/app/jcr/xforms/xforms.cnd
similarity index 100%
rename from org.argeo.app.core/src/org/argeo/app/xforms/xforms.cnd
rename to org.argeo.app.jcr/src/org/argeo/app/jcr/xforms/xforms.cnd
-- 
2.30.2