jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ang...@apache.org
Subject svn commit: r638863 - in /jackrabbit/trunk: jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/ jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/ jackrabbit-core/src/test/repository/ jackrabbit-jcr2spi/src/test/resources/
Date Wed, 19 Mar 2008 15:13:44 GMT
Author: angela
Date: Wed Mar 19 08:13:40 2008
New Revision: 638863

URL: http://svn.apache.org/viewvc?rev=638863&view=rev
Log:
JCR-1104 : JSR 283 support
JCR-1171 : Contribute Pluggable Permission and User Management to Jackrabbit

-> fixing DOCTYPE again (merci marcel!)

Modified:
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/ConfigurationEntityResolver.java
    jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/repository.xml
    jackrabbit/trunk/jackrabbit-core/src/test/repository/repository.xml
    jackrabbit/trunk/jackrabbit-jcr2spi/src/test/resources/repository.xml

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=638863&r1=638862&r2=638863&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 Mar 19 08:13:40 2008
@@ -33,10 +33,12 @@
  * <li><code>-//The Apache Software Foundation//DTD Jackrabbit 1.0//EN</code></li>
  * <li><code>-//The Apache Software Foundation//DTD Jackrabbit 1.2//EN</code></li>
  * <li><code>-//The Apache Software Foundation//DTD Jackrabbit 1.4//EN</code></li>
+ * <li><code>-//The Apache Software Foundation//DTD Jackrabbit 1.5//EN</code></li>
  * </ul>
  * <p>
  * Also the following system identifiers are mapped to local resources:
  * <ul>
+ * <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>
  * <li><code>http://jackrabbit.apache.org/dtd/repository-1.2.dtd</code></li>
  * <li><code>http://jackrabbit.apache.org/dtd/repository-1.0.dtd</code></li>
@@ -67,6 +69,14 @@
      * Creates the singleton instance of this class.
      */
     private ConfigurationEntityResolver() {
+        // Apache Jackrabbit 1.5 DTD
+        publicIds.put(
+                "-//The Apache Software Foundation//DTD Jackrabbit 1.5//EN",
+                "repository-1.5.dtd");
+        systemIds.put(
+                "http://jackrabbit.apache.org/dtd/repository-1.5.dtd",
+                "repository-1.5.dtd");
+
         // Apache Jackrabbit 1.4 DTD
         publicIds.put(
                 "-//The Apache Software Foundation//DTD Jackrabbit 1.4//EN",

Modified: jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/repository.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/repository.xml?rev=638863&r1=638862&r2=638863&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/repository.xml
(original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/repository.xml
Wed Mar 19 08:13:40 2008
@@ -16,7 +16,7 @@
    limitations under the License.
 -->
 <!DOCTYPE Repository PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 1.5//EN"
-                            "http://svn.apache.org/repos/asf/jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/config/repository-1.5.dtd">
+                            "http://jackrabbit.apache.org/dtd/repository-1.5.dtd">
 <!-- Example Repository Configuration File
      Used by
      - org.apache.jackrabbit.core.config.RepositoryConfigTest.java

Modified: jackrabbit/trunk/jackrabbit-core/src/test/repository/repository.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/repository/repository.xml?rev=638863&r1=638862&r2=638863&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/repository/repository.xml (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/repository/repository.xml Wed Mar 19 08:13:40
2008
@@ -16,7 +16,7 @@
    limitations under the License.
   -->
 <!DOCTYPE Repository PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 1.5//EN"
-                            "http://svn.apache.org/repos/asf/jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/config/repository-1.5.dtd">
+                            "http://jackrabbit.apache.org/dtd/repository-1.5.dtd">
 <!-- Example Repository Configuration File -->
 <Repository>
     <!--

Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/resources/repository.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/resources/repository.xml?rev=638863&r1=638862&r2=638863&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/resources/repository.xml (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/resources/repository.xml Wed Mar 19 08:13:40
2008
@@ -16,7 +16,7 @@
    limitations under the License.
   -->
 <!DOCTYPE Repository PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 1.5//EN"
-                            "http://svn.apache.org/repos/asf/jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/config/repository-1.5.dtd">
+                            "http://jackrabbit.apache.org/dtd/repository-1.5.dtd">
 <!-- Example Repository Configuration File -->
 <Repository>
     <!--



Mime
View raw message