inteligr8/alfresco-transform-core
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-transform-core.git synced 2025-05-12 17:04:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ATS-481

Browse Source
This commit is contained in:
CezarLeahu 2019-07-09 10:22:34 +03:00 committed by GitHub
commit 44559c2dda
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
alfresco-transformer-base/src/main/java/org/alfresco/transformer/messaging/MessagingConfig.java
View File

@ -34,6 +34,7 @@ import org.apache.activemq.command.ActiveMQQueue;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.jms.annotation.JmsListenerConfigurer; import org.springframework.jms.annotation.JmsListenerConfigurer;
@ -52,6 +53,7 @@ import org.springframework.transaction.PlatformTransactionManager;
* created on 18/12/2018 * created on 18/12/2018
*/ */
@Configuration @Configuration
@ConditionalOnProperty(name = "activemq.url")
public class MessagingConfig implements JmsListenerConfigurer public class MessagingConfig implements JmsListenerConfigurer
{ {
private static final Logger logger = LoggerFactory.getLogger(MessagingConfig.class); private static final Logger logger = LoggerFactory.getLogger(MessagingConfig.class);
@ -63,6 +65,7 @@ public class MessagingConfig implements JmsListenerConfigurer
} }
@Bean @Bean
@ConditionalOnProperty(name = "activemq.url")
public DefaultMessageHandlerMethodFactory methodFactory() public DefaultMessageHandlerMethodFactory methodFactory()
{ {
DefaultMessageHandlerMethodFactory factory = new DefaultMessageHandlerMethodFactory(); DefaultMessageHandlerMethodFactory factory = new DefaultMessageHandlerMethodFactory();
@ -71,6 +74,7 @@ public class MessagingConfig implements JmsListenerConfigurer
} }
@Bean @Bean
@ConditionalOnProperty(name = "activemq.url")
public DefaultJmsListenerContainerFactory jmsListenerContainerFactory( public DefaultJmsListenerContainerFactory jmsListenerContainerFactory(
final ConnectionFactory connectionFactory, final ConnectionFactory connectionFactory,
final TransformMessageConverter transformMessageConverter) final TransformMessageConverter transformMessageConverter)
@ -84,6 +88,7 @@ public class MessagingConfig implements JmsListenerConfigurer
} }
@Bean @Bean
@ConditionalOnProperty(name = "activemq.url")
public PlatformTransactionManager transactionManager(final ConnectionFactory connectionFactory) public PlatformTransactionManager transactionManager(final ConnectionFactory connectionFactory)
{ {
final JmsTransactionManager transactionManager = new JmsTransactionManager(); final JmsTransactionManager transactionManager = new JmsTransactionManager();
@ -92,6 +97,7 @@ public class MessagingConfig implements JmsListenerConfigurer
} }
@Bean @Bean
@ConditionalOnProperty(name = "activemq.url")
public Queue engineRequestQueue(@Value("${queue.engineRequestQueue}") String engineRequestQueueValue) public Queue engineRequestQueue(@Value("${queue.engineRequestQueue}") String engineRequestQueueValue)
{ {
return new ActiveMQQueue(engineRequestQueueValue); return new ActiveMQQueue(engineRequestQueueValue);

11
alfresco-transformer-base/src/main/resources/application.yaml
View File

@ -1,3 +1,4 @@
---
spring: spring:
servlet: servlet:
multipart: multipart:
@ -18,7 +19,7 @@ server:
logging: logging:
level: level:
#org.alfresco.util.exec.RuntimeExec: debug # org.alfresco.util.exec.RuntimeExec: debug
org.alfresco.transformer.LibreOfficeController: debug org.alfresco.transformer.LibreOfficeController: debug
org.alfresco.transformer.JodConverterSharedInstance: debug org.alfresco.transformer.JodConverterSharedInstance: debug
org.alfresco.transformer.AlfrescoPdfRendererController: debug org.alfresco.transformer.AlfrescoPdfRendererController: debug
@ -36,9 +37,9 @@ management:
web: web:
exposure: exposure:
include: include:
- metrics - metrics
- prometheus - prometheus
- health - health
metrics: metrics:
enable[http]: false enable[http]: false
enable[logback]: false enable[logback]: false
@ -46,4 +47,4 @@ management:
enable[jvm.classes]: false enable[jvm.classes]: false
container: container:
name: ${HOSTNAME:t-engine} name: ${HOSTNAME:t-engine}