#ignite-964: fix review 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/f69f25f9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f69f25f9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f69f25f9 Branch: refs/heads/ignite-961 Commit: f69f25f99e7246577b2d59c8c6591fb7960d6856 Parents: 86e5d09 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Fri Jul 10 19:06:28 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Fri Jul 10 19:06:28 2015 +0300 ---------------------------------------------------------------------- examples/config/js/example-js-cache.xml | 43 ------------ examples/config/js/rest-jetty.xml | 71 -------------------- examples/src/main/js/cache-api-example.js | 8 +-- examples/src/main/js/cache-put-get-example.js | 6 +- examples/src/main/js/cache-query-example.js | 6 +- .../main/js/cache-sql-fields-query-example.js | 6 +- examples/src/main/js/compute-run-example.js | 6 +- examples/src/main/js/map-reduce-example.js | 16 ++--- 8 files changed, 24 insertions(+), 138 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f69f25f9/examples/config/js/example-js-cache.xml ---------------------------------------------------------------------- diff --git a/examples/config/js/example-js-cache.xml b/examples/config/js/example-js-cache.xml deleted file mode 100644 index e8ffc8a..0000000 --- a/examples/config/js/example-js-cache.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<!-- - Ignite configuration with all defaults and enabled p2p deployment and enabled events. ---> -<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";> - <bean id="ignite.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"> - <property name="gridName" value="ServerNode" /> - - <!-- Set to true to enable distributed class loading for examples, default is false. --> - <property name="peerClassLoadingEnabled" value="true"/> - - <property name="connectorConfiguration"> - <bean class="org.apache.ignite.configuration.ConnectorConfiguration"> - <property name="jettyPath" value="examples/config/js/rest-jetty.xml"/> - </bean> - </property> - </bean> -</beans> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f69f25f9/examples/config/js/rest-jetty.xml ---------------------------------------------------------------------- diff --git a/examples/config/js/rest-jetty.xml b/examples/config/js/rest-jetty.xml deleted file mode 100644 index abc146b..0000000 --- a/examples/config/js/rest-jetty.xml +++ /dev/null @@ -1,71 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd";> -<Configure id="Server" class="org.eclipse.jetty.server.Server"> - <Arg name="threadPool"> - <!-- Default queued blocking thread pool --> - <New class="org.eclipse.jetty.util.thread.QueuedThreadPool"> - <Set name="minThreads">20</Set> - <Set name="maxThreads">200</Set> - </New> - </Arg> - <New id="httpCfg" class="org.eclipse.jetty.server.HttpConfiguration"> - <Set name="secureScheme">https</Set> - <Set name="securePort">8443</Set> - <Set name="sendServerVersion">true</Set> - <Set name="sendDateHeader">true</Set> - </New> - <Call name="addConnector"> - <Arg> - <New class="org.eclipse.jetty.server.ServerConnector"> - <Arg name="server"><Ref refid="Server"/></Arg> - <Arg name="factories"> - <Array type="org.eclipse.jetty.server.ConnectionFactory"> - <Item> - <New class="org.eclipse.jetty.server.HttpConnectionFactory"> - <Ref refid="httpCfg"/> - </New> - </Item> - </Array> - </Arg> - <Set name="host"> - <SystemProperty name="IGNITE_JETTY_HOST" default="localhost"/> - </Set> - <Set name="port"> - <SystemProperty name="IGNITE_JETTY_PORT" default="9095"/> - </Set> - <Set name="idleTimeout">30000</Set> - <Set name="reuseAddress">true</Set> - </New> - </Arg> - </Call> - <Set name="handler"> - <New id="Handlers" class="org.eclipse.jetty.server.handler.HandlerCollection"> - <Set name="handlers"> - <Array type="org.eclipse.jetty.server.Handler"> - <Item> - <New id="Contexts" class="org.eclipse.jetty.server.handler.ContextHandlerCollection"/> - </Item> - </Array> - </Set> - </New> - </Set> - <Set name="stopAtShutdown">false</Set> -</Configure> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f69f25f9/examples/src/main/js/cache-api-example.js ---------------------------------------------------------------------- diff --git a/examples/src/main/js/cache-api-example.js b/examples/src/main/js/cache-api-example.js index 07d14f3..dad0f34 100644 --- a/examples/src/main/js/cache-api-example.js +++ b/examples/src/main/js/cache-api-example.js @@ -21,21 +21,21 @@ var Ignition = apacheIgnite.Ignition; /** * This example demonstrates some of the cache rich API capabilities. * <p> - * Start Ignite node with {@code examples/config/js/example-js-cache.xml} configuration before running example. + * Start Ignite node with {@code examples/config/example-ignite.xml} configuration before running example. * <p> * Alternatively you can run ExampleJsNodeStartup which will - * start node with {@code examples/config/js/example-js-cache.xml} configuration. + * start node with {@code examples/config/example-ignite.xml} configuration. */ function main() { /** Cache name. */ var cacheName = "ApiExampleCache"; /** Connect to node that started with {@code examples/config/js/example-js-cache.xml} configuration. */ - Ignition.start(['127.0.0.1:9095'], null, onConnect); + Ignition.start(['127.0.0.1:8000..9000'], null, onConnect); function onConnect(err, ignite) { if (err !== null) - throw "Start remote node with config examples/config/js/example-js-cache.xml."; + throw "Start remote node with config examples/config/js/example-js-cache.xml." + err; console.log(">>> Cache API example started."); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f69f25f9/examples/src/main/js/cache-put-get-example.js ---------------------------------------------------------------------- diff --git a/examples/src/main/js/cache-put-get-example.js b/examples/src/main/js/cache-put-get-example.js index 8155cb7..ce6b47a 100644 --- a/examples/src/main/js/cache-put-get-example.js +++ b/examples/src/main/js/cache-put-get-example.js @@ -22,17 +22,17 @@ var CacheEntry = apacheIgnite.CacheEntry; /** * This example demonstrates very basic operations on cache, such as 'put' and 'get'. * <p> - * Start Ignite node with {@code examples/config/js/example-js-cache.xml} configuration before running example. + * Start Ignite node with {@code examples/config/example-ignite.xml} configuration before running example. * <p> * Alternatively you can run ExampleJsNodeStartup which will - * start node with {@code examples/config/js/example-js-cache.xml} configuration. + * start node with {@code examples/config/example-ignite.xml} configuration. */ function main() { /** Cache name. */ var cacheName = "PutGetExampleCache"; /** Connect to node that started with {@code examples/config/js/example-js-cache.xml} configuration. */ - Ignition.start(['127.0.0.1:9095'], null, onConnect); + Ignition.start(['127.0.0.1:8000..9000'], null, onConnect); function onConnect(err, ignite) { if (err !== null) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f69f25f9/examples/src/main/js/cache-query-example.js ---------------------------------------------------------------------- diff --git a/examples/src/main/js/cache-query-example.js b/examples/src/main/js/cache-query-example.js index 3566ac8..ba5e270 100644 --- a/examples/src/main/js/cache-query-example.js +++ b/examples/src/main/js/cache-query-example.js @@ -26,17 +26,17 @@ var CacheEntry = apacheIgnite.CacheEntry; /** * Cache queries example. This example demonstrates SQL queries over cache. * <p> - * Start Ignite node with {@code examples/config/js/example-js-cache.xml} configuration before running example. + * Start Ignite node with {@code examples/config/example-ignite.xml} configuration before running example. * <p> * Alternatively you can run ExampleJsNodeStartup which will - * start node with {@code examples/config/js/example-js-cache.xml} configuration. + * start node with {@code examples/config/example-ignite.xml} configuration. */ main() { /** Cache name. */ var cacheName = "CacheQueryExample"; /** Connect to node that started with {@code examples/config/js/example-js-cache.xml} configuration. */ - Ignition.start(['127.0.0.1:9095'], null, onConnect); + Ignition.start(['127.0.0.1:8000..9000'], null, onConnect); function onConnect(err, ignite) { if (err !== null) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f69f25f9/examples/src/main/js/cache-sql-fields-query-example.js ---------------------------------------------------------------------- diff --git a/examples/src/main/js/cache-sql-fields-query-example.js b/examples/src/main/js/cache-sql-fields-query-example.js index c16fbe6..e8deb43 100644 --- a/examples/src/main/js/cache-sql-fields-query-example.js +++ b/examples/src/main/js/cache-sql-fields-query-example.js @@ -25,17 +25,17 @@ var CacheEntry = apacheIgnite.CacheEntry; /** * Cache queries example. This example demonstrates SQL queries over cache. * <p> - * Start Ignite node with {@code examples/config/js/example-js-cache.xml} configuration before running example. + * Start Ignite node with {@code examples/config/example-ignite.xml} configuration before running example. * <p> * Alternatively you can run ExampleJsNodeStartup which will - * start node with {@code examples/config/js/example-js-cache.xml} configuration. + * start node with {@code examples/config/example-ignite.xml} configuration. */ main() { /** Cache name. */ var cacheName = "CacheSqlFieldsQueryExample"; /** Connect to node that started with {@code examples/config/js/example-js-cache.xml} configuration. */ - Ignition.start(['127.0.0.1:9095'], null, onConnect); + Ignition.start(['127.0.0.1:8000..9000'], null, onConnect); function onConnect(err, ignite) { if (err !== null) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f69f25f9/examples/src/main/js/compute-run-example.js ---------------------------------------------------------------------- diff --git a/examples/src/main/js/compute-run-example.js b/examples/src/main/js/compute-run-example.js index a14dcda..61b9bbd 100644 --- a/examples/src/main/js/compute-run-example.js +++ b/examples/src/main/js/compute-run-example.js @@ -21,17 +21,17 @@ var Ignition = apacheIgnite.Ignition; /** * This example demonstrates very basic operations on cache in functions for Compute.run. * <p> - * Start Ignite node with {@code examples/config/js/example-js-cache.xml} configuration before running example. + * Start Ignite node with {@code examples/config/example-ignite.xml} configuration before running example. * <p> * Alternatively you can run ExampleJsNodeStartup which will - * start node with {@code examples/config/js/example-js-cache.xml} configuration. + * start node with {@code examples/config/example-ignite.xml} configuration. */ function main() { /** Cache name. */ var cacheName = "RunCacheScriptCache"; /** Connect to node that started with {@code examples/config/js/example-js-cache.xml} configuration. */ - Ignition.start(['127.0.0.1:9095'], null, onConnect); + Ignition.start(['127.0.0.1:8000..9000'], null, onConnect); function onConnect(err, ignite) { if (err !== null) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f69f25f9/examples/src/main/js/map-reduce-example.js ---------------------------------------------------------------------- diff --git a/examples/src/main/js/map-reduce-example.js b/examples/src/main/js/map-reduce-example.js index 98b863b..a3e8305 100644 --- a/examples/src/main/js/map-reduce-example.js +++ b/examples/src/main/js/map-reduce-example.js @@ -19,20 +19,20 @@ var apacheIgnite = require("apache-ignite"); var Ignition = apacheIgnite.Ignition; /** - * Demonstrates a simple use of Compute.mapReduce. - * <p> - * Phrase passed as task argument is split into jobs each taking one word. Then jobs are distributed among - * cluster nodes. Each node computes word length and returns result to master node where total phrase length - * is calculated on reduce stage. + * Demonstrates a simple use of Compute.mapReduce. * <p> - * Start Ignite node with {@code examples/config/js/example-js-cache.xml} configuration before running example. + * Phrase passed as task argument is split into jobs each taking one word. Then jobs are distributed among + * cluster nodes. Each node computes word length and returns result to master node where total phrase length + * is calculated on reduce stage. + * <p> + * Start Ignite node with {@code examples/config/example-ignite.xml} configuration before running example. * <p> * Alternatively you can run ExampleJsNodeStartup which will - * start node with {@code examples/config/js/example-js-cache.xml} configuration. + * start node with {@code examples/config/example-ignite.xml} configuration. */ function main() { /** Connect to node that started with {@code examples/config/js/example-js-cache.xml} configuration. */ - Ignition.start(['127.0.0.1:9095'], null, onConnect); + Ignition.start(['127.0.0.1:8000..9000'], null, onConnect); function onConnect(err, ignite) { if (err !== null)
