Repository: incubator-ignite Updated Branches: refs/heads/ignite-164v2 df2db5655 -> 12c06f699
#ignite-164: Rename class GridGain to Ignition in comments. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/12c06f69 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/12c06f69 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/12c06f69 Branch: refs/heads/ignite-164v2 Commit: 12c06f699f9322ee4902954237d30d71f4b58eb6 Parents: df2db56 Author: ivasilinets <[email protected]> Authored: Wed Feb 4 20:12:16 2015 +0300 Committer: ivasilinets <[email protected]> Committed: Wed Feb 4 20:12:16 2015 +0300 ---------------------------------------------------------------------- config/hadoop/default-config.xml | 4 ++-- modules/clients/src/test/resources/spring-cache.xml | 4 ++-- modules/clients/src/test/resources/spring-server-node.xml | 4 ++-- .../clients/src/test/resources/spring-server-ssl-node.xml | 4 ++-- .../core/src/main/java/org/apache/ignite/IgniteCompute.java | 8 ++++---- .../core/src/main/java/org/apache/ignite/IgniteEvents.java | 2 +- .../core/src/main/java/org/apache/ignite/IgniteManaged.java | 4 ++-- .../src/main/java/org/apache/ignite/IgniteMessaging.java | 2 +- .../src/main/java/org/apache/ignite/IgnitePortables.java | 4 ++-- .../src/main/java/org/apache/ignite/IgniteScheduler.java | 6 +++--- modules/core/src/main/java/org/apache/ignite/Ignition.java | 4 ++-- .../java/org/apache/ignite/cache/query/CacheQueries.java | 2 +- .../main/java/org/apache/ignite/cluster/ClusterGroup.java | 2 +- .../org/apache/ignite/internal/product/IgniteProduct.java | 2 +- .../main/java/org/apache/ignite/lifecycle/LifecycleBean.java | 2 +- .../main/java/org/apache/ignite/managed/ManagedService.java | 2 +- .../apache/ignite/managed/ManagedServiceConfiguration.java | 2 +- .../java/org/apache/ignite/plugin/security/GridSecurity.java | 2 +- .../java/org/apache/ignite/portables/PortableBuilder.java | 4 ++-- .../java/org/apache/ignite/portables/PortableObject.java | 4 ++-- .../spi/authentication/noop/NoopAuthenticationSpi.java | 2 +- .../ignite/spi/communication/tcp/TcpCommunicationSpi.java | 2 +- .../org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 2 +- .../ignite/spi/securesession/noop/NoopSecureSessionSpi.java | 2 +- .../main/java/org/apache/ignite/transactions/IgniteTx.java | 2 +- .../config/benchmark/spring-cache-client-benchmark-1.xml | 4 ++-- .../config/benchmark/spring-cache-client-benchmark-2.xml | 4 ++-- .../config/benchmark/spring-cache-client-benchmark-3.xml | 4 ++-- modules/core/src/test/config/ggfs-shmem.xml | 4 ++-- modules/core/src/test/config/spring-cache-load.xml | 4 ++-- modules/core/src/test/config/spring-multicache.xml | 4 ++-- .../config/streamer/average/spring-streamer-average-base.xml | 4 ++-- .../streamer/average/spring-streamer-average-local.xml | 4 ++-- .../streamer/average/spring-streamer-average-random.xml | 4 ++-- .../core/src/test/config/streamer/spring-streamer-base.xml | 4 ++-- .../ignite/loadtests/capacity/spring-capacity-cache.xml | 4 ++-- .../apache/ignite/loadtests/colocation/spring-colocation.xml | 4 ++-- modules/core/src/test/webapp/META-INF/gg-config.xml | 4 ++-- 38 files changed, 65 insertions(+), 65 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12c06f69/config/hadoop/default-config.xml ---------------------------------------------------------------------- diff --git a/config/hadoop/default-config.xml b/config/hadoop/default-config.xml index a206e4f..b5990e4 100644 --- a/config/hadoop/default-config.xml +++ b/config/hadoop/default-config.xml @@ -23,8 +23,8 @@ When starting a standalone GridGain node, you need to execute the following command: {IGNITE_HOME}/bin/ignite.{bat|sh} path-to-this-file/default-config.xml - When starting GridGain from Java IDE, pass path to this file into GridGain: - GridGain.start("path-to-this-file/default-config.xml"); + When starting GridGain from Java IDE, pass path to this file into Ignition: + Ignition.start("path-to-this-file/default-config.xml"); --> <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"; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12c06f69/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 eaa9355..8b02466 100644 --- a/modules/clients/src/test/resources/spring-cache.xml +++ b/modules/clients/src/test/resources/spring-cache.xml @@ -23,8 +23,8 @@ When starting a standalone GridGain node, you need to execute the following command: {IGNITE_HOME}/bin/ignite.{bat|sh} examples/config/example-cache.xml - When starting GridGain from Java IDE, pass path to this file into GridGain: - GridGain.start("examples/config/example-cache.xml"); + When starting GridGain from Java IDE, pass path to this file into Ignition: + Ignition.start("examples/config/example-cache.xml"); --> <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12c06f69/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 ccfcf0f..3d4d3cc 100644 --- a/modules/clients/src/test/resources/spring-server-node.xml +++ b/modules/clients/src/test/resources/spring-server-node.xml @@ -23,8 +23,8 @@ When starting a standalone GridGain node, you need to execute the following command: {IGNITE_HOME}/bin/ignite.{bat|sh} path-to-this-file/example-cache.xml - When starting GridGain from Java IDE, pass path to this file into GridGain: - GridGain.start("path-to-this-file/example-benchmark.xml"); + When starting GridGain from Java IDE, pass path to this file into Ignition: + Ignition.start("path-to-this-file/example-benchmark.xml"); --> <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12c06f69/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 68774da..682f501 100644 --- a/modules/clients/src/test/resources/spring-server-ssl-node.xml +++ b/modules/clients/src/test/resources/spring-server-ssl-node.xml @@ -23,8 +23,8 @@ When starting a standalone GridGain node, you need to execute the following command: {IGNITE_HOME}/bin/ignite.{bat|sh} path-to-this-file/example-cache.xml - When starting GridGain from Java IDE, pass path to this file into GridGain: - GridGain.start("path-to-this-file/example-benchmark.xml"); + When starting GridGain from Java IDE, pass path to this file into Ignition: + Ignition.start("path-to-this-file/example-benchmark.xml"); --> <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12c06f69/modules/core/src/main/java/org/apache/ignite/IgniteCompute.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCompute.java b/modules/core/src/main/java/org/apache/ignite/IgniteCompute.java index ecb542a..e0b8076 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteCompute.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteCompute.java @@ -35,7 +35,7 @@ import java.util.concurrent.*; * in the {@link ClusterGroup}. Instance of {@code GridCompute} is obtained from grid projection * as follows: * <pre name="code" class="java"> - * GridCompute c = GridGain.grid().compute(); + * GridCompute c = Ignition.ignite().compute(); * </pre> * The methods are grouped as follows: * <ul> @@ -356,7 +356,7 @@ public interface IgniteCompute extends IgniteAsyncSupport { * <p> * Here is an example. * <pre name="code" class="java"> - * GridGain.grid().withName("MyTask").run(new MyRunnable() {...}); + * Ignition.ignite().withName("MyTask").run(new MyRunnable() {...}); * </pre> * * @param taskName Task name. @@ -372,7 +372,7 @@ public interface IgniteCompute extends IgniteAsyncSupport { * <p> * Here is an example. * <pre name="code" class="java"> - * GridGain.grid().withTimeout(10000).run(new MyRunnable() {...}); + * Ignition.ignite().withTimeout(10000).run(new MyRunnable() {...}); * </pre> * * @param timeout Computation timeout in milliseconds. @@ -388,7 +388,7 @@ public interface IgniteCompute extends IgniteAsyncSupport { * <p> * Here is an example. * <pre name="code" class="java"> - * GridGain.grid().compute().withNoFailover().run(new MyRunnable() {...}); + * Ignition.ignite().compute().withNoFailover().run(new MyRunnable() {...}); * </pre> * * @return This {@code GridCompute} instance for chaining calls. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12c06f69/modules/core/src/main/java/org/apache/ignite/IgniteEvents.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteEvents.java b/modules/core/src/main/java/org/apache/ignite/IgniteEvents.java index b945104..e1381c2 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteEvents.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteEvents.java @@ -29,7 +29,7 @@ import java.util.*; * There are {@code 2} ways to subscribe to event listening, {@code local} and {@code remote}. Instance * of {@code GridMessaging} is obtained from grid projection as follows: * <pre name="code" class="java"> - * GridEvents evts = GridGain.grid().events(); + * GridEvents evts = Ignition.ignite().events(); * </pre> * <p> * Local subscription, defined by {@link #localListen(IgnitePredicate, int...)} method, will add * a listener for specified events on local node only. This listener will be notified whenever any http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12c06f69/modules/core/src/main/java/org/apache/ignite/IgniteManaged.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteManaged.java b/modules/core/src/main/java/org/apache/ignite/IgniteManaged.java index a7f18f3..a44a362 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteManaged.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteManaged.java @@ -30,7 +30,7 @@ import java.util.*; * Defines functionality necessary to deploy distributed services on the grid. Instance of * {@code GridServices} is obtained from grid projection as follows: * <pre name="code" class="java"> - * GridServices svcs = GridGain.grid().services(); + * GridServices svcs = Ignition.ignite().services(); * </pre> * With distributed services you can do the following: * <ul> @@ -67,7 +67,7 @@ import java.util.*; * * gridCfg.setServiceConfiguration(svcCfg1, svcCfg2); * ... - * GridGain.start(gridCfg); + * Ignition.start(gridCfg); * </pre> * <h1 class="header">Load Balancing</h1> * In all cases, other than singleton service deployment, GridGain will automatically make sure that http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12c06f69/modules/core/src/main/java/org/apache/ignite/IgniteMessaging.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteMessaging.java b/modules/core/src/main/java/org/apache/ignite/IgniteMessaging.java index c331b6a..90202ca 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteMessaging.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteMessaging.java @@ -30,7 +30,7 @@ import java.util.*; * cannot be reused between ordered and unordered messages. Instance of {@code GridMessaging} * is obtained from grid projection as follows: * <pre name="code" class="java"> - * GridMessaging m = GridGain.grid().message(); + * GridMessaging m = Ignition.ignite().message(); * </pre> * <p> * There are {@code 2} ways to subscribe to message listening, {@code local} and {@code remote}. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12c06f69/modules/core/src/main/java/org/apache/ignite/IgnitePortables.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/IgnitePortables.java b/modules/core/src/main/java/org/apache/ignite/IgnitePortables.java index aebc31b..ec62a05 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgnitePortables.java +++ b/modules/core/src/main/java/org/apache/ignite/IgnitePortables.java @@ -107,7 +107,7 @@ import java.util.Date; * <h1 class="header">Building Portable Objects</h1> * GridGain comes with {@link org.apache.ignite.portables.PortableBuilder} which allows to build portable objects dynamically: * <pre name=code class=java> - * GridPortableBuilder builder = GridGain.grid().portables().builder(); + * GridPortableBuilder builder = Ignition.ignite().portables().builder(); * * builder.typeId("MyObject"); * @@ -125,7 +125,7 @@ import java.util.Date; * obj.setFieldA("A"); * obj.setFieldB(123); * - * GridPortableObject portableObj = GridGain.grid().portables().toPortable(obj); + * GridPortableObject portableObj = Ignition.ignite().portables().toPortable(obj); * </pre> * NOTE: you don't need to convert typed objects to portable format before storing * them in cache, GridGain will do that automatically. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12c06f69/modules/core/src/main/java/org/apache/ignite/IgniteScheduler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteScheduler.java b/modules/core/src/main/java/org/apache/ignite/IgniteScheduler.java index df4ab91..0cd0a0b 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteScheduler.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteScheduler.java @@ -27,7 +27,7 @@ import java.util.concurrent.*; * Provides functionality for scheduling jobs locally using UNIX cron-based syntax. * Instance of {@code GridScheduler} is obtained from grid as follows: * <pre name="code" class="java"> - * GridScheduler s = GridGain.grid().scheduler(); + * GridScheduler s = Ignition.ignite().scheduler(); * </pre> * <p> * Scheduler supports standard UNIX {@code cron} format with optional prefix of @@ -36,8 +36,8 @@ import java.util.concurrent.*; * Here's an example of scheduling a closure that broadcasts a message * to all nodes five times, once every minute, with initial delay of two seconds: * <pre name="code" class="java"> - * GridGain.grid().scheduler().scheduleLocal( - * GridSchedulerFuture<?> = GridGain.grid().scheduler().scheduleLocal(new Callable<Object>() { + * Ignition.ignite().scheduler().scheduleLocal( + * GridSchedulerFuture<?> = Ignition.ignite().scheduler().scheduleLocal(new Callable<Object>() { * @Override public Object call() throws IgniteCheckedException { * g.broadcast(new GridCallable() {...}).get(); * } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12c06f69/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 9f98b49..fee7e33 100644 --- a/modules/core/src/main/java/org/apache/ignite/Ignition.java +++ b/modules/core/src/main/java/org/apache/ignite/Ignition.java @@ -50,7 +50,7 @@ import java.util.*; * * cfg.setDeploymentSpi(deploySpi); * - * GridGain.start(cfg); + * Ignition.start(cfg); * </pre> * Here is how a grid instance can be configured from Spring XML configuration file. The * example below configures a grid instance with additional user attributes @@ -73,7 +73,7 @@ import java.util.*; * absolute or relative to IGNITE_HOME. * <pre name="code" class="java"> * ... - * GridGain.start("/path/to/spring/xml/file.xml"); + * Ignition.start("/path/to/spring/xml/file.xml"); * ... * </pre> * You can also instantiate grid directly from Spring without using {@code GridGain}. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12c06f69/modules/core/src/main/java/org/apache/ignite/cache/query/CacheQueries.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/query/CacheQueries.java b/modules/core/src/main/java/org/apache/ignite/cache/query/CacheQueries.java index f14f869..36ae24b 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/query/CacheQueries.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/query/CacheQueries.java @@ -30,7 +30,7 @@ import java.util.*; * <p> * Instance of {@code CacheQueries} is obtained from cache projection as follows: * <pre name="code" class="java"> - * CacheQueries q = GridGain.grid().cache("myCache").queries(); + * CacheQueries q = Ignition.ignite().cache("myCache").queries(); * </pre> */ public interface CacheQueries<K, V> { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12c06f69/modules/core/src/main/java/org/apache/ignite/cluster/ClusterGroup.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cluster/ClusterGroup.java b/modules/core/src/main/java/org/apache/ignite/cluster/ClusterGroup.java index 04b5036..025580e 100644 --- a/modules/core/src/main/java/org/apache/ignite/cluster/ClusterGroup.java +++ b/modules/core/src/main/java/org/apache/ignite/cluster/ClusterGroup.java @@ -35,7 +35,7 @@ import java.util.*; * projection will include a subset of nodes from current projection. The following code snippet * shows how to create and nest grid projections: * <pre name="code" class="java"> - * Grid g = GridGain.grid(); + * Grid g = Ignition.ignite(); * * // Projection over remote nodes. * GridProjection remoteNodes = g.forRemotes(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12c06f69/modules/core/src/main/java/org/apache/ignite/internal/product/IgniteProduct.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/product/IgniteProduct.java b/modules/core/src/main/java/org/apache/ignite/internal/product/IgniteProduct.java index 701a050..9fd4087 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/product/IgniteProduct.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/product/IgniteProduct.java @@ -24,7 +24,7 @@ import org.jetbrains.annotations.*; * Provides information about current release. Note that enterprise users are also * able to renew license. Instance of {@code GridProduct} is obtained from grid as follows: * <pre name="code" class="java"> - * GridProduct p = GridGain.grid().product(); + * GridProduct p = Ignition.ignite().product(); * </pre> */ public interface IgniteProduct { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12c06f69/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleBean.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleBean.java b/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleBean.java index b4d2255..0208c7e 100644 --- a/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleBean.java +++ b/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleBean.java @@ -63,7 +63,7 @@ import org.apache.ignite.*; * Refer to corresponding resource documentation for more information. * <p> * <h1 class="header">Usage</h1> - * If you need to tie your application logic into GridGain lifecycle, + * If you need to tie your application logic into Ignition lifecycle, * you can configure lifecycle beans via standard grid configuration, add your * application library dependencies into {@code IGNITE_HOME/libs} folder, and * simply start {@code IGNITE_HOME/ignite.{sh|bat}} scripts. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12c06f69/modules/core/src/main/java/org/apache/ignite/managed/ManagedService.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/managed/ManagedService.java b/modules/core/src/main/java/org/apache/ignite/managed/ManagedService.java index af200bf..df2c654 100644 --- a/modules/core/src/main/java/org/apache/ignite/managed/ManagedService.java +++ b/modules/core/src/main/java/org/apache/ignite/managed/ManagedService.java @@ -74,7 +74,7 @@ import java.io.*; * * gridCfg.setServiceConfiguration(svcCfg); * ... - * GridGain.start(gridCfg); + * Ignition.start(gridCfg); * </pre> * <h1 class="header">Cancellation</h1> * Services can be cancelled by calling any of the {@code cancel} methods on {@link org.apache.ignite.IgniteManaged} API. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12c06f69/modules/core/src/main/java/org/apache/ignite/managed/ManagedServiceConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/managed/ManagedServiceConfiguration.java b/modules/core/src/main/java/org/apache/ignite/managed/ManagedServiceConfiguration.java index c00193c..2d57299 100644 --- a/modules/core/src/main/java/org/apache/ignite/managed/ManagedServiceConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/managed/ManagedServiceConfiguration.java @@ -47,7 +47,7 @@ import java.io.*; * * gridCfg.setServiceConfiguration(svcCfg1, svcCfg2); * ... - * GridGain.start(gridCfg); + * Ignition.start(gridCfg); * </pre> * The above configuration can also be specified in a Spring configuration file. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12c06f69/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecurity.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecurity.java b/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecurity.java index 9527fc7..60cae92 100644 --- a/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecurity.java +++ b/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecurity.java @@ -38,7 +38,7 @@ import java.util.*; * * cfg.setSecurityCredentialsProvider(new GridSecurityCredentialsBasicProvider(creds)); * - * Grid grid = GridGain.start(cfg); + * Grid grid = Ignition.start(cfg); * </pre> * For remote Java client, configuration is provided in a similar way by specifying * {@code GridClientConfiguration.setSecurityCredentialsProvider(...)} property. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12c06f69/modules/core/src/main/java/org/apache/ignite/portables/PortableBuilder.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/portables/PortableBuilder.java b/modules/core/src/main/java/org/apache/ignite/portables/PortableBuilder.java index 5f4d382..619081c 100644 --- a/modules/core/src/main/java/org/apache/ignite/portables/PortableBuilder.java +++ b/modules/core/src/main/java/org/apache/ignite/portables/PortableBuilder.java @@ -25,7 +25,7 @@ import org.jetbrains.annotations.*; * <p> * Here is an example of how a portable object can be built dynamically: * <pre name=code class=java> - * GridPortableBuilder builder = GridGain.grid().portables().builder("org.project.MyObject"); + * GridPortableBuilder builder = Ignition.ignite().portables().builder("org.project.MyObject"); * * builder.setField("fieldA", "A"); * builder.setField("fieldB", "B"); @@ -37,7 +37,7 @@ import org.jetbrains.annotations.*; * Also builder can be initialized by existing portable object. This allows changing some fields without affecting * other fields. * <pre name=code class=java> - * GridPortableBuilder builder = GridGain.grid().portables().builder(person); + * GridPortableBuilder builder = Ignition.ignite().portables().builder(person); * * builder.setField("name", "John"); * http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12c06f69/modules/core/src/main/java/org/apache/ignite/portables/PortableObject.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/portables/PortableObject.java b/modules/core/src/main/java/org/apache/ignite/portables/PortableObject.java index 84ebffb..181c79c 100644 --- a/modules/core/src/main/java/org/apache/ignite/portables/PortableObject.java +++ b/modules/core/src/main/java/org/apache/ignite/portables/PortableObject.java @@ -92,7 +92,7 @@ import java.util.*; * <h1 class="header">Building Portable Objects</h1> * GridGain comes with {@link PortableBuilder} which allows to build portable objects dynamically: * <pre name=code class=java> - * GridPortableBuilder builder = GridGain.grid().portables().builder("org.project.MyObject"); + * GridPortableBuilder builder = Ignition.ignite().portables().builder("org.project.MyObject"); * * builder.setField("fieldA", "A"); * builder.setField("fieldB", "B"); @@ -108,7 +108,7 @@ import java.util.*; * obj.setFieldA("A"); * obj.setFieldB(123); * - * GridPortableObject portableObj = GridGain.grid().portables().toPortable(obj); + * GridPortableObject portableObj = Ignition.ignite().portables().toPortable(obj); * </pre> * <h1 class="header">Portable Metadata</h1> * Even though GridGain portable protocol only works with hash codes for type and field names http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12c06f69/modules/core/src/main/java/org/apache/ignite/spi/authentication/noop/NoopAuthenticationSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/authentication/noop/NoopAuthenticationSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/authentication/noop/NoopAuthenticationSpi.java index d80f44b..b558d0c 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/authentication/noop/NoopAuthenticationSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/authentication/noop/NoopAuthenticationSpi.java @@ -45,7 +45,7 @@ import org.apache.ignite.spi.authentication.*; * cfg.setAuthenticationSpi(authSpi); * * // Start grid. - * GridGain.start(cfg); + * Ignition.start(cfg); * </pre> * <h2 class="header">Spring Example</h2> * GridNoopAuthenticationSpi can be configured from Spring XML configuration file: http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12c06f69/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java index 68c06ba..9c5d028 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java @@ -119,7 +119,7 @@ import static org.apache.ignite.events.IgniteEventType.*; * cfg.setCommunicationSpi(commSpi); * * // Start grid. - * GridGain.start(cfg); + * Ignition.start(cfg); * </pre> * <h2 class="header">Spring Example</h2> * GridTcpCommunicationSpi can be configured from Spring XML configuration file: http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12c06f69/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java index d57760a..8190edc 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java @@ -114,7 +114,7 @@ import static org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryStatusChe * cfg.setDiscoverySpi(spi); * * // Start grid. - * GridGain.start(cfg); + * Ignition.start(cfg); * </pre> * <h2 class="header">Spring Example</h2> * GridTcpDiscoverySpi can be configured from Spring XML configuration file: http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12c06f69/modules/core/src/main/java/org/apache/ignite/spi/securesession/noop/NoopSecureSessionSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/securesession/noop/NoopSecureSessionSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/securesession/noop/NoopSecureSessionSpi.java index fa0ca49..8256e8a 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/securesession/noop/NoopSecureSessionSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/securesession/noop/NoopSecureSessionSpi.java @@ -46,7 +46,7 @@ import java.util.*; * cfg.setSecureSessionSpi(spi); * * // Start grid. - * GridGain.start(cfg); + * Ignition.start(cfg); * </pre> * <h2 class="header">Spring Example</h2> * GridNoopSecureSessionSpi can be configured from Spring XML configuration file: http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12c06f69/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTx.java b/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTx.java index a88c254..99d176c 100644 --- a/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTx.java +++ b/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTx.java @@ -97,7 +97,7 @@ import java.util.*; * <h1 class="header">Usage</h1> * You can use cache transactions as follows: * <pre name="code" class="java"> - * Cache<String, Integer> cache = GridGain.grid().cache(); + * Cache<String, Integer> cache = Ignition.ignite().cache(); * * try (GridCacheTx tx = cache.txStart()) { * // Perform transactional operations. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12c06f69/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-1.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-1.xml b/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-1.xml index ba632f3..557a00c 100644 --- a/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-1.xml +++ b/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-1.xml @@ -23,8 +23,8 @@ When starting a standalone GridGain node, you need to execute the following command: {IGNITE_HOME}/bin/ignite.{bat|sh} path-to-this-file/example-cache.xml - When starting GridGain from Java IDE, pass path to this file into GridGain: - GridGain.start("path-to-this-file/example-benchmark.xml"); + When starting GridGain from Java IDE, pass path to this file into Ignition: + Ignition.start("path-to-this-file/example-benchmark.xml"); --> <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12c06f69/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-2.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-2.xml b/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-2.xml index f22430e..cc2ccc0 100644 --- a/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-2.xml +++ b/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-2.xml @@ -23,8 +23,8 @@ When starting a standalone GridGain node, you need to execute the following command: {IGNITE_HOME}/bin/ignite.{bat|sh} path-to-this-file/example-cache.xml - When starting GridGain from Java IDE, pass path to this file into GridGain: - GridGain.start("path-to-this-file/example-benchmark.xml"); + When starting GridGain from Java IDE, pass path to this file into Ignition: + Ignition.start("path-to-this-file/example-benchmark.xml"); --> <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12c06f69/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-3.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-3.xml b/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-3.xml index 25078bc..25826b1 100644 --- a/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-3.xml +++ b/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-3.xml @@ -23,8 +23,8 @@ When starting a standalone GridGain node, you need to execute the following command: {IGNITE_HOME}/bin/ignite.{bat|sh} path-to-this-file/example-cache.xml - When starting GridGain from Java IDE, pass path to this file into GridGain: - GridGain.start("path-to-this-file/example-benchmark.xml"); + When starting GridGain from Java IDE, pass path to this file into Ignition: + Ignition.start("path-to-this-file/example-benchmark.xml"); --> <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12c06f69/modules/core/src/test/config/ggfs-shmem.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/ggfs-shmem.xml b/modules/core/src/test/config/ggfs-shmem.xml index 48a1ca1..4bf902f 100644 --- a/modules/core/src/test/config/ggfs-shmem.xml +++ b/modules/core/src/test/config/ggfs-shmem.xml @@ -23,8 +23,8 @@ When starting a standalone GridGain node, you need to execute the following command: {IGNITE_HOME}/bin/ignite.{bat|sh} path-to-this-file/example-ggfs-shmem.xml - When starting GridGain from Java IDE, pass path to this file into GridGain: - GridGain.start("path-to-this-file/example-ggfs-shmem.xml"); + When starting GridGain from Java IDE, pass path to this file into Ignition: + Ignition.start("path-to-this-file/example-ggfs-shmem.xml"); --> <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"; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12c06f69/modules/core/src/test/config/spring-cache-load.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/spring-cache-load.xml b/modules/core/src/test/config/spring-cache-load.xml index 05f6c53..b9b6173 100644 --- a/modules/core/src/test/config/spring-cache-load.xml +++ b/modules/core/src/test/config/spring-cache-load.xml @@ -23,8 +23,8 @@ When starting a standalone GridGain node, you need to execute the following command: {IGNITE_HOME}/bin/ignite.{bat|sh} path-to-this-file/example-cache.xml - When starting GridGain from Java IDE, pass path to this file into GridGain: - GridGain.start("path-to-this-file/example-benchmark.xml"); + When starting GridGain from Java IDE, pass path to this file into Ignition: + Ignition.start("path-to-this-file/example-benchmark.xml"); --> <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12c06f69/modules/core/src/test/config/spring-multicache.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/spring-multicache.xml b/modules/core/src/test/config/spring-multicache.xml index c5261ff..6f2dc19 100644 --- a/modules/core/src/test/config/spring-multicache.xml +++ b/modules/core/src/test/config/spring-multicache.xml @@ -23,8 +23,8 @@ When starting a standalone GridGain node, you need to execute the following command: {IGNITE_HOME}/bin/ignite.{bat|sh} path-to-this-file/example-cache.xml - When starting GridGain from Java IDE, pass path to this file into GridGain: - GridGain.start("path-to-this-file/example-benchmark.xml"); + When starting GridGain from Java IDE, pass path to this file into Ignition: + Ignition.start("path-to-this-file/example-benchmark.xml"); --> <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12c06f69/modules/core/src/test/config/streamer/average/spring-streamer-average-base.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/streamer/average/spring-streamer-average-base.xml b/modules/core/src/test/config/streamer/average/spring-streamer-average-base.xml index 5f90c9f..0004ef2 100644 --- a/modules/core/src/test/config/streamer/average/spring-streamer-average-base.xml +++ b/modules/core/src/test/config/streamer/average/spring-streamer-average-base.xml @@ -23,8 +23,8 @@ When starting a standalone GridGain node, you need to execute the following command: {IGNITE_HOME}/bin/ignite.{bat|sh} examples/config/example-cache.xml - When starting GridGain from Java IDE, pass path to this file into GridGain: - GridGain.start("examples/config/example-cache.xml"); + When starting GridGain from Java IDE, pass path to this file into Ignition: + Ignition.start("examples/config/example-cache.xml"); --> <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12c06f69/modules/core/src/test/config/streamer/average/spring-streamer-average-local.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/streamer/average/spring-streamer-average-local.xml b/modules/core/src/test/config/streamer/average/spring-streamer-average-local.xml index 8db31aa..3f1ce0d 100644 --- a/modules/core/src/test/config/streamer/average/spring-streamer-average-local.xml +++ b/modules/core/src/test/config/streamer/average/spring-streamer-average-local.xml @@ -23,8 +23,8 @@ When starting a standalone GridGain node, you need to execute the following command: {IGNITE_HOME}/bin/ignite.{bat|sh} examples/config/example-cache.xml - When starting GridGain from Java IDE, pass path to this file into GridGain: - GridGain.start("examples/config/example-cache.xml"); + When starting GridGain from Java IDE, pass path to this file into Ignition: + Ignition.start("examples/config/example-cache.xml"); --> <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12c06f69/modules/core/src/test/config/streamer/average/spring-streamer-average-random.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/streamer/average/spring-streamer-average-random.xml b/modules/core/src/test/config/streamer/average/spring-streamer-average-random.xml index 463820a..946b94a 100644 --- a/modules/core/src/test/config/streamer/average/spring-streamer-average-random.xml +++ b/modules/core/src/test/config/streamer/average/spring-streamer-average-random.xml @@ -23,8 +23,8 @@ When starting a standalone GridGain node, you need to execute the following command: {IGNITE_HOME}/bin/ignite.{bat|sh} examples/config/example-cache.xml - When starting GridGain from Java IDE, pass path to this file into GridGain: - GridGain.start("examples/config/example-cache.xml"); + When starting GridGain from Java IDE, pass path to this file into Ignition: + Ignition.start("examples/config/example-cache.xml"); --> <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12c06f69/modules/core/src/test/config/streamer/spring-streamer-base.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/streamer/spring-streamer-base.xml b/modules/core/src/test/config/streamer/spring-streamer-base.xml index 3cfe8cb..ef5c0c8 100644 --- a/modules/core/src/test/config/streamer/spring-streamer-base.xml +++ b/modules/core/src/test/config/streamer/spring-streamer-base.xml @@ -23,8 +23,8 @@ When starting a standalone GridGain node, you need to execute the following command: {IGNITE_HOME}/bin/ignite.{bat|sh} examples/config/example-cache.xml - When starting GridGain from Java IDE, pass path to this file into GridGain: - GridGain.start("examples/config/example-cache.xml"); + When starting GridGain from Java IDE, pass path to this file into Ignition: + Ignition.start("examples/config/example-cache.xml"); --> <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12c06f69/modules/core/src/test/java/org/apache/ignite/loadtests/capacity/spring-capacity-cache.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/capacity/spring-capacity-cache.xml b/modules/core/src/test/java/org/apache/ignite/loadtests/capacity/spring-capacity-cache.xml index 6374e35..72a6529 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/capacity/spring-capacity-cache.xml +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/capacity/spring-capacity-cache.xml @@ -23,8 +23,8 @@ When starting a standalone GridGain node, you need to execute the following command: {IGNITE_HOME}/bin/ignite.{bat|sh} path-to-this-file/example-cache.xml - When starting GridGain from Java IDE, pass path to this file into GridGain: - GridGain.start("path-to-this-file/example-benchmark.xml"); + When starting GridGain from Java IDE, pass path to this file into Ignition: + Ignition.start("path-to-this-file/example-benchmark.xml"); --> <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12c06f69/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/spring-colocation.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/spring-colocation.xml b/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/spring-colocation.xml index 7592340..8539abe 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/spring-colocation.xml +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/spring-colocation.xml @@ -23,8 +23,8 @@ When starting a standalone GridGain node, you need to execute the following command: {IGNITE_HOME}/bin/ignite.{bat|sh} path-to-this-file/example-cache.xml - When starting GridGain from Java IDE, pass path to this file into GridGain: - GridGain.start("path-to-this-file/example-benchmark.xml"); + When starting GridGain from Java IDE, pass path to this file into Ignition: + Ignition.start("path-to-this-file/example-benchmark.xml"); --> <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12c06f69/modules/core/src/test/webapp/META-INF/gg-config.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/webapp/META-INF/gg-config.xml b/modules/core/src/test/webapp/META-INF/gg-config.xml index 4a6b162..4cc14bd 100644 --- a/modules/core/src/test/webapp/META-INF/gg-config.xml +++ b/modules/core/src/test/webapp/META-INF/gg-config.xml @@ -23,8 +23,8 @@ When starting a standalone GridGain node, you need to execute the following command: {IGNITE_HOME}/bin/ignite.{bat|sh} examples/config/spring-cache.xml - When starting GridGain from Java IDE, pass path to this file into GridGain: - GridGain.start("examples/config/spring-cache.xml"); + When starting GridGain from Java IDE, pass path to this file into Ignition: + Ignition.start("examples/config/spring-cache.xml"); --> <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
