inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-01 14:41:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/AUTH-85-token-auth

Browse Source
This commit is contained in:
Gavin Cornwell
2018-03-19 08:54:17 +00:00
parent 8b1c112d61 9dd7ee15d5
commit ada3705da1
4 changed files with 87 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pom.xml
View File

@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>alfresco-repository</artifactId>
<name>Alfresco Repository</name>
<version>6.32-TOKEN-AUTH-SNAPSHOT</version>
<version>6.37-TOKEN-AUTH-SNAPSHOT</version>
<packaging>jar</packaging>
<parent>
@@ -36,12 +36,12 @@
<img.exe>convert</img.exe>
<dependency.alfresco-legacy-lucene.version>6.2</dependency.alfresco-legacy-lucene.version>
<dependency.alfresco-core.version>7.0</dependency.alfresco-core.version>
<dependency.alfresco-core.version>7.1</dependency.alfresco-core.version>
<dependency.alfresco-greenmail.version>6.1</dependency.alfresco-greenmail.version>
<dependency.alfresco-data-model.version>8.1</dependency.alfresco-data-model.version>
<dependency.alfresco-data-model.version>8.2</dependency.alfresco-data-model.version>
<dependency.alfresco-jlan.version>7.0</dependency.alfresco-jlan.version>
<dependency.alfresco-pdf-renderer.version>1.1</dependency.alfresco-pdf-renderer.version>
<dependency.alfresco-hb-data-sender.version>1.0.5</dependency.alfresco-hb-data-sender.version>
<dependency.alfresco-hb-data-sender.version>1.0.6</dependency.alfresco-hb-data-sender.version>
<dependency.spring.version>5.0.4.RELEASE</dependency.spring.version>
@@ -396,13 +396,13 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15</artifactId>
<version>1.46</version>
<artifactId>bcprov-jdk15on</artifactId>
<version>1.59</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcmail-jdk15</artifactId>
<version>1.46</version>
<artifactId>bcmail-jdk15on</artifactId>
<version>1.59</version>
</dependency>
<dependency>
<groupId>com.googlecode.mp4parser</groupId>
@@ -630,7 +630,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>11.0.2</version>
<version>24.0-jre</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>

131
src/main/java/org/alfresco/repo/content/JodConverterSharedInstance.java
View File

@@ -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

5
src/main/resources/alfresco/subsystems/OOoJodconverter/default/jodconverter-context.xml
View File

@@ -2,8 +2,11 @@
<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
<beans>
<bean id="jodconverter.shared.instance" class="org.alfresco.repo.content.JodConverterSharedInstance">
<property name="url">
<value>${jodconverter.url}</value>
</property>
<property name="officeHome">
<value>${jodconverter.officeHome}</value>
<value>${jodconverter.officeHome}</value>
</property>
<property name="maxTasksPerProcess">
<value>${jodconverter.maxTasksPerProcess}</value>

4
src/main/resources/alfresco/subsystems/fileServers/default/file-servers.properties
View File

@@ -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