fix(ignite): add missing Ignite configuration

3 files changed, 126 insertions, 74 deletions

diff --git a/basicConfig/eIDAS/ignite/igniteSpecificCommunication.xml b/basicConfig/eIDAS/ignite/igniteSpecificCommunication.xml
new file mode 100644
index 00000000..da61cbf1
--- /dev/null
+++ b/basicConfig/eIDAS/ignite/igniteSpecificCommunication.xml
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ Copyright (c) 2018 by European Commission
+  ~
+  ~ Licensed under the EUPL, Version 1.2 or - as soon they will be
+  ~ approved by the European Commission - subsequent versions of the
+  ~ EUPL (the "Licence");
+  ~ You may not use this work except in compliance with the Licence.
+  ~ You may obtain a copy of the Licence at:
+  ~ https://joinup.ec.europa.eu/page/eupl-text-11-12
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the Licence is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+  ~ implied.
+  ~ See the Licence for the specific language governing permissions and
+  ~ limitations under the Licence.
+  -->
+
+<!--
+    Ignite Spring configuration file to startup Ignite cache.
+
+    This file demonstrates how to configure cache using Spring. Provided cache
+    will be created on node startup.
+
+    Use this configuration file when running HTTP REST examples (see 'examples/rest' folder).
+
+    When starting a standalone node, you need to execute the following command:
+    {IGNITE_HOME}/bin/ignite.{bat|sh} examples/config/ignite-cache.xml
+
+    When starting Ignite from Java IDE, pass path to this file to Ignition:
+    Ignition.start("examples/config/ignite-cache.xml");
+-->
+
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="
+        http://www.springframework.org/schema/beans
+        http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+    <bean id="igniteSpecificCommunication.cfg" class="org.apache.ignite.configuration.IgniteConfiguration">
+
+        <property name="igniteInstanceName" value="igniteSpecificCommunication"/>
+
+        <property name="cacheConfiguration">
+            <list>
+
+                <!--Specific Communication Caches-->
+                <!-- Partitioned cache example configuration (Atomic mode). -->
+                <bean class="org.apache.ignite.configuration.CacheConfiguration">
+                    <property name="name" value="specificNodeConnectorRequestCache"/>
+                    <property name="atomicityMode" value="ATOMIC"/>
+                    <property name="backups" value="1"/>
+                    <property name="expiryPolicyFactory" ref="7_minutes_duration"/>
+                </bean>
+                <!-- Partitioned cache example configuration (Atomic mode). -->
+                <bean class="org.apache.ignite.configuration.CacheConfiguration">
+                    <property name="name" value="nodeSpecificProxyserviceRequestCache"/>
+                    <property name="atomicityMode" value="ATOMIC"/>
+                    <property name="backups" value="1"/>
+                    <property name="expiryPolicyFactory" ref="7_minutes_duration"/>
+                </bean>
+                <!-- Partitioned cache example configuration (Atomic mode). -->
+                <bean class="org.apache.ignite.configuration.CacheConfiguration">
+                    <property name="name" value="specificNodeProxyserviceResponseCache"/>
+                    <property name="atomicityMode" value="ATOMIC"/>
+                    <property name="backups" value="1"/>
+                    <property name="expiryPolicyFactory" ref="7_minutes_duration"/>
+                </bean>                
+                <!-- Partitioned cache example configuration (Atomic mode). -->
+                <bean class="org.apache.ignite.configuration.CacheConfiguration">
+                    <property name="name" value="nodeSpecificConnectorResponseCache"/>
+                    <property name="atomicityMode" value="ATOMIC"/>
+                    <property name="backups" value="1"/>
+                    <property name="expiryPolicyFactory" ref="7_minutes_duration"/>
+                </bean>
+                <!-- Partitioned cache example configuration (Atomic mode). -->
+                <bean class="org.apache.ignite.configuration.CacheConfiguration">
+                    <property name="name" value="msConnectorCache"/>
+                    <property name="atomicityMode" value="ATOMIC"/>
+                    <property name="backups" value="1"/>
+                    <property name="expiryPolicyFactory" ref="7_minutes_duration"/>
+                </bean>
+
+            </list>
+        </property>
+
+        <!--Multicast discover of other nodes in the grid configuration-->
+        <property name="discoverySpi">
+            <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi">
+                <property name="ipFinder">
+                    <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinder">
+                        <property name="multicastGroup" value="228.10.10.157"/>
+                    </bean>
+                </property>
+            </bean>
+        </property>
+
+        <!-- how frequently Ignite will output basic node metrics into the log-->
+        <property name="metricsLogFrequency" value="#{60 * 10 * 1000}"/>
+
+    </bean>
+
+    <!--
+        Initialize property configurer so we can reference environment variables.
+    -->
+    <bean id="propertyConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+        <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_FALLBACK"/>
+        <property name="searchSystemEnvironment" value="true"/>
+    </bean>
+
+    <!--
+        Defines expiry policy based on moment of creation for ignite cache.
+    -->
+    <bean id="7_minutes_duration" class="javax.cache.expiry.CreatedExpiryPolicy" factory-method="factoryOf" scope="prototype">
+        <constructor-arg>
+            <bean class="javax.cache.expiry.Duration">
+                <constructor-arg value="MINUTES"/>
+                <constructor-arg value="7"/>
+            </bean>
+        </constructor-arg>
+    </bean>    
+    
+</beans>
diff --git a/basicConfig/eIDAS/specificCommunicationDefinitionConnector.xml b/basicConfig/eIDAS/specificCommunicationDefinitionConnector.xml
deleted file mode 100644
index d1fc042d..00000000
--- a/basicConfig/eIDAS/specificCommunicationDefinitionConnector.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-#   Copyright (c) 2017 European Commission  
-#   Licensed under the EUPL, Version 1.2 or – as soon they will be 
-#   approved by the European Commission - subsequent versions of the 
-#    EUPL (the "Licence"); 
-#    You may not use this work except in compliance with the Licence. 
-#    You may obtain a copy of the Licence at: 
-#    * https://joinup.ec.europa.eu/page/eupl-text-11-12  
-#    *
-#    Unless required by applicable law or agreed to in writing, software 
-#    distributed under the Licence is distributed on an "AS IS" basis, 
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-#    See the Licence for the specific language governing permissions and limitations under the Licence.
- -->
-
-<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
-<properties>
-  <!-- issuer name -->
-  <entry key="lightToken.connector.request.issuer.name">specificCommunicationDefinitionConnectorRequest</entry>
-  <entry key="lightToken.connector.request.node.id">specificConnector</entry> 
-
-	<!--secrets and algorithms for request consent token-->
-	<entry key="lightToken.connector.request.secret">mySecretConnectorRequest</entry>
-	<entry key="lightToken.connector.request.algorithm">SHA-256</entry>
-
-	<!-- issuer name -->
-	<entry key="lightToken.connector.response.issuer.name">specificCommunicationDefinitionConnectorResponse</entry>
-  <entry key="lightToken.connector.response.node.id">specificConnector</entry>
-  
-	<!--secrets and algorithms for response consent token-->
-	<entry key="lightToken.connector.response.secret">mySecretConnectorResponse</entry>
-	<entry key="lightToken.connector.response.algorithm">SHA-256</entry>
-  
-  <!--The value of incoming lightRequest maximum number characters allowed-->
-	<entry key="incoming.lightRequest.max.number.characters">65535</entry>
-</properties>
diff --git a/basicConfig/eIDAS/specificCommunicationDefinitionProxyservice.xml b/basicConfig/eIDAS/specificCommunicationDefinitionProxyservice.xml
deleted file mode 100644
index c8caf16b..00000000
--- a/basicConfig/eIDAS/specificCommunicationDefinitionProxyservice.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-#   Copyright (c) 2017 European Commission  
-#   Licensed under the EUPL, Version 1.2 or – as soon they will be 
-#   approved by the European Commission - subsequent versions of the 
-#    EUPL (the "Licence"); 
-#    You may not use this work except in compliance with the Licence. 
-#    You may obtain a copy of the Licence at: 
-#    * https://joinup.ec.europa.eu/page/eupl-text-11-12  
-#    *
-#    Unless required by applicable law or agreed to in writing, software 
-#    distributed under the Licence is distributed on an "AS IS" basis, 
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-#    See the Licence for the specific language governing permissions and limitations under the Licence.
- -->
-
-<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
-<properties>
-  <entry key="distributedCommunicationMaps">true</entry> 
-
-	<!-- issuer name -->
-	<entry key="lightToken.proxyservice.request.issuer.name">specificCommunicationDefinitionProxyserviceRequest</entry>
-  <entry key="lightToken.proxyservice.request.node.id">specificProxyService</entry>
-	<!--secrets and algorithms for request consent token-->
-	<entry key="lightToken.proxyservice.request.secret">mySecretProxyserviceRequest</entry>
-	<entry key="lightToken.proxyservice.request.algorithm">SHA-256</entry>
-
-	<!-- issuer name -->
-	<entry key="lightToken.proxyservice.response.issuer.name">specificCommunicationDefinitionProxyserviceResponse</entry>
-  <entry key="lightToken.proxyservice.response.node.id">specificProxyService</entry>
-	<!--secrets and algorithms for response consent token-->
-	<entry key="lightToken.proxyservice.response.secret">mySecretProxyserviceResponse</entry>
-	<entry key="lightToken.proxyservice.response.algorithm">SHA-256</entry>
-  
-  <!--The value of incoming Light Response maximum number characters allowed-->
-	<entry key="incoming.lightResponse.max.number.characters">65535</entry>
-</properties>