From c83f7e9aa8fa23b6ce86b5ee48969836d8b3e5d0 Mon Sep 17 00:00:00 2001
From: jbonofre <jbonofre@apache.org>
Date: Wed, 2 Dec 2020 11:25:23 +0100
Subject: [PATCH] [AMQ-6899] Use generic spring schema name (working with any
 Spring version) in RuntimeConfigurationPlugin

---
 .../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 0d7e17fe05..9d3c68f251 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;