activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject [activemq] branch master updated: [AMQ-6899] Use generic spring schema name (working with any Spring version) in RuntimeConfigurationPlugin
Date Wed, 02 Dec 2020 16:27:35 GMT
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
     new c83f7e9  [AMQ-6899] Use generic spring schema name (working with any Spring version)
in RuntimeConfigurationPlugin
     new 6e28547  Merge pull request #590 from jbonofre/AMQ-6899
c83f7e9 is described below

commit c83f7e9aa8fa23b6ce86b5ee48969836d8b3e5d0
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
---
 .../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;


Mime
View raw message