Supply from filesystem infinispan configuration

- In order to speed up the prototyping time, allow to supply an
infinispan configuration from the filesystem along the one embedded in
the clustering.services-implementation. This can be specified by
supplying the property org.infinispan.config.file
- Align to 5.3 the XSD used in the infinispan config file, seems there
are different defaults between 5.1 XSD and 5.3

Change-Id: Ied87ecc56725b89b5c85ff21ae185f5d68988ab1
Signed-off-by: Giovanni Meo <gmeo@cisco.com>

diff --git a/opendaylight/clustering/services_implementation/src/main/java/org/opendaylight/controller/clustering/services_implementation/internal/ClusterManager.java b/opendaylight/clustering/services_implementation/src/main/java/org/opendaylight/controller/clustering/services_implementation/internal/ClusterManager.java
index cd3a29579194c9a6a9831f4e44d7e67150b69f6d..ca13fbc2d23df7cb94d295401e48c30ec78bb9aa 100644 (file)
--- a/opendaylight/clustering/services_implementation/src/main/java/org/opendaylight/controller/clustering/services_implementation/internal/ClusterManager.java
+++ b/opendaylight/clustering/services_implementation/src/main/java/org/opendaylight/controller/clustering/services_implementation/internal/ClusterManager.java
@@ -252,7 +252,10 @@ public class ClusterManager implements IClusterServices, IContainerAware {
         try {
             ParserRegistry parser = new ParserRegistry(this.getClass()
                     .getClassLoader());
-            ConfigurationBuilderHolder holder = parser.parseFile("config/infinispan-config.xml");
+            String infinispanConfigFile =
+                    System.getProperty("org.infinispan.config.file", "config/infinispan-config.xml");
+            logger.debug("Using configuration file:{}", infinispanConfigFile);
+            ConfigurationBuilderHolder holder = parser.parseFile(infinispanConfigFile);
             GlobalConfigurationBuilder globalBuilder = holder.getGlobalConfigurationBuilder();
             globalBuilder.serialization()
                     .classResolver(new ClassResolver())

diff --git a/opendaylight/clustering/services_implementation/src/main/resources/config/infinispan-config.xml b/opendaylight/clustering/services_implementation/src/main/resources/config/infinispan-config.xml
index ff6f99cb4bdd45adb87582f40d47356d4f8ee711..5ec4325c7f83a665ffc54d0de10b8a7ea0e31ebe 100644 (file)
--- a/opendaylight/clustering/services_implementation/src/main/resources/config/infinispan-config.xml
+++ b/opendaylight/clustering/services_implementation/src/main/resources/config/infinispan-config.xml
@@ -1,4 +1,4 @@
-<infinispan xsi:schemaLocation="urn:infinispan:config:5.1 http://www.infinispan.org/schemas/infinispan-config-5.1.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:infinispan:config:5.1">
+<infinispan xsi:schemaLocation="urn:infinispan:config:5.3 http://www.infinispan.org/schemas/infinispan-config-5.3.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:infinispan:config:5.3">
   <global>
     <transport>
       <properties>