You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by an...@apache.org on 2011/10/25 10:55:40 UTC
svn commit: r1188574 -
/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/ConfigurationEntityResolver.java
Author: angela
Date: Tue Oct 25 08:55:40 2011
New Revision: 1188574
URL: http://svn.apache.org/viewvc?rev=1188574&view=rev
Log:
JCR-3118 : Configurable actions upon authorizable creation and removal
-> dtd needs to be listed in ConfigurationEntityResolver
Modified:
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/ConfigurationEntityResolver.java
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/ConfigurationEntityResolver.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/ConfigurationEntityResolver.java?rev=1188574&r1=1188573&r2=1188574&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/ConfigurationEntityResolver.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/ConfigurationEntityResolver.java Tue Oct 25 08:55:40 2011
@@ -30,6 +30,7 @@ import org.xml.sax.SAXException;
* This simple resolver contains mappings for the following
* public identifiers used for the Jackrabbit configuration files:
* <ul>
+ * <li><code>-//The Apache Software Foundation//DTD Jackrabbit 2.4//EN</code></li>
* <li><code>-//The Apache Software Foundation//DTD Jackrabbit 2.0//EN</code></li>
* <li><code>-//The Apache Software Foundation//DTD Jackrabbit 1.6//EN</code></li>
* <li><code>-//The Apache Software Foundation//DTD Jackrabbit 1.5//EN</code></li>
@@ -40,6 +41,7 @@ import org.xml.sax.SAXException;
* <p>
* Also the following system identifiers are mapped to local resources:
* <ul>
+ * <li><code>http://jackrabbit.apache.org/dtd/repository-2.4.dtd</code></li>
* <li><code>http://jackrabbit.apache.org/dtd/repository-2.0.dtd</code></li>
* <li><code>http://jackrabbit.apache.org/dtd/repository-1.6.dtd</code></li>
* <li><code>http://jackrabbit.apache.org/dtd/repository-1.5.dtd</code></li>
@@ -73,6 +75,20 @@ public class ConfigurationEntityResolver
* Creates the singleton instance of this class.
*/
private ConfigurationEntityResolver() {
+ // Apache Jackrabbit 2.4 DTD
+ publicIds.put(
+ "-//The Apache Software Foundation//DTD Jackrabbit 2.4//EN",
+ "repository-2.4.dtd");
+ systemIds.put(
+ "http://jackrabbit.apache.org/dtd/repository-2.4.dtd",
+ "repository-2.4.dtd");
+ publicIds.put(
+ "-//The Apache Software Foundation//DTD Jackrabbit 2.4 Elements//EN",
+ "repository-2.4-elements.dtd");
+ systemIds.put(
+ "http://jackrabbit.apache.org/dtd/repository-2.4-elements.dtd",
+ "repository-2.4-elements.dtd");
+
// Apache Jackrabbit 2.0 DTD
publicIds.put(
"-//The Apache Software Foundation//DTD Jackrabbit 2.0//EN",