activemq-commits mailing list archives

This is an automated email from the ASF dual-hosted git repository.

jbonofre pushed a commit to branch activemq-5.16.x
in repository https://gitbox.apache.org/repos/asf/activemq.git


The following commit(s) were added to refs/heads/activemq-5.16.x by this push:
     new 1bc1b6d  [AMQ-6899] Use generic spring schema name (working with any Spring version)
in RuntimeConfigurationPlugin
1bc1b6d is described below

commit 1bc1b6d5028114c8fc97e138d4d588b87293b403
Author: jbonofre <jbonofre@apache.org>
AuthorDate: Wed Dec 2 11:25:23 2020 +0100

    [AMQ-6899] Use generic spring schema name (working with any Spring version) in RuntimeConfigurationPlugin
    
    (cherry picked from commit c83f7e9aa8fa23b6ce86b5ee48969836d8b3e5d0)
---
 .../java/org/apache/activemq/plugin/RuntimeConfigurationBroker.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/activemq-runtime-config/src/main/java/org/apache/activemq/plugin/RuntimeConfigurationBroker.java
b/activemq-runtime-config/src/main/java/org/apache/activemq/plugin/RuntimeConfigurationBroker.java
index 0d7e17f..9d3c68f 100644
--- a/activemq-runtime-config/src/main/java/org/apache/activemq/plugin/RuntimeConfigurationBroker.java
+++ b/activemq-runtime-config/src/main/java/org/apache/activemq/plugin/RuntimeConfigurationBroker.java
@@ -233,7 +233,11 @@ public class RuntimeConfigurationBroker extends AbstractRuntimeConfigurationBrok
 
             ArrayList<StreamSource> schemas = new ArrayList<StreamSource>();
             schemas.add(new StreamSource(getClass().getResource("/activemq.xsd").toExternalForm()));
-            schemas.add(new StreamSource(getClass().getResource("/org/springframework/beans/factory/xml/spring-beans-3.0.xsd").toExternalForm()));
+            if (getClass().getResource("/org/springframework/beans/factory/xml/spring-beans-3.0.xsd")
!= null) {
+                schemas.add(new StreamSource(getClass().getResource("/org/springframework/beans/factory/xml/spring-beans-3.0.xsd").toExternalForm()));
+            } else {
+                schemas.add(new StreamSource(getClass().getResource("/org/springframework/beans/factory/xml/spring-beans.xsd").toExternalForm()));
+            }
             schema = schemaFactory.newSchema(schemas.toArray(new Source[]{}));
         }
         return schema;