You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by mr...@apache.org on 2015/04/21 16:23:00 UTC

svn commit: r1675125 - in /jackrabbit/site/live/dtd: repository-2.4-elements.dtd repository-2.6-elements.dtd

Author: mreutegg
Date: Tue Apr 21 14:22:59 2015
New Revision: 1675125

URL: http://svn.apache.org/r1675125
Log:
JCR-3872: Config DTD does not declare ProtectedItemImporter elements

Sync DTDs

Modified:
    jackrabbit/site/live/dtd/repository-2.4-elements.dtd
    jackrabbit/site/live/dtd/repository-2.6-elements.dtd

Modified: jackrabbit/site/live/dtd/repository-2.4-elements.dtd
URL: http://svn.apache.org/viewvc/jackrabbit/site/live/dtd/repository-2.4-elements.dtd?rev=1675125&r1=1675124&r2=1675125&view=diff
==============================================================================
--- jackrabbit/site/live/dtd/repository-2.4-elements.dtd (original)
+++ jackrabbit/site/live/dtd/repository-2.4-elements.dtd Tue Apr 21 14:22:59 2015
@@ -205,7 +205,16 @@
     The Import element configures how protected items are imported into a
     workspace.
 -->
-<!ELEMENT Import (ProtectedNodeImporter|ProtectedPropertyImporter)*>
+<!ELEMENT Import (ProtectedItemImporter|ProtectedNodeImporter|ProtectedPropertyImporter)*>
+
+<!--
+    The ProtectedItemImporter element configures an importer for protected
+    items. The class attribute specifies the FQN of the class implementing the
+    ProtectedNodeImporter interface.
+    The param(s) define implementation specific parameters.
+-->
+<!ELEMENT ProtectedItemImporter (param*)>
+<!ATTLIST ProtectedItemImporter class CDATA #REQUIRED>
 
 <!--
     The ProtectedNodeImporter element configures an importer for protected

Modified: jackrabbit/site/live/dtd/repository-2.6-elements.dtd
URL: http://svn.apache.org/viewvc/jackrabbit/site/live/dtd/repository-2.6-elements.dtd?rev=1675125&r1=1675124&r2=1675125&view=diff
==============================================================================
--- jackrabbit/site/live/dtd/repository-2.6-elements.dtd (original)
+++ jackrabbit/site/live/dtd/repository-2.6-elements.dtd Tue Apr 21 14:22:59 2015
@@ -161,11 +161,14 @@
     repository in a clustered environment. a literal id may be
     specified that uniquely identifies this node in a cluster, as well
     as the delay in milliseconds before changes to the journal are
-    automatically detected.
+    automatically detected. The stopDelay in milliseconds controls how long
+    the repository waits for the journal thread to terminate. The stop delay
+    is implementation specific if no value is specified in the configuration.
 -->
 <!ELEMENT Cluster (Journal)>
 <!ATTLIST Cluster id        CDATA #IMPLIED
-                  syncDelay CDATA #IMPLIED>
+                  syncDelay CDATA #IMPLIED
+                  stopDelay CDATA #IMPLIED>
 
 <!--
     the Journal element configures the journal used in clustering; the
@@ -206,7 +209,16 @@
     The Import element configures how protected items are imported into a
     workspace.
 -->
-<!ELEMENT Import (ProtectedNodeImporter|ProtectedPropertyImporter)*>
+<!ELEMENT Import (ProtectedItemImporter|ProtectedNodeImporter|ProtectedPropertyImporter)*>
+
+<!--
+    The ProtectedItemImporter element configures an importer for protected
+    items. The class attribute specifies the FQN of the class implementing the
+    ProtectedNodeImporter interface.
+    The param(s) define implementation specific parameters.
+-->
+<!ELEMENT ProtectedItemImporter (param*)>
+<!ATTLIST ProtectedItemImporter class CDATA #REQUIRED>
 
 <!--
     The ProtectedNodeImporter element configures an importer for protected