From: Mathieu Baudier <mbaudier@argeo.org>
Date: Mon, 1 Oct 2018 06:34:21 +0000 (+0200)
Subject: Adapt to updates and additions in Argeo TP
X-Git-Tag: argeo-commons-2.1.76~45
X-Git-Url: https://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=commitdiff_plain;h=50e8c32c6bfcf903b2e123c8751143bdbc615afc

Adapt to updates and additions in Argeo TP
---

diff --git a/dep/org.argeo.dep.cms.e4.rap/pom.xml b/dep/org.argeo.dep.cms.e4.rap/pom.xml
index 0d5b9d0de..c32bb4a1c 100644
--- a/dep/org.argeo.dep.cms.e4.rap/pom.xml
+++ b/dep/org.argeo.dep.cms.e4.rap/pom.xml
@@ -30,10 +30,6 @@
 		</dependency>
 
 		<!-- Misc Third Parties -->
-		<dependency>
-			<groupId>org.argeo.tp.apache</groupId>
-			<artifactId>org.apache.tika.parser</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.bouncycastle</groupId>
 			<artifactId>bcmail</artifactId>
diff --git a/dep/org.argeo.dep.cms.node/pom.xml b/dep/org.argeo.dep.cms.node/pom.xml
index 556b48196..286beb7e1 100644
--- a/dep/org.argeo.dep.cms.node/pom.xml
+++ b/dep/org.argeo.dep.cms.node/pom.xml
@@ -153,6 +153,10 @@
 			<groupId>org.argeo.tp.apache</groupId>
 			<artifactId>org.apache.tika.core</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.apache</groupId>
+			<artifactId>org.apache.tika.parsers</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.apache</groupId>
 			<artifactId>org.apache.lucene</artifactId>
diff --git a/dep/org.argeo.dep.cms.platform/pom.xml b/dep/org.argeo.dep.cms.platform/pom.xml
index 61db9f435..a22c7a9b7 100644
--- a/dep/org.argeo.dep.cms.platform/pom.xml
+++ b/dep/org.argeo.dep.cms.platform/pom.xml
@@ -37,10 +37,10 @@
 		</dependency>
 
 		<!-- Misc Third Parties -->
-		<dependency>
-			<groupId>org.argeo.tp.apache</groupId>
-			<artifactId>org.apache.tika.parser</artifactId>
-		</dependency>
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.argeo.tp.apache</groupId> -->
+<!-- 			<artifactId>org.apache.tika.parser</artifactId> -->
+<!-- 		</dependency> -->
 		<dependency>
 			<groupId>org.argeo.tp.bouncycastle</groupId>
 			<artifactId>bcmail</artifactId>
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 11a1a523a..ace0fa5ee 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
@@ -43,6 +43,8 @@
 			<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="supportHighlighting" value="true" />
 		</SearchIndex>
 		<WorkspaceSecurity>
 			<AccessControlProvider
@@ -71,6 +73,8 @@
 		<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="supportHighlighting" value="true" />
 	</SearchIndex>
 
 	<!-- Security -->
diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsState.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsState.java
index 0990181f2..e3d48a6f4 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsState.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsState.java
@@ -98,6 +98,21 @@ public class CmsState implements NodeState {
 			throw new CmsException("Usupported transaction manager type " + tmType);
 		}
 
+		
+		// POI
+//		POIXMLTypeLoader.setClassLoader(CTConnection.class.getClassLoader());
+		
+		// Tika
+//		OpenDocumentParser odfParser = new OpenDocumentParser();
+//		bc.registerService(Parser.class, odfParser, new Hashtable());
+//		PDFParser pdfParser = new PDFParser();
+//		bc.registerService(Parser.class, pdfParser, new Hashtable());
+//		OOXMLParser ooxmlParser = new OOXMLParser();
+//		bc.registerService(Parser.class, ooxmlParser, new Hashtable());
+//		TesseractOCRParser ocrParser = new TesseractOCRParser();
+//		ocrParser.setLanguage("ara");
+//		bc.registerService(Parser.class, ocrParser, new Hashtable());
+
 		// JCR
 		RepositoryServiceFactory repositoryServiceFactory = new RepositoryServiceFactory();
 		stopHooks.add(() -> repositoryServiceFactory.shutdown());
diff --git a/org.argeo.jcr/src/org/argeo/jackrabbit/fs/fs-memory.xml b/org.argeo.jcr/src/org/argeo/jackrabbit/fs/fs-memory.xml
index c7bab0d69..f2541fb4e 100644
--- a/org.argeo.jcr/src/org/argeo/jackrabbit/fs/fs-memory.xml
+++ b/org.argeo.jcr/src/org/argeo/jackrabbit/fs/fs-memory.xml
@@ -2,43 +2,53 @@
 <!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" />
+	<FileSystem
+		class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem" />
 
 	<!-- Workspace templates -->
 	<Workspaces rootPath="${rep.home}/workspaces"
 		defaultWorkspace="main" configRootPath="/workspaces" />
 	<Workspace name="${wsp.name}">
-		<FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem" />
+		<FileSystem
+			class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem" />
 		<PersistenceManager
 			class="org.apache.jackrabbit.core.persistence.bundle.BundleFsPersistenceManager">
 		</PersistenceManager>
-		<SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+		<SearchIndex
+			class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
 			<param name="path" value="${wsp.home}/index" />
 			<param name="directoryManagerClass"
 				value="org.apache.jackrabbit.core.query.lucene.directory.RAMDirectoryManager" />
-			<FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem" />
+			<param name="extractorPoolSize" value="0" />
+			<FileSystem
+				class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem" />
 		</SearchIndex>
 	</Workspace>
 
 	<!-- Versioning -->
 	<Versioning rootPath="${rep.home}/version">
-		<FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem" />
+		<FileSystem
+			class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem" />
 		<PersistenceManager
 			class="org.apache.jackrabbit.core.persistence.bundle.BundleFsPersistenceManager">
 		</PersistenceManager>
 	</Versioning>
 
 	<!-- Indexing -->
-	<SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+	<SearchIndex
+		class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
 		<param name="path" value="${rep.home}/index" />
 		<param name="directoryManagerClass"
 			value="org.apache.jackrabbit.core.query.lucene.directory.RAMDirectoryManager" />
-		<FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem" />
+		<param name="extractorPoolSize" value="0" />
+		<FileSystem
+			class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem" />
 	</SearchIndex>
 
 	<!-- Security -->
 	<Security appName="Jackrabbit">
-		<LoginModule class="org.apache.jackrabbit.core.security.SimpleLoginModule" />
+		<LoginModule
+			class="org.apache.jackrabbit.core.security.SimpleLoginModule" />
 		<!-- <SecurityManager class="org.argeo.security.jackrabbit.ArgeoSecurityManager" -->
 		<!-- workspaceName="security" /> -->
 		<!-- <AccessManager class="org.argeo.security.jackrabbit.ArgeoAccessManager" 
diff --git a/org.argeo.jcr/src/org/argeo/jcr/fs/BinaryChannel.java b/org.argeo.jcr/src/org/argeo/jcr/fs/BinaryChannel.java
index 9213b729d..94eb70482 100644
--- a/org.argeo.jcr/src/org/argeo/jcr/fs/BinaryChannel.java
+++ b/org.argeo.jcr/src/org/argeo/jcr/fs/BinaryChannel.java
@@ -12,6 +12,8 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardOpenOption;
 
+import javax.activation.FileTypeMap;
+import javax.activation.MimetypesFileTypeMap;
 import javax.jcr.Binary;
 import javax.jcr.Node;
 import javax.jcr.Property;
@@ -31,6 +33,16 @@ public class BinaryChannel implements SeekableByteChannel {
 	// private ByteBuffer toWrite;
 	private FileChannel fc = null;
 
+	private static FileTypeMap fileTypeMap;
+
+	static {
+		try {
+			fileTypeMap = new MimetypesFileTypeMap("/etc/mime.types");
+		} catch (IOException e) {
+			fileTypeMap = FileTypeMap.getDefaultFileTypeMap();
+		}
+	}
+
 	public BinaryChannel(Node file) throws RepositoryException, IOException {
 		this.file = file;
 		// int capacity = 1024 * 1024;
@@ -45,6 +57,11 @@ public class BinaryChannel implements SeekableByteChannel {
 					this.binary = data.getSession().getValueFactory().createBinary(in);
 				}
 				data.setProperty(Property.JCR_DATA, this.binary);
+
+				// MIME type
+				String mime = fileTypeMap.getContentType(file.getName());
+				data.setProperty(Property.JCR_MIMETYPE, mime);
+
 				data.getSession().save();
 			}
 		} else {
diff --git a/pom.xml b/pom.xml
index e9642e07b..02c0281bd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
 	<!-- <url>http://repo.argeo.org/data/docs/argeo-2.1/site/argeo-commons/</url> -->
 	<properties>
 		<version.argeo-commons>2.1.76-SNAPSHOT</version.argeo-commons>
-		<version.argeo-tp>2.1.21-SNAPSHOT</version.argeo-tp>
+		<version.argeo-tp>2.1.21</version.argeo-tp>
 		<!-- RPM -->
 		<argeo.rpm.release>7</argeo.rpm.release>
 		<argeo.rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2/el7</argeo.rpm.stagingRepository>