mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-10-08 14:51:49 +00:00
Compare commits
33 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
5dab6b19bd | ||
|
455b41107c | ||
|
bc31e818d5 | ||
|
75f40fcdc3 | ||
|
cda5e50b2a | ||
|
2f1668244b | ||
|
0934f94238 | ||
|
c700920627 | ||
|
a9ce4ea402 | ||
|
fa36f29782 | ||
|
c64494ca05 | ||
|
52963c5f99 | ||
|
53f5f00274 | ||
|
072f475482 | ||
|
b362029e85 | ||
|
f5438cece1 | ||
|
e85d73fd26 | ||
|
59506dfe7d | ||
|
dea6049bc0 | ||
|
7a64964644 | ||
|
3d2bfe6b08 | ||
|
01ec63cf33 | ||
|
05425e3cbe | ||
|
2a80d17c9d | ||
|
e7ea900096 | ||
|
89847d260d | ||
|
0bb31fe4ba | ||
|
4e2d3e899a | ||
|
72965f81a8 | ||
|
7d84505c44 | ||
|
c5a753ebb8 | ||
|
24236be595 | ||
|
5d0055d9aa |
@@ -7,7 +7,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.alfresco</groupId>
|
<groupId>org.alfresco</groupId>
|
||||||
<artifactId>alfresco-community-repo-amps</artifactId>
|
<artifactId>alfresco-community-repo-amps</artifactId>
|
||||||
<version>23.2.0.52-SNAPSHOT</version>
|
<version>23.2.2.1</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<modules>
|
<modules>
|
||||||
|
@@ -7,7 +7,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.alfresco</groupId>
|
<groupId>org.alfresco</groupId>
|
||||||
<artifactId>alfresco-governance-services-community-parent</artifactId>
|
<artifactId>alfresco-governance-services-community-parent</artifactId>
|
||||||
<version>23.2.0.52-SNAPSHOT</version>
|
<version>23.2.2.1</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<modules>
|
<modules>
|
||||||
|
@@ -7,7 +7,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.alfresco</groupId>
|
<groupId>org.alfresco</groupId>
|
||||||
<artifactId>alfresco-governance-services-automation-community-repo</artifactId>
|
<artifactId>alfresco-governance-services-automation-community-repo</artifactId>
|
||||||
<version>23.2.0.52-SNAPSHOT</version>
|
<version>23.2.2.1</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
|
@@ -7,7 +7,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.alfresco</groupId>
|
<groupId>org.alfresco</groupId>
|
||||||
<artifactId>alfresco-governance-services-community-parent</artifactId>
|
<artifactId>alfresco-governance-services-community-parent</artifactId>
|
||||||
<version>23.2.0.52-SNAPSHOT</version>
|
<version>23.2.2.1</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<modules>
|
<modules>
|
||||||
|
@@ -8,7 +8,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.alfresco</groupId>
|
<groupId>org.alfresco</groupId>
|
||||||
<artifactId>alfresco-governance-services-community-repo-parent</artifactId>
|
<artifactId>alfresco-governance-services-community-repo-parent</artifactId>
|
||||||
<version>23.2.0.52-SNAPSHOT</version>
|
<version>23.2.2.1</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
|
@@ -5,7 +5,7 @@
|
|||||||
# Version label
|
# Version label
|
||||||
version.major=23
|
version.major=23
|
||||||
version.minor=2
|
version.minor=2
|
||||||
version.revision=0
|
version.revision=2
|
||||||
version.label=
|
version.label=
|
||||||
|
|
||||||
# Edition label
|
# Edition label
|
||||||
|
@@ -7,7 +7,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.alfresco</groupId>
|
<groupId>org.alfresco</groupId>
|
||||||
<artifactId>alfresco-governance-services-community-repo-parent</artifactId>
|
<artifactId>alfresco-governance-services-community-repo-parent</artifactId>
|
||||||
<version>23.2.0.52-SNAPSHOT</version>
|
<version>23.2.2.1</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
|
@@ -7,7 +7,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.alfresco</groupId>
|
<groupId>org.alfresco</groupId>
|
||||||
<artifactId>alfresco-community-repo</artifactId>
|
<artifactId>alfresco-community-repo</artifactId>
|
||||||
<version>23.2.0.52-SNAPSHOT</version>
|
<version>23.2.2.1</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<modules>
|
<modules>
|
||||||
|
@@ -8,7 +8,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.alfresco</groupId>
|
<groupId>org.alfresco</groupId>
|
||||||
<artifactId>alfresco-community-repo-amps</artifactId>
|
<artifactId>alfresco-community-repo-amps</artifactId>
|
||||||
<version>23.2.0.52-SNAPSHOT</version>
|
<version>23.2.2.1</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
|
@@ -7,7 +7,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.alfresco</groupId>
|
<groupId>org.alfresco</groupId>
|
||||||
<artifactId>alfresco-community-repo</artifactId>
|
<artifactId>alfresco-community-repo</artifactId>
|
||||||
<version>23.2.0.52-SNAPSHOT</version>
|
<version>23.2.2.1</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
@@ -7,7 +7,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.alfresco</groupId>
|
<groupId>org.alfresco</groupId>
|
||||||
<artifactId>alfresco-community-repo</artifactId>
|
<artifactId>alfresco-community-repo</artifactId>
|
||||||
<version>23.2.0.52-SNAPSHOT</version>
|
<version>23.2.2.1</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
|
@@ -7,7 +7,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.alfresco</groupId>
|
<groupId>org.alfresco</groupId>
|
||||||
<artifactId>alfresco-community-repo</artifactId>
|
<artifactId>alfresco-community-repo</artifactId>
|
||||||
<version>23.2.0.52-SNAPSHOT</version>
|
<version>23.2.2.1</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
@@ -9,6 +9,6 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.alfresco</groupId>
|
<groupId>org.alfresco</groupId>
|
||||||
<artifactId>alfresco-community-repo-packaging</artifactId>
|
<artifactId>alfresco-community-repo-packaging</artifactId>
|
||||||
<version>23.2.0.52-SNAPSHOT</version>
|
<version>23.2.2.1</version>
|
||||||
</parent>
|
</parent>
|
||||||
</project>
|
</project>
|
||||||
|
@@ -7,7 +7,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.alfresco</groupId>
|
<groupId>org.alfresco</groupId>
|
||||||
<artifactId>alfresco-community-repo-packaging</artifactId>
|
<artifactId>alfresco-community-repo-packaging</artifactId>
|
||||||
<version>23.2.0.52-SNAPSHOT</version>
|
<version>23.2.2.1</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
|
@@ -7,7 +7,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.alfresco</groupId>
|
<groupId>org.alfresco</groupId>
|
||||||
<artifactId>alfresco-community-repo</artifactId>
|
<artifactId>alfresco-community-repo</artifactId>
|
||||||
<version>23.2.0.52-SNAPSHOT</version>
|
<version>23.2.2.1</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<modules>
|
<modules>
|
||||||
|
@@ -6,7 +6,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.alfresco</groupId>
|
<groupId>org.alfresco</groupId>
|
||||||
<artifactId>alfresco-community-repo-packaging</artifactId>
|
<artifactId>alfresco-community-repo-packaging</artifactId>
|
||||||
<version>23.2.0.52-SNAPSHOT</version>
|
<version>23.2.2.1</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<modules>
|
<modules>
|
||||||
|
@@ -7,7 +7,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.alfresco</groupId>
|
<groupId>org.alfresco</groupId>
|
||||||
<artifactId>alfresco-community-repo-tests</artifactId>
|
<artifactId>alfresco-community-repo-tests</artifactId>
|
||||||
<version>23.2.0.52-SNAPSHOT</version>
|
<version>23.2.2.1</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<organization>
|
<organization>
|
||||||
|
@@ -9,7 +9,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.alfresco</groupId>
|
<groupId>org.alfresco</groupId>
|
||||||
<artifactId>alfresco-community-repo-tests</artifactId>
|
<artifactId>alfresco-community-repo-tests</artifactId>
|
||||||
<version>23.2.0.52-SNAPSHOT</version>
|
<version>23.2.2.1</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<developers>
|
<developers>
|
||||||
|
@@ -9,7 +9,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.alfresco</groupId>
|
<groupId>org.alfresco</groupId>
|
||||||
<artifactId>alfresco-community-repo-tests</artifactId>
|
<artifactId>alfresco-community-repo-tests</artifactId>
|
||||||
<version>23.2.0.52-SNAPSHOT</version>
|
<version>23.2.2.1</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<developers>
|
<developers>
|
||||||
|
@@ -8,7 +8,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.alfresco</groupId>
|
<groupId>org.alfresco</groupId>
|
||||||
<artifactId>alfresco-community-repo-tests</artifactId>
|
<artifactId>alfresco-community-repo-tests</artifactId>
|
||||||
<version>23.2.0.52-SNAPSHOT</version>
|
<version>23.2.2.1</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
|
@@ -9,7 +9,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.alfresco</groupId>
|
<groupId>org.alfresco</groupId>
|
||||||
<artifactId>alfresco-community-repo-tests</artifactId>
|
<artifactId>alfresco-community-repo-tests</artifactId>
|
||||||
<version>23.2.0.52-SNAPSHOT</version>
|
<version>23.2.2.1</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<developers>
|
<developers>
|
||||||
|
@@ -7,7 +7,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.alfresco</groupId>
|
<groupId>org.alfresco</groupId>
|
||||||
<artifactId>alfresco-community-repo-packaging</artifactId>
|
<artifactId>alfresco-community-repo-packaging</artifactId>
|
||||||
<version>23.2.0.52-SNAPSHOT</version>
|
<version>23.2.2.1</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
|
20
pom.xml
20
pom.xml
@@ -2,7 +2,7 @@
|
|||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<artifactId>alfresco-community-repo</artifactId>
|
<artifactId>alfresco-community-repo</artifactId>
|
||||||
<version>23.2.0.52-SNAPSHOT</version>
|
<version>23.2.2.1</version>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
<name>Alfresco Community Repo Parent</name>
|
<name>Alfresco Community Repo Parent</name>
|
||||||
|
|
||||||
@@ -25,7 +25,7 @@
|
|||||||
<properties>
|
<properties>
|
||||||
<acs.version.major>23</acs.version.major>
|
<acs.version.major>23</acs.version.major>
|
||||||
<acs.version.minor>2</acs.version.minor>
|
<acs.version.minor>2</acs.version.minor>
|
||||||
<acs.version.revision>0</acs.version.revision>
|
<acs.version.revision>2</acs.version.revision>
|
||||||
<acs.version.label />
|
<acs.version.label />
|
||||||
<amp.min.version>${acs.version.major}.0.0</amp.min.version>
|
<amp.min.version>${acs.version.major}.0.0</amp.min.version>
|
||||||
|
|
||||||
@@ -51,10 +51,10 @@
|
|||||||
<dependency.alfresco-server-root.version>7.0.1</dependency.alfresco-server-root.version>
|
<dependency.alfresco-server-root.version>7.0.1</dependency.alfresco-server-root.version>
|
||||||
<dependency.activiti-engine.version>5.23.0</dependency.activiti-engine.version>
|
<dependency.activiti-engine.version>5.23.0</dependency.activiti-engine.version>
|
||||||
<dependency.activiti.version>5.23.0</dependency.activiti.version>
|
<dependency.activiti.version>5.23.0</dependency.activiti.version>
|
||||||
<dependency.alfresco-transform-core.version>5.1.0-A1</dependency.alfresco-transform-core.version>
|
<dependency.alfresco-transform-core.version>5.1.1-A1</dependency.alfresco-transform-core.version>
|
||||||
<dependency.alfresco-transform-service.version>4.1.0-A1</dependency.alfresco-transform-service.version>
|
<dependency.alfresco-transform-service.version>4.1.1-A1</dependency.alfresco-transform-service.version>
|
||||||
<dependency.alfresco-greenmail.version>7.0</dependency.alfresco-greenmail.version>
|
<dependency.alfresco-greenmail.version>7.0</dependency.alfresco-greenmail.version>
|
||||||
<dependency.acs-event-model.version>0.0.26</dependency.acs-event-model.version>
|
<dependency.acs-event-model.version>0.0.27</dependency.acs-event-model.version>
|
||||||
|
|
||||||
<dependency.aspectj.version>1.9.20.1</dependency.aspectj.version>
|
<dependency.aspectj.version>1.9.20.1</dependency.aspectj.version>
|
||||||
<dependency.spring.version>6.0.14</dependency.spring.version>
|
<dependency.spring.version>6.0.14</dependency.spring.version>
|
||||||
@@ -88,7 +88,7 @@
|
|||||||
<dependency.camel.version>4.0.0</dependency.camel.version> <!-- when bumping this version, please keep track/sync with included netty.io dependencies -->
|
<dependency.camel.version>4.0.0</dependency.camel.version> <!-- when bumping this version, please keep track/sync with included netty.io dependencies -->
|
||||||
<dependency.netty.version>4.1.96.Final</dependency.netty.version> <!-- must be in sync with camels transitive dependencies, e.g.: netty-common -->
|
<dependency.netty.version>4.1.96.Final</dependency.netty.version> <!-- must be in sync with camels transitive dependencies, e.g.: netty-common -->
|
||||||
<dependency.activemq.version>5.18.3</dependency.activemq.version>
|
<dependency.activemq.version>5.18.3</dependency.activemq.version>
|
||||||
<dependency.apache-compress.version>1.25.0</dependency.apache-compress.version>
|
<dependency.apache-compress.version>1.26.0</dependency.apache-compress.version>
|
||||||
<dependency.awaitility.version>4.2.0</dependency.awaitility.version>
|
<dependency.awaitility.version>4.2.0</dependency.awaitility.version>
|
||||||
<dependency.swagger-ui.version>4.1.3</dependency.swagger-ui.version>
|
<dependency.swagger-ui.version>4.1.3</dependency.swagger-ui.version>
|
||||||
<dependency.swagger-parser.version>1.0.67</dependency.swagger-parser.version>
|
<dependency.swagger-parser.version>1.0.67</dependency.swagger-parser.version>
|
||||||
@@ -112,9 +112,9 @@
|
|||||||
<dependency.jakarta-ee-json-impl.version>1.1.4</dependency.jakarta-ee-json-impl.version>
|
<dependency.jakarta-ee-json-impl.version>1.1.4</dependency.jakarta-ee-json-impl.version>
|
||||||
<dependency.jakarta-json-path.version>2.9.0</dependency.jakarta-json-path.version>
|
<dependency.jakarta-json-path.version>2.9.0</dependency.jakarta-json-path.version>
|
||||||
<dependency.json-smart.version>2.5.0</dependency.json-smart.version>
|
<dependency.json-smart.version>2.5.0</dependency.json-smart.version>
|
||||||
<alfresco.googledrive.version>4.1.0-A1</alfresco.googledrive.version>
|
<alfresco.googledrive.version>4.1.0</alfresco.googledrive.version>
|
||||||
<alfresco.aos-module.version>2.0.0</alfresco.aos-module.version>
|
<alfresco.aos-module.version>3.0.0</alfresco.aos-module.version>
|
||||||
<alfresco.api-explorer.version>23.1.0</alfresco.api-explorer.version> <!-- Also in alfresco-enterprise-share -->
|
<alfresco.api-explorer.version>23.2.0</alfresco.api-explorer.version> <!-- Also in alfresco-enterprise-share -->
|
||||||
|
|
||||||
<alfresco.maven-plugin.version>2.2.0</alfresco.maven-plugin.version>
|
<alfresco.maven-plugin.version>2.2.0</alfresco.maven-plugin.version>
|
||||||
<license-maven-plugin.version>2.0.1</license-maven-plugin.version>
|
<license-maven-plugin.version>2.0.1</license-maven-plugin.version>
|
||||||
@@ -151,7 +151,7 @@
|
|||||||
<connection>scm:git:https://github.com/Alfresco/alfresco-community-repo.git</connection>
|
<connection>scm:git:https://github.com/Alfresco/alfresco-community-repo.git</connection>
|
||||||
<developerConnection>scm:git:https://github.com/Alfresco/alfresco-community-repo.git</developerConnection>
|
<developerConnection>scm:git:https://github.com/Alfresco/alfresco-community-repo.git</developerConnection>
|
||||||
<url>https://github.com/Alfresco/alfresco-community-repo</url>
|
<url>https://github.com/Alfresco/alfresco-community-repo</url>
|
||||||
<tag>HEAD</tag>
|
<tag>23.2.2.1</tag>
|
||||||
</scm>
|
</scm>
|
||||||
|
|
||||||
<distributionManagement>
|
<distributionManagement>
|
||||||
|
@@ -7,7 +7,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.alfresco</groupId>
|
<groupId>org.alfresco</groupId>
|
||||||
<artifactId>alfresco-community-repo</artifactId>
|
<artifactId>alfresco-community-repo</artifactId>
|
||||||
<version>23.2.0.52-SNAPSHOT</version>
|
<version>23.2.2.1</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
@@ -7,7 +7,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.alfresco</groupId>
|
<groupId>org.alfresco</groupId>
|
||||||
<artifactId>alfresco-community-repo</artifactId>
|
<artifactId>alfresco-community-repo</artifactId>
|
||||||
<version>23.2.0.52-SNAPSHOT</version>
|
<version>23.2.2.1</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
@@ -53,8 +53,6 @@ import org.alfresco.service.cmr.transfer.TransferTarget;
|
|||||||
import org.alfresco.service.cmr.transfer.TransferVersion;
|
import org.alfresco.service.cmr.transfer.TransferVersion;
|
||||||
import org.alfresco.util.HttpClientHelper;
|
import org.alfresco.util.HttpClientHelper;
|
||||||
import org.alfresco.util.PropertyCheck;
|
import org.alfresco.util.PropertyCheck;
|
||||||
import org.alfresco.util.json.ExceptionJsonSerializer;
|
|
||||||
import org.alfresco.util.json.JsonSerializer;
|
|
||||||
import org.apache.commons.httpclient.Credentials;
|
import org.apache.commons.httpclient.Credentials;
|
||||||
import org.apache.commons.httpclient.HostConfiguration;
|
import org.apache.commons.httpclient.HostConfiguration;
|
||||||
import org.apache.commons.httpclient.HttpClient;
|
import org.apache.commons.httpclient.HttpClient;
|
||||||
@@ -73,8 +71,10 @@ import org.apache.commons.httpclient.protocol.DefaultProtocolSocketFactory;
|
|||||||
import org.apache.commons.httpclient.protocol.Protocol;
|
import org.apache.commons.httpclient.protocol.Protocol;
|
||||||
import org.apache.commons.httpclient.protocol.ProtocolSocketFactory;
|
import org.apache.commons.httpclient.protocol.ProtocolSocketFactory;
|
||||||
import org.apache.commons.httpclient.protocol.SSLProtocolSocketFactory;
|
import org.apache.commons.httpclient.protocol.SSLProtocolSocketFactory;
|
||||||
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.apache.commons.logging.Log;
|
import org.apache.commons.logging.Log;
|
||||||
import org.apache.commons.logging.LogFactory;
|
import org.apache.commons.logging.LogFactory;
|
||||||
|
import org.json.JSONArray;
|
||||||
import org.json.JSONObject;
|
import org.json.JSONObject;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -102,7 +102,6 @@ public class HttpClientTransmitterImpl implements TransferTransmitter
|
|||||||
private Protocol httpsProtocol = new Protocol(HTTPS_SCHEME_NAME, (ProtocolSocketFactory) new SSLProtocolSocketFactory(), DEFAULT_HTTPS_PORT);
|
private Protocol httpsProtocol = new Protocol(HTTPS_SCHEME_NAME, (ProtocolSocketFactory) new SSLProtocolSocketFactory(), DEFAULT_HTTPS_PORT);
|
||||||
private Map<String,Protocol> protocolMap = null;
|
private Map<String,Protocol> protocolMap = null;
|
||||||
private HttpMethodFactory httpMethodFactory = null;
|
private HttpMethodFactory httpMethodFactory = null;
|
||||||
private JsonSerializer<Throwable, JSONObject> jsonErrorSerializer;
|
|
||||||
|
|
||||||
private ContentService contentService;
|
private ContentService contentService;
|
||||||
|
|
||||||
@@ -125,7 +124,6 @@ public class HttpClientTransmitterImpl implements TransferTransmitter
|
|||||||
httpClient = new HttpClient();
|
httpClient = new HttpClient();
|
||||||
httpClient.setHttpConnectionManager(new MultiThreadedHttpConnectionManager());
|
httpClient.setHttpConnectionManager(new MultiThreadedHttpConnectionManager());
|
||||||
httpMethodFactory = new StandardHttpMethodFactoryImpl();
|
httpMethodFactory = new StandardHttpMethodFactoryImpl();
|
||||||
jsonErrorSerializer = new ExceptionJsonSerializer();
|
|
||||||
|
|
||||||
// Create an HTTP Proxy Host if appropriate system properties are set
|
// Create an HTTP Proxy Host if appropriate system properties are set
|
||||||
httpProxyHost = HttpClientHelper.createProxyHost("http.proxyHost", "http.proxyPort", DEFAULT_HTTP_PORT);
|
httpProxyHost = HttpClientHelper.createProxyHost("http.proxyHost", "http.proxyPort", DEFAULT_HTTP_PORT);
|
||||||
@@ -852,7 +850,27 @@ public class HttpClientTransmitterImpl implements TransferTransmitter
|
|||||||
*/
|
*/
|
||||||
private Throwable rehydrateError(JSONObject errorJSON)
|
private Throwable rehydrateError(JSONObject errorJSON)
|
||||||
{
|
{
|
||||||
return jsonErrorSerializer.deserialize(errorJSON);
|
if (errorJSON == null)
|
||||||
|
{
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
String errorMessage = errorJSON.optString("errorMessage", StringUtils.EMPTY);
|
||||||
|
String errorId = errorJSON.optString("alfrescoMessageId", null);
|
||||||
|
|
||||||
|
Object[] errorParams = new Object[0];
|
||||||
|
JSONArray errorParamArray = errorJSON.optJSONArray("alfrescoMessageParams");
|
||||||
|
if (errorParamArray != null)
|
||||||
|
{
|
||||||
|
int length = errorParamArray.length();
|
||||||
|
errorParams = new Object[length];
|
||||||
|
for (int i = 0; i < length; ++i)
|
||||||
|
{
|
||||||
|
errorParams[i] = errorParamArray.getString(i);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return new TransferException(errorId == null ? errorMessage : errorId, errorParams);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setContentService(ContentService contentService)
|
public void setContentService(ContentService contentService)
|
||||||
@@ -870,11 +888,6 @@ public class HttpClientTransmitterImpl implements TransferTransmitter
|
|||||||
this.httpMethodFactory = httpMethodFactory;
|
this.httpMethodFactory = httpMethodFactory;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setJsonErrorSerializer(JsonSerializer<Throwable, JSONObject> jsonErrorSerializer)
|
|
||||||
{
|
|
||||||
this.jsonErrorSerializer = jsonErrorSerializer;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setNodeService(NodeService nodeService)
|
public void setNodeService(NodeService nodeService)
|
||||||
{
|
{
|
||||||
this.nodeService = nodeService;
|
this.nodeService = nodeService;
|
||||||
|
@@ -41,7 +41,8 @@ import org.json.JSONObject;
|
|||||||
public class ExceptionJsonSerializer implements JsonSerializer<Throwable, JSONObject>
|
public class ExceptionJsonSerializer implements JsonSerializer<Throwable, JSONObject>
|
||||||
{
|
{
|
||||||
private final static Log log = LogFactory.getLog(ExceptionJsonSerializer.class);
|
private final static Log log = LogFactory.getLog(ExceptionJsonSerializer.class);
|
||||||
|
|
||||||
|
@Deprecated
|
||||||
@Override
|
@Override
|
||||||
public Throwable deserialize(JSONObject errorJSON)
|
public Throwable deserialize(JSONObject errorJSON)
|
||||||
{
|
{
|
||||||
@@ -89,38 +90,42 @@ public class ExceptionJsonSerializer implements JsonSerializer<Throwable, JSONOb
|
|||||||
catch (ClassNotFoundException e)
|
catch (ClassNotFoundException e)
|
||||||
{
|
{
|
||||||
errorClass = Exception.class;
|
errorClass = Exception.class;
|
||||||
}
|
}
|
||||||
Constructor<?> constructor = null;
|
|
||||||
try
|
if (Throwable.class.isAssignableFrom(errorClass))
|
||||||
{
|
{
|
||||||
try
|
Constructor<?> constructor = null;
|
||||||
{
|
try
|
||||||
constructor = errorClass.getConstructor(String.class, Object[].class);
|
{
|
||||||
createdObject = constructor.newInstance(errorId, errorParams);
|
try
|
||||||
}
|
{
|
||||||
catch (NoSuchMethodException e)
|
constructor = errorClass.getConstructor(String.class, Object[].class);
|
||||||
{
|
createdObject = constructor.newInstance(errorId, errorParams);
|
||||||
try
|
}
|
||||||
{
|
catch (NoSuchMethodException e)
|
||||||
constructor = errorClass.getConstructor(String.class);
|
{
|
||||||
createdObject = constructor.newInstance(errorId == null ? errorMessage : errorId);
|
try
|
||||||
}
|
{
|
||||||
catch (NoSuchMethodException e1)
|
constructor = errorClass.getConstructor(String.class);
|
||||||
{
|
createdObject = constructor.newInstance(errorId == null ? errorMessage : errorId);
|
||||||
try
|
}
|
||||||
{
|
catch (NoSuchMethodException e1)
|
||||||
constructor = errorClass.getConstructor();
|
{
|
||||||
createdObject = constructor.newInstance();
|
try
|
||||||
}
|
{
|
||||||
catch (NoSuchMethodException e2)
|
constructor = errorClass.getConstructor();
|
||||||
{
|
createdObject = constructor.newInstance();
|
||||||
}
|
}
|
||||||
}
|
catch (NoSuchMethodException e2)
|
||||||
}
|
{
|
||||||
}
|
}
|
||||||
catch(Exception ex)
|
}
|
||||||
{
|
}
|
||||||
//We don't need to do anything here. Code below will fix things up
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
// We don't need to do anything here. Code below will fix things up
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (createdObject == null || !Throwable.class.isAssignableFrom(createdObject.getClass()))
|
if (createdObject == null || !Throwable.class.isAssignableFrom(createdObject.getClass()))
|
||||||
{
|
{
|
||||||
|
@@ -3,7 +3,7 @@
|
|||||||
repository.name=Main Repository
|
repository.name=Main Repository
|
||||||
|
|
||||||
# Schema number
|
# Schema number
|
||||||
version.schema=19100
|
version.schema=19102
|
||||||
|
|
||||||
# Directory configuration
|
# Directory configuration
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user