From b4b591b8af9bbbc56794df9ee5e8c25fa91f728e Mon Sep 17 00:00:00 2001
From: Denis Ungureanu <Denis.Ungureanu1@ness.com>
Date: Wed, 20 Jan 2021 16:26:02 +0200
Subject: [PATCH] ACS-1170 : Release Gytheio 0.12 - ACS 7.0 compatible (#250)

   - upgrade Gytheio
   - move jms bean to messaging-context.xml
---
 pom.xml                                                    | 2 +-
 .../configuration/ConnectionFactoryConfiguration.java      | 7 -------
 .../subsystems/Messaging/default/messaging-context.xml     | 6 ++++++
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8ddc59fd7e..5f61fb7d0b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,7 +71,7 @@
         <dependency.commons-httpclient.version>3.1-HTTPCLIENT-1265</dependency.commons-httpclient.version>
         <dependency.xercesImpl.version>2.12.1</dependency.xercesImpl.version>
         <dependency.slf4j.version>1.7.30</dependency.slf4j.version>
-        <dependency.gytheio.version>0.11.6</dependency.gytheio.version>
+        <dependency.gytheio.version>0.12</dependency.gytheio.version>
         <dependency.jaxb.version>2.3.3</dependency.jaxb.version>
         <dependency.groovy.version>2.5.9</dependency.groovy.version>
         <dependency.javax.mail.version>1.6.2</dependency.javax.mail.version>
diff --git a/repository/src/main/java/org/alfresco/messaging/camel/configuration/ConnectionFactoryConfiguration.java b/repository/src/main/java/org/alfresco/messaging/camel/configuration/ConnectionFactoryConfiguration.java
index 1d20fabf46..14843e2a68 100644
--- a/repository/src/main/java/org/alfresco/messaging/camel/configuration/ConnectionFactoryConfiguration.java
+++ b/repository/src/main/java/org/alfresco/messaging/camel/configuration/ConnectionFactoryConfiguration.java
@@ -33,7 +33,6 @@ import javax.jms.ConnectionFactory;
 import org.alfresco.encryption.AlfrescoKeyStore;
 import org.apache.activemq.ActiveMQConnectionFactory;
 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.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
@@ -81,12 +80,6 @@ public class ConnectionFactoryConfiguration
         return createConnectionFactory();
     }
 
-    @Bean
-    public JmsComponent jms()
-    {
-        return JmsComponent.jmsComponent(activeMqConnectionFactory());
-    }
-
     protected ConnectionFactory createConnectionFactory()
     {
         return new ActiveMQConnectionFactory(username, password, brokerUrl);
diff --git a/repository/src/main/resources/alfresco/subsystems/Messaging/default/messaging-context.xml b/repository/src/main/resources/alfresco/subsystems/Messaging/default/messaging-context.xml
index 853a80f7ab..4dd42cdb68 100644
--- a/repository/src/main/resources/alfresco/subsystems/Messaging/default/messaging-context.xml
+++ b/repository/src/main/resources/alfresco/subsystems/Messaging/default/messaging-context.xml
@@ -34,6 +34,12 @@
         <property name="transacted" value="${messaging.transacted}" />
         <property name="transactionManager" ref="messagingTransactionManager" />
     </bean>
+
+    <bean id="jms" class="org.apache.camel.component.jms.JmsComponent">
+        <property name="connectionFactory" ref="pooledConnectionFactory" />
+        <property name="transacted" value="${messaging.transacted}" />
+        <property name="transactionManager" ref="messagingTransactionManager" />
+    </bean>
     
     <bean id="CAMEL_PROPAGATION_MANDATORY" class="org.apache.camel.spring.spi.SpringTransactionPolicy">
         <property name="transactionManager" ref="messagingTransactionManager" />