ignite git commit: IGNITE-2630 Added CacheInterceptorEntry class with getPartitionCounter method. Added tests.

[ntikhonov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-2630 [created] 8a9a048c9


IGNITE-2630 Added CacheInterceptorEntry class with getPartitionCounter method. 
Added tests.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8a9a048c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8a9a048c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8a9a048c

Branch: refs/heads/ignite-2630
Commit: 8a9a048c92fb24eacd82a75646062e0c4aa2e406
Parents: 35fd10d
Author: nikolay_tikhonov 
Authored: Mon Mar 28 22:35:17 2016 +0300
Committer: nikolay_tikhonov 
Committed: Mon Mar 28 22:35:17 2016 +0300

--
 .../ignite/cache/CacheInterceptorEntry.java |  39 +
 .../processors/cache/CacheLazyEntry.java|  46 +-
 .../processors/cache/GridCacheMapEntry.java |  19 +-
 ...torPartitionCounterRandomOperationsTest.java | 967 +++
 .../IgniteCacheInterceptorSelfTestSuite.java|   1 +
 5 files changed, 1062 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/8a9a048c/modules/core/src/main/java/org/apache/ignite/cache/CacheInterceptorEntry.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/cache/CacheInterceptorEntry.java 
b/modules/core/src/main/java/org/apache/ignite/cache/CacheInterceptorEntry.java
new file mode 100644
index 000..a9bd8f5
--- /dev/null
+++ 
b/modules/core/src/main/java/org/apache/ignite/cache/CacheInterceptorEntry.java
@@ -0,0 +1,39 @@
+/*
+ * 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.
+ */
+
+package org.apache.ignite.cache;
+
+import javax.cache.Cache;
+
+/**
+ * A cache interceptor map entry.
+ *
+ * @param  the type of key
+ * @param  the type of value
+ */
+public abstract class CacheInterceptorEntry implements Cache.Entry 
{
+/**
+ * Each cache update increases partition counter. The same cache updates 
have on the same value of counter
+ * on primary and backup nodes. This value can be useful to communicate 
with external applications.
+ * The value has sense only for entries get by {@link 
CacheInterceptor#onAfterPut(Cache.Entry)} and
+ * {@link CacheInterceptor#onAfterRemove(Cache.Entry)} methods. For 
entries got by other methods will return
+ * {@code 0}.
+ *
+ * @return Value of counter for this entry.
+ */
+public abstract long getPartitionUpdateCounter();
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/8a9a048c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLazyEntry.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLazyEntry.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLazyEntry.java
index 6ec17c0..b7db62d 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLazyEntry.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLazyEntry.java
@@ -17,15 +17,15 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import javax.cache.Cache;
 import org.apache.ignite.Ignite;
+import org.apache.ignite.cache.CacheInterceptorEntry;
 import org.apache.ignite.internal.util.tostring.GridToStringInclude;
 import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  *
  */
-public class CacheLazyEntry implements Cache.Entry {
+public class CacheLazyEntry extends CacheInterceptorEntry {
 /** Cache context. */
 protected GridCacheContext cctx;
 
@@ -46,6 +46,9 @@ public class CacheLazyEntry implements Cache.Entry {
 /** Keep binary flag. */
 private boolean keepBinary;
 
+/** Update counter. */
+private Long updateCntr;
+
 /**
  * @param cctx Cache context.
  * @param keyObj Key cache object.
@@ -85,6 +88,31 @@ public class CacheLazyEntry implements Cache.Entry {
 K key,
 CacheObject valObj,
 V val,
+boolean keepBinary,
+  

[1/2] ignite git commit: IGNITE-1071 IgniteCache.metrics() method returns local metrics

[av]

Repository: ignite
Updated Branches:
  refs/heads/master 134f26e0d -> f17b2ae0e


http://git-wip-us.apache.org/repos/asf/ignite/blob/f17b2ae0/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTransactionalAbstractMetricsSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTransactionalAbstractMetricsSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTransactionalAbstractMetricsSelfTest.java
index 4bd4c59..b227364 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTransactionalAbstractMetricsSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTransactionalAbstractMetricsSelfTest.java
@@ -231,7 +231,7 @@ public abstract class 
GridCacheTransactionalAbstractMetricsSelfTest extends Grid
 
 for (int i = 0; i < gridCount(); i++) {
 TransactionMetrics metrics = grid(i).transactions().metrics();
-CacheMetrics cacheMetrics = grid(i).cache(null).metrics();
+CacheMetrics cacheMetrics = grid(i).cache(null).localMetrics();
 
 if (i == 0) {
 assertEquals(TX_CNT, metrics.txCommits());
@@ -276,7 +276,7 @@ public abstract class 
GridCacheTransactionalAbstractMetricsSelfTest extends Grid
 
 for (int i = 0; i < gridCount(); i++) {
 TransactionMetrics metrics = grid(i).transactions().metrics();
-CacheMetrics cacheMetrics = grid(i).cache(null).metrics();
+CacheMetrics cacheMetrics = grid(i).cache(null).localMetrics();
 
 assertEquals(0, metrics.txCommits());
 assertEquals(0, cacheMetrics.getCacheTxCommits());

http://git-wip-us.apache.org/repos/asf/ignite/blob/f17b2ae0/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java
index 463c2c0..aa7f6fa 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java
@@ -476,7 +476,7 @@ public class GridCacheColocatedDebugTest extends 
GridCommonAbstractTest {
 if (tx != null)
 tx.commit();
 
-System.out.println(cache.metrics());
+System.out.println(cache.localMetrics());
 
 assertEquals("Hello", cache.get(1));
 assertEquals("World", cache.get(2));

http://git-wip-us.apache.org/repos/asf/ignite/blob/f17b2ae0/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMetricsSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMetricsSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMetricsSelfTest.java
index 3ace98d..16aa72d 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMetricsSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMetricsSelfTest.java
@@ -107,7 +107,7 @@ public class 
GridCachePartitionedNearDisabledMetricsSelfTest extends GridCacheAb
 long misses = 0;
 
 for (int i = 0; i < gridCount(); i++) {
-CacheMetrics m = grid(i).cache(null).metrics();
+CacheMetrics m = grid(i).cache(null).localMetrics();
 
 removes += m.getCacheRemovals();
 reads += m.getCacheGets();

http://git-wip-us.apache.org/repos/asf/ignite/blob/f17b2ae0/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPartitionedTckMetricsSelfTestImpl.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPartitionedTckMetricsSelfTestImpl.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPartitionedTckMetricsSelfTestImpl.java
index d94fe68..9e4be22 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache

[2/2] ignite git commit: IGNITE-1071 IgniteCache.metrics() method returns local metrics

[av]

IGNITE-1071 IgniteCache.metrics() method returns local metrics


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f17b2ae0
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f17b2ae0
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f17b2ae0

Branch: refs/heads/master
Commit: f17b2ae0ea150a2803584f80276ada527db54b5a
Parents: 134f26e
Author: Anton Vinogradov 
Authored: Mon Mar 28 19:19:26 2016 +0300
Committer: Anton Vinogradov 
Committed: Mon Mar 28 19:34:29 2016 +0300

--
 .../rest/RestBinaryProtocolSelfTest.java|   4 +-
 .../rest/RestMemcacheProtocolSelfTest.java  |   4 +-
 .../java/org/apache/ignite/IgniteCache.java |  20 +-
 .../discovery/GridDiscoveryManager.java |   2 +-
 .../cache/CacheClusterMetricsMXBeanImpl.java| 410 +++
 .../cache/CacheLocalMetricsMXBeanImpl.java  | 410 +++
 .../cache/CacheMetricsMXBeanImpl.java   | 410 ---
 .../processors/cache/GridCacheAdapter.java  |  43 +-
 .../processors/cache/GridCacheProcessor.java|  12 +-
 .../processors/cache/GridCacheProxyImpl.java|  45 +-
 .../processors/cache/IgniteCacheProxy.java  |  39 +-
 .../processors/cache/IgniteInternalCache.java   |  31 +-
 .../platform/cache/PlatformCache.java   |   2 +-
 .../handlers/cache/GridCacheCommandHandler.java |   2 +-
 .../internal/visor/cache/VisorCacheMetrics.java |   2 +-
 .../visor/cache/VisorCacheResetMetricsTask.java |   2 +-
 .../CacheMetricsForClusterGroupSelfTest.java|   2 +-
 .../cache/CacheSwapUnswapGetTest.java   |   4 +-
 .../cache/GridCacheAbstractMetricsSelfTest.java | 124 +++---
 .../GridCacheOffHeapValuesEvictionSelfTest.java |  18 +-
 ...cheTransactionalAbstractMetricsSelfTest.java |   4 +-
 .../dht/GridCacheColocatedDebugTest.java|   2 +-
 ...ePartitionedNearDisabledMetricsSelfTest.java |   2 +-
 ...AtomicPartitionedTckMetricsSelfTestImpl.java |  92 ++---
 .../near/GridCacheNearMetricsSelfTest.java  | 152 +++
 ...idCachePartitionedHitsAndMissesSelfTest.java |   2 +-
 ...CacheLocalOffHeapAndSwapMetricsSelfTest.java | 380 -
 ...dCacheAtomicLocalTckMetricsSelfTestImpl.java |  92 ++---
 .../multijvm/IgniteCacheProcessProxy.java   |   8 +
 29 files changed, 1431 insertions(+), 889 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/f17b2ae0/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java
--
diff --git 
a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java
 
b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java
index 7629afb..251e184 100644
--- 
a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java
+++ 
b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java
@@ -412,9 +412,9 @@ public class RestBinaryProtocolSelfTest extends 
GridCommonAbstractTest {
 IgniteCache jcacheDft = grid().cache(null);
 IgniteCache jcacheName = grid().cache(CACHE_NAME);
 
-jcacheDft.mxBean().clear();
+jcacheDft.localMxBean().clear();
 
-jcacheName.mxBean().clear();
+jcacheName.localMxBean().clear();
 
 jcacheDft.put("key1", "val");
 jcacheDft.put("key2", "val");

http://git-wip-us.apache.org/repos/asf/ignite/blob/f17b2ae0/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java
--
diff --git 
a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java
 
b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java
index fbaee9e..2797387 100644
--- 
a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java
+++ 
b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java
@@ -205,8 +205,8 @@ public class RestMemcacheProtocolSelfTest extends 
GridCommonAbstractTest {
  * @throws Exception If failed.
  */
 public void testMetrics() throws Exception {
-grid().cache(null).mxBean().clear();
-grid().cache(CACHE_NAME).mxBean().clear();
+grid().cache(null).localMxBean().clear();
+grid().cache(CACHE_NAME).localMxBean().clear();
 
 grid().cache(null).put("key1", "val");
 grid().cache(null).put("key2", "val");

http://git-wip-us.apache.org/repos/asf/ignite/blob/f17b2ae0/modules/core/src/main/j

ignite git commit: NPE fix (in case cache creation failed)

[av]

Repository: ignite
Updated Branches:
  refs/heads/master 7a5024cb4 -> 134f26e0d


NPE fix (in case cache creation failed)


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/134f26e0
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/134f26e0
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/134f26e0

Branch: refs/heads/master
Commit: 134f26e0d020bad9cc6dbff046bb2c38a939c018
Parents: 7a5024c
Author: Anton Vinogradov 
Authored: Mon Mar 28 17:42:42 2016 +0300
Committer: Anton Vinogradov 
Committed: Mon Mar 28 17:42:42 2016 +0300

--
 .../processors/cache/GridCachePartitionExchangeManager.java   | 2 +-
 .../ignite/internal/processors/cache/GridCacheProcessor.java  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/134f26e0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
index 1681f2f..54580fd 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
@@ -1258,7 +1258,7 @@ public class GridCachePartitionExchangeManager 
extends GridCacheSharedMana
 boolean preloadFinished = true;
 
 for (GridCacheContext cacheCtx : cctx.cacheContexts()) {
-preloadFinished &= 
cacheCtx.preloader().syncFuture().isDone();
+preloadFinished &= cacheCtx.preloader() != null && 
cacheCtx.preloader().syncFuture().isDone();
 
 if (!preloadFinished)
 break;

http://git-wip-us.apache.org/repos/asf/ignite/blob/134f26e0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index c0fc32a..f5ebc0d 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@ -1721,7 +1721,8 @@ public class GridCacheProcessor extends 
GridProcessorAdapter {
 GridCacheContext cacheCtx = cache.context();
 
 if (F.eq(cacheCtx.startTopologyVersion(), topVer)) {
-cacheCtx.preloader().onInitialExchangeComplete(err);
+if (cacheCtx.preloader() != null)
+cacheCtx.preloader().onInitialExchangeComplete(err);
 
 String masked = maskNull(cacheCtx.name());
 

[ignite] Git Push Summary

[dmagda]

Repository: ignite
Updated Branches:
  refs/heads/ignite-2849 [deleted] c44adfaee

ignite git commit: Divide test suite.

[ntikhonov]

Repository: ignite
Updated Branches:
  refs/heads/master 35fd10d32 -> 7a5024cb4


Divide test suite.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7a5024cb
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7a5024cb
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7a5024cb

Branch: refs/heads/master
Commit: 7a5024cb47938932739d8cc469c61ae05621ab04
Parents: 35fd10d
Author: nikolay_tikhonov 
Authored: Mon Mar 28 16:59:56 2016 +0300
Committer: nikolay_tikhonov 
Committed: Mon Mar 28 17:04:42 2016 +0300

--
 ...acheContinuousQueryRandomOperationsTest.java |  8 ++--
 .../IgniteBinaryCacheQueryTestSuite4.java   | 39 
 .../IgniteCacheQuerySelfTestSuite3.java | 22 -
 .../IgniteCacheQuerySelfTestSuite4.java | 49 
 4 files changed, 92 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/7a5024cb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRandomOperationsTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRandomOperationsTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRandomOperationsTest.java
index b1316ab..e9fbf70 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRandomOperationsTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRandomOperationsTest.java
@@ -146,13 +146,13 @@ public class CacheContinuousQueryRandomOperationsTest 
extends GridCommonAbstract
  * @throws Exception If failed.
  */
 public void testFilterAndFactoryProvided() throws Exception {
-CacheConfiguration ccfg = 
cacheConfiguration(PARTITIONED,
+final CacheConfiguration ccfg = 
cacheConfiguration(PARTITIONED,
 1,
 ATOMIC,
 ONHEAP_TIERED,
 false);
 
-final IgniteCache cache = 
grid(0).getOrCreateCache(ccfg);
+grid(0).createCache(ccfg);
 
 try {
 final ContinuousQuery qry = new ContinuousQuery();
@@ -177,13 +177,13 @@ public class CacheContinuousQueryRandomOperationsTest 
extends GridCommonAbstract
 
 GridTestUtils.assertThrows(log, new Callable() {
 @Override public Object call() throws Exception {
-return cache.query(qry);
+return grid(0).cache(ccfg.getName()).query(qry);
 }
 }, IgniteException.class, null);
 
 }
 finally {
-cache.destroy();
+grid(0).destroyCache(ccfg.getName());
 }
 }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/7a5024cb/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite4.java
--
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite4.java
 
b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite4.java
new file mode 100644
index 000..32a693f
--- /dev/null
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite4.java
@@ -0,0 +1,39 @@
+/*
+ * 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.
+ */
+
+package org.apache.ignite.testsuites;
+
+import junit.framework.TestSuite;
+import org.apache.ignite.internal.binary.BinaryMarshaller;
+import org.apache.ignite.testframework.config.GridTestProperties;
+
+/**
+ * Cache query suite with binary marshaller.
+ */
+public class IgniteBinaryCacheQueryTestSuite4 extends TestSuite {
+/**
+ * @return Suite.
+ * @throws Exception In case of error.
+ */
+public static TestSuite suite(

ignite git commit: Fix missed event notification in remove-remove case.

[ntikhonov]

Repository: ignite
Updated Branches:
  refs/heads/master 9cd2f0902 -> 35fd10d32


Fix missed event notification in remove-remove case.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/35fd10d3
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/35fd10d3
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/35fd10d3

Branch: refs/heads/master
Commit: 35fd10d32a943c0cf5c9f0ddf901a15ef143a896
Parents: 9cd2f09
Author: nikolay_tikhonov 
Authored: Mon Mar 28 16:31:39 2016 +0300
Committer: nikolay_tikhonov 
Committed: Mon Mar 28 16:31:39 2016 +0300

--
 .../processors/cache/GridCacheMapEntry.java |   2 +-
 .../dht/atomic/GridDhtAtomicCache.java  |  17 +-
 .../CacheContinuousQueryFactoryFilterTest.java  |   6 +-
 ...acheContinuousQueryRandomOperationsTest.java | 522 +--
 ...inuousQueryRandomOperationsTwoNodesTest.java |  28 +
 .../IgniteCacheQuerySelfTestSuite3.java |   2 +
 6 files changed, 530 insertions(+), 47 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/35fd10d3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
index fb6aeef..c5df29b 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
@@ -2092,7 +2092,7 @@ public abstract class GridCacheMapEntry extends 
GridMetadataAwareAdapter impleme
 null,
 null,
 false,
-updateCntr0 == null ? 0 : updateCntr0);
+0);
 }
 }
 else

http://git-wip-us.apache.org/repos/asf/ignite/blob/35fd10d3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index e908c05..e8a2200 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@ -2115,7 +2115,7 @@ public class GridDhtAtomicCache extends 
GridDhtCacheAdapter {
 "[entry=" + entry + ", filter=" + 
Arrays.toString(req.filter()) + ']');
 }
 }
-else if (lsnrs != null && updRes.success()) {
+else if (lsnrs != null && updRes.updateCounter() != 0) {
 ctx.continuousQueries().onEntryUpdated(
 lsnrs,
 entry.key(),
@@ -2427,6 +2427,19 @@ public class GridDhtAtomicCache extends 
GridDhtCacheAdapter {
 updRes.newTtl(),
 CU.EXPIRE_TIME_CALCULATE);
 }
+else if (lsnrs != null && updRes.updateCounter() != 0) {
+ctx.continuousQueries().onEntryUpdated(
+lsnrs,
+entry.key(),
+updRes.newValue(),
+updRes.oldValue(),
+entry.isInternal() || !context().userCache(),
+entry.partition(),
+primary,
+false,
+updRes.updateCounter(),
+topVer);
+}
 
 if (hasNear) {
 if (primary) {
@@ -2868,7 +2881,7 @@ public class GridDhtAtomicCache extends 
GridDhtCacheAdapter {
 if (updRes.removeVersion() != null)
 ctx.onDeferredDelete(entry, 
updRes.removeVersion());
 
-if (lsnrs != null && updRes.success()) {
+if (lsnrs != null && updRes.updateCounter() != 0) {
 ctx.continuousQueries().onEntryUpdated(
 lsnrs,
 entry.key(),

http://git-wip-us.apache.org/

ignite git commit: IGNITE-2851: ODBC: Fixed metadata retrieval.

[vozerov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1786 e2be09eb3 -> caf015ac2


IGNITE-2851: ODBC: Fixed metadata retrieval.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/caf015ac
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/caf015ac
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/caf015ac

Branch: refs/heads/ignite-1786
Commit: caf015ac212aba9fa308d8156b8b4df1e8a01a95
Parents: e2be09e
Author: isapego 
Authored: Mon Mar 28 16:13:13 2016 +0300
Committer: vozerov-gridgain 
Committed: Mon Mar 28 16:13:13 2016 +0300

--
 .../processors/odbc/OdbcColumnMeta.java | 24 +++--
 .../processors/odbc/OdbcMessageParser.java  |  4 +--
 .../odbc/include/ignite/odbc/meta/column_meta.h | 19 ++
 .../cpp/odbc/include/ignite/odbc/parser.h   |  3 ++
 .../platforms/cpp/odbc/src/meta/column_meta.cpp |  1 -
 .../odbc/src/query/column_metadata_query.cpp| 27 +++---
 .../platforms/cpp/odbc/src/query/data_query.cpp |  1 -
 .../cpp/odbc/src/query/foreign_keys_query.cpp   | 28 +++
 .../cpp/odbc/src/query/primary_keys_query.cpp   | 12 +++
 .../odbc/src/query/special_columns_query.cpp| 16 -
 .../cpp/odbc/src/query/table_metadata_query.cpp | 10 +++---
 .../cpp/odbc/src/query/type_info_query.cpp  | 38 ++--
 12 files changed, 76 insertions(+), 107 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/caf015ac/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcColumnMeta.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcColumnMeta.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcColumnMeta.java
index edea1cd..0edfabc 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcColumnMeta.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcColumnMeta.java
@@ -17,14 +17,10 @@
 
 package org.apache.ignite.internal.processors.odbc;
 
-import org.apache.ignite.IgniteException;
-import org.apache.ignite.internal.binary.BinaryClassDescriptor;
-import org.apache.ignite.internal.binary.BinaryContext;
-import org.apache.ignite.internal.binary.BinaryRawWriterEx;
+import org.apache.ignite.binary.BinaryRawWriter;
+import org.apache.ignite.internal.binary.BinaryUtils;
 import org.apache.ignite.internal.processors.query.GridQueryFieldMetadata;
 
-import static 
org.apache.ignite.internal.binary.GridBinaryMarshaller.UNREGISTERED_TYPE_ID;
-
 /**
  * ODBC column-related metadata.
  */
@@ -101,25 +97,13 @@ public class OdbcColumnMeta {
  * Write in a binary format.
  *
  * @param writer Binary writer.
- * @param ctx Portable context.
  */
-public void writeBinary(BinaryRawWriterEx writer, BinaryContext ctx) {
+public void write(BinaryRawWriter writer) {
 writer.writeString(schemaName);
 writer.writeString(tableName);
 writer.writeString(columnName);
-writer.writeString(dataType.getName());
-
-byte typeId;
-
-BinaryClassDescriptor desc = ctx.descriptorForClass(dataType, false);
-
-if (desc == null)
-throw new IgniteException("Object is not portable: [class=" + 
dataType + ']');
 
-if (desc.registered())
-typeId = (byte)desc.typeId();
-else
-typeId = (byte)UNREGISTERED_TYPE_ID;
+byte typeId = BinaryUtils.typeByClass(dataType);
 
 writer.writeByte(typeId);
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/caf015ac/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcMessageParser.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcMessageParser.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcMessageParser.java
index ba0c4f1..d217390 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcMessageParser.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcMessageParser.java
@@ -208,7 +208,7 @@ public class OdbcMessageParser {
 writer.writeInt(metas.size());
 
 for (OdbcColumnMeta meta : metas)
-meta.writeBinary(writer, marsh.context());
+meta.write(writer);
 }
 else if (res0 instanceof OdbcQueryFetchResult) {
 OdbcQueryFetchResult res = (OdbcQueryFetchResult) res0;
@@ -255,7 +255,7 @@ public class OdbcMessageParser {
 writer.writeInt(columnsMeta.size());
 
 for (OdbcColumnMeta columnMeta : columnsMeta)
- 

[2/9] ignite git commit: Fixed IGNITE-2863 - Memory leak in GridUnsafeMap destruct method (author Krome Plasma, remi dot malnar at some dot invalid dot address)

[vozerov]

Fixed IGNITE-2863 - Memory leak in GridUnsafeMap destruct method (author Krome 
Plasma, remi dot malnar at some dot invalid dot address)


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ddd9f0ff
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ddd9f0ff
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ddd9f0ff

Branch: refs/heads/ignite-1786
Commit: ddd9f0ff66bee1eaf957ea63698d3c2b8c330832
Parents: fb9e9b7
Author: Yakov Zhdanov 
Authored: Fri Mar 25 17:05:13 2016 +0300
Committer: Yakov Zhdanov 
Committed: Fri Mar 25 17:05:13 2016 +0300

--
 .../ignite/internal/util/offheap/unsafe/GridUnsafeMap.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/ddd9f0ff/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeMap.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeMap.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeMap.java
index 3f58447..5c9951b 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeMap.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeMap.java
@@ -740,7 +740,7 @@ public class GridUnsafeMap implements GridOffHeapMap {
 if (tblAddr == 0)
 return;
 
-for (long binAddr = tblAddr; binAddr < memCap; binAddr += 8) {
+for (long binAddr = tblAddr, tblEnd = (tblAddr + memCap); 
binAddr < tblEnd; binAddr += 8) {
 long entryAddr = Bin.first(binAddr, mem);
 
 if (entryAddr == 0)
@@ -1817,4 +1817,4 @@ public class GridUnsafeMap implements GridOffHeapMap {
 return len == keyBytes.length && GridUnsafeMemory.compare(ptr + 
HEADER_SIZE, keyBytes);
 }
 }
-}
\ No newline at end of file
+}

[7/9] ignite git commit: Merge remote-tracking branch 'origin/master'

[vozerov]

Merge remote-tracking branch 'origin/master'


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f03b6c30
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f03b6c30
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f03b6c30

Branch: refs/heads/ignite-1786
Commit: f03b6c30a55249d8e3824f66df3aa811f994f122
Parents: 2987728 4df7418
Author: Anton Vinogradov 
Authored: Mon Mar 28 14:33:17 2016 +0300
Committer: Anton Vinogradov 
Committed: Mon Mar 28 14:33:17 2016 +0300

--
 .../cache/store/jdbc/CacheJdbcPojoStore.java|   2 +-
 .../ignite/internal/binary/BinaryUtils.java |  16 --
 .../binary/builder/BinaryObjectBuilderImpl.java | 107 +++-
 .../managers/communication/GridIoManager.java   |  43 -
 .../processors/cache/GridCacheAdapter.java  |   2 +-
 .../datastreamer/DataStreamProcessor.java   |   8 +-
 .../datastreamer/DataStreamerImpl.java  |  37 +++-
 .../datastreamer/PlatformDataStreamer.java  |   7 +-
 .../util/offheap/unsafe/GridUnsafeMap.java  |   4 +-
 .../BinaryObjectBuilderAdditionalSelfTest.java  | 144 ++--
 ...naryObjectBuilderDefaultMappersSelfTest.java |   2 +-
 .../processors/igfs/IgfsAbstractSelfTest.java   |  33 +++-
 .../igfs/IgfsPrimaryMultiNodeSelfTest.java  |  28 
 ...maryRelaxedConsistencyMultiNodeSelfTest.java |  28 
 .../IgfsPrimaryRelaxedConsistencySelfTest.java  |  28 
 .../igfs/IgfsPrimaryRelaxedSelfTest.java|  28 
 .../platform/PlatformAttributeNodeFilter.java   |  31 
 .../ignite/testsuites/IgniteIgfsTestSuite.java  |  12 +-
 .../ignite/igfs/Hadoop1DualAbstractTest.java|   3 +-
 modules/platforms/cpp/common/src/java.cpp   |  74 ++--
 .../Apache.Ignite.Core.Tests.csproj |  15 ++
 .../Binary/BinaryBuilderSelfTest.cs |  60 ++-
 .../Query/CacheQueriesCodeConfigurationTest.cs  |  16 +-
 .../Config/Apache.Ignite.exe.config.test2   |  58 +++
 .../Config/Apache.Ignite.exe.config.test3   |  34 
 .../Config/cache-local-node.xml |  65 +++
 .../Config/ignite-dotnet-cfg.xml|  52 ++
 .../Dataload/DataStreamerTestTopologyChange.cs  | 104 
 .../Examples/ExamplesTest.cs|   3 +-
 .../Apache.Ignite.Core.Tests/ExecutableTest.cs  |  89 +++---
 .../IgniteConfigurationSerializerTest.cs|   3 +-
 .../Apache.Ignite.Core.Tests/JavaHomeTest.cs|  69 
 .../Cache/Configuration/QueryEntity.cs  |   9 +-
 .../Apache.Ignite.Core/IgniteConfiguration.cs   |  10 +-
 .../IgniteConfigurationSection.xsd  |   8 +
 .../Impl/Datastream/DataStreamerImpl.cs |   9 +-
 .../Apache.Ignite.Core/Impl/IgniteUtils.cs  |  34 
 .../dotnet/Apache.Ignite/Apache.Ignite.csproj   |   2 +-
 .../Config/AppSettingsConfigurator.cs   |  97 +++
 .../Apache.Ignite/Config/ArgsConfigurator.cs| 145 ++--
 .../dotnet/Apache.Ignite/Config/Configurator.cs | 168 +++
 .../Apache.Ignite/Config/IConfigurator.cs   |  34 
 .../dotnet/Apache.Ignite/IgniteRunner.cs|  24 +--
 .../Apache.Ignite/Service/IgniteService.cs  |  21 +--
 .../Compute/ClosureExample.cs   |   2 +-
 .../Compute/TaskExample.cs  |   2 +-
 .../Datagrid/ContinuousQueryExample.cs  |   2 +-
 .../Datagrid/DataStreamerExample.cs |   2 +-
 .../Datagrid/PutGetExample.cs   |   2 +-
 .../Datagrid/QueryExample.cs|   2 +-
 .../Datagrid/StoreExample.cs|   2 +-
 .../Datagrid/TransactionExample.cs  |   2 +-
 .../Events/EventsExample.cs |   2 +-
 .../Messaging/MessagingExample.cs   |   2 +-
 .../Misc/LifecycleExample.cs|   2 +-
 .../Services/ServicesExample.cs |   2 +-
 parent/pom.xml  |   2 +
 57 files changed, 1329 insertions(+), 463 deletions(-)
--

[1/9] ignite git commit: IGNITE-2874: .NET: Fixed IDataStreamer performance regression caused by incorrect topology size calculation. This closes #572.

[vozerov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1786 63ed28519 -> e2be09eb3


IGNITE-2874: .NET: Fixed IDataStreamer performance regression caused by 
incorrect topology size calculation. This closes #572.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fb9e9b78
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fb9e9b78
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fb9e9b78

Branch: refs/heads/ignite-1786
Commit: fb9e9b78520a6258422e9e2f498f5e9331ae5197
Parents: 166bce8
Author: Pavel Tupitsyn 
Authored: Fri Mar 25 16:59:05 2016 +0300
Committer: vozerov-gridgain 
Committed: Fri Mar 25 16:59:05 2016 +0300

--
 .../datastreamer/PlatformDataStreamer.java  |   7 +-
 .../platform/PlatformAttributeNodeFilter.java   |  31 ++
 .../Apache.Ignite.Core.Tests.csproj |   5 +
 .../Config/cache-local-node.xml |  65 
 .../Dataload/DataStreamerTestTopologyChange.cs  | 104 +++
 .../Impl/Datastream/DataStreamerImpl.cs |   9 +-
 6 files changed, 215 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/fb9e9b78/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/datastreamer/PlatformDataStreamer.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/datastreamer/PlatformDataStreamer.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/datastreamer/PlatformDataStreamer.java
index 07ef4f2..78d5d86 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/datastreamer/PlatformDataStreamer.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/datastreamer/PlatformDataStreamer.java
@@ -162,10 +162,11 @@ public class PlatformDataStreamer extends 
PlatformAbstractTarget {
 
 GridDiscoveryManager discoMgr = 
platformCtx.kernalContext().discovery();
 
-long topVer = discoMgr.topologyVersion();
-int topSize = discoMgr.cacheNodes(cacheName, new 
AffinityTopologyVersion(topVer)).size();
+AffinityTopologyVersion topVer = discoMgr.topologyVersionEx();
 
-platformCtx.gateway().dataStreamerTopologyUpdate(ptr, topVer, topSize);
+int topSize = discoMgr.cacheNodes(cacheName, topVer).size();
+
+platformCtx.gateway().dataStreamerTopologyUpdate(ptr, 
topVer.topologyVersion(), topSize);
 }
 
 /**

http://git-wip-us.apache.org/repos/asf/ignite/blob/fb9e9b78/modules/core/src/test/java/org/apache/ignite/platform/PlatformAttributeNodeFilter.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/platform/PlatformAttributeNodeFilter.java
 
b/modules/core/src/test/java/org/apache/ignite/platform/PlatformAttributeNodeFilter.java
new file mode 100644
index 000..bbd08a4
--- /dev/null
+++ 
b/modules/core/src/test/java/org/apache/ignite/platform/PlatformAttributeNodeFilter.java
@@ -0,0 +1,31 @@
+/*
+ * 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.
+ */
+
+package org.apache.ignite.platform;
+
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.lang.IgnitePredicate;
+
+/**
+ * Node filter that allows nodes with an attribute.
+ */
+public class PlatformAttributeNodeFilter implements 
IgnitePredicate {
+/** {@inheritDoc} */
+@Override public boolean apply(ClusterNode node) {
+return node.attributes().containsKey("platformAttributeNode");
+}
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/fb9e9b78/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj
 
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj
index 7cc9296..38ddd4d 100644
--- 
a/modules/pla

[5/9] ignite git commit: Support optional IO policy resolver in DataStreamer.

[vozerov]

Support optional IO policy resolver in DataStreamer.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4df74187
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4df74187
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4df74187

Branch: refs/heads/ignite-1786
Commit: 4df74187072d839bdd09eb3b6163e2612fadc1c3
Parents: 2cfe0cb
Author: vozerov-gridgain 
Authored: Mon Mar 28 12:24:16 2016 +0300
Committer: vozerov-gridgain 
Committed: Mon Mar 28 12:24:16 2016 +0300

--
 .../managers/communication/GridIoManager.java   | 43 +---
 .../processors/cache/GridCacheAdapter.java  |  2 +-
 .../datastreamer/DataStreamProcessor.java   |  8 +++-
 .../datastreamer/DataStreamerImpl.java  | 37 -
 4 files changed, 81 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/4df74187/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
index 4577dc8..4bc2eea 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
@@ -115,6 +115,9 @@ public class GridIoManager extends 
GridManagerAdapter CUR_PLC = new ThreadLocal<>();
+
 /** Listeners by topic. */
 private final ConcurrentMap lsnrMap = new 
ConcurrentHashMap8<>();
 
@@ -764,7 +767,7 @@ public class GridIoManager extends 
GridManagerAdapter t = 
msgs.poll(); t != null; t = msgs.poll()) {
 try {
-lsnr.onMessage(
-nodeId,
-t.get1().message());
+invokeListener(plc, lsnr, nodeId, t.get1().message());
 }
 finally {
 if (t.get3() != null)

http://git-wip-us.apache.org/repos/asf/ignite/blob/4df74187/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index 86036ac..a1f0f28 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -5920,7 +5920,7 @@ public abstract class GridCacheAdapter implements 
IgniteInternalCachehttp://git-wip-us.apache.org/repos/asf/ignite/blob/4df74187/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessor.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessor.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessor.java
index d899c67..c7c1f5e 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessor.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessor.java
@@ -24,6 +24,7 @@ import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.internal.GridKernalContext;
 import org.apache.ignite.internal.IgniteInternalFuture;
 import org.apache.ignite.internal.IgniteInterruptedCheckedException;
+import org.apache.ignite.internal.managers.communication.GridIoManager;
 import org.apache.ignite.internal.managers.communication.GridMessageListener;
 import org.apache.ignite.internal.managers.deployment.GridDeployment;
 import org.apache.ignite.internal.processors.GridProcessorAdapter;
@@ -339,7 +340,12 @@ public class DataStreamProcessor extends 
GridProcessorAdapter {
 DataStreamerResponse res = new DataStreamerResponse(reqId, errBytes, 
forceLocDep);
 
 try {
-ctx.io().send(nodeId, resTopic, res, PUBLIC_POOL);
+Byte plc = GridIoManager.currentPolicy();
+
+if (plc == null)
+plc = PUBLIC_POOL;
+
+ctx.io().send(nodeId, resTopic, res, plc);
 }
 catch (IgniteCheckedException e) {
 if (ctx.discovery().alive(nodeId))

http://git-wip-us.apache.org/repos/asf/ignite/blob/4df74187/modules/core/src/main/java/org/apache/ignite/internal/processors/datas

[9/9] ignite git commit: Merge branch 'master' into ignite-1786

[vozerov]

Merge branch 'master' into ignite-1786


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e2be09eb
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e2be09eb
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e2be09eb

Branch: refs/heads/ignite-1786
Commit: e2be09eb3bf9648e70b14d90ceaf8f03e3666e60
Parents: 63ed285 9cd2f09
Author: vozerov-gridgain 
Authored: Mon Mar 28 16:09:43 2016 +0300
Committer: vozerov-gridgain 
Committed: Mon Mar 28 16:09:43 2016 +0300

--
 .../managers/communication/GridIoManager.java   |  43 -
 .../processors/cache/GridCacheAdapter.java  |   2 +-
 .../datastreamer/DataStreamProcessor.java   |   8 +-
 .../datastreamer/DataStreamerImpl.java  |  37 -
 .../datastreamer/PlatformDataStreamer.java  |   7 +-
 .../util/offheap/unsafe/GridUnsafeMap.java  |   4 +-
 .../processors/igfs/IgfsAbstractSelfTest.java   |  33 +++-
 .../igfs/IgfsPrimaryMultiNodeSelfTest.java  |  28 
 ...maryRelaxedConsistencyMultiNodeSelfTest.java |  28 
 .../IgfsPrimaryRelaxedConsistencySelfTest.java  |  28 
 .../igfs/IgfsPrimaryRelaxedSelfTest.java|  28 
 .../platform/PlatformAttributeNodeFilter.java   |  31 
 .../IgniteCacheDataStructuresSelfTestSuite.java |   8 +-
 .../ignite/testsuites/IgniteIgfsTestSuite.java  |  12 +-
 .../ignite/igfs/Hadoop1DualAbstractTest.java|   3 +-
 .../IgniteBinaryCacheQueryTestSuite2.java   |  39 +
 .../IgniteBinaryCacheQueryTestSuite3.java   |  39 +
 .../IgniteCacheQuerySelfTestSuite.java  | 156 ---
 .../IgniteCacheQuerySelfTestSuite2.java | 109 +
 .../IgniteCacheQuerySelfTestSuite3.java | 117 ++
 .../Apache.Ignite.Core.Tests.csproj |   5 +
 .../Config/cache-local-node.xml |  65 
 .../Dataload/DataStreamerTestTopologyChange.cs  | 104 +
 .../Impl/Datastream/DataStreamerImpl.cs |   9 +-
 24 files changed, 732 insertions(+), 211 deletions(-)
--

[8/9] ignite git commit: Added semaphore tests to data structures suite

[vozerov]

Added semaphore tests to data structures suite


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9cd2f090
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9cd2f090
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9cd2f090

Branch: refs/heads/ignite-1786
Commit: 9cd2f09021c735468896bfdfc29d4410cb48f123
Parents: f03b6c3
Author: Yakov Zhdanov 
Authored: Mon Mar 28 15:57:16 2016 +0300
Committer: Yakov Zhdanov 
Committed: Mon Mar 28 15:57:16 2016 +0300

--
 .../testsuites/IgniteCacheDataStructuresSelfTestSuite.java   | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/9cd2f090/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java
 
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java
index 519d3c1..f008a29 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java
@@ -33,6 +33,7 @@ import 
org.apache.ignite.internal.processors.cache.datastructures.local.GridCach
 import 
org.apache.ignite.internal.processors.cache.datastructures.local.GridCacheLocalSetSelfTest;
 import 
org.apache.ignite.internal.processors.cache.datastructures.local.IgniteLocalAtomicLongApiSelfTest;
 import 
org.apache.ignite.internal.processors.cache.datastructures.local.IgniteLocalCountDownLatchSelfTest;
+import 
org.apache.ignite.internal.processors.cache.datastructures.local.IgniteLocalSemaphoreSelfTest;
 import 
org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedAtomicOffheapQueueApiSelfTest;
 import 
org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedAtomicOffheapQueueCreateMultiNodeSelfTest;
 import 
org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedAtomicOffheapQueueMultiNodeSelfTest;
@@ -66,6 +67,7 @@ import 
org.apache.ignite.internal.processors.cache.datastructures.partitioned.Gr
 import 
org.apache.ignite.internal.processors.cache.datastructures.partitioned.IgnitePartitionedAtomicLongApiSelfTest;
 import 
org.apache.ignite.internal.processors.cache.datastructures.partitioned.IgnitePartitionedCountDownLatchSelfTest;
 import 
org.apache.ignite.internal.processors.cache.datastructures.partitioned.IgnitePartitionedQueueNoBackupsTest;
+import 
org.apache.ignite.internal.processors.cache.datastructures.partitioned.IgnitePartitionedSemaphoreSelfTest;
 import 
org.apache.ignite.internal.processors.cache.datastructures.partitioned.IgnitePartitionedSetNoBackupsSelfTest;
 import 
org.apache.ignite.internal.processors.cache.datastructures.replicated.GridCacheReplicatedAtomicReferenceApiSelfTest;
 import 
org.apache.ignite.internal.processors.cache.datastructures.replicated.GridCacheReplicatedAtomicStampedApiSelfTest;
@@ -78,6 +80,7 @@ import 
org.apache.ignite.internal.processors.cache.datastructures.replicated.Gri
 import 
org.apache.ignite.internal.processors.cache.datastructures.replicated.GridCacheReplicatedSetSelfTest;
 import 
org.apache.ignite.internal.processors.cache.datastructures.replicated.IgniteReplicatedAtomicLongApiSelfTest;
 import 
org.apache.ignite.internal.processors.cache.datastructures.replicated.IgniteReplicatedCountDownLatchSelfTest;
+import 
org.apache.ignite.internal.processors.cache.distributed.replicated.IgniteCacheAtomicReplicatedNodeRestartSelfTest;
 
 /**
  * Test suite for cache data structures.
@@ -102,6 +105,7 @@ public class IgniteCacheDataStructuresSelfTestSuite extends 
TestSuite {
 suite.addTest(new 
TestSuite(GridCacheLocalOffheapQueueApiSelfTest.class));
 suite.addTest(new 
TestSuite(GridCacheLocalAtomicQueueApiSelfTest.class));
 suite.addTest(new TestSuite(IgniteLocalCountDownLatchSelfTest.class));
+suite.addTest(new TestSuite(IgniteLocalSemaphoreSelfTest.class));
 
 suite.addTest(new 
TestSuite(GridCacheReplicatedSequenceApiSelfTest.class));
 suite.addTest(new 
TestSuite(GridCacheReplicatedSequenceMultiNodeSelfTest.class));
@@ -111,6 +115,7 @@ public class IgniteCacheDataStructuresSelfTestSuite extends 
TestSuite {
 suite.addTest(new TestSuite(GridCacheReplicatedSetSelfTest.class));
 suite.addTest(new 
TestSuite(GridCacheReplicatedDataStructuresFailoverSelfTest.class));
 suite.addTest(new 
TestSuite(IgniteReplicatedCountDownLatchSelfTest.class));
+suite.addTest(new 
TestSuite(IgniteCacheA

[3/9] ignite git commit: IGNITE-2830: IGFS: Added multi-node tests. This closes #564.

[vozerov]

IGNITE-2830: IGFS: Added multi-node tests. This closes #564.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b4f0dab0
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b4f0dab0
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b4f0dab0

Branch: refs/heads/ignite-1786
Commit: b4f0dab089b0acae1542b7a397bfd3f7ce2e29e6
Parents: fb9e9b7
Author: iveselovskiy 
Authored: Fri Mar 25 17:13:49 2016 +0300
Committer: vozerov-gridgain 
Committed: Fri Mar 25 17:13:49 2016 +0300

--
 .../processors/igfs/IgfsAbstractSelfTest.java   | 33 
 .../igfs/IgfsPrimaryMultiNodeSelfTest.java  | 28 +
 ...maryRelaxedConsistencyMultiNodeSelfTest.java | 28 +
 .../IgfsPrimaryRelaxedConsistencySelfTest.java  | 28 +
 .../igfs/IgfsPrimaryRelaxedSelfTest.java| 28 -
 .../ignite/testsuites/IgniteIgfsTestSuite.java  | 12 +--
 .../ignite/igfs/Hadoop1DualAbstractTest.java|  3 +-
 7 files changed, 123 insertions(+), 37 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/b4f0dab0/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java
index 2f6c7bf..748a771 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java
@@ -55,6 +55,7 @@ import org.apache.ignite.lang.IgniteBiTuple;
 import org.apache.ignite.lang.IgniteUuid;
 import org.apache.ignite.marshaller.optimized.OptimizedMarshaller;
 import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
 import org.apache.ignite.testframework.GridTestUtils;
 import org.jetbrains.annotations.Nullable;
@@ -189,6 +190,9 @@ public abstract class IgfsAbstractSelfTest extends 
IgfsCommonAbstractTest {
 /** Memory mode. */
 protected final CacheMemoryMode memoryMode;
 
+/** Ignite nodes of cluster, excluding the secondary file system node, if 
any. */
+protected Ignite[] nodes;
+
 static {
 PRIMARY_REST_CFG = new IgfsIpcEndpointConfiguration();
 
@@ -233,13 +237,20 @@ public abstract class IgfsAbstractSelfTest extends 
IgfsCommonAbstractTest {
 }
 
 /**
- * @return Use optimzied marshaller flag.
+ * @return Use optimized marshaller flag.
  */
 protected boolean useOptimizedMarshaller() {
 return false;
 }
 
 /**
+ * @return Amount of nodes to start.
+ */
+protected int nodeCount() {
+return 1;
+}
+
+/**
  * Data chunk.
  *
  * @param len Length.
@@ -258,9 +269,17 @@ public abstract class IgfsAbstractSelfTest extends 
IgfsCommonAbstractTest {
 @Override protected void beforeTestsStarted() throws Exception {
 igfsSecondaryFileSystem = createSecondaryFileSystemStack();
 
-Ignite ignite = startGridWithIgfs("ignite", "igfs", mode, 
igfsSecondaryFileSystem, PRIMARY_REST_CFG);
+TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
+
+nodes = new Ignite[nodeCount()];
+
+for (int i = 0; i < nodes.length; i++) {
+String nodeName = i == 0 ? "ignite" : "ignite" + i;
+
+nodes[i] = startGridWithIgfs(nodeName, "igfs", mode, 
igfsSecondaryFileSystem, PRIMARY_REST_CFG, ipFinder);
+}
 
-igfs = (IgfsImpl) ignite.fileSystem("igfs");
+igfs = (IgfsImpl) nodes[0].fileSystem("igfs");
 }
 
 /**
@@ -271,7 +290,7 @@ public abstract class IgfsAbstractSelfTest extends 
IgfsCommonAbstractTest {
  */
 protected IgfsSecondaryFileSystem createSecondaryFileSystemStack() throws 
Exception {
 Ignite igniteSecondary = startGridWithIgfs("ignite-secondary", 
"igfs-secondary", PRIMARY, null,
-SECONDARY_REST_CFG);
+SECONDARY_REST_CFG, new TcpDiscoveryVmIpFinder(true));
 
 IgfsEx secondaryIgfsImpl = (IgfsEx) 
igniteSecondary.fileSystem("igfs-secondary");
 
@@ -300,12 +319,14 @@ public abstract class IgfsAbstractSelfTest extends 
IgfsCommonAbstractTest {
  * @param mode IGFS mode.
  * @param secondaryFs Secondary file system (optional).
  * @param restCfg Rest configuration string (optional).
+ * @param ipFinder IP finder.
  * @return Started grid instance.
  * @throws Exception If failed.
  */
 @Suppress

[6/9] ignite git commit: Query Suite separation : 1,2,3

[vozerov]

Query Suite separation : 1,2,3


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/29877281
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/29877281
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/29877281

Branch: refs/heads/ignite-1786
Commit: 29877281aed4d3d79133279d8aae9bb4b5d9992d
Parents: 34a9b66
Author: Anton Vinogradov 
Authored: Mon Mar 28 14:13:20 2016 +0300
Committer: Anton Vinogradov 
Committed: Mon Mar 28 14:32:13 2016 +0300

--
 .../IgniteBinaryCacheQueryTestSuite2.java   |  39 +
 .../IgniteBinaryCacheQueryTestSuite3.java   |  39 +
 .../IgniteCacheQuerySelfTestSuite.java  | 156 ---
 .../IgniteCacheQuerySelfTestSuite2.java | 109 +
 .../IgniteCacheQuerySelfTestSuite3.java | 117 ++
 5 files changed, 304 insertions(+), 156 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/29877281/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite2.java
--
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite2.java
 
b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite2.java
new file mode 100644
index 000..5c9c733
--- /dev/null
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite2.java
@@ -0,0 +1,39 @@
+/*
+ * 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.
+ */
+
+package org.apache.ignite.testsuites;
+
+import junit.framework.TestSuite;
+import org.apache.ignite.internal.binary.BinaryMarshaller;
+import org.apache.ignite.testframework.config.GridTestProperties;
+
+/**
+ * Cache query suite with binary marshaller.
+ */
+public class IgniteBinaryCacheQueryTestSuite2 extends TestSuite {
+/**
+ * @return Suite.
+ * @throws Exception In case of error.
+ */
+public static TestSuite suite() throws Exception {
+GridTestProperties.setProperty(GridTestProperties.MARSH_CLASS_NAME, 
BinaryMarshaller.class.getName());
+
+TestSuite suite = IgniteCacheQuerySelfTestSuite2.suite();
+
+return suite;
+}
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/29877281/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite3.java
--
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite3.java
 
b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite3.java
new file mode 100644
index 000..f9e9af2
--- /dev/null
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite3.java
@@ -0,0 +1,39 @@
+/*
+ * 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.
+ */
+
+package org.apache.ignite.testsuites;
+
+import junit.framework.TestSuite;
+import org.apache.ignite.internal.binary.BinaryMarshaller;
+import org.apache.ignite.testframework.config.GridTestProperties;
+
+/**
+ * Cache query suite with binary marshaller.
+ */
+public class IgniteBinaryCacheQueryTestSuite3 extends TestSuite {
+/**
+ * @return Suite

[4/9] ignite git commit: Merge remote-tracking branch 'origin/master'

[vozerov]

Merge remote-tracking branch 'origin/master'


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2cfe0cb5
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2cfe0cb5
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2cfe0cb5

Branch: refs/heads/ignite-1786
Commit: 2cfe0cb5a0d84caede8b528b0a515ab4ba92bbc6
Parents: b4f0dab ddd9f0f
Author: vozerov-gridgain 
Authored: Fri Mar 25 17:14:03 2016 +0300
Committer: vozerov-gridgain 
Committed: Fri Mar 25 17:14:03 2016 +0300

--
 .../ignite/internal/util/offheap/unsafe/GridUnsafeMap.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--

ignite git commit: Added semaphore tests to data structures suite

[yzhdanov]

Repository: ignite
Updated Branches:
  refs/heads/master f03b6c30a -> 9cd2f0902


Added semaphore tests to data structures suite


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9cd2f090
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9cd2f090
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9cd2f090

Branch: refs/heads/master
Commit: 9cd2f09021c735468896bfdfc29d4410cb48f123
Parents: f03b6c3
Author: Yakov Zhdanov 
Authored: Mon Mar 28 15:57:16 2016 +0300
Committer: Yakov Zhdanov 
Committed: Mon Mar 28 15:57:16 2016 +0300

--
 .../testsuites/IgniteCacheDataStructuresSelfTestSuite.java   | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/9cd2f090/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java
 
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java
index 519d3c1..f008a29 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java
@@ -33,6 +33,7 @@ import 
org.apache.ignite.internal.processors.cache.datastructures.local.GridCach
 import 
org.apache.ignite.internal.processors.cache.datastructures.local.GridCacheLocalSetSelfTest;
 import 
org.apache.ignite.internal.processors.cache.datastructures.local.IgniteLocalAtomicLongApiSelfTest;
 import 
org.apache.ignite.internal.processors.cache.datastructures.local.IgniteLocalCountDownLatchSelfTest;
+import 
org.apache.ignite.internal.processors.cache.datastructures.local.IgniteLocalSemaphoreSelfTest;
 import 
org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedAtomicOffheapQueueApiSelfTest;
 import 
org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedAtomicOffheapQueueCreateMultiNodeSelfTest;
 import 
org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedAtomicOffheapQueueMultiNodeSelfTest;
@@ -66,6 +67,7 @@ import 
org.apache.ignite.internal.processors.cache.datastructures.partitioned.Gr
 import 
org.apache.ignite.internal.processors.cache.datastructures.partitioned.IgnitePartitionedAtomicLongApiSelfTest;
 import 
org.apache.ignite.internal.processors.cache.datastructures.partitioned.IgnitePartitionedCountDownLatchSelfTest;
 import 
org.apache.ignite.internal.processors.cache.datastructures.partitioned.IgnitePartitionedQueueNoBackupsTest;
+import 
org.apache.ignite.internal.processors.cache.datastructures.partitioned.IgnitePartitionedSemaphoreSelfTest;
 import 
org.apache.ignite.internal.processors.cache.datastructures.partitioned.IgnitePartitionedSetNoBackupsSelfTest;
 import 
org.apache.ignite.internal.processors.cache.datastructures.replicated.GridCacheReplicatedAtomicReferenceApiSelfTest;
 import 
org.apache.ignite.internal.processors.cache.datastructures.replicated.GridCacheReplicatedAtomicStampedApiSelfTest;
@@ -78,6 +80,7 @@ import 
org.apache.ignite.internal.processors.cache.datastructures.replicated.Gri
 import 
org.apache.ignite.internal.processors.cache.datastructures.replicated.GridCacheReplicatedSetSelfTest;
 import 
org.apache.ignite.internal.processors.cache.datastructures.replicated.IgniteReplicatedAtomicLongApiSelfTest;
 import 
org.apache.ignite.internal.processors.cache.datastructures.replicated.IgniteReplicatedCountDownLatchSelfTest;
+import 
org.apache.ignite.internal.processors.cache.distributed.replicated.IgniteCacheAtomicReplicatedNodeRestartSelfTest;
 
 /**
  * Test suite for cache data structures.
@@ -102,6 +105,7 @@ public class IgniteCacheDataStructuresSelfTestSuite extends 
TestSuite {
 suite.addTest(new 
TestSuite(GridCacheLocalOffheapQueueApiSelfTest.class));
 suite.addTest(new 
TestSuite(GridCacheLocalAtomicQueueApiSelfTest.class));
 suite.addTest(new TestSuite(IgniteLocalCountDownLatchSelfTest.class));
+suite.addTest(new TestSuite(IgniteLocalSemaphoreSelfTest.class));
 
 suite.addTest(new 
TestSuite(GridCacheReplicatedSequenceApiSelfTest.class));
 suite.addTest(new 
TestSuite(GridCacheReplicatedSequenceMultiNodeSelfTest.class));
@@ -111,6 +115,7 @@ public class IgniteCacheDataStructuresSelfTestSuite extends 
TestSuite {
 suite.addTest(new TestSuite(GridCacheReplicatedSetSelfTest.class));
 suite.addTest(new 
TestSuite(GridCacheReplicatedDataStructuresFailoverSelfTest.class));
 suite.addTest(new 
TestSuite(IgniteReplicatedCount

[3/4] ignite git commit: Merge remote-tracking branch 'upstream/gridgain-7.5.10' into gridgain-7.5.10

[av]

Merge remote-tracking branch 'upstream/gridgain-7.5.10' into gridgain-7.5.10


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/60e74618
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/60e74618
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/60e74618

Branch: refs/heads/ignite-1071
Commit: 60e74618b310dafc28eb5f935859fed4ec87584c
Parents: 08f5981 ce56625
Author: vozerov-gridgain 
Authored: Mon Mar 28 14:52:13 2016 +0300
Committer: vozerov-gridgain 
Committed: Mon Mar 28 14:52:13 2016 +0300

--
 .../IgniteBinaryCacheQueryTestSuite2.java   |  39 +
 .../IgniteBinaryCacheQueryTestSuite3.java   |  39 +
 .../IgniteCacheQuerySelfTestSuite.java  | 145 ---
 .../IgniteCacheQuerySelfTestSuite2.java | 102 +
 .../IgniteCacheQuerySelfTestSuite3.java | 109 ++
 5 files changed, 289 insertions(+), 145 deletions(-)
--

[2/4] ignite git commit: Support optional IO policy resolver in DataStreamer.

[av]

Support optional IO policy resolver in DataStreamer.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/08f59815
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/08f59815
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/08f59815

Branch: refs/heads/ignite-1071
Commit: 08f5981509711e65c0d4c6fc1209068f8958eb06
Parents: 53a8729
Author: vozerov-gridgain 
Authored: Mon Mar 28 12:24:16 2016 +0300
Committer: vozerov-gridgain 
Committed: Mon Mar 28 14:51:08 2016 +0300

--
 .../managers/communication/GridIoManager.java   | 43 +---
 .../processors/cache/GridCacheAdapter.java  |  2 +-
 .../datastreamer/DataStreamProcessor.java   |  8 +++-
 .../datastreamer/DataStreamerImpl.java  | 37 -
 4 files changed, 81 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/08f59815/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
index 3a615e6..0438b64 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
@@ -113,6 +113,9 @@ public class GridIoManager extends 
GridManagerAdapter CUR_PLC = new ThreadLocal<>();
+
 /** Listeners by topic. */
 private final ConcurrentMap lsnrMap = new 
ConcurrentHashMap8<>();
 
@@ -742,7 +745,7 @@ public class GridIoManager extends 
GridManagerAdapter t = 
msgs.poll(); t != null; t = msgs.poll()) {
 try {
-lsnr.onMessage(
-nodeId,
-t.get1().message());
+invokeListener(plc, lsnr, nodeId, t.get1().message());
 }
 finally {
 if (t.get3() != null)

http://git-wip-us.apache.org/repos/asf/ignite/blob/08f59815/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index 54046a9..b8fcfb6 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -5996,7 +5996,7 @@ public abstract class GridCacheAdapter implements 
IgniteInternalCachehttp://git-wip-us.apache.org/repos/asf/ignite/blob/08f59815/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessor.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessor.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessor.java
index d899c67..c7c1f5e 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessor.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessor.java
@@ -24,6 +24,7 @@ import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.internal.GridKernalContext;
 import org.apache.ignite.internal.IgniteInternalFuture;
 import org.apache.ignite.internal.IgniteInterruptedCheckedException;
+import org.apache.ignite.internal.managers.communication.GridIoManager;
 import org.apache.ignite.internal.managers.communication.GridMessageListener;
 import org.apache.ignite.internal.managers.deployment.GridDeployment;
 import org.apache.ignite.internal.processors.GridProcessorAdapter;
@@ -339,7 +340,12 @@ public class DataStreamProcessor extends 
GridProcessorAdapter {
 DataStreamerResponse res = new DataStreamerResponse(reqId, errBytes, 
forceLocDep);
 
 try {
-ctx.io().send(nodeId, resTopic, res, PUBLIC_POOL);
+Byte plc = GridIoManager.currentPolicy();
+
+if (plc == null)
+plc = PUBLIC_POOL;
+
+ctx.io().send(nodeId, resTopic, res, plc);
 }
 catch (IgniteCheckedException e) {
 if (ctx.discovery().alive(nodeId))

http://git-wip-us.apache.org/repos/asf/ignite/blob/08f59815/modules/core/src/main/java/org/apache/ignite/internal/processors/datas

[4/4] ignite git commit: Merge remote-tracking branch 'remotes/upstream/gridgain-7.5.10' into ignite-1071

[av]

Merge remote-tracking branch 'remotes/upstream/gridgain-7.5.10' into ignite-1071


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/152d2c07
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/152d2c07
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/152d2c07

Branch: refs/heads/ignite-1071
Commit: 152d2c0799cd96d50230735453876484e2271e63
Parents: f59d70a 60e7461
Author: Anton Vinogradov 
Authored: Mon Mar 28 14:56:20 2016 +0300
Committer: Anton Vinogradov 
Committed: Mon Mar 28 14:56:20 2016 +0300

--
 .../managers/communication/GridIoManager.java   |  43 +-
 .../processors/cache/GridCacheAdapter.java  |   2 +-
 .../datastreamer/DataStreamProcessor.java   |   8 +-
 .../datastreamer/DataStreamerImpl.java  |  37 -
 .../IgniteBinaryCacheQueryTestSuite2.java   |  39 +
 .../IgniteBinaryCacheQueryTestSuite3.java   |  39 +
 .../IgniteCacheQuerySelfTestSuite.java  | 145 ---
 .../IgniteCacheQuerySelfTestSuite2.java | 102 +
 .../IgniteCacheQuerySelfTestSuite3.java | 109 ++
 9 files changed, 370 insertions(+), 154 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/152d2c07/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
--

[1/4] ignite git commit: Query Suite separation : 1,2,3

[av]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1071 f59d70ad4 -> 152d2c079


Query Suite separation : 1,2,3


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ce566250
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ce566250
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ce566250

Branch: refs/heads/ignite-1071
Commit: ce56625099b5253f8baf27bfbcff4682787a5ee1
Parents: 53a8729
Author: Anton Vinogradov 
Authored: Mon Mar 28 14:13:20 2016 +0300
Committer: Anton Vinogradov 
Committed: Mon Mar 28 14:13:20 2016 +0300

--
 .../IgniteBinaryCacheQueryTestSuite2.java   |  39 +
 .../IgniteBinaryCacheQueryTestSuite3.java   |  39 +
 .../IgniteCacheQuerySelfTestSuite.java  | 145 ---
 .../IgniteCacheQuerySelfTestSuite2.java | 102 +
 .../IgniteCacheQuerySelfTestSuite3.java | 109 ++
 5 files changed, 289 insertions(+), 145 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/ce566250/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite2.java
--
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite2.java
 
b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite2.java
new file mode 100644
index 000..5c9c733
--- /dev/null
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite2.java
@@ -0,0 +1,39 @@
+/*
+ * 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.
+ */
+
+package org.apache.ignite.testsuites;
+
+import junit.framework.TestSuite;
+import org.apache.ignite.internal.binary.BinaryMarshaller;
+import org.apache.ignite.testframework.config.GridTestProperties;
+
+/**
+ * Cache query suite with binary marshaller.
+ */
+public class IgniteBinaryCacheQueryTestSuite2 extends TestSuite {
+/**
+ * @return Suite.
+ * @throws Exception In case of error.
+ */
+public static TestSuite suite() throws Exception {
+GridTestProperties.setProperty(GridTestProperties.MARSH_CLASS_NAME, 
BinaryMarshaller.class.getName());
+
+TestSuite suite = IgniteCacheQuerySelfTestSuite2.suite();
+
+return suite;
+}
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/ce566250/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite3.java
--
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite3.java
 
b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite3.java
new file mode 100644
index 000..f9e9af2
--- /dev/null
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite3.java
@@ -0,0 +1,39 @@
+/*
+ * 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.
+ */
+
+package org.apache.ignite.testsuites;
+
+import junit.framework.TestSuite;
+import org.apache.ignite.internal.binary.BinaryMarshaller;
+import org.apache.ignite.testframework.config.GridTestProperties;
+
+/**
+ * Cache query suite with binary marshaller.
+ */
+public cl

[2/2] ignite git commit: Merge remote-tracking branch 'remotes/upstream/gridgain-7.5.10' into ignite-2801

[av]

Merge remote-tracking branch 'remotes/upstream/gridgain-7.5.10' into ignite-2801


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/89cc1d04
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/89cc1d04
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/89cc1d04

Branch: refs/heads/ignite-2801
Commit: 89cc1d040e4929ac5c83e64445350c66ea4be66a
Parents: 58469ba ce56625
Author: Anton Vinogradov 
Authored: Mon Mar 28 14:33:53 2016 +0300
Committer: Anton Vinogradov 
Committed: Mon Mar 28 14:33:53 2016 +0300

--
 .../IgniteBinaryCacheQueryTestSuite2.java   |  39 +
 .../IgniteBinaryCacheQueryTestSuite3.java   |  39 +
 .../IgniteCacheQuerySelfTestSuite.java  | 145 ---
 .../IgniteCacheQuerySelfTestSuite2.java | 102 +
 .../IgniteCacheQuerySelfTestSuite3.java | 109 ++
 5 files changed, 289 insertions(+), 145 deletions(-)
--

[1/2] ignite git commit: Query Suite separation : 1,2,3

[av]

Repository: ignite
Updated Branches:
  refs/heads/ignite-2801 58469bab4 -> 89cc1d040


Query Suite separation : 1,2,3


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ce566250
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ce566250
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ce566250

Branch: refs/heads/ignite-2801
Commit: ce56625099b5253f8baf27bfbcff4682787a5ee1
Parents: 53a8729
Author: Anton Vinogradov 
Authored: Mon Mar 28 14:13:20 2016 +0300
Committer: Anton Vinogradov 
Committed: Mon Mar 28 14:13:20 2016 +0300

--
 .../IgniteBinaryCacheQueryTestSuite2.java   |  39 +
 .../IgniteBinaryCacheQueryTestSuite3.java   |  39 +
 .../IgniteCacheQuerySelfTestSuite.java  | 145 ---
 .../IgniteCacheQuerySelfTestSuite2.java | 102 +
 .../IgniteCacheQuerySelfTestSuite3.java | 109 ++
 5 files changed, 289 insertions(+), 145 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/ce566250/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite2.java
--
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite2.java
 
b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite2.java
new file mode 100644
index 000..5c9c733
--- /dev/null
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite2.java
@@ -0,0 +1,39 @@
+/*
+ * 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.
+ */
+
+package org.apache.ignite.testsuites;
+
+import junit.framework.TestSuite;
+import org.apache.ignite.internal.binary.BinaryMarshaller;
+import org.apache.ignite.testframework.config.GridTestProperties;
+
+/**
+ * Cache query suite with binary marshaller.
+ */
+public class IgniteBinaryCacheQueryTestSuite2 extends TestSuite {
+/**
+ * @return Suite.
+ * @throws Exception In case of error.
+ */
+public static TestSuite suite() throws Exception {
+GridTestProperties.setProperty(GridTestProperties.MARSH_CLASS_NAME, 
BinaryMarshaller.class.getName());
+
+TestSuite suite = IgniteCacheQuerySelfTestSuite2.suite();
+
+return suite;
+}
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/ce566250/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite3.java
--
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite3.java
 
b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite3.java
new file mode 100644
index 000..f9e9af2
--- /dev/null
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite3.java
@@ -0,0 +1,39 @@
+/*
+ * 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.
+ */
+
+package org.apache.ignite.testsuites;
+
+import junit.framework.TestSuite;
+import org.apache.ignite.internal.binary.BinaryMarshaller;
+import org.apache.ignite.testframework.config.GridTestProperties;
+
+/**
+ * Cache query suite with binary marshaller.
+ */
+public cl

[2/2] ignite git commit: Merge remote-tracking branch 'origin/master'

[av]

Merge remote-tracking branch 'origin/master'


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f03b6c30
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f03b6c30
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f03b6c30

Branch: refs/heads/master
Commit: f03b6c30a55249d8e3824f66df3aa811f994f122
Parents: 2987728 4df7418
Author: Anton Vinogradov 
Authored: Mon Mar 28 14:33:17 2016 +0300
Committer: Anton Vinogradov 
Committed: Mon Mar 28 14:33:17 2016 +0300

--
 .../cache/store/jdbc/CacheJdbcPojoStore.java|   2 +-
 .../ignite/internal/binary/BinaryUtils.java |  16 --
 .../binary/builder/BinaryObjectBuilderImpl.java | 107 +++-
 .../managers/communication/GridIoManager.java   |  43 -
 .../processors/cache/GridCacheAdapter.java  |   2 +-
 .../datastreamer/DataStreamProcessor.java   |   8 +-
 .../datastreamer/DataStreamerImpl.java  |  37 +++-
 .../datastreamer/PlatformDataStreamer.java  |   7 +-
 .../util/offheap/unsafe/GridUnsafeMap.java  |   4 +-
 .../BinaryObjectBuilderAdditionalSelfTest.java  | 144 ++--
 ...naryObjectBuilderDefaultMappersSelfTest.java |   2 +-
 .../processors/igfs/IgfsAbstractSelfTest.java   |  33 +++-
 .../igfs/IgfsPrimaryMultiNodeSelfTest.java  |  28 
 ...maryRelaxedConsistencyMultiNodeSelfTest.java |  28 
 .../IgfsPrimaryRelaxedConsistencySelfTest.java  |  28 
 .../igfs/IgfsPrimaryRelaxedSelfTest.java|  28 
 .../platform/PlatformAttributeNodeFilter.java   |  31 
 .../ignite/testsuites/IgniteIgfsTestSuite.java  |  12 +-
 .../ignite/igfs/Hadoop1DualAbstractTest.java|   3 +-
 modules/platforms/cpp/common/src/java.cpp   |  74 ++--
 .../Apache.Ignite.Core.Tests.csproj |  15 ++
 .../Binary/BinaryBuilderSelfTest.cs |  60 ++-
 .../Query/CacheQueriesCodeConfigurationTest.cs  |  16 +-
 .../Config/Apache.Ignite.exe.config.test2   |  58 +++
 .../Config/Apache.Ignite.exe.config.test3   |  34 
 .../Config/cache-local-node.xml |  65 +++
 .../Config/ignite-dotnet-cfg.xml|  52 ++
 .../Dataload/DataStreamerTestTopologyChange.cs  | 104 
 .../Examples/ExamplesTest.cs|   3 +-
 .../Apache.Ignite.Core.Tests/ExecutableTest.cs  |  89 +++---
 .../IgniteConfigurationSerializerTest.cs|   3 +-
 .../Apache.Ignite.Core.Tests/JavaHomeTest.cs|  69 
 .../Cache/Configuration/QueryEntity.cs  |   9 +-
 .../Apache.Ignite.Core/IgniteConfiguration.cs   |  10 +-
 .../IgniteConfigurationSection.xsd  |   8 +
 .../Impl/Datastream/DataStreamerImpl.cs |   9 +-
 .../Apache.Ignite.Core/Impl/IgniteUtils.cs  |  34 
 .../dotnet/Apache.Ignite/Apache.Ignite.csproj   |   2 +-
 .../Config/AppSettingsConfigurator.cs   |  97 +++
 .../Apache.Ignite/Config/ArgsConfigurator.cs| 145 ++--
 .../dotnet/Apache.Ignite/Config/Configurator.cs | 168 +++
 .../Apache.Ignite/Config/IConfigurator.cs   |  34 
 .../dotnet/Apache.Ignite/IgniteRunner.cs|  24 +--
 .../Apache.Ignite/Service/IgniteService.cs  |  21 +--
 .../Compute/ClosureExample.cs   |   2 +-
 .../Compute/TaskExample.cs  |   2 +-
 .../Datagrid/ContinuousQueryExample.cs  |   2 +-
 .../Datagrid/DataStreamerExample.cs |   2 +-
 .../Datagrid/PutGetExample.cs   |   2 +-
 .../Datagrid/QueryExample.cs|   2 +-
 .../Datagrid/StoreExample.cs|   2 +-
 .../Datagrid/TransactionExample.cs  |   2 +-
 .../Events/EventsExample.cs |   2 +-
 .../Messaging/MessagingExample.cs   |   2 +-
 .../Misc/LifecycleExample.cs|   2 +-
 .../Services/ServicesExample.cs |   2 +-
 parent/pom.xml  |   2 +
 57 files changed, 1329 insertions(+), 463 deletions(-)
--

[1/2] ignite git commit: Query Suite separation : 1,2,3

[av]

Repository: ignite
Updated Branches:
  refs/heads/master 4df741870 -> f03b6c30a


Query Suite separation : 1,2,3


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/29877281
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/29877281
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/29877281

Branch: refs/heads/master
Commit: 29877281aed4d3d79133279d8aae9bb4b5d9992d
Parents: 34a9b66
Author: Anton Vinogradov 
Authored: Mon Mar 28 14:13:20 2016 +0300
Committer: Anton Vinogradov 
Committed: Mon Mar 28 14:32:13 2016 +0300

--
 .../IgniteBinaryCacheQueryTestSuite2.java   |  39 +
 .../IgniteBinaryCacheQueryTestSuite3.java   |  39 +
 .../IgniteCacheQuerySelfTestSuite.java  | 156 ---
 .../IgniteCacheQuerySelfTestSuite2.java | 109 +
 .../IgniteCacheQuerySelfTestSuite3.java | 117 ++
 5 files changed, 304 insertions(+), 156 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/29877281/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite2.java
--
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite2.java
 
b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite2.java
new file mode 100644
index 000..5c9c733
--- /dev/null
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite2.java
@@ -0,0 +1,39 @@
+/*
+ * 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.
+ */
+
+package org.apache.ignite.testsuites;
+
+import junit.framework.TestSuite;
+import org.apache.ignite.internal.binary.BinaryMarshaller;
+import org.apache.ignite.testframework.config.GridTestProperties;
+
+/**
+ * Cache query suite with binary marshaller.
+ */
+public class IgniteBinaryCacheQueryTestSuite2 extends TestSuite {
+/**
+ * @return Suite.
+ * @throws Exception In case of error.
+ */
+public static TestSuite suite() throws Exception {
+GridTestProperties.setProperty(GridTestProperties.MARSH_CLASS_NAME, 
BinaryMarshaller.class.getName());
+
+TestSuite suite = IgniteCacheQuerySelfTestSuite2.suite();
+
+return suite;
+}
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/29877281/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite3.java
--
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite3.java
 
b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite3.java
new file mode 100644
index 000..f9e9af2
--- /dev/null
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite3.java
@@ -0,0 +1,39 @@
+/*
+ * 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.
+ */
+
+package org.apache.ignite.testsuites;
+
+import junit.framework.TestSuite;
+import org.apache.ignite.internal.binary.BinaryMarshaller;
+import org.apache.ignite.testframework.config.GridTestProperties;
+
+/**
+ * Cache query suite with binary marshaller.
+ */
+public class Ignite

[ignite] Git Push Summary

[vozerov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-gg-10994 [deleted] e568a7a56

ignite git commit: Support optional IO policy resolver in DataStreamer.

[vozerov]

Repository: ignite
Updated Branches:
  refs/heads/master 2cfe0cb5a -> 4df741870


Support optional IO policy resolver in DataStreamer.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4df74187
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4df74187
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4df74187

Branch: refs/heads/master
Commit: 4df74187072d839bdd09eb3b6163e2612fadc1c3
Parents: 2cfe0cb
Author: vozerov-gridgain 
Authored: Mon Mar 28 12:24:16 2016 +0300
Committer: vozerov-gridgain 
Committed: Mon Mar 28 12:24:16 2016 +0300

--
 .../managers/communication/GridIoManager.java   | 43 +---
 .../processors/cache/GridCacheAdapter.java  |  2 +-
 .../datastreamer/DataStreamProcessor.java   |  8 +++-
 .../datastreamer/DataStreamerImpl.java  | 37 -
 4 files changed, 81 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/4df74187/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
index 4577dc8..4bc2eea 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
@@ -115,6 +115,9 @@ public class GridIoManager extends 
GridManagerAdapter CUR_PLC = new ThreadLocal<>();
+
 /** Listeners by topic. */
 private final ConcurrentMap lsnrMap = new 
ConcurrentHashMap8<>();
 
@@ -764,7 +767,7 @@ public class GridIoManager extends 
GridManagerAdapter t = 
msgs.poll(); t != null; t = msgs.poll()) {
 try {
-lsnr.onMessage(
-nodeId,
-t.get1().message());
+invokeListener(plc, lsnr, nodeId, t.get1().message());
 }
 finally {
 if (t.get3() != null)

http://git-wip-us.apache.org/repos/asf/ignite/blob/4df74187/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index 86036ac..a1f0f28 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -5920,7 +5920,7 @@ public abstract class GridCacheAdapter implements 
IgniteInternalCachehttp://git-wip-us.apache.org/repos/asf/ignite/blob/4df74187/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessor.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessor.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessor.java
index d899c67..c7c1f5e 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessor.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessor.java
@@ -24,6 +24,7 @@ import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.internal.GridKernalContext;
 import org.apache.ignite.internal.IgniteInternalFuture;
 import org.apache.ignite.internal.IgniteInterruptedCheckedException;
+import org.apache.ignite.internal.managers.communication.GridIoManager;
 import org.apache.ignite.internal.managers.communication.GridMessageListener;
 import org.apache.ignite.internal.managers.deployment.GridDeployment;
 import org.apache.ignite.internal.processors.GridProcessorAdapter;
@@ -339,7 +340,12 @@ public class DataStreamProcessor extends 
GridProcessorAdapter {
 DataStreamerResponse res = new DataStreamerResponse(reqId, errBytes, 
forceLocDep);
 
 try {
-ctx.io().send(nodeId, resTopic, res, PUBLIC_POOL);
+Byte plc = GridIoManager.currentPolicy();
+
+if (plc == null)
+plc = PUBLIC_POOL;
+
+ctx.io().send(nodeId, resTopic, res, plc);
 }
 catch (IgniteCheckedException e) {
 if (ctx.discovery().alive(nodeId))

http://git-wip-us.apache.org/repos/asf/ignite/blob/4d

[2/2] ignite git commit: Merge remote-tracking branch 'remotes/upstream/gridgain-7.5.10' into ignite-2801

[av]

Merge remote-tracking branch 'remotes/upstream/gridgain-7.5.10' into ignite-2801


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/58469bab
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/58469bab
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/58469bab

Branch: refs/heads/ignite-2801
Commit: 58469bab4af067f682b3151e3d40ad9a4bcda234
Parents: d44 53a8729
Author: Anton Vinogradov 
Authored: Mon Mar 28 12:14:15 2016 +0300
Committer: Anton Vinogradov 
Committed: Mon Mar 28 12:14:15 2016 +0300

--
 .../CacheContinuousQueryFactoryFilterTest.java  |  2 +-
 ...acheContinuousQueryRandomOperationsTest.java | 96 ++--
 2 files changed, 49 insertions(+), 49 deletions(-)
--

[1/2] ignite git commit: Fixed tests (renamed test methods).

[av]

Repository: ignite
Updated Branches:
  refs/heads/ignite-2801 d441f -> 58469bab4


Fixed tests (renamed test methods).


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/53a87290
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/53a87290
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/53a87290

Branch: refs/heads/ignite-2801
Commit: 53a87290fe028e12a81058fc4b2f2f2341395f9a
Parents: 1c04005
Author: Tikhonov Nikolay 
Authored: Fri Mar 25 19:49:31 2016 +0300
Committer: Tikhonov Nikolay 
Committed: Fri Mar 25 19:49:31 2016 +0300

--
 .../CacheContinuousQueryFactoryFilterTest.java  |  2 +-
 ...acheContinuousQueryRandomOperationsTest.java | 96 ++--
 2 files changed, 49 insertions(+), 49 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/53a87290/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFactoryFilterTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFactoryFilterTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFactoryFilterTest.java
index 6143fa9..2b81162 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFactoryFilterTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFactoryFilterTest.java
@@ -133,7 +133,7 @@ public class CacheContinuousQueryFactoryFilterTest extends 
CacheContinuousQueryR
 }
 
 /** {@inheritDoc} */
-@Override protected void testContinuousQuery(CacheConfiguration ccfg, ContinuousDeploy deploy)
+@Override protected void doTestContinuousQuery(CacheConfiguration ccfg, ContinuousDeploy deploy)
 throws Exception {
 ignite(0).createCache(ccfg);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/53a87290/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRandomOperationsTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRandomOperationsTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRandomOperationsTest.java
index 700ce3f..b1316ab 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRandomOperationsTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRandomOperationsTest.java
@@ -197,7 +197,7 @@ public class CacheContinuousQueryRandomOperationsTest 
extends GridCommonAbstract
 ONHEAP_TIERED,
 false);
 
-testContinuousQuery(ccfg, CLIENT);
+doTestContinuousQuery(ccfg, CLIENT);
 }
 
 /**
@@ -210,7 +210,7 @@ public class CacheContinuousQueryRandomOperationsTest 
extends GridCommonAbstract
 ONHEAP_TIERED,
 false);
 
-testContinuousQuery(ccfg, SERVER);
+doTestContinuousQuery(ccfg, SERVER);
 }
 
 /**
@@ -223,7 +223,7 @@ public class CacheContinuousQueryRandomOperationsTest 
extends GridCommonAbstract
 ONHEAP_TIERED,
 false);
 
-testContinuousQuery(ccfg, ALL);
+doTestContinuousQuery(ccfg, ALL);
 }
 
 /**
@@ -236,7 +236,7 @@ public class CacheContinuousQueryRandomOperationsTest 
extends GridCommonAbstract
 ONHEAP_TIERED,
 false);
 
-testContinuousQuery(ccfg, SERVER);
+doTestContinuousQuery(ccfg, SERVER);
 }
 
 /**
@@ -249,7 +249,7 @@ public class CacheContinuousQueryRandomOperationsTest 
extends GridCommonAbstract
 ONHEAP_TIERED,
 false);
 
-testContinuousQuery(ccfg, ALL);
+doTestContinuousQuery(ccfg, ALL);
 }
 
 /**
@@ -262,7 +262,7 @@ public class CacheContinuousQueryRandomOperationsTest 
extends GridCommonAbstract
 ONHEAP_TIERED,
 false);
 
-testContinuousQuery(ccfg, CLIENT);
+doTestContinuousQuery(ccfg, CLIENT);
 }
 
 /**
@@ -275,7 +275,7 @@ public class CacheContinuousQueryRandomOperationsTest 
extends GridCommonAbstract
 OFFHEAP_VALUES,
 false);
 
-testContinuousQuery(ccfg, SERVER);
+doTestContinuousQuery(ccfg, SERVER);
 }
 
 /**
@@ -288,7 +288,7 @@ public class CacheContinuousQueryRandomOperationsTest 
extends GridCommonAbstract
  

[1/2] ignite git commit: Fixed tests (renamed test methods).

[av]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1071 7a6400404 -> f59d70ad4


Fixed tests (renamed test methods).


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/53a87290
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/53a87290
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/53a87290

Branch: refs/heads/ignite-1071
Commit: 53a87290fe028e12a81058fc4b2f2f2341395f9a
Parents: 1c04005
Author: Tikhonov Nikolay 
Authored: Fri Mar 25 19:49:31 2016 +0300
Committer: Tikhonov Nikolay 
Committed: Fri Mar 25 19:49:31 2016 +0300

--
 .../CacheContinuousQueryFactoryFilterTest.java  |  2 +-
 ...acheContinuousQueryRandomOperationsTest.java | 96 ++--
 2 files changed, 49 insertions(+), 49 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/53a87290/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFactoryFilterTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFactoryFilterTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFactoryFilterTest.java
index 6143fa9..2b81162 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFactoryFilterTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFactoryFilterTest.java
@@ -133,7 +133,7 @@ public class CacheContinuousQueryFactoryFilterTest extends 
CacheContinuousQueryR
 }
 
 /** {@inheritDoc} */
-@Override protected void testContinuousQuery(CacheConfiguration ccfg, ContinuousDeploy deploy)
+@Override protected void doTestContinuousQuery(CacheConfiguration ccfg, ContinuousDeploy deploy)
 throws Exception {
 ignite(0).createCache(ccfg);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/53a87290/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRandomOperationsTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRandomOperationsTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRandomOperationsTest.java
index 700ce3f..b1316ab 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRandomOperationsTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRandomOperationsTest.java
@@ -197,7 +197,7 @@ public class CacheContinuousQueryRandomOperationsTest 
extends GridCommonAbstract
 ONHEAP_TIERED,
 false);
 
-testContinuousQuery(ccfg, CLIENT);
+doTestContinuousQuery(ccfg, CLIENT);
 }
 
 /**
@@ -210,7 +210,7 @@ public class CacheContinuousQueryRandomOperationsTest 
extends GridCommonAbstract
 ONHEAP_TIERED,
 false);
 
-testContinuousQuery(ccfg, SERVER);
+doTestContinuousQuery(ccfg, SERVER);
 }
 
 /**
@@ -223,7 +223,7 @@ public class CacheContinuousQueryRandomOperationsTest 
extends GridCommonAbstract
 ONHEAP_TIERED,
 false);
 
-testContinuousQuery(ccfg, ALL);
+doTestContinuousQuery(ccfg, ALL);
 }
 
 /**
@@ -236,7 +236,7 @@ public class CacheContinuousQueryRandomOperationsTest 
extends GridCommonAbstract
 ONHEAP_TIERED,
 false);
 
-testContinuousQuery(ccfg, SERVER);
+doTestContinuousQuery(ccfg, SERVER);
 }
 
 /**
@@ -249,7 +249,7 @@ public class CacheContinuousQueryRandomOperationsTest 
extends GridCommonAbstract
 ONHEAP_TIERED,
 false);
 
-testContinuousQuery(ccfg, ALL);
+doTestContinuousQuery(ccfg, ALL);
 }
 
 /**
@@ -262,7 +262,7 @@ public class CacheContinuousQueryRandomOperationsTest 
extends GridCommonAbstract
 ONHEAP_TIERED,
 false);
 
-testContinuousQuery(ccfg, CLIENT);
+doTestContinuousQuery(ccfg, CLIENT);
 }
 
 /**
@@ -275,7 +275,7 @@ public class CacheContinuousQueryRandomOperationsTest 
extends GridCommonAbstract
 OFFHEAP_VALUES,
 false);
 
-testContinuousQuery(ccfg, SERVER);
+doTestContinuousQuery(ccfg, SERVER);
 }
 
 /**
@@ -288,7 +288,7 @@ public class CacheContinuousQueryRandomOperationsTest 
extends GridCommonAbstract
  

[2/2] ignite git commit: Merge remote-tracking branch 'remotes/upstream/gridgain-7.5.10' into ignite-1071

[av]

Merge remote-tracking branch 'remotes/upstream/gridgain-7.5.10' into ignite-1071


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f59d70ad
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f59d70ad
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f59d70ad

Branch: refs/heads/ignite-1071
Commit: f59d70ad4d77a90141f412b8c7c91d6c79f61a58
Parents: 7a64004 53a8729
Author: Anton Vinogradov 
Authored: Mon Mar 28 12:10:31 2016 +0300
Committer: Anton Vinogradov 
Committed: Mon Mar 28 12:10:31 2016 +0300

--
 .../CacheContinuousQueryFactoryFilterTest.java  |  2 +-
 ...acheContinuousQueryRandomOperationsTest.java | 96 ++--
 2 files changed, 49 insertions(+), 49 deletions(-)
--

[20/50] [abbrv] ignite git commit: IGNITE-843 Minor fix.

[anovikov]

IGNITE-843 Minor fix.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c4596e95
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c4596e95
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c4596e95

Branch: refs/heads/ignite-2875
Commit: c4596e95fa9e3cd7e938fb91f699340e6b12ea0e
Parents: 41e3799
Author: Andrey 
Authored: Mon Mar 21 16:53:22 2016 +0700
Committer: Andrey 
Committed: Mon Mar 21 16:53:22 2016 +0700

--
 .../src/main/js/app/modules/states/signin.state.js   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/c4596e95/modules/control-center-web/src/main/js/app/modules/states/signin.state.js
--
diff --git 
a/modules/control-center-web/src/main/js/app/modules/states/signin.state.js 
b/modules/control-center-web/src/main/js/app/modules/states/signin.state.js
index a12ef43..91c84a3 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/signin.state.js
+++ b/modules/control-center-web/src/main/js/app/modules/states/signin.state.js
@@ -28,7 +28,9 @@ angular
 $stateProvider
 .state('signin', {
 url: '/',
-templateUrl: '/signin.html'
+templateUrl: '/signin.html',
+metaTags: {
+}
 });
 }])
 .run(['$rootScope', '$state', 'Auth', 'IgniteBranding', function($root, 
$state, Auth, branding) {

[03/50] [abbrv] ignite git commit: IGNITE-2840 Additional mixins, fixed disabled conditions, disable empty dropdown

[anovikov]

IGNITE-2840 Additional mixins, fixed disabled conditions, disable empty dropdown


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/51308e66
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/51308e66
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/51308e66

Branch: refs/heads/ignite-2875
Commit: 51308e66e14845ebc01281334bac19e9101cda6d
Parents: 6b017f0
Author: vsisko 
Authored: Thu Mar 17 18:29:27 2016 +0700
Committer: vsisko 
Committed: Thu Mar 17 18:29:27 2016 +0700

--
 .../src/main/js/app/helpers/jade/mixins.jade| 52 ++--
 1 file changed, 49 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/51308e66/modules/control-center-web/src/main/js/app/helpers/jade/mixins.jade
--
diff --git 
a/modules/control-center-web/src/main/js/app/helpers/jade/mixins.jade 
b/modules/control-center-web/src/main/js/app/helpers/jade/mixins.jade
index e09d5ef..0c4e140 100644
--- a/modules/control-center-web/src/main/js/app/helpers/jade/mixins.jade
+++ b/modules/control-center-web/src/main/js/app/helpers/jade/mixins.jade
@@ -26,6 +26,34 @@ mixin checkbox(lbl, model, name, tip)
 ignite-form-field-tooltip
 | !{tip}
 
+//- Mixin for checkbox with enabled condition.
+mixin checkbox-enabled(lbl, model, name, enabled, tip)
+ignite-form-field.checkbox
+ignite-form-field-input-checkbox(
+data-id=name
+data-name=name
+data-ng-model=model
+data-ng-disabled='!(#{enabled})'
+)
+| #{lbl}
+ignite-form-field-tooltip
+| !{tip}
+
+//- Mixin for java name field with enabled condition.
+mixin java-class(lbl, model, name, enabled, required, tip)
+ignite-form-field
+ignite-form-field-label
+| #{lbl}
+ignite-form-field-tooltip
+| !{tip}
+ignite-form-field-java-class(
+data-id=name
+data-name=name
+data-ng-model=model
+data-ng-disabled='!(#{enabled})'
+data-ng-required=required
+)
+
 //- Mixin for text field.
 mixin text-enabled(lbl, model, name, enabled, required, placeholder, tip)
 ignite-form-field
@@ -38,7 +66,7 @@ mixin text-enabled(lbl, model, name, enabled, required, 
placeholder, tip)
 data-name=name
 data-ng-model=model
 data-placeholder=placeholder
-data-ng-disabled='!#{enabled}'
+data-ng-disabled='!(#{enabled})'
 data-ng-required=required
 )
 
@@ -46,6 +74,22 @@ mixin text-enabled(lbl, model, name, enabled, required, 
placeholder, tip)
 mixin text(lbl, model, name, required, placeholder, tip)
 +text-enabled(lbl, model, name, 'true', required, placeholder, tip)
 
+//- Mixin for text field with enabled condition with options.
+mixin text-options(lbl, model, name, options, enabled, placeholder, tip)
+ignite-form-field
+ignite-form-field-label
+| #{lbl}
+ignite-form-field-tooltip
+| !{tip}
+ignite-form-field-input-text(
+data-id=name
+data-name=name
+data-ng-model=model
+data-options=options
+data-placeholder=placeholder
+data-ng-disabled='!(#{enabled})'
+)
+
 //- Mixin for required numeric field.
 mixin number-requited(lbl, model, name, required, enabled, placeholder, min, 
tip)
 ignite-form-field
@@ -58,7 +102,7 @@ mixin number-requited(lbl, model, name, required, enabled, 
placeholder, min, tip
 data-name=name
 data-ng-model=model
 data-ng-required=required
-data-ng-disabled='!#{enabled}'
+data-ng-disabled='!(#{enabled})'
 data-placeholder=placeholder
 data-min=min
 )
@@ -79,6 +123,7 @@ mixin number-min-max(lbl, model, name, enabled, placeholder, 
min, max, tip)
 data-min=min
 data-max=max
 )
+
 //- Mixin for numeric field.
 mixin number(lbl, model, name, enabled, placeholder, min, tip)
 +number-requited(lbl, model, name, 'false', enabled, placeholder, min, tip)
@@ -96,7 +141,7 @@ mixin dropdown-required(lbl, model, name, required, enabled, 
placeholder, option
 data-options=options
 data-ng-model=model
 data-ng-required=required
-data-ng-disabled='!#{enabled}'
+data-ng-disabled='!(#{enabled})'
 data-placeholder=placeholder
 )
 
@@ -119,6 +164,7 @@ mixin dropdown-multiple(lbl, model, name, placeholder, 
placeholderEmpty, options
 data-options=options
 data-ng-model=model
 data-placeholder='{{ #{options}.length 

[28/50] [abbrv] ignite git commit: IGNITE-2840 Validation fixes

[anovikov]

IGNITE-2840 Validation fixes


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1e2ba1da
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1e2ba1da
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1e2ba1da

Branch: refs/heads/ignite-2875
Commit: 1e2ba1da9ff790999781ea7cd34e1d131f7d79e2
Parents: 625dcef
Author: vsisko 
Authored: Tue Mar 22 17:17:27 2016 +0700
Committer: vsisko 
Committed: Tue Mar 22 17:17:27 2016 +0700

--
 .../states/configuration/clusters/deployment.jade   |  2 +-
 .../modules/states/configuration/clusters/ssl.jade  |  2 +-
 .../modules/states/configuration/clusters/swap.jade |  2 +-
 .../states/configuration/clusters/thread.jade   |  2 +-
 .../states/configuration/clusters/transactions.jade |  2 +-
 .../src/main/js/controllers/caches-controller.js| 16 +---
 .../src/main/js/controllers/clusters-controller.js  | 15 ++-
 .../src/main/js/controllers/common-module.js|  3 +++
 8 files changed, 31 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/1e2ba1da/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/deployment.jade
--
diff --git 
a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/deployment.jade
 
b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/deployment.jade
index a7de09a..1c8d475 100644
--- 
a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/deployment.jade
+++ 
b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/deployment.jade
@@ -21,7 +21,7 @@ include ../../../../../app/helpers/jade/mixins.jade
 -var form = 'deployment'
 -var enabled = 'backupItem.peerClassLoadingEnabled'
 
-form.panel.panel-default(name='#{form}' novalidate)
+form.panel.panel-default(name='deployment' novalidate)
 .panel-heading(bs-collapse-toggle ng-click='__show__ = true')
 ignite-form-panel-chevron
 label Class deployment

http://git-wip-us.apache.org/repos/asf/ignite/blob/1e2ba1da/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/ssl.jade
--
diff --git 
a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/ssl.jade
 
b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/ssl.jade
index f96cc4e..15a14cc 100644
--- 
a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/ssl.jade
+++ 
b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/ssl.jade
@@ -22,7 +22,7 @@ include ../../../../../app/helpers/jade/mixins.jade
 -var trust = model + '.trustManagers'
 -var form = 'trustManagers'
 
-form.panel.panel-default(name='#{form}' novalidate)
+form.panel.panel-default(name='sslConfiguration' novalidate)
 .panel-heading(bs-collapse-toggle ng-click='__show__ = true')
 ignite-form-panel-chevron
 label(id='sslConfiguration-title') SSL configuration

http://git-wip-us.apache.org/repos/asf/ignite/blob/1e2ba1da/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/swap.jade
--
diff --git 
a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/swap.jade
 
b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/swap.jade
index 015bdd9..544e8ac 100644
--- 
a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/swap.jade
+++ 
b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/swap.jade
@@ -20,7 +20,7 @@ include ../../../../../app/helpers/jade/mixins.jade
 -var swapModel = model + '.swapSpaceSpi'
 -var fileSwapModel = swapModel + '.FileSwapSpaceSpi'
 
-form.panel.panel-default(name='swapSpaceSpi' novalidate)
+form.panel.panel-default(name='swap' novalidate)
 .panel-heading(bs-collapse-toggle ng-click='__show__ = true')
 ignite-form-panel-chevron
 label Swap

http://git-wip-us.apache.org/repos/asf/ignite/blob/1e2ba1da/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/thread.jade
--
diff --git 
a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/thread.jade
 
b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/thread.jade
index 1537696..264a8330 100644
--- 
a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/thread.jade
+++ 
b/modules/control-center-web/s

[31/50] [abbrv] ignite git commit: IGNITE-2597 Minor fix.

[anovikov]

IGNITE-2597 Minor fix.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1c3c17c5
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1c3c17c5
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1c3c17c5

Branch: refs/heads/ignite-2875
Commit: 1c3c17c54bc3975339b86f77ea5df4844a30b106
Parents: 767529b
Author: Andrey 
Authored: Wed Mar 23 10:20:43 2016 +0700
Committer: Andrey 
Committed: Wed Mar 23 10:20:43 2016 +0700

--
 .../ui-ace-pojos/ui-ace-pojos.controller.js   | 14 ++
 .../src/main/js/app/filters/hasPojo.filter.js |  2 +-
 .../src/main/js/app/modules/ace.module.js |  5 -
 3 files changed, 15 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/1c3c17c5/modules/control-center-web/src/main/js/app/directives/ui-ace-pojos/ui-ace-pojos.controller.js
--
diff --git 
a/modules/control-center-web/src/main/js/app/directives/ui-ace-pojos/ui-ace-pojos.controller.js
 
b/modules/control-center-web/src/main/js/app/directives/ui-ace-pojos/ui-ace-pojos.controller.js
index 1fe1c11..bc185b3 100644
--- 
a/modules/control-center-web/src/main/js/app/directives/ui-ace-pojos/ui-ace-pojos.controller.js
+++ 
b/modules/control-center-web/src/main/js/app/directives/ui-ace-pojos/ui-ace-pojos.controller.js
@@ -69,11 +69,17 @@ export default ['$scope', 'JavaTypes', 'GeneratorJava', 
function($scope, JavaTyp
 return;
 
 _.forEach(ctrl.pojos, (pojo) => {
-if (pojo.keyType === ctrl.class)
-return ctrl.data = pojo.keyClass;
+if (pojo.keyType === ctrl.class) {
+ctrl.data = pojo.keyClass;
 
-if (pojo.valueType === ctrl.class)
-return ctrl.data = pojo.valueClass;
+return false;
+}
+
+if (pojo.valueType === ctrl.class) {
+ctrl.data = pojo.valueClass;
+
+return false;
+}
 });
 };
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/1c3c17c5/modules/control-center-web/src/main/js/app/filters/hasPojo.filter.js
--
diff --git 
a/modules/control-center-web/src/main/js/app/filters/hasPojo.filter.js 
b/modules/control-center-web/src/main/js/app/filters/hasPojo.filter.js
index 3ccbf22..a179423 100644
--- a/modules/control-center-web/src/main/js/app/filters/hasPojo.filter.js
+++ b/modules/control-center-web/src/main/js/app/filters/hasPojo.filter.js
@@ -15,4 +15,4 @@
  * limitations under the License.
  */
 
-export default ['hasPojo', [() => ({caches}) => _.find(caches, (cache) => 
cache.domains && cache.domains.length)]];
+export default ['hasPojo', [() => ({caches} = []) => _.find(caches, (cache) => 
cache.domains && cache.domains.length)]];

http://git-wip-us.apache.org/repos/asf/ignite/blob/1c3c17c5/modules/control-center-web/src/main/js/app/modules/ace.module.js
--
diff --git a/modules/control-center-web/src/main/js/app/modules/ace.module.js 
b/modules/control-center-web/src/main/js/app/modules/ace.module.js
index 8a9024e..d747ccf 100644
--- a/modules/control-center-web/src/main/js/app/modules/ace.module.js
+++ b/modules/control-center-web/src/main/js/app/modules/ace.module.js
@@ -125,7 +125,10 @@ angular
 }
 
 // onLoad callbacks.
-_.forEach(opts.callbacks, (cb) => angular.isFunction(cb) && 
cb(acee));
+_.forEach(opts.callbacks, (cb) => {
+if (angular.isFunction(cb))
+cb(acee)
+});
 };
 
 return {

[29/50] [abbrv] ignite git commit: IGNITE-2597 Cleanup code. Support legacy agents.

[anovikov]

IGNITE-2597 Cleanup code. Support legacy agents.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3262283f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3262283f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3262283f

Branch: refs/heads/ignite-2875
Commit: 3262283f38570fd3764a460c2857644c3835d389
Parents: 625dcef
Author: Andrey 
Authored: Wed Mar 23 08:53:41 2016 +0700
Committer: Andrey 
Committed: Wed Mar 23 08:53:41 2016 +0700

--
 .../control-center-web/src/main/js/.eslintrc|  5 +--
 .../ui-ace-java/ui-ace-java.directive.js| 10 ++---
 .../js/app/directives/ui-ace-tabs.directive.js  |  4 +-
 .../ui-ace-xml/ui-ace-xml.directive.js  | 10 ++---
 .../src/main/js/app/filters/hasPojo.filter.js   | 10 +
 .../control-center-web/src/main/js/app/index.js |  3 +-
 .../app/modules/JavaTypes/JavaTypes.provider.js |  4 +-
 .../src/main/js/app/modules/ace.module.js   | 10 ++---
 .../app/modules/branding/features.directive.js  |  2 +-
 .../js/app/modules/branding/footer.directive.js |  2 +-
 .../modules/branding/header-title.directive.js  |  2 +-
 .../js/app/modules/dialog/dialog.directive.js   |  2 +-
 .../js/app/modules/form/field/down.directive.js |  2 +-
 .../app/modules/form/field/tooltip.directive.js |  2 +-
 .../js/app/modules/form/field/up.directive.js   |  2 +-
 .../js/app/modules/form/group/add.directive.js  |  2 +-
 .../app/modules/form/group/tooltip.directive.js |  2 +-
 .../app/modules/form/panel/chevron.directive.js |  2 +-
 .../app/modules/form/panel/revert.directive.js  | 16 
 .../configuration/summary/summary.resource.js   |  4 +-
 .../js/app/services/AgentMonitor.service.js |  7 +++-
 .../src/main/js/app/services/cleanup.service.js | 43 +---
 .../control-center-web/src/main/js/config.js| 39 --
 .../main/js/controllers/caches-controller.js|  4 +-
 .../main/js/controllers/clusters-controller.js  |  4 +-
 .../src/main/js/controllers/common-module.js|  6 +--
 .../main/js/controllers/domains-controller.js   |  3 +-
 .../src/main/js/controllers/sql-controller.js   |  6 +--
 .../src/main/js/gulpfile.js/tasks/jade.js   |  4 +-
 .../control-center-web/src/main/js/package.json | 38 -
 modules/control-center-web/src/main/js/serve.js | 12 ++
 .../src/main/js/serve/agent.js  | 15 ++-
 .../src/main/js/serve/settings.js   |  3 +-
 33 files changed, 130 insertions(+), 150 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/3262283f/modules/control-center-web/src/main/js/.eslintrc
--
diff --git a/modules/control-center-web/src/main/js/.eslintrc 
b/modules/control-center-web/src/main/js/.eslintrc
index 3e543f4..0a1fed1 100644
--- a/modules/control-center-web/src/main/js/.eslintrc
+++ b/modules/control-center-web/src/main/js/.eslintrc
@@ -92,7 +92,6 @@ rules:
 no-else-return: 2
 no-empty: 2
 no-empty-character-class: 2
-no-empty-label: 2
 no-eq-null: 2
 no-eval: 2
 no-ex-assign: 2
@@ -167,7 +166,6 @@ rules:
 no-var: 2
 no-warning-comments: 0
 no-with: 2
-new-parens: 2
 newline-after-var: 0
 object-shorthand: [2, "always"]
 one-var: [2, "never"]
@@ -182,12 +180,11 @@ rules:
 semi: [2, "always"]
 semi-spacing: [2, {"before": false, "after": true}]
 sort-vars: 0
-space-after-keywords: [2, "always"]
+keyword-spacing: 2
 space-before-blocks: [2, "always"]
 space-before-function-paren: [2, "never"]
 space-in-parens: 0
 space-infix-ops: 2
-space-return-throw-case: 2
 space-unary-ops: [2, { "words": true, "nonwords": false }]
 spaced-comment: [1, "always"]
 use-isnan: 2

http://git-wip-us.apache.org/repos/asf/ignite/blob/3262283f/modules/control-center-web/src/main/js/app/directives/ui-ace-java/ui-ace-java.directive.js
--
diff --git 
a/modules/control-center-web/src/main/js/app/directives/ui-ace-java/ui-ace-java.directive.js
 
b/modules/control-center-web/src/main/js/app/directives/ui-ace-java/ui-ace-java.directive.js
index 77cb774..948f82c 100644
--- 
a/modules/control-center-web/src/main/js/app/directives/ui-ace-java/ui-ace-java.directive.js
+++ 
b/modules/control-center-web/src/main/js/app/directives/ui-ace-java/ui-ace-java.directive.js
@@ -50,10 +50,8 @@ export default ['igniteUiAceJava', ['GeneratorJava', 
(generator) => {
 switch (method) {
 case 'clusterCaches':
 ctrl.generator = (cluster) => {
-let caches;
-
-caches = _.reduce(scope.detail, (acc, cache) => {
-if (_.contains(clus

[13/50] [abbrv] ignite git commit: IGNITE-843 Refactoring, jsDoc.

[anovikov]

IGNITE-843 Refactoring, jsDoc.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b30b52b1
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b30b52b1
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b30b52b1

Branch: refs/heads/ignite-2875
Commit: b30b52b1ab8f7e50252857af97e18b0c3092b782
Parents: 2651715
Author: Andrey 
Authored: Mon Mar 21 14:27:08 2016 +0700
Committer: Andrey 
Committed: Mon Mar 21 14:27:08 2016 +0700

--
 .../src/main/js/app/decorator/select.js |  25 +-
 .../control-center-web/src/main/js/app/index.js |   1 -
 .../js/app/services/AgentMonitor.service.js |  10 +
 .../src/main/js/controllers/sql-controller.js   |   2 +-
 modules/control-center-web/src/main/js/serve.js |  12 +-
 .../src/main/js/serve/agent.js  | 195 +++---
 .../control-center-web/src/main/js/serve/app.js |   2 +-
 .../src/main/js/serve/browser.js| 254 +++
 .../src/main/js/serve/configure.js  |   3 +
 .../control-center-web/src/main/js/serve/io.js  | 242 --
 .../src/main/js/serve/mail.js   |   3 +
 .../src/main/js/serve/mongo.js  |   3 +
 .../src/main/js/serve/routes/agent.js   |   2 +-
 .../src/main/js/serve/routes/profile.js |  12 +-
 .../src/main/js/serve/settings.js   |   3 +
 15 files changed, 407 insertions(+), 362 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/b30b52b1/modules/control-center-web/src/main/js/app/decorator/select.js
--
diff --git a/modules/control-center-web/src/main/js/app/decorator/select.js 
b/modules/control-center-web/src/main/js/app/decorator/select.js
index f232f88..13a4041 100644
--- a/modules/control-center-web/src/main/js/app/decorator/select.js
+++ b/modules/control-center-web/src/main/js/app/decorator/select.js
@@ -31,31 +31,32 @@ angular.module('mgcrea.ngStrap.select')
 
 const scope = deligate.$scope;
 
+const _valueMap = (index) => {
+if (angular.isUndefined(scope.$matches[index]))
+return null;
+
+return scope.$matches[index].value;
+};
+
 const selectAll = (active) => {
-var selected = [];
+const selected = [];
 
-scope.$apply(function () {
-for (var i = 0; i < scope.$matches.length; i++) {
+scope.$apply(() => {
+for (let i = 0; i < scope.$matches.length; i++) {
 if (scope.$isActive(i) === active) {
 selected[i] = scope.$matches[i].value;
 
 deligate.activate(i);
 
-
controller.$setViewValue(scope.$activeIndex.map(function (index) {
-if 
(angular.isUndefined(scope.$matches[index])) {
-return null;
-}
-return scope.$matches[index].value;
-}));
+
controller.$setViewValue(scope.$activeIndex.map(_valueMap));
 }
 }
 });
 
 // Emit events.
-for (var i = 0; i < selected.length; i++) {
-if (selected[i]) {
+for (let i = 0; i < selected.length; i++) {
+if (selected[i])
 scope.$emit(options.prefixEvent + '.select', 
selected[i], i, deligate);
-}
 }
 };
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/b30b52b1/modules/control-center-web/src/main/js/app/index.js
--
diff --git a/modules/control-center-web/src/main/js/app/index.js 
b/modules/control-center-web/src/main/js/app/index.js
index 1537eb9..60a3a8b 100644
--- a/modules/control-center-web/src/main/js/app/index.js
+++ b/modules/control-center-web/src/main/js/app/index.js
@@ -20,7 +20,6 @@ import _ from 'lodash';
 import ace from 'ace';
 import angular from 'angular';
 import pdfMake from 'pdfmake';
-import io from 'socket.io-client';
 
 window._ = _;
 window.ace = ace;

http://git-wip-us.apache.org/repos/asf/ignite/blob/b30b52b1/modules/control-center-web/src/main/js/app/services/AgentMonitor.service.js
--
diff --git 
a/modules/control-center-web/src/main/js/app/services/AgentMonitor.service.js 
b/modules/control-center-web/src/main/js/app/services/AgentMonitor.service.js
index cf66b61..1b661a3 100644
--- 
a/modules/control-center-web/src/

[39/50] [abbrv] ignite git commit: IGNITE-2676 Review

[anovikov]

IGNITE-2676 Review


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b99984c5
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b99984c5
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b99984c5

Branch: refs/heads/ignite-2875
Commit: b99984c5f30b3ae21e72a6b9047ee9e853a940ee
Parents: 8e3de18
Author: vsisko 
Authored: Fri Mar 25 12:53:44 2016 +0700
Committer: vsisko 
Committed: Fri Mar 25 12:53:44 2016 +0700

--
 .../main/js/app/modules/states/configuration/igfs/secondary.jade   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/b99984c5/modules/control-center-web/src/main/js/app/modules/states/configuration/igfs/secondary.jade
--
diff --git 
a/modules/control-center-web/src/main/js/app/modules/states/configuration/igfs/secondary.jade
 
b/modules/control-center-web/src/main/js/app/modules/states/configuration/igfs/secondary.jade
index 40f3f64..f4a5636 100644
--- 
a/modules/control-center-web/src/main/js/app/modules/states/configuration/igfs/secondary.jade
+++ 
b/modules/control-center-web/src/main/js/app/modules/states/configuration/igfs/secondary.jade
@@ -21,7 +21,7 @@ include ../../../../../app/helpers/jade/mixins.jade
 form.panel.panel-default(name='secondaryFileSystem' novalidate)
 .panel-heading(bs-collapse-toggle='' ng-click='__show__ = true')
 ignite-form-panel-chevron
-label Secondary file system
+label(id="secondaryFileSystem-title") Secondary file system
 ignite-form-field-tooltip.tipLabel
 | Secondary file system is provided for pass-through, 
write-through, and read-through purposes
 ignite-form-revert

[02/50] [abbrv] ignite git commit: IGNITE-843 Fixed validator for java classes.

[anovikov]

IGNITE-843 Fixed validator for java classes.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6b017f01
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6b017f01
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6b017f01

Branch: refs/heads/ignite-2875
Commit: 6b017f019a834c1b1ab8d8f705f3ef75d02967b2
Parents: ec3150d
Author: Alexey Kuznetsov 
Authored: Thu Mar 17 18:06:24 2016 +0700
Committer: Alexey Kuznetsov 
Committed: Thu Mar 17 18:06:24 2016 +0700

--
 .../form-field-java-class/form-field-java-class.directive.js  | 3 ++-
 .../form-field-java-class/form-field-java-class.jade  | 6 +++---
 .../src/main/js/app/modules/form/group/group.directive.js | 7 +++
 3 files changed, 8 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/6b017f01/modules/control-center-web/src/main/js/app/directives/form-field-java-class/form-field-java-class.directive.js
--
diff --git 
a/modules/control-center-web/src/main/js/app/directives/form-field-java-class/form-field-java-class.directive.js
 
b/modules/control-center-web/src/main/js/app/directives/form-field-java-class/form-field-java-class.directive.js
index 8c857f0..f1f66c9 100644
--- 
a/modules/control-center-web/src/main/js/app/directives/form-field-java-class/form-field-java-class.directive.js
+++ 
b/modules/control-center-web/src/main/js/app/directives/form-field-java-class/form-field-java-class.directive.js
@@ -26,6 +26,7 @@ export default ['igniteFormFieldJavaClass', 
['IgniteFormGUID', (guid) => {
 scope.ngModel = ngModel;
 scope.form = form;
 scope.label = label;
+scope.name = scope.ngModelName + 'JavaClass';
 
 scope.$watch('required', (required) => {
 label.required = required || false;
@@ -62,7 +63,7 @@ export default ['igniteFormFieldJavaClass', 
['IgniteFormGUID', (guid) => {
 restrict: 'E',
 scope: {
 id: '@',
-name: '@',
+ngModelName: '@name',
 placeholder: '@',
 required: '=ngRequired',
 disabled: '=ngDisabled',

http://git-wip-us.apache.org/repos/asf/ignite/blob/6b017f01/modules/control-center-web/src/main/js/app/directives/form-field-java-class/form-field-java-class.jade
--
diff --git 
a/modules/control-center-web/src/main/js/app/directives/form-field-java-class/form-field-java-class.jade
 
b/modules/control-center-web/src/main/js/app/directives/form-field-java-class/form-field-java-class.jade
index 6b56e6a..3078b80 100644
--- 
a/modules/control-center-web/src/main/js/app/directives/form-field-java-class/form-field-java-class.jade
+++ 
b/modules/control-center-web/src/main/js/app/directives/form-field-java-class/form-field-java-class.jade
@@ -16,7 +16,7 @@
 
 mixin feedback(error, message)
 i.fa.fa-exclamation-triangle.form-control-feedback(
-ng-if='!form[name+"JavaClass"].$pristine && 
form[name+"JavaClass"].$error.#{error}'
+ng-if='!form[name].$pristine && form[name].$error.#{error}'
 bs-tooltip='"{{ label.name }} #{message}"'
 ignite-error='#{error}'
 ignite-error-message='{{ label.name }} #{message}'
@@ -24,8 +24,8 @@ mixin feedback(error, message)
 
 .input-tip
 input.form-control(
-id='{{ id }}'
-name='{{ name }}JavaClass'
+id='{{ id }}JavaClass'
+name='{{ name }}'
 placeholder='Enter fully qualified class name'
 type='text'
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/6b017f01/modules/control-center-web/src/main/js/app/modules/form/group/group.directive.js
--
diff --git 
a/modules/control-center-web/src/main/js/app/modules/form/group/group.directive.js
 
b/modules/control-center-web/src/main/js/app/modules/form/group/group.directive.js
index d5fedfd..5039d6f 100644
--- 
a/modules/control-center-web/src/main/js/app/modules/form/group/group.directive.js
+++ 
b/modules/control-center-web/src/main/js/app/modules/form/group/group.directive.js
@@ -34,7 +34,7 @@ export default ['igniteFormGroup', [() => {
 parentFormCtrl.$defaults = parentFormCtrl.$defaults || {};
 
 if (parentFormCtrl.$pristine) {
-if (!(_.isNull(parentFormCtrl.$defaults[name]) || 
_.isUndefined(parentFormCtrl.$defaults[name]))) 
+if (!(_.isNull(parentFormCtrl.$defaults[name]) || 
_.isUndefined(parentFormCtrl.$defaults[name])))
 scope.ngModel = parentFormCtrl.$defaults[name];
 else
 parentFormCtrl.$defaults[name] = _.cloneDeep(scope.ngModel);
@@ -50,11 +50,10 @@ export default ['igniteFormGroup', [

[34/50] [abbrv] ignite git commit: IGNITE-2676 Refactoring IGFS screen to Angular directives and JADE mixins.

[anovikov]

 IGNITE-2676 Refactoring IGFS screen to Angular directives and JADE mixins.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6cd972a1
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6cd972a1
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6cd972a1

Branch: refs/heads/ignite-2875
Commit: 6cd972a1c396d3045d605639466c7d40b16246c0
Parents: 63819d6
Author: Alexey Kuznetsov 
Authored: Thu Mar 24 18:44:05 2016 +0700
Committer: Alexey Kuznetsov 
Committed: Thu Mar 24 18:44:05 2016 +0700

--
 .../form-field-java-class.directive.js  |  26 +-
 .../form-field-java-class.jade  |  26 +-
 .../src/main/js/app/helpers/jade/mixins.jade|  20 +-
 .../modules/form/field/dropdown.directive.js|  17 +-
 .../js/app/modules/form/field/dropdown.jade |   4 +
 .../form/field/input/number.directive.js|  12 +-
 .../js/app/modules/form/field/input/text.css|   2 +-
 .../modules/form/field/input/text.directive.js  |  24 +-
 .../js/app/modules/form/field/input/text.jade   |   6 +-
 .../app/modules/states/configuration.state.js   | 257 +++---
 .../states/configuration/caches/query.jade  |   6 +-
 .../states/configuration/caches/store.jade  |   8 +-
 .../states/configuration/igfs/dual.directive.js |  27 ++
 .../modules/states/configuration/igfs/dual.jade |  40 +++
 .../igfs/fragmentizer.directive.js  |  27 ++
 .../states/configuration/igfs/fragmentizer.jade |  42 +++
 .../configuration/igfs/general.directive.js |  27 ++
 .../states/configuration/igfs/general.jade  |  53 +++
 .../states/configuration/igfs/ipc.directive.js  |  27 ++
 .../modules/states/configuration/igfs/ipc.jade  |  56 +++
 .../states/configuration/igfs/misc.directive.js |  27 ++
 .../modules/states/configuration/igfs/misc.jade | 118 +++
 .../configuration/igfs/secondary.directive.js   |  27 ++
 .../states/configuration/igfs/secondary.jade|  43 +++
 .../main/js/controllers/caches-controller.js|  31 +-
 .../main/js/controllers/clusters-controller.js  |  31 +-
 .../src/main/js/controllers/common-module.js|  10 +-
 .../src/main/js/controllers/igfs-controller.js  | 346 +++
 .../src/main/js/views/configuration/igfs.jade   |  24 +-
 29 files changed, 918 insertions(+), 446 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/6cd972a1/modules/control-center-web/src/main/js/app/directives/form-field-java-class/form-field-java-class.directive.js
--
diff --git 
a/modules/control-center-web/src/main/js/app/directives/form-field-java-class/form-field-java-class.directive.js
 
b/modules/control-center-web/src/main/js/app/directives/form-field-java-class/form-field-java-class.directive.js
index 7e13b73..0f13343 100644
--- 
a/modules/control-center-web/src/main/js/app/directives/form-field-java-class/form-field-java-class.directive.js
+++ 
b/modules/control-center-web/src/main/js/app/directives/form-field-java-class/form-field-java-class.directive.js
@@ -21,17 +21,25 @@ export default ['igniteFormFieldJavaClass', 
['IgniteFormGUID', (guid) => {
 const link = (scope, el, attrs, [ngModel, form, label]) => {
 const {id, name} = scope;
 
-label.for = scope.id = id || guid();
-
-scope.ngModel = ngModel;
+scope.id = id || guid();
 scope.form = form;
-scope.label = label;
 scope.name = scope.ngModelName + 'JavaClass';
+scope.ngModel = ngModel;
 
-scope.$watch('required', (required) => {
-label.required = required || false;
+Object.defineProperty(scope, 'field', {
+get: () => scope.form[scope.name]
 });
 
+if (label) {
+label.for = scope.id;
+
+scope.label = label;
+
+scope.$watch('required', (required) => {
+label.required = required || false;
+});
+}
+
 form.$defaults = form.$defaults || {};
 form.$defaults[name] = _.cloneDeep(scope.value);
 
@@ -52,7 +60,7 @@ export default ['igniteFormFieldJavaClass', 
['IgniteFormGUID', (guid) => {
 
el.find('input').removeClass('ng-valid').addClass('ng-invalid');
 };
 
-scope.ngChange = function() {
+scope.ngChange = () => {
 ngModel.$setViewValue(scope.value);
 
 if (JSON.stringify(scope.value) !== 
JSON.stringify(form.$defaults[name]))
@@ -60,10 +68,10 @@ export default ['igniteFormFieldJavaClass', 
['IgniteFormGUID', (guid) => {
 else
 ngModel.$setPristine();
 
-setTimeout(checkValid, 100);  // Use setTimeout() workaround of 
problem of two controllers.
+setTimeout(checkValid, 100); // Use setTimeout() workaround of

[19/50] [abbrv] ignite git commit: IGNITE-2676 Minor refactoring.

[anovikov]

IGNITE-2676 Minor refactoring.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/767a2ebf
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/767a2ebf
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/767a2ebf

Branch: refs/heads/ignite-2875
Commit: 767a2ebf42b320eff30415eed6a50e23356e60b3
Parents: b30b52b
Author: Alexey Kuznetsov 
Authored: Mon Mar 21 16:09:32 2016 +0700
Committer: Alexey Kuznetsov 
Committed: Mon Mar 21 16:09:32 2016 +0700

--
 .../src/main/js/app/decorator/select.js   | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/767a2ebf/modules/control-center-web/src/main/js/app/decorator/select.js
--
diff --git a/modules/control-center-web/src/main/js/app/decorator/select.js 
b/modules/control-center-web/src/main/js/app/decorator/select.js
index 13a4041..9a6d07b 100644
--- a/modules/control-center-web/src/main/js/app/decorator/select.js
+++ b/modules/control-center-web/src/main/js/app/decorator/select.js
@@ -24,14 +24,14 @@ import angular from 'angular';
 angular.module('mgcrea.ngStrap.select')
 .decorator('$select', ($delegate) => {
 function SelectFactoryDecorated(element, controller, config) {
-const deligate = $delegate(element, controller, config);
+const delegate = $delegate(element, controller, config);
 
 // Common vars.
 const options = angular.extend({}, $delegate.defaults, config);
 
-const scope = deligate.$scope;
+const scope = delegate.$scope;
 
-const _valueMap = (index) => {
+const valueByIndex = (index) => {
 if (angular.isUndefined(scope.$matches[index]))
 return null;
 
@@ -46,9 +46,9 @@ angular.module('mgcrea.ngStrap.select')
 if (scope.$isActive(i) === active) {
 selected[i] = scope.$matches[i].value;
 
-deligate.activate(i);
+delegate.activate(i);
 
-
controller.$setViewValue(scope.$activeIndex.map(_valueMap));
+
controller.$setViewValue(scope.$activeIndex.map(valueByIndex));
 }
 }
 });
@@ -56,7 +56,7 @@ angular.module('mgcrea.ngStrap.select')
 // Emit events.
 for (let i = 0; i < selected.length; i++) {
 if (selected[i])
-scope.$emit(options.prefixEvent + '.select', 
selected[i], i, deligate);
+scope.$emit(options.prefixEvent + '.select', 
selected[i], i, delegate);
 }
 };
 
@@ -68,7 +68,7 @@ angular.module('mgcrea.ngStrap.select')
 scope.$$postDigest(selectAll.bind(this, true));
 };
 
-return deligate;
+return delegate;
 }
 
 SelectFactoryDecorated.defaults = $delegate.defaults;

[17/50] [abbrv] ignite git commit: IGNITE-843 Minor fix. (cherry picked from commit 1b58bbc)

[anovikov]

IGNITE-843 Minor fix.
(cherry picked from commit 1b58bbc)


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/72ba11c6
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/72ba11c6
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/72ba11c6

Branch: refs/heads/ignite-2875
Commit: 72ba11c65a5a8853a9b7cf0f4412418a5be8279a
Parents: a567d7f
Author: Andrey 
Authored: Mon Mar 21 10:25:12 2016 +0700
Committer: Andrey 
Committed: Mon Mar 21 15:44:35 2016 +0700

--
 modules/control-center-web/src/main/js/views/index.jade | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/72ba11c6/modules/control-center-web/src/main/js/views/index.jade
--
diff --git a/modules/control-center-web/src/main/js/views/index.jade 
b/modules/control-center-web/src/main/js/views/index.jade
index 0eef7a7..c62fb1b 100644
--- a/modules/control-center-web/src/main/js/views/index.jade
+++ b/modules/control-center-web/src/main/js/views/index.jade
@@ -25,6 +25,7 @@ html(ng-app='ignite-web-console' id='app')
 
 title(ng-bind='$meta.title')
 
+meta(name='fragment' content='!')
 meta(name='description' content='{{$meta.description}}')
 meta(name='keywords' content='{{$meta.keywords}}')
 meta(ng-repeat='(key, value) in $meta.properties' name='{{::key}}' 
content='{{::value}}')

[24/50] [abbrv] ignite git commit: IGNITE-2840 Refactoring to mixins.

[anovikov]

http://git-wip-us.apache.org/repos/asf/ignite/blob/f8a690ec/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/deployment.jade
--
diff --git 
a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/deployment.jade
 
b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/deployment.jade
index 842506f..20312e7 100644
--- 
a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/deployment.jade
+++ 
b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/deployment.jade
@@ -14,6 +14,8 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 
+include ../../../../../app/helpers/jade/mixins.jade
+
 - var model = 'backupItem'
 - var exclude = model + '.peerClassLoadingLocalClassPathExclude'
 - var form = 'deployment'
@@ -21,9 +23,9 @@
 
 mixin feedback(name, error, message)
 i.fa.fa-exclamation-triangle.form-control-feedback(
-ng-show='!#{form}.#{name}.$pristine && #{form}.#{name}.$error.#{error}'
+ng-show=form + '.' + name +  '.$error.' + error
 bs-tooltip
-data-title='#{message}'
+data-title=message
 )
 
 form.panel.panel-default(name='#{form}' novalidate)
@@ -37,160 +39,71 @@ form.panel.panel-default(name='#{form}' novalidate)
 .panel-body(ng-if='__show__')
 .col-sm-6
 .settings-row
-ignite-form-field
-ignite-form-field-label
-| Deployment mode:
-ignite-form-field-tooltip
-| Task classes and resources sharing mode#[br]
-| The following deployment modes are 
supported:#[br]
-ul
-li PRIVATE - in this mode deployed classes do 
not share resources
-li ISOLATED - in this mode tasks or classes 
deployed within the same class loader will share the same instances of resources
-li SHARED - same as ISOLATED, but now tasks 
from different master nodes with the same user version and same class loader 
will share the same class loader on remote nodes
-li CONTINUOUS - same as SHARED deployment 
mode, but resources will not be undeployed even after all master nodes left grid
-ignite-form-field-dropdown(
-data-id='deploymentMode'
-data-name='deploymentMode'
-data-options='[\
-{value: "PRIVATE", label: "PRIVATE"},\
-{value: "ISOLATED", label: "ISOLATED"}, \
-{value: "SHARED", label: "SHARED"},\
-{value: "CONTINUOUS", label: "CONTINUOUS"}\
-]'
-data-ng-model='#{model}.deploymentMode'
-data-placeholder='SHARED'
-)
++dropdown('Deployment mode:', model + '.deploymentMode', 
'deploymentMode', 'true', 'SHARED',
+'[\
+{value: "PRIVATE", label: "PRIVATE"},\
+{value: "ISOLATED", label: "ISOLATED"}, \
+{value: "SHARED", label: "SHARED"},\
+{value: "CONTINUOUS", label: "CONTINUOUS"}\
+]',
+'Task classes and resources sharing mode\
+The following deployment modes are supported:\
+\
+PRIVATE - in this mode deployed classes do not 
share resources\
+ISOLATED - in this mode tasks or classes 
deployed within the same class loader will share the same instances of 
resources\
+SHARED - same as ISOLATED, but now tasks from 
different master nodes with the same user version and same class loader will 
share the same class loader on remote nodes\
+CONTINUOUS - same as SHARED deployment mode, 
but resources will not be undeployed even after all master nodes left grid\
+')
 .settings-row
-ignite-form-field.checkbox
-ignite-form-field-input-checkbox(
-data-id='peerClassLoadingEnabled'
-data-name='peerClassLoadingEnabled'
-data-ng-model='#{model}.peerClassLoadingEnabled'
-)
-| Enable peer class loading
-ignite-form-field-tooltip
-| Enables/disables pee

[40/50] [abbrv] ignite git commit: IGNITE-2676 Fixed scroll

[anovikov]

IGNITE-2676 Fixed scroll


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c9a39bcb
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c9a39bcb
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c9a39bcb

Branch: refs/heads/ignite-2875
Commit: c9a39bcb435e0228f9790f72bfba728f2ccf69f4
Parents: b99984c
Author: vsisko 
Authored: Fri Mar 25 13:14:44 2016 +0700
Committer: vsisko 
Committed: Fri Mar 25 13:14:44 2016 +0700

--
 .../src/main/js/controllers/common-module.js | 8 ++--
 .../src/main/js/controllers/igfs-controller.js   | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/c9a39bcb/modules/control-center-web/src/main/js/controllers/common-module.js
--
diff --git 
a/modules/control-center-web/src/main/js/controllers/common-module.js 
b/modules/control-center-web/src/main/js/controllers/common-module.js
index bb72ef0..5543783 100644
--- a/modules/control-center-web/src/main/js/controllers/common-module.js
+++ b/modules/control-center-web/src/main/js/controllers/common-module.js
@@ -120,7 +120,9 @@ consoleModule.config(function($dropdownProvider) {
 
 // Common functions to be used in controllers.
 consoleModule.service('$common', [
-'$alert', '$popover', '$timeout', '$focus', '$window', function ($alert, 
$popover, $timeout, $focus, $window) {
+'$alert', '$popover', '$anchorScroll', '$location', '$timeout', '$focus', 
'$window', function ($alert, $popover, $anchorScroll, $location, $timeout, 
$focus, $window) {
+$anchorScroll.yOffset = 55;
+
 function isDefined(v) {
 return !(v === undefined || v === null);
 }
@@ -613,7 +615,9 @@ consoleModule.service('$common', [
 el = body.find('[name="' + id + '"]');
 
 if (el && el.length > 0) {
-$focus(el[0].id);
+$location.hash(el[0].id);
+
+$anchorScroll();
 
 var newPopover = $popover(el, {content: message});
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/c9a39bcb/modules/control-center-web/src/main/js/controllers/igfs-controller.js
--
diff --git 
a/modules/control-center-web/src/main/js/controllers/igfs-controller.js 
b/modules/control-center-web/src/main/js/controllers/igfs-controller.js
index 6781546..44ba0ec 100644
--- a/modules/control-center-web/src/main/js/controllers/igfs-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/igfs-controller.js
@@ -227,7 +227,7 @@ consoleModule.controller('igfsController', [
 if (item.pathModes) {
 for (var pathIx = 0; pathIx < item.pathModes.length; pathIx++) 
{
 if (!item.secondaryFileSystemEnabled && 
item.pathModes[pathIx].mode === 'PROXY')
-return showPopoverMessage($scope.ui, 'misc', 
'secondaryFileSystem-title', 'Secondary file system should be configured for 
"PROXY" path mode!');
+return showPopoverMessage($scope.ui, 
'secondaryFileSystem', 'secondaryFileSystem-title', 'Secondary file system 
should be configured for "PROXY" path mode!');
 }
 }
 

[44/50] [abbrv] ignite git commit: Merge remote-tracking branch 'community/web-console-staging' into web-console-staging

[anovikov]

Merge remote-tracking branch 'community/web-console-staging' into 
web-console-staging


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/214c9b27
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/214c9b27
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/214c9b27

Branch: refs/heads/ignite-2875
Commit: 214c9b276349ea277efd85593b7780141f24853d
Parents: e1a5dad 1017ea8
Author: Alexey Kuznetsov 
Authored: Fri Mar 25 14:29:23 2016 +0700
Committer: Alexey Kuznetsov 
Committed: Fri Mar 25 14:29:23 2016 +0700

--
 modules/control-center-web/src/main/js/views/signin.jade | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--

[08/50] [abbrv] ignite git commit: IGNITE-2597 Refactored to websockets.

[anovikov]

http://git-wip-us.apache.org/repos/asf/ignite/blob/706317f3/modules/control-center-agent/src/main/java/org/apache/ignite/console/demo/AgentSqlDemo.java
--
diff --git 
a/modules/control-center-agent/src/main/java/org/apache/ignite/console/demo/AgentSqlDemo.java
 
b/modules/control-center-agent/src/main/java/org/apache/ignite/console/demo/AgentSqlDemo.java
index a471d25..28c9a69 100644
--- 
a/modules/control-center-agent/src/main/java/org/apache/ignite/console/demo/AgentSqlDemo.java
+++ 
b/modules/control-center-agent/src/main/java/org/apache/ignite/console/demo/AgentSqlDemo.java
@@ -33,21 +33,22 @@ import java.util.concurrent.atomic.AtomicInteger;
 import org.apache.ignite.Ignite;
 import org.apache.ignite.IgniteCache;
 import org.apache.ignite.Ignition;
+import org.apache.ignite.cache.QueryEntity;
+import org.apache.ignite.cache.QueryIndex;
+import org.apache.ignite.cache.QueryIndexType;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.console.agent.AgentConfiguration;
 import org.apache.ignite.console.demo.model.Car;
 import org.apache.ignite.console.demo.model.Country;
 import org.apache.ignite.console.demo.model.Department;
 import org.apache.ignite.console.demo.model.Employee;
 import org.apache.ignite.console.demo.model.Parking;
-import org.apache.ignite.cache.QueryEntity;
-import org.apache.ignite.cache.QueryIndex;
-import org.apache.ignite.cache.QueryIndexType;
-import org.apache.ignite.configuration.CacheConfiguration;
-import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.internal.IgniteEx;
 import org.apache.ignite.internal.util.typedef.F;
 import org.apache.ignite.logger.log4j.Log4JLogger;
 import org.apache.ignite.spi.IgniteSpiException;
+import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi;
 import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
 import 
org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinderAdapter;
 import org.apache.log4j.Logger;
@@ -64,7 +65,7 @@ import static 
org.apache.ignite.internal.IgniteNodeAttributes.ATTR_REST_JETTY_PO
  */
 public class AgentSqlDemo {
 /** */
-private static final Logger log = 
Logger.getLogger(AgentMetadataDemo.class.getName());
+private static final Logger log = 
Logger.getLogger(AgentSqlDemo.class.getName());
 
 /** */
 private static final AtomicBoolean initLatch = new AtomicBoolean();
@@ -108,12 +109,12 @@ public class AgentSqlDemo {
 CacheConfiguration ccfg = new 
CacheConfiguration<>(COUNTRY_CACHE_NAME);
 
 // Configure cacheCountry types.
-Collection queryEntities = new ArrayList<>();
+Collection qryEntities = new ArrayList<>();
 
 // COUNTRY.
 QueryEntity type = new QueryEntity();
 
-queryEntities.add(type);
+qryEntities.add(type);
 
 type.setKeyType(Integer.class.getName());
 type.setValueType(Country.class.getName());
@@ -130,7 +131,7 @@ public class AgentSqlDemo {
 // Indexes for COUNTRY.
 type.setIndexes(Collections.singletonList(new QueryIndex("id", 
QueryIndexType.SORTED, false, "PRIMARY_KEY_6")));
 
-ccfg.setQueryEntities(queryEntities);
+ccfg.setQueryEntities(qryEntities);
 
 return ccfg;
 }
@@ -142,12 +143,12 @@ public class AgentSqlDemo {
 CacheConfiguration ccfg = new 
CacheConfiguration<>(DEPARTMENT_CACHE_NAME);
 
 // Configure cacheDepartment types.
-Collection queryEntities = new ArrayList<>();
+Collection qryEntities = new ArrayList<>();
 
 // DEPARTMENT.
 QueryEntity type = new QueryEntity();
 
-queryEntities.add(type);
+qryEntities.add(type);
 
 type.setKeyType(Integer.class.getName());
 type.setValueType(Department.class.getName());
@@ -164,7 +165,7 @@ public class AgentSqlDemo {
 // Indexes for DEPARTMENT.
 type.setIndexes(Collections.singletonList(new QueryIndex("id", 
QueryIndexType.SORTED, false, "PRIMARY_KEY_4")));
 
-ccfg.setQueryEntities(queryEntities);
+ccfg.setQueryEntities(qryEntities);
 
 return ccfg;
 }
@@ -176,12 +177,12 @@ public class AgentSqlDemo {
 CacheConfiguration ccfg = new 
CacheConfiguration<>(EMPLOYEE_CACHE_NAME);
 
 // Configure cacheEmployee types.
-Collection queryEntities = new ArrayList<>();
+Collection qryEntities = new ArrayList<>();
 
 // EMPLOYEE.
 QueryEntity type = new QueryEntity();
 
-queryEntities.add(type);
+qryEntities.add(type);
 
 type.setKeyType(Integer.class.getName());
 type.setValueType(Employee.class.getName());
@@ -207,23 +208,23 @@ public class AgentSqlDemo {
 
 indexes.add(new QueryIndex("id", QueryIndexType.SORTED, false, 
"PRIMARY_KEY_7"));
 
-QueryIndex index = new QueryIndex();
+Q

[18/50] [abbrv] ignite git commit: IGNITE-843 Minor fix. (cherry picked from commit 2651715)

[anovikov]

IGNITE-843 Minor fix.
(cherry picked from commit 2651715)


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/41e37997
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/41e37997
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/41e37997

Branch: refs/heads/ignite-2875
Commit: 41e379970bca300fe58d2da40aaa6cc84b9bb2cf
Parents: 72ba11c
Author: Andrey 
Authored: Mon Mar 21 11:26:45 2016 +0700
Committer: Andrey 
Committed: Mon Mar 21 15:44:54 2016 +0700

--
 modules/control-center-web/src/main/js/app/index.js | 1 +
 .../src/main/js/app/modules/states/signin.state.js  | 5 +
 2 files changed, 2 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/41e37997/modules/control-center-web/src/main/js/app/index.js
--
diff --git a/modules/control-center-web/src/main/js/app/index.js 
b/modules/control-center-web/src/main/js/app/index.js
index f959d2d..e9739fd 100644
--- a/modules/control-center-web/src/main/js/app/index.js
+++ b/modules/control-center-web/src/main/js/app/index.js
@@ -171,6 +171,7 @@ angular
 }])
 .config(['UIRouterMetatagsProvider', (UIRouterMetatagsProvider) => {
 UIRouterMetatagsProvider
+.setDefaultTitle('Apache Ignite Web Console - Management Tool and 
Configuration Wizard for Apache Ignite')
 .setTitleSuffix(' – Apache Ignite Web Console')
 .setDefaultDescription('The Apache Ignite Web Console is an 
interactive management tool and configuration wizard for Apache Ignite which 
walks you through the creation of configuration files. Try the tool now.');
 }])

http://git-wip-us.apache.org/repos/asf/ignite/blob/41e37997/modules/control-center-web/src/main/js/app/modules/states/signin.state.js
--
diff --git 
a/modules/control-center-web/src/main/js/app/modules/states/signin.state.js 
b/modules/control-center-web/src/main/js/app/modules/states/signin.state.js
index ba14be6..a12ef43 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/signin.state.js
+++ b/modules/control-center-web/src/main/js/app/modules/states/signin.state.js
@@ -28,10 +28,7 @@ angular
 $stateProvider
 .state('signin', {
 url: '/',
-templateUrl: '/signin.html',
-metaTags: {
-title: 'Management Tool and Configuration Wizard for Apache Ignite'
-}
+templateUrl: '/signin.html'
 });
 }])
 .run(['$rootScope', '$state', 'Auth', 'IgniteBranding', function($root, 
$state, Auth, branding) {

[26/50] [abbrv] ignite git commit: IGNITE-843 Fixed validation and code format.

[anovikov]

http://git-wip-us.apache.org/repos/asf/ignite/blob/625dcefa/modules/control-center-web/src/main/js/controllers/caches-controller.js
--
diff --git 
a/modules/control-center-web/src/main/js/controllers/caches-controller.js 
b/modules/control-center-web/src/main/js/controllers/caches-controller.js
index 5ff8fe6..055417b 100644
--- a/modules/control-center-web/src/main/js/controllers/caches-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/caches-controller.js
@@ -249,10 +249,10 @@ consoleModule.controller('cachesController', [
 $common.hidePopover();
 
 if ($common.isEmptyString(item.name))
-return showPopoverMessage($scope.ui, 'general', 'cacheName', 
'Name should not be empty');
+return showPopoverMessage($scope.ui, 'general', 'cacheName', 
'Cache name should not be empty!');
 
 if (item.memoryMode === 'ONHEAP_TIERED' && item.offHeapMaxMemory > 
0 && !$common.isDefined(item.evictionPolicy.kind))
-return showPopoverMessage($scope.ui, 'memory', 
'evictionPolicyKind', 'Eviction policy should not be configured');
+return showPopoverMessage($scope.ui, 'memory', 
'evictionPolicyKind', 'Eviction policy should not be configured!');
 
 var form = $scope.ui.inputForm;
 var errors = form.$error;
@@ -278,11 +278,11 @@ consoleModule.controller('cachesController', [
 
 if (item.memoryMode === 'OFFHEAP_VALUES' && 
!$common.isEmptyArray(item.domains))
 return showPopoverMessage($scope.ui, 'memory', 'memoryMode',
-'Cannot have query indexing enabled while values are 
stored off-heap');
+'Query indexing could not be enabled while values are 
stored off-heap!');
 
 if (item.memoryMode === 'OFFHEAP_TIERED' && 
!$common.isDefined(item.offHeapMaxMemory))
 return showPopoverMessage($scope.ui, 'memory', 
'offHeapMaxMemory',
-'Off-heap max memory should be specified');
+'Off-heap max memory should be specified!');
 
 var cacheStoreFactorySelected = item.cacheStoreFactory && 
item.cacheStoreFactory.kind;
 
@@ -292,14 +292,14 @@ consoleModule.controller('cachesController', [
 if (item.cacheStoreFactory.kind === 
'CacheJdbcPojoStoreFactory') {
 if ($common.isEmptyString(storeFactory.dataSourceBean))
 return showPopoverMessage($scope.ui, 'store', 
'dataSourceBean',
-'Data source bean name should not be empty');
+'Data source bean name should not be empty!');
 
 if (!$common.isValidJavaIdentifier('Data source bean', 
storeFactory.dataSourceBean, 'dataSourceBean', $scope.ui, 'store'))
 return false;
 
 if (!storeFactory.dialect)
 return showPopoverMessage($scope.ui, 'store', 
'pojoDialect',
-'Dialect should not be empty');
+'Dialect should not be empty!');
 
 if (!checkDataSources())
 return false;
@@ -309,23 +309,23 @@ consoleModule.controller('cachesController', [
 if (storeFactory.connectVia === 'URL') {
 if ($common.isEmptyString(storeFactory.connectionUrl))
 return showPopoverMessage($scope.ui, 'store', 
'connectionUrl',
-'Connection URL should not be empty');
+'Connection URL should not be empty!');
 
 if ($common.isEmptyString(storeFactory.user))
 return showPopoverMessage($scope.ui, 'store', 
'user',
-'User should not be empty');
+'User should not be empty!');
 }
 else {
 if ($common.isEmptyString(storeFactory.dataSourceBean))
 return showPopoverMessage($scope.ui, 'store', 
'dataSourceBean',
-'Data source bean name should not be empty');
+'Data source bean name should not be empty!');
 
 if (!$common.isValidJavaIdentifier('Data source bean', 
storeFactory.dataSourceBean, 'dataSourceBean', $scope.ui, 'store'))
 return false;
 
 if (!storeFactory.dialect)
 return showPopoverMessage($scope.ui, 'store', 
'blobDialect',
-'Database should not be empty');
+'Database should not be empty!');
 
 if (!checkDataSources())
 return false;
@@ -349,11 +349,11 @@ consoleModule.c

[48/50] [abbrv] ignite git commit: IGNITE-2875 WIP

[anovikov]

IGNITE-2875 WIP


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/84f7557c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/84f7557c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/84f7557c

Branch: refs/heads/ignite-2875
Commit: 84f7557c5249f19ffa950512ec39c04a860c6604
Parents: 4f6e72e
Author: Andrey 
Authored: Mon Mar 28 08:41:42 2016 +0700
Committer: Andrey 
Committed: Mon Mar 28 08:41:42 2016 +0700

--
 .../js/app/services/AgentMonitor.service.js |  4 +-
 .../src/main/js/controllers/sql-controller.js   | 41 ---
 .../src/main/js/serve/agent.js  | 38 +-
 .../src/main/js/serve/browser.js| 52 +++-
 4 files changed, 78 insertions(+), 57 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/84f7557c/modules/control-center-web/src/main/js/app/services/AgentMonitor.service.js
--
diff --git 
a/modules/control-center-web/src/main/js/app/services/AgentMonitor.service.js 
b/modules/control-center-web/src/main/js/app/services/AgentMonitor.service.js
index 364e1db..590d72f 100644
--- 
a/modules/control-center-web/src/main/js/app/services/AgentMonitor.service.js
+++ 
b/modules/control-center-web/src/main/js/app/services/AgentMonitor.service.js
@@ -225,10 +225,10 @@ class IgniteAgentMonitor {
 
 return res;
 })
-.catch((errMsg) => {
+.catch((err) => {
 this._downloadAgentModal.show();
 
-return this._$q.reject(errMsg);
+return this._$q.reject(err);
 });
 }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/84f7557c/modules/control-center-web/src/main/js/controllers/sql-controller.js
--
diff --git 
a/modules/control-center-web/src/main/js/controllers/sql-controller.js 
b/modules/control-center-web/src/main/js/controllers/sql-controller.js
index abae869..63dd31d 100644
--- a/modules/control-center-web/src/main/js/controllers/sql-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/sql-controller.js
@@ -257,7 +257,7 @@ consoleModule.controller('sqlController', [
 var _refreshFn = function() {
 IgniteAgentMonitor.topology($scope.demo)
 .then(function(clusters) {
-var caches = _.flattenDeep(clusters.map(function (cluster) 
{ return cluster._caches; }));
+var caches = _.flattenDeep(clusters.map(function (cluster) 
{ return cluster.caches; }));
 
 $scope.caches = _.sortBy(_.uniq(_.reject(caches, { mode: 
'LOCAL' }), function (cache) {
 return _mask(cache.name);
@@ -831,7 +831,7 @@ consoleModule.controller('sqlController', [
 
 _showLoading(paragraph, false);
 
-if (res.last)
+if (res.queryId === null)
 delete paragraph.queryId;
 })
 .catch(function (errMsg) {
@@ -1502,28 +1502,31 @@ consoleModule.controller('sqlController', [
 
 $scope.metadata = [];
 
-IgniteAgentMonitor.metadata($scope.demo)
-.then(function (metadata) {
-$scope.metadata = _.sortBy(_.filter(metadata, function (meta) {
-var cache = _.find($scope.caches, { name: meta.cacheName 
});
+IgniteAgentMonitor.metadata($scope.demo)
+.then(function (metadata) {
+$scope.metadata = _.sortBy(_.filter(metadata, function 
(meta) {
+var cache = _.find($scope.caches, { name: 
meta.cacheName });
 
-if (cache) {
-meta.name = (cache.sqlSchema ? cache.sqlSchema : 
'"' + meta.cacheName + '"') + '.' + meta.typeName;
+if (cache) {
+meta.name = (cache.sqlSchema ? cache.sqlSchema 
: '"' + meta.cacheName + '"') + '.' + meta.typeName;
 
-meta.displayMame = _mask(meta.cacheName) + '.' + 
meta.typeName;
+meta.displayMame = _mask(meta.cacheName) + '.' 
+ meta.typeName;
 
-if (cache.sqlSchema)
-meta.children.unshift({type: 'plain', name: 
'sqlSchema: ' + cache.sqlSchema});
+if (cache.sqlSchema)
+meta.children.unshift({type: 'plain', 
name: 'sqlSchema: ' + cache.sqlSchema});
 
-meta.children.unshift({type: 'plain', name: 'mode: 
' + cache.mode});
-}
+meta.children.uns

[36/50] [abbrv] ignite git commit: IGNITE-843 Fixed bug with ngModelName and implemented IGFS unique path validator.

[anovikov]

 IGNITE-843 Fixed bug with ngModelName and implemented IGFS unique path 
validator.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8c79a57a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8c79a57a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8c79a57a

Branch: refs/heads/ignite-2875
Commit: 8c79a57aae521c8da7c71a66c88cf9848e789760
Parents: efe4395
Author: Alexey Kuznetsov 
Authored: Fri Mar 25 12:39:40 2016 +0700
Committer: Alexey Kuznetsov 
Committed: Fri Mar 25 12:39:40 2016 +0700

--
 .../form-field-java-class.directive.js  |  6 ++-
 .../modules/form/field/input/text.directive.js  |  6 ++-
 .../src/main/js/app/modules/form/form.module.js |  2 +
 .../validator/igfs-path-unique.directive.js | 46 
 .../form/validator/property-unique.directive.js |  9 ++--
 .../modules/form/validator/unique.directive.js  |  3 +-
 .../states/configuration/caches/query.jade  |  2 +-
 .../states/configuration/caches/store.jade  |  4 +-
 .../modules/states/configuration/igfs/misc.jade |  3 ++
 9 files changed, 69 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/8c79a57a/modules/control-center-web/src/main/js/app/directives/form-field-java-class/form-field-java-class.directive.js
--
diff --git 
a/modules/control-center-web/src/main/js/app/directives/form-field-java-class/form-field-java-class.directive.js
 
b/modules/control-center-web/src/main/js/app/directives/form-field-java-class/form-field-java-class.directive.js
index 0f13343..8c469ea 100644
--- 
a/modules/control-center-web/src/main/js/app/directives/form-field-java-class/form-field-java-class.directive.js
+++ 
b/modules/control-center-web/src/main/js/app/directives/form-field-java-class/form-field-java-class.directive.js
@@ -19,11 +19,13 @@ import template from './form-field-java-class.jade!';
 
 export default ['igniteFormFieldJavaClass', ['IgniteFormGUID', (guid) => {
 const link = (scope, el, attrs, [ngModel, form, label]) => {
-const {id, name} = scope;
+const {id, ngModelName} = scope;
+
+const name = ngModelName;
 
 scope.id = id || guid();
 scope.form = form;
-scope.name = scope.ngModelName + 'JavaClass';
+scope.name = ngModelName + 'JavaClass';
 scope.ngModel = ngModel;
 
 Object.defineProperty(scope, 'field', {

http://git-wip-us.apache.org/repos/asf/ignite/blob/8c79a57a/modules/control-center-web/src/main/js/app/modules/form/field/input/text.directive.js
--
diff --git 
a/modules/control-center-web/src/main/js/app/modules/form/field/input/text.directive.js
 
b/modules/control-center-web/src/main/js/app/modules/form/field/input/text.directive.js
index a9e7f81..0a3fa04 100644
--- 
a/modules/control-center-web/src/main/js/app/modules/form/field/input/text.directive.js
+++ 
b/modules/control-center-web/src/main/js/app/modules/form/field/input/text.directive.js
@@ -20,11 +20,13 @@ import './text.css!';
 
 export default ['igniteFormFieldInputText', ['IgniteFormGUID', (guid) => {
 const link = (scope, el, attrs, [ngModel, form, label]) => {
-const {id, name} = scope;
+const {id, ngModelName} = scope;
+
+const name = ngModelName;
 
 scope.id = id || guid();
 scope.form = form;
-scope.name = scope.ngModelName + 'TextInput';
+scope.name = ngModelName + 'TextInput';
 scope.ngModel = ngModel;
 
 Object.defineProperty(scope, 'field', {

http://git-wip-us.apache.org/repos/asf/ignite/blob/8c79a57a/modules/control-center-web/src/main/js/app/modules/form/form.module.js
--
diff --git 
a/modules/control-center-web/src/main/js/app/modules/form/form.module.js 
b/modules/control-center-web/src/main/js/app/modules/form/form.module.js
index 57a92fa..81c1d99 100644
--- a/modules/control-center-web/src/main/js/app/modules/form/form.module.js
+++ b/modules/control-center-web/src/main/js/app/modules/form/form.module.js
@@ -40,6 +40,7 @@ import igniteFormGroupAdd from './group/add.directive';
 import igniteFormGroupTooltip from './group/tooltip.directive';
 
 // Validators.
+import igfsPathUnique from './validator/igfs-path-unique.directive';
 import ipaddress from './validator/ipaddress.directive';
 import javaKeywords from './validator/java-keywords.directive';
 import javaPackageSpecified from 
'./validator/java-package-specified.directive';
@@ -79,6 +80,7 @@ angular
 .directive(...igniteFormGroupAdd)
 .directive(...igniteFormGroupTooltip)
 // Validators.
+.directive(...igfsPathUnique)
 .directive(...ipaddress)
 .directive(...javaKey

[15/50] [abbrv] ignite git commit: IGNITE-843 Split username into firstName and lastName. (cherry picked from commit 60e862c)

[anovikov]

IGNITE-843 Split username into firstName and lastName.
(cherry picked from commit 60e862c)


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/922e3fc0
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/922e3fc0
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/922e3fc0

Branch: refs/heads/ignite-2875
Commit: 922e3fc0a57879d753957327412751bc5c3357e3
Parents: b20a693
Author: Andrey 
Authored: Thu Mar 17 15:50:06 2016 +0700
Committer: Andrey 
Committed: Mon Mar 21 15:43:42 2016 +0700

--
 .../src/main/js/controllers/admin-controller.js | 111 ++-
 .../src/main/js/serve/mail.js   |   2 +-
 .../src/main/js/serve/mongo.js  |   6 +-
 .../src/main/js/serve/routes/admin.js   |   4 +-
 .../src/main/js/serve/routes/public.js  |   6 +-
 .../src/main/js/views/includes/header.jade  |   4 +-
 .../src/main/js/views/settings/admin.jade   |   4 +-
 .../src/main/js/views/settings/profile.jade |  18 +--
 .../src/main/js/views/signin.jade   |  29 ++---
 .../src/main/js/views/templates/clone.jade  |   2 +-
 10 files changed, 98 insertions(+), 88 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/922e3fc0/modules/control-center-web/src/main/js/controllers/admin-controller.js
--
diff --git 
a/modules/control-center-web/src/main/js/controllers/admin-controller.js 
b/modules/control-center-web/src/main/js/controllers/admin-controller.js
index 107d310..5d204d5 100644
--- a/modules/control-center-web/src/main/js/controllers/admin-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/admin-controller.js
@@ -16,79 +16,82 @@
  */
 
 // Controller for Admin screen.
-consoleModule.controller('adminController',
-['$q', '$rootScope', '$scope', '$http', '$common', '$confirm', '$state', 
'User',
-function ($q, $rootScope, $scope, $http, $common, $confirm, $state, User) {
-$scope.users = null;
+consoleModule.controller('adminController', [
+'$rootScope', '$scope', '$http', '$q', '$common', '$confirm', '$state', 
'User',
+function ($rootScope, $scope, $http, $q, $common, $confirm, $state, User) {
+$scope.users = null;
 
-function reload() {
-$http.post('/api/v1/admin/list')
-.success(function (data) {
-$scope.users = data;
+function reload() {
+$http.post('/api/v1/admin/list')
+.success(function (data) {
+$scope.users = data;
 
-_.forEach($scope.users, function(user) {
-user.label = user.username + ' ' + user.email + ' ' +
-(user.company || '') + ' ' + (user.country || '') + ' 
' + user.lastLogin;
+_.forEach($scope.users, function(user) {
+user.userName = user.firstName + ' ' + user.lastName;
+
+user.label = user.userName + ' ' + user.email + ' ' +
+(user.company || '') + ' ' + (user.country || '');
+})
 })
-})
-.error(function (errMsg) {
-$common.showError($common.errorMessage(errMsg));
-});
-}
+.error(function (errMsg) {
+$common.showError($common.errorMessage(errMsg));
+});
+}
 
-reload();
+reload();
 
-$scope.becomeUser = function (user) {
-$http
-.get('/api/v1/admin/become', { params: {viewedUserId: user._id}})
-.then(User.read)
-.then(function (user) {
-$rootScope.$broadcast('user', user);
+$scope.becomeUser = function (user) {
+$http
+.get('/api/v1/admin/become', { params: {viewedUserId: 
user._id}})
+.then(User.read)
+.then(function (user) {
+$rootScope.$broadcast('user', user);
 
-$state.go('base.configuration.clusters')
-})
-.catch(function (errMsg) {
-$common.showError($common.errorMessage(errMsg));
-});
-};
+$state.go('base.configuration.clusters')
+})
+.catch(function (errMsg) {
+$common.showError($common.errorMessage(errMsg));
+});
+};
 
-$scope.removeUser = function (user) {
-$confirm.confirm('Are you sure you want to remove user: "' + 
user.username + '"?')
-.then(function () {
-$http.post('/api/v1/admin/remove', {userId: user._id}).success(
-function () {
-var i = _.findIndex($scope.users, function (u) {
-   

[01/50] [abbrv] ignite git commit: IGNITE-843 Fixed validator for java classes.

[anovikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-2875 [created] 692567187


IGNITE-843 Fixed validator for java classes.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ec3150d1
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ec3150d1
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ec3150d1

Branch: refs/heads/ignite-2875
Commit: ec3150d11fe9439d3e6264ac17867f20e36c4ec1
Parents: 703ec28
Author: Alexey Kuznetsov 
Authored: Thu Mar 17 17:31:33 2016 +0700
Committer: Alexey Kuznetsov 
Committed: Thu Mar 17 17:31:33 2016 +0700

--
 .../form-field-java-class/form-field-java-class.directive.js  | 7 ---
 1 file changed, 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/ec3150d1/modules/control-center-web/src/main/js/app/directives/form-field-java-class/form-field-java-class.directive.js
--
diff --git 
a/modules/control-center-web/src/main/js/app/directives/form-field-java-class/form-field-java-class.directive.js
 
b/modules/control-center-web/src/main/js/app/directives/form-field-java-class/form-field-java-class.directive.js
index 2c2840e..8c857f0 100644
--- 
a/modules/control-center-web/src/main/js/app/directives/form-field-java-class/form-field-java-class.directive.js
+++ 
b/modules/control-center-web/src/main/js/app/directives/form-field-java-class/form-field-java-class.directive.js
@@ -51,13 +51,6 @@ export default ['igniteFormFieldJavaClass', 
['IgniteFormGUID', (guid) => {
 ngModel.$setDirty();
 else
 ngModel.$setPristine();
-
-setTimeout(() => {
-if (ngModel.$valid)
-
el.find('input').addClass('ng-valid').removeClass('ng-invalid');
-else
-
el.find('input').removeClass('ng-valid').addClass('ng-invalid');
-}, 100); // Use setTimeout() workaround of problem of two 
controllers.
 };
 
 ngModel.$render = function() {

[41/50] [abbrv] ignite git commit: IGNITE-843 Minor fix.

[anovikov]

IGNITE-843 Minor fix.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e7dd8467
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e7dd8467
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e7dd8467

Branch: refs/heads/ignite-2875
Commit: e7dd8467df032c6aff3285c60ecef4a500201da1
Parents: c9a39bc
Author: Andrey 
Authored: Fri Mar 25 13:32:46 2016 +0700
Committer: Andrey 
Committed: Fri Mar 25 13:32:46 2016 +0700

--
 .../control-center-web/src/main/js/views/settings/profile.jade   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/e7dd8467/modules/control-center-web/src/main/js/views/settings/profile.jade
--
diff --git a/modules/control-center-web/src/main/js/views/settings/profile.jade 
b/modules/control-center-web/src/main/js/views/settings/profile.jade
index df8fd7d..f36f0b4 100644
--- a/modules/control-center-web/src/main/js/views/settings/profile.jade
+++ b/modules/control-center-web/src/main/js/views/settings/profile.jade
@@ -50,7 +50,7 @@ mixin lbl(txt)
 i.fa(
 ng-click='expandedToken = !expandedToken'
 ng-class='expandedToken ? "fa-chevron-circle-down" 
: "fa-chevron-circle-right"')
-a(ng-click='expandedToken = !expandedToken') 
{{expandedToken ? 'Hide security token...' : 'Show security token...'}}
+a(ng-click='expandedToken = !expandedToken') 
{{expandedToken ? 'Cancel security token changing...' : 'Show security 
token...'}}
 div(ng-show='expandedToken')
 +lbl('Security token:')
 label {{user.token}}
@@ -63,7 +63,7 @@ mixin lbl(txt)
 ng-click='expandedPassword = !expandedPassword'
 ng-class='expandedPassword ? 
"fa-chevron-circle-down" : "fa-chevron-circle-right"')
 a(ng-click='expandedPassword = !expandedPassword') 
{{expandedPassword ? 'Cancel password changing...' : 'Change password...'}}
-div(ng-show='expandedPassword')
+div(ng-if='expandedPassword')
 .details-row
 +lbl('New password:')
 .col-xs-5.col-sm-4

[09/50] [abbrv] ignite git commit: IGNITE-2597 Refactored to websockets.

[anovikov]

IGNITE-2597 Refactored to websockets.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/706317f3
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/706317f3
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/706317f3

Branch: refs/heads/ignite-2875
Commit: 706317f3d12989883a1c199797a74a49670f94aa
Parents: 2cf28fe
Author: Andrey 
Authored: Fri Mar 18 15:48:01 2016 +0700
Committer: Andrey 
Committed: Fri Mar 18 15:48:01 2016 +0700

--
 .../assembly/release-control-center-agent.xml   |   7 -
 modules/control-center-agent/pom.xml|  45 +-
 .../console/agent/AgentConfiguration.java   |  31 +-
 .../ignite/console/agent/AgentLauncher.java | 235 --
 .../ignite/console/agent/AgentSocket.java   | 190 
 .../apache/ignite/console/agent/AgentUtils.java |   8 +-
 .../console/agent/handlers/AbstractHandler.java | 102 +
 .../console/agent/handlers/DatabaseHandler.java | 298 +
 .../handlers/DatabaseMetadataExtractor.java | 205 -
 .../console/agent/handlers/RestExecutor.java| 225 --
 .../console/agent/handlers/RestHandler.java | 274 
 .../ignite/console/agent/remote/Remote.java |  37 --
 .../console/agent/remote/RemoteHandler.java | 246 ---
 .../console/agent/remote/WebSocketSender.java   |  39 --
 .../ignite/console/demo/AgentMetadataDemo.java  |  24 +-
 .../ignite/console/demo/AgentSqlDemo.java   | 101 +++--
 .../control-center-web/src/main/js/.eslintrc|   1 +
 .../control-center-web/src/main/js/.gitignore   |   5 +-
 .../src/main/js/app/data/colors.json|  22 +
 .../src/main/js/app/decorator/select.js |  55 ++-
 .../control-center-web/src/main/js/app/index.js |  37 +-
 .../js/app/services/AgentMonitor.service.js | 286 
 .../main/js/app/services/ChartColors.service.js |  22 +
 .../main/js/app/services/Countries.service.js   |  23 +
 .../app/services/Countries/Countries.service.js |  23 -
 .../src/main/js/app/services/cleanup.service.js |  62 +++
 .../js/app/services/cleanup/cleanup.service.js  |  62 ---
 .../control-center-web/src/main/js/config.js|  22 +-
 .../src/main/js/controllers/common-module.js| 201 +
 .../main/js/controllers/domains-controller.js   | 146 +++
 .../src/main/js/controllers/sql-controller.js   | 434 ++-
 .../src/main/js/gulpfile.js/tasks/bundle.js |  12 +-
 .../main/js/gulpfile.js/tasks/inject-plugins.js |   3 +-
 .../control-center-web/src/main/js/package.json |  39 +-
 modules/control-center-web/src/main/js/serve.js |  28 +-
 .../src/main/js/serve/agent.js  | 354 +--
 .../src/main/js/serve/agent_dists/README.txt|   7 +
 .../control-center-web/src/main/js/serve/app.js |  17 +-
 .../src/main/js/serve/config/default.json   |  26 --
 .../main/js/serve/config/settings.json.sample   |  26 ++
 .../src/main/js/serve/configure.js  |  72 +--
 .../control-center-web/src/main/js/serve/io.js  | 242 +++
 .../src/main/js/serve/mail.js   |   5 +-
 .../src/main/js/serve/routes/agent.js   | 307 ++---
 .../src/main/js/serve/routes/profile.js |  15 +-
 .../src/main/js/serve/routes/public.js  |  64 ++-
 .../src/main/js/serve/settings.js   |  11 +-
 .../src/main/js/views/includes/controls.jade|   2 +-
 .../main/js/views/templates/agent-download.jade |  11 +-
 .../src/main/js/views/templates/select.jade |   4 +-
 .../src/test/js/routes/agent.js |  10 +-
 51 files changed, 2462 insertions(+), 2261 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/706317f3/modules/control-center-agent/assembly/release-control-center-agent.xml
--
diff --git 
a/modules/control-center-agent/assembly/release-control-center-agent.xml 
b/modules/control-center-agent/assembly/release-control-center-agent.xml
index 90a9415..eb7da95 100644
--- a/modules/control-center-agent/assembly/release-control-center-agent.xml
+++ b/modules/control-center-agent/assembly/release-control-center-agent.xml
@@ -28,13 +28,6 @@
 
 
 
-${basedir}/../indexing/target/libs
-/jdbc-drivers
-
-**/h2-*.jar
-
-
-
 ${basedir}
 /
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/706317f3/modules/control-center-agent/pom.xml
--
diff --git a/modules/control-center-agent/pom.xml 
b/modules/control-center-agent/pom.xml
index 2fe8844..9bee2a2 100644
--- a/modules/control-center-agent/pom.xml
+++ b/modules/control-center-agent/pom.xml
@@ -34,26 +34,20 @@

[27/50] [abbrv] ignite git commit: IGNITE-843 Fixed validation and code format.

[anovikov]

IGNITE-843 Fixed validation and code format.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/625dcefa
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/625dcefa
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/625dcefa

Branch: refs/heads/ignite-2875
Commit: 625dcefa777e95abf87adbbb8ddbd5c2d20cd11b
Parents: f8a690e
Author: Alexey Kuznetsov 
Authored: Tue Mar 22 14:56:02 2016 +0700
Committer: Alexey Kuznetsov 
Committed: Tue Mar 22 14:56:02 2016 +0700

--
 .../form-field-java-class.directive.js  |  9 +++
 .../src/main/js/app/helpers/jade/mixins.jade| 64 +---
 .../js/app/modules/form/field/input/number.jade | 20 +++---
 .../modules/form/field/input/text.directive.js  | 19 +++---
 .../js/app/modules/form/field/input/text.jade   | 16 +++--
 .../js/app/modules/form/group/add.directive.js  |  4 +-
 .../form/validator/property-unique.directive.js |  5 +-
 .../configuration/caches/concurrency.jade   |  2 +-
 .../states/configuration/caches/general.jade|  2 +-
 .../states/configuration/caches/memory.jade |  2 +-
 .../states/configuration/caches/query.jade  | 30 -
 .../states/configuration/caches/rebalance.jade  |  2 +-
 .../configuration/caches/server-near-cache.jade |  6 +-
 .../states/configuration/caches/statistics.jade |  2 +-
 .../states/configuration/caches/store.jade  | 57 -
 .../states/configuration/clusters/atomic.jade   |  2 +-
 .../states/configuration/clusters/binary.jade   |  4 +-
 .../configuration/clusters/communication.jade   |  4 +-
 .../configuration/clusters/connector.jade   |  6 +-
 .../configuration/clusters/deployment.jade  | 49 ---
 .../configuration/clusters/discovery.jade   |  2 +-
 .../states/configuration/clusters/events.jade   |  2 +-
 .../states/configuration/clusters/general.jade  |  2 +-
 .../clusters/general/discovery/cloud.jade   | 50 ---
 .../clusters/general/discovery/google.jade  |  2 +-
 .../clusters/general/discovery/jdbc.jade|  2 +-
 .../clusters/general/discovery/multicast.jade   | 30 -
 .../clusters/general/discovery/s3.jade  |  2 +-
 .../clusters/general/discovery/shared.jade  |  2 +-
 .../clusters/general/discovery/vm.jade  | 30 -
 .../clusters/general/discovery/zookeeper.jade   |  2 +-
 .../bounded-exponential-backoff.jade|  2 +-
 .../discovery/zookeeper/retrypolicy/custom.jade |  2 +-
 .../retrypolicy/exponential-backoff.jade|  2 +-
 .../zookeeper/retrypolicy/forever.jade  |  2 +-
 .../zookeeper/retrypolicy/n-times.jade  |  2 +-
 .../zookeeper/retrypolicy/one-time.jade |  2 +-
 .../zookeeper/retrypolicy/until-elapsed.jade|  2 +-
 .../states/configuration/clusters/igfs.jade |  2 +-
 .../configuration/clusters/marshaller.jade  |  6 +-
 .../states/configuration/clusters/metrics.jade  |  2 +-
 .../states/configuration/clusters/ssl.jade  | 32 +-
 .../states/configuration/clusters/swap.jade |  6 +-
 .../states/configuration/clusters/thread.jade   |  2 +-
 .../states/configuration/clusters/time.jade |  2 +-
 .../configuration/clusters/transactions.jade|  2 +-
 .../main/js/controllers/caches-controller.js| 24 
 .../main/js/controllers/clusters-controller.js  | 44 +++---
 .../main/js/views/configuration/summary.jade|  4 +-
 .../src/main/js/views/includes/controls.jade| 34 +--
 50 files changed, 311 insertions(+), 294 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/625dcefa/modules/control-center-web/src/main/js/app/directives/form-field-java-class/form-field-java-class.directive.js
--
diff --git 
a/modules/control-center-web/src/main/js/app/directives/form-field-java-class/form-field-java-class.directive.js
 
b/modules/control-center-web/src/main/js/app/directives/form-field-java-class/form-field-java-class.directive.js
index f1f66c9..7e13b73 100644
--- 
a/modules/control-center-web/src/main/js/app/directives/form-field-java-class/form-field-java-class.directive.js
+++ 
b/modules/control-center-web/src/main/js/app/directives/form-field-java-class/form-field-java-class.directive.js
@@ -45,6 +45,13 @@ export default ['igniteFormFieldJavaClass', 
['IgniteFormGUID', (guid) => {
 scope.$watch(() => form.$pristine, setAsDefault);
 scope.$watch('value', setAsDefault);
 
+const checkValid = () => {
+if (ngModel.$valid)
+
el.find('input').addClass('ng-valid').removeClass('ng-invalid');
+else
+
el.find('input').removeClass('ng-valid').addClass('ng-invalid');
+};
+
 scope.ngChange = function() {
 ngModel.

[11/50] [abbrv] ignite git commit: IGNITE-843 Minor fix.

[anovikov]

IGNITE-843 Minor fix.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1b58bbce
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1b58bbce
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1b58bbce

Branch: refs/heads/ignite-2875
Commit: 1b58bbcee137432beb46d27c4344fd8e6b96c474
Parents: a8921c6
Author: Andrey 
Authored: Mon Mar 21 10:25:12 2016 +0700
Committer: Andrey 
Committed: Mon Mar 21 10:25:12 2016 +0700

--
 modules/control-center-web/src/main/js/views/index.jade | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/1b58bbce/modules/control-center-web/src/main/js/views/index.jade
--
diff --git a/modules/control-center-web/src/main/js/views/index.jade 
b/modules/control-center-web/src/main/js/views/index.jade
index 0eef7a7..c62fb1b 100644
--- a/modules/control-center-web/src/main/js/views/index.jade
+++ b/modules/control-center-web/src/main/js/views/index.jade
@@ -25,6 +25,7 @@ html(ng-app='ignite-web-console' id='app')
 
 title(ng-bind='$meta.title')
 
+meta(name='fragment' content='!')
 meta(name='description' content='{{$meta.description}}')
 meta(name='keywords' content='{{$meta.keywords}}')
 meta(ng-repeat='(key, value) in $meta.properties' name='{{::key}}' 
content='{{::value}}')

[49/50] [abbrv] ignite git commit: Merge branch 'web-console-staging' of https://github.com/gridgain/apache-ignite into ignite-2875

[anovikov]

Merge branch 'web-console-staging' of https://github.com/gridgain/apache-ignite 
into ignite-2875


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f374d011
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f374d011
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f374d011

Branch: refs/heads/ignite-2875
Commit: f374d0110790dae5bc2297029be42823a7246a2b
Parents: 84f7557 cadbc5f
Author: Andrey 
Authored: Mon Mar 28 08:42:06 2016 +0700
Committer: Andrey 
Committed: Mon Mar 28 08:42:06 2016 +0700

--
 .../form-field-java-class.directive.js  | 10 +++---
 .../src/main/js/app/helpers/jade/mixins.jade| 38 ++--
 .../modules/form/field/input/text.directive.js  | 10 +++---
 .../js/app/modules/form/field/input/text.jade   |  1 -
 .../configuration/clusters/communication.jade   |  7 ++--
 .../configuration/clusters/connector.jade   |  7 ++--
 .../configuration/clusters/discovery.jade   |  7 ++--
 .../states/configuration/clusters/general.jade  |  7 ++--
 .../clusters/general/discovery/multicast.jade   | 12 +--
 .../clusters/general/discovery/vm.jade  |  4 +++
 .../modules/states/configuration/igfs/ipc.jade  |  7 ++--
 11 files changed, 64 insertions(+), 46 deletions(-)
--

[04/50] [abbrv] ignite git commit: IGNITE-843 fixed tooltip

[anovikov]

IGNITE-843 fixed tooltip


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/aec0f596
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/aec0f596
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/aec0f596

Branch: refs/heads/ignite-2875
Commit: aec0f596658d66f3057c1daf00821677510ce83d
Parents: ad921af
Author: Dmitriyff 
Authored: Thu Mar 17 18:35:04 2016 +0700
Committer: Dmitriyff 
Committed: Thu Mar 17 18:35:04 2016 +0700

--
 .../src/main/js/app/modules/form/field/tooltip.directive.js | 5 +++--
 .../src/main/js/app/modules/form/group/tooltip.directive.js | 4 ++--
 .../states/configuration/clusters/general/discovery/vm.jade | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/aec0f596/modules/control-center-web/src/main/js/app/modules/form/field/tooltip.directive.js
--
diff --git 
a/modules/control-center-web/src/main/js/app/modules/form/field/tooltip.directive.js
 
b/modules/control-center-web/src/main/js/app/modules/form/field/tooltip.directive.js
index 4fc9ef9..e24df9c 100644
--- 
a/modules/control-center-web/src/main/js/app/modules/form/field/tooltip.directive.js
+++ 
b/modules/control-center-web/src/main/js/app/modules/form/field/tooltip.directive.js
@@ -19,8 +19,9 @@ const template = ``;
 
 export default ['igniteFormFieldTooltip', ['$tooltip', ($tooltip) => {
 const link = ($scope, $element, $attrs, [form, field], $transclude) => {
-const content = Array.prototype.slice.apply($transclude($scope))
-.reduce((html, el) => html += el.outerHTML, '');
+const content = Array.prototype.slice
+.apply($transclude($scope))
+.reduce((html, el) => html += el.outerHTML || el.textContent || 
el, '');
 
 $tooltip($element, { title: content });
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/aec0f596/modules/control-center-web/src/main/js/app/modules/form/group/tooltip.directive.js
--
diff --git 
a/modules/control-center-web/src/main/js/app/modules/form/group/tooltip.directive.js
 
b/modules/control-center-web/src/main/js/app/modules/form/group/tooltip.directive.js
index 5af8fb1..fa87ba7 100644
--- 
a/modules/control-center-web/src/main/js/app/modules/form/group/tooltip.directive.js
+++ 
b/modules/control-center-web/src/main/js/app/modules/form/group/tooltip.directive.js
@@ -20,8 +20,8 @@ const template = ``;
 export default ['igniteFormGroupTooltip', ['$tooltip', ($tooltip) => {
 const link = ($scope, $element, $attrs, $ctrls, $transclude) => {
 const content = Array.prototype.slice
-.apply($transclude($scope))
-.reduce((html, el) => html += el.outerHTML, '');
+.apply($transclude($scope))
+.reduce((html, el) => html += el.outerHTML || el.textContent || 
el, '');
 
 $tooltip($element, { title: content });
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/aec0f596/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/general/discovery/vm.jade
--
diff --git 
a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/general/discovery/vm.jade
 
b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/general/discovery/vm.jade
index 05c17ba..a0071e6 100644
--- 
a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/general/discovery/vm.jade
+++ 
b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/general/discovery/vm.jade
@@ -71,7 +71,7 @@ mixin addressFeedbackRequired(field)
 ignite-form-field-label
 | Addresses
 ignite-form-group-tooltip
-| Addresses may be represented as follows:#[br]
+| Addresses may be represented as follows:
 ul: li IP address (e.g. 127.0.0.1, 9.9.9.9, etc)
 li IP address and port (e.g. 127.0.0.1:47500, 9.9.9.9:47501, 
etc)
 li IP address and port range (e.g. 127.0.0.1:47500..47510, 
9.9.9.9:47501..47504, etc)
@@ -79,7 +79,7 @@ mixin addressFeedbackRequired(field)
 li Hostname and port (e.g. host1.com:47500, host2:47502, etc)
 li Hostname and port range (e.g. host1.com:47500..47510, 
host2:47502..47508, etc)
 | If port is 0 or not provided then default port will be used 
(depends on discovery SPI configuration)#[br]
-| If port range is provided (e.g. host:port1..port2) the following 
should be considered:#[br]
+| If port range is provided (e.g. host:port1..port2) the following 
shou

[23/50] [abbrv] ignite git commit: IGNITE-2840 Refactoring to mixins.

[anovikov]

http://git-wip-us.apache.org/repos/asf/ignite/blob/f8a690ec/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper.jade
--
diff --git 
a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper.jade
 
b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper.jade
index 1aca477..4e11cc6 100644
--- 
a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper.jade
+++ 
b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper.jade
@@ -14,65 +14,42 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 
+include ../../../../../../../app/helpers/jade/mixins.jade
+
 - var model = 'backupItem.discovery.ZooKeeper';
 
 div
 .details-row
-ignite-form-field
-ignite-form-field-label
-| Curator:
-ignite-form-field-tooltip
-| The Curator framework in use #[br]
-| By default generates curator of org.apache.curator. 
framework.imps.CuratorFrameworkImpl
-| class with configured connect string, retry policy, and 
default session and connection timeouts
-ignite-form-field-java-class(
-data-id='curator'
-data-name='curator'
-data-ng-model='#{model}.curator'
-)
++java-class('Curator:', model + '.curator', 'curator', 'true', 'false',
+'The Curator framework in use\
+By default generates curator of org.apache.curator. 
framework.imps.CuratorFrameworkImpl\
+class with configured connect string, retry policy, and default 
session and connection timeouts')
 .details-row
-ignite-form-field
-ignite-form-field-label
-| Connect string:
-ignite-form-field-tooltip
-| When "IGNITE_ZK_CONNECTION_STRING" system property is not 
configured this property will be used
-ignite-form-field-input-text(
-data-id='zkConnectionString'
-data-name='zkConnectionString'
-data-ng-model='#{model}.zkConnectionString'
-data-placeholder='host:port[chroot][,host:port[chroot]]'
-data-ng-required='true'
-)
++text('Connect string:', model + '.zkConnectionString', 
'zkConnectionString', 'true', 'host:port[chroot][,host:port[chroot]]',
+'When "IGNITE_ZK_CONNECTION_STRING" system property is not 
configured this property will be used')
 .details-row
-ignite-form-field
-ignite-form-field-label
-| Retry policy:
-ignite-form-field-tooltip
-| Available retry policies:
-ul: li Exponential backoff - retries a set number of times 
with increasing sleep time between retries
-   li Bounded exponential backoff - retries a set number of 
times with an increasing (up to a maximum bound) sleep time between retries
-li Until elapsed - retries until a given amount of time 
elapses
-li Max number of times - retries a max number of times
-li Only once - retries only once
-li Always allow retry - retries infinitely
-li Custom - custom retry policy implementation
-li Default - exponential backoff retry policy with 
configured base sleep time equal to 1000ms and max retry count equal to 10
-ignite-form-field-dropdown(
-data-id='retryPolicy'
-data-name='retryPolicy'
-data-options='[\
-{value: "ExponentialBackoff", label: "Exponential 
backoff"},\
-{value: "BoundedExponentialBackoff", label: "Bounded 
exponential backoff"},\
-{value: "UntilElapsed", label: "Until elapsed"},\
-{value: "NTimes", label: "Max number of times"},\
-{value: "OneTime", label: "Only once"},\
-{value: "Forever", label: "Always allow retry"},\
-{value: "Custom", label: "Custom"},\
-{value: undefined, label: "Default"}\
-]'
-data-ng-model='#{model}.retryPolicy.kind'
-data-multiple='false'
-)
++dropdown('Retry policy:', model + '.retryPolicy.kind', 'retryPolicy', 
'true', 'Default',
+'[\
+{value: "ExponentialBackoff", label: "Exponential backoff"},\
+{value: "BoundedExponentialBackoff", label: "Bounded 
exponential backoff"},\
+{value: "UntilElapsed", label: "Until elapsed"},\
+

[30/50] [abbrv] ignite git commit: Merge remote-tracking branch 'community/web-console-staging' into web-console-staging

[anovikov]

Merge remote-tracking branch 'community/web-console-staging' into 
web-console-staging


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/767529b2
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/767529b2
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/767529b2

Branch: refs/heads/ignite-2875
Commit: 767529b20606609770078d5d10f3ffdcc86bff0a
Parents: 3262283 1e2ba1d
Author: Andrey 
Authored: Wed Mar 23 08:53:57 2016 +0700
Committer: Andrey 
Committed: Wed Mar 23 08:53:57 2016 +0700

--
 .../states/configuration/clusters/deployment.jade   |  2 +-
 .../modules/states/configuration/clusters/ssl.jade  |  2 +-
 .../modules/states/configuration/clusters/swap.jade |  2 +-
 .../states/configuration/clusters/thread.jade   |  2 +-
 .../states/configuration/clusters/transactions.jade |  2 +-
 .../src/main/js/controllers/caches-controller.js| 16 +---
 .../src/main/js/controllers/clusters-controller.js  | 15 ++-
 .../src/main/js/controllers/common-module.js|  3 +++
 8 files changed, 31 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/767529b2/modules/control-center-web/src/main/js/controllers/caches-controller.js
--

http://git-wip-us.apache.org/repos/asf/ignite/blob/767529b2/modules/control-center-web/src/main/js/controllers/clusters-controller.js
--

http://git-wip-us.apache.org/repos/asf/ignite/blob/767529b2/modules/control-center-web/src/main/js/controllers/common-module.js
--

[14/50] [abbrv] ignite git commit: IGNITE-843 Removed signin from url. (cherry picked from commit 78eb5aa)

[anovikov]

IGNITE-843 Removed signin from url.
(cherry picked from commit 78eb5aa)


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b20a6936
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b20a6936
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b20a6936

Branch: refs/heads/ignite-2875
Commit: b20a6936d838ce3632f4844cfd63bd8374f5c7ed
Parents: 29e9356
Author: Andrey 
Authored: Fri Mar 11 10:43:38 2016 +0700
Committer: Andrey 
Committed: Mon Mar 21 15:34:00 2016 +0700

--
 modules/control-center-web/src/main/js/app/index.js   | 3 +--
 .../src/main/js/app/modules/states/signin.state.js| 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/b20a6936/modules/control-center-web/src/main/js/app/index.js
--
diff --git a/modules/control-center-web/src/main/js/app/index.js 
b/modules/control-center-web/src/main/js/app/index.js
index ca9bf62..f959d2d 100644
--- a/modules/control-center-web/src/main/js/app/index.js
+++ b/modules/control-center-web/src/main/js/app/index.js
@@ -165,8 +165,7 @@ angular
 templateUrl: '/base.html'
 });
 
-$urlRouterProvider.when('/', '/signin');
-$urlRouterProvider.otherwise('/signin');
+$urlRouterProvider.otherwise('/');
 
 $locationProvider.html5Mode(true);
 }])

http://git-wip-us.apache.org/repos/asf/ignite/blob/b20a6936/modules/control-center-web/src/main/js/app/modules/states/signin.state.js
--
diff --git 
a/modules/control-center-web/src/main/js/app/modules/states/signin.state.js 
b/modules/control-center-web/src/main/js/app/modules/states/signin.state.js
index 96ff967..ba14be6 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/signin.state.js
+++ b/modules/control-center-web/src/main/js/app/modules/states/signin.state.js
@@ -27,7 +27,7 @@ angular
 // set up the states
 $stateProvider
 .state('signin', {
-url: '/signin',
+url: '/',
 templateUrl: '/signin.html',
 metaTags: {
 title: 'Management Tool and Configuration Wizard for Apache Ignite'

[21/50] [abbrv] ignite git commit: IGNITE-843 Merge with web-console-production.

[anovikov]

IGNITE-843 Merge with web-console-production.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/94632f28
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/94632f28
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/94632f28

Branch: refs/heads/ignite-2875
Commit: 94632f288e462279d6c5ebc4dea78083809bffc1
Parents: 767a2eb c4596e9
Author: Andrey 
Authored: Mon Mar 21 17:15:20 2016 +0700
Committer: Andrey 
Committed: Mon Mar 21 17:15:20 2016 +0700

--
 .../src/main/js/app/modules/states/signin.state.js   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--

[32/50] [abbrv] ignite git commit: IGNITE-843 Fixed table mixins and added workaround for not escaping of "&&" to "& & ".

[anovikov]

IGNITE-843 Fixed table mixins and added workaround for not escaping of "&&" to 
"&&".


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/63819d66
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/63819d66
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/63819d66

Branch: refs/heads/ignite-2875
Commit: 63819d66efa202670b7bb4ab6169646e5b3b9c52
Parents: 1c3c17c
Author: Alexey Kuznetsov 
Authored: Wed Mar 23 12:09:48 2016 +0700
Committer: Alexey Kuznetsov 
Committed: Wed Mar 23 12:09:48 2016 +0700

--
 .../src/main/js/app/helpers/jade/mixins.jade| 45 
 .../src/main/js/app/modules/ace.module.js   |  2 +-
 .../states/configuration/caches/query.jade  |  8 ++--
 .../states/configuration/caches/store.jade  | 14 +++---
 .../configuration/clusters/deployment.jade  | 16 +++
 .../clusters/general/discovery/cloud.jade   | 16 +++
 .../clusters/general/discovery/multicast.jade   |  8 ++--
 .../clusters/general/discovery/vm.jade  |  8 ++--
 .../states/configuration/clusters/ssl.jade  |  8 ++--
 9 files changed, 67 insertions(+), 58 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/63819d66/modules/control-center-web/src/main/js/app/helpers/jade/mixins.jade
--
diff --git 
a/modules/control-center-web/src/main/js/app/helpers/jade/mixins.jade 
b/modules/control-center-web/src/main/js/app/helpers/jade/mixins.jade
index ed6083d..abe08a3 100644
--- a/modules/control-center-web/src/main/js/app/helpers/jade/mixins.jade
+++ b/modules/control-center-web/src/main/js/app/helpers/jade/mixins.jade
@@ -188,8 +188,8 @@ mixin dropdown-multiple(lbl, model, name, placeholder, 
placeholderEmpty, options
 data-disabled='!#{options}.length'
 )
 
-//- Mixin for table java class field.
-mixin table-java-class-field(field, items, save, newItem)
+//- Mixin for table text field.
+mixin table-text-field(field, items, valid, save, placeholder, newItem)
 -var resetOnEnter = newItem ? '(stopblur = true) && (group.add = [{}])' : 
'(field.edit = false)'
 -var onEnter = valid + ' && (' + save + '); ' + valid + ' && ' + 
resetOnEnter + ';'
 
@@ -198,10 +198,11 @@ mixin table-java-class-field(field, items, save, newItem)
 -var resetOnBlur = (newItem ? '!stopblur && (group.add = [])' : 
'field.edit = false')
 -var onBlur = valid + ' && ( ' + save + '); ' + resetOnBlur + ';'
 
-ignite-form-field-java-class(
+ignite-form-field-input-text(
 data-name=field
 data-ng-model=field
 data-ng-required='true'
+data-placeholder=placeholder
 data-ignite-unique=items
 data-ignite-form-field-input-autofocus='true'
 on-enter=onEnter
@@ -210,8 +211,8 @@ mixin table-java-class-field(field, items, save, newItem)
 )
 block
 
-//- Mixin for table java package field.
-mixin table-java-package-field(field, items, save, newItem)
+//- Mixin for table java class field.
+mixin table-java-class-field(field, items, valid, save, newItem)
 -var resetOnEnter = newItem ? '(stopblur = true) && (group.add = [{}])' : 
'(field.edit = false)'
 -var onEnter = valid + ' && (' + save + '); ' + valid + ' && ' + 
resetOnEnter + ';'
 
@@ -220,13 +221,10 @@ mixin table-java-package-field(field, items, save, 
newItem)
 -var resetOnBlur = (newItem ? '!stopblur && (group.add = [])' : 
'field.edit = false')
 -var onBlur = valid + ' && ( ' + save + '); ' + resetOnBlur + ';'
 
-ignite-form-field-input-text(
+ignite-form-field-java-class(
 data-name=field
 data-ng-model=field
 data-ng-required='true'
-data-placeholder='Enter package name'
-data-java-keywords='true'
-data-java-package-name='true'
 data-ignite-unique=items
 data-ignite-form-field-input-autofocus='true'
 on-enter=onEnter
@@ -235,8 +233,8 @@ mixin table-java-package-field(field, items, save, newItem)
 )
 block
 
-//- Mixin for table text field.
-mixin table-text-field(field, items, save, placeholder, newItem)
+//- Mixin for table java package field.
+mixin table-java-package-field(field, items, valid, save, newItem)
 -var resetOnEnter = newItem ? '(stopblur = true) && (group.add = [{}])' : 
'(field.edit = false)'
 -var onEnter = valid + ' && (' + save + '); ' + valid + ' && ' + 
resetOnEnter + ';'
 
@@ -249,7 +247,9 @@ mixin table-text-field(field, items, save, placeholder, 
newItem)
 data-name=field
 data-ng-model=field
 data-ng-required='true'
-data-placeholder=placeholder
+data-placeholder='Enter package name'
+data-java-keywords='true'
+data-java-package-name='true'
 data-ignite-unique=item

[37/50] [abbrv] ignite git commit: IGNITE-2875 WIP

[anovikov]

IGNITE-2875 WIP


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8e08764a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8e08764a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8e08764a

Branch: refs/heads/ignite-2875
Commit: 8e08764a1c8375c1ae452ecd5400b0bed54c97cb
Parents: 63819d6
Author: Andrey 
Authored: Fri Mar 25 12:44:35 2016 +0700
Committer: Andrey 
Committed: Fri Mar 25 12:44:35 2016 +0700

--
 .../src/main/js/serve/agent.js  | 265 ++-
 .../src/main/js/serve/browser.js|  17 +-
 2 files changed, 144 insertions(+), 138 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/8e08764a/modules/control-center-web/src/main/js/serve/agent.js
--
diff --git a/modules/control-center-web/src/main/js/serve/agent.js 
b/modules/control-center-web/src/main/js/serve/agent.js
index 9d4ca4c..2966d5c 100644
--- a/modules/control-center-web/src/main/js/serve/agent.js
+++ b/modules/control-center-web/src/main/js/serve/agent.js
@@ -30,6 +30,7 @@ module.exports = {
 /**
  * @param _
  * @param fs
+ * @param ws
  * @param path
  * @param JSZip
  * @param socketio
@@ -40,48 +41,40 @@ module.exports = {
  */
 module.exports.factory = function(_, ws, fs, path, JSZip, socketio, 
apacheIgnite, settings, mongo) {
 /**
- * Creates an instance of server for Ignite.
+ *
  */
-class AgentServer {
+class Command {
 /**
- * @this {AgentServer}
- * @param {Agent} agent Connected agent
- * @param {Boolean} demo Use demo node for request
+ * @param {Boolean} demo Is need run command on demo node.
+ * @param {String} name Command name.
  */
-constructor(agent, demo) {
-this._agent = agent;
-this._demo = !!demo;
+constructor(demo, name) {
+this._demo = demo;
+
+/**
+ * Command name.
+ * @type {String}
+ */
+this._name = name;
+
+/**
+ * Command parameters.
+ * @type {Array.}
+ */
+this._params = [];
 }
 
 /**
- * Run http request
- *
- * @this {AgentServer}
- * @param {cmd} cmd Command
- * @param {callback} callback on finish
+ * Add parameter to command.
+ * @param {string} key Parameter key.
+ * @param {Object} value Parameter value.
+ * @returns {Command}
  */
-runCommand(cmd, callback) {
-const params = {cmd: cmd.name()};
-
-for (const param of cmd._params)
-params[param.key] = param.value;
-
-let body;
-
-let headers;
-
-let method = 'GET';
+addParam(key, value) {
+this._params.push({key, value});
 
-if (cmd._isPost()) {
-body = cmd.postData();
-
-method = 'POST';
-
-headers = {JSONObject: 'application/json'};
-}
-
-this._agent.executeRest('ignite', params, this._demo, method, 
headers, body, callback);
-}
+return this;
+};
 }
 
 /**
@@ -99,42 +92,6 @@ module.exports.factory = function(_, ws, fs, path, JSZip, 
socketio, apacheIgnite
  * @private
  */
 this._socket = socket;
-
-/**
- * Executor for grid.
- *
- * @type {apacheIgnite.Ignite}
- * @private
- */
-this._cluster = new apacheIgnite.Ignite(new AgentServer(this));
-
-/**
- * Executor for demo node.
- *
- * @type {apacheIgnite.Ignite}
- * @private
- */
-this._demo = new apacheIgnite.Ignite(new AgentServer(this, true));
-}
-
-/**
- * Send message to agent.
- *
- * @param {String} event - Event name.
- * @param {Object} data - Transmitted data.
- * @returns {Promise}
- */
-_exec(event, data) {
-const self = this;
-
-return new Promise((resolve, reject) =>
-self._emit(event, data, (error, res) => {
-if (error)
-return reject(error);
-
-resolve(res);
-})
-);
 }
 
 /**
@@ -157,72 +114,63 @@ module.exports.factory = function(_, ws, fs, path, JSZip, 
socketio, apacheIgnite
 }
 
 /**
- * Execute rest request on node.
+ * Send message to agent.
  *
- * @param {String} uri - REST endpoint uri.
- * @param 

[42/50] [abbrv] ignite git commit: IGNITE-843 Minor fix.

[anovikov]

IGNITE-843 Minor fix.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1017ea84
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1017ea84
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1017ea84

Branch: refs/heads/ignite-2875
Commit: 1017ea846ab86866c0d50f5d377b376db307f421
Parents: e7dd846
Author: Andrey 
Authored: Fri Mar 25 14:18:39 2016 +0700
Committer: Andrey 
Committed: Fri Mar 25 14:18:39 2016 +0700

--
 modules/control-center-web/src/main/js/views/signin.jade | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/1017ea84/modules/control-center-web/src/main/js/views/signin.jade
--
diff --git a/modules/control-center-web/src/main/js/views/signin.jade 
b/modules/control-center-web/src/main/js/views/signin.jade
index 77fd8e2..f666dbe 100644
--- a/modules/control-center-web/src/main/js/views/signin.jade
+++ b/modules/control-center-web/src/main/js/views/signin.jade
@@ -56,11 +56,11 @@ header#header.header
 .settings-row(ng-show='action == "signup"')
 +lblRequired('Company:')
 .col-xs-9.col-md-8
-
input#company.form-control(enter-focus-next='country' type='text' 
ng-model='user_info.company' placeholder='Input company name' 
ng-required='action=="signup"')
+
input#company.form-control(enter-focus-next='country' type='search' 
ng-model='user_info.company' placeholder='Input company name' 
ng-required='action=="signup"')
 .settings-row(ng-show='action == "signup"')
 +lblRequired('Country:')
 .col-xs-9.col-md-8
-
button#country.select-toggle.form-control(bs-select bs-options='item for item 
in countries' enter-focus-next='user_password' type='text' 
ng-model='user_info.country' placeholder='Choose your country' 
ng-required='action=="signup"')
+
button#country.select-toggle.form-control(bs-select bs-options='item for item 
in countries' enter-focus-next='user_password' type='search' 
ng-model='user_info.country' placeholder='Choose your country' 
ng-required='action=="signup"')
 .settings-row(ng-show='action != 
"password/forgot"')
 +lblRequired('Password:')
 .col-xs-9.col-md-8

[33/50] [abbrv] ignite git commit: IGNITE-2676 Refactoring IGFS screen to Angular directives and JADE mixins.

[anovikov]

http://git-wip-us.apache.org/repos/asf/ignite/blob/6cd972a1/modules/control-center-web/src/main/js/controllers/igfs-controller.js
--
diff --git 
a/modules/control-center-web/src/main/js/controllers/igfs-controller.js 
b/modules/control-center-web/src/main/js/controllers/igfs-controller.js
index b32b606..553fd4c 100644
--- a/modules/control-center-web/src/main/js/controllers/igfs-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/igfs-controller.js
@@ -17,102 +17,38 @@
 
 // Controller for IGFS screen.
 consoleModule.controller('igfsController', [
-'$scope', '$http', '$state', '$filter', '$timeout', '$common', '$focus', 
'$confirm', '$clone', '$table', '$preview', '$loading', '$unsavedChangesGuard',
-function ($scope, $http, $state, $filter, $timeout, $common, $focus, 
$confirm, $clone, $table, $preview, $loading, $unsavedChangesGuard) {
+'$scope', '$http', '$state', '$filter', '$timeout', '$common', '$confirm', 
'$clone', '$loading', '$cleanup', '$unsavedChangesGuard',
+function ($scope, $http, $state, $filter, $timeout, $common, $confirm, 
$clone, $loading, $cleanup, $unsavedChangesGuard) {
 $unsavedChangesGuard.install($scope);
 
+var emptyIgfs = {empty: true};
+
+var __original_value;
+
+var blank = {
+ipcEndpointConfiguration: {},
+secondaryFileSystem: {}
+};
+
+// We need to initialize backupItem with empty object in order to 
properly used from angular directives.
+$scope.backupItem = emptyIgfs;
+
 $scope.ui = $common.formUI();
+$scope.ui.angularWay = true; // TODO We need to distinguish refactored 
UI from legacy UI.
 $scope.ui.activePanels = [0];
 $scope.ui.topPanels = [0];
 
-$scope.joinTip = $common.joinTip;
-$scope.getModel = $common.getModel;
-$scope.javaBuiltInClasses = $common.javaBuiltInClasses;
 $scope.compactJavaName = $common.compactJavaName;
 $scope.widthIsSufficient = $common.widthIsSufficient;
 $scope.saveBtnTipText = $common.saveBtnTipText;
-$scope.panelExpanded = $common.panelExpanded;
-
-$scope.tableVisibleRow = $table.tableVisibleRow;
-
-$scope.tableSave = function (field, index, stopEdit) {
-switch (field.type) {
-case 'pathModes':
-if ($table.tablePairSaveVisible(field, index))
-return $table.tablePairSave($scope.tablePairValid, 
$scope.backupItem, field, index, stopEdit);
-
-break;
-}
-
-return true;
-};
-
-$scope.tableReset = function (save) {
-var field = $table.tableField();
-
-if (!save || !$common.isDefined(field) || $scope.tableSave(field, 
$table.tableEditedRowIndex(), true)) {
-$table.tableReset();
-
-return true;
-}
-
-return false;
-};
-
-$scope.tableNewItem = function (field) {
-if ($scope.tableReset(true))
-$table.tableNewItem(field);
-};
-
-$scope.tableNewItemActive = $table.tableNewItemActive;
-
-$scope.tableStartEdit = function (item, field, index) {
-if ($scope.tableReset(true))
-$table.tableStartEdit(item, field, index);
-};
-
-$scope.tableEditing = $table.tableEditing;
-
-$scope.tableRemove = function (item, field, index) {
-if ($scope.tableReset(true))
-$table.tableRemove(item, field, index);
-};
-
-$scope.tableSimpleSave = $table.tableSimpleSave;
-$scope.tableSimpleSaveVisible = $table.tableSimpleSaveVisible;
-
-$scope.tableSimpleUp = function (item, field, index) {
-if ($scope.tableReset(true))
-$table.tableSimpleUp(item, field, index);
-};
-
-$scope.tableSimpleDown = function (item, field, index) {
-if ($scope.tableReset(true))
-$table.tableSimpleDown(item, field, index);
-};
-
-$scope.tableSimpleDownVisible = $table.tableSimpleDownVisible;
-
-$scope.tablePairSave = $table.tablePairSave;
-$scope.tablePairSaveVisible = $table.tablePairSaveVisible;
-
-var previews = [];
-
-$scope.previewInit = function (preview) {
-previews.push(preview);
-
-$preview.previewInit(preview);
-};
-
-$scope.previewChanged = $preview.previewChanged;
-
-$scope.hidePopover = $common.hidePopover;
 
 var showPopoverMessage = $common.showPopoverMessage;
 
-$scope.igfsModes = $common.mkOptions(['PRIMARY', 'PROXY', 'DUAL_SYNC', 
'DUAL_ASYNC']);
+$scope.contentVisible = function () {
+var item = $scope.backupItem;
 
-$scope.ipcTypes = $common.mkOptions(['SHMEM', 'TCP']);
+return !item.empty && (!item._i

[22/50] [abbrv] ignite git commit: IGNITE-2840 Refactoring to mixins.

[anovikov]

http://git-wip-us.apache.org/repos/asf/ignite/blob/f8a690ec/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/transactions.jade
--
diff --git 
a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/transactions.jade
 
b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/transactions.jade
index b241e45..872b46c 100644
--- 
a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/transactions.jade
+++ 
b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/transactions.jade
@@ -14,6 +14,8 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 
+include ../../../../../app/helpers/jade/mixins.jade
+
 - var model = 'backupItem.transactionConfiguration'
 
 form.panel.panel-default(name='transactionConfiguration' novalidate)
@@ -27,95 +29,30 @@ form.panel.panel-default(name='transactionConfiguration' 
novalidate)
 .panel-body(ng-if='__show__')
 .col-sm-6
 .settings-row
-ignite-form-field
-ignite-form-field-label
-| Concurrency
-ignite-form-field-tooltip
-| Cache transaction concurrency to use when one is 
not explicitly specified
-ignite-form-field-dropdown(
-data-id='defaultTxConcurrency'
-data-name='defaultTxConcurrency'
-data-options='[\
-{value: "OPTIMISTIC", label: "OPTIMISTIC"},\
-{value: "PESSIMISTIC", label: "PESSIMISTIC"}\
-]'
-data-ng-model='#{model}.defaultTxConcurrency'
-data-placeholder='PESSIMISTIC'
-)
++dropdown('Concurrency:', model + '.defaultTxConcurrency', 
'defaultTxConcurrency', 'true', 'PESSIMISTIC',
+'[\
+{value: "OPTIMISTIC", label: "OPTIMISTIC"},\
+{value: "PESSIMISTIC", label: "PESSIMISTIC"}\
+]',
+'Cache transaction concurrency to use when one is not 
explicitly specified')
 .settings-row
-ignite-form-field
-ignite-form-field-label
-| Isolation
-ignite-form-field-tooltip
-| Default transaction isolation
-ignite-form-field-dropdown(
-data-id='defaultTxIsolation'
-data-name='defaultTxIsolation'
-data-options='[\
-{value: "READ_COMMITTED", label: 
"READ_COMMITTED"},\
-{value: "REPEATABLE_READ", label: 
"REPEATABLE_READ"},\
-{value: "SERIALIZABLE", label: "SERIALIZABLE"}\
-]'
-data-ng-model='#{model}.defaultTxIsolation'
-data-placeholder='REPEATABLE_READ'
-)
++dropdown('Isolation:', model + '.defaultTxIsolation', 
'defaultTxIsolation', 'true', 'REPEATABLE_READ',
+'[\
+{value: "READ_COMMITTED", label: 
"READ_COMMITTED"},\
+{value: "REPEATABLE_READ", label: 
"REPEATABLE_READ"},\
+{value: "SERIALIZABLE", label: "SERIALIZABLE"}\
+]',
+'Default transaction isolation')
 .settings-row
-ignite-form-field
-ignite-form-field-label
-| Default timeout
-ignite-form-field-tooltip
-| Default transaction timeout
-ignite-form-field-input-number(
-data-id='defaultTxTimeout'
-data-name='defaultTxTimeout'
-data-ng-model='#{model}.defaultTxTimeout'
-data-placeholder='0'
-)
++number('Default timeout:', model + '.defaultTxTimeout', 
'defaultTxTimeout', 'true', '0', '0', 'Default transaction timeout')
 .settings-row
-ignite-form-field
-ignite-form-field-label
-| Pessimistic log cleanup delay
-ignite-form-field-tooltip
-| Delay, in milliseconds, after which pessimistic 
recovery entries will be cleaned up fo

[16/50] [abbrv] ignite git commit: IGNITE-2597 Fixed typo. (cherry picked from commit a8921c6)

[anovikov]

IGNITE-2597 Fixed typo.
(cherry picked from commit a8921c6)


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a567d7f5
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a567d7f5
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a567d7f5

Branch: refs/heads/ignite-2875
Commit: a567d7f50031b1db55b4576c156770fde67cfce4
Parents: 922e3fc
Author: Alexey Kuznetsov 
Authored: Fri Mar 18 16:34:41 2016 +0700
Committer: Andrey 
Committed: Mon Mar 21 15:44:27 2016 +0700

--
 .../src/main/js/app/modules/user/Auth.service.js   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/a567d7f5/modules/control-center-web/src/main/js/app/modules/user/Auth.service.js
--
diff --git 
a/modules/control-center-web/src/main/js/app/modules/user/Auth.service.js 
b/modules/control-center-web/src/main/js/app/modules/user/Auth.service.js
index 55bae1c..8894148 100644
--- a/modules/control-center-web/src/main/js/app/modules/user/Auth.service.js
+++ b/modules/control-center-web/src/main/js/app/modules/user/Auth.service.js
@@ -56,7 +56,7 @@ export default ['Auth', ['$http', '$rootScope', '$state', 
'$common', 'IgniteGett
 } else
 $state.go('password.send');
 })
-.catch((errMsg) => $common.showPopoverMessage(null, null, 
'user_email', errMsg.data));
+.catch((errMsg) => $common.showPopoverMessage(null, null, 
'email', errMsg.data));
 },
 logout() {
 $http.post('/api/v1/logout')

[10/50] [abbrv] ignite git commit: IGNITE-2597 Fixed typo.

[anovikov]

IGNITE-2597 Fixed typo.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a8921c62
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a8921c62
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a8921c62

Branch: refs/heads/ignite-2875
Commit: a8921c621f9fe42f6850871b66ce48e25bc68fb6
Parents: 706317f
Author: Alexey Kuznetsov 
Authored: Fri Mar 18 16:34:41 2016 +0700
Committer: Alexey Kuznetsov 
Committed: Fri Mar 18 16:34:41 2016 +0700

--
 .../src/main/js/app/modules/user/Auth.service.js   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/a8921c62/modules/control-center-web/src/main/js/app/modules/user/Auth.service.js
--
diff --git 
a/modules/control-center-web/src/main/js/app/modules/user/Auth.service.js 
b/modules/control-center-web/src/main/js/app/modules/user/Auth.service.js
index 55bae1c..8894148 100644
--- a/modules/control-center-web/src/main/js/app/modules/user/Auth.service.js
+++ b/modules/control-center-web/src/main/js/app/modules/user/Auth.service.js
@@ -56,7 +56,7 @@ export default ['Auth', ['$http', '$rootScope', '$state', 
'$common', 'IgniteGett
 } else
 $state.go('password.send');
 })
-.catch((errMsg) => $common.showPopoverMessage(null, null, 
'user_email', errMsg.data));
+.catch((errMsg) => $common.showPopoverMessage(null, null, 
'email', errMsg.data));
 },
 logout() {
 $http.post('/api/v1/logout')

[07/50] [abbrv] ignite git commit: IGNITE-2597 Refactored to websockets.

[anovikov]

http://git-wip-us.apache.org/repos/asf/ignite/blob/706317f3/modules/control-center-web/src/main/js/controllers/sql-controller.js
--
diff --git 
a/modules/control-center-web/src/main/js/controllers/sql-controller.js 
b/modules/control-center-web/src/main/js/controllers/sql-controller.js
index 8336afd..dd712f8 100644
--- a/modules/control-center-web/src/main/js/controllers/sql-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/sql-controller.js
@@ -17,15 +17,18 @@
 
 // Controller for SQL notebook screen.
 consoleModule.controller('sqlController', [
-'$scope', '$http', '$timeout', '$interval', '$animate', '$location', 
'$anchorScroll', '$state', '$modal', '$popover', '$loading', '$common', 
'$confirm', '$agentDownload', 'QueryNotebooks', 'uiGridExporterConstants',
-function ($scope, $http, $timeout, $interval, $animate, $location, 
$anchorScroll, $state, $modal, $popover, $loading, $common, $confirm, 
$agentDownload, QueryNotebooks, uiGridExporterConstants) {
+'$scope', '$http', '$timeout', '$interval', '$animate', '$location', 
'$anchorScroll', '$state', '$modal', '$popover', '$loading', '$common', 
'$confirm', 'IgniteAgentMonitor', 'IgniteChartColors', 'QueryNotebooks', 
'uiGridExporterConstants',
+function ($scope, $http, $timeout, $interval, $animate, $location, 
$anchorScroll, $state, $modal, $popover, $loading, $common, $confirm, 
IgniteAgentMonitor, IgniteChartColors, QueryNotebooks, uiGridExporterConstants) 
{
+
+var stopTopology = null;
+
 $scope.$on('$stateChangeStart', function(event, toState, toParams, 
fromState, fromParams) {
+$interval.cancel(stopTopology);
+
 if ($scope.notebook && $scope.notebook.paragraphs)
 $scope.notebook.paragraphs.forEach(function (paragraph) {
 _tryStopRefresh(paragraph);
 });
-
-$agentDownload.stopAwaitAgent();
 });
 
 $scope.joinTip = $common.joinTip;
@@ -84,17 +87,12 @@ consoleModule.controller('sqlController', [
 // We need max 1800 items to hold history for 30 mins in case of 
refresh every second.
 var HISTORY_LENGTH = 1800;
 
-var CHART_COLORS = [
-'#1f77b4', '#ff7f0e', '#2ca02c', '#d62728', '#9467bd', '#8c564b', 
'#e377c2', '#7f7f7f', '#bcbd22', '#17becf',
-'#ffbb78', '#98df8a', '#ff9896', '#c5b0d5', '#aec7e8', '#c49c94', 
'#f7b6d2', '#c7c7c7', '#dbdb8d', '#9edae5'
-];
-
-var MAX_VAL_COLS = CHART_COLORS.length;
+var MAX_VAL_COLS = IgniteChartColors.length;
 
 $anchorScroll.yOffset = 55;
 
 $scope.chartColor = function(index) {
-return {"color": "white", "background-color": CHART_COLORS[index]};
+return {"color": "white", "background-color": 
IgniteChartColors[index]};
 };
 
 $scope.chartRemoveKeyColumn = function (paragraph, index) {
@@ -256,6 +254,23 @@ consoleModule.controller('sqlController', [
 });
 };
 
+var _refreshFn = function() {
+IgniteAgentMonitor.topology($scope.demo)
+.then(function(clusters) {
+var caches = _.flattenDeep(clusters.map(function (cluster) 
{ return cluster._caches; }));
+
+$scope.caches = _.sortBy(_.uniq(_.reject(caches, { mode: 
'LOCAL' }), function (cache) {
+return _mask(cache.name);
+}), 'name');
+
+_setActiveCache();
+})
+.catch(_handleException)
+.finally(function() {
+$loading.finish('loading');
+});
+};
+
 var loadNotebook = function (notebook) {
 $scope.notebook = notebook;
 
@@ -278,14 +293,28 @@ consoleModule.controller('sqlController', [
 else
 $scope.rebuildScrollParagraphs();
 
-$agentDownload.startTopologyListening(getTopology, _onConnect, 
$scope.demo);
-};
+IgniteAgentMonitor.startWatch({
+state: 'base.configuration.clusters',
+text: 'Back to Configuration',
+goal: 'execute sql statements'
+}, function () {
+$state.go('base.sql.demo');
+})
+.then(function () {
+$loading.start('loading');
 
-$loading.start('loading');
+_refreshFn();
+
+if ($scope.demo)
+_.forEach($scope.notebook.paragraphs, $scope.execute);
+
+stopTopology = $interval(_refreshFn, 5000, 0, false);
+});
+};
 
 QueryNotebooks.read($scope.demo, $state.params.noteId)
 .then(loadNotebook)
-.catch(function(err) {
+.catch(function() {
 $scope.notebookLoadFailed = tru

[06/50] [abbrv] ignite git commit: IGNITE-2597 Refactored to websockets.

[anovikov]

http://git-wip-us.apache.org/repos/asf/ignite/blob/706317f3/modules/control-center-web/src/main/js/serve/routes/public.js
--
diff --git a/modules/control-center-web/src/main/js/serve/routes/public.js 
b/modules/control-center-web/src/main/js/serve/routes/public.js
index 5d0f458..45a8d90 100644
--- a/modules/control-center-web/src/main/js/serve/routes/public.js
+++ b/modules/control-center-web/src/main/js/serve/routes/public.js
@@ -65,7 +65,7 @@ module.exports.factory = function(express, passport, 
nodemailer, settings, mail,
 
 req.body.token = _randomString();
 
-return Promise.resolve(new mongo.Account(req.body));
+return new mongo.Account(req.body);
 })
 .then((account) => {
 return new Promise((resolve, reject) => {
@@ -80,13 +80,9 @@ module.exports.factory = function(express, passport, 
nodemailer, settings, mail,
 });
 });
 })
-.then((account) => {
-return new Promise((resolve, reject) =>
-new mongo.Space({name: 'Personal space', owner: 
account._id}).save()
-.then(() => resolve(account))
-.catch(reject)
-);
-})
+.then((account) => new mongo.Space({name: 'Personal space', 
owner: account._id}).save()
+.then(() => account)
+)
 .then((account) => {
 return new Promise((resolve, reject) => {
 req.logIn(account, {}, (err) => {
@@ -102,7 +98,7 @@ module.exports.factory = function(express, passport, 
nodemailer, settings, mail,
 
 account.resetPasswordToken = _randomString();
 
-account.save()
+return account.save()
 .then(() => mail.send(account, `Thanks for signing up 
for ${settings.smtp.username}.`,
 `Hello ${account.firstName} 
${account.lastName}!` +
 `You are receiving this email because you have 
signed up to use http://${req.headers.host}";>${settings.smtp.username}.` +
@@ -151,24 +147,24 @@ module.exports.factory = function(express, passport, 
nodemailer, settings, mail,
 mongo.Account.findOne({email: req.body.email}).exec()
 .then((user) => {
 if (!user)
-return Promise.reject('Account with that email address 
does not exists!');
+throw new Error('Account with that email address does 
not exists!');
 
 user.resetPasswordToken = _randomString();
 
 return user.save();
 })
 .then((user) => mail.send(user, 'Password Reset',
-`Hello ${user.firstName} ${user.lastName}!` +
-'You are receiving this because you (or someone else) 
have requested the reset of the password for your account.' +
-'Please click on the following link, or paste this 
into your browser to complete the process:' +
-'http://' + req.headers.host + 
'/password/reset?token=' + user.resetPasswordToken + '' +
-'If you did not request this, please ignore this email 
and your password will remain unchanged.',
-'Failed to send email with reset link!')
+`Hello ${user.firstName} ${user.lastName}!` +
+'You are receiving this because you (or someone else) have 
requested the reset of the password for your account.' +
+'Please click on the following link, or paste this into 
your browser to complete the process:' +
+'http://' + req.headers.host + '/password/reset?token=' + 
user.resetPasswordToken + '' +
+'If you did not request this, please ignore this email and 
your password will remain unchanged.',
+'Failed to send email with reset link!')
 )
 .then(() => res.status(200).send('An email has been sent with 
further instructions.'))
-.catch((errMsg) => {
+.catch((err) => {
 // TODO IGNITE-843 Send email to admin
-return res.status(401).send(errMsg);
+return res.status(401).send(err.message);
 });
 });
 
@@ -178,13 +174,13 @@ module.exports.factory = function(express, passport, 
nodemailer, settings, mail,
 router.post('/password/reset', (req, res) => {
 mongo.Account.findOne({resetPasswordToken: req.body.token}).exec()
 .then((user) => {
-return new Promise((resolve, reject) => {
-  

[45/50] [abbrv] ignite git commit: Merge branch 'web-console-staging' of https://github.com/gridgain/apache-ignite into ignite-2875

[anovikov]

Merge branch 'web-console-staging' of https://github.com/gridgain/apache-ignite 
into ignite-2875


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4f6e72ec
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4f6e72ec
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4f6e72ec

Branch: refs/heads/ignite-2875
Commit: 4f6e72ec39458527b5123486ad33788260288c37
Parents: 8e08764 214c9b2
Author: Andrey 
Authored: Fri Mar 25 14:46:11 2016 +0700
Committer: Andrey 
Committed: Fri Mar 25 14:46:11 2016 +0700

--
 .../form-field-java-class.directive.js  |  30 +-
 .../form-field-java-class.jade  |  26 +-
 .../src/main/js/app/helpers/jade/mixins.jade|  20 +-
 .../modules/form/field/dropdown.directive.js|  17 +-
 .../js/app/modules/form/field/dropdown.jade |   8 +-
 .../form/field/input/number.directive.js|  12 +-
 .../js/app/modules/form/field/input/text.css|   2 +-
 .../modules/form/field/input/text.directive.js  |  26 +-
 .../js/app/modules/form/field/input/text.jade   |   6 +-
 .../src/main/js/app/modules/form/form.module.js |   2 +
 .../validator/igfs-path-unique.directive.js |  46 +++
 .../form/validator/property-unique.directive.js |   9 +-
 .../modules/form/validator/unique.directive.js  |   3 +-
 .../app/modules/states/configuration.state.js   | 257 +++---
 .../states/configuration/caches/query.jade  |   4 +-
 .../states/configuration/caches/store.jade  |  12 +-
 .../states/configuration/igfs/dual.directive.js |  27 ++
 .../modules/states/configuration/igfs/dual.jade |  41 +++
 .../igfs/fragmentizer.directive.js  |  27 ++
 .../states/configuration/igfs/fragmentizer.jade |  42 +++
 .../configuration/igfs/general.directive.js |  27 ++
 .../states/configuration/igfs/general.jade  |  53 +++
 .../states/configuration/igfs/ipc.directive.js  |  27 ++
 .../modules/states/configuration/igfs/ipc.jade  |  56 +++
 .../states/configuration/igfs/misc.directive.js |  27 ++
 .../modules/states/configuration/igfs/misc.jade | 121 +++
 .../configuration/igfs/secondary.directive.js   |  27 ++
 .../states/configuration/igfs/secondary.jade|  43 +++
 .../main/js/controllers/caches-controller.js|  31 +-
 .../main/js/controllers/clusters-controller.js  |  31 +-
 .../src/main/js/controllers/common-module.js|  16 +-
 .../src/main/js/controllers/igfs-controller.js  | 348 +++
 .../main/js/helpers/generator/generator-java.js |   6 +-
 .../helpers/generator/generator-properties.js   |   2 +-
 .../src/main/js/views/configuration/igfs.jade   |  24 +-
 .../src/main/js/views/settings/profile.jade |   4 +-
 .../src/main/js/views/signin.jade   |   4 +-
 37 files changed, 997 insertions(+), 467 deletions(-)
--

[38/50] [abbrv] ignite git commit: IGNITE-2676 Review

[anovikov]

IGNITE-2676 Review


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8e3de18a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8e3de18a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8e3de18a

Branch: refs/heads/ignite-2875
Commit: 8e3de18a1c0a56609674914e141b1d2c24678940
Parents: 8c79a57
Author: vsisko 
Authored: Fri Mar 25 12:45:14 2016 +0700
Committer: vsisko 
Committed: Fri Mar 25 12:45:14 2016 +0700

--
 .../app/modules/states/configuration/igfs/dual.jade   |  3 ++-
 .../states/configuration/igfs/fragmentizer.jade   | 10 +-
 .../js/app/modules/states/configuration/igfs/ipc.jade | 14 +++---
 .../src/main/js/controllers/igfs-controller.js|  4 
 .../src/main/js/views/configuration/igfs.jade |  2 +-
 5 files changed, 15 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/8e3de18a/modules/control-center-web/src/main/js/app/modules/states/configuration/igfs/dual.jade
--
diff --git 
a/modules/control-center-web/src/main/js/app/modules/states/configuration/igfs/dual.jade
 
b/modules/control-center-web/src/main/js/app/modules/states/configuration/igfs/dual.jade
index df8a7f68..649 100644
--- 
a/modules/control-center-web/src/main/js/app/modules/states/configuration/igfs/dual.jade
+++ 
b/modules/control-center-web/src/main/js/app/modules/states/configuration/igfs/dual.jade
@@ -23,7 +23,8 @@ form.panel.panel-default(name='dualMode' novalidate)
 ignite-form-panel-chevron
 label Dual mode
 ignite-form-field-tooltip.tipLabel
-| Dual mode settings
+| IGFS supports dual-mode that allows it to work as either a 
standalone file system in Hadoop cluster, or work in tandem with HDFS, 
providing a primary caching layer for the secondary HDFS#[br]
+| As a caching layer it provides highly configurable read-through 
and write-through behaviour
 ignite-form-revert
 .panel-collapse(role='tabpanel' bs-collapse-target id='dualMode')
 .panel-body(ng-if='__show__')

http://git-wip-us.apache.org/repos/asf/ignite/blob/8e3de18a/modules/control-center-web/src/main/js/app/modules/states/configuration/igfs/fragmentizer.jade
--
diff --git 
a/modules/control-center-web/src/main/js/app/modules/states/configuration/igfs/fragmentizer.jade
 
b/modules/control-center-web/src/main/js/app/modules/states/configuration/igfs/fragmentizer.jade
index 9490726..b4f4125 100644
--- 
a/modules/control-center-web/src/main/js/app/modules/states/configuration/igfs/fragmentizer.jade
+++ 
b/modules/control-center-web/src/main/js/app/modules/states/configuration/igfs/fragmentizer.jade
@@ -28,15 +28,15 @@ form.panel.panel-default(name='fragmentizer' novalidate)
 .panel-collapse(role='tabpanel' bs-collapse-target id='fragmentizer')
 .panel-body(ng-if='__show__')
 .col-sm-6
--var fragmentizerEnabled = model + '.fragmentizerEnabled'
+-var enabled = model + '.fragmentizerEnabled'
 
 .settings-row
-+checkbox('Enabled', fragmentizerEnabled, 
'fragmentizerEnabled', 'Fragmentizer enabled flag')
++checkbox('Enabled', enabled, 'fragmentizerEnabled', 
'Fragmentizer enabled flag')
 .settings-row
-+number('Concurrent files:', model + 
'.fragmentizerConcurrentFiles', 'fragmentizerConcurrentFiles', 
fragmentizerEnabled, '0', '0', 'Number of files to process concurrently by 
fragmentizer')
++number('Concurrent files:', model + 
'.fragmentizerConcurrentFiles', 'fragmentizerConcurrentFiles', enabled, '0', 
'0', 'Number of files to process concurrently by fragmentizer')
 .settings-row
-+number('Throttling block length:', model + 
'.fragmentizerThrottlingBlockLength', 'fragmentizerThrottlingBlockLength', 
fragmentizerEnabled, '16777216', '1', 'Length of file chunk to transmit before 
throttling is delayed')
++number('Throttling block length:', model + 
'.fragmentizerThrottlingBlockLength', 'fragmentizerThrottlingBlockLength', 
enabled, '16777216', '1', 'Length of file chunk to transmit before throttling 
is delayed')
 .settings-row
-+number('Throttling delay:', model + 
'.fragmentizerThrottlingDelay', 'fragmentizerThrottlingDelay', 
fragmentizerEnabled, '200', '0', 'Delay in milliseconds for which fragmentizer 
is paused')
++number('Throttling delay:', model + 
'.fragmentizerThrottlingDelay', 'fragmentizerThrottlingDelay', enabled, '200', 
'0', 'Delay in milliseconds for which fragmentizer is pa

[05/50] [abbrv] ignite git commit: Merge branch 'web-console-staging' of https://github.com/gridgain/apache-ignite into web-console-staging

[anovikov]

Merge branch 'web-console-staging' of https://github.com/gridgain/apache-ignite 
into web-console-staging


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2cf28fe4
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2cf28fe4
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2cf28fe4

Branch: refs/heads/ignite-2875
Commit: 2cf28fe44a368761ca507f88b8ac6581af5eba4e
Parents: aec0f59 51308e6
Author: Dmitriyff 
Authored: Thu Mar 17 18:35:26 2016 +0700
Committer: Dmitriyff 
Committed: Thu Mar 17 18:35:26 2016 +0700

--
 .../form-field-java-class.directive.js  | 10 +--
 .../form-field-java-class.jade  |  6 +-
 .../src/main/js/app/helpers/jade/mixins.jade| 78 +++-
 .../app/modules/form/group/group.directive.js   |  7 +-
 .../states/configuration/caches/general.jade|  5 +-
 .../states/configuration/caches/statistics.jade |  4 +-
 .../main/js/controllers/caches-controller.js|  8 ++
 .../main/js/controllers/clusters-controller.js  |  8 ++
 8 files changed, 102 insertions(+), 24 deletions(-)
--

[46/50] [abbrv] ignite git commit: IGNITE-843 Fixed validation.

[anovikov]

 IGNITE-843 Fixed validation.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/630cbbe8
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/630cbbe8
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/630cbbe8

Branch: refs/heads/ignite-2875
Commit: 630cbbe81ecacc83d66d266e88396d8f73dd0083
Parents: 214c9b2
Author: Alexey Kuznetsov 
Authored: Fri Mar 25 18:04:28 2016 +0700
Committer: Alexey Kuznetsov 
Committed: Fri Mar 25 18:04:28 2016 +0700

--
 .../form-field-java-class.directive.js  |  6 ++--
 .../src/main/js/app/helpers/jade/mixins.jade| 38 ++--
 .../modules/form/field/input/text.directive.js  |  6 ++--
 .../js/app/modules/form/field/input/text.jade   |  1 -
 .../configuration/clusters/communication.jade   |  7 ++--
 .../configuration/clusters/connector.jade   |  7 ++--
 .../configuration/clusters/discovery.jade   |  7 ++--
 .../states/configuration/clusters/general.jade  |  7 ++--
 .../clusters/general/discovery/multicast.jade   | 12 +--
 .../clusters/general/discovery/vm.jade  |  4 +++
 .../modules/states/configuration/igfs/ipc.jade  |  7 ++--
 11 files changed, 58 insertions(+), 44 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/630cbbe8/modules/control-center-web/src/main/js/app/directives/form-field-java-class/form-field-java-class.directive.js
--
diff --git 
a/modules/control-center-web/src/main/js/app/directives/form-field-java-class/form-field-java-class.directive.js
 
b/modules/control-center-web/src/main/js/app/directives/form-field-java-class/form-field-java-class.directive.js
index 8c469ea..142cb25 100644
--- 
a/modules/control-center-web/src/main/js/app/directives/form-field-java-class/form-field-java-class.directive.js
+++ 
b/modules/control-center-web/src/main/js/app/directives/form-field-java-class/form-field-java-class.directive.js
@@ -56,10 +56,10 @@ export default ['igniteFormFieldJavaClass', 
['IgniteFormGUID', (guid) => {
 scope.$watch('value', setAsDefault);
 
 const checkValid = () => {
-if (ngModel.$valid)
-
el.find('input').addClass('ng-valid').removeClass('ng-invalid');
-else
+if (ngModel.$invalid)
 
el.find('input').removeClass('ng-valid').addClass('ng-invalid');
+else
+
el.find('input').addClass('ng-valid').removeClass('ng-invalid');
 };
 
 scope.ngChange = () => {

http://git-wip-us.apache.org/repos/asf/ignite/blob/630cbbe8/modules/control-center-web/src/main/js/app/helpers/jade/mixins.jade
--
diff --git 
a/modules/control-center-web/src/main/js/app/helpers/jade/mixins.jade 
b/modules/control-center-web/src/main/js/app/helpers/jade/mixins.jade
index 6a7500f..eaed6ac 100644
--- a/modules/control-center-web/src/main/js/app/helpers/jade/mixins.jade
+++ b/modules/control-center-web/src/main/js/app/helpers/jade/mixins.jade
@@ -14,6 +14,23 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 
+//- Mixin for feedback on specified error.
+mixin error-feedback(visible, error, errorMessage)
+i.fa.fa-exclamation-triangle.form-control-feedback(
+ng-if=visible
+bs-tooltip='"#{errorMessage}"'
+ignite-error=error
+ignite-error-message=errorMessage
+)
+
+//- Mixin for feedback on unique violation.
+mixin unique-feedback(visible, errorMessage)
++error-feedback(visible, 'igniteUnique', errorMessage)
+
+//- Mixin for feedback on IP address violation.
+mixin ipaddress-feedback(visible)
++error-feedback(visible, 'ipaddress', 'Invalid address!')
+
 //- Mixin for checkbox.
 mixin checkbox(lbl, model, name, tip)
 ignite-form-field.checkbox
@@ -55,7 +72,7 @@ mixin java-class(lbl, model, name, enabled, required, tip)
 )
 
 //- Mixin for text field.
-mixin text-ip-address(lbl, model, name, enabled, placeholder, tip)
+mixin text-ip-address(lbl, form, model, name, enabled, placeholder, tip)
 ignite-form-field
 ignite-form-field-label
 | #{lbl}
@@ -69,6 +86,7 @@ mixin text-ip-address(lbl, model, name, enabled, placeholder, 
tip)
 data-ng-disabled='!(#{enabled})'
 data-placeholder=placeholder
 )
++ipaddress-feedback(form + '.' + name + '.$error.ipaddress')
 
 //- Mixin for text field.
 mixin text-enabled(lbl, model, name, enabled, required, placeholder, tip)
@@ -308,24 +326,6 @@ mixin table-remove-conditional-button(items, show, tip)
 mixin table-remove-button(items, tip)
 +table-remove-conditional-button(items, 'true', tip)
 
-//- Mixin for feedback on specified error.
-mi

[12/50] [abbrv] ignite git commit: IGNITE-843 Minor fix.

[anovikov]

IGNITE-843 Minor fix.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/26517155
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/26517155
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/26517155

Branch: refs/heads/ignite-2875
Commit: 26517155eb3257ac648ec389a3abd5baf3c5ea61
Parents: 1b58bbc
Author: Andrey 
Authored: Mon Mar 21 11:26:45 2016 +0700
Committer: Andrey 
Committed: Mon Mar 21 11:26:45 2016 +0700

--
 modules/control-center-web/src/main/js/app/index.js | 1 +
 .../src/main/js/app/modules/states/signin.state.js  | 5 +
 2 files changed, 2 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/26517155/modules/control-center-web/src/main/js/app/index.js
--
diff --git a/modules/control-center-web/src/main/js/app/index.js 
b/modules/control-center-web/src/main/js/app/index.js
index ad92c86..1537eb9 100644
--- a/modules/control-center-web/src/main/js/app/index.js
+++ b/modules/control-center-web/src/main/js/app/index.js
@@ -181,6 +181,7 @@ angular
 }])
 .config(['UIRouterMetatagsProvider', (UIRouterMetatagsProvider) => {
 UIRouterMetatagsProvider
+.setDefaultTitle('Apache Ignite Web Console - Management Tool and 
Configuration Wizard for Apache Ignite')
 .setTitleSuffix(' – Apache Ignite Web Console')
 .setDefaultDescription('The Apache Ignite Web Console is an 
interactive management tool and configuration wizard for Apache Ignite which 
walks you through the creation of configuration files. Try the tool now.');
 }])

http://git-wip-us.apache.org/repos/asf/ignite/blob/26517155/modules/control-center-web/src/main/js/app/modules/states/signin.state.js
--
diff --git 
a/modules/control-center-web/src/main/js/app/modules/states/signin.state.js 
b/modules/control-center-web/src/main/js/app/modules/states/signin.state.js
index ba14be6..a12ef43 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/signin.state.js
+++ b/modules/control-center-web/src/main/js/app/modules/states/signin.state.js
@@ -28,10 +28,7 @@ angular
 $stateProvider
 .state('signin', {
 url: '/',
-templateUrl: '/signin.html',
-metaTags: {
-title: 'Management Tool and Configuration Wizard for Apache Ignite'
-}
+templateUrl: '/signin.html'
 });
 }])
 .run(['$rootScope', '$state', 'Auth', 'IgniteBranding', function($root, 
$state, Auth, branding) {

[25/50] [abbrv] ignite git commit: IGNITE-2840 Refactoring to mixins.

[anovikov]

 IGNITE-2840 Refactoring to mixins.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f8a690ec
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f8a690ec
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f8a690ec

Branch: refs/heads/ignite-2875
Commit: f8a690ece50012520ca5ff05da4741c19228d2c5
Parents: 94632f2
Author: Alexey Kuznetsov 
Authored: Mon Mar 21 18:26:05 2016 +0700
Committer: Alexey Kuznetsov 
Committed: Mon Mar 21 18:26:05 2016 +0700

--
 .../ui-ace-java/ui-ace-java.directive.js|   5 -
 .../ui-ace-xml/ui-ace-xml.directive.js  |   5 -
 .../src/main/js/app/helpers/jade/mixins.jade| 120 ++-
 .../form/field/input/number.directive.js|   1 +
 .../js/app/modules/form/field/input/number.jade |   1 +
 .../app/modules/states/configuration.state.js   |   5 +-
 .../states/configuration/clusters/atomic.jade   |  74 ++---
 .../states/configuration/clusters/binary.jade   | 120 ++-
 .../configuration/clusters/communication.jade   | 332 +++
 .../configuration/clusters/connector.jade   | 314 +++---
 .../configuration/clusters/deployment.jade  | 181 +++---
 .../configuration/clusters/discovery.jade   | 296 ++---
 .../states/configuration/clusters/events.jade   |  33 +-
 .../states/configuration/clusters/general.jade  |  89 ++---
 .../clusters/general/discovery/cloud.jade   | 229 -
 .../clusters/general/discovery/google.jade  |  59 +---
 .../clusters/general/discovery/jdbc.jade|  13 +-
 .../clusters/general/discovery/multicast.jade   | 159 ++---
 .../clusters/general/discovery/s3.jade  |  14 +-
 .../clusters/general/discovery/shared.jade  |  12 +-
 .../clusters/general/discovery/vm.jade  | 100 ++
 .../clusters/general/discovery/zookeeper.jade   | 126 +++
 .../bounded-exponential-backoff.jade|  39 +--
 .../discovery/zookeeper/retrypolicy/custom.jade |  14 +-
 .../retrypolicy/exponential-backoff.jade|  39 +--
 .../zookeeper/retrypolicy/forever.jade  |  14 +-
 .../zookeeper/retrypolicy/n-times.jade  |  26 +-
 .../zookeeper/retrypolicy/one-time.jade |  14 +-
 .../zookeeper/retrypolicy/until-elapsed.jade|  26 +-
 .../states/configuration/clusters/igfs.jade |  34 +-
 .../configuration/clusters/marshaller.jade  | 129 ++-
 .../states/configuration/clusters/metrics.jade  |  74 +
 .../clusters/preview-panel.directive.js | 239 -
 .../states/configuration/clusters/ssl.jade  | 179 ++
 .../states/configuration/clusters/swap.jade | 128 ++-
 .../states/configuration/clusters/thread.jade   |  76 +
 .../states/configuration/clusters/time.jade |  75 +
 .../configuration/clusters/transactions.jade| 111 ++-
 .../configuration/preview-panel.directive.js| 239 +
 .../main/js/controllers/clusters-controller.js  |   7 +-
 .../main/js/helpers/generator/generator-java.js | 110 +++---
 .../main/js/helpers/generator/generator-xml.js  |  92 +++--
 .../main/js/views/configuration/clusters.jade   |   2 +-
 43 files changed, 1063 insertions(+), 2892 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/f8a690ec/modules/control-center-web/src/main/js/app/directives/ui-ace-java/ui-ace-java.directive.js
--
diff --git 
a/modules/control-center-web/src/main/js/app/directives/ui-ace-java/ui-ace-java.directive.js
 
b/modules/control-center-web/src/main/js/app/directives/ui-ace-java/ui-ace-java.directive.js
index 617cfbe..77cb774 100644
--- 
a/modules/control-center-web/src/main/js/app/directives/ui-ace-java/ui-ace-java.directive.js
+++ 
b/modules/control-center-web/src/main/js/app/directives/ui-ace-java/ui-ace-java.directive.js
@@ -64,11 +64,6 @@ export default ['igniteUiAceJava', ['GeneratorJava', 
(generator) => {
 
 break;
 
-case 'clusterDiscovery':
-ctrl.generator = (cluster) => 
generator.clusterDiscovery(cluster.discovery).asString();
-
-break;
-
 case 'igfss':
 ctrl.generator = (cluster) => {
 const igfss = _.reduce(scope.detail, (acc, igfs) => {

http://git-wip-us.apache.org/repos/asf/ignite/blob/f8a690ec/modules/control-center-web/src/main/js/app/directives/ui-ace-xml/ui-ace-xml.directive.js
--
diff --git 
a/modules/control-center-web/src/main/js/app/directives/ui-ace-xml/ui-ace-xml.directive.js
 
b/modules/control-center-web/src/main/js/app/directives/ui-ace-xml/ui-ace-xml.directive.js
index b379404..215c1b9 100644
--- 
a/modules/control-center-web/src/main/

[43/50] [abbrv] ignite git commit: IGNITE-843 Dropdown should be disabled if no options provided.

[anovikov]

 IGNITE-843 Dropdown should be disabled if no options provided.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e1a5dad7
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e1a5dad7
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e1a5dad7

Branch: refs/heads/ignite-2875
Commit: e1a5dad7c51601d7aa88d362bffbef29f1ef5d8c
Parents: e7dd846
Author: Alexey Kuznetsov 
Authored: Fri Mar 25 14:29:03 2016 +0700
Committer: Alexey Kuznetsov 
Committed: Fri Mar 25 14:29:03 2016 +0700

--
 .../src/main/js/app/modules/form/field/dropdown.jade | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/e1a5dad7/modules/control-center-web/src/main/js/app/modules/form/field/dropdown.jade
--
diff --git 
a/modules/control-center-web/src/main/js/app/modules/form/field/dropdown.jade 
b/modules/control-center-web/src/main/js/app/modules/form/field/dropdown.jade
index db607a1..fd8456c 100644
--- 
a/modules/control-center-web/src/main/js/app/modules/form/field/dropdown.jade
+++ 
b/modules/control-center-web/src/main/js/app/modules/form/field/dropdown.jade
@@ -26,7 +26,7 @@
 data-multiple='1'
 
 ng-model='dropdown.value'
-ng-disabled='dropdown.ngDisabled'
+ng-disabled='dropdown.ngDisabled || !dropdown.options || 
!dropdown.options.length'
 
 data-ng-required='required || false'
 
@@ -45,7 +45,7 @@
 bs-options='item.value as item.label for item in dropdown.options' 
 
 ng-model='dropdown.value'
-ng-disabled='dropdown.ngDisabled'
+ng-disabled='dropdown.ngDisabled || !dropdown.options || 
!dropdown.options.length'
 
 data-ng-required='required || false'
 

[35/50] [abbrv] ignite git commit: IGNITE-843 Fixed lodash "_.contains()" to "_.includes()"

[anovikov]

 IGNITE-843 Fixed lodash "_.contains()" to "_.includes()"


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/efe43956
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/efe43956
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/efe43956

Branch: refs/heads/ignite-2875
Commit: efe43956a0f5667fa371ac59784f7f744a87a718
Parents: 6cd972a
Author: Alexey Kuznetsov 
Authored: Thu Mar 24 18:56:24 2016 +0700
Committer: Alexey Kuznetsov 
Committed: Thu Mar 24 18:56:24 2016 +0700

--
 .../src/main/js/helpers/generator/generator-java.js| 6 +++---
 .../src/main/js/helpers/generator/generator-properties.js  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/efe43956/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
--
diff --git 
a/modules/control-center-web/src/main/js/helpers/generator/generator-java.js 
b/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
index fe65b45..bcf12ce 100644
--- a/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
+++ b/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
@@ -1235,7 +1235,7 @@ $generatorJava.clusterDataSources = function (caches, 
res) {
 if (storeFactory) {
 var beanClassName = $generatorJava.dataSourceClassName(res, 
storeFactory);
 
-if (beanClassName && !_.contains(datasources, beanClassName)) {
+if (beanClassName && !_.includes(datasources, beanClassName)) {
 datasources.push(beanClassName);
 
 if (factoryKind === 'CacheJdbcPojoStoreFactory' || factoryKind 
=== 'CacheJdbcBlobStoreFactory') {
@@ -2902,7 +2902,7 @@ $generatorJava.generateExample = function (cluster, res, 
factoryCls) {
 }
 
 _.forEach(desc.insertCntConsts, function (cnt) {
-if (!_.contains(generatedConsts, cnt.name)) {
+if (!_.includes(generatedConsts, cnt.name)) {
 res.line('/** ' + cnt.comment + ' */');
 res.line('private static final int ' + 
cnt.name + ' = ' + cnt.val + ';');
 res.needEmptyLine = true;
@@ -3012,7 +3012,7 @@ $generatorJava.generateExample = function (cluster, res, 
factoryCls) {
 _.forEach(desc.selectQuery, function (query) {
 var cacheName = type.cache.name;
 
-if (!_.contains(cacheLoaded, cacheName)) {
+if (!_.includes(cacheLoaded, cacheName)) {
 res.line('ignite.cache("' + cacheName + 
'").loadCache(null);');
 
 cacheLoaded.push(cacheName);

http://git-wip-us.apache.org/repos/asf/ignite/blob/efe43956/modules/control-center-web/src/main/js/helpers/generator/generator-properties.js
--
diff --git 
a/modules/control-center-web/src/main/js/helpers/generator/generator-properties.js
 
b/modules/control-center-web/src/main/js/helpers/generator/generator-properties.js
index 9bb68eb..cf971da 100644
--- 
a/modules/control-center-web/src/main/js/helpers/generator/generator-properties.js
+++ 
b/modules/control-center-web/src/main/js/helpers/generator/generator-properties.js
@@ -71,7 +71,7 @@ $generatorProperties.dataSourcesProperties = function 
(cluster, res) {
 
 var beanClassName = $commonUtils.toJavaName(varType, 
storeFactory.dataSourceBean);
 
-if (!_.contains(datasources, beanClassName)) {
+if (!_.includes(datasources, beanClassName)) {
 datasources.push(beanClassName);
 
 res.needEmptyLine = true;

[50/50] [abbrv] ignite git commit: IGNITE-2875 WIP

[anovikov]

IGNITE-2875 WIP


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/69256718
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/69256718
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/69256718

Branch: refs/heads/ignite-2875
Commit: 69256718701dc1e0046314f4f24d4acea697c39c
Parents: f374d01
Author: Andrey 
Authored: Mon Mar 28 15:47:01 2016 +0700
Committer: Andrey 
Committed: Mon Mar 28 15:47:01 2016 +0700

--
 .../js/app/services/AgentMonitor.service.js | 31 +-
 .../src/main/js/controllers/sql-controller.js   | 43 --
 .../src/main/js/serve/agent.js  | 60 +--
 .../src/main/js/serve/browser.js| 62 ++--
 .../src/main/js/serve/routes/agent.js   |  5 +-
 .../src/main/js/serve/routes/profile.js |  7 +--
 6 files changed, 105 insertions(+), 103 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/69256718/modules/control-center-web/src/main/js/app/services/AgentMonitor.service.js
--
diff --git 
a/modules/control-center-web/src/main/js/app/services/AgentMonitor.service.js 
b/modules/control-center-web/src/main/js/app/services/AgentMonitor.service.js
index 590d72f..2b55030 100644
--- 
a/modules/control-center-web/src/main/js/app/services/AgentMonitor.service.js
+++ 
b/modules/control-center-web/src/main/js/app/services/AgentMonitor.service.js
@@ -80,12 +80,14 @@ class IgniteAgentMonitor {
 this._socketFactory = socketFactory;
 
 this._$q = $q;
+
+this._$common = $common;
 }
 
 /**
  * @private
  */
-_checkModal() {
+checkModal() {
 if (this._scope.showModal && !this._scope.hasAgents)
 
this._downloadAgentModal.$promise.then(this._downloadAgentModal.show);
 else if ((this._scope.hasAgents || !this._scope.showModal) && 
this._downloadAgentModal.$isShown)
@@ -100,7 +102,7 @@ class IgniteAgentMonitor {
 return this._$q.when();
 
 if (this._scope.hasAgents !== null)
-this._checkModal();
+this.checkModal();
 
 const latch = this._$q.defer();
 
@@ -122,7 +124,7 @@ class IgniteAgentMonitor {
 this._socket.on('agent:count', ({count}) => {
 this._scope.hasAgents = count > 0;
 
-this._checkModal();
+this.checkModal();
 
 if (this._scope.hasAgents)
 this._scope.$broadcast('agent:connected', true);
@@ -131,7 +133,7 @@ class IgniteAgentMonitor {
 this._socket.on('disconnect', () => {
 this._scope.hasAgents = false;
 
-this._checkModal();
+this.checkModal();
 });
 }
 
@@ -211,6 +213,15 @@ class IgniteAgentMonitor {
 }
 
 /**
+ * @param {String} errMsg
+ */
+showNodeError(errMsg) {
+this._downloadAgentModal.show();
+
+this._$common.showError(errMsg);
+}
+
+/**
  *
  * @param {String} event
  * @param {Object} [args]
@@ -220,16 +231,6 @@ class IgniteAgentMonitor {
 _rest(event, ...args) {
 return this._downloadAgentModal.$promise
 .then(() => this._emit(event, ...args))
-.then((res) => {
-this._downloadAgentModal.hide();
-
-return res;
-})
-.catch((err) => {
-this._downloadAgentModal.show();
-
-return this._$q.reject(err);
-});
 }
 
 /**
@@ -288,7 +289,7 @@ class IgniteAgentMonitor {
 stopWatch() {
 this._scope.showModal = false;
 
-this._checkModal();
+this.checkModal();
 
 this._scope.$broadcast('agent:connected', false);
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/69256718/modules/control-center-web/src/main/js/controllers/sql-controller.js
--
diff --git 
a/modules/control-center-web/src/main/js/controllers/sql-controller.js 
b/modules/control-center-web/src/main/js/controllers/sql-controller.js
index 63dd31d..c9cfefb 100644
--- a/modules/control-center-web/src/main/js/controllers/sql-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/sql-controller.js
@@ -257,6 +257,8 @@ consoleModule.controller('sqlController', [
 var _refreshFn = function() {
 IgniteAgentMonitor.topology($scope.demo)
 .then(function(clusters) {
+IgniteAgentMonitor.checkModal();
+
 var caches = _.flattenDeep(clusters.map(function (cluster) 
{ return cluster.caches; }));
 
 $scope.caches = _.sortBy(_.uniq(_.reject(caches, { mode: 
'LOCAL' }), function (cache) {
@@ -265,8 +267,10 @

[47/50] [abbrv] ignite git commit: IGNITE-843 Fixed validation in case of empty required input.

[anovikov]

IGNITE-843 Fixed validation in case of empty required input.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/cadbc5f8
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/cadbc5f8
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/cadbc5f8

Branch: refs/heads/ignite-2875
Commit: cadbc5f87992209c59e1ca883cbe5f91a6a99a11
Parents: 630cbbe
Author: AKuznetsov 
Authored: Fri Mar 25 22:59:15 2016 +0700
Committer: AKuznetsov 
Committed: Fri Mar 25 22:59:15 2016 +0700

--
 .../form-field-java-class.directive.js| 10 ++
 .../js/app/modules/form/field/input/text.directive.js | 10 ++
 2 files changed, 12 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/cadbc5f8/modules/control-center-web/src/main/js/app/directives/form-field-java-class/form-field-java-class.directive.js
--
diff --git 
a/modules/control-center-web/src/main/js/app/directives/form-field-java-class/form-field-java-class.directive.js
 
b/modules/control-center-web/src/main/js/app/directives/form-field-java-class/form-field-java-class.directive.js
index 142cb25..43219f9 100644
--- 
a/modules/control-center-web/src/main/js/app/directives/form-field-java-class/form-field-java-class.directive.js
+++ 
b/modules/control-center-web/src/main/js/app/directives/form-field-java-class/form-field-java-class.directive.js
@@ -56,10 +56,12 @@ export default ['igniteFormFieldJavaClass', 
['IgniteFormGUID', (guid) => {
 scope.$watch('value', setAsDefault);
 
 const checkValid = () => {
-if (ngModel.$invalid)
-
el.find('input').removeClass('ng-valid').addClass('ng-invalid');
-else
-
el.find('input').addClass('ng-valid').removeClass('ng-invalid');
+const input = el.find('input');
+
+const invalid = ngModel.$invalid || (input[0].required && 
!input[0].value);
+
+input.removeClass(invalid ? 'ng-valid' : 'ng-invalid');
+input.addClass(invalid ? 'ng-invalid' : 'ng-valid');
 };
 
 scope.ngChange = () => {

http://git-wip-us.apache.org/repos/asf/ignite/blob/cadbc5f8/modules/control-center-web/src/main/js/app/modules/form/field/input/text.directive.js
--
diff --git 
a/modules/control-center-web/src/main/js/app/modules/form/field/input/text.directive.js
 
b/modules/control-center-web/src/main/js/app/modules/form/field/input/text.directive.js
index 99d7525..21b0d0f 100644
--- 
a/modules/control-center-web/src/main/js/app/modules/form/field/input/text.directive.js
+++ 
b/modules/control-center-web/src/main/js/app/modules/form/field/input/text.directive.js
@@ -64,10 +64,12 @@ export default ['igniteFormFieldInputText', 
['IgniteFormGUID', (guid) => {
 scope.$watch('value', setAsDefault);
 
 const checkValid = () => {
-if (ngModel.$invalid)
-
el.find('input').removeClass('ng-valid').addClass('ng-invalid');
-else
-
el.find('input').addClass('ng-valid').removeClass('ng-invalid');
+const input = el.find('input');
+
+const invalid = ngModel.$invalid || (input[0].required && 
!input[0].value);
+
+input.removeClass(invalid ? 'ng-valid' : 'ng-invalid');
+input.addClass(invalid ? 'ng-invalid' : 'ng-valid');
 };
 
 scope.ngChange = () => {