svn commit: r1718362 - in /ignite/site/trunk/releases/1.5.0-b1: ./ javadoc/ javadoc/org/ javadoc/org/apache/ javadoc/org/apache/ignite/ javadoc/org/apache/ignite/binary/ javadoc/org/apache/ignite/bina

[av]

Author: av
Date: Mon Dec  7 14:05:32 2015
New Revision: 1718362

URL: http://svn.apache.org/viewvc?rev=1718362=rev
Log:
Javadoc 1.5.0-b1 added


[This commit notification would consist of 426 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]

svn commit: r1718376 - /ignite/site/trunk/download.html

[av]

Author: av
Date: Mon Dec  7 14:19:49 2015
New Revision: 1718376

URL: http://svn.apache.org/viewvc?rev=1718376=rev
Log:
1.5.0-b1 download info fixed

Modified:
ignite/site/trunk/download.html

Modified: ignite/site/trunk/download.html
URL: 
http://svn.apache.org/viewvc/ignite/site/trunk/download.html?rev=1718376=1718375=1718376=diff
==
--- ignite/site/trunk/download.html (original)
+++ ignite/site/trunk/download.html Mon Dec  7 14:19:49 2015
@@ -220,17 +220,17 @@ under the License.
   1.5.0-b1
   
 https://apacheignite.readme.io/v1.5/docs;>guide,
-https://ignite.incubator.apache.org/releases/1.5.0-b1/javadoc/;>javadoc,
-https://ignite.incubator.apache.org/releases/1.5.0-b1/scaladoc/scalar/;>scaladoc
+https://ignite.apache.org/releases/1.5.0-b1/javadoc/;>javadoc,
+https://ignite.apache.org/releases/1.5.0-b1/scaladoc/scalar/;>scaladoc
   
   2015-12-07
   
 apache-ignite-1.5.0-b1-incubating-src.zip 
+  
href="[preferred]/[distdir]/1.5.0-b1/apache-ignite-1.5.0-b1-src.zip"
+  onclick="ga('send', 'event', 'apache_ignite_source_download', 
'download', 'apache-ignite-1.5.0-b1');">apache-ignite-1.5.0-b1-src.zip 
 
-(pgp,
- sha1)
+(pgp,
+ sha1)
   
 

@@ -386,11 +386,11 @@ under the License.
   
 apache-ignite-fabric-1.5.0-b1-incubating-bin.zip
 
+  
href="[preferred]/[distdir]/1.5.0-b1/apache-ignite-fabric-1.5.0-b1-bin.zip"
+  onclick="ga('send', 'event', 
'apache_ignite_fabric_download', 'download', 
'apache-ignite-1.5.0-b1');">apache-ignite-fabric-1.5.0-b1-bin.zip 
 
-   (pgp,
 
-sha1)
+   (pgp,
 
+sha1)
   
 

@@ -519,11 +519,11 @@ under the License.
   
 apache-ignite-hadoop-1.5.0-b1-incubating-bin.zip
 
+  
href="[preferred]/[distdir]/1.5.0-b1/apache-ignite-hadoop-1.5.0-b1-bin.zip"
+  onclick="ga('send', 'event', 
'apache_ignite_hadoop_download', 'download', 
'apache-ignite-1.5.0-b1');">apache-ignite-hadoop-1.5.0-b1-bin.zip 
 
-   (pgp,
 
-sha1)
+   (pgp,
 
+sha1)
   
 

svn commit: r1718366 - /ignite/site/trunk/download.html

[av]

Author: av
Date: Mon Dec  7 14:12:30 2015
New Revision: 1718366

URL: http://svn.apache.org/viewvc?rev=1718366=rev
Log:
Added 1.5.0-b1 download info

Modified:
ignite/site/trunk/download.html

Modified: ignite/site/trunk/download.html
URL: 
http://svn.apache.org/viewvc/ignite/site/trunk/download.html?rev=1718366=1718365=1718366=diff
==
--- ignite/site/trunk/download.html (original)
+++ ignite/site/trunk/download.html Mon Dec  7 14:12:30 2015
@@ -216,6 +216,23 @@ under the License.
   VersionDocsDateSource
   
   
+   
+  1.5.0-b1
+  
+https://apacheignite.readme.io/v1.5/docs;>guide,
+https://ignite.incubator.apache.org/releases/1.5.0-b1/javadoc/;>javadoc,
+https://ignite.incubator.apache.org/releases/1.5.0-b1/scaladoc/scalar/;>scaladoc
+  
+  2015-12-07
+  
+apache-ignite-1.5.0-b1-incubating-src.zip 
+
+(pgp,
+ sha1)
+  
+

   1.4.0 (latest)
   
@@ -359,6 +376,24 @@ under the License.
 
 

+  1.5.0-b1
+  
+https://apacheignite.readme.io/v1.5/docs;>guide,
+https://ignite.apache.org/releases/1.5.0-b1/javadoc/;>javadoc,
+https://ignite.apache.org/releases/1.5.0-b1/scaladoc/scalar/;>scaladoc
+  
+  2015-12-07
+  
+apache-ignite-fabric-1.5.0-b1-incubating-bin.zip
 
+
+   (pgp,
 
+sha1)
+  
+
+   
   1.4.0 (latest)
   
 https://apacheignite.readme.io/v1.4/docs;>guide,
@@ -476,6 +511,22 @@ under the License.
 
 

+  1.5.0-b1
+  
+https://apacheignite.readme.io/v1.5/docs/hadoop-accelerator;>guide 
+  
+  2015-12-07
+  
+apache-ignite-hadoop-1.5.0-b1-incubating-bin.zip
 
+
+   (pgp,
 
+sha1)
+  
+
+   
   1.4.0 (latest)
   
 https://apacheignite.readme.io/v1.4/docs/hadoop-accelerator;>guide 
@@ -491,7 +542,7 @@ under the License.
 sha1)
   
 
-  
+   
   1.3.0
   
 https://apacheignite.readme.io/v1.3/docs/hadoop-accelerator;>guide 
@@ -507,7 +558,7 @@ under the License.
 sha1)
   
 
-  
+   
   1.2.0
   
 https://apacheignite.readme.io/v1.2/docs/hadoop-accelerator;>guide 

[1/2] ignite git commit: IGNITE-2050 - Remove duplicates from the configuration.

[agoncharuk]

Repository: ignite
Updated Branches:
  refs/heads/ignite-2050 [created] c0caf7749


IGNITE-2050 - Remove duplicates from the configuration.


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

Branch: refs/heads/ignite-2050
Commit: 2bc901bc3dcf54c88cfdbf8bc1131ef9b4bafe85
Parents: ad9e4db
Author: Alexey Goncharuk 
Authored: Thu Dec 3 15:13:38 2015 +0300
Committer: Alexey Goncharuk 
Committed: Thu Dec 3 15:13:38 2015 +0300

--
 .../configuration/CacheConfiguration.java   |  34 -
 ...cheDuplicateEntityConfigurationSelfTest.java | 126 +++
 .../IgniteCacheQuerySelfTestSuite.java  |   4 +
 3 files changed, 159 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/2bc901bc/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
 
b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
index 034d20d..af3530a 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
@@ -1872,7 +1872,20 @@ public class CacheConfiguration extends 
MutableConfiguration {
 
 TypeDescriptor desc = processKeyAndValueClasses(keyCls, valCls);
 
-qryEntities.add(convert(desc));
+QueryEntity converted = convert(desc);
+
+boolean dup = false;
+
+for (QueryEntity entity : qryEntities) {
+if (F.eq(entity.getValueType(), converted.getValueType())) {
+dup = true;
+
+break;
+}
+}
+
+if (!dup)
+qryEntities.add(converted);
 }
 
 return this;
@@ -1968,10 +1981,21 @@ public class CacheConfiguration extends 
MutableConfiguration {
 public CacheConfiguration setQueryEntities(Collection 
qryEntities) {
 if (this.qryEntities == null)
 this.qryEntities = new ArrayList<>(qryEntities);
-else if (indexedTypes != null)
-this.qryEntities.addAll(qryEntities);
-else
-throw new CacheException("Query entities can be set only once.");
+
+for (QueryEntity entity : qryEntities) {
+boolean found = false;
+
+for (QueryEntity existing : this.qryEntities) {
+if (F.eq(entity.getValueType(), existing.getValueType())) {
+found = true;
+
+break;
+}
+}
+
+if (!found)
+this.qryEntities.add(entity);
+}
 
 return this;
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/2bc901bc/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDuplicateEntityConfigurationSelfTest.java
--
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDuplicateEntityConfigurationSelfTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDuplicateEntityConfigurationSelfTest.java
new file mode 100644
index 000..8311213
--- /dev/null
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDuplicateEntityConfigurationSelfTest.java
@@ -0,0 +1,126 @@
+/*
+ * 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.internal.processors.cache;
+
+import java.util.Arrays;
+import java.util.LinkedHashMap;
+import org.apache.ignite.cache.QueryEntity;
+import 

ignite git commit: IGNITE-2050 - Fixed duplicate query types in configuration. - Fixes #291.

[agoncharuk]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5 9a14d6432 -> ebddcb187


IGNITE-2050 - Fixed duplicate query types in configuration. - Fixes #291.

Signed-off-by: Alexey Goncharuk 


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

Branch: refs/heads/ignite-1.5
Commit: ebddcb187231c08bcf53a7c567f10064393a8e60
Parents: 9a14d64
Author: Alexey Goncharuk 
Authored: Mon Dec 7 20:11:48 2015 +0300
Committer: Alexey Goncharuk 
Committed: Mon Dec 7 20:11:48 2015 +0300

--
 .../configuration/CacheConfiguration.java   |  34 -
 ...cheDuplicateEntityConfigurationSelfTest.java | 126 +++
 .../IgniteCacheQuerySelfTestSuite.java  |   4 +
 3 files changed, 159 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/ebddcb18/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
 
b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
index 034d20d..af3530a 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
@@ -1872,7 +1872,20 @@ public class CacheConfiguration extends 
MutableConfiguration {
 
 TypeDescriptor desc = processKeyAndValueClasses(keyCls, valCls);
 
-qryEntities.add(convert(desc));
+QueryEntity converted = convert(desc);
+
+boolean dup = false;
+
+for (QueryEntity entity : qryEntities) {
+if (F.eq(entity.getValueType(), converted.getValueType())) {
+dup = true;
+
+break;
+}
+}
+
+if (!dup)
+qryEntities.add(converted);
 }
 
 return this;
@@ -1968,10 +1981,21 @@ public class CacheConfiguration extends 
MutableConfiguration {
 public CacheConfiguration setQueryEntities(Collection 
qryEntities) {
 if (this.qryEntities == null)
 this.qryEntities = new ArrayList<>(qryEntities);
-else if (indexedTypes != null)
-this.qryEntities.addAll(qryEntities);
-else
-throw new CacheException("Query entities can be set only once.");
+
+for (QueryEntity entity : qryEntities) {
+boolean found = false;
+
+for (QueryEntity existing : this.qryEntities) {
+if (F.eq(entity.getValueType(), existing.getValueType())) {
+found = true;
+
+break;
+}
+}
+
+if (!found)
+this.qryEntities.add(entity);
+}
 
 return this;
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/ebddcb18/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDuplicateEntityConfigurationSelfTest.java
--
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDuplicateEntityConfigurationSelfTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDuplicateEntityConfigurationSelfTest.java
new file mode 100644
index 000..8311213
--- /dev/null
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDuplicateEntityConfigurationSelfTest.java
@@ -0,0 +1,126 @@
+/*
+ * 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.internal.processors.cache;
+
+import java.util.Arrays;
+import 

ignite git commit: IGNITE-2093 Implemented scan for near caches.

[akuznetsov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-2093 [created] ac9ee86dc


IGNITE-2093 Implemented scan for near caches.


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

Branch: refs/heads/ignite-2093
Commit: ac9ee86dc7771e752f995f7ec510b4daa9186d30
Parents: 9a14d64
Author: AKuznetsov 
Authored: Mon Dec 7 23:29:57 2015 +0700
Committer: AKuznetsov 
Committed: Mon Dec 7 23:29:57 2015 +0700

--
 .../ignite/internal/visor/cache/VisorCache.java | 13 
 .../internal/visor/query/VisorQueryJob.java | 76 +---
 .../internal/visor/query/VisorQueryUtils.java   |  5 +-
 3 files changed, 84 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/ac9ee86d/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java
index 1bbcf2f..6def8c3 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java
@@ -108,6 +108,9 @@ public class VisorCache implements Serializable {
 /** Cache partitions states. */
 private GridDhtPartitionMap2 partitionsMap;
 
+/** Flag indicating that cache has near cache. */
+private boolean near;
+
 /**
  * @param ignite Grid.
  * @param cacheName Cache name.
@@ -140,6 +143,8 @@ public class VisorCache implements Serializable {
 
 CacheConfiguration cfg = ca.configuration();
 
+near = ca.context().isNear();
+
 mode = cfg.getCacheMode();
 
 boolean partitioned = (mode == CacheMode.PARTITIONED || mode == 
CacheMode.REPLICATED)
@@ -275,6 +280,7 @@ public class VisorCache implements Serializable {
 c.primaryPartitions = Collections.emptyList();
 c.backupPartitions = Collections.emptyList();
 c.metrics = metrics;
+c.near = near;
 
 return c;
 }
@@ -405,6 +411,13 @@ public class VisorCache implements Serializable {
 return partitionsMap;
 }
 
+/**
+ * @return {@code true} if cache has near cache.
+ */
+public boolean near() {
+return near;
+}
+
 /** {@inheritDoc} */
 @Override public String toString() {
 return S.toString(VisorCache.class, this);

http://git-wip-us.apache.org/repos/asf/ignite/blob/ac9ee86d/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryJob.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryJob.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryJob.java
index 40c5cc3..50e5a06 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryJob.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryJob.java
@@ -20,11 +20,14 @@ package org.apache.ignite.internal.visor.query;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Iterator;
 import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentMap;
 import javax.cache.Cache;
 import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.CachePeekMode;
+import org.apache.ignite.cache.query.QueryCursor;
 import org.apache.ignite.cache.query.ScanQuery;
 import org.apache.ignite.cache.query.SqlFieldsQuery;
 import org.apache.ignite.internal.processors.cache.GridCacheProcessor;
@@ -39,6 +42,7 @@ import org.apache.ignite.lang.IgniteBiTuple;
 import static org.apache.ignite.internal.visor.query.VisorQueryUtils.RMV_DELAY;
 import static 
org.apache.ignite.internal.visor.query.VisorQueryUtils.SCAN_COL_NAMES;
 import static 
org.apache.ignite.internal.visor.query.VisorQueryUtils.SCAN_QRY_NAME;
+import static 
org.apache.ignite.internal.visor.query.VisorQueryUtils.SCAN_NEAR_CACHE;
 import static 
org.apache.ignite.internal.visor.query.VisorQueryUtils.SQL_QRY_NAME;
 import static 
org.apache.ignite.internal.visor.query.VisorQueryUtils.fetchScanQueryRows;
 import static 
org.apache.ignite.internal.visor.query.VisorQueryUtils.fetchSqlQueryRows;
@@ -70,26 +74,49 @@ public class VisorQueryJob extends VisorJob scan(IgniteCache c, VisorQueryArg arg) {
+ScanQuery 

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

[agoncharuk]

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


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

Branch: refs/heads/ignite-2050
Commit: c0caf77492fcb4edc2f167a750866b3f798f57da
Parents: 2bc901b 9a14d64
Author: Alexey Goncharuk 
Authored: Mon Dec 7 18:43:56 2015 +0300
Committer: Alexey Goncharuk 
Committed: Mon Dec 7 18:43:56 2015 +0300

--
 RELEASE_NOTES.txt   |   1 +
 examples/config/example-default.xml |   7 +
 examples/pom.xml|   2 +-
 examples/schema-import/pom.xml  |   2 +-
 .../store/auto/CacheBinaryAutoStoreExample.java | 158 ++
 .../datagrid/store/auto/package-info.java   |  22 +
 .../store/auto/CacheAutoStoreExample.java   |  93 +++-
 .../auto/CacheAutoStoreLoadDataExample.java |  85 
 .../datagrid/store/auto/CacheConfig.java|  81 ---
 .../datagrid/store/auto/DbH2ServerStartup.java  |  79 ---
 .../ignite/examples/util/DbH2ServerStartup.java |  79 +++
 .../ignite/examples/util/package-info.java  |  22 +
 modules/aop/pom.xml |  12 +-
 modules/aws/pom.xml |  18 +-
 modules/camel/pom.xml   |  11 +-
 modules/core/pom.xml|  28 +-
 .../store/jdbc/CacheAbstractJdbcStore.java  |  12 +-
 .../cache/store/jdbc/CacheJdbcPojoStore.java|   9 +
 .../ignite/internal/MarshallerContextImpl.java  |   7 +-
 .../internal/portable/BinaryReaderExImpl.java   |   2 +-
 .../internal/portable/PortableContext.java  |  34 +-
 .../processors/cache/GridCacheContext.java  |  30 ++
 .../processors/cache/GridCacheIoManager.java|   2 +-
 .../CacheDataStructuresManager.java |  31 +-
 .../distributed/dht/GridDhtTxPrepareFuture.java |  51 +-
 .../dht/atomic/GridDhtAtomicCache.java  |  20 +-
 .../dht/preloader/GridDhtPartitionDemander.java |   2 +-
 .../GridDhtPartitionsExchangeFuture.java|   9 +-
 .../CacheObjectBinaryProcessorImpl.java |   8 +
 .../cache/query/GridCacheQueryManager.java  |  12 +-
 .../cache/transactions/IgniteTxAdapter.java |   5 +
 .../cache/transactions/IgniteTxEntry.java   |   8 +-
 .../transactions/IgniteTxLocalAdapter.java  |  11 +-
 .../datastructures/CollocatedQueueItemKey.java  |  75 +++
 .../datastructures/CollocatedSetItemKey.java|  87 
 .../datastructures/DataStructuresProcessor.java |   7 +-
 .../GridAtomicCacheQueueImpl.java   |   8 +-
 .../datastructures/GridCacheQueueAdapter.java   |  30 +-
 .../datastructures/GridCacheQueueItemKey.java   |   9 +-
 .../datastructures/GridCacheSetImpl.java|  37 +-
 .../datastructures/GridCacheSetItemKey.java |  21 +-
 .../GridTransactionalCacheQueueImpl.java|   2 +-
 .../processors/datastructures/QueueItemKey.java |  27 +
 .../processors/datastructures/SetItemKey.java   |  36 ++
 .../handlers/query/QueryCommandHandler.java |   6 +-
 ...eAtomicEntryProcessorDeploymentSelfTest.java |   6 +-
 .../IgniteCacheEntryProcessorCallTest.java  | 497 +++
 .../cache/IgniteCacheInvokeAbstractTest.java| 369 ++
 ...eAbstractDataStructuresFailoverSelfTest.java |   7 +-
 .../GridCacheQueueApiSelfAbstractTest.java  |  18 +-
 .../GridCacheSetFailoverAbstractSelfTest.java   |   6 +-
 .../GridCachePartitionedQueueApiSelfTest.java   |   5 +
 ...dCachePartitionedQueueEntryMoveSelfTest.java |   2 +-
 .../IgnitePartitionedQueueNoBackupsTest.java|  92 
 .../GridCacheReplicatedQueueApiSelfTest.java|   5 +
 .../dht/GridCacheTxNodeFailureSelfTest.java |   2 +
 .../dht/GridNearCacheTxNodeFailureSelfTest.java |   4 -
 ...idCachePartitionedHitsAndMissesSelfTest.java |   4 +-
 .../GridCacheWriteBehindStoreAbstractTest.java  |   2 +-
 .../config/GridTestProperties.java  |   3 +
 .../testframework/junits/GridAbstractTest.java  |   7 +
 .../IgniteBinaryObjectsCacheTestSuite3.java |   2 +
 .../IgniteCacheDataStructuresSelfTestSuite.java |   3 +
 .../ignite/testsuites/IgniteCacheTestSuite.java |   2 +
 .../testsuites/IgniteCacheTestSuite2.java   |   2 +
 modules/flume/pom.xml   |  16 +-
 modules/geospatial/pom.xml  |  20 +
 modules/hadoop/pom.xml  |   2 +-
 modules/hibernate/pom.xml   |  10 +-
 modules/indexing/pom.xml|  22 +-
 modules/jcl/pom.xml |  11 +
 modules/jms11/pom.xml   |  20 +-
 modules/jta/pom.xml |  17 +
 

[ignite] Git Push Summary

[sboikov]

Repository: ignite
Updated Tags:  refs/tags/ignite-8.8.8-TEST-rc0 [created] 8ad20702a

ignite git commit: IGNITE-2083 EntryProcessor is called twice on primary node in transactional cache

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1537 5d14ec6e2 -> ca730e6c4


IGNITE-2083 EntryProcessor is called twice on primary node in transactional 
cache


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

Branch: refs/heads/ignite-1537
Commit: ca730e6c4335cb055f6541297f3863c3cb20baf2
Parents: 5d14ec6
Author: sboikov 
Authored: Mon Dec 7 12:07:29 2015 +0300
Committer: sboikov 
Committed: Mon Dec 7 12:07:29 2015 +0300

--
 .../processors/cache/IgniteCacheEntryProcessorCallTest.java   | 7 +++
 1 file changed, 7 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/ca730e6c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryProcessorCallTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryProcessorCallTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryProcessorCallTest.java
index de98d26..5163d96 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryProcessorCallTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryProcessorCallTest.java
@@ -85,6 +85,13 @@ public class IgniteCacheEntryProcessorCallTest extends 
GridCommonAbstractTest {
 }
 
 /** {@inheritDoc} */
+@Override protected void afterTestsStopped() throws Exception {
+stopAllGrids();
+
+super.afterTestsStopped();
+}
+
+/** {@inheritDoc} */
 @Override protected void beforeTestsStarted() throws Exception {
 super.beforeTestsStarted();
 

[1/2] ignite git commit: IGNITE-843 Minor UI fix.

[akuznetsov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc2 940466bc5 -> fe2b6def5


IGNITE-843 Minor UI fix.


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

Branch: refs/heads/ignite-843-rc2
Commit: cfdd7b820237a8614a274ec88f5f448fc2ea181d
Parents: 1383843
Author: Vasiliy Sisko 
Authored: Mon Dec 7 16:56:59 2015 +0700
Committer: Alexey Kuznetsov 
Committed: Mon Dec 7 16:56:59 2015 +0700

--
 .../src/main/js/views/includes/controls.jade| 21 ++--
 1 file changed, 11 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/cfdd7b82/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 95ad37d..4342720 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
@@ -159,8 +159,8 @@ mixin table-igfs-path-mode(header, tblMdl, keyFld, valFld, 
keyPlaceholder, valPl
 td.col-sm-12
 +table-igfs-path-mode-edit('new', keyPlaceholder, 
valPlaceholder, '{{::field.focusId}}', '-1')
 
-mixin details-row
-- var lblDetailClasses = ['col-sm-4', 'details-label']
+mixin details-row(lblClasses, fieldClasses)
+- var lblDetailClasses = lblClasses + ' details-label'
 
 - var detailMdl = 'getModel(backupItem, detail)[detail.model]';
 - var detailCommon = {'ng-model': detailMdl, 'ng-required': 
'detail.required'};
@@ -179,13 +179,13 @@ mixin details-row
 +tipLabel('detail.tip')
 div(ng-switch-when='text')
 label(class=lblDetailClasses ng-class='{required: 
detail.required}') {{::detail.label}}:
-.col-sm-8
+.div(class=fieldClasses)
 +tipField('detail.tip')
 .input-tip
 input.form-control(id='{{::detail.model}}' type='text' 
placeholder='{{::detail.placeholder}}')(detailCommon)
 div(ng-switch-when='number')
 label(class=lblDetailClasses ng-class='{required: 
detail.required}') {{::detail.label}}:
-.col-sm-8
+.div(class=fieldClasses)
 +tipField('detail.tip')
 .input-tip
 input.form-control(id='{{::detail.id}}' 
name='{{detail.model}}' type='number' ng-disabled=detailDisabled 
placeholder='{{::detail.placeholder}}' min='{{detail.min ? detail.min : 0}}' 
max='{{detail.max ? detail.max : Number.MAX_VALUE}}')(detailCommon)
@@ -194,13 +194,13 @@ mixin details-row
 +ico-exclamation('{{detail.model}}', 'number', 'Invalid 
value. Only numbers allowed.')
 div(ng-switch-when='dropdown')
 label(class=lblDetailClasses ng-class='{required: 
detail.required}') {{::detail.label}}:
-.col-sm-8
+.div(class=fieldClasses)
 +tipField('detail.tip')
 .input-tip
 button.select-toggle.form-control(id='{{::detail.id}}' 
bs-select data-placeholder='{{::detail.placeholder}}' bs-options='item.value as 
item.label for item in {{detail.items}}' 
tabindex='0')(detailCommon)(dropdownPlaceholder)
 div(ng-switch-when='dropdown-multiple')
 label(class=lblDetailClasses ng-class='{required: 
detail.required}') {{::detail.label}}:
-.col-sm-8
+.div(class=fieldClasses)
 +tipField('detail.tip')
 .input-tip
 button.select-toggle.form-control(bs-select 
data-multiple='1' data-placeholder='{{::detail.placeholder}}' 
bs-options='item.value as item.label for item in {{detail.items}}' 
tabindex='-1')(detailCommon)(dropdownPlaceholder)
@@ -313,7 +313,8 @@ 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 + ' 
== undefined || ' + fieldMdl + ' == null}'}
+- var dropdownMultiPlaceholder = {'ng-class': '{placeholder: !(' + 
fieldMdl + ' && ' + fieldMdl + '.length > 0)}'}
 
 div(ng-switch='field.type')
 div(ng-switch-when='label')

ignite git commit: IGNITE-2081 Fixed javadoc.

[ntikhonov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5 11b426297 -> 34596c63c


IGNITE-2081 Fixed javadoc.


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

Branch: refs/heads/ignite-1.5
Commit: 34596c63c883af696daebcd6a24bee2ef55e7e2c
Parents: 11b4262
Author: nikolay_tikhonov 
Authored: Mon Dec 7 13:29:40 2015 +0300
Committer: nikolay_tikhonov 
Committed: Mon Dec 7 13:29:40 2015 +0300

--
 .../apache/ignite/yarn/utils/package-info.java  | 22 
 1 file changed, 22 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/34596c63/modules/yarn/src/main/java/org/apache/ignite/yarn/utils/package-info.java
--
diff --git 
a/modules/yarn/src/main/java/org/apache/ignite/yarn/utils/package-info.java 
b/modules/yarn/src/main/java/org/apache/ignite/yarn/utils/package-info.java
new file mode 100644
index 000..a73c390
--- /dev/null
+++ b/modules/yarn/src/main/java/org/apache/ignite/yarn/utils/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * 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.
+ */
+
+/**
+ * 
+ * Utility and helper classes.
+ */
+package org.apache.ignite.yarn.utils;
\ No newline at end of file

[ignite] Git Push Summary

[av]

Repository: ignite
Updated Tags:  refs/tags/ignite-8.8.8-TEST-rc0 [deleted] 8ad20702a

ignite git commit: IGNITE-2090 .Net: EventsTest.TestSerialization fails

[vozerov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5 34596c63c -> c10b112ad


IGNITE-2090 .Net: EventsTest.TestSerialization fails


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

Branch: refs/heads/ignite-1.5
Commit: c10b112ad0693035d6bb2b1c782fe09f11aaded4
Parents: 34596c6
Author: Pavel Tupitsyn 
Authored: Mon Dec 7 13:42:17 2015 +0300
Committer: Pavel Tupitsyn 
Committed: Mon Dec 7 13:42:17 2015 +0300

--
 modules/platforms/dotnet/Apache.Ignite.Core.Tests/EventsTest.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/c10b112a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/EventsTest.cs
--
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/EventsTest.cs 
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/EventsTest.cs
index 9f22355..a538cb4 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/EventsTest.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/EventsTest.cs
@@ -568,7 +568,8 @@ namespace Apache.Ignite.Core.Tests
 Assert.AreEqual(EventType.SwapSpaceCleared, evt.Type);
 Assert.IsNotNullOrEmpty(evt.Name);
 Assert.AreNotEqual(Guid.Empty, evt.Id.GlobalId);
-Assert.IsTrue((evt.Timestamp - DateTime.Now).TotalSeconds < 10);
+Assert.IsTrue(Math.Abs((evt.Timestamp - 
DateTime.UtcNow).TotalSeconds) < 20, 
+"Invalid event timestamp: '{0}', current time: '{1}'", 
evt.Timestamp, DateTime.Now);
 }
 
 /// 

[38/50] [abbrv] ignite git commit: ignite-2008 Call removeExplicitNodeLocks before waiting for partitionReleaseFuture.

[sboikov]

ignite-2008 Call removeExplicitNodeLocks before waiting for 
partitionReleaseFuture.


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

Branch: refs/heads/master
Commit: baab3d2b6e047f32f33f1174474683096f2eb373
Parents: 171e9b1
Author: sboikov 
Authored: Fri Dec 4 09:04:00 2015 +0300
Committer: sboikov 
Committed: Fri Dec 4 09:04:00 2015 +0300

--
 .../dht/preloader/GridDhtPartitionsExchangeFuture.java  | 9 -
 .../distributed/dht/GridCacheTxNodeFailureSelfTest.java | 2 ++
 .../distributed/dht/GridNearCacheTxNodeFailureSelfTest.java | 4 
 .../org/apache/ignite/testsuites/IgniteCacheTestSuite2.java | 2 ++
 4 files changed, 8 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/baab3d2b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
index f7e6acc..31bfa79 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
@@ -754,6 +754,9 @@ public class GridDhtPartitionsExchangeFuture extends 
GridFutureAdapter locksFut = 
cctx.mvcc().finishLocks(exchId.topologyVersion());
 
 dumpedObjects = 0;
@@ -1015,9 +1015,8 @@ public class GridDhtPartitionsExchangeFuture extends 
GridFutureAdapterhttp://git-wip-us.apache.org/repos/asf/ignite/blob/baab3d2b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheTxNodeFailureSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheTxNodeFailureSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheTxNodeFailureSelfTest.java
index fe0b84e..78e7672 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheTxNodeFailureSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheTxNodeFailureSelfTest.java
@@ -295,6 +295,8 @@ public class GridCacheTxNodeFailureSelfTest extends 
GridCommonAbstractTest {
 // Check that thread successfully finished.
 fut.get();
 
+awaitPartitionMapExchange();
+
 // Check there are no hanging transactions.
 assertEquals(0, 
((IgniteEx)ignite(0)).context().cache().context().tm().idMapSize());
 assertEquals(0, 
((IgniteEx)ignite(2)).context().cache().context().tm().idMapSize());

http://git-wip-us.apache.org/repos/asf/ignite/blob/baab3d2b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridNearCacheTxNodeFailureSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridNearCacheTxNodeFailureSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridNearCacheTxNodeFailureSelfTest.java
index ca23646..5735182 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridNearCacheTxNodeFailureSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridNearCacheTxNodeFailureSelfTest.java
@@ -28,8 +28,4 @@ public class GridNearCacheTxNodeFailureSelfTest extends 
GridCacheTxNodeFailureSe
 @Override protected CacheConfiguration cacheConfiguration(String gridName) 
{
 return super.cacheConfiguration(gridName).setNearConfiguration(new 
NearCacheConfiguration());
 }
-
-@Override public void testPrimaryNodeFailureBackupCommitImplicit(){
-fail("https://issues.apache.org/jira/browse/IGNITE-1611;);
-}
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/baab3d2b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java

[42/50] [abbrv] ignite git commit: Javadoc hotfix

[sboikov]

Javadoc hotfix


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

Branch: refs/heads/master
Commit: d5fa3c1b69cfa336e70087dded9ddfa099000235
Parents: e5de23e
Author: Anton Vinogradov 
Authored: Fri Dec 4 13:24:59 2015 +0300
Committer: Anton Vinogradov 
Committed: Fri Dec 4 13:24:59 2015 +0300

--
 .../cache/distributed/dht/preloader/GridDhtPartitionDemander.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/d5fa3c1b/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 ced0d10..998f7a2 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
@@ -359,7 +359,7 @@ public class GridDhtPartitionDemander {
  * @param fut Future.
  * @param assigns Assignments.
  * @throws IgniteCheckedException If failed.
- * @return
+ * @return Partitions were requested.
  */
 private boolean requestPartitions(
 RebalanceFuture fut,

[33/50] [abbrv] ignite git commit: IGNITE-1270 Implement basic support for OSGi.

[sboikov]

http://git-wip-us.apache.org/repos/asf/ignite/blob/96e08027/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index a7ae644..4fd7156 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -35,15 +35,87 @@
 
 
 fabric
-2.4.1
-1.5.2
-4.1.0.RELEASE
+
+
 UTF-8
  d 

 doxygen
 git
-9.2.11.v20150529
+2.5.4
 -XDenableSunApiLintControl
+
+
+5.12.0
+1.0_6
+4.2
+1.7.2_1
+1.7.2
+1.10.12_1
+1.10.29
+2.16.0
+
1.8.3_1
+1.8.3
+1.6
+3.2.1
+2.6
+2.2.5
+2.9.1
+1.0.6_1
+1.0.6
+1.6.0
+2.0.0
+18.0
+14.0.1
+16.0.1
+1.3.175
+2.4.1
+4.5.1
+4.4.3
+1.9.13
+1.0.0_1
+1.0.0
+9.2.11.v20150529
+1.1.1
+0.1.53_1
+0.1.53
+2.4_1
+2.4
+r938
+0.8.2.1_1
+0.8.2.0_1
+0.8.2.0
+0.8.2.1
+0.8.2.1
+4.0.2
+3.5.0_1
+3.5.0
+2.0.8_6
+5.0.0
+5.0.0
+1.0.2
+2.10.4
+2.10.4
+2.11.7
+1.7.7
+1.6.4
+1.5.2
+4.1.0.RELEASE
+
4.1.7.RELEASE_1
+8.0.23
+2.2.0
+
2.2.0
+2.2.0
+0.5
+3.4.6
+
+
+*
+{local-packages}
+
+
+false
+false
+
 
 
 org.apache.ignite
@@ -182,6 +254,15 @@
 
 
 
+
+
+org.apache.maven.plugins
+maven-jar-plugin
+
+true
+
+
+
 
 org.apache.maven.plugins
 maven-javadoc-plugin
@@ -402,6 +483,52 @@
 
 
 
+
+
+org.apache.felix
+maven-bundle-plugin
+${maven.bundle.plugin.version}
+true
+
+
+true
+
+
+jar
+war
+
+
+
${project.groupId}.${project.artifactId}
+${project.version}
+
${project.organization.name}
+
${project.description}
+${project.url}
+
+${osgi.import.package}
+
+
+${osgi.export.package}
+
+
+${osgi.private.package}
+
+
${osgi.embed.dependency}
+lib
+
${osgi.embed.transitive}
+<_failok>${osgi.fail.ok}
+<_invalidfilenames />
+
+
+
+
+bundle-manifest
+process-classes
+
+manifest
+
+
+
+
 
 
 
@@ -625,6 +752,7 @@
 
 
 
+
 
 
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/96e08027/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 5f86648..993eab2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,6 +80,9 @@
 modules/mqtt
 modules/zookeeper
 modules/camel
+modules/osgi-paxlogging
+modules/osgi-karaf
+modules/osgi
 
 
 

[13/50] [abbrv] ignite git commit: ignite-1.5 Skip message send on node stop.

[sboikov]

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/master
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());
 

[25/50] [abbrv] ignite git commit: ignite-2008 Added test reproducing issue.

[sboikov]

ignite-2008 Added test reproducing issue.


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

Branch: refs/heads/master
Commit: f7709543c7e6652dc276e38629f2f1d1315fa84e
Parents: e7298ad
Author: sboikov 
Authored: Thu Dec 3 10:42:15 2015 +0300
Committer: sboikov 
Committed: Thu Dec 3 10:42:15 2015 +0300

--
 .../CacheLockReleaseNodeLeaveTest.java  | 51 
 1 file changed, 51 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/f7709543/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLockReleaseNodeLeaveTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLockReleaseNodeLeaveTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLockReleaseNodeLeaveTest.java
index 956aaef..e84fd3f 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLockReleaseNodeLeaveTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLockReleaseNodeLeaveTest.java
@@ -29,9 +29,12 @@ import 
org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
 import org.apache.ignite.testframework.GridTestUtils;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.transactions.Transaction;
 
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
+import static 
org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC;
+import static 
org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_READ;
 
 /**
  *
@@ -107,4 +110,52 @@ public class CacheLockReleaseNodeLeaveTest extends 
GridCommonAbstractTest {
 
 fut2.get(5, SECONDS);
 }
+
+/**
+ * @throws Exception If failed.
+ */
+public void testTxLockRelease() throws Exception {
+startGrids(2);
+
+final Ignite ignite0 = ignite(0);
+final Ignite ignite1 = ignite(1);
+
+final Integer key = primaryKey(ignite1.cache(null));
+
+IgniteInternalFuture fut1 = GridTestUtils.runAsync(new 
Callable() {
+@Override public Void call() throws Exception {
+Transaction tx = ignite0.transactions().txStart(PESSIMISTIC, 
REPEATABLE_READ);
+
+ignite0.cache(null).get(key);
+
+return null;
+}
+}, "lock-thread1");
+
+fut1.get();
+
+IgniteInternalFuture fut2 = GridTestUtils.runAsync(new 
Callable() {
+@Override public Void call() throws Exception {
+try (Transaction tx = 
ignite1.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) {
+log.info("Start tx lock.");
+
+ignite1.cache(null).get(key);
+
+log.info("Tx locked key.");
+
+tx.commit();
+}
+
+return null;
+}
+}, "lock-thread2");
+
+U.sleep(1000);
+
+log.info("Stop node.");
+
+ignite0.close();
+
+fut2.get(5, SECONDS);
+}
 }

[32/50] [abbrv] 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/5beed16e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5beed16e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5beed16e

Branch: refs/heads/master
Commit: 5beed16e3af924e367dffec841d39d09d326d110
Parents: dc0131d 50f6c01
Author: Anton Vinogradov 
Authored: Thu Dec 3 16:54:50 2015 +0300
Committer: Anton Vinogradov 
Committed: Thu Dec 3 16:54:50 2015 +0300

--
 .../internal/portable/BinaryReaderExImpl.java   |   2 +-
 .../internal/portable/PortableContext.java  |  34 +-
 .../processors/cache/GridCacheContext.java  |  30 ++
 .../CacheDataStructuresManager.java |  31 +-
 .../dht/atomic/GridDhtAtomicCache.java  |  20 +-
 .../CacheObjectBinaryProcessorImpl.java |   8 +
 .../cache/query/GridCacheQueryManager.java  |  12 +-
 .../transactions/IgniteTxLocalAdapter.java  |  11 +-
 .../datastructures/CollocatedQueueItemKey.java  |  75 
 .../datastructures/CollocatedSetItemKey.java|  87 +
 .../datastructures/DataStructuresProcessor.java |   7 +-
 .../GridAtomicCacheQueueImpl.java   |   8 +-
 .../datastructures/GridCacheQueueAdapter.java   |  30 +-
 .../datastructures/GridCacheQueueItemKey.java   |   9 +-
 .../datastructures/GridCacheSetImpl.java|  37 +-
 .../datastructures/GridCacheSetItemKey.java |  21 +-
 .../GridTransactionalCacheQueueImpl.java|   2 +-
 .../processors/datastructures/QueueItemKey.java |  27 ++
 .../processors/datastructures/SetItemKey.java   |  36 ++
 .../cache/IgniteCacheInvokeAbstractTest.java| 369 ++-
 ...eAbstractDataStructuresFailoverSelfTest.java |   7 +-
 .../GridCacheQueueApiSelfAbstractTest.java  |  18 +-
 .../GridCacheSetFailoverAbstractSelfTest.java   |   6 +-
 .../GridCachePartitionedQueueApiSelfTest.java   |   5 +
 ...dCachePartitionedQueueEntryMoveSelfTest.java |   2 +-
 .../IgnitePartitionedQueueNoBackupsTest.java|  92 +
 .../GridCacheReplicatedQueueApiSelfTest.java|   5 +
 .../GridCacheWriteBehindStoreAbstractTest.java  |   2 +-
 .../IgniteCacheDataStructuresSelfTestSuite.java |   3 +
 29 files changed, 778 insertions(+), 218 deletions(-)
--

[23/50] [abbrv] ignite git commit: ignite-2008 Added test reproducing issue.

[sboikov]

ignite-2008 Added test reproducing issue.


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

Branch: refs/heads/master
Commit: e7298adca37176956ffd93f1f01e32bef6626c12
Parents: bd99d1e
Author: sboikov 
Authored: Thu Dec 3 09:51:37 2015 +0300
Committer: sboikov 
Committed: Thu Dec 3 09:51:37 2015 +0300

--
 .../CacheLockReleaseNodeLeaveTest.java  | 110 +++
 1 file changed, 110 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/e7298adc/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLockReleaseNodeLeaveTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLockReleaseNodeLeaveTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLockReleaseNodeLeaveTest.java
new file mode 100644
index 000..956aaef
--- /dev/null
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLockReleaseNodeLeaveTest.java
@@ -0,0 +1,110 @@
+/*
+ * 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.internal.processors.cache.distributed;
+
+import java.util.concurrent.Callable;
+import java.util.concurrent.locks.Lock;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
+
+/**
+ *
+ */
+public class CacheLockReleaseNodeLeaveTest extends GridCommonAbstractTest {
+/** */
+private static final TcpDiscoveryIpFinder ipFinder = new 
TcpDiscoveryVmIpFinder(true);
+
+/** {@inheritDoc} */
+@Override protected IgniteConfiguration getConfiguration(String gridName) 
throws Exception {
+IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(ipFinder);
+
+CacheConfiguration ccfg = new CacheConfiguration();
+
+ccfg.setAtomicityMode(TRANSACTIONAL);
+
+cfg.setCacheConfiguration(ccfg);
+
+return cfg;
+}
+
+/** {@inheritDoc} */
+@Override protected void afterTest() throws Exception {
+stopAllGrids();
+
+super.afterTest();
+}
+
+/**
+ * @throws Exception If failed.
+ */
+public void testLockRelease() throws Exception {
+startGrids(2);
+
+final Ignite ignite0 = ignite(0);
+final Ignite ignite1 = ignite(1);
+
+final Integer key = primaryKey(ignite1.cache(null));
+
+IgniteInternalFuture fut1 = GridTestUtils.runAsync(new 
Callable() {
+@Override public Void call() throws Exception {
+Lock lock = ignite0.cache(null).lock(key);
+
+lock.lock();
+
+return null;
+}
+}, "lock-thread1");
+
+fut1.get();
+
+IgniteInternalFuture fut2 = GridTestUtils.runAsync(new 
Callable() {
+@Override public Void call() throws Exception {
+Lock lock = ignite1.cache(null).lock(key);
+
+log.info("Start lock.");
+
+lock.lock();
+
+log.info("Locked.");
+
+   

[47/50] [abbrv] ignite git commit: Printing "Failed to register marshalled class" warning in the versbose mode only

[sboikov]

Printing "Failed to register marshalled class" warning in the versbose mode only


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

Branch: refs/heads/master
Commit: 8033bc46df9087971e72187ff75557749cee3f7b
Parents: 3d585d5
Author: Denis Magda 
Authored: Sun Dec 6 11:38:17 2015 +0300
Committer: Denis Magda 
Committed: Sun Dec 6 11:38:17 2015 +0300

--
 .../org/apache/ignite/internal/MarshallerContextImpl.java | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/8033bc46/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
index 5c9b54f..276cdc3 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
@@ -123,10 +123,9 @@ public class MarshallerContextImpl extends 
MarshallerContextAdapter {
 }
 catch (CachePartialUpdateCheckedException | 
GridCacheTryPutFailedException e) {
 if (++failedCnt > 10) {
-String msg = "Failed to register marshalled class for more 
than 10 times in a row " +
-"(may affect performance).";
-
-U.quietAndWarn(log, msg, msg);
+if (log.isQuiet())
+U.quiet(false, "Failed to register marshalled class for 
more than 10 times in a row " +
+"(may affect performance).");
 
 failedCnt = 0;
 }

[35/50] [abbrv] ignite git commit: IGNITE-1270 Implement basic support for OSGi.

[sboikov]

IGNITE-1270 Implement basic support for OSGi.

* OSGi manifests for most modules.
* Apache Karaf features file to facilitate deployment (along with dependencies).
* Make Ignite classloading OSGi-friendly and support different strategies.
* Several integration tests with Pax Exam.
* POM restructuring to promote 3rd party dep versions to build params.


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

Branch: refs/heads/master
Commit: 96e0802775fe94e9ba77fab147129142b809e432
Parents: 5beed16
Author: Raul Kripalani 
Authored: Thu Dec 3 14:44:12 2015 +
Committer: Raul Kripalani 
Committed: Thu Dec 3 14:44:12 2015 +

--
 examples/pom.xml|   2 +-
 examples/schema-import/pom.xml  |   2 +-
 modules/aop/pom.xml |  12 +-
 modules/aws/pom.xml |  18 +-
 modules/camel/pom.xml   |  11 +-
 modules/core/pom.xml|  28 +-
 modules/flume/pom.xml   |  16 +-
 modules/geospatial/pom.xml  |  20 ++
 modules/hadoop/pom.xml  |   2 +-
 modules/hibernate/pom.xml   |  10 +-
 modules/indexing/pom.xml|  22 +-
 modules/jcl/pom.xml |  11 +
 modules/jms11/pom.xml   |  20 +-
 modules/jta/pom.xml |  17 +
 modules/kafka/pom.xml   |  16 +-
 modules/log4j/pom.xml   |  10 +
 modules/log4j2/pom.xml  |  11 +
 modules/mqtt/pom.xml|  24 +-
 modules/osgi-karaf/README.txt   |  18 +
 modules/osgi-karaf/licenses/apache-2.0.txt  | 202 
 modules/osgi-karaf/pom.xml  |  85 +
 .../osgi-karaf/src/main/resources/features.xml  | 327 +++
 modules/osgi-paxlogging/README.txt  |  12 +
 modules/osgi-paxlogging/licenses/apache-2.0.txt | 202 
 modules/osgi-paxlogging/pom.xml |  70 
 modules/osgi/README.txt |  65 
 modules/osgi/licenses/apache-2.0.txt| 202 
 modules/osgi/pom.xml| 171 ++
 .../IgniteAbstractOsgiContextActivator.java | 238 ++
 .../org/apache/ignite/osgi/IgniteOsgiUtils.java |  69 
 .../BundleDelegatingClassLoader.java| 147 +
 .../classloaders/ContainerSweepClassLoader.java | 134 
 .../OsgiClassLoadingStrategyType.java   |  29 ++
 .../ignite/osgi/AbstractIgniteKarafTest.java| 109 +++
 .../IgniteKarafFeaturesInstallationTest.java| 100 ++
 .../ignite/osgi/IgniteOsgiServiceTest.java  | 131 
 .../apache/ignite/osgi/IgniteOsgiTestSuite.java |  32 ++
 .../activators/BasicIgniteTestActivator.java|  76 +
 .../ignite/osgi/activators/TestOsgiFlags.java   |  53 +++
 .../osgi/activators/TestOsgiFlagsImpl.java  |  83 +
 modules/rest-http/pom.xml   |  34 +-
 modules/scalar-2.10/pom.xml |   9 +-
 modules/scalar/pom.xml  |   9 +-
 modules/schedule/pom.xml|  25 +-
 modules/schema-import/pom.xml   |   2 +-
 modules/slf4j/pom.xml   |  12 +-
 modules/spark-2.10/pom.xml  |   2 +-
 modules/spring/pom.xml  |  30 +-
 modules/ssh/pom.xml |  19 +-
 modules/twitter/pom.xml |  12 +-
 modules/urideploy/pom.xml   |  17 +-
 modules/visor-console-2.10/pom.xml  |   4 +-
 modules/visor-console/pom.xml   |   2 +-
 modules/visor-plugins/pom.xml   |   4 +-
 modules/web/pom.xml |  13 +-
 modules/zookeeper/pom.xml   |  14 +-
 parent/pom.xml  | 136 +++-
 pom.xml |   3 +
 58 files changed, 3079 insertions(+), 75 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/96e08027/examples/pom.xml
--
diff --git a/examples/pom.xml b/examples/pom.xml
index e7cd059..33c4f51 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -34,7 +34,7 @@
 
 javax.cache
 cache-api
-1.0.0
+${javax.cache.version}
 
 
 

[41/50] [abbrv] ignite git commit: Fixed IgniteTransactionalWriteInvokeBenchmark

[sboikov]

Fixed IgniteTransactionalWriteInvokeBenchmark


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

Branch: refs/heads/master
Commit: e5de23e9b61acc435ead4e70be9970a307906dbb
Parents: 11d668b
Author: ashutak 
Authored: Fri Dec 4 12:11:15 2015 +0300
Committer: ashutak 
Committed: Fri Dec 4 12:11:15 2015 +0300

--
 .../IgniteTransactionalWriteInvokeBenchmark.java| 16 +++-
 1 file changed, 7 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/e5de23e9/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalWriteInvokeBenchmark.java
--
diff --git 
a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalWriteInvokeBenchmark.java
 
b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalWriteInvokeBenchmark.java
index 9f9b5f7..35befad 100644
--- 
a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalWriteInvokeBenchmark.java
+++ 
b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalWriteInvokeBenchmark.java
@@ -68,17 +68,15 @@ public class IgniteTransactionalWriteInvokeBenchmark 
extends IgniteFailoverAbstr
 
 long start = System.nanoTime();
 
-if (cfg.memberId() == 0) {
-try (IgniteDataStreamer dataLdr = 
ignite().dataStreamer(cacheName())) {
-for (int k = 0; k < args.range() && 
!Thread.currentThread().isInterrupted(); k++) {
-dataLdr.addData("key-" + k + "-master", INITIAL_VALUE);
+try (IgniteDataStreamer dataLdr = 
ignite().dataStreamer(cacheName())) {
+for (int k = 0; k < args.range() && 
!Thread.currentThread().isInterrupted(); k++) {
+dataLdr.addData("key-" + k + "-master", INITIAL_VALUE);
 
-for (int i = 0; i < args.keysCount(); i++)
-dataLdr.addData("key-" + k + "-" + i, INITIAL_VALUE);
+for (int i = 0; i < args.keysCount(); i++)
+dataLdr.addData("key-" + k + "-" + i, INITIAL_VALUE);
 
-if (k % 10 == 0)
-println(cfg, "Populated accounts: " + k);
-}
+if (k % 10 == 0)
+println(cfg, "Populated accounts: " + k);
 }
 }
 

[20/50] [abbrv] ignite git commit: version fix

[sboikov]

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/master
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

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

[sboikov]

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

Conflicts:

modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java


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

Branch: refs/heads/master
Commit: 3fbf3e9544329210c5e59be3f3ada13ac51a4482
Parents: 357d791 11b4262
Author: Anton Vinogradov 
Authored: Mon Dec 7 13:52:27 2015 +0300
Committer: Anton Vinogradov 
Committed: Mon Dec 7 13:52:27 2015 +0300

--
 RELEASE_NOTES.txt   |   3 +
 examples/config/example-default.xml |   7 +
 examples/pom.xml|   7 +-
 examples/schema-import/pom.xml  |   4 +-
 .../store/auto/CacheBinaryAutoStoreExample.java | 158 
 .../datagrid/store/auto/package-info.java   |  22 ++
 .../store/auto/CacheAutoStoreExample.java   |  93 -
 .../auto/CacheAutoStoreLoadDataExample.java |  85 -
 .../datagrid/store/auto/CacheConfig.java|  81 
 .../datagrid/store/auto/DbH2ServerStartup.java  |  79 
 .../ignite/examples/util/DbH2ServerStartup.java |  79 
 .../ignite/examples/util/package-info.java  |  22 ++
 modules/aop/pom.xml |  14 +-
 modules/apache-license-gen/pom.xml  |   2 +-
 modules/aws/pom.xml |  20 +-
 modules/camel/pom.xml   |  16 +-
 modules/clients/pom.xml |   2 +-
 modules/cloud/pom.xml   |   2 +-
 modules/codegen/pom.xml |   2 +-
 modules/core/pom.xml|  30 +-
 .../store/jdbc/CacheAbstractJdbcStore.java  |  12 +-
 .../cache/store/jdbc/CacheJdbcPojoStore.java|   9 +
 .../configuration/IgniteConfiguration.java  |   4 +-
 .../org/apache/ignite/internal/IgnitionEx.java  |   4 +-
 .../ignite/internal/MarshallerContextImpl.java  |   7 +-
 .../GridDeploymentPerVersionStore.java  |  12 +-
 .../internal/portable/BinaryFieldAccessor.java  |  83 -
 .../internal/portable/BinaryReaderExImpl.java   |  13 +-
 .../internal/portable/BinaryWriterExImpl.java   |   5 +-
 .../internal/portable/PortableContext.java  |  34 +-
 .../CacheDefaultBinaryAffinityKeyMapper.java|  19 +-
 .../processors/cache/GridCacheAdapter.java  |   8 +-
 .../processors/cache/GridCacheContext.java  |  67 +++-
 .../GridCacheDefaultAffinityKeyMapper.java  |   9 +-
 .../processors/cache/GridCacheIoManager.java|   2 +-
 .../processors/cache/GridCacheMapEntry.java |   6 +-
 .../GridCachePartitionExchangeManager.java  |  40 +-
 .../processors/cache/GridCachePreloader.java|  16 +-
 .../cache/GridCachePreloaderAdapter.java|   7 +-
 .../processors/cache/GridCacheProcessor.java|  14 +-
 .../processors/cache/GridCacheProxyImpl.java|  12 +
 .../processors/cache/IgniteCacheProxy.java  |  24 ++
 .../processors/cache/IgniteInternalCache.java   |   9 +
 .../CacheDataStructuresManager.java |  31 +-
 .../distributed/dht/GridDhtLockFuture.java  |  17 +-
 .../dht/atomic/GridDhtAtomicCache.java  |  24 +-
 .../dht/preloader/GridDhtPartitionDemander.java |  71 ++--
 .../GridDhtPartitionsExchangeFuture.java|   9 +-
 .../dht/preloader/GridDhtPreloader.java |  31 +-
 .../preloader/GridDhtPreloaderAssignments.java  |  19 +-
 .../distributed/near/GridNearGetFuture.java |  12 +-
 .../CacheObjectBinaryProcessorImpl.java |  15 +-
 .../cache/query/GridCacheQueryManager.java  |  12 +-
 .../cache/transactions/IgniteTxHandler.java |   2 +-
 .../transactions/IgniteTxLocalAdapter.java  |  11 +-
 .../datastructures/CollocatedQueueItemKey.java  |  75 
 .../datastructures/CollocatedSetItemKey.java|  87 +
 .../datastructures/DataStructuresProcessor.java |   7 +-
 .../GridAtomicCacheQueueImpl.java   |   8 +-
 .../datastructures/GridCacheQueueAdapter.java   |  30 +-
 .../datastructures/GridCacheQueueItemKey.java   |   9 +-
 .../datastructures/GridCacheSetImpl.java|  37 +-
 .../datastructures/GridCacheSetItemKey.java |  21 +-
 .../GridTransactionalCacheQueueImpl.java|   2 +-
 .../processors/datastructures/QueueItemKey.java |  27 ++
 .../processors/datastructures/SetItemKey.java   |  36 ++
 .../handlers/query/QueryCommandHandler.java |   8 +-
 .../ignite/internal/util/IgniteUtils.java   |   8 +
 .../communication/tcp/TcpCommunicationSpi.java  |  18 +-
 .../spi/discovery/tcp/TcpDiscoverySpi.java  |   2 -
 .../core/src/main/resources/ignite.properties   |   2 +-
 

[28/50] [abbrv] ignite git commit: IGNITE-2074 Platforms C++ files have 1.5.0-EA version

[sboikov]

IGNITE-2074 Platforms C++ files have 1.5.0-EA version

Signed-off-by: Anton Vinogradov 


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

Branch: refs/heads/master
Commit: 86ec37e5e7bb6302ebff35fecb5576206adc1e1a
Parents: ad9e4db
Author: Pavel Tupitsyn 
Authored: Thu Dec 3 12:45:29 2015 +0300
Committer: Anton Vinogradov 
Committed: Thu Dec 3 14:48:00 2015 +0300

--
 pom.xml | 41 +
 1 file changed, 29 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/86ec37e5/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 109dc94..5f86648 100644
--- a/pom.xml
+++ b/pom.xml
@@ -774,20 +774,37 @@
 
 

[14/50] [abbrv] ignite git commit: ignite-1.5 Skip message send on node stop.

[sboikov]

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/master
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();

[22/50] [abbrv] ignite git commit: Adding property to control compact footer flag.

[sboikov]

Adding property to control compact footer flag.


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

Branch: refs/heads/master
Commit: bd99d1ea7fa58aac1fb2e4195b97a673b111ed9d
Parents: c4d29f9
Author: Alexey Goncharuk 
Authored: Wed Dec 2 19:35:42 2015 +0300
Committer: Alexey Goncharuk 
Committed: Wed Dec 2 19:35:42 2015 +0300

--
 .../testframework/config/GridTestProperties.java |  3 +++
 .../testframework/junits/GridAbstractTest.java   | 15 +++
 2 files changed, 18 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/bd99d1ea/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java
 
b/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java
index 2005c4c..1ea8c38 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java
@@ -72,6 +72,9 @@ public final class GridTestProperties {
 /** */
 public static final String MARSH_CLASS_NAME = "marshaller.class";
 
+/** Binary marshaller compact footers property. */
+public static final String BINARY_COMPACT_FOOTERS = 
"binary.marshaller.compact.footers";
+
 /** */
 static {
 // Initialize IGNITE_HOME system property.

http://git-wip-us.apache.org/repos/asf/ignite/blob/bd99d1ea/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
 
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
index afb6141..95661cb 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
@@ -51,6 +51,7 @@ import org.apache.ignite.IgniteLogger;
 import org.apache.ignite.IgniteSystemProperties;
 import org.apache.ignite.Ignition;
 import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.BinaryConfiguration;
 import org.apache.ignite.configuration.CacheConfiguration;
 import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.configuration.NearCacheConfiguration;
@@ -1117,6 +1118,20 @@ public abstract class GridAbstractTest extends TestCase {
 
 cfg.setNodeId(null);
 
+if 
(GridTestProperties.getProperty(GridTestProperties.BINARY_COMPACT_FOOTERS) != 
null) {
+if 
(!Boolean.valueOf(GridTestProperties.getProperty(GridTestProperties.BINARY_COMPACT_FOOTERS)))
 {
+BinaryConfiguration bCfg = cfg.getBinaryConfiguration();
+
+if (bCfg == null) {
+bCfg = new BinaryConfiguration();
+
+cfg.setBinaryConfiguration(bCfg);
+}
+
+bCfg.setCompactFooter(false);
+}
+}
+
 if (gridName != null && gridName.matches(".*\\d")) {
 String idStr = UUID.randomUUID().toString();
 

[34/50] [abbrv] ignite git commit: IGNITE-1270 Implement basic support for OSGi.

[sboikov]

http://git-wip-us.apache.org/repos/asf/ignite/blob/96e08027/modules/osgi/licenses/apache-2.0.txt
--
diff --git a/modules/osgi/licenses/apache-2.0.txt 
b/modules/osgi/licenses/apache-2.0.txt
new file mode 100644
index 000..d645695
--- /dev/null
+++ b/modules/osgi/licenses/apache-2.0.txt
@@ -0,0 +1,202 @@
+
+ Apache License
+   Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+  "License" shall mean the terms and conditions for use, reproduction,
+  and distribution as defined by Sections 1 through 9 of this document.
+
+  "Licensor" shall mean the copyright owner or entity authorized by
+  the copyright owner that is granting the License.
+
+  "Legal Entity" shall mean the union of the acting entity and all
+  other entities that control, are controlled by, or are under common
+  control with that entity. For the purposes of this definition,
+  "control" means (i) the power, direct or indirect, to cause the
+  direction or management of such entity, whether by contract or
+  otherwise, or (ii) ownership of fifty percent (50%) or more of the
+  outstanding shares, or (iii) beneficial ownership of such entity.
+
+  "You" (or "Your") shall mean an individual or Legal Entity
+  exercising permissions granted by this License.
+
+  "Source" form shall mean the preferred form for making modifications,
+  including but not limited to software source code, documentation
+  source, and configuration files.
+
+  "Object" form shall mean any form resulting from mechanical
+  transformation or translation of a Source form, including but
+  not limited to compiled object code, generated documentation,
+  and conversions to other media types.
+
+  "Work" shall mean the work of authorship, whether in Source or
+  Object form, made available under the License, as indicated by a
+  copyright notice that is included in or attached to the work
+  (an example is provided in the Appendix below).
+
+  "Derivative Works" shall mean any work, whether in Source or Object
+  form, that is based on (or derived from) the Work and for which the
+  editorial revisions, annotations, elaborations, or other modifications
+  represent, as a whole, an original work of authorship. For the purposes
+  of this License, Derivative Works shall not include works that remain
+  separable from, or merely link (or bind by name) to the interfaces of,
+  the Work and Derivative Works thereof.
+
+  "Contribution" shall mean any work of authorship, including
+  the original version of the Work and any modifications or additions
+  to that Work or Derivative Works thereof, that is intentionally
+  submitted to Licensor for inclusion in the Work by the copyright owner
+  or by an individual or Legal Entity authorized to submit on behalf of
+  the copyright owner. For the purposes of this definition, "submitted"
+  means any form of electronic, verbal, or written communication sent
+  to the Licensor or its representatives, including but not limited to
+  communication on electronic mailing lists, source code control systems,
+  and issue tracking systems that are managed by, or on behalf of, the
+  Licensor for the purpose of discussing and improving the Work, but
+  excluding communication that is conspicuously marked or otherwise
+  designated in writing by the copyright owner as "Not a Contribution."
+
+  "Contributor" shall mean Licensor and any individual or Legal Entity
+  on behalf of whom a Contribution has been received by Licensor and
+  subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+  this License, each Contributor hereby grants to You a perpetual,
+  worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+  copyright license to reproduce, prepare Derivative Works of,
+  publicly display, publicly perform, sublicense, and distribute the
+  Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+  this License, each Contributor hereby grants to You a perpetual,
+  worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+  (except as stated in this section) patent license to make, have made,
+  use, offer to sell, sell, import, and otherwise transfer the Work,
+  where such license applies only to those patent claims licensable
+  by such Contributor that are necessarily infringed by their
+  Contribution(s) alone or by combination of their Contribution(s)
+  with the Work to which such Contribution(s) 

[46/50] [abbrv] ignite git commit: IGNITE-2041 Fixed typo.

[sboikov]

IGNITE-2041 Fixed typo.


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

Branch: refs/heads/master
Commit: 3d585d5a5d3ccc5c3071d7547a19cf055bd9ce83
Parents: 23ead50
Author: AKuznetsov 
Authored: Sat Dec 5 16:57:53 2015 +0700
Committer: AKuznetsov 
Committed: Sat Dec 5 16:57:53 2015 +0700

--
 .../binary/datagrid/store/auto/CacheBinaryAutoStoreExample.java| 2 +-
 .../ignite/examples/datagrid/store/auto/CacheAutoStoreExample.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/3d585d5a/examples/src/main/java/org/apache/ignite/examples/binary/datagrid/store/auto/CacheBinaryAutoStoreExample.java
--
diff --git 
a/examples/src/main/java/org/apache/ignite/examples/binary/datagrid/store/auto/CacheBinaryAutoStoreExample.java
 
b/examples/src/main/java/org/apache/ignite/examples/binary/datagrid/store/auto/CacheBinaryAutoStoreExample.java
index 9df9f79..63d947c 100644
--- 
a/examples/src/main/java/org/apache/ignite/examples/binary/datagrid/store/auto/CacheBinaryAutoStoreExample.java
+++ 
b/examples/src/main/java/org/apache/ignite/examples/binary/datagrid/store/auto/CacheBinaryAutoStoreExample.java
@@ -138,7 +138,7 @@ public class CacheBinaryAutoStoreExample {
 cache.clear();
 
 System.out.println(">>> 
--");
-System.out.println(">>> Load data to cache from DB with cusom 
SQL...");
+System.out.println(">>> Load data to cache from DB with custom 
SQL...");
 
 // Load cache on all data nodes with custom SQL statement.
 cache.loadCache(null, "java.lang.Long", "select * from PERSON 
where id <= 3");

http://git-wip-us.apache.org/repos/asf/ignite/blob/3d585d5a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/auto/CacheAutoStoreExample.java
--
diff --git 
a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/auto/CacheAutoStoreExample.java
 
b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/auto/CacheAutoStoreExample.java
index a262c38..5498e57 100644
--- 
a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/auto/CacheAutoStoreExample.java
+++ 
b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/auto/CacheAutoStoreExample.java
@@ -143,7 +143,7 @@ public class CacheAutoStoreExample {
 cache.clear();
 
 System.out.println(">>> 
--");
-System.out.println(">>> Load data to cache from DB with cusom 
SQL...");
+System.out.println(">>> Load data to cache from DB with custom 
SQL...");
 
 // Load cache on all data nodes with custom SQL statement.
 cache.loadCache(null, "java.lang.Long", "select * from PERSON 
where id <= 3");

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

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/master 357d79135 -> 3fbf3e954


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/master
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(-)
--

[08/50] [abbrv] 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/master
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(+)
--

[02/50] [abbrv] ignite git commit: minor

[sboikov]

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/master
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;

[03/50] [abbrv] ignite git commit: 1.5.0-EA-SNAPSHOT

[sboikov]

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/master
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 files 

[07/50] [abbrv] 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/master
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 

[27/50] [abbrv] ignite git commit: ignite-1027 Fixed early rebalance sync future completion.

[sboikov]

ignite-1027 Fixed early rebalance sync future completion.


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

Branch: refs/heads/master
Commit: ad9e4db5b87b064d13db4f9251c25efd535fb9e8
Parents: 9b60c75
Author: sboikov 
Authored: Thu Dec 3 10:45:30 2015 +0300
Committer: sboikov 
Committed: Thu Dec 3 10:45:30 2015 +0300

--
 .../GridCachePartitionExchangeManager.java  | 17 ++--
 .../processors/cache/GridCachePreloader.java| 11 ++-
 .../dht/preloader/GridDhtPartitionDemander.java | 41 
 .../dht/preloader/GridDhtPreloader.java |  4 +-
 .../preloader/GridDhtPreloaderAssignments.java  | 19 +++-
 .../dht/GridCacheDhtPreloadDelayedSelfTest.java | 37 +---
 ...cingDelayedPartitionMapExchangeSelfTest.java |  9 +-
 .../GridCacheRebalancingAsyncSelfTest.java  |  3 +-
 .../GridCacheRebalancingSyncCheckDataTest.java  | 98 
 .../GridCacheRebalancingSyncSelfTest.java   | 55 +--
 ...eRebalancingUnmarshallingFailedSelfTest.java |  6 +-
 .../testsuites/IgniteCacheTestSuite3.java   |  2 +
 12 files changed, 223 insertions(+), 79 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/ad9e4db5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
index b13a5af..a0f7f93 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
@@ -1399,8 +1399,10 @@ public class GridCachePartitionExchangeManager 
extends GridCacheSharedMana
 
waitList.add(cctx.cacheContext(cId).name());
 }
 
-Callable r = 
cacheCtx.preloader().addAssignments(
-assignsMap.get(cacheId), forcePreload, 
waitList, cnt);
+Callable r = 
cacheCtx.preloader().addAssignments(assignsMap.get(cacheId),
+forcePreload,
+waitList,
+cnt);
 
 if (r != null) {
 U.log(log, "Cache rebalancing scheduled: 
[cache=" + cacheCtx.name() +
@@ -1425,7 +1427,7 @@ public class GridCachePartitionExchangeManager 
extends GridCacheSharedMana
 "[top=" + exchFut.topologyVersion() + ", 
evt=" + exchFut.discoveryEvent().name() +
 ", node=" + 
exchFut.discoveryEvent().eventNode().id() + ']');
 
-if (marshR != null)
+if (marshR != null) {
 try {
 marshR.call(); //Marshaller cache 
rebalancing launches in sync way.
 }
@@ -1435,6 +1437,7 @@ public class GridCachePartitionExchangeManager 
extends GridCacheSharedMana
 
 continue;
 }
+}
 
 final GridFutureAdapter fut = new 
GridFutureAdapter();
 
@@ -1463,17 +1466,19 @@ public class GridCachePartitionExchangeManager 
extends GridCacheSharedMana
 fut.onDone();
 }
 }
-}, /*system pool*/ true);
+}, /*system pool*/true);
 }
-else
+else {
 U.log(log, "Skipping rebalancing (obsolete 
exchange ID) " +
 "[top=" + exchFut.topologyVersion() + ", 
evt=" + exchFut.discoveryEvent().name() +
 ", node=" + 
exchFut.discoveryEvent().eventNode().id() + ']');
+}
 }
-else
+else {
 U.log(log, "Skipping rebalancing (nothing 
scheduled) " +

[36/50] [abbrv] ignite git commit: IGNITE-1270 Update version number of OSGi modules to 1.5.0-b1-SNAPSHOT. Adjust test that assumed major.minor.micro to take into account qualifier.

[sboikov]

IGNITE-1270 Update version number of OSGi modules to 1.5.0-b1-SNAPSHOT.
Adjust test that assumed major.minor.micro to take into account qualifier.


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

Branch: refs/heads/master
Commit: 4ba911f0a4dfbfffd8bef019dcbaa284c5d98bf3
Parents: 96e0802
Author: Raul Kripalani 
Authored: Thu Dec 3 14:46:23 2015 +
Committer: Raul Kripalani 
Committed: Thu Dec 3 15:00:58 2015 +

--
 modules/osgi-karaf/pom.xml| 3 +--
 modules/osgi-paxlogging/pom.xml   | 3 +--
 modules/osgi/pom.xml  | 2 +-
 .../apache/ignite/osgi/IgniteKarafFeaturesInstallationTest.java   | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/4ba911f0/modules/osgi-karaf/pom.xml
--
diff --git a/modules/osgi-karaf/pom.xml b/modules/osgi-karaf/pom.xml
index f1ac66b..e1f53e2 100644
--- a/modules/osgi-karaf/pom.xml
+++ b/modules/osgi-karaf/pom.xml
@@ -31,9 +31,8 @@
 ../../parent
 
 
-org.apache.ignite
 ignite-osgi-karaf
-1.5.0-SNAPSHOT
+1.5.0-b1-SNAPSHOT
 pom
 
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/4ba911f0/modules/osgi-paxlogging/pom.xml
--
diff --git a/modules/osgi-paxlogging/pom.xml b/modules/osgi-paxlogging/pom.xml
index bd9e18e..15a5e0c 100644
--- a/modules/osgi-paxlogging/pom.xml
+++ b/modules/osgi-paxlogging/pom.xml
@@ -32,9 +32,8 @@
 ../../parent
 
 
-org.apache.ignite
 ignite-osgi-paxlogging
-1.5.0-SNAPSHOT
+1.5.0-b1-SNAPSHOT
 jar
 
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/4ba911f0/modules/osgi/pom.xml
--
diff --git a/modules/osgi/pom.xml b/modules/osgi/pom.xml
index d6d46bf..47c7928 100644
--- a/modules/osgi/pom.xml
+++ b/modules/osgi/pom.xml
@@ -32,7 +32,7 @@
 
 
 ignite-osgi
-1.5.0-SNAPSHOT
+1.5.0-b1-SNAPSHOT
 http://ignite.apache.org
 
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/4ba911f0/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteKarafFeaturesInstallationTest.java
--
diff --git 
a/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteKarafFeaturesInstallationTest.java
 
b/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteKarafFeaturesInstallationTest.java
index c0eb06b..112a607 100644
--- 
a/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteKarafFeaturesInstallationTest.java
+++ 
b/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteKarafFeaturesInstallationTest.java
@@ -87,7 +87,7 @@ public class IgniteKarafFeaturesInstallationTest extends 
AbstractIgniteKarafTest
 f.getName(), installed));
 
 assertTrue(installed);
-assertEquals(PROJECT_VERSION.replaceAll("-", "."), f.getVersion());
+assertEquals(PROJECT_VERSION.replaceAll("-", "."), 
f.getVersion().replaceAll("-", "."));
 }
 }
 

[26/50] [abbrv] 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/9b60c75c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9b60c75c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9b60c75c

Branch: refs/heads/master
Commit: 9b60c75c62d2e352a4a65b7c5a0b17bc79499ba8
Parents: f770954 ae40e2d
Author: sboikov 
Authored: Thu Dec 3 10:42:50 2015 +0300
Committer: sboikov 
Committed: Thu Dec 3 10:42:50 2015 +0300

--
 .../org/apache/ignite/configuration/IgniteConfiguration.java| 4 ++--
 .../cache/GridCacheMultinodeUpdateNearEnabledSelfTest.java  | 5 +
 2 files changed, 7 insertions(+), 2 deletions(-)
--

[06/50] [abbrv] 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/master
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.

[11/50] [abbrv] ignite git commit: ignite-1.5 Correction for commit 59f3726.

[sboikov]

ignite-1.5 Correction for commit 59f3726.


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

Branch: refs/heads/master
Commit: c850ae474e1d60bf4e927206b580af19e7f208bb
Parents: e11e4cb
Author: sboikov 
Authored: Tue Dec 1 14:17:59 2015 +0300
Committer: sboikov 
Committed: Tue Dec 1 14:17:59 2015 +0300

--
 .../apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/c850ae47/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 e5885a6..09e4877 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
@@ -360,7 +360,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
 clients.remove(id, rmv)) {
 rmv.forceClose();
 
-if (!isNodeStopping()) {
+if (!stopping) {
 GridNioRecoveryDescriptor recoveryData = 
ses.recoveryDescriptor();
 
 if (recoveryData != null) {
@@ -1761,7 +1761,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
 
 /** {@inheritDoc} */
 @Override public void spiStop() throws IgniteSpiException {
-assert isNodeStopping();
+assert stopping;
 
 unregisterMBean();
 

[37/50] [abbrv] ignite git commit: Fixed failover tests for binary marshaller

[sboikov]

Fixed failover tests for binary marshaller


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

Branch: refs/heads/master
Commit: 171e9b172564bcaafd54532abbce3b16c7ffbc65
Parents: 4ba911f
Author: ashutak 
Authored: Thu Dec 3 18:15:40 2015 +0300
Committer: ashutak 
Committed: Thu Dec 3 18:15:40 2015 +0300

--
 .../failover/IgniteTransactionalInvokeRetryBenchmark.java  | 4 ++--
 .../failover/IgniteTransactionalWriteInvokeBenchmark.java  | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/171e9b17/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalInvokeRetryBenchmark.java
--
diff --git 
a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalInvokeRetryBenchmark.java
 
b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalInvokeRetryBenchmark.java
index 16b0959..b5a08da 100644
--- 
a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalInvokeRetryBenchmark.java
+++ 
b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalInvokeRetryBenchmark.java
@@ -169,7 +169,7 @@ public class IgniteTransactionalInvokeRetryBenchmark 
extends IgniteFailoverAbstr
 if (ex != null)
 throw ex;
 
-asyncCache.invoke(key, new IncrementCacheEntryProcessor());
+asyncCache.invoke(key, new 
IncrementInvokeRetryCacheEntryProcessor());
 asyncCache.future().get(args.cacheOperationTimeoutMillis());
 
 AtomicLong prevVal = map.putIfAbsent(key, new AtomicLong(0));
@@ -195,7 +195,7 @@ public class IgniteTransactionalInvokeRetryBenchmark 
extends IgniteFailoverAbstr
 
 /**
  */
-private static class IncrementCacheEntryProcessor implements 
CacheEntryProcessor {
+private static class IncrementInvokeRetryCacheEntryProcessor implements 
CacheEntryProcessor {
 /** */
 private static final long serialVersionUID = 0;
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/171e9b17/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalWriteInvokeBenchmark.java
--
diff --git 
a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalWriteInvokeBenchmark.java
 
b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalWriteInvokeBenchmark.java
index a52ea78..9f9b5f7 100644
--- 
a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalWriteInvokeBenchmark.java
+++ 
b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalWriteInvokeBenchmark.java
@@ -123,7 +123,7 @@ public class IgniteTransactionalWriteInvokeBenchmark 
extends IgniteFailoverAbstr
 Set values = new HashSet<>(map.values());
 
 if (values.size() != 1)
-throw new IgniteConsistencyException("Found 
different values for keys [map="+map+"]");
+throw new IgniteConsistencyException("Found 
different values for keys [map=" + map + "]");
 
 break;
 case 1: // Invoke scenario.
@@ -137,7 +137,7 @@ public class IgniteTransactionalWriteInvokeBenchmark 
extends IgniteFailoverAbstr
 asyncCache.future().get(timeout);
 
 for (String key : keys) {
-asyncCache.invoke(key, new 
IncrementCacheEntryProcessor(), cacheName());
+asyncCache.invoke(key, new 
IncrementWriteInvokeCacheEntryProcessor(), cacheName());
 Object o = asyncCache.future().get(timeout);
 
 if (o != null)
@@ -165,7 +165,7 @@ public class IgniteTransactionalWriteInvokeBenchmark 
extends IgniteFailoverAbstr
 
 /**
  */
-private static class IncrementCacheEntryProcessor implements 
CacheEntryProcessor {
+private static class IncrementWriteInvokeCacheEntryProcessor implements 
CacheEntryProcessor {
 /** */
 private static final long serialVersionUID = 0;
 

[30/50] [abbrv] ignite git commit: ignite-2042 Added special queue/set key classes to make collocation work with BinaryMarshaller. Also fixed issue with 'invoke' result with binary marshaller.

[sboikov]

ignite-2042 Added special queue/set key classes to make collocation work with 
BinaryMarshaller. Also fixed issue with 'invoke' result with binary marshaller.


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

Branch: refs/heads/master
Commit: 50f6c0131fd761f6231e7c2632a010c093000e70
Parents: 86ec37e
Author: sboikov 
Authored: Thu Dec 3 16:50:00 2015 +0300
Committer: sboikov 
Committed: Thu Dec 3 16:50:00 2015 +0300

--
 .../internal/portable/BinaryReaderExImpl.java   |   2 +-
 .../internal/portable/PortableContext.java  |  34 +-
 .../processors/cache/GridCacheContext.java  |  30 ++
 .../CacheDataStructuresManager.java |  31 +-
 .../dht/atomic/GridDhtAtomicCache.java  |  20 +-
 .../CacheObjectBinaryProcessorImpl.java |   8 +
 .../cache/query/GridCacheQueryManager.java  |  12 +-
 .../transactions/IgniteTxLocalAdapter.java  |  11 +-
 .../datastructures/CollocatedQueueItemKey.java  |  75 
 .../datastructures/CollocatedSetItemKey.java|  87 +
 .../datastructures/DataStructuresProcessor.java |   7 +-
 .../GridAtomicCacheQueueImpl.java   |   8 +-
 .../datastructures/GridCacheQueueAdapter.java   |  30 +-
 .../datastructures/GridCacheQueueItemKey.java   |   9 +-
 .../datastructures/GridCacheSetImpl.java|  37 +-
 .../datastructures/GridCacheSetItemKey.java |  21 +-
 .../GridTransactionalCacheQueueImpl.java|   2 +-
 .../processors/datastructures/QueueItemKey.java |  27 ++
 .../processors/datastructures/SetItemKey.java   |  36 ++
 .../cache/IgniteCacheInvokeAbstractTest.java| 369 ++-
 ...eAbstractDataStructuresFailoverSelfTest.java |   7 +-
 .../GridCacheQueueApiSelfAbstractTest.java  |  18 +-
 .../GridCacheSetFailoverAbstractSelfTest.java   |   6 +-
 .../GridCachePartitionedQueueApiSelfTest.java   |   5 +
 ...dCachePartitionedQueueEntryMoveSelfTest.java |   2 +-
 .../IgnitePartitionedQueueNoBackupsTest.java|  92 +
 .../GridCacheReplicatedQueueApiSelfTest.java|   5 +
 .../GridCacheWriteBehindStoreAbstractTest.java  |   2 +-
 .../IgniteCacheDataStructuresSelfTestSuite.java |   3 +
 29 files changed, 778 insertions(+), 218 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/50f6c013/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryReaderExImpl.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryReaderExImpl.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryReaderExImpl.java
index ddbf6ba..91b67f6 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryReaderExImpl.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryReaderExImpl.java
@@ -246,7 +246,7 @@ public class BinaryReaderExImpl implements BinaryReader, 
BinaryRawReaderEx, Bina
 dataStart = start + DFLT_HDR_LEN;
 }
 
-idMapper = userType ? ctx.userTypeIdMapper(typeId) : null;
+idMapper = userType ? ctx.userTypeIdMapper(typeId) : 
BinaryInternalIdMapper.defaultInstance();
 schema = PortableUtils.hasSchema(flags) ? getOrCreateSchema() : 
null;
 }
 else {

http://git-wip-us.apache.org/repos/asf/ignite/blob/50f6c013/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java
index 1482df9..fd6c41d 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java
@@ -66,6 +66,8 @@ import org.apache.ignite.binary.BinarySerializer;
 import org.apache.ignite.internal.IgniteKernal;
 import org.apache.ignite.internal.IgnitionEx;
 import 
org.apache.ignite.internal.processors.cache.portable.CacheObjectBinaryProcessorImpl;
+import 
org.apache.ignite.internal.processors.datastructures.CollocatedQueueItemKey;
+import 
org.apache.ignite.internal.processors.datastructures.CollocatedSetItemKey;
 import org.apache.ignite.internal.util.IgniteUtils;
 import org.apache.ignite.internal.util.lang.GridMapEntry;
 import org.apache.ignite.internal.util.typedef.F;
@@ -233,7 +235,8 @@ public class PortableContext implements Externalizable {
 
 /**
  * @param marsh Portable 

[29/50] [abbrv] ignite git commit: ignite-2042 Added special queue/set key classes to make collocation work with BinaryMarshaller. Also fixed issue with 'invoke' result with binary marshaller.

[sboikov]

http://git-wip-us.apache.org/repos/asf/ignite/blob/50f6c013/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java
 
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java
index c44455f..519d3c1 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java
@@ -65,6 +65,7 @@ import 
org.apache.ignite.internal.processors.cache.datastructures.partitioned.Gr
 import 
org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedSetSelfTest;
 import 
org.apache.ignite.internal.processors.cache.datastructures.partitioned.IgnitePartitionedAtomicLongApiSelfTest;
 import 
org.apache.ignite.internal.processors.cache.datastructures.partitioned.IgnitePartitionedCountDownLatchSelfTest;
+import 
org.apache.ignite.internal.processors.cache.datastructures.partitioned.IgnitePartitionedQueueNoBackupsTest;
 import 
org.apache.ignite.internal.processors.cache.datastructures.partitioned.IgnitePartitionedSetNoBackupsSelfTest;
 import 
org.apache.ignite.internal.processors.cache.datastructures.replicated.GridCacheReplicatedAtomicReferenceApiSelfTest;
 import 
org.apache.ignite.internal.processors.cache.datastructures.replicated.GridCacheReplicatedAtomicStampedApiSelfTest;
@@ -165,6 +166,8 @@ public class IgniteCacheDataStructuresSelfTestSuite extends 
TestSuite {
 suite.addTest(new TestSuite(IgniteClientDataStructuresTest.class));
 suite.addTest(new 
TestSuite(IgniteClientDiscoveryDataStructuresTest.class));
 
+suite.addTest(new 
TestSuite(IgnitePartitionedQueueNoBackupsTest.class));
+
 return suite;
 }
 }
\ No newline at end of file

[04/50] [abbrv] 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/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/master
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 
b/modules/platforms/cpp/ignite/configure.ac
index 41d944c..70b5c82 100644
--- a/modules/platforms/cpp/ignite/configure.ac
+++ 

[39/50] [abbrv] ignite git commit: IGNITE-1947 More info about why query was not found in error message.

[sboikov]

IGNITE-1947 More info about why query was not found in error message.


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

Branch: refs/heads/master
Commit: e6f6f407ef4f0c3555fd80fe5ba328739d94e3f0
Parents: baab3d2
Author: Alexey Kuznetsov 
Authored: Fri Dec 4 15:14:49 2015 +0700
Committer: Alexey Kuznetsov 
Committed: Fri Dec 4 15:14:49 2015 +0700

--
 .../processors/rest/handlers/query/QueryCommandHandler.java| 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/e6f6f407/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 bb929a4..0c44077 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
@@ -443,14 +443,16 @@ public class QueryCommandHandler extends 
GridRestCommandHandlerAdapter {
 
 if (qryCurIt == null)
 return new GridRestResponse(GridRestResponse.STATUS_FAILED,
-"Failed to find query with ID: " + req.queryId());
+"Failed to find query with ID: " + req.queryId() + ". 
" +
+"Possible reasons: wrong query ID, no more data to 
fetch from query, query was closed by timeout" +
+" or node where query was executed is not found.");
 
 qryCurIt.lock();
 
 try {
 if (qryCurIt.timestamp() == -1)
 return new 
GridRestResponse(GridRestResponse.STATUS_FAILED,
-"Query is closed by timeout. Restart query with 
ID: " + req.queryId());
+"Query with ID: " + req.queryId() + " was closed 
by timeout");
 
 qryCurIt.timestamp(U.currentTimeMillis());
 

[49/50] [abbrv] ignite git commit: 2064 Test hotfix

[sboikov]

2064 Test hotfix

Signed-off-by: Anton Vinogradov 


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

Branch: refs/heads/master
Commit: 11b426297cffcb98b6dd374cfc88184b2b04246f
Parents: 233231d
Author: Anton Vinogradov 
Authored: Fri Dec 4 19:34:46 2015 +0300
Committer: Anton Vinogradov 
Committed: Mon Dec 7 13:08:39 2015 +0300

--
 .../cache/GridCacheAtomicEntryProcessorDeploymentSelfTest.java | 6 +-
 .../apache/ignite/testframework/config/GridTestProperties.java | 3 +++
 .../ignite/testsuites/IgniteBinaryObjectsCacheTestSuite3.java  | 2 ++
 3 files changed, 10 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/11b42629/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicEntryProcessorDeploymentSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicEntryProcessorDeploymentSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicEntryProcessorDeploymentSelfTest.java
index 0873d2d..35ee6cc 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicEntryProcessorDeploymentSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicEntryProcessorDeploymentSelfTest.java
@@ -30,6 +30,7 @@ import org.apache.ignite.configuration.NearCacheConfiguration;
 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.config.GridTestProperties;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
@@ -45,7 +46,10 @@ public class GridCacheAtomicEntryProcessorDeploymentSelfTest 
extends GridCommonA
 private static final TcpDiscoveryIpFinder IP_FINDER = new 
TcpDiscoveryVmIpFinder(true);
 
 /** Entry processor */
-protected static String TEST_ENT_PROCESSOR = 
"org.apache.ignite.tests.p2p.CacheDeploymentEntryProcessor";
+protected static String TEST_ENT_PROCESSOR =
+
GridTestProperties.getProperty(GridTestProperties.ENTRY_PROCESSOR_CLASS_NAME) 
!= null ?
+
GridTestProperties.getProperty(GridTestProperties.ENTRY_PROCESSOR_CLASS_NAME) :
+"org.apache.ignite.tests.p2p.CacheDeploymentEntryProcessor";
 
 /** Test value. */
 protected static String TEST_VALUE = 
"org.apache.ignite.tests.p2p.CacheDeploymentTestValue";

http://git-wip-us.apache.org/repos/asf/ignite/blob/11b42629/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java
 
b/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java
index 1ea8c38..491f38f 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java
@@ -72,6 +72,9 @@ public final class GridTestProperties {
 /** */
 public static final String MARSH_CLASS_NAME = "marshaller.class";
 
+/** */
+public static final String ENTRY_PROCESSOR_CLASS_NAME = 
"entry.processor.class";
+
 /** Binary marshaller compact footers property. */
 public static final String BINARY_COMPACT_FOOTERS = 
"binary.marshaller.compact.footers";
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/11b42629/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsCacheTestSuite3.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsCacheTestSuite3.java
 
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsCacheTestSuite3.java
index 2778c97..3d25645 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsCacheTestSuite3.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsCacheTestSuite3.java
@@ -31,6 +31,8 @@ public class IgniteBinaryObjectsCacheTestSuite3 {
  */
 public static TestSuite suite() throws Exception {
 

[21/50] [abbrv] ignite git commit: minor

[sboikov]

minor


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

Branch: refs/heads/master
Commit: c4d29f987939f114f54a0d2cbf5837e1066015d4
Parents: 3ac1504
Author: Yakov Zhdanov 
Authored: Wed Dec 2 18:02:05 2015 +0300
Committer: Yakov Zhdanov 
Committed: Wed Dec 2 18:02:05 2015 +0300

--
 .../org/apache/ignite/internal/portable/BinaryWriterExImpl.java | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/c4d29f98/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryWriterExImpl.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryWriterExImpl.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryWriterExImpl.java
index 95807ea..59632f1 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryWriterExImpl.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryWriterExImpl.java
@@ -317,7 +317,7 @@ public class BinaryWriterExImpl implements BinaryWriter, 
BinaryRawWriterEx, Obje
 flags |= PortableUtils.FLAG_OFFSET_ONE_BYTE;
 else if (offsetByteCnt == PortableUtils.OFFSET_2)
 flags |= PortableUtils.FLAG_OFFSET_TWO_BYTES;
-
+
 // Write raw offset if needed.
 if (rawOffPos != 0) {
 flags |= PortableUtils.FLAG_HAS_RAW;
@@ -1806,9 +1806,6 @@ public class BinaryWriterExImpl implements BinaryWriter, 
BinaryRawWriterEx, Obje
 out.unsafeWriteByte(GridPortableMarshaller.HANDLE);
 out.unsafeWriteInt(pos - old);
 
-if (obj.getClass().isArray())
-System.out.println("CASE!");
-
 return true;
 }
 }

[17/50] [abbrv] ignite git commit: CacheFullApi testIgniteCacheIterator unmuted

[sboikov]

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/master
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();

[10/50] [abbrv] ignite git commit: ignite-1.5 Disabled shmem in test.

[sboikov]

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/master
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);

[ignite] Git Push Summary

[av]

Repository: ignite
Updated Tags:  refs/tags/ignite-1.5.0-EA-rc2 [deleted] 4ad874e71

[ignite] Git Push Summary

[av]

Repository: ignite
Updated Tags:  refs/tags/ignite-1.5.0-EA1-rc1 [deleted] 7aeeeccfd

[ignite] Git Push Summary

[sboikov]

Repository: ignite
Updated Tags:  refs/tags/1.5.0-b1 [created] 70760ba21

svn commit: r11453 - /dev/ignite/1.5.0-b1-rc1/ /release/ignite/1.5.0-b1/

[sboikov]

Author: sboikov
Date: Mon Dec  7 12:36:25 2015
New Revision: 11453

Log:
Release 1.5.0-b1

Added:
release/ignite/1.5.0-b1/
  - copied from r11452, dev/ignite/1.5.0-b1-rc1/
Removed:
dev/ignite/1.5.0-b1-rc1/

ignite git commit: IGNITE-2083 EntryProcessor is called twice on primary node in transactional cache

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5 c10b112ad -> 9a14d6432


IGNITE-2083 EntryProcessor is called twice on primary node in transactional 
cache


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

Branch: refs/heads/ignite-1.5
Commit: 9a14d6432932fc1a1fdf2ddd77dea920382efe8c
Parents: c10b112
Author: sboikov 
Authored: Mon Dec 7 15:05:09 2015 +0300
Committer: sboikov 
Committed: Mon Dec 7 15:05:09 2015 +0300

--
 .../distributed/dht/GridDhtTxPrepareFuture.java |  51 +-
 .../cache/transactions/IgniteTxAdapter.java |   5 +
 .../cache/transactions/IgniteTxEntry.java   |   8 +-
 .../IgniteCacheEntryProcessorCallTest.java  | 497 +++
 ...idCachePartitionedHitsAndMissesSelfTest.java |   4 +-
 .../testframework/junits/GridAbstractTest.java  |   7 +
 .../ignite/testsuites/IgniteCacheTestSuite.java |   2 +
 7 files changed, 558 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/9a14d643/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
index 9f1f8a1..3829e28 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
@@ -337,6 +337,13 @@ public final class GridDhtTxPrepareFuture extends 
GridCompoundFuture, 
Object[]> t : txEntry.entryProcessors()) {
-try {
-CacheInvokeEntry 
invokeEntry = new CacheInvokeEntry<>(
-txEntry.context(), key, val, 
txEntry.cached().version(), txEntry.keepBinary());
+ CacheInvokeEntry invokeEntry 
= new CacheInvokeEntry<>(
+ txEntry.context(), key, val, 
txEntry.cached().version(), txEntry.keepBinary());
 
+ try {
 EntryProcessor 
processor = t.get1();
 
 procRes = processor.process(invokeEntry, 
t.get2());
@@ -380,9 +389,27 @@ public final class GridDhtTxPrepareFuture extends 
GridCompoundFuture(op, 
op == NOOP ? null : val));
 
 if (retVal) {
 if (err != null || procRes != null)
@@ -1301,10 +1328,12 @@ public final class GridDhtTxPrepareFuture extends 
GridCompoundFuture procVal = 
entry.entryProcessorCalculatedValue();
+
+assert procVal != null : entry;
 
-entry.op(procVal == null ? DELETE : UPDATE);
-entry.value(procVal, true, false);
+entry.op(procVal.get1());
+entry.value(procVal.get2(), true, false);
 entry.entryProcessors(null);
 }
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/9a14d643/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
index 3065ac2..53f4f56 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
@@ -1233,6 +1233,11 @@ public abstract class IgniteTxAdapter extends 
GridMetadataAwareAdapter
 if (F.isEmpty(txEntry.entryProcessors()))
 return F.t(txEntry.op(), txEntry.value());
 else {
+T2 calcVal = 
txEntry.entryProcessorCalculatedValue();
+
+if (calcVal != null)
+return calcVal;
+
 boolean recordEvt = 
cctx.gridEvents().isRecordable(EVT_CACHE_OBJECT_READ);
 
 CacheObject cacheVal = txEntry.hasValue() ? 

svn commit: r1718482 - in /ignite/site/trunk: download.html includes/header.html

[dsetrakyan]

Author: dsetrakyan
Date: Mon Dec  7 22:19:26 2015
New Revision: 1718482

URL: http://svn.apache.org/viewvc?rev=1718482=rev
Log:
updated download nav.

Modified:
ignite/site/trunk/download.html
ignite/site/trunk/includes/header.html

Modified: ignite/site/trunk/download.html
URL: 
http://svn.apache.org/viewvc/ignite/site/trunk/download.html?rev=1718482=1718481=1718482=diff
==
--- ignite/site/trunk/download.html (original)
+++ ignite/site/trunk/download.html Mon Dec  7 22:19:26 2015
@@ -119,23 +119,34 @@ under the License.
 Hibernate L2 Cache
 Web Session 
Clustering
 
-
-
-
-
-
-Ignite and Spark
-Shared Memory Layer
-Faster Sql Queries
+Data Grid Comparisons
+Hazelcast
+Oracle Coherence
+Pivotal Gemfire
+Redis
 
-Ignite and Hadoop
+Ignite with Spark & Hadoop
+Shared Memory Layer
+Faster Sql Queries for Spark
 IGFS as HDFS Cache
 Faster In-Memory MapReduce
 
 
 
-http://apacheignite.readme.io/docs;>Documentation
-http://apache-ignite-users.70518.x6.nabble.com/;>Ask Question
+
+
+http://apacheignite.readme.io/docs;>Documentation 
+
+Apache Ignite
+http://apacheignite.readme.io/docs; target="_blank">English 
+https://www.zybuluo.com/liyuj/note/230739; target="_blank">Chinese 
+
+Code
+https://ignite.apache.org/releases/1.4.0/javadoc; target="_blank">Javadoc 

+https://github.com/apache/ignite/tree/master/examples; 
target="_blank">Examples 
+
+
+http://apache-ignite-users.70518.x6.nabble.com/; target="_blank">Ask 
Question
 
 Community 
 
@@ -143,9 +154,12 @@ under the License.
 Ask a Question
 Stack Overflow
 Mailing Lists
+https://gitter.im/apacheignite/ignite; target="_blank">Chat
+https://gitter.im/apacheignite/ignite; style="padding-left:5px; 
padding-bottom:3px;"/>
+
 Git Repositories
-https://issues.apache.org/jira/browse/IGNITE; target="_blank">Ignite 
Jira
-https://cwiki.apache.org/confluence/display/IGNITE/; 
target="_blank">Ignite Wiki
+https://issues.apache.org/jira/browse/IGNITE; target="_blank">Ignite Jira 

+https://cwiki.apache.org/confluence/display/IGNITE/; 
target="_blank">Ignite Wiki 
 People
 
 Contribute
@@ -162,11 +176,11 @@ under the License.
 
 Binary Releases
 
-Docker And Cloud Images
+Docker and Cloud Images
 
-Download From Maven
+Download from Maven
 
-Build From Source
+

ignite git commit: HashMap's offset retrieval in HashSet class definition for legacy IBM JRE

[dmagda]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5 ebddcb187 -> c07752203


HashMap's offset retrieval in HashSet class definition for legacy IBM JRE


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

Branch: refs/heads/ignite-1.5
Commit: c077522038d050aac35ce034cc86d9af7959ebd5
Parents: ebddcb1
Author: Denis Magda 
Authored: Mon Dec 7 20:52:00 2015 +0300
Committer: Denis Magda 
Committed: Mon Dec 7 20:52:00 2015 +0300

--
 .../optimized/OptimizedMarshallerUtils.java | 16 +---
 1 file changed, 13 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/c0775220/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerUtils.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerUtils.java
 
b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerUtils.java
index 4d6afe6..da92b90 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerUtils.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerUtils.java
@@ -155,12 +155,22 @@ class OptimizedMarshallerUtils {
 static final JdkMarshaller JDK_MARSH = new JdkMarshaller();
 
 static {
+long mapOff;
+
 try {
-HASH_SET_MAP_OFF = 
UNSAFE.objectFieldOffset(HashSet.class.getDeclaredField("map"));
+mapOff = 
UNSAFE.objectFieldOffset(HashSet.class.getDeclaredField("map"));
 }
 catch (NoSuchFieldException e) {
-throw new IgniteException("Initialization failure.", e);
+try {
+// Workaround for legacy IBM JRE.
+mapOff = 
UNSAFE.objectFieldOffset(HashSet.class.getDeclaredField("backingMap"));
+}
+catch (NoSuchFieldException e2) {
+throw new IgniteException("Initialization failure.", e2);
+}
 }
+
+HASH_SET_MAP_OFF = mapOff;
 }
 
 /**
@@ -537,4 +547,4 @@ class OptimizedMarshallerUtils {
 static void setObject(Object obj, long off, Object val) {
 UNSAFE.putObject(obj, off, val);
 }
-}
\ No newline at end of file
+}

[2/2] ignite git commit: IGNITE-2089 Review.

[anovikov]

IGNITE-2089 Review.


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

Branch: refs/heads/ignite-843-rc2
Commit: eb012e2593b079d72dbebe550a414e147f3af516
Parents: d41be5a
Author: Andrey 
Authored: Tue Dec 8 11:21:12 2015 +0700
Committer: Andrey 
Committed: Tue Dec 8 11:21:12 2015 +0700

--
 .../directives/callout/callout-cel.directive.js |  3 +-
 .../js/app/directives/callout/callout-cel.jade  | 18 +-
 .../app/directives/callout/callout.directive.js |  3 +-
 .../main/js/app/directives/callout/callout.scss | 17 ++
 .../src/main/js/views/configuration/caches.jade |  8 ++---
 .../main/js/views/configuration/clusters.jade   |  6 ++--
 .../src/main/js/views/configuration/igfs.jade   |  6 ++--
 .../main/js/views/configuration/metadata.jade   |  8 ++---
 .../src/main/js/views/includes/controls.jade| 20 ---
 .../src/main/js/views/sql/sql.jade  | 35 
 10 files changed, 64 insertions(+), 60 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/eb012e25/modules/control-center-web/src/main/js/app/directives/callout/callout-cel.directive.js
--
diff --git 
a/modules/control-center-web/src/main/js/app/directives/callout/callout-cel.directive.js
 
b/modules/control-center-web/src/main/js/app/directives/callout/callout-cel.directive.js
index d1141b6..a745d1a 100644
--- 
a/modules/control-center-web/src/main/js/app/directives/callout/callout-cel.directive.js
+++ 
b/modules/control-center-web/src/main/js/app/directives/callout/callout-cel.directive.js
@@ -18,7 +18,6 @@
 import template from './callout-cel.jade!'
 
 export default ['igniteCalloutCel', [() => {
-
return {
scope: {
title: '@'
@@ -29,4 +28,4 @@ export default ['igniteCalloutCel', [() => {
transclude: true,
require: '^igniteCallout'
}
-}]]
\ No newline at end of file
+}]]

http://git-wip-us.apache.org/repos/asf/ignite/blob/eb012e25/modules/control-center-web/src/main/js/app/directives/callout/callout-cel.jade
--
diff --git 
a/modules/control-center-web/src/main/js/app/directives/callout/callout-cel.jade
 
b/modules/control-center-web/src/main/js/app/directives/callout/callout-cel.jade
index 15bc0d8..02cda27 100644
--- 
a/modules/control-center-web/src/main/js/app/directives/callout/callout-cel.jade
+++ 
b/modules/control-center-web/src/main/js/app/directives/callout/callout-cel.jade
@@ -1,4 +1,20 @@
+//-
+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.
+
 td.block-callout(width='50%')
-i.fa.fa-check-square.block-callout-header-left
+i.fa.fa-check-square
 span {{::title}}:
 ul(ng-transclude='')

http://git-wip-us.apache.org/repos/asf/ignite/blob/eb012e25/modules/control-center-web/src/main/js/app/directives/callout/callout.directive.js
--
diff --git 
a/modules/control-center-web/src/main/js/app/directives/callout/callout.directive.js
 
b/modules/control-center-web/src/main/js/app/directives/callout/callout.directive.js
index b7ce6ad..32ec68e 100644
--- 
a/modules/control-center-web/src/main/js/app/directives/callout/callout.directive.js
+++ 
b/modules/control-center-web/src/main/js/app/directives/callout/callout.directive.js
@@ -18,11 +18,10 @@
 import template from './callout.jade!';
 
 export default ['igniteCallout', [() => {
-
return {
restrict: 'E',
template,
replace: true,
transclude: true 
}
-}]]
\ No newline at end of file
+}]]