Merge branches 'ignite-789' and 'ignite-sprint-4'.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/92794c53 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/92794c53 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/92794c53 Branch: refs/heads/ignite-286 Commit: 92794c539110c668c227c3241c0bf31c8c6f2d43 Parents: 5b18485 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Tue Apr 28 15:42:20 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Tue Apr 28 15:42:20 2015 +0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/ignite/Ignition.java | 18 ------------------ .../ignite/configuration/CacheConfiguration.java | 4 ++-- 2 files changed, 2 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/92794c53/modules/core/src/main/java/org/apache/ignite/Ignition.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/Ignition.java b/modules/core/src/main/java/org/apache/ignite/Ignition.java index 646b906..0204f4c 100644 --- a/modules/core/src/main/java/org/apache/ignite/Ignition.java +++ b/modules/core/src/main/java/org/apache/ignite/Ignition.java @@ -441,24 +441,6 @@ public class Ignition { } /** - * Loads Spring bean by its name from given Spring XML configuration file. If bean - * with such name doesn't exist, exception is thrown. - * - * @param springXmlStream Input stream containing Spring XML configuration (cannot be {@code null}). - * @param beanName Bean name (cannot be {@code null}). - * @return Loaded bean instance. - * @throws IgniteException If bean with provided name was not found or in case any other error. - */ - public static <T> T loadSpringBean(InputStream springXmlStream, String beanName) throws IgniteException { - try { - return IgnitionEx.loadSpringBean(springXmlStream, beanName); - } - catch (IgniteCheckedException e) { - throw U.convertException(e); - } - } - - /** * Gets an instance of default no-name grid. Note that * caller of this method should not assume that it will return the same * instance every time. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/92794c53/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java index 4931bdd..63da524 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java @@ -175,7 +175,7 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> { /** Eviction key buffer size. */ private int evictKeyBufSize = DFLT_EVICT_KEY_BUFFER_SIZE; - /** Synchronous eviction timeout. */ + /** Synchronous eviction concurrency level. */ private int evictSyncConcurrencyLvl = DFLT_EVICT_SYNCHRONIZED_CONCURRENCY_LEVEL; /** Synchronous eviction timeout. */ @@ -1529,7 +1529,7 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> { * Number of SQL rows which will be cached onheap to avoid deserialization on each SQL index access. * This setting only makes sense when offheap is enabled for this cache. * - * @return size Cache size. + * @return Cache size. * @see #setOffHeapMaxMemory(long) */ public int getSqlOnheapRowCacheSize() {
