commit 08d5343f9cfc5d6292dca93512343bc60036c754
author nikolay_tikhonov <ntikhonov@gridgain.com> Fri Jul 24 15:21:40 2015 +0300
committer nikolay_tikhonov <ntikhonov@gridgain.com> Fri Jul 24 15:21:40 2015 +0300
tree 9d86020809abfd2a76c33d40b1de779559b22ae6
parent b7912fd15a111257c79ccdd75744adc146e446ca
parent 5082d63a3fbdc1a4ba8da38bb5d10c27a629aebc

Merge branch 'ignite-1.3.3' into ignite-1.3.3-sslbench

modules/yardstick/config/ignite-base-config.xml

diff --git a/modules/yardstick/config/ignite-base-config.xml b/modules/yardstick/config/ignite-base-config.xml
index b2c976a..3b74d16 100644
--- a/modules/yardstick/config/ignite-base-config.xml
+++ b/modules/yardstick/config/ignite-base-config.xml
@@ -29,6 +29,16 @@
 
         <property name="metricsLogFrequency" value="5000"/>
 
+        <property name="sslContextFactory">
+            <bean class="org.apache.ignite.ssl.SslContextFactory">
+                <property name="keyStoreFilePath" value="config/server.jks"/>
+                <property name="keyStorePassword" value="123456"/>
+                <property name="trustManagers">
+                    <bean class="org.apache.ignite.ssl.SslContextFactory" factory-method="getDisabledTrustManager"/>
+                </property>
+            </bean>
+        </property>
+
         <property name="cacheConfiguration">
             <list>
                 <bean class="org.apache.ignite.configuration.CacheConfiguration">

modules/yardstick/config/server.jks

diff --git a/modules/yardstick/config/server.jks b/modules/yardstick/config/server.jks
new file mode 100644
index 0000000..006ecec
--- /dev/null
+++ b/modules/yardstick/config/server.jks
Binary files differ