From bc59d52e2dbf0c388d5ce2c245a3907332fe5355 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 22 Dec 2020 08:13:51 +0100
Subject: [PATCH] Improve DTD definitions in Jackrabbit repository
 configurations.

---
 .../argeo/cms/internal/jcr/repository-h2.xml  | 50 +++++++++++++------
 .../cms/internal/jcr/repository-localfs.xml   | 11 +++-
 .../cms/internal/jcr/repository-memory.xml    | 11 +++-
 .../internal/jcr/repository-postgresql.xml    | 11 +++-
 .../jcr/repository-postgresql_cluster.xml     | 11 +++-
 .../jcr/repository-postgresql_cluster_ds.xml  | 11 +++-
 .../internal/jcr/repository-postgresql_ds.xml | 11 +++-
 7 files changed, 96 insertions(+), 20 deletions(-)

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/jcr/repository-h2.xml b/org.argeo.cms/src/org/argeo/cms/internal/jcr/repository-h2.xml
index ace0fa5ee..4c1b8e19c 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/jcr/repository-h2.xml
+++ b/org.argeo.cms/src/org/argeo/cms/internal/jcr/repository-h2.xml
@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Repository PUBLIC "Jackrabbit 2.6" "http://jackrabbit.apache.org/dtd/repository-2.6.dtd">
+<!DOCTYPE Repository [
+	<!ENTITY % repository-elements
+		PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 2.6 Elements//EN"
+		"http://jackrabbit.apache.org/dtd/repository-2.6-elements.dtd">
+	%repository-elements;
+	<!ENTITY % repository
+		PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 2.6//EN"
+		"http://jackrabbit.apache.org/dtd/repository-2.6.dtd">
+	%repository;
+]>
 <Repository>
 	<!-- Shared datasource -->
 	<DataSources>
@@ -14,12 +23,14 @@
 	</DataSources>
 
 	<!-- File system and datastore -->
-	<FileSystem class="org.apache.jackrabbit.core.fs.db.DbFileSystem">
+	<FileSystem
+		class="org.apache.jackrabbit.core.fs.db.DbFileSystem">
 		<param name="dataSourceName" value="dataSource" />
 		<param name="schema" value="default" />
 		<param name="schemaObjectPrefix" value="fs_" />
 	</FileSystem>
-	<DataStore class="org.apache.jackrabbit.core.data.FileDataStore">
+	<DataStore
+		class="org.apache.jackrabbit.core.data.FileDataStore">
 		<param name="path" value="${rep.home}/datastore" />
 	</DataStore>
 
@@ -27,7 +38,8 @@
 	<Workspaces rootPath="${rep.home}/workspaces"
 		defaultWorkspace="${defaultWorkspace}" />
 	<Workspace name="${wsp.name}">
-		<FileSystem class="org.apache.jackrabbit.core.fs.db.DbFileSystem">
+		<FileSystem
+			class="org.apache.jackrabbit.core.fs.db.DbFileSystem">
 			<param name="dataSourceName" value="dataSource" />
 			<param name="schema" value="default" />
 			<param name="schemaObjectPrefix" value="${wsp.name}_fs_" />
@@ -38,12 +50,16 @@
 			<param name="schemaObjectPrefix" value="${wsp.name}_pm_" />
 			<param name="bundleCacheSize" value="${bundleCacheMB}" />
 		</PersistenceManager>
-		<SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
-			<param name="path" value="${indexesBase}/${cn}/${wsp.name}/index" />
+		<SearchIndex
+			class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+			<param name="path"
+				value="${indexesBase}/${cn}/${wsp.name}/index" />
 			<param name="extractorPoolSize" value="${extractorPoolSize}" />
 			<param name="cacheSize" value="${searchCacheSize}" />
-			<param name="maxVolatileIndexSize" value="${maxVolatileIndexSize}" />
-<!-- 			<param name="tikaConfigPath" value="${indexesBase}/${cn}/tika-config.xml" /> -->
+			<param name="maxVolatileIndexSize"
+				value="${maxVolatileIndexSize}" />
+			<!-- <param name="tikaConfigPath" value="${indexesBase}/${cn}/tika-config.xml" 
+				/> -->
 			<param name="supportHighlighting" value="true" />
 		</SearchIndex>
 		<WorkspaceSecurity>
@@ -54,7 +70,8 @@
 
 	<!-- Versioning -->
 	<Versioning rootPath="${rep.home}/version">
-		<FileSystem class="org.apache.jackrabbit.core.fs.db.DbFileSystem">
+		<FileSystem
+			class="org.apache.jackrabbit.core.fs.db.DbFileSystem">
 			<param name="dataSourceName" value="dataSource" />
 			<param name="schema" value="default" />
 			<param name="schemaObjectPrefix" value="fs_ver_" />
@@ -68,19 +85,24 @@
 	</Versioning>
 
 	<!-- Indexing -->
-	<SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+	<SearchIndex
+		class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
 		<param name="path" value="${indexesBase}/${cn}/index" />
 		<param name="extractorPoolSize" value="${extractorPoolSize}" />
 		<param name="cacheSize" value="${searchCacheSize}" />
-		<param name="maxVolatileIndexSize" value="${maxVolatileIndexSize}" />
-<!-- 		<param name="tikaConfigPath" value="${indexesBase}/${cn}/tika-config.xml" /> -->
+		<param name="maxVolatileIndexSize"
+			value="${maxVolatileIndexSize}" />
+		<!-- <param name="tikaConfigPath" value="${indexesBase}/${cn}/tika-config.xml" 
+			/> -->
 		<param name="supportHighlighting" value="true" />
 	</SearchIndex>
 
 	<!-- Security -->
 	<Security appName="Jackrabbit">
-		<SecurityManager class="org.argeo.security.jackrabbit.ArgeoSecurityManager"
+		<SecurityManager
+			class="org.argeo.security.jackrabbit.ArgeoSecurityManager"
 			workspaceName="security" />
-		<AccessManager class="org.argeo.security.jackrabbit.ArgeoAccessManager" />
+		<AccessManager
+			class="org.argeo.security.jackrabbit.ArgeoAccessManager" />
 	</Security>
 </Repository>
\ No newline at end of file
diff --git a/org.argeo.cms/src/org/argeo/cms/internal/jcr/repository-localfs.xml b/org.argeo.cms/src/org/argeo/cms/internal/jcr/repository-localfs.xml
index b88907919..0074123db 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/jcr/repository-localfs.xml
+++ b/org.argeo.cms/src/org/argeo/cms/internal/jcr/repository-localfs.xml
@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Repository PUBLIC "Jackrabbit 2.6" "http://jackrabbit.apache.org/dtd/repository-2.6.dtd">
+<!DOCTYPE Repository [
+	<!ENTITY % repository-elements
+		PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 2.6 Elements//EN"
+		"http://jackrabbit.apache.org/dtd/repository-2.6-elements.dtd">
+	%repository-elements;
+	<!ENTITY % repository
+		PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 2.6//EN"
+		"http://jackrabbit.apache.org/dtd/repository-2.6.dtd">
+	%repository;
+]>
 <Repository>
 	<!-- File system and datastore -->
 	<FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
diff --git a/org.argeo.cms/src/org/argeo/cms/internal/jcr/repository-memory.xml b/org.argeo.cms/src/org/argeo/cms/internal/jcr/repository-memory.xml
index 3630a149d..4f5736237 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/jcr/repository-memory.xml
+++ b/org.argeo.cms/src/org/argeo/cms/internal/jcr/repository-memory.xml
@@ -1,5 +1,14 @@
 <?xml version="1.0"?>
-<!DOCTYPE Repository PUBLIC "Jackrabbit 2.6" "http://jackrabbit.apache.org/dtd/repository-2.6.dtd">
+<!DOCTYPE Repository [
+	<!ENTITY % repository-elements
+		PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 2.6 Elements//EN"
+		"http://jackrabbit.apache.org/dtd/repository-2.6-elements.dtd">
+	%repository-elements;
+	<!ENTITY % repository
+		PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 2.6//EN"
+		"http://jackrabbit.apache.org/dtd/repository-2.6.dtd">
+	%repository;
+]>
 <Repository>
 	<!-- File system and datastore -->
 	<FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem" />
diff --git a/org.argeo.cms/src/org/argeo/cms/internal/jcr/repository-postgresql.xml b/org.argeo.cms/src/org/argeo/cms/internal/jcr/repository-postgresql.xml
index de2f245ad..6f87abf07 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/jcr/repository-postgresql.xml
+++ b/org.argeo.cms/src/org/argeo/cms/internal/jcr/repository-postgresql.xml
@@ -1,5 +1,14 @@
 <?xml version="1.0"?>
-<!DOCTYPE Repository PUBLIC "Jackrabbit 2.6" "http://jackrabbit.apache.org/dtd/repository-2.6.dtd">
+<!DOCTYPE Repository [
+	<!ENTITY % repository-elements
+		PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 2.6 Elements//EN"
+		"http://jackrabbit.apache.org/dtd/repository-2.6-elements.dtd">
+	%repository-elements;
+	<!ENTITY % repository
+		PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 2.6//EN"
+		"http://jackrabbit.apache.org/dtd/repository-2.6.dtd">
+	%repository;
+]>
 <Repository>
 	<!-- Shared datasource -->
 	<DataSources>
diff --git a/org.argeo.cms/src/org/argeo/cms/internal/jcr/repository-postgresql_cluster.xml b/org.argeo.cms/src/org/argeo/cms/internal/jcr/repository-postgresql_cluster.xml
index 488ad6b72..0ea64a715 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/jcr/repository-postgresql_cluster.xml
+++ b/org.argeo.cms/src/org/argeo/cms/internal/jcr/repository-postgresql_cluster.xml
@@ -1,5 +1,14 @@
 <?xml version="1.0"?>
-<!DOCTYPE Repository PUBLIC "Jackrabbit 2.6" "http://jackrabbit.apache.org/dtd/repository-2.6.dtd">
+<!DOCTYPE Repository [
+	<!ENTITY % repository-elements
+		PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 2.6 Elements//EN"
+		"http://jackrabbit.apache.org/dtd/repository-2.6-elements.dtd">
+	%repository-elements;
+	<!ENTITY % repository
+		PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 2.6//EN"
+		"http://jackrabbit.apache.org/dtd/repository-2.6.dtd">
+	%repository;
+]>
 <Repository>
 	<!-- Shared datasource -->
 	<DataSources>
diff --git a/org.argeo.cms/src/org/argeo/cms/internal/jcr/repository-postgresql_cluster_ds.xml b/org.argeo.cms/src/org/argeo/cms/internal/jcr/repository-postgresql_cluster_ds.xml
index ff181f195..605897fbe 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/jcr/repository-postgresql_cluster_ds.xml
+++ b/org.argeo.cms/src/org/argeo/cms/internal/jcr/repository-postgresql_cluster_ds.xml
@@ -1,5 +1,14 @@
 <?xml version="1.0"?>
-<!DOCTYPE Repository PUBLIC "Jackrabbit 2.6" "http://jackrabbit.apache.org/dtd/repository-2.6.dtd">
+<!DOCTYPE Repository [
+	<!ENTITY % repository-elements
+		PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 2.6 Elements//EN"
+		"http://jackrabbit.apache.org/dtd/repository-2.6-elements.dtd">
+	%repository-elements;
+	<!ENTITY % repository
+		PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 2.6//EN"
+		"http://jackrabbit.apache.org/dtd/repository-2.6.dtd">
+	%repository;
+]>
 <Repository>
 	<!-- Shared datasource -->
 	<DataSources>
diff --git a/org.argeo.cms/src/org/argeo/cms/internal/jcr/repository-postgresql_ds.xml b/org.argeo.cms/src/org/argeo/cms/internal/jcr/repository-postgresql_ds.xml
index 5229d1660..92dd88e51 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/jcr/repository-postgresql_ds.xml
+++ b/org.argeo.cms/src/org/argeo/cms/internal/jcr/repository-postgresql_ds.xml
@@ -1,5 +1,14 @@
 <?xml version="1.0"?>
-<!DOCTYPE Repository PUBLIC "Jackrabbit 2.6" "http://jackrabbit.apache.org/dtd/repository-2.6.dtd">
+<!DOCTYPE Repository [
+	<!ENTITY % repository-elements
+		PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 2.6 Elements//EN"
+		"http://jackrabbit.apache.org/dtd/repository-2.6-elements.dtd">
+	%repository-elements;
+	<!ENTITY % repository
+		PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 2.6//EN"
+		"http://jackrabbit.apache.org/dtd/repository-2.6.dtd">
+	%repository;
+]>
 <Repository>
 	<!-- Shared datasource -->
 	<DataSources>
-- 
2.30.2