jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r1526946 - in /jackrabbit/branches/2.6: ./ jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/config/repository-2.4-elements.dtd
Date Fri, 27 Sep 2013 15:15:07 GMT
Author: jukka
Date: Fri Sep 27 15:15:07 2013
New Revision: 1526946

URL: http://svn.apache.org/r1526946
Log:
2.6: Merged revision 1526945 (JCR-3671)

Modified:
    jackrabbit/branches/2.6/   (props changed)
    jackrabbit/branches/2.6/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/config/repository-2.4-elements.dtd

Propchange: jackrabbit/branches/2.6/
------------------------------------------------------------------------------
  Merged /jackrabbit/trunk:r1526945

Modified: jackrabbit/branches/2.6/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/config/repository-2.4-elements.dtd
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.6/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/config/repository-2.4-elements.dtd?rev=1526946&r1=1526945&r2=1526946&view=diff
==============================================================================
--- jackrabbit/branches/2.6/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/config/repository-2.4-elements.dtd
(original)
+++ jackrabbit/branches/2.6/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/config/repository-2.4-elements.dtd
Fri Sep 27 15:15:07 2013
@@ -205,7 +205,7 @@
     The Import element configures how protected items are imported into a
     workspace.
 -->
-<!ELEMENT Import (ProtectedNodeImporter|ProtectedPropertyImporter)*>
+<!ELEMENT Import (ProtectedItemImporter|ProtectedNodeImporter|ProtectedPropertyImporter)*>
 
 <!--
     The ProtectedNodeImporter element configures an importer for protected



Mime
View raw message