projects
/
lgpl
/
argeo-commons.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
bc59d52
)
Revert "Improve DTD definitions in Jackrabbit repository configurations."
author
Mathieu Baudier <mbaudier@argeo.org>
Tue, 22 Dec 2020 07:22:17 +0000
(08:22 +0100)
committer
Mathieu Baudier <mbaudier@argeo.org>
Tue, 22 Dec 2020 07:22:17 +0000
(08:22 +0100)
This reverts commit
bc59d52e2dbf0c388d5ce2c245a3907332fe5355
.
org.argeo.cms/src/org/argeo/cms/internal/jcr/repository-h2.xml
patch
|
blob
|
history
org.argeo.cms/src/org/argeo/cms/internal/jcr/repository-localfs.xml
patch
|
blob
|
history
org.argeo.cms/src/org/argeo/cms/internal/jcr/repository-memory.xml
patch
|
blob
|
history
org.argeo.cms/src/org/argeo/cms/internal/jcr/repository-postgresql.xml
patch
|
blob
|
history
org.argeo.cms/src/org/argeo/cms/internal/jcr/repository-postgresql_cluster.xml
patch
|
blob
|
history
org.argeo.cms/src/org/argeo/cms/internal/jcr/repository-postgresql_cluster_ds.xml
patch
|
blob
|
history
org.argeo.cms/src/org/argeo/cms/internal/jcr/repository-postgresql_ds.xml
patch
|
blob
|
history
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 4c1b8e19c6792bfe575af7627f627bd09a9ea2de..ace0fa5eede195fb672d01c88809245bb01c3aa5 100644
(file)
--- 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,14
+1,5
@@
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
-<!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;
-]>
+<!DOCTYPE Repository PUBLIC "Jackrabbit 2.6" "http://jackrabbit.apache.org/dtd/repository-2.6.dtd">
<Repository>
<!-- Shared datasource -->
<DataSources>
<Repository>
<!-- Shared datasource -->
<DataSources>
@@
-23,14
+14,12
@@
</DataSources>
<!-- File system and datastore -->
</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>
<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>
<param name="path" value="${rep.home}/datastore" />
</DataStore>
@@
-38,8
+27,7
@@
<Workspaces rootPath="${rep.home}/workspaces"
defaultWorkspace="${defaultWorkspace}" />
<Workspace name="${wsp.name}">
<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_" />
<param name="dataSourceName" value="dataSource" />
<param name="schema" value="default" />
<param name="schemaObjectPrefix" value="${wsp.name}_fs_" />
@@
-50,16
+38,12
@@
<param name="schemaObjectPrefix" value="${wsp.name}_pm_" />
<param name="bundleCacheSize" value="${bundleCacheMB}" />
</PersistenceManager>
<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="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>
<param name="supportHighlighting" value="true" />
</SearchIndex>
<WorkspaceSecurity>
@@
-70,8
+54,7
@@
<!-- Versioning -->
<Versioning rootPath="${rep.home}/version">
<!-- 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_" />
<param name="dataSourceName" value="dataSource" />
<param name="schema" value="default" />
<param name="schemaObjectPrefix" value="fs_ver_" />
@@
-85,24
+68,19
@@
</Versioning>
<!-- Indexing -->
</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="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">
<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" />
workspaceName="security" />
- <AccessManager
- class="org.argeo.security.jackrabbit.ArgeoAccessManager" />
+ <AccessManager class="org.argeo.security.jackrabbit.ArgeoAccessManager" />
</Security>
</Repository>
\ No newline at end of file
</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 0074123db363394284e689939638710755302fef..b889079194b0d4da5cf29a0dd0ccc7f759457060 100644
(file)
--- 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,14
+1,5
@@
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
-<!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;
-]>
+<!DOCTYPE Repository PUBLIC "Jackrabbit 2.6" "http://jackrabbit.apache.org/dtd/repository-2.6.dtd">
<Repository>
<!-- File system and datastore -->
<FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
<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 4f57362379dcb395a703565147540ff7b116923b..3630a149d614f99f16ab4b569a000aadb4be881b 100644
(file)
--- 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,14
+1,5
@@
<?xml version="1.0"?>
<?xml version="1.0"?>
-<!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;
-]>
+<!DOCTYPE Repository PUBLIC "Jackrabbit 2.6" "http://jackrabbit.apache.org/dtd/repository-2.6.dtd">
<Repository>
<!-- File system and datastore -->
<FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem" />
<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 6f87abf0789542480ed6d28bcb080464120df39a..de2f245ad42ae1eaedfa26cfe3e678b062a697fc 100644
(file)
--- 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,14
+1,5
@@
<?xml version="1.0"?>
<?xml version="1.0"?>
-<!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;
-]>
+<!DOCTYPE Repository PUBLIC "Jackrabbit 2.6" "http://jackrabbit.apache.org/dtd/repository-2.6.dtd">
<Repository>
<!-- Shared datasource -->
<DataSources>
<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 0ea64a71533eb1235dc2ea285929f3fff594063c..488ad6b72c3dd9dc05720f7907eb7d3c1d178923 100644
(file)
--- 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,14
+1,5
@@
<?xml version="1.0"?>
<?xml version="1.0"?>
-<!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;
-]>
+<!DOCTYPE Repository PUBLIC "Jackrabbit 2.6" "http://jackrabbit.apache.org/dtd/repository-2.6.dtd">
<Repository>
<!-- Shared datasource -->
<DataSources>
<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 605897fbe938134e7132e34de912d7086402cdcb..ff181f19599f633a39b64985fe67a7debee90d52 100644
(file)
--- 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,14
+1,5
@@
<?xml version="1.0"?>
<?xml version="1.0"?>
-<!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;
-]>
+<!DOCTYPE Repository PUBLIC "Jackrabbit 2.6" "http://jackrabbit.apache.org/dtd/repository-2.6.dtd">
<Repository>
<!-- Shared datasource -->
<DataSources>
<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 92dd88e511b1e9a29626a48abdfcce010c512d57..5229d166034dd7c53fb361b4cecb55c9a62aabd2 100644
(file)
--- 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,14
+1,5
@@
<?xml version="1.0"?>
<?xml version="1.0"?>
-<!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;
-]>
+<!DOCTYPE Repository PUBLIC "Jackrabbit 2.6" "http://jackrabbit.apache.org/dtd/repository-2.6.dtd">
<Repository>
<!-- Shared datasource -->
<DataSources>
<Repository>
<!-- Shared datasource -->
<DataSources>