Repository: incubator-ignite Updated Branches: refs/heads/ignite-45 af9514462 -> ea5231b93
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea5231b9/examples/src/main/java/org/apache/ignite/examples/misc/deployment/DeploymentExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/misc/deployment/DeploymentExample.java b/examples/src/main/java/org/apache/ignite/examples/misc/deployment/DeploymentExample.java index 8415da7..5336620 100644 --- a/examples/src/main/java/org/apache/ignite/examples/misc/deployment/DeploymentExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/misc/deployment/DeploymentExample.java @@ -40,10 +40,10 @@ import java.util.*; * in system classpath, so even in this case the deployment step is unnecessary. * <p> * Remote nodes should always be started with special configuration file which - * enables P2P class loading: {@code 'ignite.{sh|bat} examples/config/example-compute.xml'}. + * enables P2P class loading: {@code 'ignite.{sh|bat} examples/config/example-ignite.xml'}. * <p> * Alternatively you can run {@link ExampleNodeStartup} in another JVM which will - * start node with {@code examples/config/example-compute.xml} configuration. + * start node with {@code examples/config/example-ignite.xml} configuration. */ public final class DeploymentExample { /** Name of the deployed task. */ @@ -56,7 +56,7 @@ public final class DeploymentExample { * @throws Exception If example execution failed. */ public static void main(String[] args) throws Exception { - try (Ignite ignite = Ignition.start("examples/config/example-compute.xml")) { + try (Ignite ignite = Ignition.start("examples/config/example-ignite.xml")) { System.out.println(); System.out.println(">>> Deployment example started."); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea5231b9/examples/src/main/java/org/apache/ignite/examples/misc/springbean/SpringBeanExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/misc/springbean/SpringBeanExample.java b/examples/src/main/java/org/apache/ignite/examples/misc/springbean/SpringBeanExample.java index 58c17e2..69c84f4 100644 --- a/examples/src/main/java/org/apache/ignite/examples/misc/springbean/SpringBeanExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/misc/springbean/SpringBeanExample.java @@ -36,10 +36,10 @@ import java.util.concurrent.*; * apply ignite bean destructor and stop the ignite. * <p> * Remote nodes should always be started with special configuration file which - * enables P2P class loading: {@code 'ignite.{sh|bat} examples/config/example-compute.xml'}. + * enables P2P class loading: {@code 'ignite.{sh|bat} examples/config/example-ignite.xml'}. * <p> * Alternatively you can run {@link ExampleNodeStartup} in another JVM which will start node - * with {@code examples/config/example-compute.xml} configuration. + * with {@code examples/config/example-ignite.xml} configuration. */ public final class SpringBeanExample { /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea5231b9/examples/src/main/java/org/apache/ignite/examples/servicegrid/ServicesExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/servicegrid/ServicesExample.java b/examples/src/main/java/org/apache/ignite/examples/servicegrid/ServicesExample.java index f1916ae..c8786cf 100644 --- a/examples/src/main/java/org/apache/ignite/examples/servicegrid/ServicesExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/servicegrid/ServicesExample.java @@ -31,7 +31,7 @@ import java.util.*; * be that cluster-singleton, or per-node-singleton, etc... * <p> * To start remote nodes, you must run {@link ExampleNodeStartup} in another JVM - * which will start node with {@code examples/config/example-compute.xml} configuration. + * which will start node with {@code examples/config/example-ignite.xml} configuration. * <p> * NOTE:<br/> * Starting {@code ignite.sh} directly will not work, as distributed services @@ -45,7 +45,7 @@ public class ServicesExample { * @throws Exception If example execution failed. */ public static void main(String[] args) throws Exception { - try (Ignite ignite = Ignition.start("examples/config/example-compute.xml")) { + try (Ignite ignite = Ignition.start("examples/config/example-ignite.xml")) { ClusterGroup rmts = ignite.cluster().forRemotes(); if (rmts.nodes().isEmpty()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea5231b9/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingPopularNumbersExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingPopularNumbersExample.java b/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingPopularNumbersExample.java index a298932..6fb2587 100644 --- a/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingPopularNumbersExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingPopularNumbersExample.java @@ -21,6 +21,7 @@ import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.cache.query.*; import org.apache.ignite.configuration.*; +import org.apache.ignite.examples.*; import org.apache.ignite.stream.*; import javax.cache.*; @@ -36,10 +37,10 @@ import static java.util.concurrent.TimeUnit.*; * Real time popular numbers counter. * <p> * Remote nodes should always be started with special configuration file which - * enables P2P class loading: {@code 'ignite.{sh|bat} examples/config/example-compute.xml'}. + * enables P2P class loading: {@code 'ignite.{sh|bat} examples/config/example-ignite.xml'}. * <p> - * Alternatively you can run {@link org.apache.ignite.examples.ExampleNodeStartup} in another JVM which will - * start node with {@code examples/config/example-compute.xml} configuration. + * Alternatively you can run {@link ExampleNodeStartup} in another JVM which will + * start node with {@code examples/config/example-ignite.xml} configuration. */ public class StreamingPopularNumbersExample { /** Cache name. */ @@ -67,7 +68,7 @@ public class StreamingPopularNumbersExample { // Mark this cluster member as client. Ignition.setClientMode(true); - try (Ignite ignite = Ignition.start("examples/config/example-compute.xml")) { + try (Ignite ignite = Ignition.start("examples/config/example-ignite.xml")) { System.out.println(); System.out.println(">>> Cache popular numbers example started."); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea5231b9/examples/src/main/java8/org/apache/ignite/examples/java8/ComputeExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java8/org/apache/ignite/examples/java8/ComputeExample.java b/examples/src/main/java8/org/apache/ignite/examples/java8/ComputeExample.java index 557d65c..eda875f 100644 --- a/examples/src/main/java8/org/apache/ignite/examples/java8/ComputeExample.java +++ b/examples/src/main/java8/org/apache/ignite/examples/java8/ComputeExample.java @@ -23,7 +23,7 @@ import org.apache.ignite.*; * Demonstrates broadcasting and unicasting computations within cluster. * <p> * Remote nodes should always be started with special configuration file which - * enables P2P class loading: {@code 'ignite.{sh|bat} examples/config/example-compute.xml'}. + * enables P2P class loading: {@code 'ignite.{sh|bat} examples/config/example-ignite.xml'}. */ public class ComputeExample { /** @@ -33,7 +33,7 @@ public class ComputeExample { * @throws IgniteException If example execution failed. */ public static void main(String[] args) throws IgniteException { - try (Ignite ignite = Ignition.start("examples/config/example-compute.xml")) { + try (Ignite ignite = Ignition.start("examples/config/example-ignite.xml")) { System.out.println(); System.out.println(">>> Compute broadcast example started."); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea5231b9/examples/src/main/java8/org/apache/ignite/examples/java8/ExampleNodeStartup.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java8/org/apache/ignite/examples/java8/ExampleNodeStartup.java b/examples/src/main/java8/org/apache/ignite/examples/java8/ExampleNodeStartup.java index 6f5ba93..9674cf3 100644 --- a/examples/src/main/java8/org/apache/ignite/examples/java8/ExampleNodeStartup.java +++ b/examples/src/main/java8/org/apache/ignite/examples/java8/ExampleNodeStartup.java @@ -30,6 +30,6 @@ public class ExampleNodeStartup { * @throws IgniteException If failed. */ public static void main(String[] args) throws IgniteException { - Ignition.start("examples/config/example-compute.xml"); + Ignition.start("examples/config/example-ignite.xml"); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea5231b9/examples/src/main/java8/org/apache/ignite/examples/java8/MessagingExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java8/org/apache/ignite/examples/java8/MessagingExample.java b/examples/src/main/java8/org/apache/ignite/examples/java8/MessagingExample.java index 621c6d4..1b3b34f 100644 --- a/examples/src/main/java8/org/apache/ignite/examples/java8/MessagingExample.java +++ b/examples/src/main/java8/org/apache/ignite/examples/java8/MessagingExample.java @@ -30,10 +30,10 @@ import java.util.concurrent.*; * To run this example you must have at least one remote node started. * <p> * Remote nodes should always be started with special configuration file which - * enables P2P class loading: {@code 'ignite.{sh|bat} examples/config/example-compute.xml'}. + * enables P2P class loading: {@code 'ignite.{sh|bat} examples/config/example-ignite.xml'}. * <p> * Alternatively you can run {@link ExampleNodeStartup} in another JVM which will start node - * with {@code examples/config/example-compute.xml} configuration. + * with {@code examples/config/example-ignite.xml} configuration. */ public final class MessagingExample { /** Number of messages. */ @@ -49,7 +49,7 @@ public final class MessagingExample { * @throws IgniteException If example execution failed. */ public static void main(String[] args) throws Exception { - try (Ignite ignite = Ignition.start("examples/config/example-compute.xml")) { + try (Ignite ignite = Ignition.start("examples/config/example-ignite.xml")) { if (!ExamplesUtils.checkMinTopologySize(ignite.cluster(), 2)) { System.out.println(); System.out.println(">>> Please start at least 2 cluster nodes to run example."); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea5231b9/examples/src/main/java8/org/apache/ignite/examples/java8/streaming/numbers/QueryPopularNumbers.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java8/org/apache/ignite/examples/java8/streaming/numbers/QueryPopularNumbers.java b/examples/src/main/java8/org/apache/ignite/examples/java8/streaming/numbers/QueryPopularNumbers.java index 9895d2e..964b10f 100644 --- a/examples/src/main/java8/org/apache/ignite/examples/java8/streaming/numbers/QueryPopularNumbers.java +++ b/examples/src/main/java8/org/apache/ignite/examples/java8/streaming/numbers/QueryPopularNumbers.java @@ -33,17 +33,17 @@ import java.util.*; * </ul> * <p> * Remote nodes should always be started with special configuration file which - * enables P2P class loading: {@code 'ignite.{sh|bat} examples/config/example-compute.xml'}. + * enables P2P class loading: {@code 'ignite.{sh|bat} examples/config/example-ignite.xml'}. * <p> * Alternatively you can run {@link ExampleNodeStartup} in another JVM which will - * start node with {@code examples/config/example-compute.xml} configuration. + * start node with {@code examples/config/example-ignite.xml} configuration. */ public class QueryPopularNumbers { public static void main(String[] args) throws Exception { // Mark this cluster member as client. Ignition.setClientMode(true); - try (Ignite ignite = Ignition.start("examples/config/example-compute.xml")) { + try (Ignite ignite = Ignition.start("examples/config/example-ignite.xml")) { // Start new cache or get existing one. // The cache is configured with sliding window holding 1 second of the streaming data. try (IgniteCache<Integer, Long> stmCache = ignite.getOrCreateCache(CacheConfig.configure())) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea5231b9/examples/src/main/java8/org/apache/ignite/examples/java8/streaming/numbers/StreamRandomNumbers.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java8/org/apache/ignite/examples/java8/streaming/numbers/StreamRandomNumbers.java b/examples/src/main/java8/org/apache/ignite/examples/java8/streaming/numbers/StreamRandomNumbers.java index fd2587f..15a070e 100644 --- a/examples/src/main/java8/org/apache/ignite/examples/java8/streaming/numbers/StreamRandomNumbers.java +++ b/examples/src/main/java8/org/apache/ignite/examples/java8/streaming/numbers/StreamRandomNumbers.java @@ -33,10 +33,10 @@ import java.util.*; * </ul> * <p> * Remote nodes should always be started with special configuration file which - * enables P2P class loading: {@code 'ignite.{sh|bat} examples/config/example-compute.xml'}. + * enables P2P class loading: {@code 'ignite.{sh|bat} examples/config/example-ignite.xml'}. * <p> * Alternatively you can run {@link ExampleNodeStartup} in another JVM which will - * start node with {@code examples/config/example-compute.xml} configuration. + * start node with {@code examples/config/example-ignite.xml} configuration. */ public class StreamRandomNumbers { /** Random number generator. */ @@ -49,7 +49,7 @@ public class StreamRandomNumbers { // Mark this cluster member as client. Ignition.setClientMode(true); - try (Ignite ignite = Ignition.start("examples/config/example-compute.xml")) { + try (Ignite ignite = Ignition.start("examples/config/example-ignite.xml")) { // Create new cache or get existing one. // The cache is configured with sliding window holding 1 second of the streaming data. try (IgniteCache<Integer, Long> stmCache = ignite.getOrCreateCache(CacheConfig.configure())) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea5231b9/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinityExample.scala ---------------------------------------------------------------------- diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinityExample.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinityExample.scala index d52f313..991521f 100644 --- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinityExample.scala +++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinityExample.scala @@ -29,14 +29,14 @@ import scala.collection.JavaConversions._ * example is to provide the simplest code example of this logic. * <p> * Remote nodes should always be started with special configuration file which - * enables P2P class loading: `'ignite.{sh|bat} examples/config/example-compute.xml'`. + * enables P2P class loading: `'ignite.{sh|bat} examples/config/example-ignite.xml'`. * <p> * Alternatively you can run `ExampleNodeStartup` in another JVM which will - * start node with `examples/config/example-compute.xml` configuration. + * start node with `examples/config/example-ignite.xml` configuration. */ object ScalarCacheAffinityExample extends App { /** Configuration file name. */ - private val CONFIG = "examples/config/example-compute.xml" + private val CONFIG = "examples/config/example-ignite.xml" /** Name of cache. */ private val NAME = ScalarCacheAffinityExample.getClass.getSimpleName http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea5231b9/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheExample.scala ---------------------------------------------------------------------- diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheExample.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheExample.scala index 991cd19..65218b3 100644 --- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheExample.scala +++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheExample.scala @@ -29,14 +29,14 @@ import scala.collection.JavaConversions._ * Demonstrates basic In-Memory Data Ignite Cluster operations with Scalar. * <p> * Remote nodes should always be started with special configuration file which - * enables P2P class loading: `'ignite.{sh|bat} examples/config/example-compute.xml'`. + * enables P2P class loading: `'ignite.{sh|bat} examples/config/example-ignite.xml'`. * <p> * Alternatively you can run `ExampleNodeStartup` in another JVM which will - * start node with `examples/config/example-compute.xml` configuration. + * start node with `examples/config/example-ignite.xml` configuration. */ object ScalarCacheExample extends App { /** Configuration file name. */ - private val CONFIG = "examples/config/example-compute.xml" + private val CONFIG = "examples/config/example-ignite.xml" /** Name of cache specified in spring configuration. */ private val NAME = ScalarCacheExample.getClass.getSimpleName http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea5231b9/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCachePopularNumbersExample.scala ---------------------------------------------------------------------- diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCachePopularNumbersExample.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCachePopularNumbersExample.scala index 55f653c..66ecdfd 100644 --- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCachePopularNumbersExample.scala +++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCachePopularNumbersExample.scala @@ -37,17 +37,17 @@ import scala.util.Random * Real time popular number counter. * <p> * Remote nodes should always be started with special configuration file which - * enables P2P class loading: `'ignite.{sh|bat} examples/config/example-compute.xml'`. + * enables P2P class loading: `'ignite.{sh|bat} examples/config/example-ignite.xml'`. * <p> * Alternatively you can run `ExampleNodeStartup` in another JVM which will - * start node with `examples/config/example-compute.xml` configuration. + * start node with `examples/config/example-ignite.xml` configuration. * <p> * The counts are kept in cache on all remote nodes. Top `10` counts from each node are then grabbed to produce * an overall top `10` list within the ignite. */ object ScalarCachePopularNumbersExample extends App { /** Configuration file name. */ - private val CONFIG = "examples/config/example-compute.xml" + private val CONFIG = "examples/config/example-ignite.xml" /** Cache name. */ private final val NAME = ScalarCachePopularNumbersExample.getClass.getSimpleName http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea5231b9/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheQueryExample.scala ---------------------------------------------------------------------- diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheQueryExample.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheQueryExample.scala index a16b2ff..87baf67 100644 --- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheQueryExample.scala +++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheQueryExample.scala @@ -32,14 +32,14 @@ import scala.collection.JavaConversions._ * Demonstrates cache ad-hoc queries with Scalar. * <p> * Remote nodes should always be started with special configuration file which - * enables P2P class loading: `'ignite.{sh|bat} examples/config/example-compute.xml'`. + * enables P2P class loading: `'ignite.{sh|bat} examples/config/example-ignite.xml'`. * <p> * Alternatively you can run `ExampleNodeStartup` in another JVM which will - * start node with `examples/config/example-compute.xml` configuration. + * start node with `examples/config/example-ignite.xml` configuration. */ object ScalarCacheQueryExample { /** Configuration file name. */ - private val CONFIG = "examples/config/example-compute.xml" + private val CONFIG = "examples/config/example-ignite.xml" /** Cache name. */ private val NAME = ScalarCacheQueryExample.getClass.getSimpleName http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea5231b9/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarClosureExample.scala ---------------------------------------------------------------------- diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarClosureExample.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarClosureExample.scala index b73b9ed..8873139 100644 --- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarClosureExample.scala +++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarClosureExample.scala @@ -25,10 +25,10 @@ import org.apache.ignite.scalar.scalar._ * Demonstrates various closure executions on the cloud using Scalar. * <p> * Remote nodes should always be started with special configuration file which - * enables P2P class loading: `'ignite.{sh|bat} examples/config/example-compute.xml'`. + * enables P2P class loading: `'ignite.{sh|bat} examples/config/example-ignite.xml'`. */ object ScalarClosureExample extends App { - scalar("examples/config/example-compute.xml") { + scalar("examples/config/example-ignite.xml") { topology() helloWorld() helloWorld2() http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea5231b9/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarContinuationExample.scala ---------------------------------------------------------------------- diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarContinuationExample.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarContinuationExample.scala index 9a9e666..82f0905 100644 --- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarContinuationExample.scala +++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarContinuationExample.scala @@ -39,11 +39,11 @@ import java.util * the more values it will be cached on remote nodes. * <p> * Remote nodes should always be started with special configuration file which - * enables P2P class loading: `'ignite.{sh|bat} examples/config/example-compute.xml'`. + * enables P2P class loading: `'ignite.{sh|bat} examples/config/example-ignite.xml'`. */ object ScalarContinuationExample { def main(args: Array[String]) { - scalar("examples/config/example-compute.xml") { + scalar("examples/config/example-ignite.xml") { // Calculate fibonacci for N. val N: Long = 100 http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea5231b9/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCreditRiskExample.scala ---------------------------------------------------------------------- diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCreditRiskExample.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCreditRiskExample.scala index 8857050..bff7d1d 100644 --- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCreditRiskExample.scala +++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCreditRiskExample.scala @@ -27,11 +27,11 @@ import scala.util.control.Breaks._ * Scalar-based Monte-Carlo example. * <p> * Remote nodes should always be started with special configuration file which - * enables P2P class loading: `'ignite.{sh|bat} examples/config/example-compute.xml'`. + * enables P2P class loading: `'ignite.{sh|bat} examples/config/example-ignite.xml'`. */ object ScalarCreditRiskExample { def main(args: Array[String]) { - scalar("examples/config/example-compute.xml") { + scalar("examples/config/example-ignite.xml") { // Create portfolio. var portfolio = Seq.empty[Credit] http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea5231b9/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarPingPongExample.scala ---------------------------------------------------------------------- diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarPingPongExample.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarPingPongExample.scala index 05e052b..cf25eaf 100644 --- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarPingPongExample.scala +++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarPingPongExample.scala @@ -29,10 +29,10 @@ import org.apache.ignite.scalar.scalar._ * two nodes. It is analogous to `MessagingPingPongExample` on Java side. * <p> * Remote nodes should always be started with special configuration file which - * enables P2P class loading: `'ignite.{sh|bat} examples/config/example-compute.xml'`. + * enables P2P class loading: `'ignite.{sh|bat} examples/config/example-ignite.xml'`. */ object ScalarPingPongExample extends App { - scalar("examples/config/example-compute.xml") { + scalar("examples/config/example-ignite.xml") { pingPong() //pingPong2() } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea5231b9/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarPrimeExample.scala ---------------------------------------------------------------------- diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarPrimeExample.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarPrimeExample.scala index b24f5e6..3ea4fa5 100644 --- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarPrimeExample.scala +++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarPrimeExample.scala @@ -30,7 +30,7 @@ import scala.util.control.Breaks._ * ==Starting Remote Nodes== * To try this example you should (but don't have to) start remote ignite instances. * You can start as many as you like by executing the following script: - * `{IGNITE_HOME}/bin/ignite.{bat|sh} examples/config/example-compute.xml` + * `{IGNITE_HOME}/bin/ignite.{bat|sh} examples/config/example-ignite.xml` * * Once remote instances are started, you can execute this example from * Eclipse, IntelliJ IDEA, or NetBeans (and any other Java IDE) by simply hitting run @@ -49,7 +49,7 @@ object ScalarPrimeExample { * @param args Command like argument (not used). */ def main(args: Array[String]){ - scalar("examples/config/example-compute.xml") { + scalar("examples/config/example-ignite.xml") { val start = System.currentTimeMillis // Values we want to check for prime. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea5231b9/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarScheduleExample.scala ---------------------------------------------------------------------- diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarScheduleExample.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarScheduleExample.scala index ecea6f4..34fc9d5 100644 --- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarScheduleExample.scala +++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarScheduleExample.scala @@ -26,10 +26,10 @@ import org.apache.ignite.scalar.scalar._ * three times with initial scheduling delay equal to five seconds. * <p> * Remote nodes should always be started with special configuration file which - * enables P2P class loading: `'ignite.{sh|bat} examples/config/example-compute.xml'`. + * enables P2P class loading: `'ignite.{sh|bat} examples/config/example-ignite.xml'`. */ object ScalarScheduleExample extends App { - scalar("examples/config/example-compute.xml") { + scalar("examples/config/example-ignite.xml") { println() println("Compute schedule example started.") http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea5231b9/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarSnowflakeSchemaExample.scala ---------------------------------------------------------------------- diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarSnowflakeSchemaExample.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarSnowflakeSchemaExample.scala index 135075a..b861fc5 100644 --- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarSnowflakeSchemaExample.scala +++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarSnowflakeSchemaExample.scala @@ -46,14 +46,14 @@ import scala.collection.JavaConversions._ * in various ways. * <p> * Remote nodes should always be started with special configuration file which - * enables P2P class loading: `'ignite.{sh|bat} examples/config/example-compute.xml'`. + * enables P2P class loading: `'ignite.{sh|bat} examples/config/example-ignite.xml'`. * <p> * Alternatively you can run `ExampleNodeStartup` in another JVM which will - * start node with `examples/config/example-compute.xml` configuration. + * start node with `examples/config/example-ignite.xml` configuration. */ object ScalarSnowflakeSchemaExample { /** Configuration file name. */ - private val CONFIG = "examples/config/example-compute.xml" + private val CONFIG = "examples/config/example-ignite.xml" /** Name of replicated cache specified in spring configuration. */ private val REPL_NAME = "ScalarSnowflakeSchemaExampleReplicated" http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea5231b9/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarTaskExample.scala ---------------------------------------------------------------------- diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarTaskExample.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarTaskExample.scala index 8a6c562..fe7edb3 100644 --- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarTaskExample.scala +++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarTaskExample.scala @@ -32,10 +32,10 @@ import scala.collection.JavaConversions._ * As a trade off in such cases the more code needs to be written vs. simple closure execution. * <p> * Remote nodes should always be started with special configuration file which - * enables P2P class loading: `'ignite.{sh|bat} examples/config/example-compute.xml'`. + * enables P2P class loading: `'ignite.{sh|bat} examples/config/example-ignite.xml'`. */ object ScalarTaskExample extends App { - scalar("examples/config/example-compute.xml") { + scalar("examples/config/example-ignite.xml") { ignite$.compute().execute(classOf[IgniteHelloWorld], "Hello Cloud World!") } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea5231b9/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarWorldShortestMapReduce.scala ---------------------------------------------------------------------- diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarWorldShortestMapReduce.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarWorldShortestMapReduce.scala index 77e643d..a2e1516 100644 --- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarWorldShortestMapReduce.scala +++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarWorldShortestMapReduce.scala @@ -26,10 +26,10 @@ import org.apache.ignite.scalar.scalar._ * on thousands requiring no special configuration or deployment. * <p> * Remote nodes should always be started with special configuration file which - * enables P2P class loading: `'ignite.{sh|bat} examples/config/example-compute.xml'`. + * enables P2P class loading: `'ignite.{sh|bat} examples/config/example-ignite.xml'`. */ object ScalarWorldShortestMapReduce extends App { - scalar("examples/config/example-compute.xml") { + scalar("examples/config/example-ignite.xml") { val input = "World shortest mapreduce application" println("Non-space characters count: " + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea5231b9/examples/src/test/java/org/apache/ignite/examples/CacheExamplesMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/examples/src/test/java/org/apache/ignite/examples/CacheExamplesMultiNodeSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/CacheExamplesMultiNodeSelfTest.java index 93a2749..27cea4d 100644 --- a/examples/src/test/java/org/apache/ignite/examples/CacheExamplesMultiNodeSelfTest.java +++ b/examples/src/test/java/org/apache/ignite/examples/CacheExamplesMultiNodeSelfTest.java @@ -23,7 +23,7 @@ package org.apache.ignite.examples; public class CacheExamplesMultiNodeSelfTest extends CacheExamplesSelfTest { /** {@inheritDoc} */ @Override protected String defaultConfig() { - return "examples/config/example-compute.xml"; + return "examples/config/example-ignite.xml"; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea5231b9/modules/core/src/test/config/websession/example-cache.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/websession/example-cache.xml b/modules/core/src/test/config/websession/example-cache.xml index 043f5c1..d5bfeb7 100644 --- a/modules/core/src/test/config/websession/example-cache.xml +++ b/modules/core/src/test/config/websession/example-cache.xml @@ -133,7 +133,7 @@ <!-- Ignite provides several options for automatic discovery that can be used instead os static IP based discovery. For information on all options refer - to our documentation: http://doc.gridgain.org/latest/Automatic+Node+Discovery + to our documentation: http://apacheignite.readme.io/docs/cluster-config --> <!-- Uncomment static IP finder to enable static-based discovery of initial nodes. --> <!--<bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">--> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea5231b9/modules/scalar/src/test/resources/spring-ping-pong-partner.xml ---------------------------------------------------------------------- diff --git a/modules/scalar/src/test/resources/spring-ping-pong-partner.xml b/modules/scalar/src/test/resources/spring-ping-pong-partner.xml index 7f06993..adc39ec 100644 --- a/modules/scalar/src/test/resources/spring-ping-pong-partner.xml +++ b/modules/scalar/src/test/resources/spring-ping-pong-partner.xml @@ -83,7 +83,7 @@ <!-- Ignite provides several options for automatic discovery that can be used instead os static IP based discovery. For information on all options refer - to our documentation: http://doc.gridgain.org/latest/Automatic+Node+Discovery + to our documentation: http://apacheignite.readme.io/docs/cluster-config --> <!-- Uncomment static IP finder to enable static-based discovery of initial nodes. --> <!--<bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">-->