# ignite-204 : fix GridGain occurrences (portables from clients/test at spring-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/9edc6ca2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9edc6ca2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9edc6ca2 Branch: refs/heads/master Commit: 9edc6ca2afd61176407deb33eb6da686b2b83441 Parents: d220443 Author: Artem Shutak <ashu...@gridgain.com> Authored: Mon Feb 16 14:35:00 2015 +0300 Committer: Artem Shutak <ashu...@gridgain.com> Committed: Mon Feb 16 14:35:00 2015 +0300 ---------------------------------------------------------------------- .../clients/src/test/resources/spring-cache.xml | 12 ----------- .../src/test/resources/spring-server-node.xml | 21 -------------------- .../test/resources/spring-server-ssl-node.xml | 20 ++----------------- 3 files changed, 2 insertions(+), 51 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9edc6ca2/modules/clients/src/test/resources/spring-cache.xml ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/resources/spring-cache.xml b/modules/clients/src/test/resources/spring-cache.xml index 6e93f4e..d34e3cc 100644 --- a/modules/clients/src/test/resources/spring-cache.xml +++ b/modules/clients/src/test/resources/spring-cache.xml @@ -222,17 +222,5 @@ </property> </bean> </property> - - <property name="portableConfiguration"> - <bean class="org.gridgain.grid.portables.PortableConfiguration"> - <property name="typeConfigurations"> - <list> - <bean class="org.gridgain.grid.portables.PortableTypeConfiguration"> - <property name="className" value="org.gridgain.client.ClientTestPortable"/> - </bean> - </list> - </property> - </bean> - </property> </bean> </beans> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9edc6ca2/modules/clients/src/test/resources/spring-server-node.xml ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/resources/spring-server-node.xml b/modules/clients/src/test/resources/spring-server-node.xml index 3aff4a2..3b19f3d 100644 --- a/modules/clients/src/test/resources/spring-server-node.xml +++ b/modules/clients/src/test/resources/spring-server-node.xml @@ -72,27 +72,6 @@ </list> </property> - <property name="portableConfiguration"> - <bean class="org.gridgain.grid.portables.PortableConfiguration"> - <property name="typeConfigurations"> - <list> - <bean class="org.gridgain.grid.portables.PortableTypeConfiguration"> - <property name="className" value="org.gridgain.client.ClientTestPortable"/> - </bean> - <bean class="org.gridgain.grid.portables.PortableTypeConfiguration"> - <property name="className" value="org.apache.ignite.client.model.GridPortablePerson"/> - </bean> - <bean class="org.gridgain.grid.portables.PortableTypeConfiguration"> - <property name="className" value="org.apache.ignite.client.model.GridImplicitPortablePerson"/> - </bean> - <bean class="org.gridgain.grid.portables.PortableTypeConfiguration"> - <property name="className" value="GridNoDefPortablePerson"/> - </bean> - </list> - </property> - </bean> - </property> - <!-- Client configuration. --> <property name="connectorConfiguration"> <bean class="org.apache.ignite.configuration.ConnectorConfiguration"> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9edc6ca2/modules/clients/src/test/resources/spring-server-ssl-node.xml ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/resources/spring-server-ssl-node.xml b/modules/clients/src/test/resources/spring-server-ssl-node.xml index bffc965..3989ac6 100644 --- a/modules/clients/src/test/resources/spring-server-ssl-node.xml +++ b/modules/clients/src/test/resources/spring-server-ssl-node.xml @@ -28,12 +28,8 @@ --> <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:util="http://www.springframework.org/schema/util"; - xsi:schemaLocation=" - http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/util - http://www.springframework.org/schema/util/spring-util.xsd";> + xsi:schemaLocation="http://www.springframework.org/schema/beans + http://www.springframework.org/schema/beans/spring-beans.xsd";> <!-- Optional description. @@ -263,17 +259,5 @@ <property name="publicThreadPoolSize" value="15"/> <property name="systemThreadPoolSize" value="15"/> - - <property name="portableConfiguration"> - <bean class="org.gridgain.grid.portables.PortableConfiguration"> - <property name="typeConfigurations"> - <list> - <bean class="org.gridgain.grid.portables.PortableTypeConfiguration"> - <property name="className" value="org.gridgain.client.ClientTestPortable"/> - </bean> - </list> - </property> - </bean> - </property> </bean> </beans>
