From 3e4f6af0e46160c4634669a76de223485b7ce46c Mon Sep 17 00:00:00 2001 From: CezarLeahu <35226487+CezarLeahu@users.noreply.github.com> Date: Wed, 10 Jul 2019 13:42:28 +0300 Subject: [PATCH] ATS-467 : JMS config startup message (#72) --- .../src/license/THIRD-PARTY.properties | 8 +-- .../src/license/THIRD-PARTY.properties | 8 +-- .../src/license/THIRD-PARTY.properties | 8 +-- .../src/license/THIRD-PARTY.properties | 10 +--- .../src/license/THIRD-PARTY.properties | 8 +-- .../transformer/messaging/MessagingInfo.java | 56 +++++++++++++++++++ 6 files changed, 71 insertions(+), 27 deletions(-) create mode 100644 alfresco-transformer-base/src/main/java/org/alfresco/transformer/messaging/MessagingInfo.java diff --git a/alfresco-docker-alfresco-pdf-renderer/src/license/THIRD-PARTY.properties b/alfresco-docker-alfresco-pdf-renderer/src/license/THIRD-PARTY.properties index 1c9f0703..9e3a8812 100644 --- a/alfresco-docker-alfresco-pdf-renderer/src/license/THIRD-PARTY.properties +++ b/alfresco-docker-alfresco-pdf-renderer/src/license/THIRD-PARTY.properties @@ -6,7 +6,7 @@ # - Apache License 2.0 # - Apache License, Version 2.0 # - Apache License, version 2.0 -# - BSD +# - BSD 3-clause New License # - CDDL + GPLv2 with classpath exception # - CDDL 1.1 # - CDDL+GPL License @@ -19,18 +19,16 @@ # - MIT License # - MIT license # - Public Domain, per Creative Commons CC0 +# - Sun Binary Code License Agreement # - The Apache License, Version 2.0 # - The Apache Software License, Version 2.0 # - The JSON License # - The MIT License -# - The SAX License -# - The W3C License #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Fri Jun 21 12:08:50 EEST 2019 +#Tue Jul 09 13:35:12 EEST 2019 javax.transaction--jta--1.1=Sun Binary Code License Agreement commons-httpclient--commons-httpclient--3.1-HTTPCLIENT-1265=Apache License 2.0 org.codehaus.guessencoding--guessencoding--1.4=Apache License 2.0 -dom4j--dom4j--1.6.1=BSD diff --git a/alfresco-docker-imagemagick/src/license/THIRD-PARTY.properties b/alfresco-docker-imagemagick/src/license/THIRD-PARTY.properties index 28289f6e..eeeb7e0b 100644 --- a/alfresco-docker-imagemagick/src/license/THIRD-PARTY.properties +++ b/alfresco-docker-imagemagick/src/license/THIRD-PARTY.properties @@ -6,7 +6,7 @@ # - Apache License 2.0 # - Apache License, Version 2.0 # - Apache License, version 2.0 -# - BSD +# - BSD 3-clause New License # - CDDL + GPLv2 with classpath exception # - CDDL 1.1 # - CDDL+GPL License @@ -19,18 +19,16 @@ # - MIT License # - MIT license # - Public Domain, per Creative Commons CC0 +# - Sun Binary Code License Agreement # - The Apache License, Version 2.0 # - The Apache Software License, Version 2.0 # - The JSON License # - The MIT License -# - The SAX License -# - The W3C License #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Fri Jun 21 12:09:05 EEST 2019 +#Tue Jul 09 13:35:40 EEST 2019 javax.transaction--jta--1.1=Sun Binary Code License Agreement commons-httpclient--commons-httpclient--3.1-HTTPCLIENT-1265=Apache License 2.0 org.codehaus.guessencoding--guessencoding--1.4=Apache License 2.0 -dom4j--dom4j--1.6.1=BSD diff --git a/alfresco-docker-libreoffice/src/license/THIRD-PARTY.properties b/alfresco-docker-libreoffice/src/license/THIRD-PARTY.properties index 3266375a..52c90861 100644 --- a/alfresco-docker-libreoffice/src/license/THIRD-PARTY.properties +++ b/alfresco-docker-libreoffice/src/license/THIRD-PARTY.properties @@ -6,7 +6,7 @@ # - Apache License 2.0 # - Apache License, Version 2.0 # - Apache License, version 2.0 -# - BSD +# - BSD 3-clause New License # - CDDL + GPLv2 with classpath exception # - CDDL 1.1 # - CDDL+GPL License @@ -19,18 +19,16 @@ # - MIT License # - MIT license # - Public Domain, per Creative Commons CC0 +# - Sun Binary Code License Agreement # - The Apache License, Version 2.0 # - The Apache Software License, Version 2.0 # - The JSON License # - The MIT License -# - The SAX License -# - The W3C License #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Fri Jun 21 12:09:19 EEST 2019 +#Tue Jul 09 13:36:53 EEST 2019 javax.transaction--jta--1.1=Sun Binary Code License Agreement commons-httpclient--commons-httpclient--3.1-HTTPCLIENT-1265=Apache License 2.0 org.codehaus.guessencoding--guessencoding--1.4=Apache License 2.0 -dom4j--dom4j--1.6.1=BSD diff --git a/alfresco-docker-tika/src/license/THIRD-PARTY.properties b/alfresco-docker-tika/src/license/THIRD-PARTY.properties index d522096b..bea04d22 100644 --- a/alfresco-docker-tika/src/license/THIRD-PARTY.properties +++ b/alfresco-docker-tika/src/license/THIRD-PARTY.properties @@ -11,20 +11,17 @@ # - Apache License, version 2.0 # - Apache Software License - Version 2.0 # - BSD +# - BSD 3-clause New License # - BSD License # - BSD licence # - Bouncy Castle Licence # - CDDL + GPLv2 with classpath exception # - CDDL 1.1 -# - CDDL v1.1 / GPL v2 dual license # - CDDL+GPL License # - CDDL, v1.0 # - CDDL/GPLv2+CE # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - CPL -# - Common Development and Distribution License (CDDL) v1.0 -# - Dual license consisting of the CDDL v1.1 and GPL v2 -# - EDL 1.0 # - EPL 2.0 # - Eclipse Distribution License - v 1.0 # - Eclipse Public License - v 1.0 @@ -45,6 +42,7 @@ # - Public Domain, per Creative Commons CC0 # - Similar to Apache License but with the acknowledgment clause removed # - Specification License +# - Sun Binary Code License Agreement # - The Apache License, Version 2.0 # - The Apache Software License, Version 2.0 # - The BSD License @@ -53,12 +51,11 @@ # - The SAX License # - The W3C License # - UnRar License -# - lgpl #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Fri Jun 21 12:08:04 EEST 2019 +#Tue Jul 09 13:34:27 EEST 2019 org.acegisecurity--acegi-security--0.8.2_patched=Apache License 2.0 net.jcip--jcip-annotations--1.0=Public xerces--xercesImpl--2.11.0-alfresco-patched-20180402=Apache License 2.0 @@ -66,4 +63,3 @@ javax.transaction--jta--1.1=Sun Binary Code License Agreement commons-httpclient--commons-httpclient--3.1-HTTPCLIENT-1265=Apache License 2.0 xpp3--xpp3--1.1.3_8=Apache 1.1 org.codehaus.guessencoding--guessencoding--1.4=Apache License 2.0 -dom4j--dom4j--1.6.1=BSD diff --git a/alfresco-docker-transform-misc/src/license/THIRD-PARTY.properties b/alfresco-docker-transform-misc/src/license/THIRD-PARTY.properties index d886e03b..2ce17de2 100644 --- a/alfresco-docker-transform-misc/src/license/THIRD-PARTY.properties +++ b/alfresco-docker-transform-misc/src/license/THIRD-PARTY.properties @@ -6,7 +6,7 @@ # - Apache License 2.0 # - Apache License, Version 2.0 # - Apache License, version 2.0 -# - BSD +# - BSD 3-clause New License # - BSD License # - CDDL + GPLv2 with classpath exception # - CDDL 1.1 @@ -21,18 +21,16 @@ # - MIT License # - MIT license # - Public Domain, per Creative Commons CC0 +# - Sun Binary Code License Agreement # - The Apache License, Version 2.0 # - The Apache Software License, Version 2.0 # - The JSON License # - The MIT License -# - The SAX License -# - The W3C License #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Fri Jun 21 12:09:33 EEST 2019 +#Tue Jul 09 13:38:31 EEST 2019 javax.transaction--jta--1.1=Sun Binary Code License Agreement commons-httpclient--commons-httpclient--3.1-HTTPCLIENT-1265=Apache License 2.0 org.codehaus.guessencoding--guessencoding--1.4=Apache License 2.0 -dom4j--dom4j--1.6.1=BSD diff --git a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/messaging/MessagingInfo.java b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/messaging/MessagingInfo.java new file mode 100644 index 00000000..986b347c --- /dev/null +++ b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/messaging/MessagingInfo.java @@ -0,0 +1,56 @@ +/* + * #%L + * Alfresco Transform Core + * %% + * Copyright (C) 2005 - 2019 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * - + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * - + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * - + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * - + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ +package org.alfresco.transformer.messaging; + +import javax.annotation.PostConstruct; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Configuration; + +/** + * Prints JMS status information at application startup. + * + * @author Cezar Leahu + */ +@Configuration +public class MessagingInfo +{ + private static final Logger logger = LoggerFactory.getLogger(MessagingInfo.class); + + @Value("${activemq.url:}") + private String activemqUrl; + + @PostConstruct + public void init() + { + final boolean jms = activemqUrl != null && !activemqUrl.isBlank(); + logger.info("JMS client is {}, activemq.url: '{}'", jms ? "ENABLED" : "DISABLED", + activemqUrl); + } +}