inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-24 17:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

ACS-1043 : Camel upgrade to 3.7.0 (#235)

Browse Source 
ACS-1043: Upgrade Camel version
This commit is contained in:
Denis Ungureanu
2021-01-12 11:41:23 +02:00
committed by GitHub
parent f9aaddd787
commit a9e54bd08c
26 changed files with 2821 additions and 2895 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/main/java/org/alfresco/util/transaction/SpringAwareUserTransaction.java
View File

@@ -18,9 +18,10 @@
*/ */
package org.alfresco.util.transaction; package org.alfresco.util.transaction;
import static java.util.Collections.emptyList;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.Collection; import java.util.Collection;
import java.util.Collections;
import javax.transaction.HeuristicMixedException; import javax.transaction.HeuristicMixedException;
import javax.transaction.HeuristicRollbackException; import javax.transaction.HeuristicRollbackException;
@@ -138,7 +139,7 @@ public class SpringAwareUserTransaction
/** make sure that we clean up the thread transaction stack properly */ /** make sure that we clean up the thread transaction stack properly */
private boolean finalized = false; private boolean finalized = false;
private Collection<String> labels = Collections.emptyList(); private Collection<String> labels = emptyList();
/** /**
* Creates a user transaction that defaults to {@link TransactionDefinition#PROPAGATION_REQUIRED}. * Creates a user transaction that defaults to {@link TransactionDefinition#PROPAGATION_REQUIRED}.

37
data-model/src/main/java/org/alfresco/util/BaseApplicationContextHelper.java
View File

@@ -100,26 +100,25 @@ public abstract class BaseApplicationContextHelper
classpath[i] = resources[i].getURL(); classpath[i] = resources[i].getURL();
} }
// Let's give our classloader 'child-first' resource loading qualities! // Let's give our classloader 'child-first' resource loading qualities!
ClassLoader classLoader = new URLClassLoader(classpath, Thread.currentThread().getContextClassLoader()) return new URLClassLoader(classpath, Thread.currentThread().getContextClassLoader())
{ {
@Override @Override
public URL getResource(String name) public URL getResource(String name)
{ {
URL ret = findResource(name); URL ret = findResource(name);
return ret == null ? super.getResource(name) : ret; return ret == null ? super.getResource(name) : ret;
} }
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
@Override @Override
public Enumeration<URL> getResources(String name) throws IOException public Enumeration<URL> getResources(String name) throws IOException
{ {
Enumeration[] tmp = new Enumeration[2]; Enumeration[] tmp = new Enumeration[2];
tmp[0] = findResources(name); tmp[0] = findResources(name);
tmp[1] = super.getResources(name); tmp[1] = super.getResources(name);
return new CompoundEnumeration<URL>(tmp); return new CompoundEnumeration<URL>(tmp);
} }
}; };
return classLoader;
} }
/** /**

5
packaging/war/pom.xml
View File

@@ -95,11 +95,6 @@
<classifier>tests</classifier> <classifier>tests</classifier>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<!-- required by GDocs-->
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId> <artifactId>spring-test</artifactId>

47
pom.xml
View File

@@ -56,7 +56,7 @@
<dependency.spring.version>5.3.2</dependency.spring.version> <dependency.spring.version>5.3.2</dependency.spring.version>
<dependency.antlr.version>3.5.2</dependency.antlr.version> <dependency.antlr.version>3.5.2</dependency.antlr.version>
<dependency.jackson.version>2.12.1</dependency.jackson.version> <dependency.jackson.version>2.12.1</dependency.jackson.version>
<dependency.jackson-databind.version>2.11.2</dependency.jackson-databind.version> <dependency.jackson-databind.version>${dependency.jackson.version}</dependency.jackson-databind.version>
<dependency.cxf.version>3.4.2</dependency.cxf.version> <dependency.cxf.version>3.4.2</dependency.cxf.version>
<dependency.opencmis.version>1.0.0</dependency.opencmis.version> <dependency.opencmis.version>1.0.0</dependency.opencmis.version>
<dependency.webscripts.version>8.15</dependency.webscripts.version> <dependency.webscripts.version>8.15</dependency.webscripts.version>
@@ -82,7 +82,7 @@
<dependency.ooxml-schemas.version>1.4</dependency.ooxml-schemas.version> <dependency.ooxml-schemas.version>1.4</dependency.ooxml-schemas.version>
<dependency.keycloak.version>12.0.1</dependency.keycloak.version> <dependency.keycloak.version>12.0.1</dependency.keycloak.version>
<dependency.jboss.logging.version>3.4.1.Final</dependency.jboss.logging.version> <dependency.jboss.logging.version>3.4.1.Final</dependency.jboss.logging.version>
<dependency.camel.version>2.25.3</dependency.camel.version> <dependency.camel.version>3.7.0</dependency.camel.version>
<dependency.activemq.version>5.16.0</dependency.activemq.version> <dependency.activemq.version>5.16.0</dependency.activemq.version>
<dependency.apache.taglibs.version>1.2.5</dependency.apache.taglibs.version> <dependency.apache.taglibs.version>1.2.5</dependency.apache.taglibs.version>
<dependency.awaitility.version>4.0.3</dependency.awaitility.version> <dependency.awaitility.version>4.0.3</dependency.awaitility.version>
@@ -243,11 +243,6 @@
<artifactId>commons-digester</artifactId> <artifactId>commons-digester</artifactId>
<version>2.1</version> <version>2.1</version>
</dependency> </dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.6</version>
</dependency>
<dependency> <dependency>
<groupId>commons-fileupload</groupId> <groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId> <artifactId>commons-fileupload</artifactId>
@@ -637,6 +632,44 @@
<artifactId>gson</artifactId> <artifactId>gson</artifactId>
<version>${dependency.gson.version}</version> <version>${dependency.gson.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring</artifactId>
<version>${dependency.camel.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-amqp</artifactId>
<version>${dependency.camel.version}</version>
<exclusions>
<!-- conflicts with activemq geronimo-jms_1.1_spec -->
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_2.0_spec</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-jackson</artifactId>
<version>${dependency.camel.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-directvm</artifactId>
<version>${dependency.camel.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-direct</artifactId>
<version>${dependency.camel.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-mock</artifactId>
<version>${dependency.camel.version}</version>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>

5
remote-api/pom.xml
View File

@@ -207,6 +207,11 @@
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-mock</artifactId>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
<pluginManagement> <pluginManagement>

2
remote-api/src/test/java/org/alfresco/repo/web/util/HttpRangeProcessorTest.java
View File

@@ -38,7 +38,7 @@ import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner; import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.mock.web.MockHttpServletResponse;
/** /**

2
remote-api/src/test/java/org/alfresco/repo/webdav/GetMethodRegressionTest.java
View File

@@ -57,7 +57,7 @@ import org.junit.Test;
import org.junit.experimental.categories.Category; import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner; import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContext;
import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.mock.web.MockHttpServletResponse;

2
remote-api/src/test/java/org/alfresco/repo/webdav/MoveMethodTest.java
View File

@@ -65,7 +65,7 @@ import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.Mockito; import org.mockito.Mockito;
import org.mockito.runners.MockitoJUnitRunner; import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContext;
import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.mock.web.MockHttpServletResponse;

2
remote-api/src/test/java/org/alfresco/repo/webdav/UnlockMethodTest.java
View File

@@ -56,7 +56,7 @@ import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner; import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContext;
import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.mock.web.MockHttpServletResponse;

2
remote-api/src/test/java/org/alfresco/repo/webdav/WebDAVHelperTest.java
View File

@@ -30,7 +30,7 @@ import static org.junit.Assert.assertEquals;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.runners.MockitoJUnitRunner; import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletRequest;
/** /**

2
remote-api/src/test/java/org/alfresco/repo/webdav/WebDAVLockServiceImplTest.java
View File

@@ -57,7 +57,7 @@ import org.junit.runner.RunWith;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.Mockito; import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock; import org.mockito.invocation.InvocationOnMock;
import org.mockito.runners.MockitoJUnitRunner; import org.mockito.junit.MockitoJUnitRunner;
import org.mockito.stubbing.Answer; import org.mockito.stubbing.Answer;
@RunWith(MockitoJUnitRunner.class) @RunWith(MockitoJUnitRunner.class)

2
remote-api/src/test/java/org/alfresco/repo/webdav/WebDAVMethodTest.java
View File

@@ -57,7 +57,7 @@ import org.junit.Test;
import org.junit.experimental.categories.Category; import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner; import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContext;
import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.mock.web.MockHttpServletResponse;

2
remote-api/src/test/java/org/alfresco/rest/api/tests/ProbeApiTest.java
View File

@@ -35,7 +35,7 @@ import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner; import org.mockito.junit.MockitoJUnitRunner;
import static org.alfresco.rest.api.probes.ProbeEntityResource.*; import static org.alfresco.rest.api.probes.ProbeEntityResource.*;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;

44
remote-api/src/test/java/org/alfresco/rest/api/tests/QueriesPeopleApiTest.java
View File

@@ -25,6 +25,26 @@
*/ */
package org.alfresco.rest.api.tests; package org.alfresco.rest.api.tests;
import static org.alfresco.rest.api.Queries.PARAM_FIRSTNAME;
import static org.alfresco.rest.api.Queries.PARAM_LASTNAME;
import static org.alfresco.rest.api.Queries.PARAM_PERSON_ID;
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.StringJoiner;
import javax.transaction.HeuristicMixedException;
import javax.transaction.HeuristicRollbackException;
import javax.transaction.NotSupportedException;
import javax.transaction.RollbackException;
import javax.transaction.SystemException;
import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.rest.AbstractSingleNetworkSiteTest; import org.alfresco.rest.AbstractSingleNetworkSiteTest;
import org.alfresco.rest.api.Queries; import org.alfresco.rest.api.Queries;
@@ -34,34 +54,12 @@ import org.alfresco.rest.api.tests.client.data.Company;
import org.alfresco.rest.api.tests.client.data.Person; import org.alfresco.rest.api.tests.client.data.Person;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.search.SearchParameters; import org.alfresco.service.cmr.search.SearchParameters;
import org.alfresco.util.testing.category.LuceneTests;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor; import org.mockito.ArgumentCaptor;
import org.mockito.runners.MockitoJUnitRunner; import org.mockito.junit.MockitoJUnitRunner;
import javax.transaction.HeuristicMixedException;
import javax.transaction.HeuristicRollbackException;
import javax.transaction.NotSupportedException;
import javax.transaction.RollbackException;
import javax.transaction.SystemException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.StringJoiner;
import static org.alfresco.rest.api.Queries.PARAM_FIRSTNAME;
import static org.alfresco.rest.api.Queries.PARAM_LASTNAME;
import static org.alfresco.rest.api.Queries.PARAM_PERSON_ID;
import static org.junit.Assert.assertEquals;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
/** /**
* V1 REST API tests for pre-defined 'live' search Queries on People * V1 REST API tests for pre-defined 'live' search Queries on People

148
repository/pom.xml
View File

@@ -630,34 +630,6 @@
<artifactId>gytheio-messaging-camel</artifactId> <artifactId>gytheio-messaging-camel</artifactId>
<version>${dependency.gytheio.version}</version> <version>${dependency.gytheio.version}</version>
<exclusions> <exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
<exclusion>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</exclusion>
<exclusion>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</exclusion>
<exclusion>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
</exclusion>
<exclusion> <exclusion>
<groupId>org.apache.camel</groupId> <groupId>org.apache.camel</groupId>
<artifactId>camel-core</artifactId> <artifactId>camel-core</artifactId>
@@ -671,92 +643,32 @@
<dependency> <dependency>
<groupId>org.apache.camel</groupId> <groupId>org.apache.camel</groupId>
<artifactId>camel-spring</artifactId> <artifactId>camel-spring</artifactId>
<version>${dependency.camel.version}</version>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-expression</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.camel</groupId> <groupId>org.apache.camel</groupId>
<artifactId>camel-amqp</artifactId> <artifactId>camel-amqp</artifactId>
<version>${dependency.camel.version}</version>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
<!-- conflicts with activemq geronimo-jms_1.1_spec -->
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_2.0_spec</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.camel</groupId> <groupId>org.apache.camel</groupId>
<artifactId>camel-jackson</artifactId> <artifactId>camel-jackson</artifactId>
<version>${dependency.camel.version}</version> </dependency>
<exclusions> <dependency>
<!-- Duplicate classes from com.sun.activation:jakarta.activation--> <groupId>org.apache.camel</groupId>
<exclusion> <artifactId>camel-directvm</artifactId>
<groupId>jakarta.activation</groupId> </dependency>
<artifactId>jakarta.activation-api</artifactId> <dependency>
</exclusion> <groupId>org.apache.camel</groupId>
</exclusions> <artifactId>camel-direct</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-mock</artifactId>
<scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.activemq</groupId> <groupId>org.apache.activemq</groupId>
<artifactId>activemq-client</artifactId> <artifactId>activemq-client</artifactId>
<version>${dependency.activemq.version}</version> <version>${dependency.activemq.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.activemq</groupId> <groupId>org.apache.activemq</groupId>
@@ -764,30 +676,10 @@
<version>${dependency.activemq.version}</version> <version>${dependency.activemq.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.activemq</groupId> <groupId>org.apache.camel</groupId>
<artifactId>activemq-camel</artifactId> <artifactId>camel-activemq</artifactId>
<version>${dependency.activemq.version}</version> <version>${dependency.camel.version}</version>
<exclusions> <exclusions>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
</exclusion>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
<exclusion>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
<!-- Duplicates classes from jakarta.transaction:jakarta.transaction-api --> <!-- Duplicates classes from jakarta.transaction:jakarta.transaction-api -->
<exclusion> <exclusion>
<groupId>org.apache.geronimo.specs</groupId> <groupId>org.apache.geronimo.specs</groupId>
@@ -800,14 +692,6 @@
<artifactId>activemq-pool</artifactId> <artifactId>activemq-pool</artifactId>
<version>${dependency.activemq.version}</version> <version>${dependency.activemq.version}</version>
<exclusions> <exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
<!-- Duplicates classes from jakarta.transaction:jakarta.transaction-api --> <!-- Duplicates classes from jakarta.transaction:jakarta.transaction-api -->
<exclusion> <exclusion>
<groupId>org.apache.geronimo.specs</groupId> <groupId>org.apache.geronimo.specs</groupId>

5
repository/src/main/java/org/alfresco/messaging/camel/SpringContextRouteLoader.java
View File

@@ -27,6 +27,7 @@ package org.alfresco.messaging.camel;
import java.util.ArrayList; import java.util.ArrayList;
import org.apache.camel.CamelContext;
import org.apache.camel.model.ModelCamelContext; import org.apache.camel.model.ModelCamelContext;
import org.apache.camel.model.RouteDefinition; import org.apache.camel.model.RouteDefinition;
import org.springframework.beans.BeansException; import org.springframework.beans.BeansException;
@@ -65,7 +66,9 @@ public class SpringContextRouteLoader implements ApplicationContextAware, Initia
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void addRoutesToCamelContext() throws Exception public void addRoutesToCamelContext() throws Exception
{ {
ModelCamelContext modelCamelContext = (ModelCamelContext) applicationContext.getBean(camelContextId); ModelCamelContext modelCamelContext = applicationContext
.getBean(camelContextId, CamelContext.class)
.adapt(ModelCamelContext.class);
ArrayList<RouteDefinition> routeDefinitions = (ArrayList<RouteDefinition>) applicationContext.getBean(routeContextId); ArrayList<RouteDefinition> routeDefinitions = (ArrayList<RouteDefinition>) applicationContext.getBean(routeContextId);
modelCamelContext.addRouteDefinitions(routeDefinitions); modelCamelContext.addRouteDefinitions(routeDefinitions);
} }

7
repository/src/main/java/org/alfresco/messaging/camel/configuration/ConnectionFactoryConfiguration.java
View File

@@ -33,6 +33,7 @@ import javax.jms.ConnectionFactory;
import org.alfresco.encryption.AlfrescoKeyStore; import org.alfresco.encryption.AlfrescoKeyStore;
import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.ActiveMQSslConnectionFactory; import org.apache.activemq.ActiveMQSslConnectionFactory;
import org.apache.camel.component.jms.JmsComponent;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
@@ -80,6 +81,12 @@ public class ConnectionFactoryConfiguration
return createConnectionFactory(); return createConnectionFactory();
} }
@Bean
public JmsComponent jms()
{
return JmsComponent.jmsComponent(activeMqConnectionFactory());
}
protected ConnectionFactory createConnectionFactory() protected ConnectionFactory createConnectionFactory()
{ {
return new ActiveMQConnectionFactory(username, password, brokerUrl); return new ActiveMQConnectionFactory(username, password, brokerUrl);

4
repository/src/main/java/org/alfresco/messaging/camel/routes/OnContentUpdateRenditionRoute.java
View File

@@ -39,7 +39,7 @@ import org.alfresco.repo.rawevents.types.OnContentUpdatePolicyEvent;
import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.util.GUID; import org.alfresco.util.GUID;
import org.apache.camel.spring.SpringRouteBuilder; import org.apache.camel.builder.RouteBuilder;
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.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -52,7 +52,7 @@ import org.springframework.stereotype.Component;
* @author Cristian Turlica * @author Cristian Turlica
*/ */
@Component @Component
public class OnContentUpdateRenditionRoute extends SpringRouteBuilder public class OnContentUpdateRenditionRoute extends RouteBuilder
{ {
private static Log logger = LogFactory.getLog(OnContentUpdateRenditionRoute.class); private static Log logger = LogFactory.getLog(OnContentUpdateRenditionRoute.class);

12
repository/src/main/java/org/alfresco/messaging/camel/routes/RepoNodeEventsRouteBuilder.java
View File

@@ -25,7 +25,7 @@
*/ */
package org.alfresco.messaging.camel.routes; package org.alfresco.messaging.camel.routes;
import org.apache.camel.spring.SpringRouteBuilder; import org.apache.camel.builder.RouteBuilder;
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.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
@@ -37,7 +37,7 @@ import org.springframework.stereotype.Component;
* @author sglover * @author sglover
*/ */
@Component @Component
public class RepoNodeEventsRouteBuilder extends SpringRouteBuilder public class RepoNodeEventsRouteBuilder extends RouteBuilder
{ {
private static Log logger = LogFactory.getLog(RepoNodeEventsRouteBuilder.class); private static Log logger = LogFactory.getLog(RepoNodeEventsRouteBuilder.class);
@@ -60,8 +60,10 @@ public class RepoNodeEventsRouteBuilder extends SpringRouteBuilder
logger.debug("targetTopic is "+targetTopic); logger.debug("targetTopic is "+targetTopic);
} }
from(sourceQueue).routeId("alfresco.events -> topic:alfresco.repo.events") from(sourceQueue)
.marshal("defaultDataFormat").to(targetTopic) .routeId("alfresco.events -> topic:alfresco.repo.events")
.end(); .marshal("defaultDataFormat")
.to(targetTopic)
.end();
} }
} }

4
repository/src/main/java/org/alfresco/messaging/camel/routes/TransformRequestConsumer.java
View File

@@ -26,7 +26,7 @@
package org.alfresco.messaging.camel.routes; package org.alfresco.messaging.camel.routes;
import org.apache.camel.Processor; import org.apache.camel.Processor;
import org.apache.camel.spring.SpringRouteBuilder; import org.apache.camel.builder.RouteBuilder;
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.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -43,7 +43,7 @@ import java.util.concurrent.Executors;
* @author aepure * @author aepure
*/ */
@Component @Component
public class TransformRequestConsumer extends SpringRouteBuilder public class TransformRequestConsumer extends RouteBuilder
{ {
private static Log logger = LogFactory.getLog(TransformRequestConsumer.class); private static Log logger = LogFactory.getLog(TransformRequestConsumer.class);

2
repository/src/main/resources/alfresco/subsystems/Messaging/default/messaging-context.xml
View File

@@ -71,7 +71,7 @@
<!-- Any RouteBuilder in this enterprise package will be fired up --> <!-- Any RouteBuilder in this enterprise package will be fired up -->
<context:component-scan base-package="org.alfresco.enterprise.repo.routes"/> <context:component-scan base-package="org.alfresco.enterprise.repo.routes"/>
<camelContext id="alfrescoCamelContext" xmlns="http://camel.apache.org/schema/spring"> <camelContext id="alfrescoCamelContext" xmlns="http://camel.apache.org/schema/spring" useBreadcrumb="true">
<contextScan/> <contextScan/>
<camel:jmxAgent id="agent" mbeanObjectDomainName="Alfresco.Camel" /> <camel:jmxAgent id="agent" mbeanObjectDomainName="Alfresco.Camel" />
<template id="camelProducerTemplate" defaultEndpoint="direct:alfresco.default" /> <template id="camelProducerTemplate" defaultEndpoint="direct:alfresco.default" />

14
repository/src/test/java/org/alfresco/messaging/camel/CamelRoutesTest.java
View File

@@ -47,28 +47,28 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@ContextConfiguration(locations = "/test-messaging-context.xml") @ContextConfiguration(locations = "/test-messaging-context.xml")
public class CamelRoutesTest public class CamelRoutesTest
{ {
@EndpointInject(uri = "mock:result1") @EndpointInject("mock:result1")
protected MockEndpoint resultEndpoint1; protected MockEndpoint resultEndpoint1;
@EndpointInject(uri = "mock:result2") @EndpointInject("mock:result2")
protected MockEndpoint resultEndpoint2; protected MockEndpoint resultEndpoint2;
@EndpointInject(uri = "mock:dlq") @EndpointInject("mock:dlq")
protected MockEndpoint dlqEndpoint; protected MockEndpoint dlqEndpoint;
@Autowired @Autowired
protected CamelContext camelContext; protected CamelContext camelContext;
@Produce(uri = "direct-vm:alfresco.test.1") @Produce("direct-vm:alfresco.test.1")
protected ProducerTemplate template1; protected ProducerTemplate template1;
@Produce(uri = "direct-vm:alfresco.test.2") @Produce("direct-vm:alfresco.test.2")
protected ProducerTemplate template2; protected ProducerTemplate template2;
@Produce(uri = "direct-vm:alfresco.default") @Produce("direct-vm:alfresco.default")
protected ProducerTemplate template3; protected ProducerTemplate template3;
@Produce(uri = "direct-vm:alfresco.test.transacted") @Produce("direct-vm:alfresco.test.transacted")
protected ProducerTemplate template4; protected ProducerTemplate template4;
@Autowired @Autowired

7
repository/src/test/java/org/alfresco/messaging/camel/routes/TestingRouteBuilder.java
View File

@@ -25,7 +25,7 @@
*/ */
package org.alfresco.messaging.camel.routes; package org.alfresco.messaging.camel.routes;
import org.apache.camel.spring.SpringRouteBuilder; import org.apache.camel.builder.RouteBuilder;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
/** /**
@@ -34,13 +34,14 @@ import org.springframework.stereotype.Component;
* @author Ray Gauss II * @author Ray Gauss II
*/ */
@Component @Component
public class TestingRouteBuilder extends SpringRouteBuilder public class TestingRouteBuilder extends RouteBuilder
{ {
@Override @Override
public void configure() throws Exception public void configure() throws Exception
{ {
from("direct-vm:alfresco.test.2").to("mock:result2"); from("direct-vm:alfresco.test.2")
.to("mock:result2");
} }
} }

5
repository/src/test/java/org/alfresco/repo/event2/AbstractContextAwareRepoEvent.java
View File

@@ -131,10 +131,9 @@ public abstract class AbstractContextAwareRepoEvent extends BaseSpringTest
// authenticate as admin // authenticate as admin
AuthenticationUtil.setAdminUserAsFullyAuthenticatedUser(); AuthenticationUtil.setAdminUserAsFullyAuthenticatedUser();
this.rootNodeRef = retryingTransactionHelper.doInTransaction(() -> { rootNodeRef = retryingTransactionHelper.doInTransaction(() -> {
// create a store and get the root node // create a store and get the root node
StoreRef storeRef = new StoreRef(StoreRef.PROTOCOL_WORKSPACE, StoreRef storeRef = new StoreRef(StoreRef.PROTOCOL_WORKSPACE, getClass().getName());
this.getClass().getName());
if (!nodeService.exists(storeRef)) if (!nodeService.exists(storeRef))
{ {
storeRef = nodeService.createStore(storeRef.getProtocol(), storeRef = nodeService.createStore(storeRef.getProtocol(),

3
repository/src/test/java/org/alfresco/repo/rendition2/RenditionEventProcessorTest.java
View File

@@ -29,14 +29,13 @@ import static org.mockito.Mockito.doThrow;
import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.repo.rawevents.types.OnContentUpdatePolicyEvent; import org.alfresco.repo.rawevents.types.OnContentUpdatePolicyEvent;
import org.alfresco.repo.transaction.RetryingTransactionHelper;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.transaction.TransactionService; import org.alfresco.service.transaction.TransactionService;
import org.alfresco.util.ApplicationContextHelper; import org.alfresco.util.ApplicationContextHelper;
import org.apache.camel.CamelContext; import org.apache.camel.CamelContext;
import org.apache.camel.Exchange; import org.apache.camel.Exchange;
import org.apache.camel.Message; import org.apache.camel.Message;
import org.apache.camel.impl.DefaultExchange; import org.apache.camel.support.DefaultExchange;
import org.junit.Before; import org.junit.Before;
import org.junit.Rule; import org.junit.Rule;
import org.junit.Test; import org.junit.Test;

2
repository/src/test/java/org/alfresco/repo/rendition2/TransformationOptionsConverterTest.java
View File

@@ -34,7 +34,7 @@ import org.alfresco.service.cmr.repository.TransformationOptions;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.runners.MockitoJUnitRunner; import org.mockito.junit.MockitoJUnitRunner;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;