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 2009/11/25 14:51:41 UTC
svn commit: r884097 - in /jackrabbit/trunk/jackrabbit-core/src/main:
java/org/apache/jackrabbit/core/config/ConfigurationEntityResolver.java
resources/org/apache/jackrabbit/core/config/repository-2.0.dtd
Author: mreutegg
Date: Wed Nov 25 13:51:41 2009
New Revision: 884097
URL: http://svn.apache.org/viewvc?rev=884097&view=rev
Log:
JCR-2405: repository-2.0.dtd missing
Added:
jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/config/repository-2.0.dtd
- copied, changed from r881285, jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/config/repository-1.6.dtd
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=884097&r1=884096&r2=884097&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 Wed Nov 25 13:51:41 2009
@@ -16,20 +16,21 @@
*/
package org.apache.jackrabbit.core.config;
-import org.xml.sax.EntityResolver;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
import java.io.IOException;
import java.io.InputStream;
import java.util.HashMap;
import java.util.Map;
+import org.xml.sax.EntityResolver;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
/**
* Entity resolver for Jackrabbit configuration files.
* 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.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>
* <li><code>-//The Apache Software Foundation//DTD Jackrabbit 1.4//EN</code></li>
@@ -39,6 +40,7 @@
* <p>
* Also the following system identifiers are mapped to local resources:
* <ul>
+ * <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>
* <li><code>http://jackrabbit.apache.org/dtd/repository-1.4.dtd</code></li>
@@ -71,6 +73,14 @@
* Creates the singleton instance of this class.
*/
private ConfigurationEntityResolver() {
+ // Apache Jackrabbit 2.0 DTD
+ publicIds.put(
+ "-//The Apache Software Foundation//DTD Jackrabbit 2.0//EN",
+ "repository-2.0.dtd");
+ systemIds.put(
+ "http://jackrabbit.apache.org/dtd/repository-2.0.dtd",
+ "repository-2.0.dtd");
+
// Apache Jackrabbit 1.6 DTD
publicIds.put(
"-//The Apache Software Foundation//DTD Jackrabbit 1.6//EN",
@@ -78,7 +88,7 @@
systemIds.put(
"http://jackrabbit.apache.org/dtd/repository-1.6.dtd",
"repository-1.6.dtd");
-
+
// Apache Jackrabbit 1.5 DTD
publicIds.put(
"-//The Apache Software Foundation//DTD Jackrabbit 1.5//EN",
Copied: jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/config/repository-2.0.dtd (from r881285, jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/config/repository-1.6.dtd)
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/config/repository-2.0.dtd?p2=jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/config/repository-2.0.dtd&p1=jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/config/repository-1.6.dtd&r1=881285&r2=884097&rev=884097&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/config/repository-1.6.dtd (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/config/repository-2.0.dtd Wed Nov 25 13:51:41 2009
@@ -75,7 +75,7 @@
used by this repository instance; the class attribute specifies the FQN of the
class implementing the JackrabbitSecurityManager interface
-->
-<!ELEMENT SecurityManager (WorkspaceAccessManager?, param*)>
+<!ELEMENT SecurityManager (WorkspaceAccessManager?,UserManager?,UserIdClass?, param*)>
<!ATTLIST SecurityManager class CDATA #REQUIRED
workspaceName CDATA #IMPLIED>
@@ -141,7 +141,7 @@
it is used to create the initial workspace if there's no workspace yet
and for creating additional workspaces through the api
-->
-<!ELEMENT Workspace (FileSystem,PersistenceManager,SearchIndex?,ISMLocking?,WorkspaceSecurity?)>
+<!ELEMENT Workspace (FileSystem,PersistenceManager,SearchIndex?,ISMLocking?,WorkspaceSecurity?,Import?)>
<!ATTLIST Workspace name CDATA #REQUIRED>
<!--
@@ -227,3 +227,44 @@
-->
<!ELEMENT DataStore (param*)>
<!ATTLIST DataStore class CDATA #REQUIRED>
+
+<!--
+ The Import element configures how protected items are imported into a
+ workspace.
+-->
+<!ELEMENT Import (ProtectedNodeImporter|ProtectedPropertyImporter)*>
+
+<!--
+ The ProtectedNodeImporter element configures an importer for protected
+ nodes. The class attribute specifies the FQN of the class implementing the
+ ProtectedNodeImporter interface.
+ The param(s) define implementation specific parameters.
+-->
+<!ELEMENT ProtectedNodeImporter (param*)>
+<!ATTLIST ProtectedNodeImporter class CDATA #REQUIRED>
+
+<!--
+ The ProtectedPropertyImporter element configures an importer for protected
+ properties. The class attribute specifies the FQN of the class implementing
+ the ProtectedPropertyImporter interface.
+ The param(s) define implementation specific parameters.
+-->
+<!ELEMENT ProtectedPropertyImporter (param*)>
+<!ATTLIST ProtectedPropertyImporter class CDATA #REQUIRED>
+
+<!--
+ The UserManager element configures the user manager implementation that is
+ used in Jackrabbit. The class attribute specifies the FQN of the class
+ implementing the UserManager interface.
+ The param(s) define implementation specific parameters.
+-->
+<!ELEMENT UserManager (param*)>
+<!ATTLIST UserManager class CDATA #REQUIRED>
+
+<!--
+ The UserIdClass element specifies the class of principals used to retrieve
+ the userID out of a Subject. The class attribute specifies the FQN of a
+ class implementing the java.security.Principal interface.
+-->
+<!ELEMENT UserIdClass EMPTY>
+<!ATTLIST UserIdClass class CDATA #REQUIRED>