jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thom...@apache.org
Subject svn commit: r745500 - in /jackrabbit/trunk/jackrabbit-core/src: main/java/org/apache/jackrabbit/core/config/ConfigurationEntityResolver.java main/resources/org/apache/jackrabbit/core/config/repository-1.6.dtd test/repository/repository.xml
Date Wed, 18 Feb 2009 12:44:40 GMT
Author: thomasm
Date: Wed Feb 18 12:44:39 2009
New Revision: 745500

URL: http://svn.apache.org/viewvc?rev=745500&view=rev
Log:
JCR-1605 Configurable RepositoryLock (repository-1.6.dtd changes)

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/config/repository-1.6.dtd
    jackrabbit/trunk/jackrabbit-core/src/test/repository/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=745500&r1=745499&r2=745500&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 Feb 18 12:44:39 2009
@@ -30,14 +30,16 @@
  * 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 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.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>
+ * <li><code>-//The Apache Software Foundation//DTD Jackrabbit 1.2//EN</code></li>
+ * <li><code>-//The Apache Software Foundation//DTD Jackrabbit 1.0//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.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>
  * <li><code>http://jackrabbit.apache.org/dtd/repository-1.2.dtd</code></li>
@@ -69,6 +71,14 @@
      * Creates the singleton instance of this class.
      */
     private ConfigurationEntityResolver() {
+        // Apache Jackrabbit 1.6 DTD
+        publicIds.put(
+                "-//The Apache Software Foundation//DTD Jackrabbit 1.6//EN",
+                "repository-1.6.dtd");
+        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",

Modified: 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-1.6.dtd?rev=745500&r1=745499&r2=745500&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-1.6.dtd
Wed Feb 18 12:44:39 2009
@@ -53,7 +53,7 @@
         settings on the /jcr:system tree.
 
 -->
-<!ELEMENT Repository (Cluster|FileSystem|DataStore|Security|Workspaces|Workspace|Versioning|SearchIndex)*>

+<!ELEMENT Repository (Cluster|FileSystem|DataStore|Security|Workspaces|Workspace|Versioning|SearchIndex|RepositoryLockMechanism)*>

 
 <!--
     a virtual file system
@@ -211,14 +211,14 @@
 <!ATTLIST ISMLocking class CDATA #REQUIRED>
 
 <!--
-    the RepsitoryLockMechanism element configures the mechanism
+    the RepositoryLockMechanism element configures the mechanism
     that is used to ensure only one process writes to the 
     backend (file system or database) at any time; the class
     attribute specifies the FQN of the class implementing the
-    RepsitoryLockMechanism interface.
+    RepositoryLockMechanism interface.
 -->
-<!ELEMENT RepsitoryLockMechanism (param*)>
-<!ATTLIST RepsitoryLockMechanism class CDATA #REQUIRED>
+<!ELEMENT RepositoryLockMechanism (param*)>
+<!ATTLIST RepositoryLockMechanism class CDATA #REQUIRED>
 
 <!--
     the DataStore element configures the data store

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=745500&r1=745499&r2=745500&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/repository/repository.xml (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/repository/repository.xml Wed Feb 18 12:44:39
2009
@@ -15,8 +15,8 @@
    See the License for the specific language governing permissions and
    limitations under the License.
   -->
-<!DOCTYPE Repository PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 1.5//EN"
-                            "http://jackrabbit.apache.org/dtd/repository-1.5.dtd">
+<!DOCTYPE Repository PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 1.6//EN"
+                            "http://jackrabbit.apache.org/dtd/repository-1.6.dtd">
 <!-- Example Repository Configuration File -->
 <Repository>
     <!--
@@ -28,6 +28,16 @@
     </FileSystem>
 
     <!--
+        data store configuration
+	<DataStore class="org.apache.jackrabbit.core.data.FileDataStore"/>
+    -->
+    
+    <!--
+        repository lock mechanism configuration
+    <RepositoryLockMechanism class="org.apache.jackrabbit.core.util.CooperativeFileLock"/>
+    -->
+
+    <!--
         security configuration
     -->
     <Security appName="Jackrabbit">



Mime
View raw message