IGNITE-141 - Fixed configs
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/257029d9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/257029d9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/257029d9 Branch: refs/heads/ignite-51 Commit: 257029d9726c0bed357efb8ce8820e223f38b5a9 Parents: 5825666 Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Thu Mar 5 17:11:56 2015 -0800 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Thu Mar 5 17:11:56 2015 -0800 ---------------------------------------------------------------------- .../core/src/test/config/io-manager-benchmark.xml | 12 ------------ modules/core/src/test/config/jobs-load-base.xml | 11 ----------- .../core/src/test/config/load/dsi-load-base.xml | 16 ---------------- modules/yardstick/config/ignite-base-config.xml | 17 ----------------- modules/yardstick/config/ignite-store-config.xml | 18 ------------------ 5 files changed, 74 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/257029d9/modules/core/src/test/config/io-manager-benchmark.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/io-manager-benchmark.xml b/modules/core/src/test/config/io-manager-benchmark.xml index 1e43e75..48f420f 100644 --- a/modules/core/src/test/config/io-manager-benchmark.xml +++ b/modules/core/src/test/config/io-manager-benchmark.xml @@ -33,18 +33,6 @@ </bean> </property> - <property name="marshaller"> - <bean class="org.apache.ignite.marshaller.optimized.OptimizedMarshaller"> - <property name="requireSerializable" value="true"/> - - <property name="classNames"> - <list> - <value>org.apache.ignite.loadtests.communication.GridTestMessage</value> - </list> - </property> - </bean> - </property> - <!-- Various optimisations. --> <property name="peerClassLoadingEnabled" value="false"/> <property name="connectorConfiguration"><null/></property> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/257029d9/modules/core/src/test/config/jobs-load-base.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/jobs-load-base.xml b/modules/core/src/test/config/jobs-load-base.xml index 91e612a..97e9a88 100644 --- a/modules/core/src/test/config/jobs-load-base.xml +++ b/modules/core/src/test/config/jobs-load-base.xml @@ -31,17 +31,6 @@ <bean abstract="true" id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"> <property name="localHost" value="127.0.0.1"/> - <property name="marshaller"> - <bean class="org.apache.ignite.marshaller.optimized.OptimizedMarshaller"> - <property name="classNames"> - <list> - <value>org.apache.ignite.loadtests.job.GridJobExecutionLoadTestJob</value> - </list> - </property> - </bean> - </property> - - <!-- Uncomment this to provide TCP discovery SPI (predefined addresses). Use the addresses list to provide IP addresses of initial nodes in the grid http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/257029d9/modules/core/src/test/config/load/dsi-load-base.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/load/dsi-load-base.xml b/modules/core/src/test/config/load/dsi-load-base.xml index 27c319f..4b11875 100644 --- a/modules/core/src/test/config/load/dsi-load-base.xml +++ b/modules/core/src/test/config/load/dsi-load-base.xml @@ -32,22 +32,6 @@ <property name="localHost" value="127.0.0.1"/> - <property name="marshaller"> - <bean class="org.apache.ignite.marshaller.optimized.OptimizedMarshaller"> - <property name="classNames"> - <list> - <value>org.apache.ignite.loadtests.dsi.GridDsiSession</value> - <value>org.apache.ignite.loadtests.dsi.GridDsiPerfJob</value> - <value>org.apache.ignite.loadtests.dsi.GridDsiRequestTask</value> - <value>org.apache.ignite.loadtests.dsi.GridDsiResponseTask</value> - <value>org.apache.ignite.loadtests.dsi.GridDsiRequest</value> - <value>org.apache.ignite.loadtests.dsi.GridDsiResponse</value> - <value>org.apache.ignite.loadtests.dsi.GridDsiMessage</value> - </list> - </property> - </bean> - </property> - <property name="discoverySpi"> <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi"> <property name="ipFinder"> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/257029d9/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 1214b8a..ccb45a7 100644 --- a/modules/yardstick/config/ignite-base-config.xml +++ b/modules/yardstick/config/ignite-base-config.xml @@ -27,23 +27,6 @@ <bean id="base-ignite.cfg" class="org.apache.ignite.configuration.IgniteConfiguration" abstract="true"> <property name="peerClassLoadingEnabled" value="false"/> - <property name="marshaller"> - <bean class="org.apache.ignite.marshaller.optimized.OptimizedMarshaller"> - <property name="requireSerializable" value="true"/> - <property name="classNames"> - <list> - <value>org.apache.ignite.yardstick.cache.model.SampleValue</value> - <value>org.apache.ignite.yardstick.cache.model.Person</value> - <value>org.apache.ignite.yardstick.cache.model.Organization</value> - <value>org.apache.ignite.yardstick.compute.model.NoopTask$NoopJob</value> - <value>org.apache.ignite.yardstick.compute.model.NoopCallable</value> - <value>org.apache.ignite.yardstick.compute.IgniteRunBenchmark$NoopRunnable</value> - <value>org.apache.ignite.yardstick.compute.IgniteApplyBenchmark$NoopClosure</value> - </list> - </property> - </bean> - </property> - <!--<property name="indexingSpi">--> <!--<list>--> <!--<bean class="org.apache.ignite.spi.indexing.h2.H2IndexingSpi">--> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/257029d9/modules/yardstick/config/ignite-store-config.xml ---------------------------------------------------------------------- diff --git a/modules/yardstick/config/ignite-store-config.xml b/modules/yardstick/config/ignite-store-config.xml index 066b246..fee35eb 100644 --- a/modules/yardstick/config/ignite-store-config.xml +++ b/modules/yardstick/config/ignite-store-config.xml @@ -73,24 +73,6 @@ <bean class="org.apache.ignite.configuration.IgniteConfiguration" > <property name="peerClassLoadingEnabled" value="false"/> - <property name="marshaller"> - <bean class="org.apache.ignite.marshaller.optimized.OptimizedMarshaller"> - <property name="requireSerializable" value="true"/> - <property name="classNames"> - <list> - <value>org.apache.ignite.yardstick.cache.model.SampleKey</value> - <value>org.apache.ignite.yardstick.cache.model.SampleValue</value> - <value>org.apache.ignite.yardstick.cache.model.Person</value> - <value>org.apache.ignite.yardstick.cache.model.Organization</value> - <value>org.apache.ignite.yardstick.compute.model.NoopTask$NoopJob</value> - <value>org.apache.ignite.yardstick.compute.model.NoopCallable</value> - <value>org.apache.ignite.yardstick.compute.IgniteRunBenchmark$NoopRunnable</value> - <value>org.apache.ignite.yardstick.compute.IgniteApplyBenchmark$NoopClosure</value> - </list> - </property> - </bean> - </property> - <property name="cacheConfiguration"> <list> <bean class="org.apache.ignite.configuration.CacheConfiguration">
