svn commit: r11382 - /dev/ignite/1.5.0-b1-rc1/

[sboikov]

Author: sboikov
Date: Tue Dec  1 20:31:29 2015
New Revision: 11382

Log:
new RC (1.5.0-b1-rc1)

Added:
dev/ignite/1.5.0-b1-rc1/
dev/ignite/1.5.0-b1-rc1/apache-ignite-1.5.0-b1-src.zip   (with props)
dev/ignite/1.5.0-b1-rc1/apache-ignite-1.5.0-b1-src.zip.asc
dev/ignite/1.5.0-b1-rc1/apache-ignite-1.5.0-b1-src.zip.md5
dev/ignite/1.5.0-b1-rc1/apache-ignite-1.5.0-b1-src.zip.sha1
dev/ignite/1.5.0-b1-rc1/apache-ignite-fabric-1.5.0-b1-bin.zip   (with props)
dev/ignite/1.5.0-b1-rc1/apache-ignite-fabric-1.5.0-b1-bin.zip.asc
dev/ignite/1.5.0-b1-rc1/apache-ignite-fabric-1.5.0-b1-bin.zip.md5
dev/ignite/1.5.0-b1-rc1/apache-ignite-fabric-1.5.0-b1-bin.zip.sha1
dev/ignite/1.5.0-b1-rc1/apache-ignite-hadoop-1.5.0-b1-bin.zip   (with props)
dev/ignite/1.5.0-b1-rc1/apache-ignite-hadoop-1.5.0-b1-bin.zip.asc
dev/ignite/1.5.0-b1-rc1/apache-ignite-hadoop-1.5.0-b1-bin.zip.md5
dev/ignite/1.5.0-b1-rc1/apache-ignite-hadoop-1.5.0-b1-bin.zip.sha1

Added: dev/ignite/1.5.0-b1-rc1/apache-ignite-1.5.0-b1-src.zip
==
Binary file - no diff available.

Propchange: dev/ignite/1.5.0-b1-rc1/apache-ignite-1.5.0-b1-src.zip
--
svn:mime-type = application/octet-stream

Added: dev/ignite/1.5.0-b1-rc1/apache-ignite-1.5.0-b1-src.zip.asc
==
--- dev/ignite/1.5.0-b1-rc1/apache-ignite-1.5.0-b1-src.zip.asc (added)
+++ dev/ignite/1.5.0-b1-rc1/apache-ignite-1.5.0-b1-src.zip.asc Tue Dec  1 
20:31:29 2015
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v1.4.11 (GNU/Linux)
+
+iQIcBAABAgAGBQJWXgMcAAoJEEDYklpZOnQ72kUP+wc5O6ij7sJtJ9fZt5FBta9x
+M4oz+YzBqT3pRy0E7gAujNbPP5qBsP1Kyk9zzrRwtTKJrN6bl3do/Cz01/E/7uol
+Sjp+x7JrDf0+ry0QXZrQYN/R5GFxZKDelhZhhZ87VzOppQAp5T49DAHV3GMc6/y/
+R24D2r8l2ToP3trJecEvDCn2PDFMJTbJKmCl+eGGp6I4uHuEluodjimzyu6xa5D2
+57r1V3y1vi1TcBVTqsFOu4tiRx1w7jE93y2w8ACmZ49IMr0/gMRjyLKxXK0hjuBB
+Is0dg3g5+ah5DQNIsTsp/x8fIU6mFJ3K/HirDT3w8Mkngz/oYPybx+8iogvSif48
+2UdEy/5SftPZyI/u1zRVPIkieZDQhr0JDrgksKYQKZIXKoiDtwlcG3CFyylN0b1/
+8zbDeS/Nt8ixh0tu4DxxZ9UgJVV8KamxRUocazGQ9azd3zhyt6tikv9NRAfq/SQH
+3hqzZXszmm5PdloDeMt01uUaKWd04YPjsrVopdTcc7+aVjVTV56fFSPntekd1rk7
+uZ30OQvpcTLAzTsPq6wL5L7trKtjD0MJ1v7ER97wK7RZG0w32/i2/SEhe6vTvL/t
+jsveXEuBQ1pKfh6+69tzQHLcsUS6DZjHngjaQeGcOFwNLXpOjXcNeRwv3f6QXx79
+8vZ2p+jyp46YSmSh1OR6
+=UJ/J
+-END PGP SIGNATURE-

Added: dev/ignite/1.5.0-b1-rc1/apache-ignite-1.5.0-b1-src.zip.md5
==
--- dev/ignite/1.5.0-b1-rc1/apache-ignite-1.5.0-b1-src.zip.md5 (added)
+++ dev/ignite/1.5.0-b1-rc1/apache-ignite-1.5.0-b1-src.zip.md5 Tue Dec  1 
20:31:29 2015
@@ -0,0 +1 @@
+4d8ad83b493f60d9130886287419fd95  apache-ignite-1.5.0-b1-src.zip
\ No newline at end of file

Added: dev/ignite/1.5.0-b1-rc1/apache-ignite-1.5.0-b1-src.zip.sha1
==
--- dev/ignite/1.5.0-b1-rc1/apache-ignite-1.5.0-b1-src.zip.sha1 (added)
+++ dev/ignite/1.5.0-b1-rc1/apache-ignite-1.5.0-b1-src.zip.sha1 Tue Dec  1 
20:31:29 2015
@@ -0,0 +1 @@
+151d532c66a1d7462d711d8b582b097690b11549  apache-ignite-1.5.0-b1-src.zip
\ No newline at end of file

Added: dev/ignite/1.5.0-b1-rc1/apache-ignite-fabric-1.5.0-b1-bin.zip
==
Binary file - no diff available.

Propchange: dev/ignite/1.5.0-b1-rc1/apache-ignite-fabric-1.5.0-b1-bin.zip
--
svn:mime-type = application/octet-stream

Added: dev/ignite/1.5.0-b1-rc1/apache-ignite-fabric-1.5.0-b1-bin.zip.asc
==
--- dev/ignite/1.5.0-b1-rc1/apache-ignite-fabric-1.5.0-b1-bin.zip.asc (added)
+++ dev/ignite/1.5.0-b1-rc1/apache-ignite-fabric-1.5.0-b1-bin.zip.asc Tue Dec  
1 20:31:29 2015
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v1.4.11 (GNU/Linux)
+
+iQIcBAABAgAGBQJWXgMcAAoJEEDYklpZOnQ7PBkP/jXgFiiKL9FpFmmsHhRgi3qB
+dyJtzCyahOe7Aqfxzx5ev/FTfhAPeHkTCP8ojora0pqmBOSwMkC2bCiMb+IHcRQy
+LZ3ZGgTuZlHFxWyk0i1VZnUVyK4mHjpirTzX+8RpHm1YnCjaA1a2MUdLKaeITL/b
+1p5ENhmXtypppaHFIuVJed3bQdtld2a745qsft26eem85opwJnxWZRqAgcHt/yyP
+3j9BjTlhxoprr93qFF5HZPw1ivKGsyKA60perrnY7T4cMZdE85JXayF5iMvd3Cn0
+B65mKH1nZapwEAzT9y75qAWK4NTxWeTfDonklvqnSIoDNcVnaVSLjLgU2HZ4U2ur
+BeB3xocM6a00OVMhbS9fR6eLgeU+jbw0XQxwiZMfwf64oogKRDTjSu2wOkHnIYgX
+KqdHl08eboA57OMI92bSNU/Qgh1B1LnxghS8TQLGYy0lVni/JKq+t/Dch8It5baq
+6GZh0g+OTPhu27rExaIdNTVf7PE8V3kHCdjzoF1Vjv0G1qv3PWaKXWqhWfAmu74R
+iPBH99GIIVh+YgzpbfSkHVRk4ApGy/HwjKwJpWlH4ReBluJasn8Yfy7gvy3Cbjnv
+7cAoc/YnYW5pZ6zzGEY06vPhCEsmCp8K264nJrpxQAynW9+OfB5XUlDRljx9hhGl
+TV4js07MK3EZd5gHgXAH
+=eNYo
+-END PGP SIGNATURE-

Added: 

[04/32] ignite git commit: ignite-530

[anovikov]

ignite-530


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

Branch: refs/heads/ignite-843-rc2
Commit: c5304a94eb0676839acb0302efb1159430ee8cd9
Parents: eeb584d
Author: Anton Vinogradov 
Authored: Mon Nov 30 15:12:07 2015 +0300
Committer: Anton Vinogradov 
Committed: Mon Nov 30 15:12:07 2015 +0300

--
 .../twitter/IgniteTwitterStreamerTestSuite.java  | 19 ---
 1 file changed, 12 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/c5304a94/modules/twitter/src/test/java/org/apache/ignite/stream/twitter/IgniteTwitterStreamerTestSuite.java
--
diff --git 
a/modules/twitter/src/test/java/org/apache/ignite/stream/twitter/IgniteTwitterStreamerTestSuite.java
 
b/modules/twitter/src/test/java/org/apache/ignite/stream/twitter/IgniteTwitterStreamerTestSuite.java
index b458bed..e07aaec 100644
--- 
a/modules/twitter/src/test/java/org/apache/ignite/stream/twitter/IgniteTwitterStreamerTestSuite.java
+++ 
b/modules/twitter/src/test/java/org/apache/ignite/stream/twitter/IgniteTwitterStreamerTestSuite.java
@@ -17,16 +17,21 @@
 
 package org.apache.ignite.stream.twitter;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import junit.framework.TestSuite;
 
 /**
  * Twitter streamer tests.
  */
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
-IgniteTwitterStreamerTest.class
-})
-public class IgniteTwitterStreamerTestSuite {
+public class IgniteTwitterStreamerTestSuite extends TestSuite {
+/**
+ * @return Twitter streamer tests suite.
+ * @throws Exception If failed.
+ */
+public static TestSuite suite() throws Exception {
+TestSuite suite = new TestSuite("Twitter streamed Test Suite");
 
+suite.addTestSuite(IgniteTwitterStreamerTest.class);
+
+return suite;
+}
 }

[17/32] ignite git commit: ignite-1.5 Should not wait on preloader sync future for system caches callbacks.

[anovikov]

ignite-1.5 Should not wait on preloader sync future for system caches callbacks.


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

Branch: refs/heads/ignite-843-rc2
Commit: 3492deaec670f9870c58cdf608cf77282d184f00
Parents: f5e9918
Author: sboikov 
Authored: Tue Dec 1 12:15:55 2015 +0300
Committer: sboikov 
Committed: Tue Dec 1 12:19:14 2015 +0300

--
 .../org/apache/ignite/internal/IgnitionEx.java  |  4 +--
 .../CacheDefaultBinaryAffinityKeyMapper.java| 19 +++---
 .../processors/cache/GridCacheAdapter.java  |  8 +
 .../processors/cache/GridCacheContext.java  | 37 
 .../GridCacheDefaultAffinityKeyMapper.java  |  9 -
 .../processors/cache/GridCacheMapEntry.java |  6 +++-
 .../GridCachePartitionExchangeManager.java  | 23 
 .../processors/cache/GridCachePreloader.java|  5 +++
 .../cache/GridCachePreloaderAdapter.java|  7 +++-
 .../processors/cache/GridCacheProcessor.java| 14 +---
 .../processors/cache/GridCacheProxyImpl.java| 12 +++
 .../processors/cache/IgniteCacheProxy.java  | 24 +
 .../processors/cache/IgniteInternalCache.java   |  9 +
 .../dht/atomic/GridDhtAtomicCache.java  |  4 +--
 .../dht/preloader/GridDhtPartitionDemander.java | 17 +
 .../dht/preloader/GridDhtPreloader.java | 27 ++
 .../CacheObjectBinaryProcessorImpl.java |  7 +++-
 .../cache/transactions/IgniteTxHandler.java |  2 +-
 .../communication/tcp/TcpCommunicationSpi.java  |  6 ++--
 .../CachePutEventListenerErrorSelfTest.java | 35 ++
 .../cache/GridCacheClearSelfTest.java   |  9 +++--
 ...eAbstractDataStructuresFailoverSelfTest.java | 32 +++--
 ...ObjectsCacheDataStructuresSelfTestSuite.java |  4 +++
 ...BinaryObjectsCacheExpiryPolicyTestSuite.java |  4 +++
 ...gniteBinaryObjectsCacheRestartTestSuite.java |  4 +++
 .../IgniteBinaryObjectsCacheTestSuite2.java |  4 +++
 .../IgniteBinaryObjectsCacheTestSuite3.java |  4 +++
 .../IgniteBinaryObjectsCacheTestSuite4.java |  4 +++
 ...IgniteBinaryObjectsComputeGridTestSuite.java |  4 +++
 .../IgnitePortableCacheTestSuite.java   |  1 -
 30 files changed, 250 insertions(+), 95 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/3492deae/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java 
b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
index 889b25c..be06f85 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
@@ -2057,7 +2057,7 @@ public class IgnitionEx {
 cache.setWriteSynchronizationMode(FULL_SYNC);
 cache.setAffinity(new RendezvousAffinityFunction(false, 100));
 cache.setNodeFilter(CacheConfiguration.ALL_NODES);
-cache.setRebalanceOrder(-1);//Prior to user caches.
+cache.setRebalanceOrder(-2); //Prior to user caches.
 
 return cache;
 }
@@ -2078,7 +2078,7 @@ public class IgnitionEx {
 ccfg.setWriteSynchronizationMode(FULL_SYNC);
 ccfg.setCacheMode(cfg.getCacheMode());
 ccfg.setNodeFilter(CacheConfiguration.ALL_NODES);
-ccfg.setRebalanceOrder(-1);//Prior to user caches.
+ccfg.setRebalanceOrder(-1); //Prior to user caches.
 
 if (cfg.getCacheMode() == PARTITIONED)
 ccfg.setBackups(cfg.getBackups());

http://git-wip-us.apache.org/repos/asf/ignite/blob/3492deae/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheDefaultBinaryAffinityKeyMapper.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheDefaultBinaryAffinityKeyMapper.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheDefaultBinaryAffinityKeyMapper.java
index efd38f7..d244a16 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheDefaultBinaryAffinityKeyMapper.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheDefaultBinaryAffinityKeyMapper.java
@@ -17,6 +17,7 @@
 
 package org.apache.ignite.internal.processors.cache;
 
+import org.apache.ignite.Ignite;
 import org.apache.ignite.IgniteException;
 import 

[26/32] ignite git commit: Test fixed (GridNioSelfTest)

[anovikov]

Test fixed (GridNioSelfTest)


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

Branch: refs/heads/ignite-843-rc2
Commit: b274a5caf27c83ee4603ef7aa25a3ab5b89eb5ff
Parents: 74f93b6
Author: ashutak 
Authored: Tue Dec 1 16:35:31 2015 +0300
Committer: ashutak 
Committed: Tue Dec 1 16:35:31 2015 +0300

--
 .../internal/util/nio/GridNioSelfTest.java  | 69 +++-
 1 file changed, 38 insertions(+), 31 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/b274a5ca/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSelfTest.java
index fd141c9..594e3c2 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSelfTest.java
@@ -58,9 +58,6 @@ import static java.util.concurrent.TimeUnit.SECONDS;
  * Tests for new NIO server.
  */
 public class GridNioSelfTest extends GridCommonAbstractTest {
-/** Test port. */
-private static final int PORT = 55443;
-
 /** Message count in test without reconnect. */
 private static final int MSG_CNT = 2000;
 
@@ -82,6 +79,9 @@ public class GridNioSelfTest extends GridCommonAbstractTest {
 /** Marshaller. */
 private static volatile Marshaller marsh;
 
+/** Test port. */
+private int port = 55443;
+
 /** {@inheritDoc} */
 @Override protected void beforeTestsStarted() throws Exception {
 getTestResources().startThreads(true);
@@ -94,6 +94,13 @@ public class GridNioSelfTest extends GridCommonAbstractTest {
 getTestResources().stopThreads();
 }
 
+/** {@inheritDoc} */
+@Override protected void beforeTest() throws Exception {
+super.beforeTest();
+
+port++;
+}
+
 /**
  * @throws Exception If failed.
  */
@@ -120,7 +127,7 @@ public class GridNioSelfTest extends GridCommonAbstractTest 
{
 }
 };
 
-GridNioServer srvr = startServer(PORT, new GridPlainParser(), lsnr);
+GridNioServer srvr = startServer(port, new GridPlainParser(), lsnr);
 
 try {
 IgniteInternalFuture fut = multithreadedAsync(new Runnable() {
@@ -170,11 +177,11 @@ public class GridNioSelfTest extends 
GridCommonAbstractTest {
 }
 };
 
-GridNioServer srvr = startServer(PORT, new GridPlainParser(), lsnr);
+GridNioServer srvr = startServer(port, new GridPlainParser(), lsnr);
 
 Socket s = createSocket();
 
-s.connect(new InetSocketAddress(U.getLocalHost(), PORT), 1000);
+s.connect(new InetSocketAddress(U.getLocalHost(), port), 1000);
 
 try {
 byte[] msg = new byte[MSG_SIZE];
@@ -228,12 +235,12 @@ public class GridNioSelfTest extends 
GridCommonAbstractTest {
 }
 };
 
-GridNioServer srvr = startServer(PORT, new GridPlainParser(), lsnr);
+GridNioServer srvr = startServer(port, new GridPlainParser(), lsnr);
 
 try {
 Socket s = createSocket();
 
-s.connect(new InetSocketAddress(U.getLocalHost(), PORT), 1000);
+s.connect(new InetSocketAddress(U.getLocalHost(), port), 1000);
 
 if (!(s instanceof SSLSocket)) {
 // These methods are not supported by SSL sockets.
@@ -270,7 +277,7 @@ public class GridNioSelfTest extends GridCommonAbstractTest 
{
 }
 };
 
-GridNioServer srvr = startServer(PORT, new GridPlainParser(), lsnr);
+GridNioServer srvr = startServer(port, new GridPlainParser(), lsnr);
 
 final AtomicLong cnt = new AtomicLong();
 
@@ -287,7 +294,7 @@ public class GridNioSelfTest extends GridCommonAbstractTest 
{
 msg[i] = (byte) (i ^ (i * i - 1)); // Some data
 
 try (Socket s = createSocket()) {
-s.connect(new InetSocketAddress(U.getLocalHost(), 
PORT), 1000);
+s.connect(new InetSocketAddress(U.getLocalHost(), 
port), 1000);
 
 OutputStream out = s.getOutputStream();
 
@@ -362,12 +369,12 @@ public class GridNioSelfTest extends 
GridCommonAbstractTest {
 }
 };
 
-GridNioServer srvr = startServer(PORT, new GridPlainParser(), lsnr);
+GridNioServer srvr = startServer(port, new 

[13/32] ignite git commit: 1.5.0-EA-SNAPSHOT

[anovikov]

1.5.0-EA-SNAPSHOT


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

Branch: refs/heads/ignite-843-rc2
Commit: 6260fc1fc80cc77cc9a0ef776640845b979b27b3
Parents: fcbc6d0
Author: Ignite Teamcity 
Authored: Mon Nov 30 19:42:45 2015 +0300
Committer: Ignite Teamcity 
Committed: Mon Nov 30 19:42:45 2015 +0300

--
 examples/pom.xml   | 5 ++---
 examples/schema-import/pom.xml | 2 +-
 modules/aop/pom.xml| 2 +-
 modules/apache-license-gen/pom.xml | 2 +-
 modules/aws/pom.xml| 2 +-
 modules/camel/pom.xml  | 5 ++---
 modules/clients/pom.xml| 2 +-
 modules/cloud/pom.xml  | 2 +-
 modules/codegen/pom.xml| 2 +-
 modules/core/pom.xml   | 2 +-
 modules/core/src/main/resources/ignite.properties  | 2 +-
 modules/extdata/p2p/pom.xml| 2 +-
 modules/extdata/uri/modules/uri-dependency/pom.xml | 2 +-
 modules/extdata/uri/pom.xml| 4 ++--
 modules/flume/pom.xml  | 5 ++---
 modules/gce/pom.xml| 2 +-
 modules/geospatial/pom.xml | 2 +-
 modules/hadoop/pom.xml | 2 +-
 modules/hibernate/pom.xml  | 2 +-
 modules/indexing/pom.xml   | 2 +-
 modules/jcl/pom.xml| 2 +-
 modules/jms11/pom.xml  | 2 +-
 modules/jta/pom.xml| 2 +-
 modules/kafka/pom.xml  | 2 +-
 modules/log4j/pom.xml  | 2 +-
 modules/log4j2/pom.xml | 2 +-
 modules/mesos/pom.xml  | 2 +-
 modules/mqtt/pom.xml   | 5 ++---
 modules/platforms/cpp/common/configure.ac  | 2 +-
 modules/platforms/cpp/core-test/configure.ac   | 2 +-
 modules/platforms/cpp/core/configure.ac| 2 +-
 modules/platforms/cpp/examples/configure.ac| 2 +-
 modules/platforms/cpp/ignite/configure.ac  | 2 +-
 .../dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs | 4 ++--
 .../Properties/AssemblyInfo.cs | 4 ++--
 .../dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs | 4 ++--
 .../dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs   | 4 ++--
 .../platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs  | 4 ++--
 .../examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs | 4 ++--
 .../Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs   | 4 ++--
 modules/rest-http/pom.xml  | 2 +-
 modules/scalar-2.10/pom.xml| 2 +-
 modules/scalar/pom.xml | 2 +-
 modules/schedule/pom.xml   | 2 +-
 modules/schema-import/pom.xml  | 2 +-
 modules/slf4j/pom.xml  | 2 +-
 modules/spark-2.10/pom.xml | 2 +-
 modules/spark/pom.xml  | 2 +-
 modules/spring/pom.xml | 2 +-
 modules/ssh/pom.xml| 2 +-
 modules/tools/pom.xml  | 2 +-
 modules/twitter/pom.xml| 5 ++---
 modules/urideploy/pom.xml  | 2 +-
 modules/visor-console-2.10/pom.xml | 2 +-
 modules/visor-console/pom.xml  | 2 +-
 modules/visor-plugins/pom.xml  | 2 +-
 modules/web/pom.xml| 2 +-
 modules/yardstick/pom.xml  | 6 ++
 modules/yarn/pom.xml   | 2 +-
 modules/zookeeper/pom.xml  | 2 +-
 pom.xml| 2 +-
 61 

[23/32] ignite git commit: version fix

[anovikov]

version fix


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

Branch: refs/heads/ignite-843-rc2
Commit: 74054fb04bba7e5b73c6c638c576d2344c5c6d2f
Parents: c850ae4
Author: Anton Vinogradov 
Authored: Tue Dec 1 14:36:13 2015 +0300
Committer: Anton Vinogradov 
Committed: Tue Dec 1 14:36:13 2015 +0300

--
 examples/pom.xml   | 2 +-
 examples/schema-import/pom.xml | 2 +-
 modules/aop/pom.xml| 2 +-
 modules/apache-license-gen/pom.xml | 2 +-
 modules/aws/pom.xml| 2 +-
 modules/camel/pom.xml  | 2 +-
 modules/clients/pom.xml| 2 +-
 modules/cloud/pom.xml  | 2 +-
 modules/codegen/pom.xml| 2 +-
 modules/core/pom.xml   | 2 +-
 modules/core/src/main/resources/ignite.properties  | 2 +-
 modules/extdata/p2p/pom.xml| 2 +-
 modules/extdata/uri/modules/uri-dependency/pom.xml | 2 +-
 modules/extdata/uri/pom.xml| 2 +-
 modules/flume/pom.xml  | 2 +-
 modules/gce/pom.xml| 2 +-
 modules/geospatial/pom.xml | 2 +-
 modules/hadoop/pom.xml | 2 +-
 modules/hibernate/pom.xml  | 2 +-
 modules/indexing/pom.xml   | 2 +-
 modules/jcl/pom.xml| 2 +-
 modules/jms11/pom.xml  | 2 +-
 modules/jta/pom.xml| 2 +-
 modules/kafka/pom.xml  | 2 +-
 modules/log4j/pom.xml  | 2 +-
 modules/log4j2/pom.xml | 2 +-
 modules/mesos/pom.xml  | 2 +-
 modules/mqtt/pom.xml   | 2 +-
 modules/rest-http/pom.xml  | 2 +-
 modules/scalar-2.10/pom.xml| 2 +-
 modules/scalar/pom.xml | 2 +-
 modules/schedule/pom.xml   | 2 +-
 modules/schema-import/pom.xml  | 2 +-
 modules/slf4j/pom.xml  | 2 +-
 modules/spark-2.10/pom.xml | 2 +-
 modules/spark/pom.xml  | 2 +-
 modules/spring/pom.xml | 2 +-
 modules/ssh/pom.xml| 2 +-
 modules/tools/pom.xml  | 2 +-
 modules/twitter/pom.xml| 2 +-
 modules/urideploy/pom.xml  | 2 +-
 modules/visor-console-2.10/pom.xml | 2 +-
 modules/visor-console/pom.xml  | 2 +-
 modules/visor-plugins/pom.xml  | 2 +-
 modules/web/pom.xml| 2 +-
 modules/yardstick/pom.xml  | 2 +-
 modules/yarn/pom.xml   | 2 +-
 modules/zookeeper/pom.xml  | 2 +-
 pom.xml| 2 +-
 49 files changed, 49 insertions(+), 49 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/74054fb0/examples/pom.xml
--
diff --git a/examples/pom.xml b/examples/pom.xml
index 1b79525..c018e1e 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -28,7 +28,7 @@
 
 
 ignite-examples
-1.5.0-EA-SNAPSHOT
+1.5.0-EA1-SNAPSHOT
 
 
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/74054fb0/examples/schema-import/pom.xml
--
diff --git a/examples/schema-import/pom.xml b/examples/schema-import/pom.xml
index ee6dc5e..d4eb3b3 100644
--- a/examples/schema-import/pom.xml
+++ b/examples/schema-import/pom.xml
@@ -35,7 +35,7 @@
 
 
 ignite-schema-import-demo
-1.5.0-EA-SNAPSHOT
+1.5.0-EA1-SNAPSHOT
 
 
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/74054fb0/modules/aop/pom.xml
--
diff --git a/modules/aop/pom.xml b/modules/aop/pom.xml
index a2eb499..850af76 100644
--- a/modules/aop/pom.xml
+++ b/modules/aop/pom.xml
@@ -31,7 +31,7 @@
 
 
 ignite-aop
-1.5.0-EA-SNAPSHOT
+1.5.0-EA1-SNAPSHOT
 http://ignite.apache.org
 
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/74054fb0/modules/apache-license-gen/pom.xml

[16/32] ignite git commit: Release notes update

[anovikov]

Release notes update


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

Branch: refs/heads/ignite-843-rc2
Commit: 98303001684265b3677fb663e51c4a44b9fd1707
Parents: f5e9918
Author: Anton Vinogradov 
Authored: Tue Dec 1 11:18:40 2015 +0300
Committer: Anton Vinogradov 
Committed: Tue Dec 1 11:18:40 2015 +0300

--
 RELEASE_NOTES.txt | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/98303001/RELEASE_NOTES.txt
--
diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt
index 4985edb..f7f48fa 100644
--- a/RELEASE_NOTES.txt
+++ b/RELEASE_NOTES.txt
@@ -9,6 +9,8 @@ Apache Ignite In-Memory Data Fabric 1.5
 * Added new binary cache object marshalling implementation.
 * Added IgniteSemaphore data structure.
 * Added MQTT Streamer.
+* Added Twitter Streamer.
+* Added Ignite Sink (integration with Apache Flume).
 * Fixed failover for continuous queries.
 * Fixed compilation and runtime errors under OpenJDK and IBM JDK.
 * Fixed Integer.size limitation for cache.

[10/32] ignite git commit: minor

[anovikov]

minor


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

Branch: refs/heads/ignite-843-rc2
Commit: 776af1a5aade09174422de9b8f5d04f1ce50d458
Parents: 8e605e9
Author: Yakov Zhdanov 
Authored: Mon Nov 30 17:32:59 2015 +0300
Committer: Yakov Zhdanov 
Committed: Mon Nov 30 17:32:59 2015 +0300

--
 .../rest/handlers/cache/GridCacheCommandHandlerSelfTest.java| 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/776af1a5/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java
index 484ee87..740b166 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java
@@ -62,6 +62,7 @@ public class GridCacheCommandHandlerSelfTest extends 
GridCommonAbstractTest {
 TcpDiscoverySpi disco = new TcpDiscoverySpi();
 
 disco.setIpFinder(new TcpDiscoveryVmIpFinder(true));
+disco.setJoinTimeout(5000);
 
 // Cache config.
 CacheConfiguration cacheCfg = defaultCacheConfiguration();

[24/32] ignite git commit: ignite-1.5 Skip message send on node stop.

[anovikov]

ignite-1.5 Skip message send on node stop.


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

Branch: refs/heads/ignite-843-rc2
Commit: 3e7c532d83fc41b4c8439f30f4157d84bbc3fa08
Parents: 74054fb
Author: sboikov 
Authored: Tue Dec 1 15:22:28 2015 +0300
Committer: sboikov 
Committed: Tue Dec 1 15:22:28 2015 +0300

--
 .../distributed/dht/preloader/GridDhtPartitionDemander.java   | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/3e7c532d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
index 20f12b6..728e792 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
@@ -861,8 +861,10 @@ public class GridDhtPartitionDemander {
 U.log(log, "Cancelled rebalancing from all nodes [cache=" + 
cctx.name()
 + ", topology=" + topologyVersion());
 
-for (UUID nodeId : remaining.keySet())
-cleanupRemoteContexts(nodeId);
+if (!cctx.kernalContext().isStopping()) {
+for (UUID nodeId : remaining.keySet())
+cleanupRemoteContexts(nodeId);
+}
 
 remaining.clear();
 
@@ -920,7 +922,6 @@ public class GridDhtPartitionDemander {
 
 //Check remote node rebalancing API version.
 if 
(node.version().compareTo(GridDhtPreloader.REBALANCING_VER_2_SINCE) >= 0) {
-
 GridDhtPartitionDemandMessage d = new 
GridDhtPartitionDemandMessage(
 -1/* remove supply context signal */, 
this.topologyVersion(), cctx.cacheId());
 

[12/32] ignite git commit: minor

[anovikov]

minor


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

Branch: refs/heads/ignite-843-rc2
Commit: fcbc6d0e6c7042cb39abbc0b388a5f9ade958d95
Parents: 3d6973b
Author: Yakov Zhdanov 
Authored: Mon Nov 30 17:33:56 2015 +0300
Committer: Yakov Zhdanov 
Committed: Mon Nov 30 17:33:56 2015 +0300

--
 .../java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java  | 2 --
 1 file changed, 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/fcbc6d0e/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
index 8827a78..854ce95 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
@@ -44,7 +44,6 @@ import javax.net.ssl.SSLServerSocketFactory;
 import javax.net.ssl.SSLSocketFactory;
 import org.apache.ignite.Ignite;
 import org.apache.ignite.IgniteAuthenticationException;
-import org.apache.ignite.IgniteCache;
 import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.IgniteException;
 import org.apache.ignite.IgniteLogger;
@@ -60,7 +59,6 @@ import org.apache.ignite.internal.util.typedef.internal.LT;
 import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.lang.IgniteBiTuple;
-import org.apache.ignite.lang.IgniteCallable;
 import org.apache.ignite.lang.IgniteInClosure;
 import org.apache.ignite.lang.IgniteProductVersion;
 import org.apache.ignite.lang.IgniteUuid;

[06/32] ignite git commit: minor

[anovikov]

minor


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

Branch: refs/heads/ignite-843-rc2
Commit: 8e605e9f33c99a4f8404bff3dd8902f4b08704da
Parents: 0fcc1d1
Author: Yakov Zhdanov 
Authored: Mon Nov 30 16:45:27 2015 +0300
Committer: Yakov Zhdanov 
Committed: Mon Nov 30 16:45:27 2015 +0300

--
 .../rest/handlers/cache/GridCacheCommandHandlerSelfTest.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/8e605e9f/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java
index e58eb54..484ee87 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java
@@ -71,10 +71,10 @@ public class GridCacheCommandHandlerSelfTest extends 
GridCommonAbstractTest {
 // Grid config.
 IgniteConfiguration cfg = super.getConfiguration();
 
-cfg.setLocalHost("localhost");
+cfg.setLocalHost("127.0.0.1");
 
 ConnectorConfiguration clnCfg = new ConnectorConfiguration();
-clnCfg.setHost("localhost");
+clnCfg.setHost("127.0.0.1");
 
 cfg.setConnectorConfiguration(clnCfg);
 cfg.setDiscoverySpi(disco);
@@ -239,4 +239,4 @@ public class GridCacheCommandHandlerSelfTest extends 
GridCommonAbstractTest {
 });
 }
 }
-}
\ No newline at end of file
+}

[31/32] ignite git commit: version fix

[anovikov]

version fix


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

Branch: refs/heads/ignite-843-rc2
Commit: 3ac1504d6e46daf4322b0bc9c4411b0f26c3a4aa
Parents: 2564a55
Author: Anton Vinogradov 
Authored: Tue Dec 1 18:33:23 2015 +0300
Committer: Anton Vinogradov 
Committed: Tue Dec 1 18:33:23 2015 +0300

--
 examples/pom.xml   | 2 +-
 examples/schema-import/pom.xml | 2 +-
 modules/aop/pom.xml| 2 +-
 modules/apache-license-gen/pom.xml | 2 +-
 modules/aws/pom.xml| 2 +-
 modules/camel/pom.xml  | 2 +-
 modules/clients/pom.xml| 2 +-
 modules/cloud/pom.xml  | 2 +-
 modules/codegen/pom.xml| 2 +-
 modules/core/pom.xml   | 2 +-
 modules/core/src/main/resources/ignite.properties  | 2 +-
 modules/extdata/p2p/pom.xml| 2 +-
 modules/extdata/uri/modules/uri-dependency/pom.xml | 2 +-
 modules/extdata/uri/pom.xml| 2 +-
 modules/flume/pom.xml  | 2 +-
 modules/gce/pom.xml| 2 +-
 modules/geospatial/pom.xml | 2 +-
 modules/hadoop/pom.xml | 2 +-
 modules/hibernate/pom.xml  | 2 +-
 modules/indexing/pom.xml   | 2 +-
 modules/jcl/pom.xml| 2 +-
 modules/jms11/pom.xml  | 2 +-
 modules/jta/pom.xml| 2 +-
 modules/kafka/pom.xml  | 2 +-
 modules/log4j/pom.xml  | 2 +-
 modules/log4j2/pom.xml | 2 +-
 modules/mesos/pom.xml  | 2 +-
 modules/mqtt/pom.xml   | 2 +-
 modules/rest-http/pom.xml  | 2 +-
 modules/scalar-2.10/pom.xml| 2 +-
 modules/scalar/pom.xml | 2 +-
 modules/schedule/pom.xml   | 2 +-
 modules/schema-import/pom.xml  | 2 +-
 modules/slf4j/pom.xml  | 2 +-
 modules/spark-2.10/pom.xml | 2 +-
 modules/spark/pom.xml  | 2 +-
 modules/spring/pom.xml | 2 +-
 modules/ssh/pom.xml| 2 +-
 modules/tools/pom.xml  | 2 +-
 modules/twitter/pom.xml| 2 +-
 modules/urideploy/pom.xml  | 2 +-
 modules/visor-console-2.10/pom.xml | 2 +-
 modules/visor-console/pom.xml  | 2 +-
 modules/visor-plugins/pom.xml  | 2 +-
 modules/web/pom.xml| 2 +-
 modules/yardstick/pom.xml  | 2 +-
 modules/yarn/pom.xml   | 2 +-
 modules/zookeeper/pom.xml  | 2 +-
 pom.xml| 2 +-
 49 files changed, 49 insertions(+), 49 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/3ac1504d/examples/pom.xml
--
diff --git a/examples/pom.xml b/examples/pom.xml
index c018e1e..e7cd059 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -28,7 +28,7 @@
 
 
 ignite-examples
-1.5.0-EA1-SNAPSHOT
+1.5.0-b1-SNAPSHOT
 
 
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/3ac1504d/examples/schema-import/pom.xml
--
diff --git a/examples/schema-import/pom.xml b/examples/schema-import/pom.xml
index d4eb3b3..a6b635c 100644
--- a/examples/schema-import/pom.xml
+++ b/examples/schema-import/pom.xml
@@ -35,7 +35,7 @@
 
 
 ignite-schema-import-demo
-1.5.0-EA1-SNAPSHOT
+1.5.0-b1-SNAPSHOT
 
 
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/3ac1504d/modules/aop/pom.xml
--
diff --git a/modules/aop/pom.xml b/modules/aop/pom.xml
index 850af76..f410f65 100644
--- a/modules/aop/pom.xml
+++ b/modules/aop/pom.xml
@@ -31,7 +31,7 @@
 
 
 ignite-aop
-1.5.0-EA1-SNAPSHOT
+1.5.0-b1-SNAPSHOT
 http://ignite.apache.org
 
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/3ac1504d/modules/apache-license-gen/pom.xml

[11/32] ignite git commit: Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5_

[anovikov]

Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5_


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

Branch: refs/heads/ignite-843-rc2
Commit: 3d6973b403e2cfe44c31d590a14a738ad37552e7
Parents: 776af1a aee20d9
Author: Yakov Zhdanov 
Authored: Mon Nov 30 17:33:09 2015 +0300
Committer: Yakov Zhdanov 
Committed: Mon Nov 30 17:33:09 2015 +0300

--
 .../GridDeploymentPerVersionStore.java  |  12 +-
 .../distributed/dht/GridDhtLockFuture.java  |  17 ++-
 .../communication/tcp/TcpCommunicationSpi.java  |  12 +-
 ...cheAbstractFullApiMultithreadedSelfTest.java |   9 +-
 .../IgniteCacheStoreValueAbstractTest.java  | 111 +++
 .../cache/IgniteCacheTxPreloadNoWriteTest.java  |   2 +-
 ...idCacheNearOnlyMultiNodeFullApiSelfTest.java |   3 +-
 ...eRebalancingUnmarshallingFailedSelfTest.java |  13 ++-
 .../GridCacheLocalIsolatedNodesSelfTest.java|   6 +-
 9 files changed, 116 insertions(+), 69 deletions(-)
--

[27/32] ignite git commit: fixed npe

[anovikov]

fixed npe


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

Branch: refs/heads/ignite-843-rc2
Commit: 022cdafec2f23651c8de82ae7bd9bd5f37999e21
Parents: b274a5c
Author: Yakov Zhdanov 
Authored: Tue Dec 1 16:36:59 2015 +0300
Committer: Yakov Zhdanov 
Committed: Tue Dec 1 16:36:59 2015 +0300

--
 .../cache/distributed/near/GridNearGetFuture.java   | 12 +++-
 1 file changed, 7 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/022cdafe/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java
index 3f61b2f..9705569 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java
@@ -264,11 +264,13 @@ public final class GridNearGetFuture extends 
CacheDistributedGetFutureAdap
 if (!success) {
 GridCacheVersion obsolete = cctx.versions().next(topVer);
 
-for (GridNearCacheEntry reserved : savedEntries.values()) {
-reserved.releaseEviction();
+if (savedEntries != null) {
+for (GridNearCacheEntry reserved : 
savedEntries.values()) {
+reserved.releaseEviction();
 
-if (reserved.markObsolete(obsolete))
-reserved.context().cache().removeEntry(reserved);
+if (reserved.markObsolete(obsolete))
+
reserved.context().cache().removeEntry(reserved);
+}
 }
 }
 }
@@ -543,7 +545,7 @@ public final class GridNearGetFuture extends 
CacheDistributedGetFutureAdap
 }
 else {
 K key0 = (K)cctx.unwrapPortableIfNeeded(key, 
!deserializePortable, false);
-V val0 = !skipVals ? 
+V val0 = !skipVals ?
 (V)cctx.unwrapPortableIfNeeded(v, 
!deserializePortable, false) :
 (V)Boolean.TRUE;
 

[29/32] ignite git commit: IGNITE-1161 Typo.

[anovikov]

IGNITE-1161 Typo.


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

Branch: refs/heads/ignite-843-rc2
Commit: e0c970a5fe46940ac9ab2355dd5913f2f7fc2a69
Parents: c389763
Author: anovikov 
Authored: Tue Dec 1 21:11:03 2015 +0700
Committer: anovikov 
Committed: Tue Dec 1 21:11:03 2015 +0700

--
 .../processors/rest/handlers/query/QueryCommandHandler.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/e0c970a5/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/query/QueryCommandHandler.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/query/QueryCommandHandler.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/query/QueryCommandHandler.java
index 2961a27..bb929a4 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/query/QueryCommandHandler.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/query/QueryCommandHandler.java
@@ -90,7 +90,7 @@ public class QueryCommandHandler extends 
GridRestCommandHandlerAdapter {
 
 long createTime = qryCurIt.timestamp();
 
-if (createTime + idleQryCurTimeout > time && 
qryCurIt.tryLock()) {
+if (time > createTime + idleQryCurTimeout && 
qryCurIt.tryLock()) {
 try {
 qryCurIt.timestamp(-1);
 

[02/32] ignite git commit: Package-info files.

[anovikov]

Package-info files.


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

Branch: refs/heads/ignite-843-rc2
Commit: dc14cccd9b66b44ecdd426234895eb19006ed293
Parents: 346733f
Author: Anton Vinogradov 
Authored: Mon Nov 30 14:32:29 2015 +0300
Committer: Anton Vinogradov 
Committed: Mon Nov 30 14:32:29 2015 +0300

--
 .../ignite/cache/store/spring/package-info.java | 21 
 .../discovery/tcp/ipfinder/zk/package-info.java | 21 
 2 files changed, 42 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/dc14cccd/modules/spring/src/main/java/org/apache/ignite/cache/store/spring/package-info.java
--
diff --git 
a/modules/spring/src/main/java/org/apache/ignite/cache/store/spring/package-info.java
 
b/modules/spring/src/main/java/org/apache/ignite/cache/store/spring/package-info.java
new file mode 100644
index 000..2ccce9e
--- /dev/null
+++ 
b/modules/spring/src/main/java/org/apache/ignite/cache/store/spring/package-info.java
@@ -0,0 +1,21 @@
+/*
+ *  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.
+ */
+
+/**
+ * Contains cache store session listener based on Spring transaction 
management.
+ */
+package org.apache.ignite.cache.store.spring;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/dc14cccd/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/zk/package-info.java
--
diff --git 
a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/zk/package-info.java
 
b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/zk/package-info.java
new file mode 100644
index 000..7263710
--- /dev/null
+++ 
b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/zk/package-info.java
@@ -0,0 +1,21 @@
+/*
+ *  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.
+ */
+
+/**
+ * Contains TCP Discovery IP Finder uses Apache ZooKeeper (ZK) to locate peer 
nodes.
+ */
+package org.apache.ignite.spi.discovery.tcp.ipfinder.zk;
\ No newline at end of file

[07/32] ignite git commit: Fixed GridCacheLocalIsolatedNodesSelfTest and GridCacheLocalFullApiMultithreadedSelfTest.testRemoveAllAsync tests.

[anovikov]

Fixed GridCacheLocalIsolatedNodesSelfTest and 
GridCacheLocalFullApiMultithreadedSelfTest.testRemoveAllAsync tests.


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

Branch: refs/heads/ignite-843-rc2
Commit: 407bf939a8beae32108cdb60bfba3efe3cc8d7c1
Parents: 8e605e9
Author: Tikhonov Nikolay 
Authored: Mon Nov 30 16:49:14 2015 +0300
Committer: Tikhonov Nikolay 
Committed: Mon Nov 30 16:49:14 2015 +0300

--
 .../GridCacheAbstractFullApiMultithreadedSelfTest.java  | 9 +++--
 .../cache/local/GridCacheLocalIsolatedNodesSelfTest.java| 6 +++---
 2 files changed, 10 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/407bf939/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java
index e89288f..5e43b2a 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java
@@ -22,6 +22,7 @@ import java.util.Collection;
 import java.util.Map;
 import java.util.Random;
 import java.util.Set;
+import java.util.HashSet;
 import java.util.TreeSet;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -341,12 +342,16 @@ public abstract class 
GridCacheAbstractFullApiMultithreadedSelfTest extends Grid
 
 IgniteCache cacheAsync = cache.withAsync();
 
+Set ids = new HashSet<>(set);
+
 cacheAsync.removeAll(rangeKeys(0, rnd));
 
 cacheAsync.future().get();
 
-for (int i = 0; i < rnd; i++)
-assert cache.localPeek("key" + i, CachePeekMode.ONHEAP) == 
null;
+for (int i = 0; i < rnd; i++) {
+if (ids.contains(i))
+assert cache.localPeek("key" + i, 
CachePeekMode.ONHEAP) == null;
+}
 }
 });
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/407bf939/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalIsolatedNodesSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalIsolatedNodesSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalIsolatedNodesSelfTest.java
index e6b66ca..53122c7 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalIsolatedNodesSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalIsolatedNodesSelfTest.java
@@ -66,7 +66,7 @@ public class GridCacheLocalIsolatedNodesSelfTest extends 
GridCommonAbstractTest
 assert !nid1.equals(nid3);
 
 // Local cache on first node only.
-CacheConfiguration ccfg1 = new 
CacheConfiguration<>("A");
+CacheConfiguration ccfg1 = new 
CacheConfiguration<>("A1");
 ccfg1.setCacheMode(LOCAL);
 ccfg1.setNodeFilter(new NodeIdFilter(nid1));
 
@@ -74,7 +74,7 @@ public class GridCacheLocalIsolatedNodesSelfTest extends 
GridCommonAbstractTest
 c1.put("g1", "c1");
 
 // Local cache on second node only.
-CacheConfiguration ccfg2 = new 
CacheConfiguration<>("A");
+CacheConfiguration ccfg2 = new 
CacheConfiguration<>("A2");
 ccfg2.setCacheMode(LOCAL);
 ccfg2.setNodeFilter(new NodeIdFilter(nid2));
 
@@ -82,7 +82,7 @@ public class GridCacheLocalIsolatedNodesSelfTest extends 
GridCommonAbstractTest
 c2.put("g2", "c2");
 
 // Local cache on third node only.
-CacheConfiguration ccfg3 = new 
CacheConfiguration<>("A");
+CacheConfiguration ccfg3 = new 
CacheConfiguration<>("A3");
 ccfg3.setCacheMode(LOCAL);
 ccfg3.setNodeFilter(new NodeIdFilter(nid3));
 

[28/32] ignite git commit: CacheFullApi testIgniteCacheIterator unmuted

[anovikov]

CacheFullApi testIgniteCacheIterator unmuted


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

Branch: refs/heads/ignite-843-rc2
Commit: c38976319154e13a320ab1b161d2caa8b7b82d35
Parents: 022cdaf
Author: ashutak 
Authored: Tue Dec 1 16:39:57 2015 +0300
Committer: ashutak 
Committed: Tue Dec 1 16:39:57 2015 +0300

--
 .../processors/cache/GridCacheAbstractFullApiSelfTest.java | 2 --
 1 file changed, 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/c3897631/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
index 084fe83..5af90e9 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
@@ -4127,8 +4127,6 @@ public abstract class GridCacheAbstractFullApiSelfTest 
extends GridCacheAbstract
  * @throws Exception If failed.
  */
 public void testIgniteCacheIterator() throws Exception {
-fail("https://issues.apache.org/jira/browse/IGNITE-1756;);
-
 IgniteCache cache = jcache(0);
 
 Iterator> it = cache.iterator();

[05/32] ignite git commit: ignite-1.5 Handle marshal/unmarshal prevVals in GridDhtAtomicUpdateRequest.

[anovikov]

ignite-1.5 Handle marshal/unmarshal prevVals in GridDhtAtomicUpdateRequest.


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

Branch: refs/heads/ignite-843-rc2
Commit: 0fcc1d18f7d403588e2f018458b1d16c81ed131c
Parents: c5304a9
Author: sboikov 
Authored: Mon Nov 30 15:15:06 2015 +0300
Committer: sboikov 
Committed: Mon Nov 30 15:15:06 2015 +0300

--
 .../cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/0fcc1d18/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java
index b3155a7..4f15fa1 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java
@@ -647,6 +647,8 @@ public class GridDhtAtomicUpdateRequest extends 
GridCacheMessage implements Grid
 
 prepareMarshalCacheObjects(nearVals, cctx);
 
+prepareMarshalCacheObjects(prevVals, cctx);
+
 if (forceTransformBackups) {
 // force addition of deployment info for entry processors if P2P 
is enabled globally.
 if (!addDepInfo && ctx.deploymentEnabled())
@@ -674,6 +676,8 @@ public class GridDhtAtomicUpdateRequest extends 
GridCacheMessage implements Grid
 
 finishUnmarshalCacheObjects(nearVals, cctx, ldr);
 
+finishUnmarshalCacheObjects(prevVals, cctx, ldr);
+
 if (forceTransformBackups) {
 entryProcessors = unmarshalCollection(entryProcessorsBytes, ctx, 
ldr);
 

[03/32] ignite git commit: ignite-1924

[anovikov]

ignite-1924


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

Branch: refs/heads/ignite-843-rc2
Commit: eeb584d070f72ab5457135ad15217316d75bba6a
Parents: dc14ccc
Author: Anton Vinogradov 
Authored: Mon Nov 30 14:49:29 2015 +0300
Committer: Anton Vinogradov 
Committed: Mon Nov 30 14:49:29 2015 +0300

--
 .../spi/communication/tcp/IgniteCacheSslStartStopSelfTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/eeb584d0/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteCacheSslStartStopSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteCacheSslStartStopSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteCacheSslStartStopSelfTest.java
index fe84c67..12bd020 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteCacheSslStartStopSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteCacheSslStartStopSelfTest.java
@@ -27,12 +27,12 @@ import static 
org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
 /**
  *
  */
-//Can fail as described at https://issues.apache.org/jira/browse/IGNITE-1924
 public class IgniteCacheSslStartStopSelfTest extends 
IgniteCachePutRetryAbstractSelfTest {
 /** {@inheritDoc} */
 @Override protected IgniteConfiguration getConfiguration(String gridName) 
throws Exception {
 IgniteConfiguration cfg = super.getConfiguration(gridName);
 
+fail("https://issues.apache.org/jira/browse/IGNITE-1924;);
 cfg.setSslContextFactory(GridTestUtils.sslFactory());
 
 return cfg;

[15/32] ignite git commit: fixed version

[anovikov]

fixed version


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

Branch: refs/heads/ignite-843-rc2
Commit: f5e9918f80c6535844fffdb4ce63399e233f7b00
Parents: ecb3cb4
Author: Yakov Zhdanov 
Authored: Mon Nov 30 23:10:12 2015 +0300
Committer: Yakov Zhdanov 
Committed: Mon Nov 30 23:10:12 2015 +0300

--
 modules/platforms/cpp/common/configure.ac| 2 +-
 modules/platforms/cpp/core-test/configure.ac | 2 +-
 modules/platforms/cpp/core/configure.ac  | 2 +-
 modules/platforms/cpp/examples/configure.ac  | 2 +-
 modules/platforms/cpp/ignite/configure.ac| 2 +-
 .../dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs   | 4 ++--
 .../Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs  | 4 ++--
 .../dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs   | 4 ++--
 .../dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs | 4 ++--
 .../platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs| 4 ++--
 .../examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs   | 4 ++--
 .../Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs | 4 ++--
 12 files changed, 19 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/f5e9918f/modules/platforms/cpp/common/configure.ac
--
diff --git a/modules/platforms/cpp/common/configure.ac 
b/modules/platforms/cpp/common/configure.ac
index 229cb9d..8f53ea3 100644
--- a/modules/platforms/cpp/common/configure.ac
+++ b/modules/platforms/cpp/common/configure.ac
@@ -19,7 +19,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.69])
-AC_INIT([Apache Ignite JNI bridge for C++], [1.5.1.0], 
[d...@ignite.apache.org], [ignite-common], [ignite.apache.org])
+AC_INIT([Apache Ignite JNI bridge for C++], [1.5.0-EA], 
[d...@ignite.apache.org], [ignite-common], [ignite.apache.org])
 AC_CONFIG_SRCDIR(src)
 
 AC_CANONICAL_SYSTEM

http://git-wip-us.apache.org/repos/asf/ignite/blob/f5e9918f/modules/platforms/cpp/core-test/configure.ac
--
diff --git a/modules/platforms/cpp/core-test/configure.ac 
b/modules/platforms/cpp/core-test/configure.ac
index 1612bea..14baf55 100644
--- a/modules/platforms/cpp/core-test/configure.ac
+++ b/modules/platforms/cpp/core-test/configure.ac
@@ -19,7 +19,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.69])
-AC_INIT([Apache Ignite C++ Test], [1.5.1.0], [d...@ignite.apache.org], 
[ignite], [ignite.apache.org])
+AC_INIT([Apache Ignite C++ Test], [1.5.0-EA], [d...@ignite.apache.org], 
[ignite], [ignite.apache.org])
 AC_CONFIG_SRCDIR(src)
 
 AC_CANONICAL_SYSTEM

http://git-wip-us.apache.org/repos/asf/ignite/blob/f5e9918f/modules/platforms/cpp/core/configure.ac
--
diff --git a/modules/platforms/cpp/core/configure.ac 
b/modules/platforms/cpp/core/configure.ac
index 2733a46..f10eeb9 100644
--- a/modules/platforms/cpp/core/configure.ac
+++ b/modules/platforms/cpp/core/configure.ac
@@ -19,7 +19,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.69])
-AC_INIT([Apache Ignite C++], [1.5.1.0], [d...@ignite.apache.org], [ignite], 
[ignite.apache.org])
+AC_INIT([Apache Ignite C++], [1.5.0-EA], [d...@ignite.apache.org], [ignite], 
[ignite.apache.org])
 AC_CONFIG_SRCDIR(src)
 
 AC_CANONICAL_SYSTEM

http://git-wip-us.apache.org/repos/asf/ignite/blob/f5e9918f/modules/platforms/cpp/examples/configure.ac
--
diff --git a/modules/platforms/cpp/examples/configure.ac 
b/modules/platforms/cpp/examples/configure.ac
index 3ee5330..2d30028 100644
--- a/modules/platforms/cpp/examples/configure.ac
+++ b/modules/platforms/cpp/examples/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.69])
-AC_INIT([Ingnite C++ 
examples],[1.5.1.0],[d...@ignite.apache.org],[ignite-examples],[ignite.apache.org])
+AC_INIT([Ingnite C++ 
examples],[1.5.0-EA],[d...@ignite.apache.org],[ignite-examples],[ignite.apache.org])
 AC_CONFIG_SRCDIR(src)
 
 AC_CANONICAL_SYSTEM

http://git-wip-us.apache.org/repos/asf/ignite/blob/f5e9918f/modules/platforms/cpp/ignite/configure.ac
--
diff --git a/modules/platforms/cpp/ignite/configure.ac 

[18/32] ignite git commit: Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5

[anovikov]

Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5


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

Branch: refs/heads/ignite-843-rc2
Commit: b64100a32029723e5cbc94dd09fde24f78143cc9
Parents: 3492dea 9830300
Author: sboikov 
Authored: Tue Dec 1 12:19:47 2015 +0300
Committer: sboikov 
Committed: Tue Dec 1 12:19:47 2015 +0300

--
 RELEASE_NOTES.txt | 2 ++
 1 file changed, 2 insertions(+)
--

[32/32] ignite git commit: Merge branch 'ignite-1.5' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-843-rc2

[anovikov]

Merge branch 'ignite-1.5' of https://git-wip-us.apache.org/repos/asf/ignite 
into ignite-843-rc2


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

Branch: refs/heads/ignite-843-rc2
Commit: 78f9e8fcf1ece6188378707e485c67990464e33e
Parents: c9026b9 3ac1504
Author: Andrey 
Authored: Wed Dec 2 09:41:52 2015 +0700
Committer: Andrey 
Committed: Wed Dec 2 09:41:52 2015 +0700

--
 RELEASE_NOTES.txt   |   2 +
 examples/pom.xml|   5 +-
 examples/schema-import/pom.xml  |   2 +-
 modules/aop/pom.xml |   2 +-
 modules/apache-license-gen/pom.xml  |   2 +-
 modules/aws/pom.xml |   2 +-
 modules/camel/pom.xml   |   5 +-
 .../ignite/stream/camel/package-info.java   |  21 +++
 .../ignite/stream/camel/package-info.java   |  21 +++
 modules/clients/pom.xml |   2 +-
 modules/cloud/pom.xml   |   2 +-
 modules/codegen/pom.xml |   2 +-
 modules/core/pom.xml|   2 +-
 .../org/apache/ignite/internal/IgnitionEx.java  |   4 +-
 .../GridDeploymentPerVersionStore.java  |  12 +-
 .../internal/portable/BinaryFieldAccessor.java  |  83 +++--
 .../internal/portable/BinaryReaderExImpl.java   |  11 ++
 .../CacheDefaultBinaryAffinityKeyMapper.java|  19 +-
 .../processors/cache/GridCacheAdapter.java  |   8 +-
 .../processors/cache/GridCacheContext.java  |  37 ++--
 .../GridCacheDefaultAffinityKeyMapper.java  |   9 +-
 .../processors/cache/GridCacheMapEntry.java |   6 +-
 .../GridCachePartitionExchangeManager.java  |  23 +--
 .../processors/cache/GridCachePreloader.java|   5 +
 .../cache/GridCachePreloaderAdapter.java|   7 +-
 .../processors/cache/GridCacheProcessor.java|  14 +-
 .../processors/cache/GridCacheProxyImpl.java|  12 ++
 .../processors/cache/IgniteCacheProxy.java  |  24 +++
 .../processors/cache/IgniteInternalCache.java   |   9 +
 .../distributed/dht/GridDhtLockFuture.java  |  17 +-
 .../dht/atomic/GridDhtAtomicCache.java  |   4 +-
 .../dht/atomic/GridDhtAtomicUpdateRequest.java  |   4 +
 .../dht/preloader/GridDhtPartitionDemander.java |  32 ++--
 .../dht/preloader/GridDhtPreloader.java |  27 +++
 .../distributed/near/GridNearGetFuture.java |  12 +-
 .../CacheObjectBinaryProcessorImpl.java |   7 +-
 .../cache/transactions/IgniteTxHandler.java |   2 +-
 .../handlers/query/QueryCommandHandler.java |   2 +-
 .../ignite/internal/util/IgniteUtils.java   |   8 +
 .../communication/tcp/TcpCommunicationSpi.java  |  18 +-
 .../spi/discovery/tcp/TcpDiscoverySpi.java  |   2 -
 .../core/src/main/resources/ignite.properties   |   2 +-
 .../portable/BinaryMarshallerSelfTest.java  | 186 ---
 .../CachePutEventListenerErrorSelfTest.java |  35 ++--
 ...cheAbstractFullApiMultithreadedSelfTest.java |   9 +-
 .../cache/GridCacheAbstractFullApiSelfTest.java |   2 -
 .../cache/GridCacheClearSelfTest.java   |   9 +-
 ...inodeUpdateNearEnabledNoBackupsSelfTest.java |   9 +-
 .../cache/IgniteCacheAbstractTest.java  |   3 +
 .../IgniteCacheStoreValueAbstractTest.java  | 111 ++-
 .../cache/IgniteCacheTxPreloadNoWriteTest.java  |   2 +-
 ...eAbstractDataStructuresFailoverSelfTest.java |  32 ++--
 ...idCacheNearOnlyMultiNodeFullApiSelfTest.java |   3 +-
 ...eRebalancingUnmarshallingFailedSelfTest.java |  13 +-
 .../GridCacheLocalIsolatedNodesSelfTest.java|   6 +-
 .../cache/GridCacheCommandHandlerSelfTest.java  |   7 +-
 .../internal/util/nio/GridNioSelfTest.java  |  69 +++
 .../tcp/IgniteCacheSslStartStopSelfTest.java|   2 +-
 ...ObjectsCacheDataStructuresSelfTestSuite.java |   4 +
 ...BinaryObjectsCacheExpiryPolicyTestSuite.java |   4 +
 ...gniteBinaryObjectsCacheRestartTestSuite.java |   4 +
 .../IgniteBinaryObjectsCacheTestSuite2.java |   4 +
 .../IgniteBinaryObjectsCacheTestSuite3.java |   4 +
 .../IgniteBinaryObjectsCacheTestSuite4.java |   4 +
 ...IgniteBinaryObjectsComputeGridTestSuite.java |   4 +
 .../IgnitePortableCacheTestSuite.java   |   1 -
 modules/extdata/p2p/pom.xml |   2 +-
 .../extdata/uri/modules/uri-dependency/pom.xml  |   2 +-
 modules/extdata/uri/pom.xml |   4 +-
 modules/flume/pom.xml   |   5 +-
 .../ignite/stream/flume/package-info.java   |  21 +++
 .../ignite/stream/flume/package-info.java   |  21 +++
 modules/gce/pom.xml |   2 +-
 

[08/32] ignite git commit: Fixed GridCacheNearOnlyMultiNodeP2PDisabledFullApiSelfTest.testReaderTtlNoTx test.

[anovikov]

Fixed GridCacheNearOnlyMultiNodeP2PDisabledFullApiSelfTest.testReaderTtlNoTx 
test.


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

Branch: refs/heads/ignite-843-rc2
Commit: eed4b1c245d8a22d4e9ae2ce7200089025c8c5ae
Parents: 407bf93
Author: Tikhonov Nikolay 
Authored: Mon Nov 30 17:09:15 2015 +0300
Committer: Tikhonov Nikolay 
Committed: Mon Nov 30 17:09:15 2015 +0300

--
 .../near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/eed4b1c2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
index c4407fe..eaab103 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
@@ -413,7 +413,8 @@ public class GridCacheNearOnlyMultiNodeFullApiSelfTest 
extends GridCachePartitio
 return true;
 }
 catch (GridCacheEntryRemovedException e) {
-throw new RuntimeException(e);
+// If e0.valueBytes() thrown this exception then entry has 
been removed.
+return true;
 }
 }
 }, Math.min(ttl * 10, getTestTimeout(;

[01/32] ignite git commit: Package-info files.

[anovikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc2 88ceba9cb -> 78f9e8fcf


Package-info files.


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

Branch: refs/heads/ignite-843-rc2
Commit: 346733f43da891c2c343ea8e924032acaa5f41b7
Parents: 0b61333
Author: Anton Vinogradov 
Authored: Mon Nov 30 14:25:50 2015 +0300
Committer: Anton Vinogradov 
Committed: Mon Nov 30 14:25:50 2015 +0300

--
 .../ignite/stream/camel/package-info.java   | 21 
 .../ignite/stream/camel/package-info.java   | 21 
 .../ignite/stream/flume/package-info.java   | 21 
 .../ignite/stream/flume/package-info.java   | 21 
 .../ignite/stream/jms11/package-info.java   | 21 
 .../ignite/stream/jms11/package-info.java   | 21 
 .../ignite/stream/kafka/package-info.java   | 21 
 .../ignite/stream/kafka/package-info.java   | 21 
 .../apache/ignite/stream/mqtt/package-info.java | 21 
 .../apache/ignite/stream/mqtt/package-info.java | 21 
 .../ignite/stream/twitter/package-info.java | 21 
 .../ignite/stream/twitter/package-info.java | 21 
 12 files changed, 252 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/346733f4/modules/camel/src/main/java/org/apache/ignite/stream/camel/package-info.java
--
diff --git 
a/modules/camel/src/main/java/org/apache/ignite/stream/camel/package-info.java 
b/modules/camel/src/main/java/org/apache/ignite/stream/camel/package-info.java
new file mode 100644
index 000..f084813
--- /dev/null
+++ 
b/modules/camel/src/main/java/org/apache/ignite/stream/camel/package-info.java
@@ -0,0 +1,21 @@
+/*
+ *  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.
+ */
+
+/**
+ * Contains implementation of Camel Streamer.
+ */
+package org.apache.ignite.stream.camel;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/346733f4/modules/camel/src/test/java/org/apache/ignite/stream/camel/package-info.java
--
diff --git 
a/modules/camel/src/test/java/org/apache/ignite/stream/camel/package-info.java 
b/modules/camel/src/test/java/org/apache/ignite/stream/camel/package-info.java
new file mode 100644
index 000..f084813
--- /dev/null
+++ 
b/modules/camel/src/test/java/org/apache/ignite/stream/camel/package-info.java
@@ -0,0 +1,21 @@
+/*
+ *  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.
+ */
+
+/**
+ * Contains implementation of Camel Streamer.
+ */
+package org.apache.ignite.stream.camel;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/346733f4/modules/flume/src/main/java/org/apache/ignite/stream/flume/package-info.java
--
diff --git 

[25/32] ignite git commit: ignite-1.5 Skip message send on node stop.

[anovikov]

ignite-1.5 Skip message send on node stop.


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

Branch: refs/heads/ignite-843-rc2
Commit: 74f93b650c40b8551b333dfbc486e549fc38f41e
Parents: 3e7c532
Author: sboikov 
Authored: Tue Dec 1 15:25:11 2015 +0300
Committer: sboikov 
Committed: Tue Dec 1 15:25:11 2015 +0300

--
 .../dht/preloader/GridDhtPartitionDemander.java | 12 +++-
 1 file changed, 7 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/74f93b65/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
index 728e792..eb9e97f 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
@@ -283,7 +283,7 @@ public class GridDhtPartitionDemander {
  * @param force {@code True} if dummy reassign.
  * @param caches Rebalancing of these caches will be finished before this 
started.
  * @param cnt Counter.
- * @throws IgniteCheckedException Exception
+ * @throws IgniteCheckedException If failed.
  */
 Callable addAssignments(final GridDhtPreloaderAssignments 
assigns, boolean force,
 final Collection caches, int cnt) {
@@ -741,7 +741,7 @@ public class GridDhtPartitionDemander {
 private static final long serialVersionUID = 1L;
 
 /** Should EVT_CACHE_REBALANCE_STOPPED event be sent of not. */
-private final boolean sendStoppedEvnt;
+private final boolean sndStoppedEvnt;
 
 /** */
 private final GridCacheContext cctx;
@@ -770,6 +770,7 @@ public class GridDhtPartitionDemander {
  * @param cctx Context.
  * @param log Logger.
  * @param sentStopEvnt Stop event flag.
+ * @param updateSeq Update sequence.
  */
 RebalanceFuture(GridDhtPreloaderAssignments assigns,
 GridCacheContext cctx,
@@ -782,7 +783,7 @@ public class GridDhtPartitionDemander {
 this.topVer = assigns.topologyVersion();
 this.cctx = cctx;
 this.log = log;
-this.sendStoppedEvnt = sentStopEvnt;
+this.sndStoppedEvnt = sentStopEvnt;
 this.updateSeq = updateSeq;
 }
 
@@ -794,7 +795,7 @@ public class GridDhtPartitionDemander {
 this.topVer = null;
 this.cctx = null;
 this.log = null;
-this.sendStoppedEvnt = false;
+this.sndStoppedEvnt = false;
 this.updateSeq = -1;
 }
 
@@ -1007,7 +1008,7 @@ public class GridDhtPartitionDemander {
  */
 private void checkIsDone(boolean cancelled) {
 if (remaining.isEmpty()) {
-if (cctx.events().isRecordable(EVT_CACHE_REBALANCE_STOPPED) && 
(!cctx.isReplicated() || sendStoppedEvnt))
+if (cctx.events().isRecordable(EVT_CACHE_REBALANCE_STOPPED) && 
(!cctx.isReplicated() || sndStoppedEvnt))
 preloadEvent(EVT_CACHE_REBALANCE_STOPPED, 
exchFut.discoveryEvent());
 
 if (log.isDebugEnabled())
@@ -1385,6 +1386,7 @@ public class GridDhtPartitionDemander {
 /**
  * @param node Node.
  * @param d D.
+ * @throws IgniteCheckedException If failed.
  */
 public void run(ClusterNode node, GridDhtPartitionDemandMessage d) 
throws IgniteCheckedException {
 demandLock.readLock().lock();

[21/32] ignite git commit: ignite-1.5 Disabled shmem in test.

[anovikov]

ignite-1.5 Disabled shmem in test.


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

Branch: refs/heads/ignite-843-rc2
Commit: e11e4cb5362899f9f5429cbb4683063ad036b8cd
Parents: fb4ef34
Author: sboikov 
Authored: Tue Dec 1 13:36:52 2015 +0300
Committer: sboikov 
Committed: Tue Dec 1 13:36:52 2015 +0300

--
 .../ignite/internal/processors/cache/IgniteCacheAbstractTest.java | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/e11e4cb5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java
index 164ac66..7df72f0 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java
@@ -33,6 +33,7 @@ import org.apache.ignite.configuration.CacheConfiguration;
 import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.configuration.NearCacheConfiguration;
 import org.apache.ignite.lang.IgniteBiInClosure;
+import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi;
 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;
@@ -88,6 +89,8 @@ public abstract class IgniteCacheAbstractTest extends 
GridCommonAbstractTest {
 @Override protected IgniteConfiguration getConfiguration(String gridName) 
throws Exception {
 IgniteConfiguration cfg = super.getConfiguration(gridName);
 
+
((TcpCommunicationSpi)cfg.getCommunicationSpi()).setSharedMemoryPort(-1);
+
 TcpDiscoverySpi disco = new TcpDiscoverySpi().setForceServerMode(true);
 
 disco.setMaxMissedHeartbeats(Integer.MAX_VALUE);

[09/32] ignite git commit: Ignite-1.5 - Fixing tests.

[anovikov]

Ignite-1.5 - Fixing tests.


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

Branch: refs/heads/ignite-843-rc2
Commit: aee20d9d6822fd13fd437420b439ea18e99d0223
Parents: eed4b1c
Author: Alexey Goncharuk 
Authored: Mon Nov 30 17:27:41 2015 +0300
Committer: Alexey Goncharuk 
Committed: Mon Nov 30 17:27:41 2015 +0300

--
 .../GridDeploymentPerVersionStore.java  |  12 +-
 .../distributed/dht/GridDhtLockFuture.java  |  17 ++-
 .../communication/tcp/TcpCommunicationSpi.java  |  12 +-
 .../IgniteCacheStoreValueAbstractTest.java  | 111 +++
 .../cache/IgniteCacheTxPreloadNoWriteTest.java  |   2 +-
 ...eRebalancingUnmarshallingFailedSelfTest.java |  13 ++-
 6 files changed, 104 insertions(+), 63 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/aee20d9d/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java
index fabbcb2..5e30bf6 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java
@@ -145,11 +145,15 @@ public class GridDeploymentPerVersionStore extends 
GridDeploymentStoreAdapter {
 "nodes: " + dep);
 }
 }
-else if (log.isDebugEnabled())
-log.debug("Preserving deployment without 
node participants: " + dep);
+else {
+if (log.isDebugEnabled())
+log.debug("Preserving deployment 
without node participants: " + dep);
+}
+}
+else {
+if (log.isDebugEnabled())
+log.debug("Keeping deployment as it still 
has participants: " + dep);
 }
-else if (log.isDebugEnabled())
-log.debug("Keeping deployment as it still has 
participants: " + dep);
 }
 
 if (deps.isEmpty())

http://git-wip-us.apache.org/repos/asf/ignite/blob/aee20d9d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
index 2b5d5a4..f0d2e15 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
@@ -738,11 +738,22 @@ public final class GridDhtLockFuture extends 
GridCompoundIdentityFuture
 if (!success && !stopping)
 undoLocks(true);
 
-if (tx != null)
+boolean set = false;
+
+if (tx != null) {
 cctx.tm().txContext(tx);
 
-if (err == null && !stopping)
-loadMissingFromStore();
+set = cctx.tm().setTxTopologyHint(tx);
+}
+
+try {
+if (err == null && !stopping)
+loadMissingFromStore();
+}
+finally {
+if (set)
+cctx.tm().setTxTopologyHint(null);
+}
 
 if (super.onDone(success, err)) {
 if (log.isDebugEnabled())

http://git-wip-us.apache.org/repos/asf/ignite/blob/aee20d9d/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
index b2f0f65..9f8bae3 100644
--- 

[2/2] ignite git commit: Merge remote-tracking branch 'origin/ignite-843-rc2' into ignite-843-rc2

[akuznetsov]

Merge remote-tracking branch 'origin/ignite-843-rc2' into ignite-843-rc2


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

Branch: refs/heads/ignite-843-rc2
Commit: 680ce88b527cfd0683640e6eb2c1c51a0986a859
Parents: 00a9a09 78f9e8f
Author: Alexey Kuznetsov 
Authored: Wed Dec 2 10:25:50 2015 +0700
Committer: Alexey Kuznetsov 
Committed: Wed Dec 2 10:25:50 2015 +0700

--
 RELEASE_NOTES.txt   |   2 +
 examples/pom.xml|   5 +-
 examples/schema-import/pom.xml  |   2 +-
 modules/aop/pom.xml |   2 +-
 modules/apache-license-gen/pom.xml  |   2 +-
 modules/aws/pom.xml |   2 +-
 modules/camel/pom.xml   |   5 +-
 .../ignite/stream/camel/package-info.java   |  21 +++
 .../ignite/stream/camel/package-info.java   |  21 +++
 modules/clients/pom.xml |   2 +-
 modules/cloud/pom.xml   |   2 +-
 modules/codegen/pom.xml |   2 +-
 .../control-center-web/src/main/js/app/index.js |   2 +-
 .../app/modules/states/password-reset/index.js  |  40 
 .../js/app/modules/states/password/index.js |  40 
 modules/core/pom.xml|   2 +-
 .../org/apache/ignite/internal/IgnitionEx.java  |   4 +-
 .../GridDeploymentPerVersionStore.java  |  12 +-
 .../internal/portable/BinaryFieldAccessor.java  |  83 +++--
 .../internal/portable/BinaryReaderExImpl.java   |  11 ++
 .../CacheDefaultBinaryAffinityKeyMapper.java|  19 +-
 .../processors/cache/GridCacheAdapter.java  |   8 +-
 .../processors/cache/GridCacheContext.java  |  37 ++--
 .../GridCacheDefaultAffinityKeyMapper.java  |   9 +-
 .../processors/cache/GridCacheMapEntry.java |   6 +-
 .../GridCachePartitionExchangeManager.java  |  23 +--
 .../processors/cache/GridCachePreloader.java|   5 +
 .../cache/GridCachePreloaderAdapter.java|   7 +-
 .../processors/cache/GridCacheProcessor.java|  14 +-
 .../processors/cache/GridCacheProxyImpl.java|  12 ++
 .../processors/cache/IgniteCacheProxy.java  |  24 +++
 .../processors/cache/IgniteInternalCache.java   |   9 +
 .../distributed/dht/GridDhtLockFuture.java  |  17 +-
 .../dht/atomic/GridDhtAtomicCache.java  |   4 +-
 .../dht/atomic/GridDhtAtomicUpdateRequest.java  |   4 +
 .../dht/preloader/GridDhtPartitionDemander.java |  32 ++--
 .../dht/preloader/GridDhtPreloader.java |  27 +++
 .../distributed/near/GridNearGetFuture.java |  12 +-
 .../CacheObjectBinaryProcessorImpl.java |   7 +-
 .../cache/transactions/IgniteTxHandler.java |   2 +-
 .../handlers/query/QueryCommandHandler.java |   2 +-
 .../ignite/internal/util/IgniteUtils.java   |   8 +
 .../communication/tcp/TcpCommunicationSpi.java  |  18 +-
 .../spi/discovery/tcp/TcpDiscoverySpi.java  |   2 -
 .../core/src/main/resources/ignite.properties   |   2 +-
 .../portable/BinaryMarshallerSelfTest.java  | 186 ---
 .../CachePutEventListenerErrorSelfTest.java |  35 ++--
 ...cheAbstractFullApiMultithreadedSelfTest.java |   9 +-
 .../cache/GridCacheAbstractFullApiSelfTest.java |   2 -
 .../cache/GridCacheClearSelfTest.java   |   9 +-
 ...inodeUpdateNearEnabledNoBackupsSelfTest.java |   9 +-
 .../cache/IgniteCacheAbstractTest.java  |   3 +
 .../IgniteCacheStoreValueAbstractTest.java  | 111 ++-
 .../cache/IgniteCacheTxPreloadNoWriteTest.java  |   2 +-
 ...eAbstractDataStructuresFailoverSelfTest.java |  32 ++--
 ...idCacheNearOnlyMultiNodeFullApiSelfTest.java |   3 +-
 ...eRebalancingUnmarshallingFailedSelfTest.java |  13 +-
 .../GridCacheLocalIsolatedNodesSelfTest.java|   6 +-
 .../cache/GridCacheCommandHandlerSelfTest.java  |   7 +-
 .../internal/util/nio/GridNioSelfTest.java  |  69 +++
 .../tcp/IgniteCacheSslStartStopSelfTest.java|   2 +-
 ...ObjectsCacheDataStructuresSelfTestSuite.java |   4 +
 ...BinaryObjectsCacheExpiryPolicyTestSuite.java |   4 +
 ...gniteBinaryObjectsCacheRestartTestSuite.java |   4 +
 .../IgniteBinaryObjectsCacheTestSuite2.java |   4 +
 .../IgniteBinaryObjectsCacheTestSuite3.java |   4 +
 .../IgniteBinaryObjectsCacheTestSuite4.java |   4 +
 ...IgniteBinaryObjectsComputeGridTestSuite.java |   4 +
 .../IgnitePortableCacheTestSuite.java   |   1 -
 modules/extdata/p2p/pom.xml |   2 +-
 .../extdata/uri/modules/uri-dependency/pom.xml  |   2 +-
 modules/extdata/uri/pom.xml |   4 +-
 modules/flume/pom.xml   |   5 +-
 

Git Push Summary

[sboikov]

Repository: ignite
Updated Tags:  refs/tags/ignite-1.5.0-b1-rc1 [created] 2f105d230

svn commit: r1717490 - /ignite/site/trunk/community/contribute.html

[dmagda]

Author: dmagda
Date: Tue Dec  1 18:21:17 2015
New Revision: 1717490

URL: http://svn.apache.org/viewvc?rev=1717490=rev
Log:
Replcaced patch-based contribution's way information with the pull-request based

Modified:
ignite/site/trunk/community/contribute.html

Modified: ignite/site/trunk/community/contribute.html
URL: 
http://svn.apache.org/viewvc/ignite/site/trunk/community/contribute.html?rev=1717490=1717489=1717490=diff
==
--- ignite/site/trunk/community/contribute.html (original)
+++ ignite/site/trunk/community/contribute.html Tue Dec  1 18:21:17 2015
@@ -159,14 +159,8 @@ under the License.
 Pick a ticket from
 https://issues.apache.org/jira/browse/IGNITE; 
target="_blank">Ignite Jira
 
-Create a branch in GIT (same name as the ticket, all 
lowercase)
-When ready, submit a patch in Jira and assign to a 
committer
-
-Send email to the mailto:d...@ignite.apache.org;>dev list stating that
-patch is ready
-
-The committer will provide comments after review.
-If the patch is rejected, address comments and repeat the 
process.
+Follow GitHub pull-request's based contribution way that 
is described 
+https://cwiki.apache.org/confluence/display/IGNITE/How+to+Contribute#HowtoContribute-1.CreateGitHubpull-request;>here
 in details.
 
 
 

[2/2] 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/7530ec1c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7530ec1c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7530ec1c

Branch: refs/heads/ignite-843-rc2
Commit: 7530ec1c996aaebe8360b59303acf0f091d7b5c1
Parents: 1297d55
Author: Andrey 
Authored: Wed Dec 2 14:19:39 2015 +0700
Committer: Andrey 
Committed: Wed Dec 2 14:19:39 2015 +0700

--
 .../src/main/js/controllers/common-module.js | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/7530ec1c/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 a126f41..649628e 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
@@ -2094,12 +2094,12 @@ consoleModule.controller('agent-download', [
  * Close dialog and go by specified link.
  */
 $scope.goBack = function () {
-if (_agentDownloadModal.backLink)
-$state.go(_agentDownloadModal.backLink);
-
 _stopInterval();
 
 _agentDownloadModal.hide();
+
+if (_agentDownloadModal.backLink)
+$state.go(_agentDownloadModal.backLink);
 };
 
 $scope.downloadAgent = function () {
@@ -2212,7 +2212,7 @@ consoleModule.controller('agent-download', [
 
 _agentDownloadModal.checkFn = checkFn;
 
-_agentDownloadModal.backLink = '/';
+_agentDownloadModal.backLink = 'base.configuration.clusters';
 
 $scope.agentDownloadBackTo = 'Configuration';
 

[1/2] ignite git commit: IGNITE-843 Fixed version.

[anovikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc2 680ce88b5 -> 7530ec1c9


IGNITE-843 Fixed version.


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

Branch: refs/heads/ignite-843-rc2
Commit: 1297d554af25e71b87e6d75f19a7017118b277fa
Parents: 680ce88
Author: Andrey 
Authored: Wed Dec 2 13:41:11 2015 +0700
Committer: Andrey 
Committed: Wed Dec 2 13:41:11 2015 +0700

--
 modules/control-center-agent/pom.xml |  2 +-
 modules/schema-import-db/pom.xml | 34 +++
 2 files changed, 17 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/1297d554/modules/control-center-agent/pom.xml
--
diff --git a/modules/control-center-agent/pom.xml 
b/modules/control-center-agent/pom.xml
index af85efe..4cde704 100644
--- a/modules/control-center-agent/pom.xml
+++ b/modules/control-center-agent/pom.xml
@@ -31,7 +31,7 @@
 
 
 ignite-control-center-agent
-1.5.0-SNAPSHOT
+1.5.0-b1-SNAPSHOT
 
 
 9.2.12.v20150709

http://git-wip-us.apache.org/repos/asf/ignite/blob/1297d554/modules/schema-import-db/pom.xml
--
diff --git a/modules/schema-import-db/pom.xml b/modules/schema-import-db/pom.xml
index 3b9d7e6..8c544b2 100644
--- a/modules/schema-import-db/pom.xml
+++ b/modules/schema-import-db/pom.xml
@@ -1,23 +1,21 @@
 
 
 
+  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.
+-->
 
 

[1/2] ignite git commit: IGNITE-843 Minor fixes in comments.

[akuznetsov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc2 78f9e8fcf -> 680ce88b5


IGNITE-843 Minor fixes in comments.


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

Branch: refs/heads/ignite-843-rc2
Commit: 00a9a09fe814176dd7e3c53d440aae0404be9e7f
Parents: 88ceba9
Author: Alexey Kuznetsov 
Authored: Wed Dec 2 10:25:02 2015 +0700
Committer: Alexey Kuznetsov 
Committed: Wed Dec 2 10:25:15 2015 +0700

--
 modules/control-center-web/src/main/js/gulpfile.js/index.js | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/00a9a09f/modules/control-center-web/src/main/js/gulpfile.js/index.js
--
diff --git a/modules/control-center-web/src/main/js/gulpfile.js/index.js 
b/modules/control-center-web/src/main/js/gulpfile.js/index.js
index 79c0847..751b0ea 100644
--- a/modules/control-center-web/src/main/js/gulpfile.js/index.js
+++ b/modules/control-center-web/src/main/js/gulpfile.js/index.js
@@ -18,9 +18,11 @@
 var gulp = require('gulp');
 var requireDir = require('require-dir');
 
-// Require all tasks in gulpfile.js/tasks, including subfolders
+// Require all tasks in gulpfile.js/tasks, including subfolders.
 requireDir('./tasks', { recurse: true });
 
-// Summary tasks
+// Default no-arg task.
 gulp.task('default', ['build']);
+
+// Build + watch + connect task.
 gulp.task('watch', ['build', 'bundle:watch', 'sass:watch', 'jade:watch', 
'copy:watch', 'connect']);

[45/50] [abbrv] ignite git commit: IGNITE-2015 Fixed marshaller selection.

[anovikov]

IGNITE-2015 Fixed marshaller selection.


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

Branch: refs/heads/ignite-843-rc2
Commit: b79a700e31e0d9e083e273400514d4e2c91d119e
Parents: 2f7b80d
Author: Alexey Kuznetsov 
Authored: Tue Dec 1 15:22:03 2015 +0700
Committer: Alexey Kuznetsov 
Committed: Tue Dec 1 15:22:03 2015 +0700

--
 .../src/main/js/controllers/clusters-controller.js | 2 +-
 .../src/main/js/controllers/models/clusters.json   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/b79a700e/modules/control-center-web/src/main/js/controllers/clusters-controller.js
--
diff --git 
a/modules/control-center-web/src/main/js/controllers/clusters-controller.js 
b/modules/control-center-web/src/main/js/controllers/clusters-controller.js
index 96a42a7..cfe3409 100644
--- a/modules/control-center-web/src/main/js/controllers/clusters-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/clusters-controller.js
@@ -121,7 +121,7 @@ consoleModule.controller('clustersController', [
 
 $scope.segmentationPolicy = $common.mkOptions(['RESTART_JVM', 'STOP', 
'NOOP']);
 
-$scope.marshallers = $common.mkOptions(['OptimizedMarshaller', 
'JdkMarshaller']);
+$scope.marshallers = $common.mkOptions(['OptimizedMarshaller', 
'JdkMarshaller', undefined]);
 
 $scope.sslKeyAlgorithms = ['SumX509', 'X509'];
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/b79a700e/modules/control-center-web/src/main/js/controllers/models/clusters.json
--
diff --git 
a/modules/control-center-web/src/main/js/controllers/models/clusters.json 
b/modules/control-center-web/src/main/js/controllers/models/clusters.json
index 96ac6bd..7947fea 100644
--- a/modules/control-center-web/src/main/js/controllers/models/clusters.json
+++ b/modules/control-center-web/src/main/js/controllers/models/clusters.json
@@ -1319,7 +1319,7 @@
   "items": "marshallers",
   "tip": [
 "Instance of marshaller to use in grid",
-"If not provided, OptimizedMarshaller will be used on Java HotSpot 
VM, and JdkMarshaller will be used on other VMs"
+"If not provided, BinaryMarshaller will be used"
   ],
   "details": {
 "OptimizedMarshaller": {

[47/50] [abbrv] ignite git commit: IGNITE-843 Merge ignite_modules.

[anovikov]

http://git-wip-us.apache.org/repos/asf/ignite/blob/6699b1e9/modules/control-center-web/src/main/js/views/sql/sql.jade
--
diff --git a/modules/control-center-web/src/main/js/views/sql/sql.jade 
b/modules/control-center-web/src/main/js/views/sql/sql.jade
index 4c50210..aff65ce 100644
--- a/modules/control-center-web/src/main/js/views/sql/sql.jade
+++ b/modules/control-center-web/src/main/js/views/sql/sql.jade
@@ -39,157 +39,155 @@ mixin chart-settings(mdl)
 .col-xs-4
 +result-toolbar
 
+.row
+.col-sm-12
+.docs-content(ng-controller='sqlController' 
dw-loading='loadingNotebookScreen' dw-loading-options='{text: "Loading notebook 
screen...", className: "page-loading-overlay"}')
+div(ng-if='loaded && !notebook' style='text-align: center')
+h2 Failed to load notebook
+label.col-sm-12 Notebook not accessible any more. Go back to 
configuration or open to another notebook.
+button.h3.btn.btn-primary(ng-click='goToConfiguration()') Back 
to configuration
+div(ng-if='loaded && notebook')
+.block-callout-parent
+table
+tbody
+tr
+td.block-callout-left(width='50%')
+
i.fa.fa-check-square.block-callout-header-left
+label.block-callout-header-left With SQL 
Notebook you can:
+ul
+li Create any number of queries
+li Execute and explain SQL queries
+li Execute scan queries
+li View data in tabular form and as 
charts
+td.block-callout-right(width='50%')
+
i.fa.fa-check-square.block-callout-header-right
+label.block-callout-header-right To 
execute SQL you need:
+ul
+li Start Apache Ignite Cluster with 
caches
+li Populate caches with data
+li Start Apache Ignite Web Agent
+li Create query, enter some SQL and 
execute it
+hr
+.row(bs-affix style='margin-bottom: 10px')
+.docs-header.notebook-header
+h1.col-sm-6(ng-hide='notebook.edit')
+label(style='max-width: calc(100% - 60px)') 
{{notebook.name}}
+.btn-group
++btn-toolbar('fa-pencil', 'notebook.edit = 
true;notebook.editName = notebook.name', 'Rename notebook')
++btn-toolbar('fa-trash', 'removeNotebook()', 
'Remove notebook')
+h1.col-sm-6(ng-show='notebook.edit')
+i.btn.fa.fa-floppy-o(ng-show='notebook.editName' 
ng-click='renameNotebook(notebook.editName)' bs-tooltip data-title='Save 
notebook name' data-trigger='hover')
+.input-tip
+
input.form-control(ng-model='notebook.editName' required 
on-enter='renameNotebook(notebook.editName)' on-escape='notebook.edit = false;')
+h1.pull-right
+a.dropdown-toggle(data-toggle='dropdown' 
bs-dropdown='scrollParagraphs' data-placement='bottom-right') Scroll to query
+span.caret
+.btn-group(style='margin-top: 2px')
++btn-toolbar('fa-plus', 'addParagraph()', 'Add 
new query')
+.docs-body.paragraphs
+.panel-group(bs-collapse ng-model='notebook.activePanels' 
data-allow-multiple='true' data-start-collapsed='false')
+.panel.panel-default(ng-repeat='paragraph in 
notebook.paragraphs')
+.panel-heading(id='{{paragraph.id}}' 
bs-collapse-toggle)
+.row
+.col-sm-6(ng-hide='paragraph.edit')
+
i.tipLabel.fa(ng-class='paragraphExpanded(paragraph) ? "fa-chevron-circle-up" : 
"fa-chevron-circle-down"')
+label {{paragraph.name}}
 
-block container
-.row
-.col-sm-12
-.docs-content(ng-controller='sqlController' 
dw-loading='loadingNotebookScreen' dw-loading-options='{text: "Loading notebook 
screen...", className: "page-loading-overlay"}')
-div(ng-if='loaded && !notebook' style='text-align: center')
-h2 Failed to load notebook
-label.col-sm-12 Notebook not accessible any more. Go back 

[37/50] [abbrv] ignite git commit: IGNITE-843 Merge branches ignite-843-rc1.

[anovikov]

http://git-wip-us.apache.org/repos/asf/ignite/blob/6b19f87d/modules/control-center-web/src/main/js/controllers/common-module.js
--
diff --cc modules/control-center-web/src/main/js/controllers/common-module.js
index 440fb15,4985022..b235796
--- a/modules/control-center-web/src/main/js/controllers/common-module.js
+++ b/modules/control-center-web/src/main/js/controllers/common-module.js
@@@ -19,7 -19,8 +19,9 @@@ var consoleModule = angular.module('ign
  [
  'ngAnimate', 'ngSanitize', 'mgcrea.ngStrap', 'smart-table', 'ui.ace', 
'treeControl', 'darthwade.dwLoading', 'agGrid', 'nvd3', 'dndLists'
  /* ignite:modules */
 +, 'ignite-console'
+ , 'ignite-web-console.navbar'
+ , 'ignite-web-console.configuration.sidebar'
  /* endignite */
  /* ignite:plugins */
  /* endignite */
@@@ -665,16 -654,14 +667,14 @@@ consoleModule.service('$common', 
  return {
  getModel: getModel,
  joinTip: function (arr) {
- if (!arr) {
+ if (!arr)
  return arr;
- }
  
- var lines = arr.map(function (line) {
+ var lines = _.map(arr, function (line) {
  var rtrimmed = line.replace(/\s+$/g, '');
  
- if (rtrimmed.indexOf('>', this.length - 1) === -1) {
 -if (rtrimmed.indexOf('>', this.length - 1) == -1)
++if (rtrimmed.indexOf('>', this.length - 1) === -1)
  rtrimmed = rtrimmed + '';
- }
  
  return rtrimmed;
  });
@@@ -1034,16 -1037,6 +1034,16 @@@ consoleModule.service('$unsavedChangesG
  window.onbeforeunload = null;
  });
  
 +var unbind = $rootScope.$on('$stateChangeStart', function(event, 
toState, toParams, fromState, fromParams) {
 +if ($scope.ui && $scope.ui.isDirty()) {
 +if (!confirm('You have unsaved changes.\n\nAre you sure 
you want to discard them?')) {
- event.preventDefault(); 
++event.preventDefault();
 +} else {
 +unbind();
 +}
 +}
 +});
 +
  window.onbeforeunload = function(){
  return $scope.ui && $scope.ui.isDirty()
  ? 'You have unsaved changes.\n\nAre you sure you want to 
discard them?'

http://git-wip-us.apache.org/repos/asf/ignite/blob/6b19f87d/modules/control-center-web/src/main/js/controllers/summary-controller.js
--
diff --cc 
modules/control-center-web/src/main/js/controllers/summary-controller.js
index b6fcfb9,d4d3c58..bd2f424
--- a/modules/control-center-web/src/main/js/controllers/summary-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/summary-controller.js
@@@ -99,10 -101,10 +99,10 @@@ consoleModule.controller('summaryContro
  function selectPojoClass(config) {
  if ($scope.selectedItem)
  _.forEach($scope.selectedItem.metadatas, function(meta) {
--if (meta.keyType == config.pojoClass)
++if (meta.keyType === config.pojoClass)
  return config.pojoClassBody = meta.keyClass;
  
--if (meta.valueType == config.pojoClass)
++if (meta.valueType === config.pojoClass)
  return config.pojoClassBody = meta.valueClass;
  });
  }
@@@ -121,7 -123,7 +121,7 @@@
  
  function restoreSelected(selected, config, tabs, metadatas) {
  if (!$common.isDefined(selected) || _.findIndex(metadatas, 
function (meta) {
--return meta.keyType == selected || meta.valueType == 
selected;
++return meta.keyType === selected || meta.valueType 
=== selected;
  }) < 0) {
  if (metadatas.length > 0) {
  if ($common.isDefined(metadatas[0].keyType))
@@@ -132,7 -134,7 +132,7 @@@
  else {
  config.pojoClass = undefined;
  
--if (tabs.activeTab == 2)
++if (tabs.activeTab === 2)
  tabs.activeTab = 0;
  }
  }
@@@ -262,7 -262,7 +260,7 @@@
  
  if (restoredId) {
  var idx = _.findIndex($scope.clusters, function (cluster) 
{
--return cluster._id == restoredId;
++return cluster._id === restoredId;
  });
  
  if (idx >= 0)

[19/50] [abbrv] ignite git commit: Fixed GridSessionCheckpointSelfTest.

[anovikov]

Fixed GridSessionCheckpointSelfTest.


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

Branch: refs/heads/ignite-843-rc2
Commit: a2cdc73afd54e02c86ede0d6e81ed280d4b0aff0
Parents: 6a95f88
Author: Tikhonov Nikolay 
Authored: Fri Nov 27 20:07:59 2015 +0300
Committer: Tikhonov Nikolay 
Committed: Fri Nov 27 22:33:02 2015 +0300

--
 .../ignite/testframework/junits/IgniteTestResources.java | 11 +++
 1 file changed, 11 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/a2cdc73a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java
 
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java
index 406318f..970002d 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java
@@ -26,7 +26,12 @@ import java.util.concurrent.ThreadPoolExecutor;
 import javax.management.MBeanServer;
 import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.portable.BinaryCachingMetadataHandler;
+import org.apache.ignite.internal.portable.BinaryMarshaller;
+import org.apache.ignite.internal.portable.PortableContext;
 import org.apache.ignite.internal.processors.resource.GridResourceProcessor;
+import org.apache.ignite.internal.util.IgniteUtils;
 import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.marshaller.Marshaller;
 import org.apache.ignite.marshaller.MarshallerContextTestImpl;
@@ -258,6 +263,12 @@ public class IgniteTestResources {
 
 marsh.setContext(new MarshallerContextTestImpl());
 
+if (marsh instanceof BinaryMarshaller) {
+PortableContext ctx = new 
PortableContext(BinaryCachingMetadataHandler.create(), new 
IgniteConfiguration());
+
+IgniteUtils.invoke(BinaryMarshaller.class, marsh, 
"setPortableContext", ctx, new IgniteConfiguration());
+}
+
 return marsh;
 }
 }
\ No newline at end of file

[31/50] [abbrv] ignite git commit: IGNITE-843 Common properties generator.

[anovikov]

IGNITE-843 Common properties generator.


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

Branch: refs/heads/ignite-843-rc2
Commit: 3d1a6c08bc49394123d583498e81968ac58b5784
Parents: 0c53621
Author: Andrey 
Authored: Mon Nov 30 15:52:35 2015 +0700
Committer: Andrey 
Committed: Mon Nov 30 15:52:35 2015 +0700

--
 .../main/js/controllers/summary-controller.js|  4 +---
 .../js/helpers/generator/generator-common.js | 19 +--
 .../js/helpers/generator/generator-properties.js | 15 +++
 3 files changed, 29 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/3d1a6c08/modules/control-center-web/src/main/js/controllers/summary-controller.js
--
diff --git 
a/modules/control-center-web/src/main/js/controllers/summary-controller.js 
b/modules/control-center-web/src/main/js/controllers/summary-controller.js
index 163e7f6..d4d3c58 100644
--- a/modules/control-center-web/src/main/js/controllers/summary-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/summary-controller.js
@@ -206,9 +206,7 @@ consoleModule.controller('summaryController', [
 
 zip.file('Dockerfile', $scope.dockerServer);
 
-var builder = $generatorProperties.sslProperties(cluster);
-
-builder = $generatorProperties.dataSourcesProperties(cluster, builder);
+var builder = $generatorProperties.generateProperties(cluster);
 
 if (builder)
 zip.file('src/main/resources/secret.properties', 
builder.asString());

http://git-wip-us.apache.org/repos/asf/ignite/blob/3d1a6c08/modules/control-center-web/src/main/js/helpers/generator/generator-common.js
--
diff --git 
a/modules/control-center-web/src/main/js/helpers/generator/generator-common.js 
b/modules/control-center-web/src/main/js/helpers/generator/generator-common.js
index 9fcd784..c0bbdea 100644
--- 
a/modules/control-center-web/src/main/js/helpers/generator/generator-common.js
+++ 
b/modules/control-center-web/src/main/js/helpers/generator/generator-common.js
@@ -63,16 +63,23 @@ $generatorCommon.builder = function (deep) {
 res.safePoint = -1;
 
 res.mergeProps = function (fromRes) {
-res.datasources = fromRes.datasources;
+if ($commonUtils.isDefinedAndNotEmpty(fromRes)) {
+res.datasources = fromRes.datasources;
 
-angular.extend(res.imports, fromRes.imports);
-angular.extend(res.vars, fromRes.datasources);
+angular.extend(res.imports, fromRes.imports);
+angular.extend(res.vars, fromRes.vars);
+}
 };
 
 res.mergeLines = function (fromRes) {
-_.forEach(fromRes, function (line) {
-res.append(line);
-})
+if ($commonUtils.isDefinedAndNotEmpty(fromRes)) {
+if (res.needEmptyLine)
+res.push('');
+
+_.forEach(fromRes, function (line) {
+res.append(line);
+});
+}
 };
 
 res.startSafeBlock = function () {

http://git-wip-us.apache.org/repos/asf/ignite/blob/3d1a6c08/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 06328c6..d273eae 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
@@ -97,3 +97,18 @@ $generatorProperties.sslProperties = function (cluster, res) 
{
 
 return res;
 };
+
+/**
+ * Generate properties file with all possible properties.
+ *
+ * @param cluster Cluster to get configurations.
+ * @param res Optional configuration presentation builder object.
+ * @returns Configuration presentation builder object
+ */
+$generatorProperties.generateProperties = function (cluster, res) {
+res = $generatorProperties.dataSourcesProperties(cluster, res);
+
+res = $generatorProperties.sslProperties(cluster, res);
+
+return res;
+};

[46/50] [abbrv] ignite git commit: IGNITE-843 Updated pom.xml generation.

[anovikov]

IGNITE-843 Updated pom.xml generation.


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

Branch: refs/heads/ignite-843-rc2
Commit: 869593849367f095fb94858efec3a7a2de15d03f
Parents: b79a700
Author: Alexey Kuznetsov 
Authored: Tue Dec 1 15:23:07 2015 +0700
Committer: Alexey Kuznetsov 
Committed: Tue Dec 1 15:23:07 2015 +0700

--
 .../src/main/js/controllers/summary-controller.js  | 2 +-
 .../src/main/js/helpers/generator/generator-common.js  | 2 +-
 .../src/main/js/helpers/generator/generator-pom.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/86959384/modules/control-center-web/src/main/js/controllers/summary-controller.js
--
diff --git 
a/modules/control-center-web/src/main/js/controllers/summary-controller.js 
b/modules/control-center-web/src/main/js/controllers/summary-controller.js
index d4d3c58..0cbbd2f 100644
--- a/modules/control-center-web/src/main/js/controllers/summary-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/summary-controller.js
@@ -19,7 +19,7 @@
 consoleModule.controller('summaryController', [
 '$scope', '$http', '$common', '$loading', '$message', '$table',
 function ($scope, $http, $common, $loading, $message, $table) {
-var igniteVersion = '1.5.0-IWC';
+var igniteVersion = '1.5.0';
 
 $scope.panelExpanded = $common.panelExpanded;
 $scope.tableVisibleRow = $table.tableVisibleRow;

http://git-wip-us.apache.org/repos/asf/ignite/blob/86959384/modules/control-center-web/src/main/js/helpers/generator/generator-common.js
--
diff --git 
a/modules/control-center-web/src/main/js/helpers/generator/generator-common.js 
b/modules/control-center-web/src/main/js/helpers/generator/generator-common.js
index c0bbdea..b56f2b1 100644
--- 
a/modules/control-center-web/src/main/js/helpers/generator/generator-common.js
+++ 
b/modules/control-center-web/src/main/js/helpers/generator/generator-common.js
@@ -20,7 +20,7 @@ $generatorCommon = {};
 
 // Add leading zero.
 $generatorCommon.addLeadingZero = function (numberStr, minSize) {
-if (typeof (numberStr) != 'string')
+if (typeof (numberStr) !== 'string')
 numberStr = '' + numberStr;
 
 while (numberStr.length < minSize) {

http://git-wip-us.apache.org/repos/asf/ignite/blob/86959384/modules/control-center-web/src/main/js/helpers/generator/generator-pom.js
--
diff --git 
a/modules/control-center-web/src/main/js/helpers/generator/generator-pom.js 
b/modules/control-center-web/src/main/js/helpers/generator/generator-pom.js
index c4e5e45..aff8307 100644
--- a/modules/control-center-web/src/main/js/helpers/generator/generator-pom.js
+++ b/modules/control-center-web/src/main/js/helpers/generator/generator-pom.js
@@ -129,7 +129,7 @@ $generatorPom.pom = function (cluster, igniteVersion, res) {
 res.startBlock('');
 res.startBlock('');
 $generatorPom.addProperty(res, 'id', 'GridGain External Repository');
-$generatorPom.addProperty(res, 'url', 
'http://www.gridgainsystems.com/nexus/content/repositories/gridgain_staging-1555');
+$generatorPom.addProperty(res, 'url', 
'http://www.gridgainsystems.com/nexus/content/repositories/gridgain_staging-1584');
 res.endBlock('');
 res.endBlock('');
 

[15/50] [abbrv] ignite git commit: Fixing binary objects tests.

[anovikov]

Fixing binary objects tests.


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

Branch: refs/heads/ignite-843-rc2
Commit: 292de51c75dfd696459ef6569ee49beb8e7b10ec
Parents: f3cb64e
Author: Alexey Goncharuk 
Authored: Fri Nov 27 18:34:56 2015 +0300
Committer: Alexey Goncharuk 
Committed: Fri Nov 27 18:34:56 2015 +0300

--
 .../ignite/cache/CacheKeyConfiguration.java |  19 ++
 .../internal/portable/BinaryObjectExImpl.java   |   5 +-
 .../portable/PortableClassDescriptor.java   |   3 +-
 .../processors/cache/CacheLazyEntry.java|   2 +-
 .../processors/cache/GridCacheAdapter.java  |   2 +-
 .../processors/cache/GridCacheContext.java  |  12 +-
 .../dht/atomic/GridDhtAtomicCache.java  |   4 +-
 .../distributed/near/GridNearGetFuture.java |   4 +-
 .../GridCacheInternalKeyImpl.java   |   2 +-
 .../portable/BinaryMarshallerSelfTest.java  |  64 ++
 ...niteCacheCopyOnReadDisabledAbstractTest.java |   2 +
 .../dht/GridCacheDhtInternalEntrySelfTest.java  | 203 ---
 .../near/GridCacheNearTxForceKeyTest.java   |   2 +-
 ...achePartitionedPreloadLifecycleSelfTest.java |  71 ---
 .../testsuites/IgniteCacheTestSuite2.java   |   2 -
 15 files changed, 147 insertions(+), 250 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/292de51c/modules/core/src/main/java/org/apache/ignite/cache/CacheKeyConfiguration.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/cache/CacheKeyConfiguration.java 
b/modules/core/src/main/java/org/apache/ignite/cache/CacheKeyConfiguration.java
index 767b44c..f117847 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/cache/CacheKeyConfiguration.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/cache/CacheKeyConfiguration.java
@@ -18,6 +18,8 @@
 package org.apache.ignite.cache;
 
 import java.io.Serializable;
+import java.lang.reflect.Field;
+import org.apache.ignite.cache.affinity.AffinityKeyMapped;
 import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
@@ -41,6 +43,23 @@ public class CacheKeyConfiguration implements Serializable {
 }
 
 /**
+ * @param keyCls Key class.
+ */
+public CacheKeyConfiguration(Class keyCls) {
+typeName = keyCls.getName();
+
+for (; keyCls != Object.class && keyCls != null; keyCls = 
keyCls.getSuperclass()) {
+for (Field f : keyCls.getDeclaredFields()) {
+if (f.getAnnotation(AffinityKeyMapped.class) != null) {
+affKeyFieldName = f.getName();
+
+return;
+}
+}
+}
+}
+
+/**
  * Creates cache key configuration with given type name and affinity field 
name.
  *
  * @param typeName Type name.

http://git-wip-us.apache.org/repos/asf/ignite/blob/292de51c/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectExImpl.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectExImpl.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectExImpl.java
index 2ea71ec..a32329a 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectExImpl.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectExImpl.java
@@ -164,6 +164,7 @@ public abstract class BinaryObjectExImpl implements 
BinaryObjectEx {
  */
 private String toString(BinaryReaderHandles ctx, 
IdentityHashMap handles) {
 int idHash = System.identityHashCode(this);
+int hash = hashCode();
 
 BinaryType meta;
 
@@ -175,14 +176,14 @@ public abstract class BinaryObjectExImpl implements 
BinaryObjectEx {
 }
 
 if (meta == null)
-return BinaryObject.class.getSimpleName() +  " [hash=" + idHash + 
", typeId=" + typeId() + ']';
+return BinaryObject.class.getSimpleName() +  " [idHash=" + idHash 
+ ", hash=" + hash + ", typeId=" + typeId() + ']';
 
 handles.put(this, idHash);
 
 SB buf = new SB(meta.typeName());
 
 if (meta.fieldNames() != null) {
-buf.a(" [hash=").a(idHash);
+buf.a(" [idHash=").a(idHash).a(", hash=").a(hash);
 
 for (String name : meta.fieldNames()) {
 Object val = field(ctx, name);

[40/50] [abbrv] ignite git commit: IGNITE-843 Fixed placeholders for dropdowns.

[anovikov]

IGNITE-843 Fixed placeholders for dropdowns.


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

Branch: refs/heads/ignite-843-rc2
Commit: 3ba1c934ab00835facbf89f8900e4f12ca91622a
Parents: 85d956d
Author: Alexey Kuznetsov 
Authored: Tue Dec 1 11:30:15 2015 +0700
Committer: Alexey Kuznetsov 
Committed: Tue Dec 1 11:30:15 2015 +0700

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


http://git-wip-us.apache.org/repos/asf/ignite/blob/3ba1c934/modules/control-center-web/src/main/js/views/includes/controls.jade
--
diff --git 
a/modules/control-center-web/src/main/js/views/includes/controls.jade 
b/modules/control-center-web/src/main/js/views/includes/controls.jade
index 7504231..0bf14f4 100644
--- a/modules/control-center-web/src/main/js/views/includes/controls.jade
+++ b/modules/control-center-web/src/main/js/views/includes/controls.jade
@@ -165,7 +165,7 @@ mixin details-row
 - var detailMdl = 'getModel(backupItem, detail)[detail.model]';
 - var detailCommon = {'ng-model': detailMdl, 'ng-required': 
'detail.required'};
 - var detailDisabled = '{{detail.disabled}}'
-- var dropdownPlaceholder = {'ng-class': '{placeholder: !' + detailMdl + ' 
|| ' + detailMdl + '.length == 0}'}
+- var dropdownPlaceholder = {'ng-class': '{placeholder: !(' + detailMdl + 
' && ' + detailMdl + '.length > 0)}'}
 
 - var customValidators = {'ng-attr-ipaddress': '{{detail.ipaddress}}'}
 
@@ -313,7 +313,7 @@ mixin form-row-custom(lblClasses, fieldClasses, dataSource)
 - var fieldRequiredClass = '{true: "required"}[field.required || 
required(field)]'
 - var fieldHide = '{{field.hide}}'
 - var fieldDisabled = {'ng-disabled': '{{field.disabled}}'}
-- var dropdownPlaceholder = {'ng-class': '{placeholder: !' + fieldMdl + ' 
|| ' + fieldMdl + '.length == 0}'}
+- var dropdownPlaceholder = {'ng-class': '{placeholder: !(' + fieldMdl + ' 
&& ' + fieldMdl + '.length > 0)}'}
 
 div(ng-switch='field.type')
 div(ng-switch-when='label')

[09/50] [abbrv] ignite git commit: IGNITE-2018 Refactored examples to use common model classes.

[anovikov]

IGNITE-2018 Refactored examples to use common model classes.


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

Branch: refs/heads/ignite-843-rc2
Commit: e519c2f5b1e05f886c861eb2bd05aec7cffa5bbc
Parents: 3080f61
Author: AKuznetsov 
Authored: Fri Nov 27 20:30:46 2015 +0700
Committer: AKuznetsov 
Committed: Fri Nov 27 20:30:46 2015 +0700

--
 .../hibernate/CacheHibernatePersonStore.java|   4 +-
 .../hibernate/CacheHibernateStoreExample.java   |   2 +-
 .../datagrid/store/hibernate/Person.hbm.xml |   2 +-
 .../apache/ignite/examples/binary/Address.java  |  72 -
 .../apache/ignite/examples/binary/Employee.java |  93 ---
 .../ignite/examples/binary/EmployeeKey.java |  93 ---
 .../ignite/examples/binary/Organization.java|  93 ---
 .../examples/binary/OrganizationType.java   |  32 
 ...ComputeClientBinaryTaskExecutionExample.java |   4 +-
 .../CacheClientBinaryPutGetExample.java |   6 +-
 .../datagrid/CacheClientBinaryQueryExample.java |  22 +--
 .../examples/datagrid/CacheQueryExample.java| 161 ---
 .../ignite/examples/datagrid/store/Person.java  | 154 --
 .../store/auto/CacheAutoStoreExample.java   |   4 +-
 .../auto/CacheAutoStoreLoadDataExample.java |   4 +-
 .../datagrid/store/auto/CacheConfig.java|   6 +-
 .../store/dummy/CacheDummyPersonStore.java  |  12 +-
 .../store/dummy/CacheDummyStoreExample.java |   4 +-
 .../store/jdbc/CacheJdbcPersonStore.java|  18 +--
 .../store/jdbc/CacheJdbcStoreExample.java   |   4 +-
 .../store/spring/CacheSpringPersonStore.java|  10 +-
 .../store/spring/CacheSpringStoreExample.java   |   4 +-
 .../ignite/examples/model/Organization.java |  55 +++
 .../apache/ignite/examples/model/Person.java| 120 ++
 .../ignite/examples/model/binary/Address.java   |  72 +
 .../ignite/examples/model/binary/Employee.java  |  93 +++
 .../examples/model/binary/EmployeeKey.java  |  93 +++
 .../examples/model/binary/Organization.java |  93 +++
 .../examples/model/binary/OrganizationType.java |  32 
 .../examples/ScalarCacheQueryExample.scala  |  66 ++--
 30 files changed, 651 insertions(+), 777 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/e519c2f5/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernatePersonStore.java
--
diff --git 
a/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernatePersonStore.java
 
b/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernatePersonStore.java
index d040b88..ade5d18 100644
--- 
a/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernatePersonStore.java
+++ 
b/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernatePersonStore.java
@@ -24,7 +24,7 @@ import javax.cache.integration.CacheWriterException;
 import org.apache.ignite.cache.store.CacheStore;
 import org.apache.ignite.cache.store.CacheStoreAdapter;
 import org.apache.ignite.cache.store.CacheStoreSession;
-import org.apache.ignite.examples.datagrid.store.Person;
+import org.apache.ignite.examples.model.Person;
 import org.apache.ignite.lang.IgniteBiInClosure;
 import org.apache.ignite.resources.CacheStoreSessionResource;
 import org.hibernate.HibernateException;
@@ -107,7 +107,7 @@ public class CacheHibernatePersonStore extends 
CacheStoreAdapter {
 for (Object obj : list) {
 Person person = (Person)obj;
 
-clo.apply(person.getId(), person);
+clo.apply(person.id, person);
 
 cnt++;
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/e519c2f5/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernateStoreExample.java
--
diff --git 
a/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernateStoreExample.java
 
b/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernateStoreExample.java
index f993d81..71c4f68 100644
--- 
a/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernateStoreExample.java
+++ 

[16/50] [abbrv] ignite git commit: typo fix

[anovikov]

typo fix


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

Branch: refs/heads/ignite-843-rc2
Commit: fb5d54a6b7b737b9dbf93651a478ed3d7a21e340
Parents: 292de51
Author: Anton Vinogradov 
Authored: Fri Nov 27 19:51:11 2015 +0300
Committer: Anton Vinogradov 
Committed: Fri Nov 27 19:51:11 2015 +0300

--
 RELEASE_NOTES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/fb5d54a6/RELEASE_NOTES.txt
--
diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt
index 42258f7..4985edb 100644
--- a/RELEASE_NOTES.txt
+++ b/RELEASE_NOTES.txt
@@ -10,7 +10,7 @@ Apache Ignite In-Memory Data Fabric 1.5
 * Added IgniteSemaphore data structure.
 * Added MQTT Streamer.
 * Fixed failover for continuous queries.
-* Fixed compilation and runtime errors under OpnJDK and IBM JDK.
+* Fixed compilation and runtime errors under OpenJDK and IBM JDK.
 * Fixed Integer.size limitation for cache.
 * Fixed and improved cache types configuration.
 * Fixed cache rebalancing.

[24/50] [abbrv] ignite git commit: Merge branch 'ignite-1.5' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1.5

[anovikov]

Merge branch 'ignite-1.5' of https://git-wip-us.apache.org/repos/asf/ignite 
into ignite-1.5


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

Branch: refs/heads/ignite-843-rc2
Commit: ba28eaf3808a412036043e419ffeab040afe1486
Parents: 87cbc19 a5d9993
Author: Alexey Goncharuk 
Authored: Sat Nov 28 18:39:59 2015 +0300
Committer: Alexey Goncharuk 
Committed: Sat Nov 28 18:39:59 2015 +0300

--
 .../portable/builder/BinaryObjectBuilderImpl.java   | 12 +---
 ...CacheBinaryObjectsAbstractMultiThreadedSelfTest.java |  8 
 2 files changed, 17 insertions(+), 3 deletions(-)
--

[28/50] [abbrv] ignite git commit: IGNITE-2024 Added support for fields and non-JavaBeans getters/setters.

[anovikov]

IGNITE-2024 Added support for fields and non-JavaBeans getters/setters.


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

Branch: refs/heads/ignite-843-rc2
Commit: 923fea8659eac46f351b8d64f710a351f6bbf3ff
Parents: 59f3726
Author: AKuznetsov 
Authored: Sun Nov 29 20:44:51 2015 +0700
Committer: AKuznetsov 
Committed: Sun Nov 29 20:44:51 2015 +0700

--
 .../cache/store/jdbc/CacheJdbcPojoStore.java| 188 +--
 1 file changed, 133 insertions(+), 55 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/923fea86/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStore.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStore.java
 
b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStore.java
index b837e5c..abc4b2e 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStore.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStore.java
@@ -18,6 +18,8 @@
 package org.apache.ignite.cache.store.jdbc;
 
 import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -44,7 +46,7 @@ import org.jetbrains.annotations.Nullable;
  */
 public class CacheJdbcPojoStore extends CacheAbstractJdbcStore {
 /** POJO methods cache. */
-private volatile Map> pojosMthds = 
Collections.emptyMap();
+private volatile Map> pojosProps 
= Collections.emptyMap();
 
 /**
  * Get field value from object for use as query parameter.
@@ -81,23 +83,23 @@ public class CacheJdbcPojoStore extends 
CacheAbstractJdbcStore {
 @Nullable private Object extractPojoParameter(@Nullable String cacheName, 
String typeName, String fldName,
 Object obj) throws CacheException {
 try {
-Map cacheMethods = 
pojosMthds.get(cacheName);
+Map cacheProps = 
pojosProps.get(cacheName);
 
-if (cacheMethods == null)
+if (cacheProps == null)
 throw new CacheException("Failed to find POJO type metadata 
for cache: " + U.maskName(cacheName));
 
-PojoMethodsCache mc = cacheMethods.get(typeName);
+PojoPropertiesCache ppc = cacheProps.get(typeName);
 
-if (mc == null)
+if (ppc == null)
 throw new CacheException("Failed to find POJO type metadata 
for type: " + typeName);
 
-Method getter = mc.getters.get(fldName);
+ClassProperty prop = ppc.props.get(fldName);
 
-if (getter == null)
-throw new CacheLoaderException("Failed to find getter in POJO 
class [class=" + typeName +
+if (prop == null)
+throw new CacheLoaderException("Failed to find property in 
POJO class [class=" + typeName +
 ", prop=" + fldName + "]");
 
-return getter.invoke(obj);
+return prop.get(obj);
 }
 catch (Exception e) {
 throw new CacheException("Failed to read object of class: " + 
typeName, e);
@@ -171,26 +173,26 @@ public class CacheJdbcPojoStore extends 
CacheAbstractJdbcStore {
 JdbcTypeField[] flds, Map loadColIdxs, ResultSet rs)
 throws CacheLoaderException {
 
-Map cacheMethods = pojosMthds.get(cacheName);
+Map cacheProps = 
pojosProps.get(cacheName);
 
-if (cacheMethods == null)
+if (cacheProps == null)
 throw new CacheLoaderException("Failed to find POJO types metadata 
for cache: " + U.maskName(cacheName));
 
-PojoMethodsCache mc = cacheMethods.get(typeName);
+PojoPropertiesCache ppc = cacheProps.get(typeName);
 
-if (mc == null)
+if (ppc == null)
 throw new CacheLoaderException("Failed to find POJO type metadata 
for type: " + typeName);
 
 try {
-Object obj = mc.ctor.newInstance();
+Object obj = ppc.ctor.newInstance();
 
 for (JdbcTypeField fld : flds) {
 String fldJavaName = fld.getJavaFieldName();
 
-Method setter = mc.setters.get(fldJavaName);
+  

[49/50] [abbrv] ignite git commit: Merge remote-tracking branch 'origin/ignite-843-rc2' into ignite-843-rc2

[anovikov]

Merge remote-tracking branch 'origin/ignite-843-rc2' into ignite-843-rc2


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

Branch: refs/heads/ignite-843-rc2
Commit: 586ec5c72880f5133e6a0085a2efb5e10b804ffd
Parents: 6699b1e d1582eb
Author: Andrey 
Authored: Tue Dec 1 15:52:58 2015 +0700
Committer: Andrey 
Committed: Tue Dec 1 15:52:58 2015 +0700

--
 .../control-center-web/src/main/js/controllers/common-module.js| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


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

[20/50] [abbrv] ignite git commit: Fixed GridCacheBinaryObjects*Test's.

[anovikov]

Fixed GridCacheBinaryObjects*Test's.


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

Branch: refs/heads/ignite-843-rc2
Commit: 8a822d81adf3a903b84daf17a11e642309576528
Parents: a2cdc73
Author: Tikhonov Nikolay 
Authored: Fri Nov 27 22:30:06 2015 +0300
Committer: Tikhonov Nikolay 
Committed: Fri Nov 27 22:51:04 2015 +0300

--
 .../ignite/internal/processors/cache/CacheObjectContext.java   | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/8a822d81/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectContext.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectContext.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectContext.java
index b99c99f..fe650f3 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectContext.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectContext.java
@@ -220,6 +220,8 @@ import org.apache.ignite.internal.util.typedef.F;
 private Collection unwrapPortables(ArrayList col, boolean 
keepPortable, boolean cpy) {
 int size = col.size();
 
+col = new ArrayList<>(col);
+
 for (int i = 0; i < size; i++) {
 Object o = col.get(i);
 

[08/50] [abbrv] ignite git commit: Fixed IgniteTxRemoteState to properly process invalid partitions.

[anovikov]

Fixed IgniteTxRemoteState to properly process invalid partitions.


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

Branch: refs/heads/ignite-843-rc2
Commit: 3080f61ae9ca1481d65f18f7a84f8bbc9d682f79
Parents: 722fe14
Author: sboikov 
Authored: Fri Nov 27 15:24:32 2015 +0300
Committer: sboikov 
Committed: Fri Nov 27 15:24:32 2015 +0300

--
 .../cache/distributed/dht/GridDhtTxRemote.java  | 15 +---
 .../IgniteTxRemoteSingleStateImpl.java  | 16 ++---
 .../cache/transactions/IgniteTxRemoteState.java |  5 
 .../transactions/IgniteTxRemoteStateImpl.java   | 24 
 4 files changed, 37 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/3080f61a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxRemote.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxRemote.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxRemote.java
index e0929ad..85a5759 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxRemote.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxRemote.java
@@ -279,20 +279,7 @@ public class GridDhtTxRemote extends 
GridDistributedTxRemoteAdapter {
 @Override public void addInvalidPartition(GridCacheContext cacheCtx, int 
part) {
 super.addInvalidPartition(cacheCtx, part);
 
-Map writeMap = txState.writeMap();
-
-for (Iterator it = writeMap.values().iterator(); 
it.hasNext();) {
-IgniteTxEntry e = it.next();
-
-GridCacheEntryEx cached = e.cached();
-
-if (cached != null) {
-if (cached.partition() == part)
-it.remove();
-}
-else if (cacheCtx.affinity().partition(e.key()) == part)
-it.remove();
-}
+txState.invalidPartition(part);
 }
 
 /**

http://git-wip-us.apache.org/repos/asf/ignite/blob/3080f61a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxRemoteSingleStateImpl.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxRemoteSingleStateImpl.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxRemoteSingleStateImpl.java
index 90af517..a68006b 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxRemoteSingleStateImpl.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxRemoteSingleStateImpl.java
@@ -65,15 +65,7 @@ public class IgniteTxRemoteSingleStateImpl extends 
IgniteTxRemoteStateAdapter {
 
 /** {@inheritDoc} */
 @Override public Set writeSet() {
-if (entry != null) {
-HashSet set = new HashSet<>(3, 0.75f);
-
-set.add(entry.txKey());
-
-return set;
-}
-else
-return Collections.emptySet();
+return entry != null ? Collections.singleton(entry.txKey()) : 
Collections.emptySet();
 }
 
 /** {@inheritDoc} */
@@ -113,6 +105,12 @@ public class IgniteTxRemoteSingleStateImpl extends 
IgniteTxRemoteStateAdapter {
 }
 
 /** {@inheritDoc} */
+@Override public void invalidPartition(int part) {
+if (entry != null && entry.context().affinity().partition(entry.key()) 
== part)
+entry = null;
+}
+
+/** {@inheritDoc} */
 public String toString() {
 return S.toString(IgniteTxRemoteSingleStateImpl.class, this);
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/3080f61a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxRemoteState.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxRemoteState.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxRemoteState.java
index b8290a1..77fc97e 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxRemoteState.java
+++ 

[14/50] [abbrv] ignite git commit: ignite-2020 GridProjectionLocalJobMultipleArgumentsSelfTest fixed

[anovikov]

ignite-2020 GridProjectionLocalJobMultipleArgumentsSelfTest fixed


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

Branch: refs/heads/ignite-843-rc2
Commit: f3cb64e375ff97a35b25ec0687b7d599f212afbd
Parents: 6312737
Author: agura 
Authored: Fri Nov 27 17:26:20 2015 +0300
Committer: agura 
Committed: Fri Nov 27 17:39:46 2015 +0300

--
 .../GridProjectionLocalJobMultipleArgumentsSelfTest.java | 11 +--
 1 file changed, 5 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/f3cb64e3/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionLocalJobMultipleArgumentsSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionLocalJobMultipleArgumentsSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionLocalJobMultipleArgumentsSelfTest.java
index 58ff1fb..356e002 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionLocalJobMultipleArgumentsSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionLocalJobMultipleArgumentsSelfTest.java
@@ -43,7 +43,7 @@ public class GridProjectionLocalJobMultipleArgumentsSelfTest 
extends GridCommonA
 private static final TcpDiscoveryIpFinder IP_FINDER = new 
TcpDiscoveryVmIpFinder(true);
 
 /** */
-private static Collection ids;
+private static Collection ids;
 
 /** */
 private static AtomicInteger res;
@@ -90,7 +90,7 @@ public class GridProjectionLocalJobMultipleArgumentsSelfTest 
extends GridCommonA
 for (int i : F.asList(1, 2, 3)) {
 res.add(grid().compute().affinityCall(null, i, new 
IgniteCallable() {
 @Override public Integer call() {
-ids.add(System.identityHashCode(this));
+ids.add(this);
 
 return 10;
 }
@@ -108,7 +108,7 @@ public class 
GridProjectionLocalJobMultipleArgumentsSelfTest extends GridCommonA
 for (int i : F.asList(1, 2, 3)) {
 grid().compute().affinityRun(null, i, new IgniteRunnable() {
 @Override public void run() {
-ids.add(System.identityHashCode(this));
+ids.add(this);
 
 res.addAndGet(10);
 }
@@ -125,8 +125,7 @@ public class 
GridProjectionLocalJobMultipleArgumentsSelfTest extends GridCommonA
 public void testCall() throws Exception {
 Collection res = grid().compute().apply(new C1() {
 @Override public Integer apply(Integer arg) {
-
-ids.add(System.identityHashCode(this));
+ids.add(this);
 
 return 10 + arg;
 }
@@ -144,7 +143,7 @@ public class 
GridProjectionLocalJobMultipleArgumentsSelfTest extends GridCommonA
 
 Collection res = grid().compute().apply(new C1() {
 @Override public Integer apply(Integer arg) {
-ids.add(System.identityHashCode(this));
+ids.add(this);
 
 return 10 + arg;
 }

[48/50] [abbrv] ignite git commit: IGNITE-843 Merge ignite_modules.

[anovikov]

IGNITE-843 Merge ignite_modules.


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

Branch: refs/heads/ignite-843-rc2
Commit: 6699b1e9edfc99c855bb67a3573c7db903251b24
Parents: a8c8ebf
Author: Andrey 
Authored: Tue Dec 1 15:52:43 2015 +0700
Committer: Andrey 
Committed: Tue Dec 1 15:52:43 2015 +0700

--
 .../control-center-web/src/main/js/app/index.js |   4 +-
 .../app/modules/configuration-sidebar/main.js   |  56 
 .../app/modules/configuration/sidebar/main.js   |  56 
 .../src/main/js/gulpfile.js/tasks/concat.js |   4 +-
 .../src/main/js/gulpfile.js/tasks/copy.js   |   3 +-
 .../main/js/gulpfile.js/tasks/inject-plugins.js |   7 +-
 .../src/main/js/views/configuration/caches.jade |  41 ++-
 .../main/js/views/configuration/clusters.jade   |  41 ++-
 .../src/main/js/views/configuration/igfs.jade   |  41 ++-
 .../main/js/views/configuration/metadata.jade   |  83 +++---
 .../main/js/views/configuration/sidebar.jade|  38 +--
 .../main/js/views/configuration/summary.jade| 125 
 .../src/main/js/views/index.jade|  24 +-
 .../src/main/js/views/login.jade|   1 +
 .../src/main/js/views/reset.jade|   1 +
 .../src/main/js/views/settings/admin.jade   |  74 +++--
 .../src/main/js/views/settings/profile.jade |  79 +++--
 .../src/main/js/views/sql/sql.jade  | 294 +--
 .../main/js/views/templates/batch-confirm.jade  |   2 +-
 .../src/main/js/views/templates/layout.jade |  50 
 20 files changed, 478 insertions(+), 546 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/6699b1e9/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 07d790d..8c68968 100644
--- a/modules/control-center-web/src/main/js/app/index.js
+++ b/modules/control-center-web/src/main/js/app/index.js
@@ -65,7 +65,7 @@ import './modules/states/admin/index'
 // ignite:modules
 import './modules/navbar/main'
 import './modules/userbar/main'
-import './modules/configuration-sidebar/main'
+import './modules/configuration/sidebar/main'
 // endignite
 
 angular
@@ -85,7 +85,7 @@ angular
//
'ignite-console.navbar',
'ignite-console.userbar',
-'ignite-console.configuration-sidebar'
+'ignite-console.configuration.sidebar'
 ])
 .config(['$stateProvider', '$locationProvider', '$urlRouterProvider', 
function($stateProvider, $locationProvider, $urlRouterProvider) {
// set up the states

http://git-wip-us.apache.org/repos/asf/ignite/blob/6699b1e9/modules/control-center-web/src/main/js/app/modules/configuration-sidebar/main.js
--
diff --git 
a/modules/control-center-web/src/main/js/app/modules/configuration-sidebar/main.js
 
b/modules/control-center-web/src/main/js/app/modules/configuration-sidebar/main.js
deleted file mode 100644
index 8d34064..000
--- 
a/modules/control-center-web/src/main/js/app/modules/configuration-sidebar/main.js
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * 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.
- */
-
-import angular from 'angular'
-
-angular
-.module('ignite-console.configuration.sidebar', [
-
-])
-.provider('igniteConfigurationSidebar', function() {
-var items = [
-{ label: 'Clusters', href: '/configuration/clusters' },
-{ label: 'Caches', href: '/configuration/caches' },
-{ label: 'Metadata', href: '/configuration/metadata' },
-{ label: 'IGFS', href: '/configuration/igfs' }
-];
-
-this.push = function(data) {
-items.push(data);
-};
-
-this.$get = [function() {
-var r = angular.copy(items);
-
-

[25/50] [abbrv] ignite git commit: Fixing metadata update under changing topology. This closes #280

[anovikov]

Fixing metadata update under changing topology. This closes #280


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

Branch: refs/heads/ignite-843-rc2
Commit: 59ee87e17d4cb4cc1232dd883e2f708552139c13
Parents: ba28eaf
Author: Alexey Goncharuk 
Authored: Sat Nov 28 18:42:26 2015 +0300
Committer: Alexey Goncharuk 
Committed: Sat Nov 28 18:42:26 2015 +0300

--
 .../internal/portable/BinaryEnumObjectImpl.java |   2 +-
 .../internal/portable/BinaryObjectImpl.java |  10 +-
 .../internal/portable/BinaryReaderExImpl.java   |   6 +-
 .../internal/portable/BinaryWriterExImpl.java   |  10 +-
 .../internal/portable/PortableContext.java  |  31 ++-
 .../ignite/internal/portable/PortableUtils.java |  10 +-
 .../builder/BinaryObjectBuilderImpl.java|   2 +-
 .../portable/builder/PortableBuilderEnum.java   |   2 +-
 .../builder/PortableEnumArrayLazyValue.java |   2 +-
 .../builder/PortableObjectArrayLazyValue.java   |   2 +-
 .../CacheDefaultBinaryAffinityKeyMapper.java|  51 
 .../distributed/dht/GridDhtTxFinishFuture.java  |  12 +-
 .../distributed/dht/GridDhtTxLocalAdapter.java  |   2 +-
 .../distributed/dht/GridDhtTxPrepareFuture.java |  37 ++-
 .../dht/atomic/GridDhtAtomicCache.java  |   5 +-
 .../colocated/GridDhtColocatedLockFuture.java   |  17 +-
 .../distributed/near/GridNearLockFuture.java|  24 +-
 ...arOptimisticSerializableTxPrepareFuture.java |  12 +-
 .../near/GridNearOptimisticTxPrepareFuture.java | 134 +-
 .../portable/CacheObjectPortableContext.java|   3 +-
 .../cache/transactions/IgniteTxHandler.java |   6 +-
 .../cache/transactions/IgniteTxManager.java |  22 +-
 .../portable/BinaryMarshallerSelfTest.java  |   2 +-
 .../CachePutEventListenerErrorSelfTest.java | 180 ++
 .../GridCacheOnCopyFlagAbstractSelfTest.java|  14 +-
 ...yMetadataUpdateChangingTopologySelfTest.java | 245 +++
 .../replicated/GridReplicatedTxPreloadTest.java |   6 +
 ...CacheReplicatedPreloadLifecycleSelfTest.java | 100 +---
 .../ignite/testsuites/IgniteCacheTestSuite.java |   3 +
 .../IgnitePortableObjectsTestSuite.java |   2 +
 30 files changed, 791 insertions(+), 163 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/59ee87e1/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryEnumObjectImpl.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryEnumObjectImpl.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryEnumObjectImpl.java
index e13c076..467d767 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryEnumObjectImpl.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryEnumObjectImpl.java
@@ -110,7 +110,7 @@ public class BinaryEnumObjectImpl implements 
BinaryObjectEx, Externalizable, Cac
 /** {@inheritDoc} */
 @SuppressWarnings("unchecked")
 @Override public  T deserialize() throws BinaryObjectException {
-Class cls = PortableUtils.resolveClass(ctx, typeId, clsName, null);
+Class cls = PortableUtils.resolveClass(ctx, typeId, clsName, null, 
true);
 
 return BinaryEnumCache.get(cls, ord);
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/59ee87e1/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectImpl.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectImpl.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectImpl.java
index 87a03dc..cf5a659 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectImpl.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectImpl.java
@@ -127,7 +127,7 @@ public final class BinaryObjectImpl extends 
BinaryObjectExImpl implements Extern
 @Nullable @Override public  T value(CacheObjectContext ctx, boolean 
cpy) {
 Object obj0 = obj;
 
-if (obj0 == null || cpy)
+if (obj0 == null || (cpy && needCopy(ctx)))
 obj0 = deserializeValue(ctx);
 
 return (T)obj0;
@@ -561,6 +561,14 @@ public final class BinaryObjectImpl extends 
BinaryObjectExImpl implements Extern
 }
 
 /**
+ * @param ctx Context.
+ * @return {@code True} need to copy value returned to user.
+ */
+private boolean needCopy(CacheObjectContext ctx) {
+return ctx.copyOnGet() 

[23/50] [abbrv] ignite git commit: Skip metadata check in builder if write null value.

[anovikov]

Skip metadata check in builder if write null value.


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

Branch: refs/heads/ignite-843-rc2
Commit: a5d9993199a51d2d6d6203b7f725b11182c4d632
Parents: ee5d9fd
Author: sboikov 
Authored: Sat Nov 28 16:00:50 2015 +0300
Committer: sboikov 
Committed: Sat Nov 28 16:00:50 2015 +0300

--
 .../portable/builder/BinaryObjectBuilderImpl.java   | 12 +---
 1 file changed, 9 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/a5d99931/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/BinaryObjectBuilderImpl.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/BinaryObjectBuilderImpl.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/BinaryObjectBuilderImpl.java
index 5c2c713..cadc781 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/BinaryObjectBuilderImpl.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/BinaryObjectBuilderImpl.java
@@ -311,10 +311,16 @@ public class BinaryObjectBuilderImpl implements 
BinaryObjectBuilder {
 
 String oldFldTypeName = meta == null ? null : 
meta.fieldTypeName(name);
 
+boolean nullObjField = false;
+
 int newFldTypeId;
 
-if (val instanceof PortableValueWithType)
-newFldTypeId = ((PortableValueWithType) val).typeId();
+if (val instanceof PortableValueWithType) {
+newFldTypeId = ((PortableValueWithType)val).typeId();
+
+if (newFldTypeId == GridPortableMarshaller.OBJ && 
((PortableValueWithType)val).value() == null)
+nullObjField = true;
+}
 else
 newFldTypeId = 
PortableUtils.typeByClass(val.getClass());
 
@@ -327,7 +333,7 @@ public class BinaryObjectBuilderImpl implements 
BinaryObjectBuilder {
 
 fieldsMeta.put(name, 
PortableUtils.fieldTypeId(newFldTypeName));
 }
-else {
+else if (!nullObjField) {
 String objTypeName = 
PortableUtils.fieldTypeName(GridPortableMarshaller.OBJ);
 
 if (!objTypeName.equals(oldFldTypeName) && 
!oldFldTypeName.equals(newFldTypeName)) {

[50/50] [abbrv] ignite git commit: IGNITE-843 Merge branches ignite-843-rc1.

[anovikov]

IGNITE-843 Merge branches ignite-843-rc1.


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

Branch: refs/heads/ignite-843-rc2
Commit: 75ef6981cbf9af6e33728d26ec12cd4b435c
Parents: 586ec5c 8695938
Author: Andrey 
Authored: Tue Dec 1 16:01:09 2015 +0700
Committer: Andrey 
Committed: Tue Dec 1 16:01:09 2015 +0700

--
 .../main/js/controllers/clusters-controller.js  |  2 +-
 .../src/main/js/controllers/models/caches.json  | 10 ++
 .../main/js/controllers/models/clusters.json|  2 +-
 .../main/js/controllers/summary-controller.js   |  2 +-
 modules/control-center-web/src/main/js/db.js|  1 +
 .../main/js/helpers/generator/generator-java.js |  7 ---
 .../main/js/helpers/generator/generator-pom.js  |  2 +-
 .../main/js/helpers/generator/generator-xml.js  | 21 +++-
 .../src/main/js/public/stylesheets/style.scss   | 16 +--
 .../src/main/js/views/includes/controls.jade|  4 ++--
 10 files changed, 42 insertions(+), 25 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/ignite/blob/75ef6981/modules/control-center-web/src/main/js/controllers/summary-controller.js
--
diff --cc 
modules/control-center-web/src/main/js/controllers/summary-controller.js
index bd2f424,0cbbd2f..c2bb1d7
--- a/modules/control-center-web/src/main/js/controllers/summary-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/summary-controller.js
@@@ -17,9 -17,9 +17,9 @@@
  
  // Controller for Summary screen.
  consoleModule.controller('summaryController', [
 -'$scope', '$http', '$common', '$loading', '$message', '$table',
 -function ($scope, $http, $common, $loading, $message, $table) {
 +'$scope', '$http', '$common', '$loading', '$table',
 +function ($scope, $http, $common, $loading, $table) {
- var igniteVersion = '1.5.0-IWC';
+ var igniteVersion = '1.5.0';
  
  $scope.panelExpanded = $common.panelExpanded;
  $scope.tableVisibleRow = $table.tableVisibleRow;

http://git-wip-us.apache.org/repos/asf/ignite/blob/75ef6981/modules/control-center-web/src/main/js/public/stylesheets/style.scss
--

http://git-wip-us.apache.org/repos/asf/ignite/blob/75ef6981/modules/control-center-web/src/main/js/views/includes/controls.jade
--

[26/50] [abbrv] ignite git commit: format

[anovikov]

format


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

Branch: refs/heads/ignite-843-rc2
Commit: 3a6a46322c97d04cf649cad57e9d67cc2213b320
Parents: 59ee87e
Author: Yakov Zhdanov 
Authored: Sat Nov 28 18:45:28 2015 +0300
Committer: Yakov Zhdanov 
Committed: Sat Nov 28 18:45:28 2015 +0300

--
 .../processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/3a6a4632/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java
--
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java
index 832f076..07e44da 100644
--- 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java
@@ -1041,4 +1041,4 @@ public abstract class 
IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA
 return res;
 }
 }
-}
\ No newline at end of file
+}

[03/50] [abbrv] ignite git commit: Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5

[anovikov]

Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5


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

Branch: refs/heads/ignite-843-rc2
Commit: 91f3f87524acb278726e6d6f1e27d4cfdc56a15a
Parents: 2806393 857c63e
Author: vozerov-gridgain 
Authored: Fri Nov 27 13:21:59 2015 +0300
Committer: vozerov-gridgain 
Committed: Fri Nov 27 13:21:59 2015 +0300

--
 ...gniteAtomicLongChangingTopologySelfTest.java |   8 +-
 modules/jms11/licenses/apache-2.0.txt   | 202 +++
 modules/kafka/README.txt|  32 +++
 modules/mqtt/licenses/apache-2.0.txt| 202 +++
 modules/zookeeper/licenses/apache-2.0.txt   | 202 +++
 5 files changed, 645 insertions(+), 1 deletion(-)
--

[12/50] [abbrv] ignite git commit: Disabled peer class loading in test.

[anovikov]

Disabled peer class loading in test.


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

Branch: refs/heads/ignite-843-rc2
Commit: 9b01be3ae237befe94574cfe32f3375ee45ff1ec
Parents: 3080f61
Author: sboikov 
Authored: Fri Nov 27 16:49:07 2015 +0300
Committer: sboikov 
Committed: Fri Nov 27 16:49:07 2015 +0300

--
 .../distributed/dht/IgniteAtomicLongChangingTopologySelfTest.java  | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/9b01be3a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteAtomicLongChangingTopologySelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteAtomicLongChangingTopologySelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteAtomicLongChangingTopologySelfTest.java
index 56bc760..74cb9ef 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteAtomicLongChangingTopologySelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteAtomicLongChangingTopologySelfTest.java
@@ -93,6 +93,8 @@ public class IgniteAtomicLongChangingTopologySelfTest extends 
GridCommonAbstract
 
 cfg.setClientMode(client);
 
+cfg.setPeerClassLoadingEnabled(false);
+
 return cfg;
 }
 

[02/50] [abbrv] ignite git commit: IGNITE-2017: Added top-level platforms readme.

[anovikov]

IGNITE-2017: Added top-level platforms readme.


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

Branch: refs/heads/ignite-843-rc2
Commit: 280639319757723bf9f273546b7c0d2b79575d40
Parents: e1db30a
Author: vozerov-gridgain 
Authored: Fri Nov 27 13:21:40 2015 +0300
Committer: vozerov-gridgain 
Committed: Fri Nov 27 13:21:40 2015 +0300

--
 assembly/release-fabric-base.xml | 9 +
 modules/platforms/README.txt | 6 ++
 2 files changed, 15 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/28063931/assembly/release-fabric-base.xml
--
diff --git a/assembly/release-fabric-base.xml b/assembly/release-fabric-base.xml
index d3e75ba..65903ee 100644
--- a/assembly/release-fabric-base.xml
+++ b/assembly/release-fabric-base.xml
@@ -69,6 +69,15 @@
 
 
 
+
+
+modules/platforms
+/platforms
+
+README.txt
+
+
+
 
 
 modules/platforms/dotnet

http://git-wip-us.apache.org/repos/asf/ignite/blob/28063931/modules/platforms/README.txt
--
diff --git a/modules/platforms/README.txt b/modules/platforms/README.txt
new file mode 100644
index 000..6268a88
--- /dev/null
+++ b/modules/platforms/README.txt
@@ -0,0 +1,6 @@
+Apache Ignite Platforms
+==
+
+Contains integrations with other platforms, most notably:
+ * Apache Ignite.NET
+ * Apache Ignite C++
\ No newline at end of file

[43/50] [abbrv] ignite git commit: IGNITE-843 Added keepBinary to cache configuration.

[anovikov]

IGNITE-843 Added keepBinary to cache configuration.


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

Branch: refs/heads/ignite-843-rc2
Commit: 95730f9ee8b2cfda0d4d43eeae5d5823b986b2de
Parents: 1d9d888
Author: Alexey Kuznetsov 
Authored: Tue Dec 1 14:58:09 2015 +0700
Committer: Alexey Kuznetsov 
Committed: Tue Dec 1 14:58:09 2015 +0700

--
 .../src/main/js/controllers/models/caches.json| 10 ++
 modules/control-center-web/src/main/js/db.js  |  1 +
 .../src/main/js/helpers/generator/generator-java.js   |  7 ---
 .../src/main/js/helpers/generator/generator-xml.js|  7 ---
 4 files changed, 19 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/95730f9e/modules/control-center-web/src/main/js/controllers/models/caches.json
--
diff --git 
a/modules/control-center-web/src/main/js/controllers/models/caches.json 
b/modules/control-center-web/src/main/js/controllers/models/caches.json
index bf3e81e..a60735a 100644
--- a/modules/control-center-web/src/main/js/controllers/models/caches.json
+++ b/modules/control-center-web/src/main/js/controllers/models/caches.json
@@ -576,6 +576,16 @@
   }
 },
 {
+  "label": "Keep binary in store",
+  "id": "keepBinaryInStore",
+  "type": "check",
+  "model": "keepBinaryInStore",
+  "placeholder": true,
+  "tip": [
+"Flag indicating that CacheStore implementation is working with 
binary objects instead of Java objects"
+  ]
+},
+{
   "label": "Load previous value",
   "id": "loadPreviousValue",
   "type": "check",

http://git-wip-us.apache.org/repos/asf/ignite/blob/95730f9e/modules/control-center-web/src/main/js/db.js
--
diff --git a/modules/control-center-web/src/main/js/db.js 
b/modules/control-center-web/src/main/js/db.js
index 51fedef..f26f418 100644
--- a/modules/control-center-web/src/main/js/db.js
+++ b/modules/control-center-web/src/main/js/db.js
@@ -157,6 +157,7 @@ var CacheSchema = new Schema({
 hibernateProperties: [String]
 }
 },
+keepBinaryInStore: Boolean,
 loadPreviousValue: Boolean,
 readThrough: Boolean,
 writeThrough: Boolean,

http://git-wip-us.apache.org/repos/asf/ignite/blob/95730f9e/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 b9fb376..1ea01ae 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
@@ -965,9 +965,10 @@ $generatorJava.cacheStore = function (cache, metadatas, 
cacheVarName, res) {
 res.needEmptyLine = true;
 }
 
-$generatorJava.property(res, cacheVarName, cache, 'loadPreviousValue');
-$generatorJava.property(res, cacheVarName, cache, 'readThrough');
-$generatorJava.property(res, cacheVarName, cache, 'writeThrough');
+$generatorJava.property(res, cacheVarName, cache, 'keepBinaryInStore', 
null, null, false);
+$generatorJava.property(res, cacheVarName, cache, 'loadPreviousValue', 
null, null, false);
+$generatorJava.property(res, cacheVarName, cache, 'readThrough', null, 
null, false);
+$generatorJava.property(res, cacheVarName, cache, 'writeThrough', null, 
null, false);
 
 res.needEmptyLine = true;
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/95730f9e/modules/control-center-web/src/main/js/helpers/generator/generator-xml.js
--
diff --git 
a/modules/control-center-web/src/main/js/helpers/generator/generator-xml.js 
b/modules/control-center-web/src/main/js/helpers/generator/generator-xml.js
index f01506a..55cf397 100644
--- a/modules/control-center-web/src/main/js/helpers/generator/generator-xml.js
+++ b/modules/control-center-web/src/main/js/helpers/generator/generator-xml.js
@@ -792,9 +792,10 @@ $generatorXml.cacheStore = function(cache, metadatas, res) 
{
 }
 }
 
-$generatorXml.property(res, cache, 'loadPreviousValue');
-$generatorXml.property(res, cache, 'readThrough');
-$generatorXml.property(res, cache, 'writeThrough');
+

[06/50] [abbrv] ignite git commit: ignite-2013 GridCacheEvictionLockUnlockSelfTest.testPartitioned test fixed

[anovikov]

ignite-2013 GridCacheEvictionLockUnlockSelfTest.testPartitioned test fixed


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

Branch: refs/heads/ignite-843-rc2
Commit: 95ab2310d2db49baadceefe3e667a3e1c930c926
Parents: 1727df6
Author: agura 
Authored: Thu Nov 26 21:54:34 2015 +0300
Committer: agura 
Committed: Fri Nov 27 14:45:19 2015 +0300

--
 .../cache/eviction/GridCacheEvictionLockUnlockSelfTest.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/95ab2310/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionLockUnlockSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionLockUnlockSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionLockUnlockSelfTest.java
index 11faca3..75f5c8f 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionLockUnlockSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionLockUnlockSelfTest.java
@@ -142,7 +142,7 @@ public class GridCacheEvictionLockUnlockSelfTest extends 
GridCommonAbstractTest
 assertEquals(gridCnt, touchCnt.get());
 
 for (int j = 0; j < gridCnt; j++)
-assertFalse(jcache(j).containsKey("key"));
+assertEquals(0, jcache(j).size());
 }
 }
 finally {

[44/50] [abbrv] ignite git commit: IGNITE-843 Support plugins for XML cache generation.

[anovikov]

IGNITE-843 Support plugins for XML cache generation.


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

Branch: refs/heads/ignite-843-rc2
Commit: 2f7b80dc4a58b00e7aee0f29c3e4763c905ac975
Parents: 95730f9
Author: Alexey Kuznetsov 
Authored: Tue Dec 1 15:06:13 2015 +0700
Committer: Alexey Kuznetsov 
Committed: Tue Dec 1 15:06:13 2015 +0700

--
 .../src/main/js/helpers/generator/generator-xml.js| 14 --
 1 file changed, 12 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/2f7b80dc/modules/control-center-web/src/main/js/helpers/generator/generator-xml.js
--
diff --git 
a/modules/control-center-web/src/main/js/helpers/generator/generator-xml.js 
b/modules/control-center-web/src/main/js/helpers/generator/generator-xml.js
index 55cf397..cd8942a 100644
--- a/modules/control-center-web/src/main/js/helpers/generator/generator-xml.js
+++ b/modules/control-center-web/src/main/js/helpers/generator/generator-xml.js
@@ -1108,6 +1108,18 @@ $generatorXml.cache = function(cache, res) {
 
 res.startBlock('');
 
+$generatorXml.cacheConfiguration(cache, res);
+
+res.endBlock('');
+
+return res;
+};
+
+// Generate cache configs.
+$generatorXml.cacheConfiguration = function(cache, res) {
+if (!res)
+res = $generatorCommon.builder();
+
 $generatorXml.cacheGeneral(cache, res);
 
 $generatorXml.cacheMemory(cache, res);
@@ -1126,8 +1138,6 @@ $generatorXml.cache = function(cache, res) {
 
 $generatorXml.cacheMetadatas(cache.metadatas, res);
 
-res.endBlock('');
-
 return res;
 };
 

[07/50] [abbrv] ignite git commit: Add README.txt for jms11, mqtt and zookeeper modules.

[anovikov]

Add README.txt for jms11, mqtt and zookeeper modules.


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

Branch: refs/heads/ignite-843-rc2
Commit: 722fe14a6814a9cdbfea1cbfe53598ba5ed8ea8f
Parents: 95ab231
Author: Raul Kripalani 
Authored: Fri Nov 27 11:54:32 2015 +
Committer: Raul Kripalani 
Committed: Fri Nov 27 11:54:32 2015 +

--
 modules/jms11/README.txt | 29 +
 modules/mqtt/README.txt  | 29 +
 modules/zookeeper/README.txt | 29 +
 3 files changed, 87 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/722fe14a/modules/jms11/README.txt
--
diff --git a/modules/jms11/README.txt b/modules/jms11/README.txt
new file mode 100644
index 000..3f0d213
--- /dev/null
+++ b/modules/jms11/README.txt
@@ -0,0 +1,29 @@
+Apache Ignite JMS 1.1 Module
+
+
+Apache Ignite JMS 1.1 module provides a streamer to consume JMS queue and 
topic messages into
+Apache Ignite caches.
+
+Importing Apache Ignite JMS 1.1 Module In Maven Project
+
+
+If you are using Maven to manage dependencies of your project, you can add the 
JMS 1.1 module
+dependency like this (replace '${ignite.version}' with actual Ignite version 
you are
+interested in):
+
+http://maven.apache.org/POM/4.0.0;
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+...
+
+...
+
+org.apache.ignite
+ignite-jms11
+${ignite.version}
+
+...
+
+...
+

http://git-wip-us.apache.org/repos/asf/ignite/blob/722fe14a/modules/mqtt/README.txt
--
diff --git a/modules/mqtt/README.txt b/modules/mqtt/README.txt
new file mode 100644
index 000..62a1589
--- /dev/null
+++ b/modules/mqtt/README.txt
@@ -0,0 +1,29 @@
+Apache Ignite MQTT Module
+-
+
+Apache Ignite MQTT module provides a streamer to consume MQTT topic messages 
into
+Apache Ignite caches.
+
+Importing Apache Ignite MQTT Module In Maven Project
+
+
+If you are using Maven to manage dependencies of your project, you can add the 
MQTT module
+dependency like this (replace '${ignite.version}' with actual Ignite version 
you are
+interested in):
+
+http://maven.apache.org/POM/4.0.0;
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+...
+
+...
+
+org.apache.ignite
+ignite-mqtt
+${ignite.version}
+
+...
+
+...
+

http://git-wip-us.apache.org/repos/asf/ignite/blob/722fe14a/modules/zookeeper/README.txt
--
diff --git a/modules/zookeeper/README.txt b/modules/zookeeper/README.txt
new file mode 100644
index 000..6d400ad
--- /dev/null
+++ b/modules/zookeeper/README.txt
@@ -0,0 +1,29 @@
+Apache Ignite ZooKeeper Module
+--
+
+Apache Ignite ZooKeeper module provides a TCP Discovery IP Finder that uses a 
ZooKeeper
+directory to locate other Ignite nodes to connect to.
+
+Importing Apache Ignite ZooKeeper Module In Maven Project
+-
+
+If you are using Maven to manage dependencies of your project, you can add the 
ZooKeeper
+module dependency like this (replace '${ignite.version}' with actual Ignite 
version you
+are interested in):
+
+http://maven.apache.org/POM/4.0.0;
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+...
+
+...
+
+org.apache.ignite
+ignite-zookeeper
+${ignite.version}
+
+...
+
+...
+

[36/50] [abbrv] ignite git commit: IGNITE-843 Update dependencies.

[anovikov]

IGNITE-843 Update dependencies.


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

Branch: refs/heads/ignite-843-rc2
Commit: 85d956d17dcfc7080c61a38c1563cd2ff36de44b
Parents: c014199
Author: AKuznetsov 
Authored: Mon Nov 30 19:09:06 2015 +0700
Committer: AKuznetsov 
Committed: Mon Nov 30 19:09:06 2015 +0700

--
 .../control-center-web/src/main/js/config.js| 37 +---
 .../control-center-web/src/main/js/package.json |  6 ++--
 2 files changed, 20 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/85d956d1/modules/control-center-web/src/main/js/config.js
--
diff --git a/modules/control-center-web/src/main/js/config.js 
b/modules/control-center-web/src/main/js/config.js
index 62abb41..0640226 100644
--- a/modules/control-center-web/src/main/js/config.js
+++ b/modules/control-center-web/src/main/js/config.js
@@ -33,7 +33,7 @@ System.config({
 "bootstrap": "github:twbs/bootstrap@3.3.5",
 "clean-css": "npm:clean-css@3.4.8",
 "core-js": "npm:core-js@1.2.6",
-"css": "github:systemjs/plugin-css@0.1.19",
+"css": "github:systemjs/plugin-css@0.1.20",
 "font-awesome": "npm:font-awesome@4.4.0",
 "jquery": "github:components/jquery@2.1.4",
 "jszip": "github:Stuk/jszip@2.5.0",
@@ -49,9 +49,6 @@ System.config({
 "github:angular/bower-angular-sanitize@1.4.8": {
   "angular": "github:angular/bower-angular@1.4.8"
 },
-"github:angular/bower-angular@1.4.7": {
-  "jquery": "github:components/jquery@2.1.4"
-},
 "github:angular/bower-angular@1.4.8": {
   "jquery": "github:components/jquery@2.1.4"
 },
@@ -110,15 +107,15 @@ System.config({
 },
 "github:krispo/angular-nvd3@1.0.4": {
   "angular": "github:angular/bower-angular@1.4.8",
-  "d3": "npm:d3@3.5.9",
+  "d3": "npm:d3@3.5.10",
   "nvd3": "npm:nvd3@1.8.1"
 },
 "github:marceljuenemann/angular-drag-and-drop-lists@1.3.0": {
-  "angular": "github:angular/bower-angular@1.4.7"
+  "angular": "github:angular/bower-angular@1.4.8"
 },
 "github:mgcrea/angular-motion@0.4.3": {
   "angular": "github:angular/bower-angular@1.4.8",
-  "css": "github:systemjs/plugin-css@0.1.19"
+  "css": "github:systemjs/plugin-css@0.1.20"
 },
 "github:mobilexag/plugin-sass@0.0.10": {
   "fs": "github:jspm/nodelibs-fs@0.1.2",
@@ -135,7 +132,7 @@ System.config({
   "jquery": "github:components/jquery@2.1.4"
 },
 "github:wix/angular-tree-control@0.2.22": {
-  "angular": "github:angular/bower-angular@1.4.7"
+  "angular": "github:angular/bower-angular@1.4.8"
 },
 "npm:amdefine@1.0.0": {
   "fs": "github:jspm/nodelibs-fs@0.1.2",
@@ -143,9 +140,9 @@ System.config({
   "path": "github:jspm/nodelibs-path@0.1.0",
   "process": "github:jspm/nodelibs-process@0.1.2"
 },
-"npm:asn1.js@4.1.0": {
+"npm:asn1.js@4.2.0": {
   "assert": "github:jspm/nodelibs-assert@0.1.0",
-  "bn.js": "npm:bn.js@4.3.0",
+  "bn.js": "npm:bn.js@4.4.0",
   "buffer": "github:jspm/nodelibs-buffer@0.1.0",
   "inherits": "npm:inherits@2.0.1",
   "minimalistic-assert": "npm:minimalistic-assert@1.0.0",
@@ -183,14 +180,14 @@ System.config({
   "inherits": "npm:inherits@2.0.1"
 },
 "npm:browserify-rsa@4.0.0": {
-  "bn.js": "npm:bn.js@4.3.0",
+  "bn.js": "npm:bn.js@4.4.0",
   "buffer": "github:jspm/nodelibs-buffer@0.1.0",
   "constants": "github:jspm/nodelibs-constants@0.1.0",
   "crypto": "github:jspm/nodelibs-crypto@0.1.0",
   "randombytes": "npm:randombytes@2.0.1"
 },
 "npm:browserify-sign@4.0.0": {
-  "bn.js": "npm:bn.js@4.3.0",
+  "bn.js": "npm:bn.js@4.4.0",
   "browserify-rsa": "npm:browserify-rsa@4.0.0",
   "buffer": "github:jspm/nodelibs-buffer@0.1.0",
   "create-hash": "npm:create-hash@1.1.2",
@@ -253,7 +250,7 @@ System.config({
   "buffer": "github:jspm/nodelibs-buffer@0.1.0"
 },
 "npm:create-ecdh@4.0.0": {
-  "bn.js": "npm:bn.js@4.3.0",
+  "bn.js": "npm:bn.js@4.4.0",
   "buffer": "github:jspm/nodelibs-buffer@0.1.0",
   "crypto": "github:jspm/nodelibs-crypto@0.1.0",
   "elliptic": "npm:elliptic@6.0.2"
@@ -292,7 +289,7 @@ System.config({
   "minimalistic-assert": "npm:minimalistic-assert@1.0.0"
 },
 "npm:diffie-hellman@5.0.0": {
-  "bn.js": "npm:bn.js@4.3.0",
+  "bn.js": "npm:bn.js@4.4.0",
   "buffer": "github:jspm/nodelibs-buffer@0.1.0",
   "crypto": "github:jspm/nodelibs-crypto@0.1.0",
   

[30/50] [abbrv] ignite git commit: IGNITE-843 Fixed joinTip.

[anovikov]

IGNITE-843 Fixed joinTip.


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

Branch: refs/heads/ignite-843-rc2
Commit: 0c536216cc0c4c5a44577d692b788b485a01984e
Parents: 61a4f88
Author: Alexey Kuznetsov 
Authored: Mon Nov 30 13:28:33 2015 +0700
Committer: Alexey Kuznetsov 
Committed: Mon Nov 30 13:28:33 2015 +0700

--
 modules/control-center-web/src/main/js/config.js | 5 -
 .../src/main/js/controllers/common-module.js | 8 +++-
 2 files changed, 7 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/0c536216/modules/control-center-web/src/main/js/config.js
--
diff --git a/modules/control-center-web/src/main/js/config.js 
b/modules/control-center-web/src/main/js/config.js
index 495ab0a..62abb41 100644
--- a/modules/control-center-web/src/main/js/config.js
+++ b/modules/control-center-web/src/main/js/config.js
@@ -207,8 +207,11 @@ System.config({
 },
 "npm:buffer@3.5.2": {
   "base64-js": "npm:base64-js@0.0.8",
+  "child_process": "github:jspm/nodelibs-child_process@0.1.0",
+  "fs": "github:jspm/nodelibs-fs@0.1.2",
   "ieee754": "npm:ieee754@1.1.6",
-  "is-array": "npm:is-array@1.0.1"
+  "is-array": "npm:is-array@1.0.1",
+  "process": "github:jspm/nodelibs-process@0.1.2"
 },
 "npm:cipher-base@1.0.2": {
   "buffer": "github:jspm/nodelibs-buffer@0.1.0",

http://git-wip-us.apache.org/repos/asf/ignite/blob/0c536216/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 965906a..4985022 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
@@ -654,16 +654,14 @@ consoleModule.service('$common', [
 return {
 getModel: getModel,
 joinTip: function (arr) {
-if (!arr) {
+if (!arr)
 return arr;
-}
 
-var lines = arr.map(function (line) {
+var lines = _.map(arr, function (line) {
 var rtrimmed = line.replace(/\s+$/g, '');
 
-if (rtrimmed.indexOf('>', this.length - 1) == -1) {
+if (rtrimmed.indexOf('>', this.length - 1) == -1)
 rtrimmed = rtrimmed + '';
-}
 
 return rtrimmed;
 });

[10/50] [abbrv] ignite git commit: IGNITE-2009: Fixed leak in cached SQL queries.

[anovikov]

IGNITE-2009: Fixed leak in cached SQL queries.


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

Branch: refs/heads/ignite-843-rc2
Commit: fc10b3e40fadd7ad792aaea63fe270c6413c5068
Parents: 3080f61
Author: vozerov-gridgain 
Authored: Fri Nov 27 16:48:01 2015 +0300
Committer: vozerov-gridgain 
Committed: Fri Nov 27 16:48:01 2015 +0300

--
 .../processors/query/h2/IgniteH2Indexing.java   | 24 +---
 1 file changed, 16 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/fc10b3e4/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
--
diff --git 
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
 
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
index cc452c1..1437a16 100644
--- 
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
+++ 
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
@@ -49,6 +49,7 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import javax.cache.Cache;
 import javax.cache.CacheException;
@@ -255,7 +256,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
 set(c);
 
 // Reset statement cache when new connection is created.
-stmtCache.get().clear();
+stmtCache.remove(Thread.currentThread());
 }
 
 return c;
@@ -280,12 +281,8 @@ public class IgniteH2Indexing implements GridQueryIndexing 
{
 /** */
 private volatile GridKernalContext ctx;
 
-/** */
-private final ThreadLocal stmtCache = new 
ThreadLocal() {
-@Override protected StatementCache initialValue() {
-return new StatementCache(PREPARED_STMT_CACHE_SIZE);
-}
-};
+/** Statement cache. */
+private final ConcurrentHashMap stmtCache = new 
ConcurrentHashMap<>();
 
 /** */
 private final GridBoundedConcurrentLinkedHashMap, TwoStepCachedQuery> twoStepCache =
@@ -313,7 +310,18 @@ public class IgniteH2Indexing implements GridQueryIndexing 
{
  */
 private PreparedStatement prepareStatement(Connection c, String sql, 
boolean useStmtCache) throws SQLException {
 if (useStmtCache) {
-StatementCache cache = stmtCache.get();
+Thread curThread = Thread.currentThread();
+
+StatementCache cache = stmtCache.get(curThread);
+
+if (cache == null) {
+StatementCache cache0 = new 
StatementCache(PREPARED_STMT_CACHE_SIZE);
+
+cache = stmtCache.putIfAbsent(curThread, cache0);
+
+if (cache == null)
+cache = cache0;
+}
 
 PreparedStatement stmt = cache.get(sql);
 

[39/50] [abbrv] ignite git commit: IGNITE-843 Cleanup

[anovikov]

IGNITE-843 Cleanup


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

Branch: refs/heads/ignite-843-rc2
Commit: a8c8ebf6f1b2aaa3fcaf3901195ef1b1dc4a0299
Parents: 6b19f87
Author: Andrey 
Authored: Tue Dec 1 10:12:14 2015 +0700
Committer: Andrey 
Committed: Tue Dec 1 10:12:14 2015 +0700

--
 .../main/js/app/modules/configuration-sidebar/main.js   |  2 +-
 .../src/main/js/controllers/common-module.js| 12 ++--
 modules/control-center-web/src/main/js/routes/admin.js  |  2 +-
 modules/control-center-web/src/main/js/routes/public.js |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/a8c8ebf6/modules/control-center-web/src/main/js/app/modules/configuration-sidebar/main.js
--
diff --git 
a/modules/control-center-web/src/main/js/app/modules/configuration-sidebar/main.js
 
b/modules/control-center-web/src/main/js/app/modules/configuration-sidebar/main.js
index 5a2abff..8d34064 100644
--- 
a/modules/control-center-web/src/main/js/app/modules/configuration-sidebar/main.js
+++ 
b/modules/control-center-web/src/main/js/app/modules/configuration-sidebar/main.js
@@ -18,7 +18,7 @@
 import angular from 'angular'
 
 angular
-.module('ignite-console.configuration-sidebar', [
+.module('ignite-console.configuration.sidebar', [
 
 ])
 .provider('igniteConfigurationSidebar', function() {

http://git-wip-us.apache.org/repos/asf/ignite/blob/a8c8ebf6/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 b235796..7cb5011 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
@@ -20,8 +20,8 @@ var consoleModule = angular.module('ignite-web-console',
 'ngAnimate', 'ngSanitize', 'mgcrea.ngStrap', 'smart-table', 'ui.ace', 
'treeControl', 'darthwade.dwLoading', 'agGrid', 'nvd3', 'dndLists'
 /* ignite:modules */
 , 'ignite-console'
-, 'ignite-web-console.navbar'
-, 'ignite-web-console.configuration.sidebar'
+, 'ignite-console.navbar'
+, 'ignite-console.configuration.sidebar'
 /* endignite */
 /* ignite:plugins */
 /* endignite */
@@ -34,7 +34,7 @@ var consoleModule = angular.module('ignite-web-console',
 
 $rootScope.revertIdentity = function () {
 $http
-.get('/api/v1/admin/revertIdentity')
+.get('/api/v1/admin/revert/identity')
 .then(User.read)
 .then(function (user) {
 $rootScope.$broadcast('user', user);
@@ -2033,7 +2033,7 @@ consoleModule.controller('resetPassword', [
 '$scope', '$modal', '$http', '$common', '$focus', 'Auth', '$state',
 function ($scope, $modal, $http, $common, $focus, Auth, $state) {
 if ($state.params.token)
-$http.post('/api/v1/password/validate-token', {token: 
$state.params.token})
+$http.post('/api/v1/validate/token', {token: $state.params.token})
 .success(function (res) {
 $scope.email = res.email;
 $scope.token = res.token;
@@ -2075,7 +2075,7 @@ consoleModule.controller('auth', [
 
 // Download agent controller.
 consoleModule.controller('agent-download', [
-'$http', '$common', '$scope', '$interval', '$modal', '$window', function 
($http, $common, $scope, $interval, $modal, $window) {
+'$http', '$common', '$scope', '$interval', '$modal', '$state', function 
($http, $common, $scope, $interval, $modal, $state) {
 // Pre-fetch modal dialogs.
 var _agentDownloadModal = $modal({scope: $scope, templateUrl: 
'/templates/agent-download.html', show: false, backdrop: 'static'});
 
@@ -2095,7 +2095,7 @@ consoleModule.controller('agent-download', [
  */
 $scope.goBack = function () {
 if (_agentDownloadModal.backLink)
-$window.location = _agentDownloadModal.backLink;
+$state.go(_agentDownloadModal.backLink);
 
 _stopInterval();
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/a8c8ebf6/modules/control-center-web/src/main/js/routes/admin.js
--
diff --git 

[38/50] [abbrv] ignite git commit: IGNITE-843 Merge branches ignite-843-rc1.

[anovikov]

IGNITE-843 Merge branches ignite-843-rc1.


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

Branch: refs/heads/ignite-843-rc2
Commit: 6b19f87df49e20e05ec1d423c2af2bd841784254
Parents: 95401ab 85d956d
Author: Andrey 
Authored: Tue Dec 1 09:58:30 2015 +0700
Committer: Andrey 
Committed: Tue Dec 1 09:59:31 2015 +0700

--
 .gitignore  |6 +
 DEVNOTES.txt|2 +-
 RELEASE_NOTES.txt   |   17 +
 assembly/release-fabric-base.xml|  103 +
 examples/config/example-default.xml |   76 +
 examples/config/example-ignite.xml  |   62 +-
 examples/pom.xml|2 +-
 examples/schema-import/bin/db-init.sql  |3 +-
 .../org/apache/ignite/schema/CacheConfig.java   |7 +-
 .../java/org/apache/ignite/schema/Demo.java |   20 +-
 .../hibernate/CacheHibernatePersonStore.java|4 +-
 .../hibernate/CacheHibernateStoreExample.java   |2 +-
 .../datagrid/store/hibernate/Person.hbm.xml |2 +-
 ...ComputeClientBinaryTaskExecutionExample.java |  153 +
 .../binary/computegrid/ComputeClientTask.java   |  116 +
 .../binary/computegrid/package-info.java|   21 +
 .../CacheClientBinaryPutGetExample.java |  230 ++
 .../datagrid/CacheClientBinaryQueryExample.java |  330 ++
 .../examples/binary/datagrid/package-info.java  |   21 +
 .../ignite/examples/binary/package-info.java|   21 +
 .../ComputeFibonacciContinuationExample.java|   15 +-
 .../computegrid/ComputeTaskMapExample.java  |6 +-
 .../computegrid/ComputeTaskSplitExample.java|4 +-
 .../examples/datagrid/CacheQueryExample.java|  161 +-
 .../ignite/examples/datagrid/store/Person.java  |  154 -
 .../store/auto/CacheAutoStoreExample.java   |4 +-
 .../auto/CacheAutoStoreLoadDataExample.java |4 +-
 .../datagrid/store/auto/CacheConfig.java|6 +-
 .../store/dummy/CacheDummyPersonStore.java  |   12 +-
 .../store/dummy/CacheDummyStoreExample.java |4 +-
 .../store/jdbc/CacheJdbcPersonStore.java|   18 +-
 .../store/jdbc/CacheJdbcStoreExample.java   |4 +-
 .../store/spring/CacheSpringPersonStore.java|   10 +-
 .../store/spring/CacheSpringStoreExample.java   |4 +-
 .../datastructures/IgniteSemaphoreExample.java  |  168 +
 .../examples/messaging/MessagingExample.java|   18 +-
 .../examples/misc/springbean/spring-bean.xml|7 -
 .../ignite/examples/model/Organization.java |   62 +
 .../apache/ignite/examples/model/Person.java|  127 +
 .../ignite/examples/model/binary/Address.java   |   72 +
 .../ignite/examples/model/binary/Employee.java  |   93 +
 .../examples/model/binary/EmployeeKey.java  |   93 +
 .../examples/model/binary/Organization.java |   93 +
 .../examples/model/binary/OrganizationType.java |   32 +
 .../scalar/examples/ScalarCacheExample.scala|   19 +-
 .../examples/ScalarCacheQueryExample.scala  |   66 +-
 .../CacheClientPortableExampleTest.java |   46 +
 .../ignite/examples/CacheExamplesSelfTest.java  |   10 +-
 .../ComputeClientPortableExampleTest.java   |   37 +
 .../testsuites/IgniteExamplesSelfTestSuite.java |   10 +-
 modules/camel/README.txt|   34 +
 modules/camel/licenses/apache-2.0.txt   |  202 +
 modules/camel/pom.xml   |  102 +
 .../ignite/stream/camel/CamelStreamer.java  |  237 ++
 .../stream/camel/IgniteCamelStreamerTest.java   |  418 ++
 .../camel/IgniteCamelStreamerTestSuite.java |   47 +
 .../src/test/resources/camel.test.properties|   18 +
 .../client/router/RouterFactorySelfTest.java|2 +
 .../ignite/codegen/MessageCodeGenerator.java|7 +-
 .../src/main/js/controllers/common-module.js|   12 +-
 .../main/js/controllers/summary-controller.js   |   14 +-
 .../js/helpers/generator/generator-common.js|   28 +-
 .../helpers/generator/generator-properties.js   |   15 +
 modules/core/pom.xml|   21 +
 ...processors.platform.PlatformBootstrapFactory |2 +
 .../src/main/java/org/apache/ignite/Ignite.java |   24 +
 .../java/org/apache/ignite/IgniteBinary.java|  363 ++
 .../java/org/apache/ignite/IgniteCache.java |   68 +-
 .../java/org/apache/ignite/IgniteCompute.java   |3 +-
 .../org/apache/ignite/IgniteDataStreamer.java   |   16 +
 .../java/org/apache/ignite/IgniteSemaphore.java |  312 ++
 .../org/apache/ignite/binary/BinaryField.java   |   46 +
 .../apache/ignite/binary/BinaryIdMapper.java|   55 +
 .../binary/BinaryInvalidTypeException.java  |   58 +
 

[05/50] [abbrv] ignite git commit: ignite-2010 IgniteCacheCrossCacheTxFailoverTest.testCrossCachePessimisticTxFailoverOffheapSwap test fixed

[anovikov]

ignite-2010 
IgniteCacheCrossCacheTxFailoverTest.testCrossCachePessimisticTxFailoverOffheapSwap
 test fixed


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

Branch: refs/heads/ignite-843-rc2
Commit: 1727df6a334b3cc879ca7bc9dd76e6f52f1e027a
Parents: 9c46fa9
Author: agura 
Authored: Thu Nov 26 17:36:12 2015 +0300
Committer: agura 
Committed: Fri Nov 27 14:44:05 2015 +0300

--
 .../distributed/dht/IgniteCacheCrossCacheTxFailoverTest.java   | 6 ++
 1 file changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/1727df6a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheCrossCacheTxFailoverTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheCrossCacheTxFailoverTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheCrossCacheTxFailoverTest.java
index e46761b..0294dea 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheCrossCacheTxFailoverTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheCrossCacheTxFailoverTest.java
@@ -37,6 +37,7 @@ import 
org.apache.ignite.internal.IgniteFutureTimeoutCheckedException;
 import org.apache.ignite.internal.IgniteInternalFuture;
 import org.apache.ignite.internal.IgniteKernal;
 import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.util.typedef.G;
 import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi;
 import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
@@ -391,6 +392,11 @@ public class IgniteCacheCrossCacheTxFailoverTest extends 
GridCommonAbstractTest
 ignite0.destroyCache(CACHE1);
 ignite0.destroyCache(CACHE2);
 
+AffinityTopologyVersion topVer = 
ignite0.context().cache().context().exchange().lastTopologyFuture().get();
+
+for (Ignite ignite : G.allGrids())
+
((IgniteKernal)ignite).context().cache().context().exchange().affinityReadyFuture(topVer).get();
+
 awaitPartitionMapExchange();
 }
 }

[22/50] [abbrv] ignite git commit: Use TcpDiscoveryVmIpFinder.

[anovikov]

Use TcpDiscoveryVmIpFinder.


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

Branch: refs/heads/ignite-843-rc2
Commit: ee5d9fd8beb3d6bf29ee2e932d4c1fe374e6dffc
Parents: 8a822d8
Author: sboikov 
Authored: Sat Nov 28 15:01:57 2015 +0300
Committer: sboikov 
Committed: Sat Nov 28 15:01:57 2015 +0300

--
 .../GridCacheBinaryObjectsAbstractMultiThreadedSelfTest.java | 8 
 1 file changed, 8 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/ee5d9fd8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCacheBinaryObjectsAbstractMultiThreadedSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCacheBinaryObjectsAbstractMultiThreadedSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCacheBinaryObjectsAbstractMultiThreadedSelfTest.java
index f1e427b..321194f 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCacheBinaryObjectsAbstractMultiThreadedSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCacheBinaryObjectsAbstractMultiThreadedSelfTest.java
@@ -40,6 +40,9 @@ import org.apache.ignite.binary.BinaryObject;
 import org.apache.ignite.binary.BinaryReader;
 import org.apache.ignite.binary.BinaryTypeConfiguration;
 import org.apache.ignite.binary.BinaryWriter;
+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.junits.common.GridCommonAbstractTest;
 import org.jsr166.LongAdder8;
 
@@ -50,6 +53,9 @@ import static 
org.apache.ignite.cache.CacheWriteSynchronizationMode.PRIMARY_SYNC
  */
 public abstract class GridCacheBinaryObjectsAbstractMultiThreadedSelfTest 
extends GridCommonAbstractTest {
 /** */
+private static final TcpDiscoveryIpFinder IP_FINDER = new 
TcpDiscoveryVmIpFinder(true);
+
+/** */
 private static final int THREAD_CNT = 64;
 
 /** */
@@ -59,6 +65,8 @@ public abstract class 
GridCacheBinaryObjectsAbstractMultiThreadedSelfTest extend
 @Override protected IgniteConfiguration getConfiguration(String gridName) 
throws Exception {
 IgniteConfiguration cfg = super.getConfiguration(gridName);
 
+((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(IP_FINDER);
+
 CacheConfiguration cacheCfg = new CacheConfiguration();
 
 cacheCfg.setCacheMode(cacheMode());

[27/50] [abbrv] ignite git commit: Fixed communication subsystem stop notification.

[anovikov]

Fixed communication subsystem stop notification.


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

Branch: refs/heads/ignite-843-rc2
Commit: 59f3726696ec47b52f68103aa8250d9f2015b49b
Parents: 3a6a463
Author: Yakov Zhdanov 
Authored: Sat Nov 28 18:46:51 2015 +0300
Committer: Yakov Zhdanov 
Committed: Sat Nov 28 18:46:51 2015 +0300

--
 .../managers/communication/GridIoManager.java   | 88 +---
 .../distributed/dht/GridDhtTxPrepareFuture.java |  4 +-
 .../cache/transactions/IgniteTxHandler.java |  4 +-
 .../communication/tcp/TcpCommunicationSpi.java  | 17 ++--
 .../ignite/testframework/GridTestUtils.java | 61 +-
 5 files changed, 76 insertions(+), 98 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/59f37266/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 ea82d7f..a8557cc 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
@@ -46,8 +46,6 @@ import org.apache.ignite.internal.GridKernalContext;
 import org.apache.ignite.internal.GridTopic;
 import org.apache.ignite.internal.IgniteComponentType;
 import org.apache.ignite.internal.IgniteDeploymentCheckedException;
-import org.apache.ignite.internal.IgniteKernal;
-import org.apache.ignite.internal.IgnitionEx;
 import org.apache.ignite.internal.direct.DirectMessageReader;
 import org.apache.ignite.internal.direct.DirectMessageWriter;
 import org.apache.ignite.internal.managers.GridManagerAdapter;
@@ -103,9 +101,6 @@ import static 
org.jsr166.ConcurrentLinkedHashMap.QueuePolicy.PER_SEGMENT_Q_OPTIM
  * Grid communication manager.
  */
 public class GridIoManager extends 
GridManagerAdapter {
-/** */
-public static volatile boolean TURBO_DEBUG_MODE;
-
 /** Empty array of message factories. */
 public static final MessageFactory[] EMPTY = {};
 
@@ -775,7 +770,7 @@ public class GridIoManager extends 
GridManagerAdapter

[17/50] [abbrv] ignite git commit: marshaller perf suggestion fixed

[anovikov]

marshaller perf suggestion fixed


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

Branch: refs/heads/ignite-843-rc2
Commit: 0c03b916a4608e35993eeff276e2e12638930d52
Parents: fb5d54a
Author: Yakov Zhdanov 
Authored: Fri Nov 27 20:27:29 2015 +0300
Committer: Yakov Zhdanov 
Committed: Fri Nov 27 20:27:29 2015 +0300

--
 .../java/org/apache/ignite/internal/IgniteKernal.java | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/0c03b916/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java 
b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 305769b..68d48c9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -53,21 +53,21 @@ import org.apache.ignite.IgniteAtomicLong;
 import org.apache.ignite.IgniteAtomicReference;
 import org.apache.ignite.IgniteAtomicSequence;
 import org.apache.ignite.IgniteAtomicStamped;
+import org.apache.ignite.IgniteBinary;
 import org.apache.ignite.IgniteCache;
 import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.IgniteClientDisconnectedException;
 import org.apache.ignite.IgniteCompute;
 import org.apache.ignite.IgniteCountDownLatch;
-import org.apache.ignite.IgniteSemaphore;
 import org.apache.ignite.IgniteDataStreamer;
 import org.apache.ignite.IgniteEvents;
 import org.apache.ignite.IgniteException;
 import org.apache.ignite.IgniteFileSystem;
 import org.apache.ignite.IgniteLogger;
 import org.apache.ignite.IgniteMessaging;
-import org.apache.ignite.IgniteBinary;
 import org.apache.ignite.IgniteQueue;
 import org.apache.ignite.IgniteScheduler;
+import org.apache.ignite.IgniteSemaphore;
 import org.apache.ignite.IgniteServices;
 import org.apache.ignite.IgniteSet;
 import org.apache.ignite.IgniteSystemProperties;
@@ -96,6 +96,8 @@ import 
org.apache.ignite.internal.managers.failover.GridFailoverManager;
 import org.apache.ignite.internal.managers.indexing.GridIndexingManager;
 import 
org.apache.ignite.internal.managers.loadbalancer.GridLoadBalancerManager;
 import org.apache.ignite.internal.managers.swapspace.GridSwapSpaceManager;
+import org.apache.ignite.internal.portable.BinaryEnumCache;
+import org.apache.ignite.internal.portable.BinaryMarshaller;
 import org.apache.ignite.internal.processors.GridProcessor;
 import org.apache.ignite.internal.processors.affinity.GridAffinityProcessor;
 import org.apache.ignite.internal.processors.cache.GridCacheAdapter;
@@ -133,7 +135,6 @@ import 
org.apache.ignite.internal.processors.service.GridServiceProcessor;
 import org.apache.ignite.internal.processors.session.GridTaskSessionProcessor;
 import org.apache.ignite.internal.processors.task.GridTaskProcessor;
 import org.apache.ignite.internal.processors.timeout.GridTimeoutProcessor;
-import org.apache.ignite.internal.portable.BinaryEnumCache;
 import org.apache.ignite.internal.util.GridTimerTask;
 import org.apache.ignite.internal.util.future.GridFinishedFuture;
 import org.apache.ignite.internal.util.future.GridFutureAdapter;
@@ -158,7 +159,6 @@ import org.apache.ignite.lifecycle.LifecycleBean;
 import org.apache.ignite.lifecycle.LifecycleEventType;
 import org.apache.ignite.marshaller.MarshallerExclusions;
 import org.apache.ignite.marshaller.optimized.OptimizedMarshaller;
-import org.apache.ignite.internal.portable.BinaryMarshaller;
 import org.apache.ignite.mxbean.ClusterLocalNodeMetricsMXBean;
 import org.apache.ignite.mxbean.IgniteMXBean;
 import org.apache.ignite.mxbean.ThreadPoolMXBean;
@@ -1192,9 +1192,9 @@ public class IgniteKernal implements IgniteEx, 
IgniteMXBean, Externalizable {
 if (cfg.getIncludeEventTypes() != null && 
cfg.getIncludeEventTypes().length != 0)
 perf.add("Disable grid events (remove 'includeEventTypes' from 
configuration)");
 
-if (OptimizedMarshaller.available() && !(cfg.getMarshaller() 
instanceof OptimizedMarshaller))
-perf.add("Enable optimized marshaller (set 'marshaller' to " +
-OptimizedMarshaller.class.getSimpleName() + ')');
+if (BinaryMarshaller.available() && !(cfg.getMarshaller() instanceof 
BinaryMarshaller))
+perf.add("Enable binary marshaller (set 'marshaller' to " +
+BinaryMarshaller.class.getSimpleName() + ')');
 }
 
 /**

[32/50] [abbrv] ignite git commit: Merge remote-tracking branch 'origin/ignite-843-rc1' into ignite-843-rc1

[anovikov]

Merge remote-tracking branch 'origin/ignite-843-rc1' into ignite-843-rc1


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

Branch: refs/heads/ignite-843-rc2
Commit: 9653af519dc2b519180dc63cecef2d1b507d6d03
Parents: ac2ef81 3d1a6c0
Author: AKuznetsov 
Authored: Mon Nov 30 17:33:29 2015 +0700
Committer: AKuznetsov 
Committed: Mon Nov 30 17:33:29 2015 +0700

--
 .../control-center-web/src/main/js/.gitignore   |   1 +
 modules/control-center-web/src/main/js/app.js   |   4 +
 .../control-center-web/src/main/js/app/index.js |  34 ++
 .../app/modules/configuration-sidebar/main.js   |  54 +++
 modules/control-center-web/src/main/js/bin/www  |   2 +-
 .../control-center-web/src/main/js/config.js| 436 +++
 .../main/js/controllers/clusters-controller.js  |  28 +-
 .../src/main/js/controllers/common-module.js|  98 -
 .../src/main/js/controllers/igfs-controller.js  |  79 ++--
 .../main/js/controllers/metadata-controller.js  |   5 +-
 .../src/main/js/controllers/models/caches.json  |  12 +-
 .../main/js/controllers/models/clusters.json|  10 +
 .../src/main/js/controllers/models/igfs.json|  22 +-
 .../main/js/controllers/models/metadata.json|   9 -
 .../src/main/js/controllers/sql-controller.js   |  80 ++--
 .../main/js/controllers/summary-controller.js   |  10 +-
 modules/control-center-web/src/main/js/db.js|  16 +-
 .../src/main/js/gulpfile.js/tasks/build.js  |   2 +-
 .../src/main/js/gulpfile.js/tasks/bundle.js |   7 +
 .../src/main/js/gulpfile.js/tasks/copy.js   |  30 +-
 .../main/js/gulpfile.js/tasks/inject-plugins.js |   4 +-
 .../src/main/js/gulpfile.js/tasks/jade.js   |  33 +-
 .../src/main/js/helpers/common-utils.js |  10 +
 .../src/main/js/helpers/configuration-loader.js |  30 ++
 .../js/helpers/generator/generator-common.js|  42 +-
 .../main/js/helpers/generator/generator-java.js | 249 ++-
 .../main/js/helpers/generator/generator-pom.js  |  95 ++--
 .../helpers/generator/generator-properties.js   |  15 +
 .../main/js/helpers/generator/generator-xml.js  |  89 ++--
 .../src/main/js/ignite_modules/README.txt   |   6 +
 .../control-center-web/src/main/js/package.json | 159 ++-
 .../src/main/js/public/js/Blob.js   | 211 -
 .../src/main/js/public/js/FileSaver.min.js  |   2 -
 .../src/main/js/public/js/jszip.min.js  |  14 -
 .../src/main/js/public/stylesheets/style.scss   |   9 +-
 .../src/main/js/routes/clusters.js  |   2 +-
 .../main/js/views/configuration/metadata.jade   |   1 -
 .../main/js/views/configuration/sidebar.jade|  27 +-
 .../js/views/configuration/summary-tabs.jade|   1 +
 .../main/js/views/configuration/summary.jade|  24 +-
 .../src/main/js/views/includes/controls.jade|  14 +-
 .../src/main/js/views/includes/header.jade  |  13 +-
 .../src/main/js/views/settings/profile.jade |   1 -
 .../src/main/js/views/sql/sql.jade  |  14 +-
 .../src/main/js/views/templates/layout.jade |  40 +-
 .../store/jdbc/CacheAbstractJdbcStore.java  |  34 +-
 .../dht/preloader/GridDhtPartitionSupplier.java |   3 +
 .../scala/org/apache/ignite/visor/visor.scala   |   3 +-
 48 files changed, 1415 insertions(+), 669 deletions(-)
--

[29/50] [abbrv] ignite git commit: Fixed performance suggestions.

[anovikov]

Fixed performance suggestions.


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

Branch: refs/heads/ignite-843-rc2
Commit: 0b61333a34be7fac8309ce050aa383f757f6187e
Parents: 923fea8
Author: Alexey Goncharuk 
Authored: Sun Nov 29 17:11:08 2015 +0300
Committer: Alexey Goncharuk 
Committed: Sun Nov 29 17:11:08 2015 +0300

--
 .../src/main/java/org/apache/ignite/internal/IgniteKernal.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/0b61333a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java 
b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 05b1997..87ccf93 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -1192,7 +1192,7 @@ public class IgniteKernal implements IgniteEx, 
IgniteMXBean, Externalizable {
 if (cfg.getIncludeEventTypes() != null && 
cfg.getIncludeEventTypes().length != 0)
 perf.add("Disable grid events (remove 'includeEventTypes' from 
configuration)");
 
-if (BinaryMarshaller.available() && (cfg.getMarshaller() != null || 
!(cfg.getMarshaller() instanceof BinaryMarshaller)))
+if (BinaryMarshaller.available() && (cfg.getMarshaller() != null && 
!(cfg.getMarshaller() instanceof BinaryMarshaller)))
 perf.add("Use default binary marshaller (do not set 'marshaller' 
explicitly)");
 }
 

[41/50] [abbrv] ignite git commit: IGNITE-843 Fixed checkbox align for detailed rows.

[anovikov]

IGNITE-843 Fixed checkbox align for detailed rows.


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

Branch: refs/heads/ignite-843-rc2
Commit: 93b2c007edf1d62b12f5d774202f1d56c7d7db5a
Parents: 3ba1c93
Author: Alexey Kuznetsov 
Authored: Tue Dec 1 11:45:07 2015 +0700
Committer: Alexey Kuznetsov 
Committed: Tue Dec 1 11:45:07 2015 +0700

--
 .../control-center-web/src/main/js/public/stylesheets/style.scss   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/93b2c007/modules/control-center-web/src/main/js/public/stylesheets/style.scss
--
diff --git 
a/modules/control-center-web/src/main/js/public/stylesheets/style.scss 
b/modules/control-center-web/src/main/js/public/stylesheets/style.scss
index 6851d9e..77e4f07 100644
--- a/modules/control-center-web/src/main/js/public/stylesheets/style.scss
+++ b/modules/control-center-web/src/main/js/public/stylesheets/style.scss
@@ -399,7 +399,7 @@ h1, h2, h3, h4, h5, h6 {
 }
 
 .checkbox label {
-line-height: 20px;
+line-height: 20px !important;
 vertical-align: middle;
 }
 }

[01/50] [abbrv] ignite git commit: BinaryTypeImpl: Minor JavaDoc fix.

[anovikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc2 d1582ebfa -> 75ef6981c


BinaryTypeImpl: Minor JavaDoc fix.


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

Branch: refs/heads/ignite-843-rc2
Commit: e1db30a986aaecb823ed49505e55b376d2d08d2a
Parents: e4f6224
Author: vozerov-gridgain 
Authored: Fri Nov 27 13:20:53 2015 +0300
Committer: vozerov-gridgain 
Committed: Fri Nov 27 13:20:53 2015 +0300

--
 .../java/org/apache/ignite/internal/portable/BinaryTypeImpl.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/e1db30a9/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryTypeImpl.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryTypeImpl.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryTypeImpl.java
index 9512cdb..f471af2 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryTypeImpl.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryTypeImpl.java
@@ -77,7 +77,9 @@ public class BinaryTypeImpl implements BinaryType {
 return meta.isEnum();
 }
 
-/** {@inheritDoc} */
+/**
+ * @return Context.
+ */
 public PortableContext context() {
 return ctx;
 }

[34/50] [abbrv] ignite git commit: IGNITE-843 Merge branch 'master' into ignite-843-rc1.

[anovikov]

IGNITE-843 Merge branch 'master' into ignite-843-rc1.


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

Branch: refs/heads/ignite-843-rc2
Commit: 25ef0f6cc3bdd6152b362fbf642b8ac734a16d9a
Parents: 9653af5 c88ab6f
Author: AKuznetsov 
Authored: Mon Nov 30 18:11:10 2015 +0700
Committer: AKuznetsov 
Committed: Mon Nov 30 18:11:40 2015 +0700

--
 .gitignore  |6 +
 assembly/release-fabric-base.xml|   94 +
 .../config/binary/example-ignite-binary.xml |   44 +
 examples/config/example-default.xml |   76 +
 examples/config/example-ignite.xml  |   56 +-
 examples/schema-import/bin/db-init.sql  |3 +-
 .../org/apache/ignite/schema/CacheConfig.java   |7 +-
 .../java/org/apache/ignite/schema/Demo.java |   20 +-
 .../apache/ignite/examples/binary/Address.java  |   72 +
 .../apache/ignite/examples/binary/Employee.java |   93 +
 .../ignite/examples/binary/EmployeeKey.java |   90 +
 .../binary/ExampleBinaryNodeStartup.java|   36 +
 .../ignite/examples/binary/Organization.java|   93 +
 .../examples/binary/OrganizationType.java   |   32 +
 ...ComputeClientBinaryTaskExecutionExample.java |  153 +
 .../binary/computegrid/ComputeClientTask.java   |  116 +
 .../binary/computegrid/package-info.java|   21 +
 .../CacheClientBinaryPutGetExample.java |  230 ++
 .../datagrid/CacheClientBinaryQueryExample.java |  330 ++
 .../examples/binary/datagrid/package-info.java  |   21 +
 .../ignite/examples/binary/package-info.java|   21 +
 .../datastructures/IgniteSemaphoreExample.java  |  168 +
 .../CacheClientPortableExampleTest.java |   46 +
 .../ignite/examples/CacheExamplesSelfTest.java  |   10 +-
 .../ComputeClientPortableExampleTest.java   |   37 +
 .../testsuites/IgniteExamplesSelfTestSuite.java |6 +
 modules/camel/README.txt|   34 +
 modules/camel/licenses/apache-2.0.txt   |  202 +
 modules/camel/pom.xml   |  102 +
 .../ignite/stream/camel/CamelStreamer.java  |  237 ++
 .../stream/camel/IgniteCamelStreamerTest.java   |  418 ++
 .../camel/IgniteCamelStreamerTestSuite.java |   47 +
 .../src/test/resources/camel.test.properties|   18 +
 .../ignite/codegen/MessageCodeGenerator.java|6 +-
 modules/core/pom.xml|   21 +
 ...processors.platform.PlatformBootstrapFactory |2 +
 .../src/main/java/org/apache/ignite/Ignite.java |   24 +
 .../java/org/apache/ignite/IgniteBinary.java|  357 ++
 .../java/org/apache/ignite/IgniteCache.java |   44 +-
 .../java/org/apache/ignite/IgniteCompute.java   |3 +-
 .../org/apache/ignite/IgniteDataStreamer.java   |   16 +
 .../java/org/apache/ignite/IgniteSemaphore.java |  312 ++
 .../org/apache/ignite/binary/BinaryField.java   |   46 +
 .../apache/ignite/binary/BinaryIdMapper.java|   54 +
 .../binary/BinaryInvalidTypeException.java  |   58 +
 .../org/apache/ignite/binary/BinaryObject.java  |  149 +
 .../ignite/binary/BinaryObjectBuilder.java  |  135 +
 .../ignite/binary/BinaryObjectException.java|   57 +
 .../apache/ignite/binary/BinaryRawReader.java   |  240 ++
 .../apache/ignite/binary/BinaryRawWriter.java   |  225 ++
 .../org/apache/ignite/binary/BinaryReader.java  |  290 ++
 .../apache/ignite/binary/BinarySerializer.java  |   47 +
 .../org/apache/ignite/binary/BinaryType.java|   68 +
 .../ignite/binary/BinaryTypeConfiguration.java  |  112 +
 .../org/apache/ignite/binary/BinaryWriter.java  |  273 ++
 .../org/apache/ignite/binary/Binarylizable.java |   48 +
 .../org/apache/ignite/binary/package-info.java  |   22 +
 .../ignite/cache/CacheKeyConfiguration.java |   92 +
 .../apache/ignite/cache/CacheTypeMetadata.java  |   67 +-
 .../org/apache/ignite/cache/QueryEntity.java|  217 ++
 .../org/apache/ignite/cache/QueryIndex.java |  227 ++
 .../org/apache/ignite/cache/QueryIndexType.java |   38 +
 .../store/jdbc/CacheAbstractJdbcStore.java  |  638 ++-
 .../store/jdbc/CacheJdbcBlobStoreFactory.java   |   14 +-
 .../cache/store/jdbc/CacheJdbcPojoStore.java|  444 ++-
 .../store/jdbc/CacheJdbcPojoStoreFactory.java   |  277 +-
 .../ignite/cache/store/jdbc/JdbcType.java   |  255 ++
 .../cache/store/jdbc/JdbcTypeDefaultHasher.java |   43 +
 .../ignite/cache/store/jdbc/JdbcTypeField.java  |  172 +
 .../ignite/cache/store/jdbc/JdbcTypeHasher.java |   34 +
 .../org/apache/ignite/compute/ComputeJob.java   |2 +-
 .../configuration/BinaryConfiguration.java  |  139 +
 .../configuration/CacheConfiguration.java   |  692 +++-
 .../configuration/IgniteConfiguration.java  |   75 

[1/4] ignite git commit: Release notes update

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1537 e8bc4c94f -> e59b0f6d6


Release notes update


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

Branch: refs/heads/ignite-1537
Commit: 98303001684265b3677fb663e51c4a44b9fd1707
Parents: f5e9918
Author: Anton Vinogradov 
Authored: Tue Dec 1 11:18:40 2015 +0300
Committer: Anton Vinogradov 
Committed: Tue Dec 1 11:18:40 2015 +0300

--
 RELEASE_NOTES.txt | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/98303001/RELEASE_NOTES.txt
--
diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt
index 4985edb..f7f48fa 100644
--- a/RELEASE_NOTES.txt
+++ b/RELEASE_NOTES.txt
@@ -9,6 +9,8 @@ Apache Ignite In-Memory Data Fabric 1.5
 * Added new binary cache object marshalling implementation.
 * Added IgniteSemaphore data structure.
 * Added MQTT Streamer.
+* Added Twitter Streamer.
+* Added Ignite Sink (integration with Apache Flume).
 * Fixed failover for continuous queries.
 * Fixed compilation and runtime errors under OpenJDK and IBM JDK.
 * Fixed Integer.size limitation for cache.

[2/4] ignite git commit: ignite-1.5 Should not wait on preloader sync future for system caches callbacks.

[sboikov]

ignite-1.5 Should not wait on preloader sync future for system caches callbacks.


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

Branch: refs/heads/ignite-1537
Commit: 3492deaec670f9870c58cdf608cf77282d184f00
Parents: f5e9918
Author: sboikov 
Authored: Tue Dec 1 12:15:55 2015 +0300
Committer: sboikov 
Committed: Tue Dec 1 12:19:14 2015 +0300

--
 .../org/apache/ignite/internal/IgnitionEx.java  |  4 +--
 .../CacheDefaultBinaryAffinityKeyMapper.java| 19 +++---
 .../processors/cache/GridCacheAdapter.java  |  8 +
 .../processors/cache/GridCacheContext.java  | 37 
 .../GridCacheDefaultAffinityKeyMapper.java  |  9 -
 .../processors/cache/GridCacheMapEntry.java |  6 +++-
 .../GridCachePartitionExchangeManager.java  | 23 
 .../processors/cache/GridCachePreloader.java|  5 +++
 .../cache/GridCachePreloaderAdapter.java|  7 +++-
 .../processors/cache/GridCacheProcessor.java| 14 +---
 .../processors/cache/GridCacheProxyImpl.java| 12 +++
 .../processors/cache/IgniteCacheProxy.java  | 24 +
 .../processors/cache/IgniteInternalCache.java   |  9 +
 .../dht/atomic/GridDhtAtomicCache.java  |  4 +--
 .../dht/preloader/GridDhtPartitionDemander.java | 17 +
 .../dht/preloader/GridDhtPreloader.java | 27 ++
 .../CacheObjectBinaryProcessorImpl.java |  7 +++-
 .../cache/transactions/IgniteTxHandler.java |  2 +-
 .../communication/tcp/TcpCommunicationSpi.java  |  6 ++--
 .../CachePutEventListenerErrorSelfTest.java | 35 ++
 .../cache/GridCacheClearSelfTest.java   |  9 +++--
 ...eAbstractDataStructuresFailoverSelfTest.java | 32 +++--
 ...ObjectsCacheDataStructuresSelfTestSuite.java |  4 +++
 ...BinaryObjectsCacheExpiryPolicyTestSuite.java |  4 +++
 ...gniteBinaryObjectsCacheRestartTestSuite.java |  4 +++
 .../IgniteBinaryObjectsCacheTestSuite2.java |  4 +++
 .../IgniteBinaryObjectsCacheTestSuite3.java |  4 +++
 .../IgniteBinaryObjectsCacheTestSuite4.java |  4 +++
 ...IgniteBinaryObjectsComputeGridTestSuite.java |  4 +++
 .../IgnitePortableCacheTestSuite.java   |  1 -
 30 files changed, 250 insertions(+), 95 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/3492deae/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java 
b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
index 889b25c..be06f85 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
@@ -2057,7 +2057,7 @@ public class IgnitionEx {
 cache.setWriteSynchronizationMode(FULL_SYNC);
 cache.setAffinity(new RendezvousAffinityFunction(false, 100));
 cache.setNodeFilter(CacheConfiguration.ALL_NODES);
-cache.setRebalanceOrder(-1);//Prior to user caches.
+cache.setRebalanceOrder(-2); //Prior to user caches.
 
 return cache;
 }
@@ -2078,7 +2078,7 @@ public class IgnitionEx {
 ccfg.setWriteSynchronizationMode(FULL_SYNC);
 ccfg.setCacheMode(cfg.getCacheMode());
 ccfg.setNodeFilter(CacheConfiguration.ALL_NODES);
-ccfg.setRebalanceOrder(-1);//Prior to user caches.
+ccfg.setRebalanceOrder(-1); //Prior to user caches.
 
 if (cfg.getCacheMode() == PARTITIONED)
 ccfg.setBackups(cfg.getBackups());

http://git-wip-us.apache.org/repos/asf/ignite/blob/3492deae/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheDefaultBinaryAffinityKeyMapper.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheDefaultBinaryAffinityKeyMapper.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheDefaultBinaryAffinityKeyMapper.java
index efd38f7..d244a16 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheDefaultBinaryAffinityKeyMapper.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheDefaultBinaryAffinityKeyMapper.java
@@ -17,6 +17,7 @@
 
 package org.apache.ignite.internal.processors.cache;
 
+import org.apache.ignite.Ignite;
 import org.apache.ignite.IgniteException;
 import 

[3/4] ignite git commit: Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5

[sboikov]

Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5


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

Branch: refs/heads/ignite-1537
Commit: b64100a32029723e5cbc94dd09fde24f78143cc9
Parents: 3492dea 9830300
Author: sboikov 
Authored: Tue Dec 1 12:19:47 2015 +0300
Committer: sboikov 
Committed: Tue Dec 1 12:19:47 2015 +0300

--
 RELEASE_NOTES.txt | 2 ++
 1 file changed, 2 insertions(+)
--

[4/4] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537

[sboikov]

Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537


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

Branch: refs/heads/ignite-1537
Commit: e59b0f6d62bb836a80a96a6d31a3e812dbd10613
Parents: e8bc4c9 b64100a
Author: sboikov 
Authored: Tue Dec 1 12:21:29 2015 +0300
Committer: sboikov 
Committed: Tue Dec 1 12:21:29 2015 +0300

--
 RELEASE_NOTES.txt | 2 ++
 1 file changed, 2 insertions(+)
--

ignite git commit: IGNITE-843 Fixed ping.

[akuznetsov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc2 95401ab40 -> d1582ebfa


IGNITE-843 Fixed ping.


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

Branch: refs/heads/ignite-843-rc2
Commit: d1582ebfa67d5f0a839978840ecb5bceb0046de6
Parents: 95401ab
Author: Alexey Kuznetsov 
Authored: Tue Dec 1 15:34:48 2015 +0700
Committer: Alexey Kuznetsov 
Committed: Tue Dec 1 15:34:48 2015 +0700

--
 .../control-center-web/src/main/js/controllers/common-module.js| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/d1582ebf/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 440fb15..a27899c 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
@@ -2188,7 +2188,7 @@ consoleModule.controller('agent-download', [
 $scope.awaitAgent = function (checkFn) {
 _agentDownloadModal.skipSingleError = false;
 
-_agentDownloadModal.checkUrl = '/agent/ping';
+_agentDownloadModal.checkUrl = '/api/v1/agent/ping';
 
 _agentDownloadModal.checkFn = checkFn;
 

ignite git commit: ignite-1.5 Should not wait on preloader sync future for system caches callbacks.

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1537 05c7698c7 -> 63db1e1d3


ignite-1.5 Should not wait on preloader sync future for system caches callbacks.


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

Branch: refs/heads/ignite-1537
Commit: 63db1e1d30141f0fa7a998dc239f4b3b35f08353
Parents: 05c7698
Author: sboikov 
Authored: Tue Dec 1 11:42:35 2015 +0300
Committer: sboikov 
Committed: Tue Dec 1 11:42:35 2015 +0300

--
 ...ridCacheMultinodeUpdateNearEnabledNoBackupsSelfTest.java | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/63db1e1d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultinodeUpdateNearEnabledNoBackupsSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultinodeUpdateNearEnabledNoBackupsSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultinodeUpdateNearEnabledNoBackupsSelfTest.java
index cb40397..3122fe3 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultinodeUpdateNearEnabledNoBackupsSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultinodeUpdateNearEnabledNoBackupsSelfTest.java
@@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.cache;
 import org.apache.ignite.configuration.CacheConfiguration;
 
 /**
- * TODO: IGNITE-809.
+ *
  */
 public class GridCacheMultinodeUpdateNearEnabledNoBackupsSelfTest extends 
GridCacheMultinodeUpdateNearEnabledSelfTest {
 /** {@inheritDoc} */
@@ -36,4 +36,9 @@ public class 
GridCacheMultinodeUpdateNearEnabledNoBackupsSelfTest extends GridCa
 
 return ccfg;
 }
-}
\ No newline at end of file
+
+/** {@inheritDoc} */
+@Override public void testInvoke() throws Exception {
+fail("https://issues.apache.org/jira/browse/IGNITE-809;);
+}
+}

[18/50] [abbrv] ignite git commit: Fixing tests

[anovikov]

Fixing tests


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

Branch: refs/heads/ignite-843-rc2
Commit: 6a95f88d4cea59d70dd02628b23be976dcb9f6d9
Parents: 0c03b91
Author: Yakov Zhdanov 
Authored: Fri Nov 27 20:40:05 2015 +0300
Committer: Yakov Zhdanov 
Committed: Fri Nov 27 20:40:05 2015 +0300

--
 .../cache/eviction/random/RandomEvictionPolicySelfTest.java  | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/6a95f88d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/random/RandomEvictionPolicySelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/random/RandomEvictionPolicySelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/random/RandomEvictionPolicySelfTest.java
index 9d781eb..af04cdc 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/random/RandomEvictionPolicySelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/random/RandomEvictionPolicySelfTest.java
@@ -92,7 +92,11 @@ public class RandomEvictionPolicySelfTest extends
 info("Stats [cntr=" + i + ", total=" + runs + ']');
 }
 
-assert g.cache(null).size() <= max;
+int size = g.cache(null).size();
+
+info("Cache size: " + size);
+
+assert size <= (max * 1.2) : size; // Add 20% room for random 
evictions.
 
 info(policy(0));
 }
@@ -354,4 +358,4 @@ public class RandomEvictionPolicySelfTest extends
 @Override protected void checkPolicies() {
 // No-op.
 }
-}
\ No newline at end of file
+}

[11/50] [abbrv] ignite git commit: Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5

[anovikov]

Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5


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

Branch: refs/heads/ignite-843-rc2
Commit: 56aeea3d1f519229ad7ce80992a23bf367ef72c1
Parents: fc10b3e e519c2f
Author: vozerov-gridgain 
Authored: Fri Nov 27 16:48:28 2015 +0300
Committer: vozerov-gridgain 
Committed: Fri Nov 27 16:48:28 2015 +0300

--
 .../hibernate/CacheHibernatePersonStore.java|   4 +-
 .../hibernate/CacheHibernateStoreExample.java   |   2 +-
 .../datagrid/store/hibernate/Person.hbm.xml |   2 +-
 .../apache/ignite/examples/binary/Address.java  |  72 -
 .../apache/ignite/examples/binary/Employee.java |  93 ---
 .../ignite/examples/binary/EmployeeKey.java |  93 ---
 .../ignite/examples/binary/Organization.java|  93 ---
 .../examples/binary/OrganizationType.java   |  32 
 ...ComputeClientBinaryTaskExecutionExample.java |   4 +-
 .../CacheClientBinaryPutGetExample.java |   6 +-
 .../datagrid/CacheClientBinaryQueryExample.java |  22 +--
 .../examples/datagrid/CacheQueryExample.java| 161 ---
 .../ignite/examples/datagrid/store/Person.java  | 154 --
 .../store/auto/CacheAutoStoreExample.java   |   4 +-
 .../auto/CacheAutoStoreLoadDataExample.java |   4 +-
 .../datagrid/store/auto/CacheConfig.java|   6 +-
 .../store/dummy/CacheDummyPersonStore.java  |  12 +-
 .../store/dummy/CacheDummyStoreExample.java |   4 +-
 .../store/jdbc/CacheJdbcPersonStore.java|  18 +--
 .../store/jdbc/CacheJdbcStoreExample.java   |   4 +-
 .../store/spring/CacheSpringPersonStore.java|  10 +-
 .../store/spring/CacheSpringStoreExample.java   |   4 +-
 .../ignite/examples/model/Organization.java |  55 +++
 .../apache/ignite/examples/model/Person.java| 120 ++
 .../ignite/examples/model/binary/Address.java   |  72 +
 .../ignite/examples/model/binary/Employee.java  |  93 +++
 .../examples/model/binary/EmployeeKey.java  |  93 +++
 .../examples/model/binary/Organization.java |  93 +++
 .../examples/model/binary/OrganizationType.java |  32 
 .../examples/ScalarCacheQueryExample.scala  |  66 ++--
 30 files changed, 651 insertions(+), 777 deletions(-)
--

[21/50] [abbrv] ignite git commit: Fixing binary objects tests.

[anovikov]

Fixing binary objects tests.


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

Branch: refs/heads/ignite-843-rc2
Commit: 87cbc1945343b2d0e4667362dba0514c831ca2b5
Parents: 8a822d8
Author: Alexey Goncharuk 
Authored: Sat Nov 28 14:07:29 2015 +0300
Committer: Alexey Goncharuk 
Committed: Sat Nov 28 14:07:29 2015 +0300

--
 .../java/org/apache/ignite/examples/model/Organization.java   | 7 +++
 .../main/java/org/apache/ignite/examples/model/Person.java| 7 +++
 .../main/java/org/apache/ignite/internal/IgniteKernal.java| 5 ++---
 .../org/apache/ignite/internal/portable/BinaryMarshaller.java | 2 --
 .../cache/IgniteCacheAbstractFieldsQuerySelfTest.java | 4 ++--
 .../cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java  | 5 -
 6 files changed, 18 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/87cbc194/examples/src/main/java/org/apache/ignite/examples/model/Organization.java
--
diff --git 
a/examples/src/main/java/org/apache/ignite/examples/model/Organization.java 
b/examples/src/main/java/org/apache/ignite/examples/model/Organization.java
index 3881719..3dcaa44 100644
--- a/examples/src/main/java/org/apache/ignite/examples/model/Organization.java
+++ b/examples/src/main/java/org/apache/ignite/examples/model/Organization.java
@@ -38,6 +38,13 @@ public class Organization implements Serializable {
 public String name;
 
 /**
+ * Default empty constructor.
+ */
+public Organization() {
+// No-op.
+}
+
+/**
  * Create organization.
  *
  * @param name Organization name.

http://git-wip-us.apache.org/repos/asf/ignite/blob/87cbc194/examples/src/main/java/org/apache/ignite/examples/model/Person.java
--
diff --git 
a/examples/src/main/java/org/apache/ignite/examples/model/Person.java 
b/examples/src/main/java/org/apache/ignite/examples/model/Person.java
index 616cf6a..5ccda51 100644
--- a/examples/src/main/java/org/apache/ignite/examples/model/Person.java
+++ b/examples/src/main/java/org/apache/ignite/examples/model/Person.java
@@ -59,6 +59,13 @@ public class Person implements Serializable {
 private transient AffinityKey key;
 
 /**
+ * Default empty constructor.
+ */
+public Person() {
+// No-op.
+}
+
+/**
  * Constructs person record.
  *
  * @param org   Organization.

http://git-wip-us.apache.org/repos/asf/ignite/blob/87cbc194/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java 
b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 68d48c9..05b1997 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -1192,9 +1192,8 @@ public class IgniteKernal implements IgniteEx, 
IgniteMXBean, Externalizable {
 if (cfg.getIncludeEventTypes() != null && 
cfg.getIncludeEventTypes().length != 0)
 perf.add("Disable grid events (remove 'includeEventTypes' from 
configuration)");
 
-if (BinaryMarshaller.available() && !(cfg.getMarshaller() instanceof 
BinaryMarshaller))
-perf.add("Enable binary marshaller (set 'marshaller' to " +
-BinaryMarshaller.class.getSimpleName() + ')');
+if (BinaryMarshaller.available() && (cfg.getMarshaller() != null || 
!(cfg.getMarshaller() instanceof BinaryMarshaller)))
+perf.add("Use default binary marshaller (do not set 'marshaller' 
explicitly)");
 }
 
 /**

http://git-wip-us.apache.org/repos/asf/ignite/blob/87cbc194/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryMarshaller.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryMarshaller.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryMarshaller.java
index 759d802..bfaae74 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryMarshaller.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryMarshaller.java
@@ -33,8 +33,6 @@ import sun.misc.Unsafe;
 /**
  * Implementation of {@link org.apache.ignite.marshaller.Marshaller} that lets 
to serialize and 

[35/50] [abbrv] ignite git commit: Merge branch 'ignite-1.5' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-843-rc1

[anovikov]

Merge branch 'ignite-1.5' of https://git-wip-us.apache.org/repos/asf/ignite 
into ignite-843-rc1


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

Branch: refs/heads/ignite-843-rc2
Commit: c014199cd7103d1c8f4821b59312069c8f348b47
Parents: 25ef0f6 0b61333
Author: AKuznetsov 
Authored: Mon Nov 30 18:11:55 2015 +0700
Committer: AKuznetsov 
Committed: Mon Nov 30 18:11:55 2015 +0700

--
 DEVNOTES.txt|   2 +-
 RELEASE_NOTES.txt   |  17 +
 assembly/release-fabric-base.xml|   9 +
 .../config/binary/example-ignite-binary.xml |  44 --
 examples/config/example-ignite.xml  |  10 +-
 examples/pom.xml|   2 +-
 .../hibernate/CacheHibernatePersonStore.java|   4 +-
 .../hibernate/CacheHibernateStoreExample.java   |   2 +-
 .../datagrid/store/hibernate/Person.hbm.xml |   2 +-
 .../apache/ignite/examples/binary/Address.java  |  72 ---
 .../apache/ignite/examples/binary/Employee.java |  93 
 .../ignite/examples/binary/EmployeeKey.java |  90 
 .../binary/ExampleBinaryNodeStartup.java|  36 --
 .../ignite/examples/binary/Organization.java|  93 
 .../examples/binary/OrganizationType.java   |  32 --
 ...ComputeClientBinaryTaskExecutionExample.java |  10 +-
 .../CacheClientBinaryPutGetExample.java |  12 +-
 .../datagrid/CacheClientBinaryQueryExample.java |  28 +-
 .../ComputeFibonacciContinuationExample.java|  15 +-
 .../computegrid/ComputeTaskMapExample.java  |   6 +-
 .../computegrid/ComputeTaskSplitExample.java|   4 +-
 .../examples/datagrid/CacheQueryExample.java| 161 ++-
 .../ignite/examples/datagrid/store/Person.java  | 154 ---
 .../store/auto/CacheAutoStoreExample.java   |   4 +-
 .../auto/CacheAutoStoreLoadDataExample.java |   4 +-
 .../datagrid/store/auto/CacheConfig.java|   6 +-
 .../store/dummy/CacheDummyPersonStore.java  |  12 +-
 .../store/dummy/CacheDummyStoreExample.java |   4 +-
 .../store/jdbc/CacheJdbcPersonStore.java|  18 +-
 .../store/jdbc/CacheJdbcStoreExample.java   |   4 +-
 .../store/spring/CacheSpringPersonStore.java|  10 +-
 .../store/spring/CacheSpringStoreExample.java   |   4 +-
 .../examples/messaging/MessagingExample.java|  18 +-
 .../examples/misc/springbean/spring-bean.xml|   7 -
 .../ignite/examples/model/Organization.java |  62 +++
 .../apache/ignite/examples/model/Person.java| 127 ++
 .../ignite/examples/model/binary/Address.java   |  72 +++
 .../ignite/examples/model/binary/Employee.java  |  93 
 .../examples/model/binary/EmployeeKey.java  |  93 
 .../examples/model/binary/Organization.java |  93 
 .../examples/model/binary/OrganizationType.java |  32 ++
 .../scalar/examples/ScalarCacheExample.scala|  19 +-
 .../examples/ScalarCacheQueryExample.scala  |  66 +--
 .../testsuites/IgniteExamplesSelfTestSuite.java |   4 +-
 .../client/router/RouterFactorySelfTest.java|   2 +
 .../ignite/codegen/MessageCodeGenerator.java|   1 +
 .../java/org/apache/ignite/IgniteBinary.java|  30 +-
 .../java/org/apache/ignite/IgniteCache.java |  26 +-
 .../apache/ignite/binary/BinaryIdMapper.java|   3 +-
 .../org/apache/ignite/binary/BinaryObject.java  |  17 +-
 .../apache/ignite/binary/BinarySerializer.java  |   2 +-
 .../org/apache/ignite/binary/BinaryType.java|  16 +-
 .../ignite/binary/BinaryTypeConfiguration.java  |  21 +
 .../apache/ignite/cache/CacheInterceptor.java   |   2 +-
 .../ignite/cache/CacheKeyConfiguration.java |  19 +
 .../apache/ignite/cache/CacheTypeMetadata.java  |   2 +
 .../rendezvous/RendezvousAffinityFunction.java  |   2 +-
 .../store/jdbc/CacheAbstractJdbcStore.java  |   2 +-
 .../cache/store/jdbc/CacheJdbcPojoStore.java| 191 +---
 .../configuration/CacheConfiguration.java   |  36 +-
 .../internal/GridEventConsumeHandler.java   |   5 +
 .../internal/GridMessageListenHandler.java  |   5 +
 .../apache/ignite/internal/IgniteKernal.java|  13 +-
 .../org/apache/ignite/internal/IgnitionEx.java  |  15 +-
 .../ignite/internal/NodeStoppingException.java  |  35 ++
 .../managers/communication/GridIoManager.java   |  88 +---
 .../communication/GridIoMessageFactory.java |   8 +-
 .../discovery/GridDiscoveryManager.java |  19 +-
 .../internal/portable/BinaryEnumObjectImpl.java | 311 +
 .../internal/portable/BinaryFieldImpl.java  |   6 +-
 .../internal/portable/BinaryMarshaller.java | 142 ++
 .../internal/portable/BinaryMetadata.java   |  16 +-
 .../internal/portable/BinaryObjectEx.java   | 225 

[33/50] [abbrv] ignite git commit: IGNITE-843 Merge branch 'master' into ignite-843-rc1.

[anovikov]

http://git-wip-us.apache.org/repos/asf/ignite/blob/25ef0f6c/modules/schema-import-db/pom.xml
--
diff --cc modules/schema-import-db/pom.xml
index 6d0dc2c,000..3b9d7e6
mode 100644,00..100644
--- a/modules/schema-import-db/pom.xml
+++ b/modules/schema-import-db/pom.xml
@@@ -1,39 -1,0 +1,46 @@@
 +
 +
 +
 +
 +
 +http://www.w3.org/2001/XMLSchema-instance; 
xmlns="http://maven.apache.org/POM/4.0.0;
 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
 +4.0.0
 +
 +
 +org.apache.ignite
 +ignite-parent
 +1
 +../../parent
 +
 +
 +ignite-schema-import-db
 +1.5.0-SNAPSHOT
 +
++
++
++org.apache.ignite
++ignite-core
++${project.version}
++
++
 +

http://git-wip-us.apache.org/repos/asf/ignite/blob/25ef0f6c/modules/schema-import-db/src/main/java/org/apache/ignite/schema/parser/DbTable.java
--
diff --cc 
modules/schema-import-db/src/main/java/org/apache/ignite/schema/parser/DbTable.java
index 6ec9d1f,000..cc321c1
mode 100644,00..100644
--- 
a/modules/schema-import-db/src/main/java/org/apache/ignite/schema/parser/DbTable.java
+++ 
b/modules/schema-import-db/src/main/java/org/apache/ignite/schema/parser/DbTable.java
@@@ -1,109 -1,0 +1,84 @@@
 +/*
 + *
 + *  * 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.schema.parser;
 +
++import org.apache.ignite.cache.QueryIndex;
++
 +import java.util.Collection;
- import java.util.Map;
- import java.util.Set;
 +
 +/**
 + * Database table.
 + */
 +public class DbTable {
 +/** Schema name. */
 +private final String schema;
 +
 +/** Table name. */
 +private final String tbl;
 +
 +/** Columns. */
 +private final Collection cols;
 +
- /** Columns in ascending order. */
- private final Set ascCols;
- 
- /** Columns in descending order. */
- private final Set descCols;
- 
 +/** Indexes. */
- private final Map> idxs;
++private final Collection idxs;
 +
 +/**
 + * Default columns.
 + *
 + * @param schema Schema name.
 + * @param tbl Table name.
 + * @param cols Columns.
-  * @param ascCols Columns in ascending order.
-  * @param descCols Columns in descending order.
 + * @param idxs Indexes;
 + */
- public DbTable(String schema, String tbl, Collection cols, 
Set ascCols, Set descCols,
- Map> idxs) {
++public DbTable(String schema, String tbl, Collection cols, 
Collection idxs) {
 +this.schema = schema;
 +this.tbl = tbl;
 +this.cols = cols;
- this.ascCols = ascCols;
- this.descCols = descCols;
 +this.idxs = idxs;
 +}
 +
 +/**
 + * @return Schema name.
 + */
 +public String schema() {
 +return schema;
 +}
 +
 +/**
 + * @return Table name.
 + */
 +public String table() {
 +return tbl;
 +}
 +
 +/**
 + * @return Columns.
 + */
 +public Collection columns() {
 +return cols;
 +}
 +
 +/**
-  * @return Fields in ascending order
-  */
- public Set ascendingColumns() {
- return ascCols;
- }
- 
- /**
-  * @return Fields in descending order
-  */
- public Set descendingColumns() {
- return descCols;
- }
- 
- /**
 + * @return Indexes.
 + */
- public Map> indexes() {
++public Collection indexes() {
 +return idxs;
 +}
 +}

http://git-wip-us.apache.org/repos/asf/ignite/blob/25ef0f6c/modules/schema-import-db/src/main/java/org/apache/ignite/schema/parser/dialect/DatabaseMetadataDialect.java
--
diff --cc 
modules/schema-import-db/src/main/java/org/apache/ignite/schema/parser/dialect/DatabaseMetadataDialect.java
index db8adfd,000..fad5b0e
mode 100644,00..100644
--- 

[1/2] ignite git commit: ignite-1.5 Should not wait on preloader sync future for system caches callbacks.

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5 983030016 -> b64100a32


ignite-1.5 Should not wait on preloader sync future for system caches callbacks.


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

Branch: refs/heads/ignite-1.5
Commit: 3492deaec670f9870c58cdf608cf77282d184f00
Parents: f5e9918
Author: sboikov 
Authored: Tue Dec 1 12:15:55 2015 +0300
Committer: sboikov 
Committed: Tue Dec 1 12:19:14 2015 +0300

--
 .../org/apache/ignite/internal/IgnitionEx.java  |  4 +--
 .../CacheDefaultBinaryAffinityKeyMapper.java| 19 +++---
 .../processors/cache/GridCacheAdapter.java  |  8 +
 .../processors/cache/GridCacheContext.java  | 37 
 .../GridCacheDefaultAffinityKeyMapper.java  |  9 -
 .../processors/cache/GridCacheMapEntry.java |  6 +++-
 .../GridCachePartitionExchangeManager.java  | 23 
 .../processors/cache/GridCachePreloader.java|  5 +++
 .../cache/GridCachePreloaderAdapter.java|  7 +++-
 .../processors/cache/GridCacheProcessor.java| 14 +---
 .../processors/cache/GridCacheProxyImpl.java| 12 +++
 .../processors/cache/IgniteCacheProxy.java  | 24 +
 .../processors/cache/IgniteInternalCache.java   |  9 +
 .../dht/atomic/GridDhtAtomicCache.java  |  4 +--
 .../dht/preloader/GridDhtPartitionDemander.java | 17 +
 .../dht/preloader/GridDhtPreloader.java | 27 ++
 .../CacheObjectBinaryProcessorImpl.java |  7 +++-
 .../cache/transactions/IgniteTxHandler.java |  2 +-
 .../communication/tcp/TcpCommunicationSpi.java  |  6 ++--
 .../CachePutEventListenerErrorSelfTest.java | 35 ++
 .../cache/GridCacheClearSelfTest.java   |  9 +++--
 ...eAbstractDataStructuresFailoverSelfTest.java | 32 +++--
 ...ObjectsCacheDataStructuresSelfTestSuite.java |  4 +++
 ...BinaryObjectsCacheExpiryPolicyTestSuite.java |  4 +++
 ...gniteBinaryObjectsCacheRestartTestSuite.java |  4 +++
 .../IgniteBinaryObjectsCacheTestSuite2.java |  4 +++
 .../IgniteBinaryObjectsCacheTestSuite3.java |  4 +++
 .../IgniteBinaryObjectsCacheTestSuite4.java |  4 +++
 ...IgniteBinaryObjectsComputeGridTestSuite.java |  4 +++
 .../IgnitePortableCacheTestSuite.java   |  1 -
 30 files changed, 250 insertions(+), 95 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/3492deae/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java 
b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
index 889b25c..be06f85 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
@@ -2057,7 +2057,7 @@ public class IgnitionEx {
 cache.setWriteSynchronizationMode(FULL_SYNC);
 cache.setAffinity(new RendezvousAffinityFunction(false, 100));
 cache.setNodeFilter(CacheConfiguration.ALL_NODES);
-cache.setRebalanceOrder(-1);//Prior to user caches.
+cache.setRebalanceOrder(-2); //Prior to user caches.
 
 return cache;
 }
@@ -2078,7 +2078,7 @@ public class IgnitionEx {
 ccfg.setWriteSynchronizationMode(FULL_SYNC);
 ccfg.setCacheMode(cfg.getCacheMode());
 ccfg.setNodeFilter(CacheConfiguration.ALL_NODES);
-ccfg.setRebalanceOrder(-1);//Prior to user caches.
+ccfg.setRebalanceOrder(-1); //Prior to user caches.
 
 if (cfg.getCacheMode() == PARTITIONED)
 ccfg.setBackups(cfg.getBackups());

http://git-wip-us.apache.org/repos/asf/ignite/blob/3492deae/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheDefaultBinaryAffinityKeyMapper.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheDefaultBinaryAffinityKeyMapper.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheDefaultBinaryAffinityKeyMapper.java
index efd38f7..d244a16 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheDefaultBinaryAffinityKeyMapper.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheDefaultBinaryAffinityKeyMapper.java
@@ -17,6 +17,7 @@
 
 package org.apache.ignite.internal.processors.cache;
 
+import 

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

[sboikov]

Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5


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

Branch: refs/heads/ignite-1.5
Commit: b64100a32029723e5cbc94dd09fde24f78143cc9
Parents: 3492dea 9830300
Author: sboikov 
Authored: Tue Dec 1 12:19:47 2015 +0300
Committer: sboikov 
Committed: Tue Dec 1 12:19:47 2015 +0300

--
 RELEASE_NOTES.txt | 2 ++
 1 file changed, 2 insertions(+)
--

ignite git commit: IGNITE-843 Minor fix.

[anovikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc2 75ef6981c -> 88ceba9cb


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/88ceba9c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/88ceba9c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/88ceba9c

Branch: refs/heads/ignite-843-rc2
Commit: 88ceba9cbc293c8bdea7654b2b6201275e8b8d27
Parents: 75ef698
Author: Andrey 
Authored: Tue Dec 1 16:34:44 2015 +0700
Committer: Andrey 
Committed: Tue Dec 1 16:34:44 2015 +0700

--
 modules/control-center-web/src/main/js/gulpfile.js/index.js | 2 +-
 modules/control-center-web/src/main/js/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/88ceba9c/modules/control-center-web/src/main/js/gulpfile.js/index.js
--
diff --git a/modules/control-center-web/src/main/js/gulpfile.js/index.js 
b/modules/control-center-web/src/main/js/gulpfile.js/index.js
index 6e4f5de..79c0847 100644
--- a/modules/control-center-web/src/main/js/gulpfile.js/index.js
+++ b/modules/control-center-web/src/main/js/gulpfile.js/index.js
@@ -23,4 +23,4 @@ requireDir('./tasks', { recurse: true });
 
 // Summary tasks
 gulp.task('default', ['build']);
-gulp.task('watch', ['build', 'bundle:watch', 'sass:watch', 'jade:watch', 
'copy:watch']);
+gulp.task('watch', ['build', 'bundle:watch', 'sass:watch', 'jade:watch', 
'copy:watch', 'connect']);

http://git-wip-us.apache.org/repos/asf/ignite/blob/88ceba9c/modules/control-center-web/src/main/js/package.json
--
diff --git a/modules/control-center-web/src/main/js/package.json 
b/modules/control-center-web/src/main/js/package.json
index da3f887..2e9b52f 100644
--- a/modules/control-center-web/src/main/js/package.json
+++ b/modules/control-center-web/src/main/js/package.json
@@ -4,7 +4,7 @@
   "description": "Interactive Web console for configuration, executing SQL 
queries and monitoring of Apache Ignite Cluster",
   "private": true,
   "scripts": {
-"start": "jspm i && gulp build && node serve"
+"start": "jspm i && gulp build --debug && node serve"
   },
   "author": "",
   "contributors": [

ignite git commit: ignite-1.5 Muted test

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5 b64100a32 -> fb4ef34a5


ignite-1.5 Muted test


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

Branch: refs/heads/ignite-1.5
Commit: fb4ef34a5e0f7d70674d8cbe3522955ca420c61c
Parents: b64100a
Author: sboikov 
Authored: Tue Dec 1 12:53:34 2015 +0300
Committer: sboikov 
Committed: Tue Dec 1 12:53:34 2015 +0300

--
 ...ridCacheMultinodeUpdateNearEnabledNoBackupsSelfTest.java | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/fb4ef34a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultinodeUpdateNearEnabledNoBackupsSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultinodeUpdateNearEnabledNoBackupsSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultinodeUpdateNearEnabledNoBackupsSelfTest.java
index cb40397..3122fe3 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultinodeUpdateNearEnabledNoBackupsSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultinodeUpdateNearEnabledNoBackupsSelfTest.java
@@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.cache;
 import org.apache.ignite.configuration.CacheConfiguration;
 
 /**
- * TODO: IGNITE-809.
+ *
  */
 public class GridCacheMultinodeUpdateNearEnabledNoBackupsSelfTest extends 
GridCacheMultinodeUpdateNearEnabledSelfTest {
 /** {@inheritDoc} */
@@ -36,4 +36,9 @@ public class 
GridCacheMultinodeUpdateNearEnabledNoBackupsSelfTest extends GridCa
 
 return ccfg;
 }
-}
\ No newline at end of file
+
+/** {@inheritDoc} */
+@Override public void testInvoke() throws Exception {
+fail("https://issues.apache.org/jira/browse/IGNITE-809;);
+}
+}

[1/2] ignite git commit: IGNITE-2015 Fixed marshaller selection.

[akuznetsov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc1 2f7b80dc4 -> 869593849


IGNITE-2015 Fixed marshaller selection.


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

Branch: refs/heads/ignite-843-rc1
Commit: b79a700e31e0d9e083e273400514d4e2c91d119e
Parents: 2f7b80d
Author: Alexey Kuznetsov 
Authored: Tue Dec 1 15:22:03 2015 +0700
Committer: Alexey Kuznetsov 
Committed: Tue Dec 1 15:22:03 2015 +0700

--
 .../src/main/js/controllers/clusters-controller.js | 2 +-
 .../src/main/js/controllers/models/clusters.json   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/b79a700e/modules/control-center-web/src/main/js/controllers/clusters-controller.js
--
diff --git 
a/modules/control-center-web/src/main/js/controllers/clusters-controller.js 
b/modules/control-center-web/src/main/js/controllers/clusters-controller.js
index 96a42a7..cfe3409 100644
--- a/modules/control-center-web/src/main/js/controllers/clusters-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/clusters-controller.js
@@ -121,7 +121,7 @@ consoleModule.controller('clustersController', [
 
 $scope.segmentationPolicy = $common.mkOptions(['RESTART_JVM', 'STOP', 
'NOOP']);
 
-$scope.marshallers = $common.mkOptions(['OptimizedMarshaller', 
'JdkMarshaller']);
+$scope.marshallers = $common.mkOptions(['OptimizedMarshaller', 
'JdkMarshaller', undefined]);
 
 $scope.sslKeyAlgorithms = ['SumX509', 'X509'];
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/b79a700e/modules/control-center-web/src/main/js/controllers/models/clusters.json
--
diff --git 
a/modules/control-center-web/src/main/js/controllers/models/clusters.json 
b/modules/control-center-web/src/main/js/controllers/models/clusters.json
index 96ac6bd..7947fea 100644
--- a/modules/control-center-web/src/main/js/controllers/models/clusters.json
+++ b/modules/control-center-web/src/main/js/controllers/models/clusters.json
@@ -1319,7 +1319,7 @@
   "items": "marshallers",
   "tip": [
 "Instance of marshaller to use in grid",
-"If not provided, OptimizedMarshaller will be used on Java HotSpot 
VM, and JdkMarshaller will be used on other VMs"
+"If not provided, BinaryMarshaller will be used"
   ],
   "details": {
 "OptimizedMarshaller": {

[2/2] ignite git commit: IGNITE-843 Updated pom.xml generation.

[akuznetsov]

IGNITE-843 Updated pom.xml generation.


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

Branch: refs/heads/ignite-843-rc1
Commit: 869593849367f095fb94858efec3a7a2de15d03f
Parents: b79a700
Author: Alexey Kuznetsov 
Authored: Tue Dec 1 15:23:07 2015 +0700
Committer: Alexey Kuznetsov 
Committed: Tue Dec 1 15:23:07 2015 +0700

--
 .../src/main/js/controllers/summary-controller.js  | 2 +-
 .../src/main/js/helpers/generator/generator-common.js  | 2 +-
 .../src/main/js/helpers/generator/generator-pom.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/86959384/modules/control-center-web/src/main/js/controllers/summary-controller.js
--
diff --git 
a/modules/control-center-web/src/main/js/controllers/summary-controller.js 
b/modules/control-center-web/src/main/js/controllers/summary-controller.js
index d4d3c58..0cbbd2f 100644
--- a/modules/control-center-web/src/main/js/controllers/summary-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/summary-controller.js
@@ -19,7 +19,7 @@
 consoleModule.controller('summaryController', [
 '$scope', '$http', '$common', '$loading', '$message', '$table',
 function ($scope, $http, $common, $loading, $message, $table) {
-var igniteVersion = '1.5.0-IWC';
+var igniteVersion = '1.5.0';
 
 $scope.panelExpanded = $common.panelExpanded;
 $scope.tableVisibleRow = $table.tableVisibleRow;

http://git-wip-us.apache.org/repos/asf/ignite/blob/86959384/modules/control-center-web/src/main/js/helpers/generator/generator-common.js
--
diff --git 
a/modules/control-center-web/src/main/js/helpers/generator/generator-common.js 
b/modules/control-center-web/src/main/js/helpers/generator/generator-common.js
index c0bbdea..b56f2b1 100644
--- 
a/modules/control-center-web/src/main/js/helpers/generator/generator-common.js
+++ 
b/modules/control-center-web/src/main/js/helpers/generator/generator-common.js
@@ -20,7 +20,7 @@ $generatorCommon = {};
 
 // Add leading zero.
 $generatorCommon.addLeadingZero = function (numberStr, minSize) {
-if (typeof (numberStr) != 'string')
+if (typeof (numberStr) !== 'string')
 numberStr = '' + numberStr;
 
 while (numberStr.length < minSize) {

http://git-wip-us.apache.org/repos/asf/ignite/blob/86959384/modules/control-center-web/src/main/js/helpers/generator/generator-pom.js
--
diff --git 
a/modules/control-center-web/src/main/js/helpers/generator/generator-pom.js 
b/modules/control-center-web/src/main/js/helpers/generator/generator-pom.js
index c4e5e45..aff8307 100644
--- a/modules/control-center-web/src/main/js/helpers/generator/generator-pom.js
+++ b/modules/control-center-web/src/main/js/helpers/generator/generator-pom.js
@@ -129,7 +129,7 @@ $generatorPom.pom = function (cluster, igniteVersion, res) {
 res.startBlock('');
 res.startBlock('');
 $generatorPom.addProperty(res, 'id', 'GridGain External Repository');
-$generatorPom.addProperty(res, 'url', 
'http://www.gridgainsystems.com/nexus/content/repositories/gridgain_staging-1555');
+$generatorPom.addProperty(res, 'url', 
'http://www.gridgainsystems.com/nexus/content/repositories/gridgain_staging-1584');
 res.endBlock('');
 res.endBlock('');
 

[3/4] ignite git commit: Release notes update

[sboikov]

Release notes update


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

Branch: refs/heads/ignite-1.5.1
Commit: 98303001684265b3677fb663e51c4a44b9fd1707
Parents: f5e9918
Author: Anton Vinogradov 
Authored: Tue Dec 1 11:18:40 2015 +0300
Committer: Anton Vinogradov 
Committed: Tue Dec 1 11:18:40 2015 +0300

--
 RELEASE_NOTES.txt | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/98303001/RELEASE_NOTES.txt
--
diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt
index 4985edb..f7f48fa 100644
--- a/RELEASE_NOTES.txt
+++ b/RELEASE_NOTES.txt
@@ -9,6 +9,8 @@ Apache Ignite In-Memory Data Fabric 1.5
 * Added new binary cache object marshalling implementation.
 * Added IgniteSemaphore data structure.
 * Added MQTT Streamer.
+* Added Twitter Streamer.
+* Added Ignite Sink (integration with Apache Flume).
 * Fixed failover for continuous queries.
 * Fixed compilation and runtime errors under OpenJDK and IBM JDK.
 * Fixed Integer.size limitation for cache.

[1/4] ignite git commit: fixed version

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5.1 4f1d55cc6 -> f8c6acc1d


fixed version


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

Branch: refs/heads/ignite-1.5.1
Commit: ecb3cb445bf3ec51a67768a08db5c601459ca1ce
Parents: 6260fc1
Author: Yakov Zhdanov 
Authored: Mon Nov 30 23:01:27 2015 +0300
Committer: Yakov Zhdanov 
Committed: Mon Nov 30 23:01:27 2015 +0300

--
 modules/platforms/cpp/common/configure.ac   |  2 +-
 modules/platforms/cpp/core-test/configure.ac|  2 +-
 modules/platforms/cpp/core/configure.ac |  2 +-
 modules/platforms/cpp/examples/configure.ac |  2 +-
 modules/platforms/cpp/ignite/configure.ac   |  2 +-
 .../Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs |  4 ++--
 .../Properties/AssemblyInfo.cs  | 12 ++--
 .../Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs |  4 ++--
 .../Apache.Ignite.Core/Properties/AssemblyInfo.cs   |  6 +++---
 .../dotnet/Apache.Ignite/Properties/AssemblyInfo.cs |  4 ++--
 .../Apache.Ignite.Examples/Properties/AssemblyInfo.cs   |  4 ++--
 .../Properties/AssemblyInfo.cs  |  4 ++--
 12 files changed, 24 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/ecb3cb44/modules/platforms/cpp/common/configure.ac
--
diff --git a/modules/platforms/cpp/common/configure.ac 
b/modules/platforms/cpp/common/configure.ac
index 8f53ea3..229cb9d 100644
--- a/modules/platforms/cpp/common/configure.ac
+++ b/modules/platforms/cpp/common/configure.ac
@@ -19,7 +19,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.69])
-AC_INIT([Apache Ignite JNI bridge for C++], [1.5.0-EA], 
[d...@ignite.apache.org], [ignite-common], [ignite.apache.org])
+AC_INIT([Apache Ignite JNI bridge for C++], [1.5.1.0], 
[d...@ignite.apache.org], [ignite-common], [ignite.apache.org])
 AC_CONFIG_SRCDIR(src)
 
 AC_CANONICAL_SYSTEM

http://git-wip-us.apache.org/repos/asf/ignite/blob/ecb3cb44/modules/platforms/cpp/core-test/configure.ac
--
diff --git a/modules/platforms/cpp/core-test/configure.ac 
b/modules/platforms/cpp/core-test/configure.ac
index 14baf55..1612bea 100644
--- a/modules/platforms/cpp/core-test/configure.ac
+++ b/modules/platforms/cpp/core-test/configure.ac
@@ -19,7 +19,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.69])
-AC_INIT([Apache Ignite C++ Test], [1.5.0-EA], [d...@ignite.apache.org], 
[ignite], [ignite.apache.org])
+AC_INIT([Apache Ignite C++ Test], [1.5.1.0], [d...@ignite.apache.org], 
[ignite], [ignite.apache.org])
 AC_CONFIG_SRCDIR(src)
 
 AC_CANONICAL_SYSTEM

http://git-wip-us.apache.org/repos/asf/ignite/blob/ecb3cb44/modules/platforms/cpp/core/configure.ac
--
diff --git a/modules/platforms/cpp/core/configure.ac 
b/modules/platforms/cpp/core/configure.ac
index f10eeb9..2733a46 100644
--- a/modules/platforms/cpp/core/configure.ac
+++ b/modules/platforms/cpp/core/configure.ac
@@ -19,7 +19,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.69])
-AC_INIT([Apache Ignite C++], [1.5.0-EA], [d...@ignite.apache.org], [ignite], 
[ignite.apache.org])
+AC_INIT([Apache Ignite C++], [1.5.1.0], [d...@ignite.apache.org], [ignite], 
[ignite.apache.org])
 AC_CONFIG_SRCDIR(src)
 
 AC_CANONICAL_SYSTEM

http://git-wip-us.apache.org/repos/asf/ignite/blob/ecb3cb44/modules/platforms/cpp/examples/configure.ac
--
diff --git a/modules/platforms/cpp/examples/configure.ac 
b/modules/platforms/cpp/examples/configure.ac
index 2d30028..3ee5330 100644
--- a/modules/platforms/cpp/examples/configure.ac
+++ b/modules/platforms/cpp/examples/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.69])
-AC_INIT([Ingnite C++ 
examples],[1.5.0-EA],[d...@ignite.apache.org],[ignite-examples],[ignite.apache.org])
+AC_INIT([Ingnite C++ 
examples],[1.5.1.0],[d...@ignite.apache.org],[ignite-examples],[ignite.apache.org])
 AC_CONFIG_SRCDIR(src)
 
 AC_CANONICAL_SYSTEM

http://git-wip-us.apache.org/repos/asf/ignite/blob/ecb3cb44/modules/platforms/cpp/ignite/configure.ac
--
diff --git a/modules/platforms/cpp/ignite/configure.ac 

[2/4] ignite git commit: fixed version

[sboikov]

fixed version


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

Branch: refs/heads/ignite-1.5.1
Commit: f5e9918f80c6535844fffdb4ce63399e233f7b00
Parents: ecb3cb4
Author: Yakov Zhdanov 
Authored: Mon Nov 30 23:10:12 2015 +0300
Committer: Yakov Zhdanov 
Committed: Mon Nov 30 23:10:12 2015 +0300

--
 modules/platforms/cpp/common/configure.ac| 2 +-
 modules/platforms/cpp/core-test/configure.ac | 2 +-
 modules/platforms/cpp/core/configure.ac  | 2 +-
 modules/platforms/cpp/examples/configure.ac  | 2 +-
 modules/platforms/cpp/ignite/configure.ac| 2 +-
 .../dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs   | 4 ++--
 .../Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs  | 4 ++--
 .../dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs   | 4 ++--
 .../dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs | 4 ++--
 .../platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs| 4 ++--
 .../examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs   | 4 ++--
 .../Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs | 4 ++--
 12 files changed, 19 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/f5e9918f/modules/platforms/cpp/common/configure.ac
--
diff --git a/modules/platforms/cpp/common/configure.ac 
b/modules/platforms/cpp/common/configure.ac
index 229cb9d..8f53ea3 100644
--- a/modules/platforms/cpp/common/configure.ac
+++ b/modules/platforms/cpp/common/configure.ac
@@ -19,7 +19,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.69])
-AC_INIT([Apache Ignite JNI bridge for C++], [1.5.1.0], 
[d...@ignite.apache.org], [ignite-common], [ignite.apache.org])
+AC_INIT([Apache Ignite JNI bridge for C++], [1.5.0-EA], 
[d...@ignite.apache.org], [ignite-common], [ignite.apache.org])
 AC_CONFIG_SRCDIR(src)
 
 AC_CANONICAL_SYSTEM

http://git-wip-us.apache.org/repos/asf/ignite/blob/f5e9918f/modules/platforms/cpp/core-test/configure.ac
--
diff --git a/modules/platforms/cpp/core-test/configure.ac 
b/modules/platforms/cpp/core-test/configure.ac
index 1612bea..14baf55 100644
--- a/modules/platforms/cpp/core-test/configure.ac
+++ b/modules/platforms/cpp/core-test/configure.ac
@@ -19,7 +19,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.69])
-AC_INIT([Apache Ignite C++ Test], [1.5.1.0], [d...@ignite.apache.org], 
[ignite], [ignite.apache.org])
+AC_INIT([Apache Ignite C++ Test], [1.5.0-EA], [d...@ignite.apache.org], 
[ignite], [ignite.apache.org])
 AC_CONFIG_SRCDIR(src)
 
 AC_CANONICAL_SYSTEM

http://git-wip-us.apache.org/repos/asf/ignite/blob/f5e9918f/modules/platforms/cpp/core/configure.ac
--
diff --git a/modules/platforms/cpp/core/configure.ac 
b/modules/platforms/cpp/core/configure.ac
index 2733a46..f10eeb9 100644
--- a/modules/platforms/cpp/core/configure.ac
+++ b/modules/platforms/cpp/core/configure.ac
@@ -19,7 +19,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.69])
-AC_INIT([Apache Ignite C++], [1.5.1.0], [d...@ignite.apache.org], [ignite], 
[ignite.apache.org])
+AC_INIT([Apache Ignite C++], [1.5.0-EA], [d...@ignite.apache.org], [ignite], 
[ignite.apache.org])
 AC_CONFIG_SRCDIR(src)
 
 AC_CANONICAL_SYSTEM

http://git-wip-us.apache.org/repos/asf/ignite/blob/f5e9918f/modules/platforms/cpp/examples/configure.ac
--
diff --git a/modules/platforms/cpp/examples/configure.ac 
b/modules/platforms/cpp/examples/configure.ac
index 3ee5330..2d30028 100644
--- a/modules/platforms/cpp/examples/configure.ac
+++ b/modules/platforms/cpp/examples/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.69])
-AC_INIT([Ingnite C++ 
examples],[1.5.1.0],[d...@ignite.apache.org],[ignite-examples],[ignite.apache.org])
+AC_INIT([Ingnite C++ 
examples],[1.5.0-EA],[d...@ignite.apache.org],[ignite-examples],[ignite.apache.org])
 AC_CONFIG_SRCDIR(src)
 
 AC_CANONICAL_SYSTEM

http://git-wip-us.apache.org/repos/asf/ignite/blob/f5e9918f/modules/platforms/cpp/ignite/configure.ac
--
diff --git a/modules/platforms/cpp/ignite/configure.ac 
b/modules/platforms/cpp/ignite/configure.ac

[4/4] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1.5.1

[sboikov]

Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1.5.1

Conflicts:

modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs

modules/platforms/dotnet/Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs

modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs
modules/platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs
modules/platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs

modules/platforms/dotnet/examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs

modules/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs


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

Branch: refs/heads/ignite-1.5.1
Commit: f8c6acc1de966e31deb1dcf73754ef9ff9bc06f0
Parents: 4f1d55c 9830300
Author: Anton Vinogradov 
Authored: Tue Dec 1 11:25:37 2015 +0300
Committer: Anton Vinogradov 
Committed: Tue Dec 1 11:25:37 2015 +0300

--
 RELEASE_NOTES.txt | 2 ++
 1 file changed, 2 insertions(+)
--

ignite git commit: Release notes update

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5 f5e9918f8 -> 983030016


Release notes update


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

Branch: refs/heads/ignite-1.5
Commit: 98303001684265b3677fb663e51c4a44b9fd1707
Parents: f5e9918
Author: Anton Vinogradov 
Authored: Tue Dec 1 11:18:40 2015 +0300
Committer: Anton Vinogradov 
Committed: Tue Dec 1 11:18:40 2015 +0300

--
 RELEASE_NOTES.txt | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/98303001/RELEASE_NOTES.txt
--
diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt
index 4985edb..f7f48fa 100644
--- a/RELEASE_NOTES.txt
+++ b/RELEASE_NOTES.txt
@@ -9,6 +9,8 @@ Apache Ignite In-Memory Data Fabric 1.5
 * Added new binary cache object marshalling implementation.
 * Added IgniteSemaphore data structure.
 * Added MQTT Streamer.
+* Added Twitter Streamer.
+* Added Ignite Sink (integration with Apache Flume).
 * Fixed failover for continuous queries.
 * Fixed compilation and runtime errors under OpenJDK and IBM JDK.
 * Fixed Integer.size limitation for cache.

[2/2] ignite git commit: ignite-1.5 Should not wait on preloader sync future for system caches callbacks.

[sboikov]

ignite-1.5 Should not wait on preloader sync future for system caches callbacks.


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

Branch: refs/heads/ignite-1537
Commit: b0b1233b7f40ec3a7508a1688740c2345ef7674b
Parents: 83ce596
Author: sboikov 
Authored: Tue Dec 1 11:08:13 2015 +0300
Committer: sboikov 
Committed: Tue Dec 1 11:08:13 2015 +0300

--
 .../CachePutEventListenerErrorSelfTest.java | 35 +++-
 .../cache/GridCacheClearSelfTest.java   |  9 +++--
 2 files changed, 27 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/b0b1233b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CachePutEventListenerErrorSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CachePutEventListenerErrorSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CachePutEventListenerErrorSelfTest.java
index 0e0e521..bf8f615 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CachePutEventListenerErrorSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CachePutEventListenerErrorSelfTest.java
@@ -64,21 +64,26 @@ public class CachePutEventListenerErrorSelfTest extends 
GridCommonAbstractTest {
 
 Ignition.setClientMode(true);
 
-Ignite ignite = startGrid("client");
-
-ignite.events().remoteListen(
-new IgniteBiPredicate() {
-@Override public boolean apply(UUID uuid, Event evt) {
-return true;
-}
-},
-new IgnitePredicate() {
-@Override public boolean apply(Event evt) {
-throw new NoClassDefFoundError("XXX");
-}
-},
-EventType.EVT_CACHE_OBJECT_PUT
-);
+try {
+Ignite ignite = startGrid("client");
+
+ignite.events().remoteListen(
+new IgniteBiPredicate() {
+@Override public boolean apply(UUID uuid, Event evt) {
+return true;
+}
+},
+new IgnitePredicate() {
+@Override public boolean apply(Event evt) {
+throw new NoClassDefFoundError("XXX");
+}
+},
+EventType.EVT_CACHE_OBJECT_PUT
+);
+}
+finally {
+Ignition.setClientMode(false);
+}
 }
 
 /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/ignite/blob/b0b1233b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheClearSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheClearSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheClearSelfTest.java
index 5e14f14..67316b4 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheClearSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheClearSelfTest.java
@@ -61,8 +61,13 @@ public class GridCacheClearSelfTest extends 
GridCommonAbstractTest {
 
 Ignition.setClientMode(true);
 
-startGrid("client1");
-startGrid("client2");
+try {
+startGrid("client1");
+startGrid("client2");
+}
+finally {
+Ignition.setClientMode(false);
+}
 }
 
 /** {@inheritDoc} */

[1/2] ignite git commit: ignite-1.5 Should not wait on preloader sync future for system caches callbacks.

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1537 1f08d2f7e -> b0b1233b7


ignite-1.5 Should not wait on preloader sync future for system caches callbacks.


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

Branch: refs/heads/ignite-1537
Commit: 83ce5960ba9cba04b1823087802b39a6706aaf8d
Parents: 1f08d2f
Author: sboikov 
Authored: Tue Dec 1 10:59:06 2015 +0300
Committer: sboikov 
Committed: Tue Dec 1 10:59:06 2015 +0300

--
 .../cache/portable/CacheObjectBinaryProcessorImpl.java | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/83ce5960/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectBinaryProcessorImpl.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectBinaryProcessorImpl.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectBinaryProcessorImpl.java
index 4bdd7e7..220a45a 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectBinaryProcessorImpl.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectBinaryProcessorImpl.java
@@ -503,10 +503,12 @@ public class CacheObjectBinaryProcessorImpl extends 
IgniteCacheObjectProcessorIm
 if (clientNode)
 return clientMetaDataCache.get(typeId);
 else {
-BinaryMetadata meta = metaDataCache.localPeek(new 
PortableMetadataKey(typeId));
+PortableMetadataKey key = new PortableMetadataKey(typeId);
+
+BinaryMetadata meta = metaDataCache.localPeek(key);
 
 if (meta == null && 
!metaDataCache.context().preloader().syncFuture().isDone())
-meta = metaDataCache.getTopologySafe(new 
PortableMetadataKey(typeId));
+meta = metaDataCache.getTopologySafe(key);
 
 return meta != null ? meta.wrap(portableCtx) : null;
 }