Introduced FutureDocument

Author: car031

logicaldoc-cmis/src/main/java/com/logicaldoc/cmis/LDRepository.java

@@ -487,7 +487,7 @@ public String createDocumentFromSource(CallContext context, String sourceId, Str
 			transaction.setUser(getSessionUser(context));
 			transaction.setComment("");
 
-			Document newDoc = documentManager.copyToFolder(doc, target, transaction, true, true, true);
+			Document newDoc = documentManager.copyToFolder(doc, target, transaction, true, true, true).getDocument();
 			return getId(newDoc);
 
 		} catch (Exception t) {
@@ -661,7 +661,7 @@ public String createDocument(CallContext context, Properties properties, String
 			transaction.setSessionId(sid);
 
 			document = documentManager.create(new BufferedInputStream(contentStream.getStream(), BUFFER_SIZE), document,
-					transaction);
+					transaction).getDocument();
 
 			return getId(document);
 		} catch (Exception t) {

logicaldoc-cmis/src/test/resources/context.properties

@@ -9,6 +9,7 @@ hibernate.dialect=org.hibernate.dialect.HSQLDialect
 
 index.dir=${user.home}/logicaldoc/data/index/
 conf.userdir=${user.home}/logicaldoc/data/users/
+conf.plugindir=${user.home}/logicaldoc/data/plugins/
 store.1.dir=target/store
 
 tag.minsize=3

logicaldoc-cmis/src/test/resources/log4j2.xml

@@ -5,6 +5,7 @@
 		<Property name="pattern">%d{dd.MM.yyyy HH:mm:ss,SSS} %-5p  (%c:%4L) -- %m%n</Property>
 		<Property name="dateformat">ISO8601</Property>
 	</Properties>
+
 	<Appenders>
 		<RollingFile name="file" fileName="${root}/file.log" filePattern="${root}/file.log.%i">
 			<PatternLayout>
@@ -15,30 +16,59 @@
 			</Policies>
 			<DefaultRolloverStrategy max="1" />
 		</RollingFile>
+		<RollingFile name="hikari" fileName="${root}/hikari.log" filePattern="${root}/hikari.log.%i">
+			<PatternLayout>
+				<Pattern>${pattern}</Pattern>
+			</PatternLayout>
+			<Policies>
+				<SizeBasedTriggeringPolicy size="1 MB" />
+			</Policies>
+			<DefaultRolloverStrategy max="1" />
+		</RollingFile>
 
 		<Console name="console" target="SYSTEM_OUT">
 			<PatternLayout pattern="%m%n" />
 		</Console>
 	</Appenders>
+
 	<Loggers>
-		<Logger name="com.logicaldoc.cmis" level="info" additivity="true">
-			<AppenderRef ref="file" />
+		<Logger name="org.apache.cxf" level="fatal" additivity="false">
+			<Appender-Ref ref="file" />
 		</Logger>
-	    <Logger name="com.logicaldoc" level="warn" additivity="false">
+		<Logger name="com.logicaldoc.core.searchengine" level="error"
+			additivity="false">
 			<Appender-Ref ref="file" />
 		</Logger>
-		<Logger name="org.hibernate" level="error" additivity="false">
-			<AppenderRef ref="file" />
+		<Logger name="com.logicaldoc" level="warn" additivity="false">
+			<Appender-Ref ref="file" />
+		</Logger>
+		<Logger name="com.logicaldoc.util.spring.DatabasePropertySource"
+			level="fatal" additivity="false">
+			<Appender-Ref ref="file" />
+		</Logger>
+		<Logger name="com.zaxxer.hikari" level="debug" additivity="false">
+			<AppenderRef ref="hikari" />
 		</Logger>
 		<Logger name="java.sql" level="error" additivity="false">
 			<AppenderRef ref="file" />
 		</Logger>
 		<Logger name="org.hsqldb" level="error" additivity="false">
 			<AppenderRef ref="file" />
 		</Logger>
-		<Root level="info">
+        <Logger name="com.logicaldoc.core.document.DocumentManagerImpl" level="info" additivity="false">
+			<AppenderRef ref="file" />
+		</Logger>
+		<Logger name="com.logicaldoc.util.io.FileUtil" level="debug" additivity="false">
 			<AppenderRef ref="file" />
+		</Logger>
+		<Logger name="org.hsqldb" level="debug" additivity="false">
+			<AppenderRef ref="file" />
+		</Logger>
+
+		<Root level="fatal">
 			<AppenderRef ref="console" />
 		</Root>
 	</Loggers>
-</Configuration>
+
+
+</Configuration>	

logicaldoc-core/src/main/java/com/logicaldoc/core/automation/DocTool.java

@@ -304,7 +304,7 @@ public Document create(Document doc, File file, String username) {
 
 		DocumentManager manager = Context.get(DocumentManager.class);
 		try {
-			return manager.create(file, doc, transaction);
+			return manager.create(file, doc, transaction).getDocument();
 		} catch (PersistenceException e) {
 			log.error(e.getMessage(), e);
 			return null;
@@ -384,7 +384,7 @@ public Document copy(Document doc, String targetPath, boolean links, boolean not
 		transaction.setUser(user);
 
 		try {
-			return manager.copyToFolder(doc, folder, transaction, links, notes, security);
+			return manager.copyToFolder(doc, folder, transaction, links, notes, security).getDocument();
 		} catch (PersistenceException | IOException e) {
 			log.error(e.getMessage(), e);
 			return null;
@@ -580,7 +580,7 @@ public Document copyResource(Document doc, String fileVersion, String suffix, St
 			docVO.setLanguage(doc.getLanguage());
 
 			DocumentManager manager = Context.get(DocumentManager.class);
-			return manager.create(tmpFile, docVO, transaction);
+			return manager.create(tmpFile, docVO, transaction).getDocument();
 		} catch (IOException | PersistenceException e) {
 			log.error(e.getMessage(), e);
 			return null;
@@ -683,7 +683,7 @@ public Document merge(Collection<Document> documents, long targetFolderId, Strin
 
 		DocumentManager manager = Context.get(DocumentManager.class);
 		try {
-			return manager.merge(documents, targetFolderId, fileName, transaction);
+			return manager.merge(documents, targetFolderId, fileName, transaction).getDocument();
 		} catch (IOException | PersistenceException e) {
 			log.error(e.getMessage(), e);
 			return null;

logicaldoc-core/src/main/java/com/logicaldoc/core/automation/MailTool.java

@@ -328,7 +328,7 @@ public List<Document> extractAttachments(Document doc, String filterFileName, St
 							transaction.setUser(user);
 
 							DocumentManager manager = Context.get(DocumentManager.class);
-							Document attDoc = manager.create(tmpFile, docVO, transaction);
+							Document attDoc = manager.create(tmpFile, docVO, transaction).getDocument();
 							createdDocs.add(attDoc);
 						} finally {
 							if (tmpFile != null)

logicaldoc-core/src/main/java/com/logicaldoc/core/conversion/FormatConverterManager.java

@@ -69,6 +69,7 @@ public class FormatConverterManager {
 
 	@Resource(name = "ContextProperties")
 	protected ContextProperties config;
+
 	// Key is the src_extension-dst_extension, value is a collection of
 	// converters
 	private Map<String, List<FormatConverter>> converters = new HashMap<>();
@@ -223,7 +224,7 @@ public Document convert(Document document, String fileVersion, String format, Do
 
 				DocumentHistory createHistory = new DocumentHistory(transaction);
 				createHistory.setComment(null);
-				return documentManager.create(out, docVO, createHistory);
+				return documentManager.create(out, docVO, createHistory).getDocument();
 			} else
 				throw new IOException("The conversion was not done");
 		} finally {