From 6ead0e527e79af4b363111cdb6e951edb1df8dcb Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 24 Feb 2015 21:47:14 +0000
Subject: [PATCH] Simplify and improve various configurations

git-svn-id: https://svn.argeo.org/slc/trunk@7947 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 demo/log4j.properties                         | 31 +-------
 demo/slc_demo_rap.properties                  | 18 ++---
 .../repository-h2-v1.1.11.xml                 | 79 -------------------
 org.argeo.slc.server.repo/repository-h2.xml   |  9 ++-
 .../repository-pg-dist.xml                    |  9 ++-
 .../repository-pg-docs.xml                    |  9 ++-
 .../repository-pg-java.xml                    |  9 ++-
 .../repository-pg-rpm.xml                     |  9 ++-
 8 files changed, 46 insertions(+), 127 deletions(-)
 delete mode 100644 org.argeo.slc.server.repo/repository-h2-v1.1.11.xml

diff --git a/demo/log4j.properties b/demo/log4j.properties
index 612352cd9..122f42a67 100644
--- a/demo/log4j.properties
+++ b/demo/log4j.properties
@@ -1,39 +1,12 @@
-#log4j.rootLogger=WARN, console
 log4j.rootLogger=WARN, development
 
-## Levels
 log4j.logger.org.argeo=DEBUG
-#log4j.logger.org.argeo.slc.repo=TRACE
-log4j.logger.org.argeo.jackrabbit.remote.ExtendedDispatcherServlet=ERROR
-log4j.logger.org.springframework.web.servlet.PageNotFound=ERROR
-log4j.logger.org.argeo.server.webextender.TomcatDeployer=WARN
-
-#log4j.logger.org.apache=DEBUG
-#log4j.logger.org.springframework.security=DEBUG
-#log4j.logger.org.apache.jackrabbit=DEBUG
-#log4j.logger.org.apache.jackrabbit.spi2dav=DEBUG
-#log4j.logger.org.apache.jackrabbit.core.query.QueryImpl=DEBUG
-
-log4j.logger.org.apache.coyote=INFO
-log4j.logger.org.apache.catalina.core.ContainerBase=INFO
-log4j.logger.org.apache.directory.server=ERROR
-log4j.logger.org.apache.jackrabbit.core.query.lucene=ERROR
-log4j.logger.org.apache.jackrabbit.core.config.ConfigurationErrorHandler=ERROR
-log4j.logger.org.apache.jackrabbit.core.util.db.DbUtility=FATAL
 
 ## Appenders
-# default appender
 log4j.appender.console=org.apache.log4j.ConsoleAppender
 log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern=%d{yyyyMMdd HH:mm:ss} %-5p %m [%t] %c%n
-
-# messages only appender
-log4j.appender.messages=org.apache.log4j.ConsoleAppender
-log4j.appender.messages.layout=org.apache.log4j.PatternLayout
-log4j.appender.messages.layout.ConversionPattern=%m%n
+log4j.appender.console.layout.ConversionPattern= %-5p %d{ISO8601} %m - %c - [%t]%n
 
-# development appender
 log4j.appender.development=org.apache.log4j.ConsoleAppender
 log4j.appender.development.layout=org.apache.log4j.PatternLayout
-log4j.appender.development.layout.ConversionPattern=%d{HH:mm:ss,SSS} [%16.16t] %5p %m (%F:%L) %c%n
-#log4j.appender.development.layout.ConversionPattern=%d{HH:mm:ss,SSS} %5p %m [%16.16t] %c%n
+log4j.appender.development.layout.ConversionPattern=%d{ABSOLUTE} %m (%F:%L) [%t] %p %n
diff --git a/demo/slc_demo_rap.properties b/demo/slc_demo_rap.properties
index 4164d3983..38c361371 100644
--- a/demo/slc_demo_rap.properties
+++ b/demo/slc_demo_rap.properties
@@ -1,22 +1,22 @@
-argeo.osgi.start.3.node=\
-org.eclipse.equinox.http.servlet,\
-org.eclipse.equinox.http.jetty,\
-org.eclipse.rap.rwt.osgi
-
-argeo.osgi.start.4.node=\
+argeo.osgi.start.2.node=\
 org.argeo.cms,\
 
-argeo.osgi.start.5.node=\
+argeo.osgi.start.3.http=\
+org.eclipse.equinox.http.servlet,\
+org.eclipse.equinox.http.jetty
+
+argeo.osgi.start.4.apps=\
+org.eclipse.rap.rwt.osgi,\
 org.eclipse.gemini.blueprint.extender
 
-argeo.osgi.start.5.workbench=\
+argeo.osgi.start.4.workbench=\
 org.eclipse.equinox.http.registry,\
 
 argeo.osgi.start.5.slc=\
 org.argeo.slc.node.jackrabbit,\
-org.argeo.slc.server.repo,\
 org.argeo.slc.agent,\
 org.argeo.slc.agent.jcr,\
+org.argeo.slc.server.repo,\
 
 
 org.osgi.service.http.port=7070
diff --git a/org.argeo.slc.server.repo/repository-h2-v1.1.11.xml b/org.argeo.slc.server.repo/repository-h2-v1.1.11.xml
deleted file mode 100644
index d9ace5d45..000000000
--- a/org.argeo.slc.server.repo/repository-h2-v1.1.11.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Repository PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 1.6//EN"
-                            "http://jackrabbit.apache.org/dtd/repository-2.0.dtd">
-<!-- Old default configuration, still used on some repositories. -->
-<Repository>
-	<!-- Shared datasource -->
-	<DataSources>
-		<DataSource name="dataSource">
-			<param name="driver" value="org.h2.Driver" />
-			<param name="url" value="jdbc:h2:${rep.home}/h2/repository" />
-			<param name="user" value="${slc.repo.jcr.dbuser}" />
-			<param name="password" value="${slc.repo.jcr.dbpassword}" />
-			<param name="databaseType" value="h2" />
-			<param name="maxPoolSize" value="${slc.repo.jcr.maxPoolSize}" />
-		</DataSource>
-	</DataSources>
-
-	<!-- File system and datastore -->
-	<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.db.DbDataStore"> 
-		<param name="dataSourceName" value="dataSource" /> <param name="schemaObjectPrefix" 
-		value="ds_" /> </DataStore> -->
-
-	<!-- Workspace templates -->
-	<Workspaces rootPath="${rep.home}/workspaces"
-		defaultWorkspace="main" />
-	<Workspace name="${wsp.name}">
-		<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_" />
-		</FileSystem>
-		<PersistenceManager
-			class="org.apache.jackrabbit.core.persistence.pool.H2PersistenceManager">
-			<param name="dataSourceName" value="dataSource" />
-			<param name="schemaObjectPrefix" value="${wsp.name}_pm_" />
-		</PersistenceManager>
-		<SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
-			<param name="path" value="${wsp.home}/index" />
-		</SearchIndex>
-	</Workspace>
-
-	<!-- Versioning -->
-	<Versioning rootPath="${rep.home}/version">
-		<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_" />
-		</FileSystem>
-		<PersistenceManager
-			class="org.apache.jackrabbit.core.persistence.pool.H2PersistenceManager">
-			<param name="dataSourceName" value="dataSource" />
-			<param name="schemaObjectPrefix" value="pm_ver_" />
-		</PersistenceManager>
-	</Versioning>
-
-	<!-- Indexing -->
-	<SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
-		<param name="path" value="${rep.home}/repository/index" />
-		<param name="extractorPoolSize" value="2" />
-		<param name="supportHighlighting" value="true" />
-	</SearchIndex>
-
-	<!-- Security -->
-	<Security appName="Jackrabbit">
-		<SecurityManager class="org.argeo.security.jackrabbit.ArgeoSecurityManager"
-			workspaceName="security">
-		</SecurityManager>
-		<AccessManager class="org.argeo.security.jackrabbit.ArgeoAccessManager">
-		</AccessManager>
-		<LoginModule class="org.argeo.security.jackrabbit.ArgeoLoginModule">
-		</LoginModule>
-	</Security>
-</Repository>
\ No newline at end of file
diff --git a/org.argeo.slc.server.repo/repository-h2.xml b/org.argeo.slc.server.repo/repository-h2.xml
index 88a2d934d..18d5ffb91 100644
--- a/org.argeo.slc.server.repo/repository-h2.xml
+++ b/org.argeo.slc.server.repo/repository-h2.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Repository PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 1.6//EN"
-                            "http://jackrabbit.apache.org/dtd/repository-2.0.dtd">
+<!DOCTYPE Repository PUBLIC "Jackrabbit 2.6" "http://jackrabbit.apache.org/dtd/repository-2.6.dtd">
 <Repository>
 	<!-- Shared datasource -->
 	<DataSources>
@@ -38,6 +37,12 @@
 		<SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
 			<param name="path" value="${rep.home}/indexes/workspaces/${wsp.name}" />
 		</SearchIndex>
+		<WorkspaceSecurity>
+			<AccessControlProvider
+				class="org.argeo.security.jackrabbit.ArgeoAccessControlProvider">
+				<param name="allow-unknown-principals" value="true" />
+			</AccessControlProvider>
+		</WorkspaceSecurity>
 	</Workspace>
 
 	<!-- Versioning -->
diff --git a/org.argeo.slc.server.repo/repository-pg-dist.xml b/org.argeo.slc.server.repo/repository-pg-dist.xml
index f140d20f8..f95a15eab 100644
--- a/org.argeo.slc.server.repo/repository-pg-dist.xml
+++ b/org.argeo.slc.server.repo/repository-pg-dist.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Repository PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 1.6//EN"
-                            "http://jackrabbit.apache.org/dtd/repository-2.0.dtd">
+<!DOCTYPE Repository PUBLIC "Jackrabbit 2.6" "http://jackrabbit.apache.org/dtd/repository-2.6.dtd">
 <Repository>
 	<!-- Shared datasource -->
 	<DataSources>
@@ -41,6 +40,12 @@
 		<SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
 			<param name="path" value="${rep.home}/indexes/workspaces/${wsp.name}" />
 		</SearchIndex>
+		<WorkspaceSecurity>
+			<AccessControlProvider
+				class="org.argeo.security.jackrabbit.ArgeoAccessControlProvider">
+				<param name="allow-unknown-principals" value="true" />
+			</AccessControlProvider>
+		</WorkspaceSecurity>
 	</Workspace>
 
 	<!-- Versioning -->
diff --git a/org.argeo.slc.server.repo/repository-pg-docs.xml b/org.argeo.slc.server.repo/repository-pg-docs.xml
index b59162d01..d8a9a6b83 100644
--- a/org.argeo.slc.server.repo/repository-pg-docs.xml
+++ b/org.argeo.slc.server.repo/repository-pg-docs.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Repository PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 1.6//EN"
-                            "http://jackrabbit.apache.org/dtd/repository-2.0.dtd">
+<!DOCTYPE Repository PUBLIC "Jackrabbit 2.6" "http://jackrabbit.apache.org/dtd/repository-2.6.dtd">
 <Repository>
 	<!-- Shared datasource -->
 	<DataSources>
@@ -41,6 +40,12 @@
 		<SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
 			<param name="path" value="${rep.home}/indexes/workspaces/${wsp.name}" />
 		</SearchIndex>
+		<WorkspaceSecurity>
+			<AccessControlProvider
+				class="org.argeo.security.jackrabbit.ArgeoAccessControlProvider">
+				<param name="allow-unknown-principals" value="true" />
+			</AccessControlProvider>
+		</WorkspaceSecurity>
 	</Workspace>
 
 	<!-- Versioning -->
diff --git a/org.argeo.slc.server.repo/repository-pg-java.xml b/org.argeo.slc.server.repo/repository-pg-java.xml
index ff600c99a..254d1bbe9 100644
--- a/org.argeo.slc.server.repo/repository-pg-java.xml
+++ b/org.argeo.slc.server.repo/repository-pg-java.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Repository PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 1.6//EN"
-                            "http://jackrabbit.apache.org/dtd/repository-2.0.dtd">
+<!DOCTYPE Repository PUBLIC "Jackrabbit 2.6" "http://jackrabbit.apache.org/dtd/repository-2.6.dtd">
 <Repository>
 	<!-- Shared datasource -->
 	<DataSources>
@@ -41,6 +40,12 @@
 		<SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
 			<param name="path" value="${rep.home}/indexes/workspaces/${wsp.name}" />
 		</SearchIndex>
+		<WorkspaceSecurity>
+			<AccessControlProvider
+				class="org.argeo.security.jackrabbit.ArgeoAccessControlProvider">
+				<param name="allow-unknown-principals" value="true" />
+			</AccessControlProvider>
+		</WorkspaceSecurity>
 	</Workspace>
 
 	<!-- Versioning -->
diff --git a/org.argeo.slc.server.repo/repository-pg-rpm.xml b/org.argeo.slc.server.repo/repository-pg-rpm.xml
index b9f6d84d2..ee5b1fd67 100644
--- a/org.argeo.slc.server.repo/repository-pg-rpm.xml
+++ b/org.argeo.slc.server.repo/repository-pg-rpm.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Repository PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 1.6//EN"
-                            "http://jackrabbit.apache.org/dtd/repository-2.0.dtd">
+<!DOCTYPE Repository PUBLIC "Jackrabbit 2.6" "http://jackrabbit.apache.org/dtd/repository-2.6.dtd">
 <Repository>
 	<!-- Shared datasource -->
 	<DataSources>
@@ -41,6 +40,12 @@
 		<SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
 			<param name="path" value="${rep.home}/indexes/workspaces/${wsp.name}" />
 		</SearchIndex>
+		<WorkspaceSecurity>
+			<AccessControlProvider
+				class="org.argeo.security.jackrabbit.ArgeoAccessControlProvider">
+				<param name="allow-unknown-principals" value="true" />
+			</AccessControlProvider>
+		</WorkspaceSecurity>
 	</Workspace>
 
 	<!-- Versioning -->
-- 
2.39.2