From fd768714f37a93b1b188a535991be43c9dc9ef6d Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 1 Jan 2020 12:11:28 +0100
Subject: [PATCH] Improve DocBook

---
 org.argeo.jcr/bnd.bnd                                     | 2 +-
 org.argeo.jcr/src/org/argeo/jcr/docbook/DocBookModel.java | 3 ++-
 org.argeo.jcr/src/org/argeo/jcr/docbook/DocBookNames.java | 1 +
 org.argeo.jcr/src/org/argeo/jcr/docbook/DocBookTypes.java | 1 +
 org.argeo.jcr/src/org/argeo/jcr/docbook/docbook-full.cnd  | 7 +------
 org.argeo.jcr/src/org/argeo/jcr/docbook/docbook.cnd       | 3 ---
 6 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/org.argeo.jcr/bnd.bnd b/org.argeo.jcr/bnd.bnd
index 079f93d81..fbdfdb765 100644
--- a/org.argeo.jcr/bnd.bnd
+++ b/org.argeo.jcr/bnd.bnd
@@ -1,4 +1,4 @@
-#Provide-Capability: cms.datamodel;name=docbook;cnd="/org/argeo/jcr/docbook/docbook.cnd"
+Provide-Capability: cms.datamodel;name=docbook;cnd="/org/argeo/jcr/docbook/docbook.cnd"
 
 Import-Package: junit.framework;resolution:=optional,\
 org.xml.sax;version="0.0.0",\
diff --git a/org.argeo.jcr/src/org/argeo/jcr/docbook/DocBookModel.java b/org.argeo.jcr/src/org/argeo/jcr/docbook/DocBookModel.java
index 61a902d9e..db3cd3952 100644
--- a/org.argeo.jcr/src/org/argeo/jcr/docbook/DocBookModel.java
+++ b/org.argeo.jcr/src/org/argeo/jcr/docbook/DocBookModel.java
@@ -5,6 +5,7 @@ import java.io.InputStream;
 import java.io.OutputStream;
 
 import javax.jcr.ImportUUIDBehavior;
+import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 
@@ -34,7 +35,7 @@ public class DocBookModel {
 			log.trace("Imported " + path + " in " + duration + " ms");
 
 	}
-
+	
 	public void exportXml(String path, OutputStream out)
 			throws RepositoryException, IOException {
 		session.exportDocumentView(path, out, true, false);
diff --git a/org.argeo.jcr/src/org/argeo/jcr/docbook/DocBookNames.java b/org.argeo.jcr/src/org/argeo/jcr/docbook/DocBookNames.java
index 291b30c5c..1a67e68c5 100644
--- a/org.argeo.jcr/src/org/argeo/jcr/docbook/DocBookNames.java
+++ b/org.argeo.jcr/src/org/argeo/jcr/docbook/DocBookNames.java
@@ -2,6 +2,7 @@ package org.argeo.jcr.docbook;
 
 public interface DocBookNames {
 	// ELEMENTS
+	public final static String DBK_ARTICLE = "dbk:article";
 	public final static String DBK_PARA = "dbk:para";
 	public final static String DBK_SECTION = "dbk:section";
 	public final static String DBK_MEDIAOBJECT = "dbk:mediaobject";
diff --git a/org.argeo.jcr/src/org/argeo/jcr/docbook/DocBookTypes.java b/org.argeo.jcr/src/org/argeo/jcr/docbook/DocBookTypes.java
index 176c5c3a9..18264065c 100644
--- a/org.argeo.jcr/src/org/argeo/jcr/docbook/DocBookTypes.java
+++ b/org.argeo.jcr/src/org/argeo/jcr/docbook/DocBookTypes.java
@@ -1,6 +1,7 @@
 package org.argeo.jcr.docbook;
 
 public interface DocBookTypes {
+	public final static String BOOK = "dbk:book";
 	public final static String ARTICLE = "dbk:article";
 	public final static String SECTION = "dbk:section";
 	public final static String PARA = "dbk:para";
diff --git a/org.argeo.jcr/src/org/argeo/jcr/docbook/docbook-full.cnd b/org.argeo.jcr/src/org/argeo/jcr/docbook/docbook-full.cnd
index 7e4fefab9..306e7cb9b 100644
--- a/org.argeo.jcr/src/org/argeo/jcr/docbook/docbook-full.cnd
+++ b/org.argeo.jcr/src/org/argeo/jcr/docbook/docbook-full.cnd
@@ -1,10 +1,7 @@
 <dbk = 'http://docbook.org/ns/docbook'>
 <argeodbk = 'http://www.argeo.org/ns/argeodbk'>
-<jcr = 'http://www.jcp.org/jcr/1.0'>
-<nt = 'http://www.jcp.org/jcr/nt/1.0'>
 <xlink = 'http://www.w3.org/1999/xlink'>
 <xs = 'http://www.w3.org/2001/XMLSchema'>
-<xml = 'http://www.w3.org/XML/1998/namespace'>
 
 [argeodbk:titled]
 mixin
@@ -218,6 +215,7 @@ mixin
 
 [argeodbk:base]
 abstract
+orderable
  - dbk:annotations (String)
  - dbk:arch (String)
  - dbk:audience (String)
@@ -235,9 +233,6 @@ abstract
  - dbk:version (String)
  - dbk:wordsize (String)
  - dbk:xreflabel (String)
- - xml:base (String)
- - xml:id (String)
- - xml:lang (String)
 
 [dbk:abbrev] > argeodbk:base, argeodbk:freeText, argeodbk:indexingInlines, argeodbk:linkingAttributes, argeodbk:ubiquitousInlines
  + dbk:trademark (dbk:trademark) = dbk:trademark *
diff --git a/org.argeo.jcr/src/org/argeo/jcr/docbook/docbook.cnd b/org.argeo.jcr/src/org/argeo/jcr/docbook/docbook.cnd
index 74ec3cc88..f22288def 100644
--- a/org.argeo.jcr/src/org/argeo/jcr/docbook/docbook.cnd
+++ b/org.argeo.jcr/src/org/argeo/jcr/docbook/docbook.cnd
@@ -103,9 +103,6 @@ orderable
  - dbk:version (String)
  - dbk:wordsize (String)
  - dbk:xreflabel (String)
-// - {http://www.w3.org/XML/1998/namespace}base (String)
-// - {http://www.w3.org/XML/1998/namespace}id (String)
-// - {http://www.w3.org/XML/1998/namespace}lang (String)
 
 [dbk:alt] > argeodbk:base
  + dbk:inlinemediaobject (dbk:inlinemediaobject) = dbk:inlinemediaobject *
-- 
2.30.2