From ce4a2662a412954eb25be21666b7a26133952224 Mon Sep 17 00:00:00 2001 From: CodrinChirica Date: Wed, 14 Mar 2018 09:54:11 +0200 Subject: [PATCH 01/16] REPO-3051: Upgrade Libraries: Guava (#91) - set guava library version to 24.0-jre --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e151e6c72b..22634ac8bc 100644 --- a/pom.xml +++ b/pom.xml @@ -629,7 +629,7 @@ com.google.guava guava - 11.0.2 + 24.0-jre org.springframework.security From 6ffefb5d934a89e45ef7f8f78c2b57b8f611cdd2 Mon Sep 17 00:00:00 2001 From: alfresco-build Date: Wed, 14 Mar 2018 08:32:39 +0000 Subject: [PATCH 02/16] [maven-release-plugin] prepare release alfresco-repository-6.32 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 22634ac8bc..561e464425 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-repository Alfresco Repository - 6.32-SNAPSHOT + 6.32 jar @@ -15,7 +15,7 @@ scm:git:git@github.com:Alfresco/alfresco-repository.git scm:git:git@github.com:Alfresco/alfresco-repository.git https://github.com/Alfresco/alfresco-repository - HEAD + alfresco-repository-6.32 From 5b34b4a3da331b9213e8226ca6b89f6642e8f82b Mon Sep 17 00:00:00 2001 From: alfresco-build Date: Wed, 14 Mar 2018 08:32:45 +0000 Subject: [PATCH 03/16] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 561e464425..ba26de453f 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-repository Alfresco Repository - 6.32 + 6.33-SNAPSHOT jar @@ -15,7 +15,7 @@ scm:git:git@github.com:Alfresco/alfresco-repository.git scm:git:git@github.com:Alfresco/alfresco-repository.git https://github.com/Alfresco/alfresco-repository - alfresco-repository-6.32 + HEAD From c11e28d091ece45b92b3a2707a0e7796773ac483 Mon Sep 17 00:00:00 2001 From: Cristian Turlica Date: Wed, 14 Mar 2018 17:18:12 +0200 Subject: [PATCH 04/16] REPO-3150: Upgrade Libraries: Bouncycastle - updated bouncycastle version to 1.59 --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index ba26de453f..9d68c4a8ab 100644 --- a/pom.xml +++ b/pom.xml @@ -395,13 +395,13 @@ org.bouncycastle - bcprov-jdk15 - 1.46 + bcprov-jdk15on + 1.59 org.bouncycastle - bcmail-jdk15 - 1.46 + bcmail-jdk15on + 1.59 com.googlecode.mp4parser From 4b9ada6d32ce8b2e82b2ee7f5715d31c078cd08d Mon Sep 17 00:00:00 2001 From: "andrei.bazavan" Date: Wed, 14 Mar 2018 17:32:02 +0200 Subject: [PATCH 05/16] REPO-3256:EOL Disable CIFS and FTP by default - Cifs and FTP has been disabled by default --- .../subsystems/fileServers/default/file-servers.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/alfresco/subsystems/fileServers/default/file-servers.properties b/src/main/resources/alfresco/subsystems/fileServers/default/file-servers.properties index 91fd39bec2..f01c998059 100644 --- a/src/main/resources/alfresco/subsystems/fileServers/default/file-servers.properties +++ b/src/main/resources/alfresco/subsystems/fileServers/default/file-servers.properties @@ -21,7 +21,7 @@ filesystem.setReadOnlyFlagOnFolders=false ### CIFS Server Configuration ### -cifs.enabled=true +cifs.enabled=false cifs.serverName=${localname}A cifs.domain= cifs.broadcast=255.255.255.255 @@ -74,7 +74,7 @@ cifs.pseudoFiles.shareURL.enabled=true cifs.pseudoFiles.shareURL.fileName=__Share.url ### FTP Server Configuration ### -ftp.enabled=true +ftp.enabled=false ftp.port=21 # Timeout for socket, that is waiting response from client ftp.sessionTimeout=5000 From 704c9b068135e97c3ac2367d1b1db727c4769cd9 Mon Sep 17 00:00:00 2001 From: alfresco-build Date: Wed, 14 Mar 2018 18:10:57 +0000 Subject: [PATCH 06/16] [maven-release-plugin] prepare release alfresco-repository-6.33 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 9d68c4a8ab..0fa9fee1b0 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-repository Alfresco Repository - 6.33-SNAPSHOT + 6.33 jar @@ -15,7 +15,7 @@ scm:git:git@github.com:Alfresco/alfresco-repository.git scm:git:git@github.com:Alfresco/alfresco-repository.git https://github.com/Alfresco/alfresco-repository - HEAD + alfresco-repository-6.33 From 94c55baa16759beab289d9dc3925b28061ecb0f7 Mon Sep 17 00:00:00 2001 From: alfresco-build Date: Wed, 14 Mar 2018 18:11:06 +0000 Subject: [PATCH 07/16] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 0fa9fee1b0..a1daa29fbc 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-repository Alfresco Repository - 6.33 + 6.34-SNAPSHOT jar @@ -15,7 +15,7 @@ scm:git:git@github.com:Alfresco/alfresco-repository.git scm:git:git@github.com:Alfresco/alfresco-repository.git https://github.com/Alfresco/alfresco-repository - alfresco-repository-6.33 + HEAD From fe29e45484f1df830d52ed70d4e9d5ef130386df Mon Sep 17 00:00:00 2001 From: alfresco-build Date: Thu, 15 Mar 2018 09:55:25 +0000 Subject: [PATCH 08/16] [maven-release-plugin] prepare release alfresco-repository-6.34 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index a1daa29fbc..61e1ac92cf 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-repository Alfresco Repository - 6.34-SNAPSHOT + 6.34 jar @@ -15,7 +15,7 @@ scm:git:git@github.com:Alfresco/alfresco-repository.git scm:git:git@github.com:Alfresco/alfresco-repository.git https://github.com/Alfresco/alfresco-repository - HEAD + alfresco-repository-6.34 From 2674a86aa2afee48633407caff3aeae63eab7337 Mon Sep 17 00:00:00 2001 From: alfresco-build Date: Thu, 15 Mar 2018 09:55:33 +0000 Subject: [PATCH 09/16] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 61e1ac92cf..e65ff61671 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-repository Alfresco Repository - 6.34 + 6.35-SNAPSHOT jar @@ -15,7 +15,7 @@ scm:git:git@github.com:Alfresco/alfresco-repository.git scm:git:git@github.com:Alfresco/alfresco-repository.git https://github.com/Alfresco/alfresco-repository - alfresco-repository-6.34 + HEAD From 2aa7e548ac216ad3f1a2d407a3c54da1154ca418 Mon Sep 17 00:00:00 2001 From: Erik Knizat Date: Fri, 16 Mar 2018 14:52:39 +0000 Subject: [PATCH 10/16] Update pom.xml * Update hb data sender version from 1.0.5 to 1.0.6 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e65ff61671..4367c5aea4 100644 --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,7 @@ 8.1 7.0 1.1 - 1.0.5 + 1.0.6 5.0.4.RELEASE From 5281d26836a8caf3ffb4143d9b8e9111c9f58001 Mon Sep 17 00:00:00 2001 From: alfresco-build Date: Fri, 16 Mar 2018 15:58:23 +0000 Subject: [PATCH 11/16] [maven-release-plugin] prepare release alfresco-repository-6.35 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 4367c5aea4..a7ef80fe34 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-repository Alfresco Repository - 6.35-SNAPSHOT + 6.35 jar @@ -15,7 +15,7 @@ scm:git:git@github.com:Alfresco/alfresco-repository.git scm:git:git@github.com:Alfresco/alfresco-repository.git https://github.com/Alfresco/alfresco-repository - HEAD + alfresco-repository-6.35 From b9bff2849b9ccfd3d88d4e3b655660a74284e6cc Mon Sep 17 00:00:00 2001 From: alfresco-build Date: Fri, 16 Mar 2018 15:58:30 +0000 Subject: [PATCH 12/16] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index a7ef80fe34..822fd41205 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-repository Alfresco Repository - 6.35 + 6.36-SNAPSHOT jar @@ -15,7 +15,7 @@ scm:git:git@github.com:Alfresco/alfresco-repository.git scm:git:git@github.com:Alfresco/alfresco-repository.git https://github.com/Alfresco/alfresco-repository - alfresco-repository-6.35 + HEAD From 3e19ebe75f59711380df9c7adfa9dcc4e2e8f6a3 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Sat, 17 Mar 2018 12:27:55 +0000 Subject: [PATCH 13/16] REPO-3335 Enterprise Docker and docker-compose simplified by pulling in transformer images --- .../content/JodConverterSharedInstance.java | 131 ++++++++++-------- .../default/jodconverter-context.xml | 5 +- 2 files changed, 76 insertions(+), 60 deletions(-) diff --git a/src/main/java/org/alfresco/repo/content/JodConverterSharedInstance.java b/src/main/java/org/alfresco/repo/content/JodConverterSharedInstance.java index 6a859d3341..a563b2ec29 100644 --- a/src/main/java/org/alfresco/repo/content/JodConverterSharedInstance.java +++ b/src/main/java/org/alfresco/repo/content/JodConverterSharedInstance.java @@ -2,7 +2,7 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2017 Alfresco Software Limited + * Copyright (C) 2005 - 2018 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -41,6 +41,8 @@ import org.artofsolving.jodconverter.office.OfficeManager; import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.InitializingBean; +///////// THIS FILE IS A COPY OF THE CODE IN alfresco-docker-transformers ///////////// + /** * Makes use of the JodConverter library and an installed * OpenOffice application to perform OpenOffice-driven conversions. @@ -67,6 +69,7 @@ public class JodConverterSharedInstance implements InitializingBean, DisposableB // "${jodconverter.maxTasksPerProcess}" will be injected. private Integer maxTasksPerProcess; + private String url; private String officeHome; private int[] portNumbers; private Long taskExecutionTimeout; @@ -87,7 +90,12 @@ public class JodConverterSharedInstance implements InitializingBean, DisposableB this.maxTasksPerProcess = l.intValue(); } } - + + public void setUrl(String url) + { + this.url = url == null ? null : url.trim(); + } + public void setOfficeHome(String officeHome) { this.officeHome = officeHome == null ? "" : officeHome.trim(); @@ -275,7 +283,7 @@ public class JodConverterSharedInstance implements InitializingBean, DisposableB */ public boolean isAvailable() { - final boolean result = isAvailable && officeManager != null; + final boolean result = isAvailable && (officeManager != null || (url != null && !url.isEmpty())); return result; } @@ -306,6 +314,7 @@ public class JodConverterSharedInstance implements InitializingBean, DisposableB logger.debug(" jodconverter.taskExecutionTimeout = " + taskExecutionTimeout); logger.debug(" jodconverter.taskQueueTimeout = " + taskQueueTimeout); logger.debug(" jodconverter.connectTimeout = " + connectTimeout); + logger.debug(" jodconverter.url = " + url); } // Only start the JodConverter instance(s) if the subsystem is enabled. @@ -314,71 +323,75 @@ public class JodConverterSharedInstance implements InitializingBean, DisposableB return; } - logAllSofficeFilesUnderOfficeHome(); - - try + if (url == null || url.isEmpty()) { - DefaultOfficeManagerConfiguration defaultOfficeMgrConfig = new DefaultOfficeManagerConfiguration(); - if (maxTasksPerProcess != null && maxTasksPerProcess > 0) + + logAllSofficeFilesUnderOfficeHome(); + + try { - defaultOfficeMgrConfig.setMaxTasksPerProcess(maxTasksPerProcess); + DefaultOfficeManagerConfiguration defaultOfficeMgrConfig = new DefaultOfficeManagerConfiguration(); + if (maxTasksPerProcess != null && maxTasksPerProcess > 0) + { + defaultOfficeMgrConfig.setMaxTasksPerProcess(maxTasksPerProcess); + } + if (officeHome != null && officeHome.length() != 0) + { + defaultOfficeMgrConfig.setOfficeHome(officeHome); + } + if (portNumbers != null && portNumbers.length != 0) + { + defaultOfficeMgrConfig.setPortNumbers(portNumbers); + } + if (taskExecutionTimeout != null && taskExecutionTimeout > 0) + { + defaultOfficeMgrConfig.setTaskExecutionTimeout(taskExecutionTimeout); + } + if (taskQueueTimeout != null && taskQueueTimeout > 0) + { + defaultOfficeMgrConfig.setTaskQueueTimeout(taskQueueTimeout); + } + if (templateProfileDir != null) + { + defaultOfficeMgrConfig.setTemplateProfileDir(templateProfileDir); + } + if (connectTimeout != null) + { + defaultOfficeMgrConfig.setConnectTimeout(connectTimeout); + } + // Try to configure and start the JodConverter library. + officeManager = defaultOfficeMgrConfig.buildOfficeManager(); + officeManager.start(); } - if (officeHome != null) + catch (IllegalStateException isx) { - defaultOfficeMgrConfig.setOfficeHome(officeHome); + if (logger.isErrorEnabled()) + { + logger.error("Unable to pre-initialise JodConverter library. " + + "The following error is shown for informational purposes only.", isx); + } + return; } - if (portNumbers != null && portNumbers.length != 0) + catch (OfficeException ox) { - defaultOfficeMgrConfig.setPortNumbers(portNumbers); + if (logger.isErrorEnabled()) + { + logger.error("Unable to start JodConverter library. " + + "The following error is shown for informational purposes only.", ox); + } + + // We need to let it continue (comment-out return statement) even if an error occurs. See MNT-13706 and associated issues. + //return; } - if (taskExecutionTimeout != null && taskExecutionTimeout > 0) + catch (Exception x) { - defaultOfficeMgrConfig.setTaskExecutionTimeout(taskExecutionTimeout); + if (logger.isErrorEnabled()) + { + logger.error("Unexpected error in configuring or starting the JodConverter library." + + "The following error is shown for informational purposes only.", x); + } + return; } - if (taskQueueTimeout != null && taskQueueTimeout > 0) - { - defaultOfficeMgrConfig.setTaskQueueTimeout(taskQueueTimeout); - } - if (templateProfileDir != null) - { - defaultOfficeMgrConfig.setTemplateProfileDir(templateProfileDir); - } - if (connectTimeout != null) - { - defaultOfficeMgrConfig.setConnectTimeout(connectTimeout); - } - // Try to configure and start the JodConverter library. - officeManager = defaultOfficeMgrConfig.buildOfficeManager(); - officeManager.start(); - } - catch (IllegalStateException isx) - { - if (logger.isErrorEnabled()) - { - logger.error("Unable to pre-initialise JodConverter library. " - + "The following error is shown for informational purposes only.", isx); - } - return; - } - catch (OfficeException ox) - { - if (logger.isErrorEnabled()) - { - logger.error("Unable to start JodConverter library. " - + "The following error is shown for informational purposes only.", ox); - } - - // We need to let it continue (comment-out return statement) even if an error occurs. See MNT-13706 and associated issues. - //return; - } - catch (Exception x) - { - if (logger.isErrorEnabled()) - { - logger.error("Unexpected error in configuring or starting the JodConverter library." - + "The following error is shown for informational purposes only.",x); - } - return; } // If any exceptions are thrown in the above code, then isAvailable diff --git a/src/main/resources/alfresco/subsystems/OOoJodconverter/default/jodconverter-context.xml b/src/main/resources/alfresco/subsystems/OOoJodconverter/default/jodconverter-context.xml index b13acb5744..d628a278cd 100644 --- a/src/main/resources/alfresco/subsystems/OOoJodconverter/default/jodconverter-context.xml +++ b/src/main/resources/alfresco/subsystems/OOoJodconverter/default/jodconverter-context.xml @@ -2,8 +2,11 @@ + + ${jodconverter.url} + - ${jodconverter.officeHome} + ${jodconverter.officeHome} ${jodconverter.maxTasksPerProcess} From 7052783226f492c706d43146c3ca092acbef9fda Mon Sep 17 00:00:00 2001 From: Cristian Turlica Date: Mon, 19 Mar 2018 09:48:33 +0200 Subject: [PATCH 14/16] Upgraded core to 7.1 and data-model 8.2 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 822fd41205..02c6a26130 100644 --- a/pom.xml +++ b/pom.xml @@ -36,9 +36,9 @@ convert 6.2 - 7.0 + 7.1 6.1 - 8.1 + 8.2 7.0 1.1 1.0.6 From 7f8305b062c15cb4e65fde8ca4c8f8acb02f3f56 Mon Sep 17 00:00:00 2001 From: alfresco-build Date: Mon, 19 Mar 2018 08:23:19 +0000 Subject: [PATCH 15/16] [maven-release-plugin] prepare release alfresco-repository-6.36 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 02c6a26130..e814484398 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-repository Alfresco Repository - 6.36-SNAPSHOT + 6.36 jar @@ -15,7 +15,7 @@ scm:git:git@github.com:Alfresco/alfresco-repository.git scm:git:git@github.com:Alfresco/alfresco-repository.git https://github.com/Alfresco/alfresco-repository - HEAD + alfresco-repository-6.36 From 9dd7ee15d56378140a205847ae3b48c0dcf28118 Mon Sep 17 00:00:00 2001 From: alfresco-build Date: Mon, 19 Mar 2018 08:23:25 +0000 Subject: [PATCH 16/16] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index e814484398..9675404be8 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-repository Alfresco Repository - 6.36 + 6.37-SNAPSHOT jar @@ -15,7 +15,7 @@ scm:git:git@github.com:Alfresco/alfresco-repository.git scm:git:git@github.com:Alfresco/alfresco-repository.git https://github.com/Alfresco/alfresco-repository - alfresco-repository-6.36 + HEAD