Improve DocBook

diff --git a/org.argeo.jcr/bnd.bnd b/org.argeo.jcr/bnd.bnd
index 079f93d81249fb1869484d1f5b30eb33cc1b451f..fbdfdb765d29ed8179f90e407cfe0120d4120337 100644 (file)
--- 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 61a902d9ef260b517cabbcf9ae6a22ba5d8563e0..db3cd3952f03e47c4b6e7d15e4b8034427f75838 100644 (file)
--- 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 291b30c5cc11a6e690ab964b5be560874dc33343..1a67e68c5c8b3b39c81b00e3a874b542aaec9460 100644 (file)
--- 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 176c5c3a94c1e50232fabfb63457df6d981b05ec..18264065c1e473db790e3ba2a3bcb3f765785be2 100644 (file)
--- 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 7e4fefab9248756b39e4d97416c7ac69e0406aa3..306e7cb9b9c134064b302a3894e9b60f7cc23080 100644 (file)
--- 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 74ec3cc88b4ea22b896ff06e17e70e387b1c4cb9..f22288def1de4a757143a8c03ac195901edc5b0b 100644 (file)
--- 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 *