Repository: incubator-ignite Updated Branches: refs/heads/ignite-960 6affd3fe3 -> 8a9cd8226
#ignite-960: Small fix in javadoc Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/90f42a4b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/90f42a4b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/90f42a4b Branch: refs/heads/ignite-960 Commit: 90f42a4b78c5b0aba8dcc5ff9985470077dc66e0 Parents: 6affd3f Author: ivasilinets <ivasilin...@gridgain.com> Authored: Tue Jun 2 11:00:22 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Tue Jun 2 11:00:22 2015 +0300 ---------------------------------------------------------------------- .../ignite/resources/SpringApplicationContextResource.java | 4 ++-- modules/spring/src/test/config/store-cache.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90f42a4b/modules/core/src/main/java/org/apache/ignite/resources/SpringApplicationContextResource.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/resources/SpringApplicationContextResource.java b/modules/core/src/main/java/org/apache/ignite/resources/SpringApplicationContextResource.java index 93c9a30..38c0c88 100644 --- a/modules/core/src/main/java/org/apache/ignite/resources/SpringApplicationContextResource.java +++ b/modules/core/src/main/java/org/apache/ignite/resources/SpringApplicationContextResource.java @@ -37,7 +37,7 @@ import java.lang.annotation.*; * <pre name="code" class="java"> * public class MyGridJob implements ComputeJob { * ... - * @IgniteSpringApplicationContextResource + * @SpringApplicationContextResource * private ApplicationContext springCtx; * ... * } @@ -48,7 +48,7 @@ import java.lang.annotation.*; * ... * private ApplicationContext springCtx; * ... - * @IgniteSpringApplicationContextResource + * @SpringApplicationContextResource * public void setApplicationContext(MBeanServer springCtx) { * this.springCtx = springCtx; * } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90f42a4b/modules/spring/src/test/config/store-cache.xml ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/config/store-cache.xml b/modules/spring/src/test/config/store-cache.xml index 23cf3ea..af5928b 100644 --- a/modules/spring/src/test/config/store-cache.xml +++ b/modules/spring/src/test/config/store-cache.xml @@ -24,7 +24,7 @@ <bean class="org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor"/> - <bean id= "simpleDataSource" class="org.h2.jdbcx.JdbcDataSource"/> + <bean id="simpleDataSource" class="org.h2.jdbcx.JdbcDataSource"/> <bean id="ignite.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"> <property name="cacheConfiguration">