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

pom.xml

@@ -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>
+            <artifactId>bcprov-jdk15on</artifactId>
-            <version>1.46</version>
+            <version>1.59</version>
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
-            <artifactId>bcmail-jdk15</artifactId>
+            <artifactId>bcmail-jdk15on</artifactId>
-            <version>1.46</version>
+            <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>

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;
@@ -88,6 +91,11 @@ public class JodConverterSharedInstance implements InitializingBean, DisposableB
         }
     }
 
+    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,6 +323,9 @@ public class JodConverterSharedInstance implements InitializingBean, DisposableB
             return;
         }
 
+        if (url == null || url.isEmpty())
+        {
+
             logAllSofficeFilesUnderOfficeHome();
 
             try
@@ -323,7 +335,7 @@ public class JodConverterSharedInstance implements InitializingBean, DisposableB
                 {
                     defaultOfficeMgrConfig.setMaxTasksPerProcess(maxTasksPerProcess);
                 }
-            if (officeHome != null)
+                if (officeHome != null && officeHome.length() != 0)
                 {
                     defaultOfficeMgrConfig.setOfficeHome(officeHome);
                 }
@@ -376,10 +388,11 @@ public class JodConverterSharedInstance implements InitializingBean, DisposableB
                 if (logger.isErrorEnabled())
                 {
                     logger.error("Unexpected error in configuring or starting the JodConverter library."
-                                + "The following error is shown for informational purposes only.",x);
+                            + "The following error is shown for informational purposes only.", x);
                 }
                 return;
             }
+        }
 
         // If any exceptions are thrown in the above code, then isAvailable
         // should remain false, hence the return statements.

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

@@ -2,6 +2,9 @@
 <!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>
        </property>

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