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

[anovikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc2 31abbeb15 -> a66b79199


IGNITE-843 Fixed download affix.


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

Branch: refs/heads/ignite-843-rc2
Commit: a71041f848afc759f4291596d7327f936652136d
Parents: 539f819
Author: Andrey 
Authored: Wed Dec 9 15:59:59 2015 +0700
Committer: Andrey 
Committed: Wed Dec 9 15:59:59 2015 +0700

--
 .../main/js/views/configuration/summary.jade| 79 +++-
 1 file changed, 42 insertions(+), 37 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/a71041f8/modules/control-center-web/src/main/js/views/configuration/summary.jade
--
diff --git 
a/modules/control-center-web/src/main/js/views/configuration/summary.jade 
b/modules/control-center-web/src/main/js/views/configuration/summary.jade
index 3b238b8..024666f 100644
--- a/modules/control-center-web/src/main/js/views/configuration/summary.jade
+++ b/modules/control-center-web/src/main/js/views/configuration/summary.jade
@@ -38,45 +38,50 @@ mixin hard-link(ref, txt)
 ignite-loading
 hr
 
-.padding-dflt(ng-if='clusters.length == 0')
+.padding-dflt(ng-if='!clusters || clusters.length == 0')
 | You have no clusters configured. Please configure them 
 a(href='/configuration/clusters') here.
 
-+main-table('Clusters:', 'clusters', 'clusterName', 'selectItem(row)', 
'{{$index + 1}}) {{row.name}}', 'name')
+div(ng-show='clusters || clusters.length > 0')
++main-table('Clusters:', 'clusters', 'clusterName', 
'selectItem(row)', '{{$index + 1}}) {{row.name}}', 'name')
 
-div(ng-show='selectedItem && tableVisibleRow(displayedRows, 
selectedItem)' role='tab')
-.padding-top-dflt(ng-if='clusters.length > 0' bs-affix)
-button.btn.btn-primary(id='download' 
ng-click='downloadConfiguration()' bs-tooltip data-title='Download 
configuration' data-placement='bottom') Download
-hr
-.panel-group(bs-collapse ng-init='panels.activePanels=[0,1]' 
ng-model='panels.activePanels' data-allow-multiple='true')
-.panel.panel-default
-.panel-heading(role='tab' bs-collapse-toggle)
-i.fa(ng-class='panelExpanded(panels, "server") ? 
"fa-chevron-circle-up" : "fa-chevron-circle-down"')
-label Server
-.panel-collapse(id='server' role='tabpanel' 
bs-collapse-target)
-.summary-tabs(bs-tabs 
data-bs-active-pane="tabsServer.activeTab" 
template='configuration/summary-tabs.html')
-div(bs-pane title='XML')
-ignite-ui-ace-xml(data-cluster='cluster')
-div(bs-pane title='Java')
-ignite-ui-ace-java(data-cluster='cluster')
-div(bs-pane title='POM')
-ignite-ui-ace-pom(data-cluster='cluster')
-div(bs-pane title='Dockerfile')
-ignite-ui-ace-docker(data-cluster='cluster' 
ng-model='ctrl.data.docker')
+div(ng-show='selectedItem && tableVisibleRow(displayedRows, 
selectedItem)')
+.padding-top-dflt(bs-affix)
+button.btn.btn-primary(id='download' 
ng-click='downloadConfiguration()' bs-tooltip data-title='Download 
configuration' data-placement='bottom') Download
 
-.panel.panel-default
-.panel-heading(role='tab' bs-collapse-toggle)
-i.fa(ng-class='panelExpanded(panels, "client") ? 
"fa-chevron-circle-up" : "fa-chevron-circle-down"')
-label Client
-.panel-collapse(id='client' role='tabpanel' 
bs-collapse-target)
-.details-row(ng-repeat='field in clientFields')
-+form-row-custom(['col-xs-4 col-sm-4 col-md-3'], 
['col-xs-4 col-sm-4 col-md-3'], 'backupItem')
-.summary-tabs(bs-tabs 
data-bs-active-pane="tabsClient.activeTab" 
template='configuration/summary-tabs.html')
-div(bs-pane title='XML')
-ignite-ui-ace-xml(data-cluster='cluster' 
data-cluster-cfg='backupItem.nearConfiguration')
-div(bs-pane title='Java')
-ignite-ui-ace-java(data-cluster='cluster' 

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

[anovikov]

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


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

Branch: refs/heads/ignite-843-rc2
Commit: a66b7919987bd7022911acbd40011bf9046e042d
Parents: a71041f 31abbeb
Author: Andrey 
Authored: Wed Dec 9 16:00:13 2015 +0700
Committer: Andrey 
Committed: Wed Dec 9 16:00:13 2015 +0700

--
 .../main/js/helpers/generator/generator-java.js | 21 
 1 file changed, 21 insertions(+)
--

ignite git commit: IGNITE-1864: Transaction manager factory instead of Transaction manager Lookup

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5 0adee3ae0 -> 5ea19a454


IGNITE-1864: Transaction manager factory instead of Transaction manager Lookup


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

Branch: refs/heads/ignite-1.5
Commit: 5ea19a4549eb9df619bad9e8a86b844a5db2ca1f
Parents: 0adee3a
Author: ashutak 
Authored: Wed Dec 9 12:02:57 2015 +0300
Committer: ashutak 
Committed: Wed Dec 9 12:02:57 2015 +0300

--
 .../configuration/CacheConfiguration.java   |   4 +-
 .../configuration/TransactionConfiguration.java |  47 +++-
 .../cache/jta/CacheJtaManagerAdapter.java   |   4 +-
 .../HibernateTransactionalDataRegion.java   |  18 +-
 .../HibernateL2CacheTransactionalSelfTest.java  |  23 +-
 modules/jta/pom.xml |   9 +-
 .../cache/jta/jndi/CacheJndiTmFactory.java  | 132 +++
 .../processors/cache/jta/CacheJtaManager.java   |  41 +++-
 .../cache/AbstarctCacheJtaSelfTest.java | 183 +++
 .../cache/CacheJndiTmFactorySelfTest.java   | 166 ++
 ...CacheJtaConfigurationValidationSelfTest.java |   4 +-
 ...CacheJtaFactoryConfigValidationSelfTest.java | 142 
 .../processors/cache/GridCacheJtaSelfTest.java  | 221 ---
 .../cache/GridCacheReplicatedJtaSelfTest.java   |  32 ---
 .../cache/GridJtaLifecycleAwareSelfTest.java| 191 
 .../GridPartitionedCacheJtaFactorySelfTest.java |  41 
 ...titionedCacheJtaLookupClassNameSelfTest.java |  83 +++
 .../GridReplicatedCacheJtaFactorySelfTest.java  |  32 +++
 ...plicatedCacheJtaLookupClassNameSelfTest.java |  32 +++
 .../GridTmLookupLifecycleAwareSelfTest.java | 122 --
 .../ignite/testsuites/IgniteJtaTestSuite.java   |  26 ++-
 21 files changed, 1150 insertions(+), 403 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/5ea19a45/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 67f7b2e..d73ff58 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
@@ -1112,7 +1112,7 @@ public class CacheConfiguration extends 
MutableConfiguration {
  * Gets class name of transaction manager finder for integration for JEE 
app servers.
  *
  * @return Transaction manager finder.
- * @deprecated Use {@link 
TransactionConfiguration#getTxManagerLookupClassName()} instead.
+ * @deprecated Use {@link TransactionConfiguration#getTxManagerFactory()} 
instead.
  */
 @Deprecated
 public String getTransactionManagerLookupClassName() {
@@ -1125,7 +1125,7 @@ public class CacheConfiguration extends 
MutableConfiguration {
  * @param tmLookupClsName Name of class implementing GridCacheTmLookup 
interface that is used to
  *  receive JTA transaction manager.
  * @return {@code this} for chaining.
- * @deprecated Use {@link 
TransactionConfiguration#setTxManagerLookupClassName(String)} instead.
+ * @deprecated Use {@link 
TransactionConfiguration#setTxManagerFactory(Factory)} instead.
  */
 @Deprecated
 public CacheConfiguration 
setTransactionManagerLookupClassName(String tmLookupClsName) {

http://git-wip-us.apache.org/repos/asf/ignite/blob/5ea19a45/modules/core/src/main/java/org/apache/ignite/configuration/TransactionConfiguration.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/configuration/TransactionConfiguration.java
 
b/modules/core/src/main/java/org/apache/ignite/configuration/TransactionConfiguration.java
index fc2a6cb..b3d294d 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/configuration/TransactionConfiguration.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/configuration/TransactionConfiguration.java
@@ -18,6 +18,7 @@
 package org.apache.ignite.configuration;
 
 import java.io.Serializable;
+import javax.cache.configuration.Factory;
 import org.apache.ignite.transactions.Transaction;
 import org.apache.ignite.transactions.TransactionConcurrency;
 import org.apache.ignite.transactions.TransactionIsolation;
@@ -65,6 +66,9 @@ public class TransactionConfiguration implements Serializable 
{
 /** Name of class 

[1/2] ignite git commit: IGNITE-843 Added declaration of array variable.

[akuznetsov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc2 539f819c3 -> 31abbeb15


IGNITE-843 Added declaration of array variable.


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

Branch: refs/heads/ignite-843-rc2
Commit: 744ec6443167d4b858de066a461ffb274bfad6ab
Parents: da50f0c
Author: Vasiliy Sisko 
Authored: Wed Dec 9 15:54:07 2015 +0700
Committer: Alexey Kuznetsov 
Committed: Wed Dec 9 15:54:07 2015 +0700

--
 .../main/js/helpers/generator/generator-java.js | 21 
 1 file changed, 21 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/744ec644/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
--
diff --git 
a/modules/control-center-web/src/main/js/helpers/generator/generator-java.js 
b/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
index 39f9c9e..f5714b4 100644
--- a/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
+++ b/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
@@ -119,6 +119,27 @@ $generatorJava.declareVariableCustom = function (res, 
varName, varFullType, varE
 };
 
 /**
+ * Add array variable declaration.
+ *
+ * @param res Resulting output with generated code.
+ * @param varName Variable name.
+ * @param varFullType Variable full class name to be added to imports.
+ * @param length Array length.
+ */
+$generatorJava.declareVariableArray = function (res, varName, varFullType, 
length) {
+var varType = res.importClass(varFullType);
+
+var varNew = !res.vars[varName];
+
+if (varNew)
+res.vars[varName] = true;
+
+res.line((varNew ? (varType + '[] ') : '') + varName + ' = new ' + varType 
+ '[' + length + '];');
+
+res.needEmptyLine = true;
+};
+
+/**
  * Clear list of declared variables.
  *
  * @param res

[1/2] ignite git commit: IGNITE-2064 Fixed Usage of Optimize classloader

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5 5ea19a454 -> afbb0dc0c


IGNITE-2064 Fixed Usage of Optimize classloader


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

Branch: refs/heads/ignite-1.5
Commit: d0786551aef92f77cbb23097de18745399d00d69
Parents: 5ea19a4
Author: Anton Vinogradov 
Authored: Tue Dec 8 16:39:36 2015 +0300
Committer: Anton Vinogradov 
Committed: Wed Dec 9 12:55:06 2015 +0300

--
 .../portable/PortableClassDescriptor.java   | 46 ++--
 1 file changed, 23 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/d0786551/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableClassDescriptor.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableClassDescriptor.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableClassDescriptor.java
index 984f7c9..ed65e63 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableClassDescriptor.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableClassDescriptor.java
@@ -17,13 +17,6 @@
 
 package org.apache.ignite.internal.portable;
 
-import org.apache.ignite.IgniteCheckedException;
-import org.apache.ignite.internal.processors.cache.CacheObjectImpl;
-import org.apache.ignite.internal.util.typedef.internal.U;
-import org.apache.ignite.marshaller.MarshallerExclusions;
-import org.apache.ignite.marshaller.optimized.OptimizedMarshaller;
-import org.jetbrains.annotations.Nullable;
-
 import java.io.Externalizable;
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -43,10 +36,16 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.UUID;
-import org.apache.ignite.binary.BinaryObjectException;
+import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.binary.BinaryIdMapper;
-import org.apache.ignite.binary.Binarylizable;
+import org.apache.ignite.binary.BinaryObjectException;
 import org.apache.ignite.binary.BinarySerializer;
+import org.apache.ignite.binary.Binarylizable;
+import org.apache.ignite.internal.processors.cache.CacheObjectImpl;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.marshaller.MarshallerExclusions;
+import org.apache.ignite.marshaller.optimized.OptimizedMarshaller;
+import org.jetbrains.annotations.Nullable;
 
 import static java.lang.reflect.Modifier.isStatic;
 import static java.lang.reflect.Modifier.isTransient;
@@ -268,11 +267,11 @@ public class PortableClassDescriptor {
 }
 }
 }
-
+
 fields = fields0.toArray(new 
BinaryFieldAccessor[fields0.size()]);
-
+
 stableSchema = schemaBuilder.build();
-
+
 break;
 
 default:
@@ -796,19 +795,20 @@ public class PortableClassDescriptor {
  * @return {@code true} if to use, {@code false} otherwise.
  */
 private boolean initUseOptimizedMarshallerFlag() {
-   boolean use;
-
-try {
-Method writeObj = cls.getDeclaredMethod("writeObject", 
ObjectOutputStream.class);
-Method readObj = cls.getDeclaredMethod("readObject", 
ObjectInputStream.class);
+for (Class c = cls; !c.equals(Object.class); c = c.getSuperclass()) {
+try {
+Method writeObj = c.getDeclaredMethod("writeObject", 
ObjectOutputStream.class);
+Method readObj = c.getDeclaredMethod("readObject", 
ObjectInputStream.class);
 
-use = !Modifier.isStatic(writeObj.getModifiers()) && 
!Modifier.isStatic(readObj.getModifiers()) &&
-writeObj.getReturnType() == void.class && 
readObj.getReturnType() == void.class;
-}
-catch (NoSuchMethodException e) {
-use = false;
+if (!Modifier.isStatic(writeObj.getModifiers()) && 
!Modifier.isStatic(readObj.getModifiers()) &&
+writeObj.getReturnType() == void.class && 
readObj.getReturnType() == void.class)
+return true;
+}
+catch (NoSuchMethodException e) {
+// No-op.
+}
 }
 
-return use;
+return false;
 }
 }

[2/2] ignite git commit: IGNITE-2064 Fixed Usage of Optimize classloader test coverage

[sboikov]

IGNITE-2064 Fixed Usage of Optimize classloader test coverage


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

Branch: refs/heads/ignite-1.5
Commit: afbb0dc0c1323b1b24d1a6f4f46fc78d255c98a4
Parents: d078655
Author: Anton Vinogradov 
Authored: Wed Dec 9 12:59:51 2015 +0300
Committer: Anton Vinogradov 
Committed: Wed Dec 9 12:59:51 2015 +0300

--
 .../internal/portable/BinaryMarshallerSelfTest.java   | 14 +-
 1 file changed, 13 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/afbb0dc0/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryMarshallerSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryMarshallerSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryMarshallerSelfTest.java
index a06e6c3..d667e07 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryMarshallerSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryMarshallerSelfTest.java
@@ -80,6 +80,7 @@ import sun.misc.Unsafe;
 
 import static 
org.apache.ignite.internal.portable.streams.PortableMemoryAllocator.INSTANCE;
 import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertNotEquals;
 
 /**
  * Portable marshaller tests.
@@ -329,6 +330,17 @@ public class BinaryMarshallerSelfTest extends 
GridCommonAbstractTest {
 /**
  * @throws Exception If failed.
  */
+public void testException() throws Exception {
+Exception ex = new RuntimeException();
+
+// Checks that Optimize marshaller will be used, because Throwable has 
writeObject method.
+// Exception's stacktrace equals to zero-length array by default and 
generates at Throwable's writeObject method.
+assertNotEquals(0, marshalUnmarshal(ex).getStackTrace().length);
+}
+
+/**
+ * @throws Exception If failed.
+ */
 public void testCollection() throws Exception {
 testCollection(new ArrayList(3));
 testCollection(new LinkedHashSet());
@@ -2406,7 +2418,7 @@ public class BinaryMarshallerSelfTest extends 
GridCommonAbstractTest {
 protected boolean compactFooter() {
 return true;
 }
-
+
 /**
  * @param marsh Marshaller.
  * @return Portable context.

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

[akuznetsov]

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


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

Branch: refs/heads/ignite-843-rc2
Commit: 31abbeb153061b0db8fe139206801acf680a838d
Parents: 744ec64 539f819
Author: Alexey Kuznetsov 
Authored: Wed Dec 9 15:54:54 2015 +0700
Committer: Alexey Kuznetsov 
Committed: Wed Dec 9 15:54:54 2015 +0700

--
 .../src/main/js/app/data/os.json|   4 +
 .../app/directives/loading/loading.directive.js |  27 ++
 .../main/js/app/directives/loading/loading.jade |  18 ++
 .../ui-ace-docker/ui-ace-docker.controller.js   |  43 +++
 .../ui-ace-docker/ui-ace-docker.directive.js|  37 +++
 .../directives/ui-ace-docker/ui-ace-docker.jade |  35 +++
 .../ui-ace-java/ui-ace-java.controller.js   |  58 
 .../ui-ace-java/ui-ace-java.directive.js|  33 +++
 .../app/directives/ui-ace-java/ui-ace-java.jade |  28 ++
 .../ui-ace-pojos/ui-ace-pojos.controller.js |  89 ++
 .../ui-ace-pojos/ui-ace-pojos.directive.js  |  37 +++
 .../directives/ui-ace-pojos/ui-ace-pojos.jade   |  33 +++
 .../ui-ace-pom/ui-ace-pom.controller.js |  40 +++
 .../ui-ace-pom/ui-ace-pom.directive.js  |  32 ++
 .../app/directives/ui-ace-pom/ui-ace-pom.jade   |  17 ++
 .../ui-ace-xml/ui-ace-xml.controller.js |  38 +++
 .../ui-ace-xml/ui-ace-xml.directive.js  |  33 +++
 .../app/directives/ui-ace-xml/ui-ace-xml.jade   |  17 ++
 .../js/app/filters/hasPojo/hasPojo.filter.js|  26 ++
 .../control-center-web/src/main/js/app/index.js |  37 ++-
 .../app/modules/states/configuration/index.js   |  16 +-
 .../configuration/summary/summary.controller.js | 133 +
 .../configuration/summary/summary.resource.js   |  41 +++
 .../main/js/app/services/UiAceOnLoad/service.js |  36 +++
 .../control-center-web/src/main/js/config.js|   1 +
 .../main/js/controllers/summary-controller.js   | 293 ---
 .../src/main/js/gulpfile.js/tasks/copy.js   |   4 +-
 .../main/js/helpers/generator/generator-xml.js  |   2 +-
 .../control-center-web/src/main/js/package.json |   1 +
 .../js/views/configuration/summary-tabs.jade|   2 +-
 .../main/js/views/configuration/summary.jade| 134 +++--
 31 files changed, 953 insertions(+), 392 deletions(-)
--

[12/20] ignite git commit: ignite-2030 Fixed issue with JAVA_HOME containing parenthesis

[sboikov]

ignite-2030  Fixed issue with JAVA_HOME containing parenthesis


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

Branch: refs/heads/ignite-1537
Commit: 69047243bb1de980647711a59573bf44e69761eb
Parents: bdbe406
Author: sboikov 
Authored: Wed Dec 9 09:27:23 2015 +0300
Committer: sboikov 
Committed: Wed Dec 9 09:27:23 2015 +0300

--
 bin/ignite.bat| 5 +++--
 bin/include/parseargs.bat | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/69047243/bin/ignite.bat
--
diff --git a/bin/ignite.bat b/bin/ignite.bat
index 43cc58b..97c2e45 100644
--- a/bin/ignite.bat
+++ b/bin/ignite.bat
@@ -20,6 +20,7 @@
 ::
 
 @echo off
+Setlocal EnableDelayedExpansion
 
 if "%OS%" == "Windows_NT"  setlocal
 
@@ -119,7 +120,7 @@ if %ERRORLEVEL% neq 0 (
 :: Process 'restart'.
 ::
 set RANDOM_NUMBER_COMMAND="%JAVA_HOME%\bin\java.exe" -cp %CP% 
org.apache.ignite.startup.cmdline.CommandLineRandomNumberGenerator
-for /f "usebackq tokens=*" %%i in (`"%RANDOM_NUMBER_COMMAND%"`) do set 
RANDOM_NUMBER=%%i
+for /f "usebackq tokens=*" %%i in (`%RANDOM_NUMBER_COMMAND%`) do set 
RANDOM_NUMBER=%%i
 
 set RESTART_SUCCESS_FILE="%IGNITE_HOME%\work\ignite_success_%RANDOM_NUMBER%"
 set RESTART_SUCCESS_OPT=-DIGNITE_SUCCESS_FILE=%RESTART_SUCCESS_FILE%
@@ -132,7 +133,7 @@ set 
RESTART_SUCCESS_OPT=-DIGNITE_SUCCESS_FILE=%RESTART_SUCCESS_FILE%
 :: This is executed if -nojmx is not specified
 ::
 if not "%NO_JMX%" == "1" (
-for /F "tokens=*" %%A in ('""%JAVA_HOME%\bin\java" -cp %CP% 
org.apache.ignite.internal.util.portscanner.GridJmxPortFinder"') do (
+for /F "tokens=*" %%A in ('""!JAVA_HOME!\bin\java" -cp %CP% 
org.apache.ignite.internal.util.portscanner.GridJmxPortFinder"') do (
 set JMX_PORT=%%A
 )
 )

http://git-wip-us.apache.org/repos/asf/ignite/blob/69047243/bin/include/parseargs.bat
--
diff --git a/bin/include/parseargs.bat b/bin/include/parseargs.bat
index c4b35d2..86e5766 100644
--- a/bin/include/parseargs.bat
+++ b/bin/include/parseargs.bat
@@ -40,7 +40,7 @@
 :: in other scripts to parse common command lines parameters.
 
 set convertArgsCmd="%JAVA_HOME%\bin\java.exe" -cp %CP% 
org.apache.ignite.startup.cmdline.CommandLineTransformer %*
-for /f "usebackq tokens=*" %%i in (`"%convertArgsCmd%"`) do set 
reformattedArgs=%%i
+for /f "usebackq tokens=*" %%i in (`%convertArgsCmd%`) do set 
reformattedArgs=%%i
 
 for %%i in (%reformattedArgs%) do (
 if "%%i" == "CommandLineTransformerError" exit /b 1

[1/4] ignite git commit: IGNITE-2111: Build procedure for .NET.

[vozerov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5 3ba7e541c -> 3016c0f1b


http://git-wip-us.apache.org/repos/asf/ignite/blob/01a22328/modules/platforms/dotnet/Apache.Ignite.sln
--
diff --git a/modules/platforms/dotnet/Apache.Ignite.sln 
b/modules/platforms/dotnet/Apache.Ignite.sln
index 929af73..19916f2 100644
--- a/modules/platforms/dotnet/Apache.Ignite.sln
+++ b/modules/platforms/dotnet/Apache.Ignite.sln
@@ -24,6 +24,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution 
Items", "Solution
ProjectSection(SolutionItems) = preProject
Apache.Ignite.FxCop = Apache.Ignite.FxCop
Apache.Ignite.sln.DotSettings = Apache.Ignite.sln.DotSettings
+   build.bat = build.bat
examples\Config\example-cache-query.xml = 
examples\Config\example-cache-query.xml
examples\Config\example-cache-store.xml = 
examples\Config\example-cache-store.xml
examples\Config\example-cache.xml = 
examples\Config\example-cache.xml

http://git-wip-us.apache.org/repos/asf/ignite/blob/01a22328/modules/platforms/dotnet/build.bat
--
diff --git a/modules/platforms/dotnet/build.bat 
b/modules/platforms/dotnet/build.bat
new file mode 100644
index 000..e2dfeed
--- /dev/null
+++ b/modules/platforms/dotnet/build.bat
@@ -0,0 +1,94 @@
+::
+:: Licensed to the Apache Software Foundation (ASF) under one or more
+:: contributor license agreements.  See the NOTICE file distributed with
+:: this work for additional information regarding copyright ownership.
+:: The ASF licenses this file to You under the Apache License, Version 2.0
+:: (the "License"); you may not use this file except in compliance with
+:: the License.  You may obtain a copy of the License at
+::
+::  http://www.apache.org/licenses/LICENSE-2.0
+::
+:: Unless required by applicable law or agreed to in writing, software
+:: distributed under the License is distributed on an "AS IS" BASIS,
+:: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+:: See the License for the specific language governing permissions and
+:: limitations under the License.
+::
+
+::
+:: Ignite.NET build script.
+::
+
+@echo OFF
+
+rem uncomment the following if having problems with Microsoft.Cpp.Default.props
+rem SET VCTargetsPath=C:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0\V120
+
+set PLATFORM=%1
+if [%PLATFORM%]==[] set PLATFORM=x64
+
+set TARGET_DIR=bin
+if not [%PLATFORM%]==[x64] set TARGET_DIR=%TARGET_DIR%\%PLATFORM%
+
+rem Validate path to .Net installation.
+IF NOT EXIST %DOTNET_PATH%\MSBuild.exe SET 
DOTNET_PATH=c:\Windows\Microsoft.NET\Framework\v4.0.30319
+IF NOT EXIST %DOTNET_PATH%\MSBuild.exe GOTO INVALID_DOTNET_PATH
+
+set PATH0=%PATH%
+set PATH=%PATH0%;%DOTNET_PATH%
+
+echo Switch to build script directory %~dp0
+cd %~dp0
+
+rem Build project.
+echo .
+echo Build project for platform: %PLATFORM%
+MSBuild.exe Apache.Ignite.sln /t:Clean;Rebuild /p:Configuration=Release 
/p:Platform=%PLATFORM% /val /m /nologo /ds
+
+IF %ERRORLEVEL% NEQ 0 GOTO ERROR
+
+set PATH=%PATH0%
+
+rem Build distributions.
+echo .
+echo Copy client libraries into the distribution directory: %TARGET_DIR%
+
+rmdir /S /Q %TARGET_DIR%
+IF NOT EXIST %TARGET_DIR%\NUL mkdir %TARGET_DIR%
+
+copy /Y Apache.Ignite\bin\%PLATFORM%\Release\*.* %TARGET_DIR%
+
+copy /Y readme.txt %TARGET_DIR%
+
+goto DONE
+
+:INVALID_DOTNET_PATH
+echo DOTNET_PATH=%DOTNET_PATH% is invalid path to .Net installation.
+
+set ERRORLEVEL=1
+goto ERROR
+
+:INVALID_TEST_RESULT
+echo No test results generated during tests execution.
+
+set ERRORLEVEL=1
+
+goto ERROR
+
+:ERROR
+set _ERRORLVL=%ERRORLEVEL%
+
+echo Breaked due to upper errors with exit code: %_ERRORLVL%
+
+echo ON
+
+@exit /b %_ERRORLVL%
+
+:DONE
+
+echo.
+echo Done!
+
+:END
+
+echo ON

http://git-wip-us.apache.org/repos/asf/ignite/blob/01a22328/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Apache.Ignite.Examples.csproj
--
diff --git 
a/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Apache.Ignite.Examples.csproj
 
b/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Apache.Ignite.Examples.csproj
index a693930..2f4ce18 100644
--- 
a/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Apache.Ignite.Examples.csproj
+++ 
b/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Apache.Ignite.Examples.csproj
@@ -46,7 +46,9 @@
   
   
 
-  
..\..\Apache.Ignite\bin\$(Platform)\$(Configuration)\Apache.Ignite.Core.dll
+  ..\..\Apache.Ignite\bin\$(Platform)\$(Configuration)\Apache.Ignite.Core.dll
+  ..\..\bin\x86\Apache.Ignite.Core.dll
+  ..\..\bin\Apache.Ignite.Core.dll
 
 
 

[2/4] ignite git commit: IGNITE-2111: Build procedure for .NET.

[vozerov]

http://git-wip-us.apache.org/repos/asf/ignite/blob/01a22328/modules/platforms/dotnet/Apache.Ignite.dxg
--
diff --git a/modules/platforms/dotnet/Apache.Ignite.dxg 
b/modules/platforms/dotnet/Apache.Ignite.dxg
new file mode 100644
index 000..df4de98
--- /dev/null
+++ b/modules/platforms/dotnet/Apache.Ignite.dxg
@@ -0,0 +1,2387 @@
+# Doxyfile 1.8.9.1
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project.
+#
+# All text after a double hash (##) is considered a comment and is placed in
+# front of the TAG it is preceding.
+#
+# All text after a single hash (#) is considered a comment and will be ignored.
+# The format is:
+# TAG = value [value, ...]
+# For lists, items can also be appended using:
+# TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (\" \").
+
+#---
+# Project related configuration options
+#---
+
+# This tag specifies the encoding used for all characters in the config file
+# that follow. The default is UTF-8 which is also the encoding used for all 
text
+# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
+# built into libc) for the transcoding. See 
http://www.gnu.org/software/libiconv
+# for the list of possible encodings.
+# The default value is: UTF-8.
+
+DOXYFILE_ENCODING  = UTF-8
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
+# double-quotes, unless you are using Doxywizard) that should identify the
+# project for which the documentation is generated. This name is used in the
+# title of most generated pages and in a few other places.
+# The default value is: My Project.
+
+PROJECT_NAME   = "Apache Ignite.NET"
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. 
This
+# could be handy for archiving the generated documentation or if some version
+# control system is used.
+
+PROJECT_NUMBER =
+
+# Using the PROJECT_BRIEF tag one can provide an optional one line description
+# for a project that appears at the top of each page and should give viewer a
+# quick idea about the purpose of the project. Keep the description short.
+
+PROJECT_BRIEF  =
+
+# With the PROJECT_LOGO tag one can specify a logo or an icon that is included
+# in the documentation. The maximum height of the logo should not exceed 55
+# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
+# the logo to the output directory.
+
+PROJECT_LOGO   =
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
+# into which the generated documentation will be written. If a relative path is
+# entered, it will be relative to the location where doxygen was started. If
+# left blank the current directory will be used.
+
+OUTPUT_DIRECTORY   = doc
+
+# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
+# directories (in 2 levels) under the output directory of each output format 
and
+# will distribute the generated files over these directories. Enabling this
+# option can be useful when feeding doxygen a huge amount of source files, 
where
+# putting all generated files in the same directory would otherwise causes
+# performance problems for the file system.
+# The default value is: NO.
+
+CREATE_SUBDIRS = NO
+
+# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
+# characters to appear in the names of generated files. If set to NO, non-ASCII
+# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
+# U+3044.
+# The default value is: NO.
+
+ALLOW_UNICODE_NAMES= NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, 
Chinese,
+# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States),
+# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian,
+# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages),
+# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian,
+# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, 
Russian,
+# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish,
+# Ukrainian and Vietnamese.
+# The default value is: English.
+
+OUTPUT_LANGUAGE= English
+
+# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
+# descriptions after the members that are listed in the file and class
+# documentation (similar to Javadoc). Set to NO to disable this.
+# The default value is: YES.
+

[3/4] ignite git commit: IGNITE-2111: Build procedure for .NET.

[vozerov]

IGNITE-2111: Build procedure for .NET.


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

Branch: refs/heads/ignite-1.5
Commit: 01a22328289f707edb5e479b3cfd03e1502f2f55
Parents: afbb0dc
Author: Pavel Tupitsyn 
Authored: Wed Dec 9 15:32:51 2015 +0300
Committer: vozerov-gridgain 
Committed: Wed Dec 9 15:32:51 2015 +0300

--
 assembly/docfiles/ignite_logo.png   |  Bin 0 -> 24315 bytes
 assembly/release-fabric-base.xml|   12 +-
 .../Apache.Ignite.Core.csproj   |4 +
 modules/platforms/dotnet/Apache.Ignite.dxg  | 2387 ++
 modules/platforms/dotnet/Apache.Ignite.sln  |1 +
 modules/platforms/dotnet/build.bat  |   94 +
 .../Apache.Ignite.Examples.csproj   |4 +-
 .../Apache.Ignite.ExamplesDll.csproj|4 +-
 parent/pom.xml  |1 +
 9 files changed, 2499 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/01a22328/assembly/docfiles/ignite_logo.png
--
diff --git a/assembly/docfiles/ignite_logo.png 
b/assembly/docfiles/ignite_logo.png
new file mode 100644
index 000..7435f01
Binary files /dev/null and b/assembly/docfiles/ignite_logo.png differ

http://git-wip-us.apache.org/repos/asf/ignite/blob/01a22328/assembly/release-fabric-base.xml
--
diff --git a/assembly/release-fabric-base.xml b/assembly/release-fabric-base.xml
index 65903ee..00dd9a4 100644
--- a/assembly/release-fabric-base.xml
+++ b/assembly/release-fabric-base.xml
@@ -87,16 +87,16 @@
 
 
 
-
+
 
-modules/platforms/dotnet/Apache.Ignite.Core
-
/platforms/dotnet/Apache.Ignite.Core
+modules/platforms/dotnet/bin
+/platforms/dotnet/bin
 
 
-
+
 
-modules/platforms/dotnet/Apache.Ignite
-/platforms/dotnet/Apache.Ignite
+modules/platforms/dotnet/doc
+/platforms/dotnet/docs
 
 
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/01a22328/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj 
b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
index 831130c..b3bd712 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
@@ -17,24 +17,28 @@
 bin\x64\Debug\
 true
 DEBUG;CODE_ANALYSIS
+bin\x64\Debug\Apache.Ignite.Core.XML
   
   
 x64
 bin\x64\Release\
 true
 true
+
bin\x64\Release\Apache.Ignite.Core.XML
   
   
 x86
 bin\x86\Debug\
 true
 DEBUG;CODE_ANALYSIS
+bin\x86\Debug\Apache.Ignite.Core.XML
   
   
 x86
 bin\x86\Release\
 true
 true
+
bin\x86\Release\Apache.Ignite.Core.XML
   
   
 true

ignite git commit: ignite-1.5 Fixed asserts in GridTransactionalCacheQueueImpl to take into account case when queue data was really lost.

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5 3016c0f1b -> add616145


ignite-1.5 Fixed asserts in GridTransactionalCacheQueueImpl to take into 
account case when queue data was really lost.


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

Branch: refs/heads/ignite-1.5
Commit: add6161451d3e8b263782e52c51a0e2b34daeb3f
Parents: 3016c0f
Author: sboikov 
Authored: Wed Dec 9 16:32:48 2015 +0300
Committer: sboikov 
Committed: Wed Dec 9 16:32:48 2015 +0300

--
 .../GridTransactionalCacheQueueImpl.java|  32 +++--
 ...eAbstractDataStructuresFailoverSelfTest.java | 138 +++
 2 files changed, 128 insertions(+), 42 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/add61614/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridTransactionalCacheQueueImpl.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridTransactionalCacheQueueImpl.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridTransactionalCacheQueueImpl.java
index 32e94d3..7b80765 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridTransactionalCacheQueueImpl.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridTransactionalCacheQueueImpl.java
@@ -96,22 +96,28 @@ public class GridTransactionalCacheQueueImpl extends 
GridCacheQueueAdapter
 @Override public T call() throws Exception {
 T retVal;
 
-try (IgniteInternalTx tx = cache.txStartEx(PESSIMISTIC, 
REPEATABLE_READ)) {
-Long idx = (Long)cache.invoke(queueKey, new 
PollProcessor(id)).get();
+while (true) {
+try (IgniteInternalTx tx = 
cache.txStartEx(PESSIMISTIC, REPEATABLE_READ)) {
+Long idx = (Long)cache.invoke(queueKey, new 
PollProcessor(id)).get();
 
-if (idx != null) {
-checkRemoved(idx);
+if (idx != null) {
+checkRemoved(idx);
 
-retVal = (T)cache.getAndRemove(itemKey(idx));
+retVal = (T)cache.getAndRemove(itemKey(idx));
 
-assert retVal != null : idx;
-}
-else
-retVal = null;
+if (retVal == null) { // Possible if data was 
lost.
+tx.commit();
 
-tx.commit();
+continue;
+}
+}
+else
+retVal = null;
 
-return retVal;
+tx.commit();
+
+return retVal;
+}
 }
 }
 }).call();
@@ -188,9 +194,7 @@ public class GridTransactionalCacheQueueImpl extends 
GridCacheQueueAdapter
 if (idx != null) {
 checkRemoved(idx);
 
-boolean rmv = cache.remove(itemKey(idx));
-
-assert rmv : idx;
+cache.remove(itemKey(idx));
 }
 
 tx.commit();

http://git-wip-us.apache.org/repos/asf/ignite/blob/add61614/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java
index cb16aeb..1e15c15 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java
@@ -196,14 +196,14 @@ public abstract class 
GridCacheAbstractDataStructuresFailoverSelfTest extends Ig
   

[1/2] ignite git commit: IGNITE-2068 Reworked java code generation: split to methods.

[akuznetsov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc2 a66b79199 -> 26b093ce0


IGNITE-2068 Reworked java code generation: split to methods.


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

Branch: refs/heads/ignite-843-rc2
Commit: f73b346a5a5ea7003e84c8959ba626693356abb3
Parents: a66b791
Author: Vasiliy Sisko 
Authored: Wed Dec 9 18:00:56 2015 +0700
Committer: Alexey Kuznetsov 
Committed: Wed Dec 9 18:00:56 2015 +0700

--
 .../main/js/helpers/generator/generator-java.js | 192 ---
 1 file changed, 126 insertions(+), 66 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/f73b346a/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
--
diff --git 
a/modules/control-center-web/src/main/js/helpers/generator/generator-java.js 
b/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
index f5714b4..08deb9e 100644
--- a/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
+++ b/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
@@ -26,28 +26,28 @@ $generatorJava = {};
  * @returns {*} String with value that will be valid for java.
  */
 $generatorJava.toJavaCode = function (val, type) {
-if (val == null)
+if (val === null)
 return 'null';
 
-if (type == 'raw')
+if (type === 'raw')
 return val;
 
-if (type == 'class')
+if (type === 'class')
 return val + '.class';
 
-if (type == 'float')
+if (type === 'float')
 return val + 'f';
 
-if (type == 'path')
+if (type === 'path')
 return '"' + val.replace(/\\/g, '') + '"';
 
 if (type)
 return type + '.' + val;
 
-if (typeof(val) == 'string')
+if (typeof(val) === 'string')
 return '"' + val.replace('"', '\\"') + '"';
 
-if (typeof(val) == 'number' || typeof(val) == 'boolean')
+if (typeof(val) === 'number' || typeof(val) === 'boolean')
 return '' + val;
 
 throw "Unknown type: " + typeof(val) + ' (' + val + ')';
@@ -166,7 +166,7 @@ $generatorJava.property = function (res, varName, obj, 
propName, dataType, sette
 var hasDflt = $commonUtils.isDefined(dflt);
 
 // Add to result if no default provided or value not equals to default.
-if (!hasDflt || (hasDflt && val != dflt)) {
+if (!hasDflt || (hasDflt && val !== dflt)) {
 res.emptyLineIfNeeded();
 
 res.line(varName + '.' + $generatorJava.setterName(propName, 
setterName) +
@@ -200,7 +200,7 @@ $generatorJava.listProperty = function (res, varName, obj, 
propName, dataType, s
 res.line(varName + '.' + $generatorJava.setterName(propName, 
setterName) +
 '(Arrays.asList(' +
 _.map(val, function (v) {
-return $generatorJava.toJavaCode(v, dataType)
+return $generatorJava.toJavaCode(v, dataType);
 }).join(', ') +
 '));');
 
@@ -225,7 +225,7 @@ $generatorJava.arrayProperty = function (res, varName, obj, 
propName, setterName
 
 res.line(varName + '.' + $generatorJava.setterName(propName, 
setterName) + '({ ' +
 _.map(val, function (v) {
-return 'new ' + res.importClass(v) + '()'
+return 'new ' + res.importClass(v) + '()';
 }).join(', ') +
 ' });');
 
@@ -496,11 +496,11 @@ $generatorJava.clusterAtomics = function (cluster, res) {
 
 var cacheMode = atomics.cacheMode ? atomics.cacheMode : 'PARTITIONED';
 
-var hasData = cacheMode != 'PARTITIONED';
+var hasData = cacheMode !== 'PARTITIONED';
 
 hasData = $generatorJava.property(res, 'atomicCfg', atomics, 
'atomicSequenceReserveSize') || hasData;
 
-if (cacheMode == 'PARTITIONED')
+if (cacheMode === 'PARTITIONED')
 hasData = $generatorJava.property(res, 'atomicCfg', atomics, 
'backups') || hasData;
 
 res.needEmptyLine = true;
@@ -652,7 +652,7 @@ $generatorJava.clusterEvents = function (cluster, res) {
 if (cluster.includeEventTypes && cluster.includeEventTypes.length > 0) {
 res.emptyLineIfNeeded();
 
-if (cluster.includeEventTypes.length == 1) {
+if (cluster.includeEventTypes.length === 1) {
 res.importClass('org.apache.ignite.events.EventType');
 
 res.line('cfg.setIncludeEventTypes(EventType.' + 
cluster.includeEventTypes[0] + ');');
@@ -739,7 +739,7 @@ $generatorJava.clusterSwap = function (cluster, res) {
 if (!res)
 

[32/51] [abbrv] ignite git commit: Ignite-1.5 - Added missing serialVersionUID to fix the build.

[akuznetsov]

Ignite-1.5 - Added missing serialVersionUID to fix the build.


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

Branch: refs/heads/ignite-843-rc2
Commit: 67ebd02c9a58ef2d835e55e4aa6efdcec6d53b8c
Parents: c292748
Author: Alexey Goncharuk 
Authored: Tue Dec 8 15:09:10 2015 +0300
Committer: Alexey Goncharuk 
Committed: Tue Dec 8 15:09:10 2015 +0300

--
 .../org/apache/ignite/internal/util/GridMessageCollection.java| 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/67ebd02c/modules/core/src/main/java/org/apache/ignite/internal/util/GridMessageCollection.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/util/GridMessageCollection.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/util/GridMessageCollection.java
index 09a5e96..6044bbe 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/util/GridMessageCollection.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/util/GridMessageCollection.java
@@ -34,6 +34,9 @@ import 
org.apache.ignite.plugin.extensions.communication.MessageWriter;
  */
 public final class GridMessageCollection implements Message 
{
 /** */
+private static final long serialVersionUID = 0L;
+
+/** */
 @GridDirectCollection(Message.class)
 private Collection msgs;
 

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

[akuznetsov]

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/ignite-843-rc2
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(-)
--

[08/51] [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.

[akuznetsov]

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/ignite-843-rc2
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("-", "."));
 }
 }
 

[38/51] [abbrv] ignite git commit: IGNITE-1694 : .NET: Use DllImport instead of delegates in P/Invoke.

[akuznetsov]

IGNITE-1694 : .NET: Use DllImport instead of delegates in P/Invoke.


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

Branch: refs/heads/ignite-843-rc2
Commit: 568f910f11472e6ab533c3f1cef6f197456e006f
Parents: efe632b
Author: Pavel Tupitsyn 
Authored: Tue Dec 8 16:35:51 2015 +0300
Committer: vozerov-gridgain 
Committed: Tue Dec 8 16:35:51 2015 +0300

--
 .../Apache.Ignite.Core.csproj   |   1 +
 .../Apache.Ignite.Core/Impl/NativeMethods.cs|  10 -
 .../Impl/Unmanaged/IgniteJniNativeMethods.cs| 358 +
 .../Impl/Unmanaged/UnmanagedUtils.cs| 788 +++
 modules/platforms/dotnet/Apache.Ignite.FxCop| 322 +++-
 5 files changed, 798 insertions(+), 681 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/568f910f/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj 
b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
index 2c7d787..831130c 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
@@ -297,6 +297,7 @@
 
 
 
+
 
 
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/568f910f/modules/platforms/dotnet/Apache.Ignite.Core/Impl/NativeMethods.cs
--
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/NativeMethods.cs 
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/NativeMethods.cs
index 6e25e7e..eb3ba97 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/NativeMethods.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/NativeMethods.cs
@@ -33,15 +33,5 @@ namespace Apache.Ignite.Core.Impl
 [DllImport("kernel32.dll", SetLastError = true, CharSet = 
CharSet.Ansi, BestFitMapping = false, 
 ThrowOnUnmappableChar = true)]
 internal static extern IntPtr LoadLibrary(string path);
-
-/// 
-/// Get procedure address with WinAPI.
-/// 
-/// DLL pointer.
-/// Procedure name.
-/// Procedure address.
-[DllImport("kernel32.dll", SetLastError = true, CharSet = 
CharSet.Ansi, BestFitMapping = false, 
-ThrowOnUnmappableChar = true)]
-internal static extern IntPtr GetProcAddress(IntPtr ptr, string name);
 }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/568f910f/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/IgniteJniNativeMethods.cs
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/IgniteJniNativeMethods.cs
 
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/IgniteJniNativeMethods.cs
new file mode 100644
index 000..860e703
--- /dev/null
+++ 
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/IgniteJniNativeMethods.cs
@@ -0,0 +1,358 @@
+/*
+ * 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.
+ */
+
+namespace Apache.Ignite.Core.Impl.Unmanaged
+{
+using System.Runtime.InteropServices;
+using System.Security;
+
+/// 
+/// Ignite JNI native methods.
+/// 
+[SuppressUnmanagedCodeSecurity]
+internal unsafe static class IgniteJniNativeMethods
+{
+[DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint = 
"IgniteReallocate")]
+public static extern int Reallocate(long memPtr, int cap);
+
+[DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint = 
"IgniteIgnitionStart")]
+public static extern void* IgnitionStart(void* ctx, sbyte* cfgPath, 
sbyte* gridName, int factoryId, 
+long 

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

[akuznetsov]

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/ignite-843-rc2
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

[34/51] [abbrv] ignite git commit: IGNITE-2026: .NET: Fixed stack overflow caused by incorrect unboxing of value types.

[akuznetsov]

IGNITE-2026: .NET: Fixed stack overflow caused by incorrect unboxing of value 
types.


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

Branch: refs/heads/ignite-843-rc2
Commit: efe632b18e760f699bedee906050f66eabadb077
Parents: 8ca163b
Author: Pavel Tupitsyn 
Authored: Tue Dec 8 15:59:23 2015 +0300
Committer: vozerov-gridgain 
Committed: Tue Dec 8 15:59:23 2015 +0300

--
 .../Binary/BinarySelfTest.cs| 67 
 .../Impl/Binary/BinaryReflectiveActions.cs  |  4 +-
 .../Impl/Common/DelegateConverter.cs| 15 +++--
 3 files changed, 78 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/efe632b1/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Binary/BinarySelfTest.cs
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Binary/BinarySelfTest.cs 
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Binary/BinarySelfTest.cs
index 88328ec..9232665 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Binary/BinarySelfTest.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Binary/BinarySelfTest.cs
@@ -1028,6 +1028,20 @@ namespace Apache.Ignite.Core.Tests.Binary
 CheckObject(marsh, new OuterObjectType(), new InnerObjectType());
 }
 
+[Test]
+public void TestStructsReflective()
+{
+var marsh = new Marshaller(new BinaryConfiguration
+{
+TypeConfigurations = new[] {new BinaryTypeConfiguration(typeof 
(ReflectiveStruct))}
+});
+
+var obj = new ReflectiveStruct(15, 28.8);
+var res = marsh.Unmarshal(marsh.Marshal(obj));
+
+Assert.AreEqual(res, obj);
+}
+
 /**
  * Test handles.
  */
@@ -2228,5 +2242,58 @@ namespace Apache.Ignite.Core.Tests.Binary
 return Foo;
 }
 }
+
+private struct ReflectiveStruct : IEquatable
+{
+private readonly int _x;
+private readonly double _y;
+
+public ReflectiveStruct(int x, double y)
+{
+_x = x;
+_y = y;
+}
+
+public int X
+{
+get { return _x; }
+}
+
+public double Y
+{
+get { return _y; }
+}
+
+public bool Equals(ReflectiveStruct other)
+{
+return _x == other._x && _y.Equals(other._y);
+}
+
+public override bool Equals(object obj)
+{
+if (ReferenceEquals(null, obj))
+return false;
+
+return obj is ReflectiveStruct && Equals((ReflectiveStruct) 
obj);
+}
+
+public override int GetHashCode()
+{
+unchecked
+{
+return (_x*397) ^ _y.GetHashCode();
+}
+}
+
+public static bool operator ==(ReflectiveStruct left, 
ReflectiveStruct right)
+{
+return left.Equals(right);
+}
+
+public static bool operator !=(ReflectiveStruct left, 
ReflectiveStruct right)
+{
+return !left.Equals(right);
+}
+}
 }
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/efe632b1/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryReflectiveActions.cs
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryReflectiveActions.cs
 
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryReflectiveActions.cs
index b229898..15509fc 100644
--- 
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryReflectiveActions.cs
+++ 
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryReflectiveActions.cs
@@ -398,9 +398,7 @@ namespace Apache.Ignite.Core.Impl.Binary
 
 // Assign field value
 var targetParam = Expression.Parameter(typeof(object));
-var targetParamConverted = Expression.Convert(targetParam, 
field.DeclaringType);
-var assignExpr = 
Expression.Call(DelegateConverter.GetWriteFieldMethod(field), 
targetParamConverted, 
-readExpr);
+var assignExpr = 
Expression.Call(DelegateConverter.GetWriteFieldMethod(field), targetParam, 
readExpr);
 
 // Compile and return
 return 

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

[akuznetsov]

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/ignite-843-rc2
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}
 
 
 

[42/51] [abbrv] ignite git commit: ignite-1.5 Cache map refactoring. This closes #279.

[akuznetsov]

ignite-1.5 Cache map refactoring. This closes #279.


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

Branch: refs/heads/ignite-843-rc2
Commit: 3baf4d163c6edafa7367ece7901ad1efe695a8d4
Parents: c30def8
Author: sboikov 
Authored: Tue Dec 8 17:30:14 2015 +0300
Committer: sboikov 
Committed: Tue Dec 8 17:30:14 2015 +0300

--
 .../processors/cache/GridCacheAdapter.java  |  65 +-
 .../cache/GridCacheConcurrentMap.java   | 734 +--
 .../processors/cache/GridCacheMapEntry.java |  44 +-
 .../cache/GridCacheMapEntryFactory.java |  13 +-
 .../distributed/GridDistributedCacheEntry.java  |  14 +-
 .../distributed/dht/GridDhtCacheAdapter.java|  13 +-
 .../distributed/dht/GridDhtCacheEntry.java  |  14 +-
 .../dht/GridDhtOffHeapCacheEntry.java   |  15 +-
 .../distributed/dht/GridNoStorageCacheMap.java  |   4 +-
 .../dht/atomic/GridDhtAtomicCache.java  |  23 +-
 .../dht/atomic/GridDhtAtomicCacheEntry.java |  16 +-
 .../atomic/GridDhtAtomicOffHeapCacheEntry.java  |  15 +-
 .../dht/colocated/GridDhtColocatedCache.java|  13 +-
 .../colocated/GridDhtColocatedCacheEntry.java   |  14 +-
 .../GridDhtColocatedOffHeapCacheEntry.java  |  15 +-
 .../colocated/GridDhtDetachedCacheEntry.java|   4 +-
 .../distributed/near/GridNearCacheAdapter.java  |   8 +-
 .../distributed/near/GridNearCacheEntry.java|  16 +-
 .../near/GridNearOffHeapCacheEntry.java |  15 +-
 .../processors/cache/local/GridLocalCache.java  |   8 +-
 .../cache/local/GridLocalCacheEntry.java|  15 +-
 .../local/atomic/GridLocalAtomicCache.java  |   8 +-
 .../ignite/internal/util/IgniteUtils.java   |  18 +-
 .../cache/GridCacheAlwaysEvictionPolicy.java|   2 +-
 .../cache/GridCacheConcurrentMapSelfTest.java   |  11 -
 .../loadtests/hashmap/GridHashMapLoadTest.java  |   4 +-
 26 files changed, 357 insertions(+), 764 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/3baf4d16/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index f96954e..034640f 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -925,25 +925,60 @@ public abstract class GridCacheAdapter implements 
IgniteInternalCache

[24/51] [abbrv] ignite git commit: IGNITE-2083 EntryProcessor is called twice on primary node in transactional cache

[akuznetsov]

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-843-rc2
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() ? txEntry.value() :

[30/51] [abbrv] ignite git commit: ignite-1.5 - MessageCollection + marshalling issue test

[akuznetsov]

ignite-1.5 - MessageCollection + marshalling issue test


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

Branch: refs/heads/ignite-843-rc2
Commit: 322a85a359e0fc2c56f5c3aa38fc48a92e553289
Parents: c077522
Author: S.Vladykin 
Authored: Tue Dec 8 13:17:36 2015 +0300
Committer: S.Vladykin 
Committed: Tue Dec 8 13:17:36 2015 +0300

--
 .../ignite/codegen/MessageCodeGenerator.java|   6 +-
 .../communication/GridIoMessageFactory.java |   8 +-
 .../internal/util/GridMessageCollection.java| 157 +++
 .../internal/util/UUIDCollectionMessage.java|  42 -
 .../testsuites/IgniteUtilSelfTestSuite.java |   2 +
 .../ignite/util/GridMessageCollectionTest.java  | 105 +
 6 files changed, 314 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/322a85a3/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java
--
diff --git 
a/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java
 
b/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java
index 8733bb3..587ad06 100644
--- 
a/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java
+++ 
b/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java
@@ -43,9 +43,6 @@ import org.apache.ignite.internal.GridDirectCollection;
 import org.apache.ignite.internal.GridDirectMap;
 import org.apache.ignite.internal.GridDirectTransient;
 import org.apache.ignite.internal.IgniteCodeGeneratingFail;
-import 
org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridNearAtomicUpdateRequest;
-import 
org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryEntry;
-import org.apache.ignite.internal.util.UUIDCollectionMessage;
 import org.apache.ignite.internal.util.typedef.internal.SB;
 import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.lang.IgniteUuid;
@@ -170,8 +167,9 @@ public class MessageCodeGenerator {
 
 //gen.generateAll(true);
 
-gen.generateAndWrite(GridNearAtomicUpdateRequest.class);
+//gen.generateAndWrite(GridNearAtomicUpdateRequest.class);
 
+//gen.generateAndWrite(GridMessageCollection.class);
 //gen.generateAndWrite(DataStreamerEntry.class);
 
 //gen.generateAndWrite(GridDistributedLockRequest.class);

http://git-wip-us.apache.org/repos/asf/ignite/blob/322a85a3/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
index c9b8e27..b0ef3f4 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
@@ -125,6 +125,7 @@ import 
org.apache.ignite.internal.processors.rest.handlers.task.GridTaskResultRe
 import 
org.apache.ignite.internal.processors.rest.handlers.task.GridTaskResultResponse;
 import org.apache.ignite.internal.util.GridByteArrayList;
 import org.apache.ignite.internal.util.GridLongList;
+import org.apache.ignite.internal.util.GridMessageCollection;
 import org.apache.ignite.internal.util.UUIDCollectionMessage;
 import org.apache.ignite.lang.IgniteOutClosure;
 import org.apache.ignite.plugin.extensions.communication.Message;
@@ -720,7 +721,12 @@ public class GridIoMessageFactory implements 
MessageFactory {
 
 break;
 
-// [-3..119] - this
+case 124:
+msg = new GridMessageCollection<>();
+
+break;
+
+// [-3..119] [124] - this
 // [120..123] - DR
 // [-4..-22] - SQL
 default:

http://git-wip-us.apache.org/repos/asf/ignite/blob/322a85a3/modules/core/src/main/java/org/apache/ignite/internal/util/GridMessageCollection.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/util/GridMessageCollection.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/util/GridMessageCollection.java
new file mode 100644
index 000..09a5e96
--- /dev/null
+++ 

[22/51] [abbrv] ignite git commit: IGNITE-2081 Fixed javadoc.

[akuznetsov]

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-843-rc2
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

[18/51] [abbrv] ignite git commit: IGNITE-2041 Fixed typo.

[akuznetsov]

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/ignite-843-rc2
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");

[37/51] [abbrv] ignite git commit: IGNITE-1694 : .NET: Use DllImport instead of delegates in P/Invoke.

[akuznetsov]

http://git-wip-us.apache.org/repos/asf/ignite/blob/568f910f/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs 
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs
index 9a49fae..56a184d 100644
--- 
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs
+++ 
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs
@@ -19,10 +19,10 @@ namespace Apache.Ignite.Core.Impl.Unmanaged
 {
 using System;
 using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
 using System.Runtime.InteropServices;
 using Apache.Ignite.Core.Common;
-using Apache.Ignite.Core.Impl.Common;
+
+using JNI = IgniteJniNativeMethods;
 
 /// 
 /// Unmanaged utility classes.
@@ -32,544 +32,27 @@ namespace Apache.Ignite.Core.Impl.Unmanaged
 /** Interop factory ID for .Net. */
 private const int InteropFactoryId = 1;
 
-#region PROCEDURE NAMES
-
-private const string ProcReallocate = "IgniteReallocate";
-
-private const string ProcIgnitionStart = "IgniteIgnitionStart";
-private const string ProcIgnitionStop = "IgniteIgnitionStop";
-private const string ProcIgnitionStopAll = "IgniteIgnitionStopAll";
-
-private const string ProcProcessorReleaseStart = 
"IgniteProcessorReleaseStart";
-private const string ProcProcessorProjection = 
"IgniteProcessorProjection";
-private const string ProcProcessorCache = "IgniteProcessorCache";
-private const string ProcProcessorGetOrCreateCache = 
"IgniteProcessorGetOrCreateCache";
-private const string ProcProcessorCreateCache = 
"IgniteProcessorCreateCache";
-private const string ProcProcessorAffinity = "IgniteProcessorAffinity";
-private const string ProcProcessorDataStreamer = 
"IgniteProcessorDataStreamer";
-private const string ProcProcessorTransactions = 
"IgniteProcessorTransactions";
-private const string ProcProcessorCompute = "IgniteProcessorCompute";
-private const string ProcProcessorMessage = "IgniteProcessorMessage";
-private const string ProcProcessorEvents = "IgniteProcessorEvents";
-private const string ProcProcessorServices = "IgniteProcessorServices";
-private const string ProcProcessorExtensions = 
"IgniteProcessorExtensions";
-private const string ProcProcessorAtomicLong = 
"IgniteProcessorAtomicLong";
-
-private const string ProcTargetInStreamOutLong = 
"IgniteTargetInStreamOutLong";
-private const string ProcTargetInStreamOutStream = 
"IgniteTargetInStreamOutStream";
-private const string ProcTargetInStreamOutObject = 
"IgniteTargetInStreamOutObject";
-private const string ProcTargetInObjectStreamOutStream = 
"IgniteTargetInObjectStreamOutStream";
-private const string ProcTargetOutLong = "IgniteTargetOutLong";
-private const string ProcTargetOutStream = "IgniteTargetOutStream";
-private const string ProcTargetOutObject = "IgniteTargetOutObject";
-private const string ProcTargetListenFut = "IgniteTargetListenFuture";
-private const string ProcTargetListenFutForOp = 
"IgniteTargetListenFutureForOperation";
-
-private const string ProcAffinityParts = "IgniteAffinityPartitions";
-
-private const string ProcCacheWithSkipStore = 
"IgniteCacheWithSkipStore";
-private const string ProcCacheWithNoRetries = 
"IgniteCacheWithNoRetries";
-private const string ProcCacheWithExpiryPolicy = 
"IgniteCacheWithExpiryPolicy";
-private const string ProcCacheWithAsync = "IgniteCacheWithAsync";
-private const string ProcCacheWithKeepBinary = 
"IgniteCacheWithKeepPortable";
-private const string ProcCacheClear = "IgniteCacheClear";
-private const string ProcCacheRemoveAll = "IgniteCacheRemoveAll";
-private const string ProcCacheOutOpQueryCursor = 
"IgniteCacheOutOpQueryCursor";
-private const string ProcCacheOutOpContinuousQuery = 
"IgniteCacheOutOpContinuousQuery";
-private const string ProcCacheIterator = "IgniteCacheIterator";
-private const string ProcCacheLocalIterator = 
"IgniteCacheLocalIterator";
-private const string ProcCacheEnterLock = "IgniteCacheEnterLock";
-private const string ProcCacheExitLock = "IgniteCacheExitLock";
-private const string ProcCacheTryEnterLock = "IgniteCacheTryEnterLock";
-private const string ProcCacheCloseLock = "IgniteCacheCloseLock";
-private const string ProcCacheRebalance = "IgniteCacheRebalance";
-private const string ProcCacheSize = "IgniteCacheSize";
-
-private const string ProcCacheStoreCallbackInvoke = 
"IgniteCacheStoreCallbackInvoke";
-
-private const 

[29/51] [abbrv] ignite git commit: ignite-1692 Changed test initialization logic to remove race confition that caused ClusterTopologyServerNotFoundException

[akuznetsov]

ignite-1692 Changed test initialization logic to remove race confition that 
caused ClusterTopologyServerNotFoundException


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

Branch: refs/heads/ignite-843-rc2
Commit: 5cd0039a535b4c2ea7434d4b085c9e18f28c930d
Parents: d579183
Author: sboikov 
Authored: Tue Dec 8 13:12:24 2015 +0300
Committer: sboikov 
Committed: Tue Dec 8 13:12:24 2015 +0300

--
 .../DataStreamProcessorSelfTest.java| 25 
 1 file changed, 15 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/5cd0039a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java
index 65dd690..9fedc35 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java
@@ -206,14 +206,17 @@ public class DataStreamProcessorSelfTest extends 
GridCommonAbstractTest {
 @SuppressWarnings("ErrorNotRethrown")
 private void checkDataStreamer() throws Exception {
 try {
-Ignite g1 = startGrid(1);
-
 useCache = true;
 
-Ignite g2 = startGrid(2);
+Ignite igniteWithCache = startGrid(2);
+
 startGrid(3);
 
-final IgniteDataStreamer ldr = 
g1.dataStreamer(null);
+useCache = false;
+
+Ignite igniteWithoutCache = startGrid(1);
+
+final IgniteDataStreamer ldr = 
igniteWithoutCache.dataStreamer(null);
 
 ldr.receiver(DataStreamerCacheUpdaters.batchedSorted());
 
@@ -255,7 +258,7 @@ public class DataStreamProcessorSelfTest extends 
GridCommonAbstractTest {
 
 assertEquals(total, s2 + s3);
 
-final IgniteDataStreamer rmvLdr = 
g2.dataStreamer(null);
+final IgniteDataStreamer rmvLdr = 
igniteWithCache.dataStreamer(null);
 
 rmvLdr.receiver(DataStreamerCacheUpdaters.batchedSorted());
 
@@ -443,15 +446,17 @@ public class DataStreamProcessorSelfTest extends 
GridCommonAbstractTest {
 // Start all required nodes.
 int idx = 1;
 
-for (int i = 0; i < nodesCntNoCache; i++)
-startGrid(idx++);
-
 useCache = true;
 
 for (int i = 0; i < nodesCntCache; i++)
 startGrid(idx++);
 
-Ignite g1 = grid(1);
+useCache = false;
+
+for (int i = 0; i < nodesCntNoCache; i++)
+startGrid(idx++);
+
+Ignite g1 = grid(idx - 1);
 
 // Get and configure loader.
 final IgniteDataStreamer ldr = 
g1.dataStreamer(null);
@@ -1019,4 +1024,4 @@ public class DataStreamProcessorSelfTest extends 
GridCommonAbstractTest {
 }
 }
 }
-}
\ No newline at end of file
+}

[16/51] [abbrv] ignite git commit: IGNITE-2041 Fixed JDBC cache store example. Reworked from deprecated code to new API and refactored code, made it more simple. Fixed bug in store in case of cache co

[akuznetsov]

 IGNITE-2041 Fixed JDBC cache store example.
 Reworked from deprecated code to new API and refactored code, made it more 
simple.
 Fixed bug in store in case of cache configured keepBinaryInStore(true).
 Added one more auto cache store example: CacheBinaryAutoStoreExample.


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

Branch: refs/heads/ignite-843-rc2
Commit: 92ef7c7ce8229130762b64082cc9455579a05247
Parents: 6a109eb
Author: Alexey Kuznetsov 
Authored: Fri Dec 4 17:57:57 2015 +0700
Committer: Alexey Kuznetsov 
Committed: Fri Dec 4 17:57:57 2015 +0700

--
 examples/config/example-default.xml |   7 +
 .../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 +++
 .../store/jdbc/CacheAbstractJdbcStore.java  |  12 +-
 .../cache/store/jdbc/CacheJdbcPojoStore.java|   9 ++
 11 files changed, 390 insertions(+), 257 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/92ef7c7c/examples/config/example-default.xml
--
diff --git a/examples/config/example-default.xml 
b/examples/config/example-default.xml
index e6c359d..6bd6f16 100644
--- a/examples/config/example-default.xml
+++ b/examples/config/example-default.xml
@@ -28,6 +28,13 @@
 http://www.springframework.org/schema/beans/spring-beans.xsd
 http://www.springframework.org/schema/util
 http://www.springframework.org/schema/util/spring-util.xsd;>
+
+
+
+
+
+
+
 
 
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/92ef7c7c/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
new file mode 100644
index 000..9df9f79
--- /dev/null
+++ 
b/examples/src/main/java/org/apache/ignite/examples/binary/datagrid/store/auto/CacheBinaryAutoStoreExample.java
@@ -0,0 +1,158 @@
+/*
+ * 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.examples.binary.datagrid.store.auto;
+
+import java.sql.Types;
+import java.util.UUID;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.cache.store.jdbc.CacheJdbcPojoStore;
+import org.apache.ignite.cache.store.jdbc.CacheJdbcPojoStoreFactory;
+import org.apache.ignite.cache.store.jdbc.JdbcType;
+import org.apache.ignite.cache.store.jdbc.JdbcTypeField;
+import org.apache.ignite.cache.store.jdbc.dialect.H2Dialect;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.examples.ExampleNodeStartup;
+import org.apache.ignite.examples.util.DbH2ServerStartup;
+import org.apache.ignite.examples.model.Person;
+import org.apache.ignite.transactions.Transaction;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
+
+/**
+ * Demonstrates usage of cache with underlying persistent store configured.
+ * 
+ * This example uses {@link CacheJdbcPojoStore} as a persistent store.
+ * 
+ * To start the example, you should:
+ * 
+ * 

[45/51] [abbrv] ignite git commit: ignite-10 Fix ignite instance [de]serialization

[akuznetsov]

ignite-10 Fix ignite instance [de]serialization


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

Branch: refs/heads/ignite-843-rc2
Commit: 0adee3ae09a86334375b521871539b086215ba92
Parents: 6904724
Author: sboikov 
Authored: Wed Dec 9 09:56:53 2015 +0300
Committer: sboikov 
Committed: Wed Dec 9 09:56:53 2015 +0300

--
 .../messaging/MessagingPingPongExample.java |  4 --
 .../examples/MessagingExamplesSelfTest.java |  2 -
 .../main/java/org/apache/ignite/Ignition.java   | 16 +++
 .../store/jdbc/CacheAbstractJdbcStore.java  |  5 +--
 .../configuration/CacheConfiguration.java   |  1 -
 .../configuration/IgniteConfiguration.java  |  2 -
 .../apache/ignite/internal/IgniteKernal.java|  2 +-
 .../org/apache/ignite/internal/IgnitionEx.java  | 39 +
 .../ignite/internal/MarshallerContextImpl.java  | 23 +-
 .../managers/communication/GridIoManager.java   |  3 +-
 .../internal/portable/BinaryFieldAccessor.java  |  9 ++--
 .../internal/portable/BinaryReaderExImpl.java   | 19 
 .../internal/portable/BinaryWriterExImpl.java   | 19 
 .../internal/portable/PortableContext.java  | 12 ++---
 .../CacheDefaultBinaryAffinityKeyMapper.java|  2 +-
 .../processors/cache/GridCacheProcessor.java|  2 +-
 .../dht/GridDhtAffinityAssignmentResponse.java  |  2 +-
 .../CacheObjectBinaryProcessorImpl.java | 41 +
 .../cache/query/GridCacheQueryManager.java  | 46 ++--
 .../util/nio/GridNioBackPressureControl.java| 14 +-
 .../org/apache/ignite/spi/IgniteSpiThread.java  | 10 ++---
 .../communication/tcp/TcpCommunicationSpi.java  |  6 +--
 .../org/apache/ignite/thread/IgniteThread.java  | 43 ++
 .../ignite/thread/IgniteThreadPoolExecutor.java | 37 ++--
 .../portable/BinaryMarshallerSelfTest.java  |  2 +-
 ...cheAbstractFullApiMultithreadedSelfTest.java |  2 +-
 .../cache/GridCacheAbstractFullApiSelfTest.java |  4 +-
 ...eAbstractDataStructuresFailoverSelfTest.java |  2 -
 .../marshaller/GridMarshallerAbstractTest.java  | 32 +-
 .../testframework/junits/GridAbstractTest.java  |  9 ++--
 .../junits/IgniteTestResources.java |  2 +-
 .../ignite/testsuites/IgniteCacheTestSuite.java |  4 +-
 .../IgnitePortableCacheTestSuite.java   |  3 +-
 ...niteCacheP2pUnmarshallingQueryErrorTest.java |  5 +++
 .../ignite/osgi/AbstractIgniteKarafTest.java|  2 -
 .../ignite/internal/GridFactorySelfTest.java| 29 
 .../GridSpringBeanSerializationSelfTest.java|  2 +
 37 files changed, 252 insertions(+), 205 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/0adee3ae/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingPingPongExample.java
--
diff --git 
a/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingPingPongExample.java
 
b/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingPingPongExample.java
index a2ba227..8571f66 100644
--- 
a/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingPingPongExample.java
+++ 
b/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingPingPongExample.java
@@ -26,7 +26,6 @@ import org.apache.ignite.cluster.ClusterGroup;
 import org.apache.ignite.examples.ExampleNodeStartup;
 import org.apache.ignite.examples.ExamplesUtils;
 import org.apache.ignite.lang.IgniteBiPredicate;
-import org.apache.ignite.resources.IgniteInstanceResource;
 
 /**
  * Demonstrates simple message exchange between local and remote nodes.
@@ -65,9 +64,6 @@ public class MessagingPingPongExample {
 
 // Set up remote player.
 ignite.message(nodeB).remoteListen(null, new 
IgniteBiPredicate() {
-@IgniteInstanceResource
-private Ignite ignite;
-
 @Override public boolean apply(UUID nodeId, String rcvMsg) {
 System.out.println("Received message [msg=" + rcvMsg + ", 
sender=" + nodeId + ']');
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/0adee3ae/examples/src/test/java8/org/apache/ignite/java8/examples/MessagingExamplesSelfTest.java
--
diff --git 
a/examples/src/test/java8/org/apache/ignite/java8/examples/MessagingExamplesSelfTest.java
 
b/examples/src/test/java8/org/apache/ignite/java8/examples/MessagingExamplesSelfTest.java
index c77e4b6..e15159d 100644
--- 

[02/51] [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.

[akuznetsov]

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/ignite-843-rc2
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 

[23/51] [abbrv] ignite git commit: IGNITE-2090 .Net: EventsTest.TestSerialization fails

[akuznetsov]

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-843-rc2
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);
 }
 
 /// 

[51/51] [abbrv] ignite git commit: Merge branches 'ignite-1.5' and 'ignite-843-rc2'

[akuznetsov]

Merge branches 'ignite-1.5' and 'ignite-843-rc2'


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

Branch: refs/heads/ignite-843-rc2
Commit: 4b2dd7c8d8ec88686e6d0ed2c083598965517636
Parents: 26b093c 3ba7e54
Author: Alexey Kuznetsov 
Authored: Wed Dec 9 18:23:36 2015 +0700
Committer: Alexey Kuznetsov 
Committed: Wed Dec 9 18:24:01 2015 +0700

--
 RELEASE_NOTES.txt   |   1 +
 bin/ignite.bat  |   5 +-
 bin/include/parseargs.bat   |   2 +-
 examples/config/example-default.xml |   7 +
 examples/pom.xml|   4 +-
 examples/schema-import/pom.xml  |   4 +-
 .../java/org/apache/ignite/schema/Demo.java |   6 +-
 .../store/auto/CacheBinaryAutoStoreExample.java | 158 
 .../datagrid/store/auto/package-info.java   |  22 +
 .../store/auto/CacheAutoStoreExample.java   |  94 ++-
 .../auto/CacheAutoStoreLoadDataExample.java |  85 --
 .../datagrid/store/auto/CacheConfig.java|  81 --
 .../datagrid/store/auto/DbH2ServerStartup.java  |  79 --
 .../messaging/MessagingPingPongExample.java |   4 -
 .../ignite/examples/util/DbH2ServerStartup.java |  79 ++
 .../ignite/examples/util/package-info.java  |  22 +
 .../examples/MessagingExamplesSelfTest.java |   2 -
 modules/aop/pom.xml |  14 +-
 modules/apache-license-gen/pom.xml  |   2 +-
 modules/aws/pom.xml |  20 +-
 modules/camel/pom.xml   |  13 +-
 modules/clients/pom.xml |   2 +-
 modules/cloud/pom.xml   |   2 +-
 modules/codegen/pom.xml |   2 +-
 .../ignite/codegen/MessageCodeGenerator.java|   6 +-
 modules/control-center-agent/pom.xml|   2 +-
 modules/control-center-web/pom.xml  |   2 +-
 modules/core/pom.xml|  30 +-
 .../main/java/org/apache/ignite/Ignition.java   |  16 +
 .../store/jdbc/CacheAbstractJdbcStore.java  |  17 +-
 .../cache/store/jdbc/CacheJdbcPojoStore.java|   9 +
 .../configuration/CacheConfiguration.java   |  39 +-
 .../configuration/IgniteConfiguration.java  |   6 +-
 .../configuration/TransactionConfiguration.java |  47 +-
 .../apache/ignite/internal/GridComponent.java   |   3 +-
 .../ignite/internal/GridPluginComponent.java|   4 +-
 .../apache/ignite/internal/IgniteKernal.java|  20 +-
 .../org/apache/ignite/internal/IgnitionEx.java  |  39 +-
 .../ignite/internal/MarshallerContextImpl.java  |  30 +-
 .../internal/managers/GridManagerAdapter.java   |   5 +-
 .../managers/communication/GridIoManager.java   |   3 +-
 .../communication/GridIoMessageFactory.java |   8 +-
 .../deployment/GridDeploymentManager.java   |   5 +-
 .../internal/portable/BinaryFieldAccessor.java  |   9 +-
 .../internal/portable/BinaryReaderExImpl.java   |  21 +-
 .../internal/portable/BinaryWriterExImpl.java   |  24 +-
 .../portable/PortableClassDescriptor.java   |  46 +-
 .../internal/portable/PortableContext.java  |  46 +-
 .../processors/GridProcessorAdapter.java|   5 +-
 .../CacheDefaultBinaryAffinityKeyMapper.java|   2 +-
 .../processors/cache/GridCacheAdapter.java  |  65 +-
 .../cache/GridCacheConcurrentMap.java   | 734 +
 .../processors/cache/GridCacheContext.java  |  36 +-
 .../processors/cache/GridCacheIoManager.java|   2 +-
 .../processors/cache/GridCacheMapEntry.java |  44 +-
 .../cache/GridCacheMapEntryFactory.java |  13 +-
 .../GridCachePartitionExchangeManager.java  |  17 +-
 .../processors/cache/GridCachePreloader.java|  11 +-
 .../processors/cache/GridCacheProcessor.java|  28 +-
 .../CacheDataStructuresManager.java |  31 +-
 .../distributed/GridDistributedCacheEntry.java  |  14 +-
 .../dht/GridDhtAffinityAssignmentResponse.java  |   2 +-
 .../distributed/dht/GridDhtCacheAdapter.java|  13 +-
 .../distributed/dht/GridDhtCacheEntry.java  |  14 +-
 .../dht/GridDhtOffHeapCacheEntry.java   |  15 +-
 .../distributed/dht/GridDhtTxPrepareFuture.java |  51 +-
 .../distributed/dht/GridNoStorageCacheMap.java  |   4 +-
 .../dht/atomic/GridDhtAtomicCache.java  |  43 +-
 .../dht/atomic/GridDhtAtomicCacheEntry.java |  16 +-
 .../atomic/GridDhtAtomicOffHeapCacheEntry.java  |  15 +-
 .../dht/colocated/GridDhtColocatedCache.java|  13 +-
 .../colocated/GridDhtColocatedCacheEntry.java   |  14 +-
 .../GridDhtColocatedOffHeapCacheEntry.java  |  15 +-
 .../colocated/GridDhtDetachedCacheEntry.java|   4 +-
 

[15/51] [abbrv] ignite git commit: Javadoc hotfix

[akuznetsov]

Javadoc hotfix


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

Branch: refs/heads/ignite-843-rc2
Commit: 6a109ebd4c637b3ec6e298ae8cf785c422abebc1
Parents: d5fa3c1
Author: Anton Vinogradov 
Authored: Fri Dec 4 13:42:25 2015 +0300
Committer: Anton Vinogradov 
Committed: Fri Dec 4 13:42:25 2015 +0300

--
 parent/pom.xml | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/6a109ebd/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 4fd7156..68ba62b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -428,6 +428,10 @@
 Spark Integration
 
org.apache.ignite.spark.examples.java
 
+
+OSGi integration
+org.apache.ignite.osgi*
+
 
 
 

[48/51] [abbrv] ignite git commit: IGNITE-2064 Fixed Usage of Optimize classloader test coverage

[akuznetsov]

IGNITE-2064 Fixed Usage of Optimize classloader test coverage


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

Branch: refs/heads/ignite-843-rc2
Commit: afbb0dc0c1323b1b24d1a6f4f46fc78d255c98a4
Parents: d078655
Author: Anton Vinogradov 
Authored: Wed Dec 9 12:59:51 2015 +0300
Committer: Anton Vinogradov 
Committed: Wed Dec 9 12:59:51 2015 +0300

--
 .../internal/portable/BinaryMarshallerSelfTest.java   | 14 +-
 1 file changed, 13 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/afbb0dc0/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryMarshallerSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryMarshallerSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryMarshallerSelfTest.java
index a06e6c3..d667e07 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryMarshallerSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryMarshallerSelfTest.java
@@ -80,6 +80,7 @@ import sun.misc.Unsafe;
 
 import static 
org.apache.ignite.internal.portable.streams.PortableMemoryAllocator.INSTANCE;
 import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertNotEquals;
 
 /**
  * Portable marshaller tests.
@@ -329,6 +330,17 @@ public class BinaryMarshallerSelfTest extends 
GridCommonAbstractTest {
 /**
  * @throws Exception If failed.
  */
+public void testException() throws Exception {
+Exception ex = new RuntimeException();
+
+// Checks that Optimize marshaller will be used, because Throwable has 
writeObject method.
+// Exception's stacktrace equals to zero-length array by default and 
generates at Throwable's writeObject method.
+assertNotEquals(0, marshalUnmarshal(ex).getStackTrace().length);
+}
+
+/**
+ * @throws Exception If failed.
+ */
 public void testCollection() throws Exception {
 testCollection(new ArrayList(3));
 testCollection(new LinkedHashSet());
@@ -2406,7 +2418,7 @@ public class BinaryMarshallerSelfTest extends 
GridCommonAbstractTest {
 protected boolean compactFooter() {
 return true;
 }
-
+
 /**
  * @param marsh Marshaller.
  * @return Portable context.

[12/51] [abbrv] ignite git commit: IGNITE-2019 Fixed schema import on Mac OSX El Capitan. - Fixes #292.

[akuznetsov]

IGNITE-2019 Fixed schema import on Mac OSX El Capitan. - Fixes #292.

Signed-off-by: Andrey 


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

Branch: refs/heads/ignite-843-rc2
Commit: 11d668b2f77b12e7dc9bbc8ebdbfeb5e2ddad716
Parents: e6f6f40
Author: Andrey 
Authored: Fri Dec 4 15:52:14 2015 +0700
Committer: Andrey 
Committed: Fri Dec 4 15:52:14 2015 +0700

--
 .../org/apache/ignite/schema/ui/SchemaImportApp.java  | 14 ++
 1 file changed, 14 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/11d668b2/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/SchemaImportApp.java
--
diff --git 
a/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/SchemaImportApp.java
 
b/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/SchemaImportApp.java
index 495c316..6f9e05b 100644
--- 
a/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/SchemaImportApp.java
+++ 
b/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/SchemaImportApp.java
@@ -22,6 +22,7 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.lang.reflect.Field;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.sql.Connection;
@@ -1738,6 +1739,19 @@ public class SchemaImportApp extends Application {
 catch (Exception ignore) {
 // No-op.
 }
+
+// Workaround for JDK 7/JavaFX 2 application on Mac OSX El Capitan.
+try {
+Class fontFinderCls = 
Class.forName("com.sun.t2k.MacFontFinder");
+
+Field psNameToPathMap = 
fontFinderCls.getDeclaredField("psNameToPathMap");
+
+psNameToPathMap.setAccessible(true);
+psNameToPathMap.set(null, new HashMap());
+}
+catch (Exception ignore) {
+// No-op.
+}
 }
 
 launch(args);

[09/51] [abbrv] ignite git commit: Fixed failover tests for binary marshaller

[akuznetsov]

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/ignite-843-rc2
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;
 

[01/51] [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.

[akuznetsov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc2 26b093ce0 -> 4b2dd7c8d


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

[49/51] [abbrv] ignite git commit: IGNITE-2108 Fixed cache store examples.

[akuznetsov]

IGNITE-2108 Fixed cache store examples.


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

Branch: refs/heads/ignite-843-rc2
Commit: e0ffc29593648391d7f45d7879451a687fca6e81
Parents: 5ea19a4
Author: Alexey Kuznetsov 
Authored: Wed Dec 9 17:52:02 2015 +0700
Committer: Alexey Kuznetsov 
Committed: Wed Dec 9 17:52:02 2015 +0700

--
 .../java/org/apache/ignite/schema/Demo.java |  6 ++-
 .../store/auto/CacheAutoStoreExample.java   | 49 ++--
 2 files changed, 29 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/e0ffc295/examples/schema-import/src/main/java/org/apache/ignite/schema/Demo.java
--
diff --git 
a/examples/schema-import/src/main/java/org/apache/ignite/schema/Demo.java 
b/examples/schema-import/src/main/java/org/apache/ignite/schema/Demo.java
index a981f5a..a8934cb 100644
--- a/examples/schema-import/src/main/java/org/apache/ignite/schema/Demo.java
+++ b/examples/schema-import/src/main/java/org/apache/ignite/schema/Demo.java
@@ -41,11 +41,13 @@ public class Demo {
  * Constructs and returns a fully configured instance of a {@link 
CacheJdbcPojoStoreFactory}.
  */
 private static class H2DemoStoreFactory extends 
CacheJdbcPojoStoreFactory {
-/** Default constructor. */
-H2DemoStoreFactory() {
+/** {@inheritDoc} */
+@Override public CacheJdbcPojoStore create() {
 setDialect(new H2Dialect());
 
 
setDataSource(JdbcConnectionPool.create("jdbc:h2:tcp://localhost/~/schema-import/demo",
 "sa", ""));
+
+return super.create();
 }
 }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/e0ffc295/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 5498e57..7d21fce 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
@@ -65,30 +65,9 @@ public class CacheAutoStoreExample {
 private static final class CacheJdbcPojoStoreExampleFactory extends 
CacheJdbcPojoStoreFactory {
 /** {@inheritDoc} */
 @Override public CacheJdbcPojoStore create() {
-JdbcType jdbcType = new JdbcType();
+
setDataSource(JdbcConnectionPool.create("jdbc:h2:tcp://localhost/mem:ExampleDb",
 "sa", ""));
 
-jdbcType.setCacheName(CACHE_NAME);
-jdbcType.setDatabaseSchema("PUBLIC");
-jdbcType.setDatabaseTable("PERSON");
-
-jdbcType.setKeyType("java.lang.Long");
-jdbcType.setKeyFields(new JdbcTypeField(Types.BIGINT, "ID", 
Long.class, "id"));
-
-jdbcType.setValueType("org.apache.ignite.examples.model.Person");
-jdbcType.setValueFields(
-new JdbcTypeField(Types.BIGINT, "ID", Long.class, "id"),
-new JdbcTypeField(Types.VARCHAR, "FIRST_NAME", 
String.class, "firstName"),
-new JdbcTypeField(Types.VARCHAR, "LAST_NAME", 
String.class, "lastName")
-);
-
-CacheJdbcPojoStore store = new 
CacheJdbcPojoStore<>();
-
-
store.setDataSource(JdbcConnectionPool.create("jdbc:h2:tcp://localhost/mem:ExampleDb",
 "sa", ""));
-store.setDialect(new H2Dialect());
-
-store.setTypes(jdbcType);
-
-return store;
+return super.create();
 }
 }
 
@@ -98,7 +77,29 @@ public class CacheAutoStoreExample {
 private static CacheConfiguration cacheConfiguration() {
 CacheConfiguration cfg = new 
CacheConfiguration<>(CACHE_NAME);
 
-cfg.setCacheStoreFactory(new CacheJdbcPojoStoreExampleFactory());
+CacheJdbcPojoStoreExampleFactory storeFactory = new 
CacheJdbcPojoStoreExampleFactory();
+
+storeFactory.setDialect(new H2Dialect());
+
+JdbcType jdbcType = new JdbcType();
+
+jdbcType.setCacheName(CACHE_NAME);
+jdbcType.setDatabaseSchema("PUBLIC");
+jdbcType.setDatabaseTable("PERSON");
+
+jdbcType.setKeyType("java.lang.Long");
+jdbcType.setKeyFields(new 

[17/51] [abbrv] ignite git commit: ignite-1.5 - release notes

[akuznetsov]

ignite-1.5 - release notes


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

Branch: refs/heads/ignite-843-rc2
Commit: 23ead500762095300417759a30c08cd76daf210d
Parents: 92ef7c7
Author: Yakov Zhdanov 
Authored: Fri Dec 4 17:28:50 2015 +0300
Committer: Yakov Zhdanov 
Committed: Fri Dec 4 17:28:50 2015 +0300

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


http://git-wip-us.apache.org/repos/asf/ignite/blob/23ead500/RELEASE_NOTES.txt
--
diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt
index f7f48fa..243ec18 100644
--- a/RELEASE_NOTES.txt
+++ b/RELEASE_NOTES.txt
@@ -11,6 +11,7 @@ Apache Ignite In-Memory Data Fabric 1.5
 * Added MQTT Streamer.
 * Added Twitter Streamer.
 * Added Ignite Sink (integration with Apache Flume).
+* Fixed optimistic serializable transactions: implemented "deadlock-free" 
locking algorithm.
 * Fixed failover for continuous queries.
 * Fixed compilation and runtime errors under OpenJDK and IBM JDK.
 * Fixed Integer.size limitation for cache.

[43/51] [abbrv] ignite git commit: Fix OSGi test.

[akuznetsov]

Fix OSGi test.

(@ProbeBuilder applies to all test classes when run from a suite).


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

Branch: refs/heads/ignite-843-rc2
Commit: bdbe4068b3851f7a412935acb3e36860cd08efa9
Parents: 3baf4d1
Author: Raul Kripalani 
Authored: Tue Dec 8 21:04:36 2015 +0100
Committer: Raul Kripalani 
Committed: Tue Dec 8 21:04:36 2015 +0100

--
 .../test/java/org/apache/ignite/osgi/IgniteOsgiServiceTest.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/bdbe4068/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteOsgiServiceTest.java
--
diff --git 
a/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteOsgiServiceTest.java 
b/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteOsgiServiceTest.java
index 9a2e92d..4f875ed 100644
--- 
a/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteOsgiServiceTest.java
+++ 
b/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteOsgiServiceTest.java
@@ -93,7 +93,7 @@ public class IgniteOsgiServiceTest extends 
AbstractIgniteKarafTest {
  */
 @ProbeBuilder
 public TestProbeBuilder probeConfiguration(TestProbeBuilder probe) {
-probe.setHeader(Constants.IMPORT_PACKAGE, 
"*,org.apache.ignite.osgi.activators");
+probe.setHeader(Constants.IMPORT_PACKAGE, 
"*,org.apache.ignite.osgi.activators;resolution:=\"optional\"");
 
 return probe;
 }

[27/51] [abbrv] ignite git commit: 1.5.0-b2-SNAPSHOT

[akuznetsov]

1.5.0-b2-SNAPSHOT


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

Branch: refs/heads/ignite-843-rc2
Commit: 3b26859bd64b7ddbc9d0b8094663887784b4f2cf
Parents: c077522
Author: Ignite Teamcity 
Authored: Tue Dec 8 11:32:26 2015 +0300
Committer: Ignite Teamcity 
Committed: Tue Dec 8 11:32:26 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/osgi-karaf/pom.xml | 5 ++---
 modules/osgi-paxlogging/pom.xml| 6 ++
 modules/osgi/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| 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 +-
 

[33/51] [abbrv] ignite git commit: IGNITE-2064 More test fixes

[akuznetsov]

IGNITE-2064 More test fixes


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

Branch: refs/heads/ignite-843-rc2
Commit: 8ca163bd0f06cc832df126733dbbe50cea35c2ac
Parents: 67ebd02
Author: Anton Vinogradov 
Authored: Tue Dec 8 15:46:10 2015 +0300
Committer: Anton Vinogradov 
Committed: Tue Dec 8 15:46:10 2015 +0300

--
 .../GridCacheConditionalDeploymentSelfTest.java | 20 
 .../cache/GridCacheDeploymentSelfTest.java  | 11 ---
 2 files changed, 20 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/8ca163bd/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConditionalDeploymentSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConditionalDeploymentSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConditionalDeploymentSelfTest.java
index c03eb08..4098225 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConditionalDeploymentSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConditionalDeploymentSelfTest.java
@@ -18,11 +18,11 @@
 package org.apache.ignite.internal.processors.cache;
 
 import org.apache.ignite.Ignite;
-import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.Ignition;
 import org.apache.ignite.configuration.CacheConfiguration;
 import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.internal.managers.communication.GridIoMessageFactory;
+import org.apache.ignite.internal.portable.BinaryMarshaller;
 import org.apache.ignite.internal.util.IgniteUtils;
 import org.apache.ignite.internal.util.typedef.CO;
 import org.apache.ignite.plugin.extensions.communication.Message;
@@ -139,19 +139,23 @@ public class GridCacheConditionalDeploymentSelfTest 
extends GridCommonAbstractTe
 public void testAddedDeploymentInfo2() throws Exception {
 GridCacheContext ctx = cacheContext();
 
-assertTrue(ctx.deploymentEnabled());
+if (grid(0).configuration().getMarshaller() instanceof 
BinaryMarshaller)
+assertFalse(ctx.deploymentEnabled());
+else {
+assertTrue(ctx.deploymentEnabled());
 
-GridCacheIoManager ioMgr = cacheIoManager();
+GridCacheIoManager ioMgr = cacheIoManager();
 
-TestMessage msg = new TestMessage();
+TestMessage msg = new TestMessage();
 
-assertNull(msg.deployInfo());
+assertNull(msg.deployInfo());
 
-msg.addDepInfo = false;
+msg.addDepInfo = false;
 
-IgniteUtils.invoke(GridCacheIoManager.class, ioMgr, "onSend", msg, 
grid(1).cluster().localNode().id());
+IgniteUtils.invoke(GridCacheIoManager.class, ioMgr, "onSend", msg, 
grid(1).cluster().localNode().id());
 
-assertNull(msg.deployInfo());
+assertNull(msg.deployInfo());
+}
 }
 
 protected GridCacheContext cacheContext() {

http://git-wip-us.apache.org/repos/asf/ignite/blob/8ca163bd/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
index e18520d..aa64959 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
@@ -26,6 +26,7 @@ import org.apache.ignite.configuration.CacheConfiguration;
 import org.apache.ignite.configuration.DeploymentMode;
 import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.configuration.NearCacheConfiguration;
+import org.apache.ignite.internal.portable.BinaryMarshaller;
 import org.apache.ignite.internal.util.typedef.T2;
 import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
@@ -207,7 +208,9 @@ public class GridCacheDeploymentSelfTest extends 
GridCommonAbstractTest {
 }
 
 assertEquals(0, g1.cache(null).localSize());
-assertEquals(0, g2.cache(null).localSize());
+
+

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

[akuznetsov]

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
 
 
 

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

[akuznetsov]

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/ignite-843-rc2
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;
 }

[26/51] [abbrv] ignite git commit: HashMap's offset retrieval in HashSet class definition for legacy IBM JRE

[akuznetsov]

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-843-rc2
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
+}

[36/51] [abbrv] ignite git commit: IGNITE-1694 : .NET: Use DllImport instead of delegates in P/Invoke.

[akuznetsov]

http://git-wip-us.apache.org/repos/asf/ignite/blob/568f910f/modules/platforms/dotnet/Apache.Ignite.FxCop
--
diff --git a/modules/platforms/dotnet/Apache.Ignite.FxCop 
b/modules/platforms/dotnet/Apache.Ignite.FxCop
index 5c7f7f1..0df73c5 100644
--- a/modules/platforms/dotnet/Apache.Ignite.FxCop
+++ b/modules/platforms/dotnet/Apache.Ignite.FxCop
@@ -107,11 +107,329 @@



-   
+   
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+   

   
   
   
  
- 
+ 
+  
+   
+
+ 
+  
+   
+
+ 
+  
+   
+
+ 
+  
+   'IBinaryReader.GetRawReader()'
+  
+ 
+
+   
+  
+ 
+ 
+  
+   
+
+ 
+  
+   'IBinaryWriter.GetRawWriter()'
+  
+ 
+
+   
+  
+ 
+ 
+  
+   
+
+ 
+  
+   'IIgniteBinary.GetBinaryTypes()'
+  
+ 
+
+   
+  
+ 
+
+   
+   
+
+ 
+  
+   
+
+ 
+  
+   'value'
+  
+ 
+
+   
+  
+ 
+
+   
+   
+
+ 
+  
+   
+
+ 
+  
+   
'ComputeJobAdapterT.GetArgumentTArg(int)'
+   'IndexOutOfRangeException'
+  
+ 
+
+   
+  
+ 
+
+   
+   
+
+ 
+  
+   
+
+ 
+  
+   'IEvents.GetEnabledEvents()'
+  
+ 
+
+   
+  
+ 
+
+   
+   
+
+ 
+  
+   
+
+ 
+  
+   'IgniteUtils'
+  
+ 
+
+   
+  
+ 
+
+   
+   
+
+ 
+  
+   
+
+ 
+  
+   'string.Format(string, object)'
+   'BinaryReader.DeserializeT()'
+   'string.Format(IFormatProvider, string, params 
object[])'
+  
+ 
+
+   
+   
+
+ 
+  
+   'string.Format(string, object, object)'
+   'BinaryReader.IsNotNullHeader(byte)'
+   'string.Format(IFormatProvider, string, params 
object[])'
+  
+ 
+
+   
+  
+ 
+ 
+  
+   
+
+ 
+  
+   'string.Format(string, object, object, object)'
+   'Marshaller.AddType(Type, int, string, bool, bool, 
IBinaryNameMapper, IBinaryIdMapper, IBinarySerializer, string)'
+   'string.Format(IFormatProvider, string, params 
object[])'
+  
+ 
+
+   
+  
+ 
+
+   
+   
+
+ 
+  
+   
+
+ 
+  
+   'Classpath.AppendHomeClasspath(string, bool, 
StringBuilder)'
+   'string.EndsWith(string)'
+   'string.EndsWith(string, StringComparison)'
+  
+ 
+
+   
+   
+
+ 
+  
+   'Classpath.CreateClasspath(string, IgniteConfiguration, 
bool)'
+   'string.EndsWith(string)'
+   'string.EndsWith(string, StringComparison)'
+  
+ 
+
+   
+  
+ 
+ 
+  
+   
+
+ 
+  
+   'FutureT.OnNullResult()'
+   'Exception'
+  
+ 
+
+   
+  
+ 
+ 
+  
+   
+
+ 
+  
+   'string.Format(string, object)'
+   'IgniteHome.Resolve(IgniteConfiguration)'
+   'string.Format(IFormatProvider, string, params 
object[])'
+  
+ 
+ 
+  
+   'string.Format(string, object, object)'
+   'IgniteHome.Resolve(IgniteConfiguration)'
+   'string.Format(IFormatProvider, string, params 
object[])'
+  
+ 
+
+   
+  
+ 
+
+   
+   
+
+ 
+  
+   
+   

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

[akuznetsov]

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

Branch: refs/heads/ignite-843-rc2
Commit: 0e81a3973cccfe6d912e073cd9f44db5a5c46d79
Parents: 568f910 3a34003
Author: vozerov-gridgain 
Authored: Tue Dec 8 16:36:12 2015 +0300
Committer: vozerov-gridgain 
Committed: Tue Dec 8 16:36:12 2015 +0300

--
 .../config/benchmark-failover.properties|  2 +-
 ...IgniteTransactionalWriteInvokeBenchmark.java | 42 +++-
 2 files changed, 33 insertions(+), 11 deletions(-)
--

[03/51] [abbrv] ignite git commit: Hotfix IGNITE-2079

[akuznetsov]

Hotfix IGNITE-2079


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

Branch: refs/heads/ignite-843-rc2
Commit: dc0131da6582fb0f0d1ff25c62eb7462e5f460af
Parents: 86ec37e
Author: Anton Vinogradov 
Authored: Thu Dec 3 16:52:26 2015 +0300
Committer: Anton Vinogradov 
Committed: Thu Dec 3 16:52:26 2015 +0300

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


http://git-wip-us.apache.org/repos/asf/ignite/blob/dc0131da/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
index b06526e..9a391e5 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
@@ -562,7 +562,7 @@ public class GridCacheIoManager extends 
GridCacheSharedManagerAdapter {
 
 default:
 throw new IgniteCheckedException("Failed to send response to 
node. Unsupported direct type [message="
-+ msg + "]");
++ msg + "]", msg.classError());
 }
 }
 

[41/51] [abbrv] ignite git commit: ignite-1.5 Cache map refactoring. This closes #279.

[akuznetsov]

http://git-wip-us.apache.org/repos/asf/ignite/blob/3baf4d16/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java
index 1f494c0..5bb6794 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java
@@ -220,8 +220,6 @@ public class GridCacheConcurrentMapSelfTest extends 
GridCommonAbstractTest {
 Thread.sleep(1000);
 
 jcache().get(rand.nextInt(cnt));
-
-assertEquals(0, local().map.iteratorMapSize());
 }
 
 /**
@@ -315,8 +313,6 @@ public class GridCacheConcurrentMapSelfTest extends 
GridCommonAbstractTest {
 Thread.sleep(1000);
 
 jcache().get(rand.nextInt(cnt));
-
-assertEquals(0, local().map.iteratorMapSize());
 }
 
 /**
@@ -352,14 +348,7 @@ public class GridCacheConcurrentMapSelfTest extends 
GridCommonAbstractTest {
 System.gc();
 
 c.get(100);
-
-if (local().map.iteratorMapSize() == 0)
-break;
-else
-U.sleep(500);
 }
-
-assertEquals(0, local().map.iteratorMapSize());
 }
 }
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/3baf4d16/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridHashMapLoadTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridHashMapLoadTest.java
 
b/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridHashMapLoadTest.java
index a41f6c8..b459dde 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridHashMapLoadTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridHashMapLoadTest.java
@@ -81,7 +81,7 @@ public class GridHashMapLoadTest extends 
GridCommonAbstractTest {
 Integer val = i++;
 
 map.put(key, new GridCacheMapEntry(ctx, ctx.toCacheKeyObject(key),
-key.hashCode(), ctx.toCacheObject(val), null, 1) {
+key.hashCode(), ctx.toCacheObject(val)) {
 @Override public boolean tmLock(IgniteInternalTx tx,
 long timeout,
 @Nullable GridCacheVersion serOrder,
@@ -103,4 +103,4 @@ public class GridHashMapLoadTest extends 
GridCommonAbstractTest {
 info("Inserted objects: " + i / 2);
 }
 }
-}
\ No newline at end of file
+}

[44/51] [abbrv] ignite git commit: ignite-2030 Fixed issue with JAVA_HOME containing parenthesis

[akuznetsov]

ignite-2030  Fixed issue with JAVA_HOME containing parenthesis


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

Branch: refs/heads/ignite-843-rc2
Commit: 69047243bb1de980647711a59573bf44e69761eb
Parents: bdbe406
Author: sboikov 
Authored: Wed Dec 9 09:27:23 2015 +0300
Committer: sboikov 
Committed: Wed Dec 9 09:27:23 2015 +0300

--
 bin/ignite.bat| 5 +++--
 bin/include/parseargs.bat | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/69047243/bin/ignite.bat
--
diff --git a/bin/ignite.bat b/bin/ignite.bat
index 43cc58b..97c2e45 100644
--- a/bin/ignite.bat
+++ b/bin/ignite.bat
@@ -20,6 +20,7 @@
 ::
 
 @echo off
+Setlocal EnableDelayedExpansion
 
 if "%OS%" == "Windows_NT"  setlocal
 
@@ -119,7 +120,7 @@ if %ERRORLEVEL% neq 0 (
 :: Process 'restart'.
 ::
 set RANDOM_NUMBER_COMMAND="%JAVA_HOME%\bin\java.exe" -cp %CP% 
org.apache.ignite.startup.cmdline.CommandLineRandomNumberGenerator
-for /f "usebackq tokens=*" %%i in (`"%RANDOM_NUMBER_COMMAND%"`) do set 
RANDOM_NUMBER=%%i
+for /f "usebackq tokens=*" %%i in (`%RANDOM_NUMBER_COMMAND%`) do set 
RANDOM_NUMBER=%%i
 
 set RESTART_SUCCESS_FILE="%IGNITE_HOME%\work\ignite_success_%RANDOM_NUMBER%"
 set RESTART_SUCCESS_OPT=-DIGNITE_SUCCESS_FILE=%RESTART_SUCCESS_FILE%
@@ -132,7 +133,7 @@ set 
RESTART_SUCCESS_OPT=-DIGNITE_SUCCESS_FILE=%RESTART_SUCCESS_FILE%
 :: This is executed if -nojmx is not specified
 ::
 if not "%NO_JMX%" == "1" (
-for /F "tokens=*" %%A in ('""%JAVA_HOME%\bin\java" -cp %CP% 
org.apache.ignite.internal.util.portscanner.GridJmxPortFinder"') do (
+for /F "tokens=*" %%A in ('""!JAVA_HOME!\bin\java" -cp %CP% 
org.apache.ignite.internal.util.portscanner.GridJmxPortFinder"') do (
 set JMX_PORT=%%A
 )
 )

http://git-wip-us.apache.org/repos/asf/ignite/blob/69047243/bin/include/parseargs.bat
--
diff --git a/bin/include/parseargs.bat b/bin/include/parseargs.bat
index c4b35d2..86e5766 100644
--- a/bin/include/parseargs.bat
+++ b/bin/include/parseargs.bat
@@ -40,7 +40,7 @@
 :: in other scripts to parse common command lines parameters.
 
 set convertArgsCmd="%JAVA_HOME%\bin\java.exe" -cp %CP% 
org.apache.ignite.startup.cmdline.CommandLineTransformer %*
-for /f "usebackq tokens=*" %%i in (`"%convertArgsCmd%"`) do set 
reformattedArgs=%%i
+for /f "usebackq tokens=*" %%i in (`%convertArgsCmd%`) do set 
reformattedArgs=%%i
 
 for %%i in (%reformattedArgs%) do (
 if "%%i" == "CommandLineTransformerError" exit /b 1

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

[akuznetsov]

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) 

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

[akuznetsov]

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

Branch: refs/heads/ignite-1.5
Commit: 3ba7e541caa8f2dd2c4301203b07bfc58ef4cabb
Parents: e0ffc29 afbb0dc
Author: Alexey Kuznetsov 
Authored: Wed Dec 9 17:53:04 2015 +0700
Committer: Alexey Kuznetsov 
Committed: Wed Dec 9 17:53:04 2015 +0700

--
 .../portable/PortableClassDescriptor.java   | 46 ++--
 .../portable/BinaryMarshallerSelfTest.java  | 14 +-
 2 files changed, 36 insertions(+), 24 deletions(-)
--

[1/9] ignite git commit: IGNITE-2099: WIP.

[vozerov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-2099 [created] 9ff351b50


IGNITE-2099: WIP.


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

Branch: refs/heads/ignite-2099
Commit: 86f4892dced3f4ed6b3dcfb59f639aaa9cc53f77
Parents: 0adee3a
Author: vozerov-gridgain 
Authored: Wed Dec 9 12:53:00 2015 +0300
Committer: vozerov-gridgain 
Committed: Wed Dec 9 12:53:00 2015 +0300

--
 .../ignite/binary/BinaryCollectionFactory.java  | 33 
 .../apache/ignite/binary/BinaryMapFactory.java  | 33 
 .../apache/ignite/binary/BinaryRawReader.java   |  8 +-
 .../org/apache/ignite/binary/BinaryReader.java  |  9 +--
 .../internal/portable/BinaryReaderExImpl.java   | 83 ++--
 .../internal/portable/PortableContext.java  | 12 ---
 .../ignite/internal/portable/PortableUtils.java | 74 +
 .../portable/BinaryMarshallerSelfTest.java  |  4 +-
 .../BinaryObjectBuilderAdditionalSelfTest.java  | 71 ++---
 .../mutabletest/GridPortableTestClasses.java| 77 +-
 10 files changed, 269 insertions(+), 135 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/86f4892d/modules/core/src/main/java/org/apache/ignite/binary/BinaryCollectionFactory.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/binary/BinaryCollectionFactory.java
 
b/modules/core/src/main/java/org/apache/ignite/binary/BinaryCollectionFactory.java
new file mode 100644
index 000..0e5bf83
--- /dev/null
+++ 
b/modules/core/src/main/java/org/apache/ignite/binary/BinaryCollectionFactory.java
@@ -0,0 +1,33 @@
+/*
+ * 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.binary;
+
+import java.util.Collection;
+
+/**
+ * Collection factory.
+ */
+public interface BinaryCollectionFactory {
+/**
+ * Create collection.
+ *
+ * @param size Amount of elements in collection.
+ * @return Collection.
+ */
+public Collection create(int size);
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/86f4892d/modules/core/src/main/java/org/apache/ignite/binary/BinaryMapFactory.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/binary/BinaryMapFactory.java 
b/modules/core/src/main/java/org/apache/ignite/binary/BinaryMapFactory.java
new file mode 100644
index 000..d514bf9
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/binary/BinaryMapFactory.java
@@ -0,0 +1,33 @@
+/*
+ * 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.binary;
+
+import java.util.Map;
+
+/**
+ * Map factory.
+ */
+public interface BinaryMapFactory {
+/**
+ * Create collection.
+ *
+ * @param size Amount of elements in collection.
+ * @return Collection.
+ */
+public Map create(int size);
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/86f4892d/modules/core/src/main/java/org/apache/ignite/binary/BinaryRawReader.java

[9/9] ignite git commit: Merge branch 'ignite-1.5' into ignite-2099

[vozerov]

Merge branch 'ignite-1.5' into ignite-2099


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

Branch: refs/heads/ignite-2099
Commit: 9ff351b50b481c85460c4c95f9c3aad93a5a9a6f
Parents: d72d846 afbb0dc
Author: vozerov-gridgain 
Authored: Wed Dec 9 15:03:59 2015 +0300
Committer: vozerov-gridgain 
Committed: Wed Dec 9 15:03:59 2015 +0300

--
 .../configuration/CacheConfiguration.java   |   4 +-
 .../configuration/TransactionConfiguration.java |  47 +++-
 .../portable/PortableClassDescriptor.java   |  46 ++--
 .../cache/jta/CacheJtaManagerAdapter.java   |   4 +-
 .../portable/BinaryMarshallerSelfTest.java  |  14 +-
 .../HibernateTransactionalDataRegion.java   |  18 +-
 .../HibernateL2CacheTransactionalSelfTest.java  |  23 +-
 modules/jta/pom.xml |   9 +-
 .../cache/jta/jndi/CacheJndiTmFactory.java  | 132 +++
 .../processors/cache/jta/CacheJtaManager.java   |  41 +++-
 .../cache/AbstarctCacheJtaSelfTest.java | 183 +++
 .../cache/CacheJndiTmFactorySelfTest.java   | 166 ++
 ...CacheJtaConfigurationValidationSelfTest.java |   4 +-
 ...CacheJtaFactoryConfigValidationSelfTest.java | 142 
 .../processors/cache/GridCacheJtaSelfTest.java  | 221 ---
 .../cache/GridCacheReplicatedJtaSelfTest.java   |  32 ---
 .../cache/GridJtaLifecycleAwareSelfTest.java| 191 
 .../GridPartitionedCacheJtaFactorySelfTest.java |  41 
 ...titionedCacheJtaLookupClassNameSelfTest.java |  83 +++
 .../GridReplicatedCacheJtaFactorySelfTest.java  |  32 +++
 ...plicatedCacheJtaLookupClassNameSelfTest.java |  32 +++
 .../GridTmLookupLifecycleAwareSelfTest.java | 122 --
 .../ignite/testsuites/IgniteJtaTestSuite.java   |  26 ++-
 23 files changed, 1186 insertions(+), 427 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/9ff351b5/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableClassDescriptor.java
--

http://git-wip-us.apache.org/repos/asf/ignite/blob/9ff351b5/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryMarshallerSelfTest.java
--

[2/9] ignite git commit: IGNITE-2099: Enhanced test, all is fine for now.

[vozerov]

IGNITE-2099: Enhanced test, all is fine for now.


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

Branch: refs/heads/ignite-2099
Commit: 5c41396817b9d8b208d4107edf805865220b9172
Parents: 86f4892
Author: vozerov-gridgain 
Authored: Wed Dec 9 13:00:43 2015 +0300
Committer: vozerov-gridgain 
Committed: Wed Dec 9 13:00:43 2015 +0300

--
 .../internal/portable/mutabletest/GridPortableTestClasses.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/5c413968/modules/core/src/test/java/org/apache/ignite/internal/portable/mutabletest/GridPortableTestClasses.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/portable/mutabletest/GridPortableTestClasses.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/portable/mutabletest/GridPortableTestClasses.java
index 3aaa0d0..b568cb5 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/portable/mutabletest/GridPortableTestClasses.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/portable/mutabletest/GridPortableTestClasses.java
@@ -412,7 +412,7 @@ public class GridPortableTestClasses {
  */
 public static class Companies {
 /** Companies. */
-private ArrayList companies = new ArrayList<>();
+private List companies = new ArrayList<>();
 
 /**
  * @param idx Index.

[6/9] ignite git commit: Merge branch 'ignite-2099' into ignite-2099-noentry

[vozerov]

Merge branch 'ignite-2099' into ignite-2099-noentry


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

Branch: refs/heads/ignite-2099
Commit: e7992323d1c7ab435173282f590f277e76bfaa3b
Parents: d53472e 755fe6d
Author: vozerov-gridgain 
Authored: Wed Dec 9 13:21:11 2015 +0300
Committer: vozerov-gridgain 
Committed: Wed Dec 9 13:21:11 2015 +0300

--
 .../ignite/internal/portable/builder/PortableBuilderReader.java | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/e7992323/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/PortableBuilderReader.java
--

[4/9] ignite git commit: IGNITE-2099: Removed entries handling.

[vozerov]

IGNITE-2099: Removed entries handling.


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

Branch: refs/heads/ignite-2099
Commit: d53472e5de989c994cd534e21ce10d54db4cd277
Parents: 75d5874
Author: vozerov-gridgain 
Authored: Wed Dec 9 13:11:42 2015 +0300
Committer: vozerov-gridgain 
Committed: Wed Dec 9 13:11:42 2015 +0300

--
 .../internal/portable/BinaryFieldAccessor.java  | 19 ++
 .../internal/portable/BinaryReaderExImpl.java   | 24 ---
 .../internal/portable/BinaryWriteMode.java  |  3 -
 .../internal/portable/BinaryWriterExImpl.java   | 45 +++--
 .../portable/GridPortableMarshaller.java|  3 -
 .../portable/PortableClassDescriptor.java   |  6 --
 .../ignite/internal/portable/PortableUtils.java | 30 -
 .../portable/builder/PortableBuilderReader.java | 10 ---
 .../portable/builder/PortableLazyMapEntry.java  | 68 
 9 files changed, 15 insertions(+), 193 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/d53472e5/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryFieldAccessor.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryFieldAccessor.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryFieldAccessor.java
index 2f6b73c..7701fb5 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryFieldAccessor.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryFieldAccessor.java
@@ -17,6 +17,11 @@
 
 package org.apache.ignite.internal.portable;
 
+import org.apache.ignite.binary.BinaryObjectException;
+import org.apache.ignite.internal.util.GridUnsafe;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import sun.misc.Unsafe;
+
 import java.lang.reflect.Field;
 import java.math.BigDecimal;
 import java.sql.Timestamp;
@@ -24,10 +29,6 @@ import java.util.Collection;
 import java.util.Date;
 import java.util.Map;
 import java.util.UUID;
-import org.apache.ignite.binary.BinaryObjectException;
-import org.apache.ignite.internal.util.GridUnsafe;
-import org.apache.ignite.internal.util.typedef.internal.U;
-import sun.misc.Unsafe;
 
 /**
  * Field accessor to speedup access.
@@ -607,11 +608,6 @@ public abstract class BinaryFieldAccessor {
 
 break;
 
-case MAP_ENTRY:
-writer.writeMapEntryField((Map.Entry)val);
-
-break;
-
 case PORTABLE_OBJ:
 writer.writePortableObjectField((BinaryObjectImpl)val);
 
@@ -813,11 +809,6 @@ public abstract class BinaryFieldAccessor {
 
 break;
 
-case MAP_ENTRY:
-val = reader.readMapEntry(id);
-
-break;
-
 case PORTABLE_OBJ:
 val = reader.readPortableObject(id);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/d53472e5/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 e2d098b..6a8091f 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
@@ -65,7 +65,6 @@ import static 
org.apache.ignite.internal.portable.GridPortableMarshaller.INT_ARR
 import static org.apache.ignite.internal.portable.GridPortableMarshaller.LONG;
 import static 
org.apache.ignite.internal.portable.GridPortableMarshaller.LONG_ARR;
 import static org.apache.ignite.internal.portable.GridPortableMarshaller.MAP;
-import static 
org.apache.ignite.internal.portable.GridPortableMarshaller.MAP_ENTRY;
 import static org.apache.ignite.internal.portable.GridPortableMarshaller.NULL;
 import static org.apache.ignite.internal.portable.GridPortableMarshaller.OBJ;
 import static 
org.apache.ignite.internal.portable.GridPortableMarshaller.OBJ_ARR;
@@ -313,24 +312,6 @@ public class BinaryReaderExImpl implements BinaryReader, 
BinaryRawReaderEx, Bina
 
 /**
  * @param fieldId Field ID.
- * @return Value.
- * @throws BinaryObjectException On case of error.
- */
-@Nullable Map.Entry readMapEntry(int fieldId) throws 
BinaryObjectException {
-if (findFieldById(fieldId)) {
-   

[5/9] ignite git commit: IGNITE-2099: Minor fix.

[vozerov]

IGNITE-2099: Minor fix.


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

Branch: refs/heads/ignite-2099
Commit: 755fe6dd80c4d3c846bea35f8232fc4650b5e966
Parents: 75d5874
Author: vozerov-gridgain 
Authored: Wed Dec 9 13:21:04 2015 +0300
Committer: vozerov-gridgain 
Committed: Wed Dec 9 13:21:04 2015 +0300

--
 .../ignite/internal/portable/builder/PortableBuilderReader.java | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/755fe6dd/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/PortableBuilderReader.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/PortableBuilderReader.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/PortableBuilderReader.java
index 1e6ef91..985d200 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/PortableBuilderReader.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/PortableBuilderReader.java
@@ -732,6 +732,7 @@ public class PortableBuilderReader implements 
PortablePositionReadable {
 
 case GridPortableMarshaller.HASH_SET:
 case GridPortableMarshaller.LINKED_HASH_SET:
+return new PortableLazySet(this, size);
 }
 
 throw new BinaryObjectException("Unknown collection type: " + 
colType);

[3/9] ignite git commit: IGNITE-2099: Removed collection types which are no longer used.

[vozerov]

IGNITE-2099: Removed collection types which are no longer used.


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

Branch: refs/heads/ignite-2099
Commit: 75d5874cb89722152de009c1581831bf6b2bc0e4
Parents: 5c41396
Author: vozerov-gridgain 
Authored: Wed Dec 9 13:05:07 2015 +0300
Committer: vozerov-gridgain 
Committed: Wed Dec 9 13:05:07 2015 +0300

--
 .../portable/GridPortableMarshaller.java| 18 --
 .../internal/portable/PortableContext.java  | 59 +---
 .../ignite/internal/portable/PortableUtils.java | 38 -
 .../portable/builder/PortableBuilderReader.java |  3 -
 .../builder/PortableBuilderSerializer.java  |  8 +--
 5 files changed, 28 insertions(+), 98 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/75d5874c/modules/core/src/main/java/org/apache/ignite/internal/portable/GridPortableMarshaller.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/portable/GridPortableMarshaller.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/portable/GridPortableMarshaller.java
index 5244da8..a9df27d 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/portable/GridPortableMarshaller.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/portable/GridPortableMarshaller.java
@@ -167,30 +167,12 @@ public class GridPortableMarshaller {
 public static final byte LINKED_HASH_SET = 4;
 
 /** */
-public static final byte TREE_SET = 5;
-
-/** */
-public static final byte CONC_SKIP_LIST_SET = 6;
-
-/** */
-public static final byte CONC_LINKED_QUEUE = 7;
-
-/** */
 public static final byte HASH_MAP = 1;
 
 /** */
 public static final byte LINKED_HASH_MAP = 2;
 
 /** */
-public static final byte TREE_MAP = 3;
-
-/** */
-public static final byte CONC_HASH_MAP = 4;
-
-/** */
-public static final byte PROPERTIES_MAP = 5;
-
-/** */
 public static final int OBJECT_TYPE_ID = -1;
 
 /** */

http://git-wip-us.apache.org/repos/asf/ignite/blob/75d5874c/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 7449863..1f129cd 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
@@ -17,6 +17,33 @@
 
 package org.apache.ignite.internal.portable;
 
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.binary.BinaryIdMapper;
+import org.apache.ignite.binary.BinaryInvalidTypeException;
+import org.apache.ignite.binary.BinaryObjectException;
+import org.apache.ignite.binary.BinarySerializer;
+import org.apache.ignite.binary.BinaryType;
+import org.apache.ignite.binary.BinaryTypeConfiguration;
+import org.apache.ignite.cache.CacheKeyConfiguration;
+import org.apache.ignite.cache.affinity.AffinityKeyMapped;
+import org.apache.ignite.configuration.BinaryConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+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;
+import org.apache.ignite.internal.util.typedef.T2;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.marshaller.MarshallerContext;
+import org.apache.ignite.marshaller.optimized.OptimizedMarshaller;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
+
 import java.io.Externalizable;
 import java.io.File;
 import java.io.IOException;
@@ -41,43 +68,11 @@ import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.LinkedList;
 import java.util.Map;
-import java.util.Properties;
 import java.util.Set;
-import java.util.TreeMap;
-import java.util.TreeSet;
 import java.util.UUID;
-import 

[7/9] ignite git commit: IGNITE-2099: Fixing tests.

[vozerov]

IGNITE-2099: Fixing tests.


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

Branch: refs/heads/ignite-2099
Commit: 6172ce1c3dfc7266cd22fdb1cc29eb64ca795041
Parents: e799232
Author: vozerov-gridgain 
Authored: Wed Dec 9 13:25:53 2015 +0300
Committer: vozerov-gridgain 
Committed: Wed Dec 9 13:25:53 2015 +0300

--
 .../BinaryObjectBuilderAdditionalSelfTest.java  | 30 
 1 file changed, 30 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/6172ce1c/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryObjectBuilderAdditionalSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryObjectBuilderAdditionalSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryObjectBuilderAdditionalSelfTest.java
index 119500a..06535d2 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryObjectBuilderAdditionalSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryObjectBuilderAdditionalSelfTest.java
@@ -150,15 +150,6 @@ public class BinaryObjectBuilderAdditionalSelfTest extends 
GridCommonAbstractTes
 
 break;
 }
-
-case "entry":
-assertEquals(((Map.Entry)expVal).getKey(), 
((Map.Entry)actVal).getKey());
-assertEquals(((Map.Entry)expVal).getValue(), 
((Map.Entry)actVal).getValue());
-break;
-
-default:
-assertTrue(field.getName(), Objects.deepEquals(expVal, 
actVal));
-break;
 }
 }
 }
@@ -925,27 +916,6 @@ public class BinaryObjectBuilderAdditionalSelfTest extends 
GridCommonAbstractTes
 /**
  *
  */
-public void testMapEntryModification() {
-TestObjectContainer obj = new TestObjectContainer();
-obj.foo = ImmutableMap.of(1, "a").entrySet().iterator().next();
-
-BinaryObjectBuilderImpl mutableObj = wrap(obj);
-
-Map.Entry entry = mutableObj.getField("foo");
-
-assertEquals(1, entry.getKey());
-assertEquals("a", entry.getValue());
-
-entry.setValue("b");
-
-TestObjectContainer res = mutableObj.build().deserialize();
-
-assertEquals(new GridMapEntry<>(1, "b"), res.foo);
-}
-
-/**
- *
- */
 public void testMapEntryOverride() {
 TestObjectContainer obj = new TestObjectContainer();
 

[8/9] ignite git commit: IGNITE-2099: Minor fix.

[vozerov]

IGNITE-2099: Minor fix.


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

Branch: refs/heads/ignite-2099
Commit: d72d8462030b5610a5c7b5cd6469e25bef1f5fcc
Parents: 6172ce1
Author: vozerov-gridgain 
Authored: Wed Dec 9 13:34:27 2015 +0300
Committer: vozerov-gridgain 
Committed: Wed Dec 9 13:34:27 2015 +0300

--
 .../java/org/apache/ignite/internal/portable/PortableUtils.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/d72d8462/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableUtils.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableUtils.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableUtils.java
index e4ae77c..125bb25 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableUtils.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableUtils.java
@@ -609,10 +609,10 @@ public class PortableUtils {
 if (cls.isArray())
 return cls.getComponentType().isEnum() || cls.getComponentType() 
== Enum.class ? ENUM_ARR : OBJ_ARR;
 
-if (Collection.class.isAssignableFrom(cls))
+if (isSpecialCollection(cls))
 return COL;
 
-if (Map.class.isAssignableFrom(cls))
+if (isSpecialMap(cls))
 return MAP;
 
 return OBJ;

[1/2] ignite git commit: IGNITE-2108 Fixed cache store examples.

[akuznetsov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5 afbb0dc0c -> 3ba7e541c


IGNITE-2108 Fixed cache store examples.


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

Branch: refs/heads/ignite-1.5
Commit: e0ffc29593648391d7f45d7879451a687fca6e81
Parents: 5ea19a4
Author: Alexey Kuznetsov 
Authored: Wed Dec 9 17:52:02 2015 +0700
Committer: Alexey Kuznetsov 
Committed: Wed Dec 9 17:52:02 2015 +0700

--
 .../java/org/apache/ignite/schema/Demo.java |  6 ++-
 .../store/auto/CacheAutoStoreExample.java   | 49 ++--
 2 files changed, 29 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/e0ffc295/examples/schema-import/src/main/java/org/apache/ignite/schema/Demo.java
--
diff --git 
a/examples/schema-import/src/main/java/org/apache/ignite/schema/Demo.java 
b/examples/schema-import/src/main/java/org/apache/ignite/schema/Demo.java
index a981f5a..a8934cb 100644
--- a/examples/schema-import/src/main/java/org/apache/ignite/schema/Demo.java
+++ b/examples/schema-import/src/main/java/org/apache/ignite/schema/Demo.java
@@ -41,11 +41,13 @@ public class Demo {
  * Constructs and returns a fully configured instance of a {@link 
CacheJdbcPojoStoreFactory}.
  */
 private static class H2DemoStoreFactory extends 
CacheJdbcPojoStoreFactory {
-/** Default constructor. */
-H2DemoStoreFactory() {
+/** {@inheritDoc} */
+@Override public CacheJdbcPojoStore create() {
 setDialect(new H2Dialect());
 
 
setDataSource(JdbcConnectionPool.create("jdbc:h2:tcp://localhost/~/schema-import/demo",
 "sa", ""));
+
+return super.create();
 }
 }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/e0ffc295/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 5498e57..7d21fce 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
@@ -65,30 +65,9 @@ public class CacheAutoStoreExample {
 private static final class CacheJdbcPojoStoreExampleFactory extends 
CacheJdbcPojoStoreFactory {
 /** {@inheritDoc} */
 @Override public CacheJdbcPojoStore create() {
-JdbcType jdbcType = new JdbcType();
+
setDataSource(JdbcConnectionPool.create("jdbc:h2:tcp://localhost/mem:ExampleDb",
 "sa", ""));
 
-jdbcType.setCacheName(CACHE_NAME);
-jdbcType.setDatabaseSchema("PUBLIC");
-jdbcType.setDatabaseTable("PERSON");
-
-jdbcType.setKeyType("java.lang.Long");
-jdbcType.setKeyFields(new JdbcTypeField(Types.BIGINT, "ID", 
Long.class, "id"));
-
-jdbcType.setValueType("org.apache.ignite.examples.model.Person");
-jdbcType.setValueFields(
-new JdbcTypeField(Types.BIGINT, "ID", Long.class, "id"),
-new JdbcTypeField(Types.VARCHAR, "FIRST_NAME", 
String.class, "firstName"),
-new JdbcTypeField(Types.VARCHAR, "LAST_NAME", 
String.class, "lastName")
-);
-
-CacheJdbcPojoStore store = new 
CacheJdbcPojoStore<>();
-
-
store.setDataSource(JdbcConnectionPool.create("jdbc:h2:tcp://localhost/mem:ExampleDb",
 "sa", ""));
-store.setDialect(new H2Dialect());
-
-store.setTypes(jdbcType);
-
-return store;
+return super.create();
 }
 }
 
@@ -98,7 +77,29 @@ public class CacheAutoStoreExample {
 private static CacheConfiguration cacheConfiguration() {
 CacheConfiguration cfg = new 
CacheConfiguration<>(CACHE_NAME);
 
-cfg.setCacheStoreFactory(new CacheJdbcPojoStoreExampleFactory());
+CacheJdbcPojoStoreExampleFactory storeFactory = new 
CacheJdbcPojoStoreExampleFactory();
+
+storeFactory.setDialect(new H2Dialect());
+
+JdbcType jdbcType = new JdbcType();
+
+jdbcType.setCacheName(CACHE_NAME);
+jdbcType.setDatabaseSchema("PUBLIC");
+jdbcType.setDatabaseTable("PERSON");
+
+   

[35/51] [abbrv] ignite git commit: Fixed race in IgniteTransactionalWriteInvokeBenchmark test.

[akuznetsov]

Fixed race in IgniteTransactionalWriteInvokeBenchmark test.


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

Branch: refs/heads/ignite-843-rc2
Commit: 3a340034056f5da0ca00ed88e128b59cc28381d2
Parents: efe632b
Author: ashutak 
Authored: Tue Dec 8 16:02:36 2015 +0300
Committer: ashutak 
Committed: Tue Dec 8 16:02:36 2015 +0300

--
 .../config/benchmark-failover.properties|  2 +-
 ...IgniteTransactionalWriteInvokeBenchmark.java | 42 +++-
 2 files changed, 33 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/3a340034/modules/yardstick/config/benchmark-failover.properties
--
diff --git a/modules/yardstick/config/benchmark-failover.properties 
b/modules/yardstick/config/benchmark-failover.properties
index 7ed464c..352e2d4 100644
--- a/modules/yardstick/config/benchmark-failover.properties
+++ b/modules/yardstick/config/benchmark-failover.properties
@@ -60,7 +60,7 @@ RESTART_SERVERS=true
 SERVER_HOSTS=localhost,localhost
 
 # Comma-separated list of the hosts to run BenchmarkDrivers on.
-DRIVER_HOSTS=localhost
+DRIVER_HOSTS=localhost,localhost
 
 # Remote username.
 # REMOTE_USER=

http://git-wip-us.apache.org/repos/asf/ignite/blob/3a340034/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 35befad..67044a1 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
@@ -25,9 +25,11 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.Callable;
+import java.util.concurrent.TimeUnit;
 import javax.cache.processor.EntryProcessorException;
 import javax.cache.processor.MutableEntry;
 import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCountDownLatch;
 import org.apache.ignite.IgniteDataStreamer;
 import org.apache.ignite.cache.CacheEntryProcessor;
 import org.apache.ignite.cache.affinity.Affinity;
@@ -58,29 +60,49 @@ public class IgniteTransactionalWriteInvokeBenchmark 
extends IgniteFailoverAbstr
 /** */
 private static final Long INITIAL_VALUE = 1L;
 
+/** */
+public static final int TIMEOUT_SEC = 20 * 60;
+
 /** {@inheritDoc} */
 @Override public void setUp(BenchmarkConfiguration cfg) throws Exception {
 super.setUp(cfg);
 
 assert args.keysCount() > 0 : "Count of keys: " + args.keysCount();
 
-println(cfg, "Populating data...");
+IgniteCountDownLatch latch = 
ignite().countDownLatch("DATA-POPULATED-LATCH-" + cacheName(), 1, true, true);
+
+if (cfg.memberId() == 0) {
+println(cfg, "Populating data for cache: " + cacheName());
 
-long start = System.nanoTime();
+long start = System.nanoTime();
 
-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);
+}
 }
+
+println(cfg, "Finished populating data in " + ((System.nanoTime() 
- start) / 1_000_000)
++ " ms. for cache: " + cacheName());
+
+latch.countDown();
 }
+  

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

[akuznetsov]

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

Branch: refs/heads/ignite-843-rc2
Commit: c292748013acfcbf6b3752183a34bb26de16c1f4
Parents: 322a85a 5cd0039
Author: S.Vladykin 
Authored: Tue Dec 8 13:18:30 2015 +0300
Committer: S.Vladykin 
Committed: Tue Dec 8 13:18:30 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 +-
 .../apache/ignite/internal/GridComponent.java   |  3 +-
 .../ignite/internal/GridPluginComponent.java|  4 +-
 .../apache/ignite/internal/IgniteKernal.java| 18 +++-
 .../internal/managers/GridManagerAdapter.java   |  5 +-
 .../deployment/GridDeploymentManager.java   |  5 +-
 .../processors/GridProcessorAdapter.java|  5 +-
 .../processors/cache/GridCacheContext.java  |  6 +-
 .../processors/cache/GridCacheProcessor.java| 26 +-
 .../datastructures/DataStructuresProcessor.java |  4 +-
 .../core/src/main/resources/ignite.properties   |  2 +-
 .../IgniteClientReconnectAbstractTest.java  | 95 +---
 .../IgniteClientReconnectAtomicsTest.java   | 57 
 .../IgniteClientReconnectCacheTest.java |  5 +-
 .../IgniteClientReconnectCollectionsTest.java   | 51 +++
 .../DataStreamProcessorSelfTest.java| 25 +++---
 modules/extdata/p2p/pom.xml |  2 +-
 .../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/osgi-karaf/pom.xml  |  5 +-
 modules/osgi-paxlogging/pom.xml |  6 +-
 modules/osgi/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 +-
 .../Properties/AssemblyInfo.cs  |  4 +-
 .../Properties/AssemblyInfo.cs  |  4 +-
 .../Properties/AssemblyInfo.cs  |  4 +-
 .../Properties/AssemblyInfo.cs  |  4 +-
 .../Apache.Ignite/Properties/AssemblyInfo.cs|  4 +-
 .../Properties/AssemblyInfo.cs  |  4 +-
 .../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 |  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   |  

[40/51] [abbrv] ignite git commit: 2064 Issue url fix

[akuznetsov]

2064 Issue url fix


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

Branch: refs/heads/ignite-843-rc2
Commit: c30def8f049bddb4ec272528326f84bf90a1399b
Parents: 0e81a39
Author: Anton Vinogradov 
Authored: Tue Dec 8 16:48:58 2015 +0300
Committer: Anton Vinogradov 
Committed: Tue Dec 8 16:48:58 2015 +0300

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


http://git-wip-us.apache.org/repos/asf/ignite/blob/c30def8f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
index aa64959..bfa353b 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
@@ -228,7 +228,7 @@ public class GridCacheDeploymentSelfTest extends 
GridCommonAbstractTest {
 Ignite g1 = startGrid(1);
 
 if (g1.configuration().getMarshaller() instanceof BinaryMarshaller)
-fail("http://atlassian.gridgain.com/jira/browse/GG-10791;);
+fail("https://issues.apache.org/jira/browse/IGNITE-2106;);
 
 Ignite g2 = startGrid(2);
 

[03/20] ignite git commit: Fixed race in IgniteTransactionalWriteInvokeBenchmark test.

[sboikov]

Fixed race in IgniteTransactionalWriteInvokeBenchmark test.


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

Branch: refs/heads/ignite-1537
Commit: 3a340034056f5da0ca00ed88e128b59cc28381d2
Parents: efe632b
Author: ashutak 
Authored: Tue Dec 8 16:02:36 2015 +0300
Committer: ashutak 
Committed: Tue Dec 8 16:02:36 2015 +0300

--
 .../config/benchmark-failover.properties|  2 +-
 ...IgniteTransactionalWriteInvokeBenchmark.java | 42 +++-
 2 files changed, 33 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/3a340034/modules/yardstick/config/benchmark-failover.properties
--
diff --git a/modules/yardstick/config/benchmark-failover.properties 
b/modules/yardstick/config/benchmark-failover.properties
index 7ed464c..352e2d4 100644
--- a/modules/yardstick/config/benchmark-failover.properties
+++ b/modules/yardstick/config/benchmark-failover.properties
@@ -60,7 +60,7 @@ RESTART_SERVERS=true
 SERVER_HOSTS=localhost,localhost
 
 # Comma-separated list of the hosts to run BenchmarkDrivers on.
-DRIVER_HOSTS=localhost
+DRIVER_HOSTS=localhost,localhost
 
 # Remote username.
 # REMOTE_USER=

http://git-wip-us.apache.org/repos/asf/ignite/blob/3a340034/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 35befad..67044a1 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
@@ -25,9 +25,11 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.Callable;
+import java.util.concurrent.TimeUnit;
 import javax.cache.processor.EntryProcessorException;
 import javax.cache.processor.MutableEntry;
 import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCountDownLatch;
 import org.apache.ignite.IgniteDataStreamer;
 import org.apache.ignite.cache.CacheEntryProcessor;
 import org.apache.ignite.cache.affinity.Affinity;
@@ -58,29 +60,49 @@ public class IgniteTransactionalWriteInvokeBenchmark 
extends IgniteFailoverAbstr
 /** */
 private static final Long INITIAL_VALUE = 1L;
 
+/** */
+public static final int TIMEOUT_SEC = 20 * 60;
+
 /** {@inheritDoc} */
 @Override public void setUp(BenchmarkConfiguration cfg) throws Exception {
 super.setUp(cfg);
 
 assert args.keysCount() > 0 : "Count of keys: " + args.keysCount();
 
-println(cfg, "Populating data...");
+IgniteCountDownLatch latch = 
ignite().countDownLatch("DATA-POPULATED-LATCH-" + cacheName(), 1, true, true);
+
+if (cfg.memberId() == 0) {
+println(cfg, "Populating data for cache: " + cacheName());
 
-long start = System.nanoTime();
+long start = System.nanoTime();
 
-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);
+}
 }
+
+println(cfg, "Finished populating data in " + ((System.nanoTime() 
- start) / 1_000_000)
++ " ms. for cache: " + cacheName());
+
+latch.countDown();
 }
+

[14/20] ignite git commit: IGNITE-1864: Transaction manager factory instead of Transaction manager Lookup

[sboikov]

IGNITE-1864: Transaction manager factory instead of Transaction manager Lookup


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

Branch: refs/heads/ignite-1537
Commit: 5ea19a4549eb9df619bad9e8a86b844a5db2ca1f
Parents: 0adee3a
Author: ashutak 
Authored: Wed Dec 9 12:02:57 2015 +0300
Committer: ashutak 
Committed: Wed Dec 9 12:02:57 2015 +0300

--
 .../configuration/CacheConfiguration.java   |   4 +-
 .../configuration/TransactionConfiguration.java |  47 +++-
 .../cache/jta/CacheJtaManagerAdapter.java   |   4 +-
 .../HibernateTransactionalDataRegion.java   |  18 +-
 .../HibernateL2CacheTransactionalSelfTest.java  |  23 +-
 modules/jta/pom.xml |   9 +-
 .../cache/jta/jndi/CacheJndiTmFactory.java  | 132 +++
 .../processors/cache/jta/CacheJtaManager.java   |  41 +++-
 .../cache/AbstarctCacheJtaSelfTest.java | 183 +++
 .../cache/CacheJndiTmFactorySelfTest.java   | 166 ++
 ...CacheJtaConfigurationValidationSelfTest.java |   4 +-
 ...CacheJtaFactoryConfigValidationSelfTest.java | 142 
 .../processors/cache/GridCacheJtaSelfTest.java  | 221 ---
 .../cache/GridCacheReplicatedJtaSelfTest.java   |  32 ---
 .../cache/GridJtaLifecycleAwareSelfTest.java| 191 
 .../GridPartitionedCacheJtaFactorySelfTest.java |  41 
 ...titionedCacheJtaLookupClassNameSelfTest.java |  83 +++
 .../GridReplicatedCacheJtaFactorySelfTest.java  |  32 +++
 ...plicatedCacheJtaLookupClassNameSelfTest.java |  32 +++
 .../GridTmLookupLifecycleAwareSelfTest.java | 122 --
 .../ignite/testsuites/IgniteJtaTestSuite.java   |  26 ++-
 21 files changed, 1150 insertions(+), 403 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/5ea19a45/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 67f7b2e..d73ff58 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
@@ -1112,7 +1112,7 @@ public class CacheConfiguration extends 
MutableConfiguration {
  * Gets class name of transaction manager finder for integration for JEE 
app servers.
  *
  * @return Transaction manager finder.
- * @deprecated Use {@link 
TransactionConfiguration#getTxManagerLookupClassName()} instead.
+ * @deprecated Use {@link TransactionConfiguration#getTxManagerFactory()} 
instead.
  */
 @Deprecated
 public String getTransactionManagerLookupClassName() {
@@ -1125,7 +1125,7 @@ public class CacheConfiguration extends 
MutableConfiguration {
  * @param tmLookupClsName Name of class implementing GridCacheTmLookup 
interface that is used to
  *  receive JTA transaction manager.
  * @return {@code this} for chaining.
- * @deprecated Use {@link 
TransactionConfiguration#setTxManagerLookupClassName(String)} instead.
+ * @deprecated Use {@link 
TransactionConfiguration#setTxManagerFactory(Factory)} instead.
  */
 @Deprecated
 public CacheConfiguration 
setTransactionManagerLookupClassName(String tmLookupClsName) {

http://git-wip-us.apache.org/repos/asf/ignite/blob/5ea19a45/modules/core/src/main/java/org/apache/ignite/configuration/TransactionConfiguration.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/configuration/TransactionConfiguration.java
 
b/modules/core/src/main/java/org/apache/ignite/configuration/TransactionConfiguration.java
index fc2a6cb..b3d294d 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/configuration/TransactionConfiguration.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/configuration/TransactionConfiguration.java
@@ -18,6 +18,7 @@
 package org.apache.ignite.configuration;
 
 import java.io.Serializable;
+import javax.cache.configuration.Factory;
 import org.apache.ignite.transactions.Transaction;
 import org.apache.ignite.transactions.TransactionConcurrency;
 import org.apache.ignite.transactions.TransactionIsolation;
@@ -65,6 +66,9 @@ public class TransactionConfiguration implements Serializable 
{
 /** Name of class implementing GridCacheTmLookup. */
 private String tmLookupClsName;
 
+/** 

[13/20] ignite git commit: ignite-10 Fix ignite instance [de]serialization

[sboikov]

ignite-10 Fix ignite instance [de]serialization


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

Branch: refs/heads/ignite-1537
Commit: 0adee3ae09a86334375b521871539b086215ba92
Parents: 6904724
Author: sboikov 
Authored: Wed Dec 9 09:56:53 2015 +0300
Committer: sboikov 
Committed: Wed Dec 9 09:56:53 2015 +0300

--
 .../messaging/MessagingPingPongExample.java |  4 --
 .../examples/MessagingExamplesSelfTest.java |  2 -
 .../main/java/org/apache/ignite/Ignition.java   | 16 +++
 .../store/jdbc/CacheAbstractJdbcStore.java  |  5 +--
 .../configuration/CacheConfiguration.java   |  1 -
 .../configuration/IgniteConfiguration.java  |  2 -
 .../apache/ignite/internal/IgniteKernal.java|  2 +-
 .../org/apache/ignite/internal/IgnitionEx.java  | 39 +
 .../ignite/internal/MarshallerContextImpl.java  | 23 +-
 .../managers/communication/GridIoManager.java   |  3 +-
 .../internal/portable/BinaryFieldAccessor.java  |  9 ++--
 .../internal/portable/BinaryReaderExImpl.java   | 19 
 .../internal/portable/BinaryWriterExImpl.java   | 19 
 .../internal/portable/PortableContext.java  | 12 ++---
 .../CacheDefaultBinaryAffinityKeyMapper.java|  2 +-
 .../processors/cache/GridCacheProcessor.java|  2 +-
 .../dht/GridDhtAffinityAssignmentResponse.java  |  2 +-
 .../CacheObjectBinaryProcessorImpl.java | 41 +
 .../cache/query/GridCacheQueryManager.java  | 46 ++--
 .../util/nio/GridNioBackPressureControl.java| 14 +-
 .../org/apache/ignite/spi/IgniteSpiThread.java  | 10 ++---
 .../communication/tcp/TcpCommunicationSpi.java  |  6 +--
 .../org/apache/ignite/thread/IgniteThread.java  | 43 ++
 .../ignite/thread/IgniteThreadPoolExecutor.java | 37 ++--
 .../portable/BinaryMarshallerSelfTest.java  |  2 +-
 ...cheAbstractFullApiMultithreadedSelfTest.java |  2 +-
 .../cache/GridCacheAbstractFullApiSelfTest.java |  4 +-
 ...eAbstractDataStructuresFailoverSelfTest.java |  2 -
 .../marshaller/GridMarshallerAbstractTest.java  | 32 +-
 .../testframework/junits/GridAbstractTest.java  |  9 ++--
 .../junits/IgniteTestResources.java |  2 +-
 .../ignite/testsuites/IgniteCacheTestSuite.java |  4 +-
 .../IgnitePortableCacheTestSuite.java   |  3 +-
 ...niteCacheP2pUnmarshallingQueryErrorTest.java |  5 +++
 .../ignite/osgi/AbstractIgniteKarafTest.java|  2 -
 .../ignite/internal/GridFactorySelfTest.java| 29 
 .../GridSpringBeanSerializationSelfTest.java|  2 +
 37 files changed, 252 insertions(+), 205 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/0adee3ae/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingPingPongExample.java
--
diff --git 
a/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingPingPongExample.java
 
b/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingPingPongExample.java
index a2ba227..8571f66 100644
--- 
a/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingPingPongExample.java
+++ 
b/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingPingPongExample.java
@@ -26,7 +26,6 @@ import org.apache.ignite.cluster.ClusterGroup;
 import org.apache.ignite.examples.ExampleNodeStartup;
 import org.apache.ignite.examples.ExamplesUtils;
 import org.apache.ignite.lang.IgniteBiPredicate;
-import org.apache.ignite.resources.IgniteInstanceResource;
 
 /**
  * Demonstrates simple message exchange between local and remote nodes.
@@ -65,9 +64,6 @@ public class MessagingPingPongExample {
 
 // Set up remote player.
 ignite.message(nodeB).remoteListen(null, new 
IgniteBiPredicate() {
-@IgniteInstanceResource
-private Ignite ignite;
-
 @Override public boolean apply(UUID nodeId, String rcvMsg) {
 System.out.println("Received message [msg=" + rcvMsg + ", 
sender=" + nodeId + ']');
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/0adee3ae/examples/src/test/java8/org/apache/ignite/java8/examples/MessagingExamplesSelfTest.java
--
diff --git 
a/examples/src/test/java8/org/apache/ignite/java8/examples/MessagingExamplesSelfTest.java
 
b/examples/src/test/java8/org/apache/ignite/java8/examples/MessagingExamplesSelfTest.java
index c77e4b6..e15159d 100644
--- 

[06/20] ignite git commit: IGNITE-1694 : .NET: Use DllImport instead of delegates in P/Invoke.

[sboikov]

IGNITE-1694 : .NET: Use DllImport instead of delegates in P/Invoke.


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

Branch: refs/heads/ignite-1537
Commit: 568f910f11472e6ab533c3f1cef6f197456e006f
Parents: efe632b
Author: Pavel Tupitsyn 
Authored: Tue Dec 8 16:35:51 2015 +0300
Committer: vozerov-gridgain 
Committed: Tue Dec 8 16:35:51 2015 +0300

--
 .../Apache.Ignite.Core.csproj   |   1 +
 .../Apache.Ignite.Core/Impl/NativeMethods.cs|  10 -
 .../Impl/Unmanaged/IgniteJniNativeMethods.cs| 358 +
 .../Impl/Unmanaged/UnmanagedUtils.cs| 788 +++
 modules/platforms/dotnet/Apache.Ignite.FxCop| 322 +++-
 5 files changed, 798 insertions(+), 681 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/568f910f/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj 
b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
index 2c7d787..831130c 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
@@ -297,6 +297,7 @@
 
 
 
+
 
 
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/568f910f/modules/platforms/dotnet/Apache.Ignite.Core/Impl/NativeMethods.cs
--
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/NativeMethods.cs 
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/NativeMethods.cs
index 6e25e7e..eb3ba97 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/NativeMethods.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/NativeMethods.cs
@@ -33,15 +33,5 @@ namespace Apache.Ignite.Core.Impl
 [DllImport("kernel32.dll", SetLastError = true, CharSet = 
CharSet.Ansi, BestFitMapping = false, 
 ThrowOnUnmappableChar = true)]
 internal static extern IntPtr LoadLibrary(string path);
-
-/// 
-/// Get procedure address with WinAPI.
-/// 
-/// DLL pointer.
-/// Procedure name.
-/// Procedure address.
-[DllImport("kernel32.dll", SetLastError = true, CharSet = 
CharSet.Ansi, BestFitMapping = false, 
-ThrowOnUnmappableChar = true)]
-internal static extern IntPtr GetProcAddress(IntPtr ptr, string name);
 }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/568f910f/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/IgniteJniNativeMethods.cs
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/IgniteJniNativeMethods.cs
 
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/IgniteJniNativeMethods.cs
new file mode 100644
index 000..860e703
--- /dev/null
+++ 
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/IgniteJniNativeMethods.cs
@@ -0,0 +1,358 @@
+/*
+ * 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.
+ */
+
+namespace Apache.Ignite.Core.Impl.Unmanaged
+{
+using System.Runtime.InteropServices;
+using System.Security;
+
+/// 
+/// Ignite JNI native methods.
+/// 
+[SuppressUnmanagedCodeSecurity]
+internal unsafe static class IgniteJniNativeMethods
+{
+[DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint = 
"IgniteReallocate")]
+public static extern int Reallocate(long memPtr, int cap);
+
+[DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint = 
"IgniteIgnitionStart")]
+public static extern void* IgnitionStart(void* ctx, sbyte* cfgPath, 
sbyte* gridName, int factoryId, 
+long 

[05/20] ignite git commit: IGNITE-1694 : .NET: Use DllImport instead of delegates in P/Invoke.

[sboikov]

http://git-wip-us.apache.org/repos/asf/ignite/blob/568f910f/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs 
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs
index 9a49fae..56a184d 100644
--- 
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs
+++ 
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs
@@ -19,10 +19,10 @@ namespace Apache.Ignite.Core.Impl.Unmanaged
 {
 using System;
 using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
 using System.Runtime.InteropServices;
 using Apache.Ignite.Core.Common;
-using Apache.Ignite.Core.Impl.Common;
+
+using JNI = IgniteJniNativeMethods;
 
 /// 
 /// Unmanaged utility classes.
@@ -32,544 +32,27 @@ namespace Apache.Ignite.Core.Impl.Unmanaged
 /** Interop factory ID for .Net. */
 private const int InteropFactoryId = 1;
 
-#region PROCEDURE NAMES
-
-private const string ProcReallocate = "IgniteReallocate";
-
-private const string ProcIgnitionStart = "IgniteIgnitionStart";
-private const string ProcIgnitionStop = "IgniteIgnitionStop";
-private const string ProcIgnitionStopAll = "IgniteIgnitionStopAll";
-
-private const string ProcProcessorReleaseStart = 
"IgniteProcessorReleaseStart";
-private const string ProcProcessorProjection = 
"IgniteProcessorProjection";
-private const string ProcProcessorCache = "IgniteProcessorCache";
-private const string ProcProcessorGetOrCreateCache = 
"IgniteProcessorGetOrCreateCache";
-private const string ProcProcessorCreateCache = 
"IgniteProcessorCreateCache";
-private const string ProcProcessorAffinity = "IgniteProcessorAffinity";
-private const string ProcProcessorDataStreamer = 
"IgniteProcessorDataStreamer";
-private const string ProcProcessorTransactions = 
"IgniteProcessorTransactions";
-private const string ProcProcessorCompute = "IgniteProcessorCompute";
-private const string ProcProcessorMessage = "IgniteProcessorMessage";
-private const string ProcProcessorEvents = "IgniteProcessorEvents";
-private const string ProcProcessorServices = "IgniteProcessorServices";
-private const string ProcProcessorExtensions = 
"IgniteProcessorExtensions";
-private const string ProcProcessorAtomicLong = 
"IgniteProcessorAtomicLong";
-
-private const string ProcTargetInStreamOutLong = 
"IgniteTargetInStreamOutLong";
-private const string ProcTargetInStreamOutStream = 
"IgniteTargetInStreamOutStream";
-private const string ProcTargetInStreamOutObject = 
"IgniteTargetInStreamOutObject";
-private const string ProcTargetInObjectStreamOutStream = 
"IgniteTargetInObjectStreamOutStream";
-private const string ProcTargetOutLong = "IgniteTargetOutLong";
-private const string ProcTargetOutStream = "IgniteTargetOutStream";
-private const string ProcTargetOutObject = "IgniteTargetOutObject";
-private const string ProcTargetListenFut = "IgniteTargetListenFuture";
-private const string ProcTargetListenFutForOp = 
"IgniteTargetListenFutureForOperation";
-
-private const string ProcAffinityParts = "IgniteAffinityPartitions";
-
-private const string ProcCacheWithSkipStore = 
"IgniteCacheWithSkipStore";
-private const string ProcCacheWithNoRetries = 
"IgniteCacheWithNoRetries";
-private const string ProcCacheWithExpiryPolicy = 
"IgniteCacheWithExpiryPolicy";
-private const string ProcCacheWithAsync = "IgniteCacheWithAsync";
-private const string ProcCacheWithKeepBinary = 
"IgniteCacheWithKeepPortable";
-private const string ProcCacheClear = "IgniteCacheClear";
-private const string ProcCacheRemoveAll = "IgniteCacheRemoveAll";
-private const string ProcCacheOutOpQueryCursor = 
"IgniteCacheOutOpQueryCursor";
-private const string ProcCacheOutOpContinuousQuery = 
"IgniteCacheOutOpContinuousQuery";
-private const string ProcCacheIterator = "IgniteCacheIterator";
-private const string ProcCacheLocalIterator = 
"IgniteCacheLocalIterator";
-private const string ProcCacheEnterLock = "IgniteCacheEnterLock";
-private const string ProcCacheExitLock = "IgniteCacheExitLock";
-private const string ProcCacheTryEnterLock = "IgniteCacheTryEnterLock";
-private const string ProcCacheCloseLock = "IgniteCacheCloseLock";
-private const string ProcCacheRebalance = "IgniteCacheRebalance";
-private const string ProcCacheSize = "IgniteCacheSize";
-
-private const string ProcCacheStoreCallbackInvoke = 
"IgniteCacheStoreCallbackInvoke";
-
-private const 

[02/20] ignite git commit: IGNITE-2026: .NET: Fixed stack overflow caused by incorrect unboxing of value types.

[sboikov]

IGNITE-2026: .NET: Fixed stack overflow caused by incorrect unboxing of value 
types.


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

Branch: refs/heads/ignite-1537
Commit: efe632b18e760f699bedee906050f66eabadb077
Parents: 8ca163b
Author: Pavel Tupitsyn 
Authored: Tue Dec 8 15:59:23 2015 +0300
Committer: vozerov-gridgain 
Committed: Tue Dec 8 15:59:23 2015 +0300

--
 .../Binary/BinarySelfTest.cs| 67 
 .../Impl/Binary/BinaryReflectiveActions.cs  |  4 +-
 .../Impl/Common/DelegateConverter.cs| 15 +++--
 3 files changed, 78 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/efe632b1/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Binary/BinarySelfTest.cs
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Binary/BinarySelfTest.cs 
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Binary/BinarySelfTest.cs
index 88328ec..9232665 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Binary/BinarySelfTest.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Binary/BinarySelfTest.cs
@@ -1028,6 +1028,20 @@ namespace Apache.Ignite.Core.Tests.Binary
 CheckObject(marsh, new OuterObjectType(), new InnerObjectType());
 }
 
+[Test]
+public void TestStructsReflective()
+{
+var marsh = new Marshaller(new BinaryConfiguration
+{
+TypeConfigurations = new[] {new BinaryTypeConfiguration(typeof 
(ReflectiveStruct))}
+});
+
+var obj = new ReflectiveStruct(15, 28.8);
+var res = marsh.Unmarshal(marsh.Marshal(obj));
+
+Assert.AreEqual(res, obj);
+}
+
 /**
  * Test handles.
  */
@@ -2228,5 +2242,58 @@ namespace Apache.Ignite.Core.Tests.Binary
 return Foo;
 }
 }
+
+private struct ReflectiveStruct : IEquatable
+{
+private readonly int _x;
+private readonly double _y;
+
+public ReflectiveStruct(int x, double y)
+{
+_x = x;
+_y = y;
+}
+
+public int X
+{
+get { return _x; }
+}
+
+public double Y
+{
+get { return _y; }
+}
+
+public bool Equals(ReflectiveStruct other)
+{
+return _x == other._x && _y.Equals(other._y);
+}
+
+public override bool Equals(object obj)
+{
+if (ReferenceEquals(null, obj))
+return false;
+
+return obj is ReflectiveStruct && Equals((ReflectiveStruct) 
obj);
+}
+
+public override int GetHashCode()
+{
+unchecked
+{
+return (_x*397) ^ _y.GetHashCode();
+}
+}
+
+public static bool operator ==(ReflectiveStruct left, 
ReflectiveStruct right)
+{
+return left.Equals(right);
+}
+
+public static bool operator !=(ReflectiveStruct left, 
ReflectiveStruct right)
+{
+return !left.Equals(right);
+}
+}
 }
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/efe632b1/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryReflectiveActions.cs
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryReflectiveActions.cs
 
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryReflectiveActions.cs
index b229898..15509fc 100644
--- 
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryReflectiveActions.cs
+++ 
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryReflectiveActions.cs
@@ -398,9 +398,7 @@ namespace Apache.Ignite.Core.Impl.Binary
 
 // Assign field value
 var targetParam = Expression.Parameter(typeof(object));
-var targetParamConverted = Expression.Convert(targetParam, 
field.DeclaringType);
-var assignExpr = 
Expression.Call(DelegateConverter.GetWriteFieldMethod(field), 
targetParamConverted, 
-readExpr);
+var assignExpr = 
Expression.Call(DelegateConverter.GetWriteFieldMethod(field), targetParam, 
readExpr);
 
 // Compile and return
 return 

[07/20] 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/0e81a397
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0e81a397
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0e81a397

Branch: refs/heads/ignite-1537
Commit: 0e81a3973cccfe6d912e073cd9f44db5a5c46d79
Parents: 568f910 3a34003
Author: vozerov-gridgain 
Authored: Tue Dec 8 16:36:12 2015 +0300
Committer: vozerov-gridgain 
Committed: Tue Dec 8 16:36:12 2015 +0300

--
 .../config/benchmark-failover.properties|  2 +-
 ...IgniteTransactionalWriteInvokeBenchmark.java | 42 +++-
 2 files changed, 33 insertions(+), 11 deletions(-)
--

[17/20] ignite git commit: IGNITE-2108 Fixed cache store examples.

[sboikov]

IGNITE-2108 Fixed cache store examples.


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

Branch: refs/heads/ignite-1537
Commit: e0ffc29593648391d7f45d7879451a687fca6e81
Parents: 5ea19a4
Author: Alexey Kuznetsov 
Authored: Wed Dec 9 17:52:02 2015 +0700
Committer: Alexey Kuznetsov 
Committed: Wed Dec 9 17:52:02 2015 +0700

--
 .../java/org/apache/ignite/schema/Demo.java |  6 ++-
 .../store/auto/CacheAutoStoreExample.java   | 49 ++--
 2 files changed, 29 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/e0ffc295/examples/schema-import/src/main/java/org/apache/ignite/schema/Demo.java
--
diff --git 
a/examples/schema-import/src/main/java/org/apache/ignite/schema/Demo.java 
b/examples/schema-import/src/main/java/org/apache/ignite/schema/Demo.java
index a981f5a..a8934cb 100644
--- a/examples/schema-import/src/main/java/org/apache/ignite/schema/Demo.java
+++ b/examples/schema-import/src/main/java/org/apache/ignite/schema/Demo.java
@@ -41,11 +41,13 @@ public class Demo {
  * Constructs and returns a fully configured instance of a {@link 
CacheJdbcPojoStoreFactory}.
  */
 private static class H2DemoStoreFactory extends 
CacheJdbcPojoStoreFactory {
-/** Default constructor. */
-H2DemoStoreFactory() {
+/** {@inheritDoc} */
+@Override public CacheJdbcPojoStore create() {
 setDialect(new H2Dialect());
 
 
setDataSource(JdbcConnectionPool.create("jdbc:h2:tcp://localhost/~/schema-import/demo",
 "sa", ""));
+
+return super.create();
 }
 }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/e0ffc295/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 5498e57..7d21fce 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
@@ -65,30 +65,9 @@ public class CacheAutoStoreExample {
 private static final class CacheJdbcPojoStoreExampleFactory extends 
CacheJdbcPojoStoreFactory {
 /** {@inheritDoc} */
 @Override public CacheJdbcPojoStore create() {
-JdbcType jdbcType = new JdbcType();
+
setDataSource(JdbcConnectionPool.create("jdbc:h2:tcp://localhost/mem:ExampleDb",
 "sa", ""));
 
-jdbcType.setCacheName(CACHE_NAME);
-jdbcType.setDatabaseSchema("PUBLIC");
-jdbcType.setDatabaseTable("PERSON");
-
-jdbcType.setKeyType("java.lang.Long");
-jdbcType.setKeyFields(new JdbcTypeField(Types.BIGINT, "ID", 
Long.class, "id"));
-
-jdbcType.setValueType("org.apache.ignite.examples.model.Person");
-jdbcType.setValueFields(
-new JdbcTypeField(Types.BIGINT, "ID", Long.class, "id"),
-new JdbcTypeField(Types.VARCHAR, "FIRST_NAME", 
String.class, "firstName"),
-new JdbcTypeField(Types.VARCHAR, "LAST_NAME", 
String.class, "lastName")
-);
-
-CacheJdbcPojoStore store = new 
CacheJdbcPojoStore<>();
-
-
store.setDataSource(JdbcConnectionPool.create("jdbc:h2:tcp://localhost/mem:ExampleDb",
 "sa", ""));
-store.setDialect(new H2Dialect());
-
-store.setTypes(jdbcType);
-
-return store;
+return super.create();
 }
 }
 
@@ -98,7 +77,29 @@ public class CacheAutoStoreExample {
 private static CacheConfiguration cacheConfiguration() {
 CacheConfiguration cfg = new 
CacheConfiguration<>(CACHE_NAME);
 
-cfg.setCacheStoreFactory(new CacheJdbcPojoStoreExampleFactory());
+CacheJdbcPojoStoreExampleFactory storeFactory = new 
CacheJdbcPojoStoreExampleFactory();
+
+storeFactory.setDialect(new H2Dialect());
+
+JdbcType jdbcType = new JdbcType();
+
+jdbcType.setCacheName(CACHE_NAME);
+jdbcType.setDatabaseSchema("PUBLIC");
+jdbcType.setDatabaseTable("PERSON");
+
+jdbcType.setKeyType("java.lang.Long");
+jdbcType.setKeyFields(new 

[19/20] ignite git commit: merge 1.5

[sboikov]

merge 1.5


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

Branch: refs/heads/ignite-1537
Commit: b9140b332c33dc6f9ca6047022ce3c563ff706a6
Parents: 6f38064 3ba7e54
Author: sboikov 
Authored: Wed Dec 9 15:11:55 2015 +0300
Committer: sboikov 
Committed: Wed Dec 9 15:11:55 2015 +0300

--
 bin/ignite.bat  |   5 +-
 bin/include/parseargs.bat   |   2 +-
 examples/pom.xml|   2 +-
 examples/schema-import/pom.xml  |   2 +-
 .../java/org/apache/ignite/schema/Demo.java |   6 +-
 .../store/auto/CacheAutoStoreExample.java   |  49 +-
 .../messaging/MessagingPingPongExample.java |   4 -
 .../examples/MessagingExamplesSelfTest.java |   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 +-
 .../ignite/codegen/MessageCodeGenerator.java|   6 +-
 modules/core/pom.xml|   2 +-
 .../main/java/org/apache/ignite/Ignition.java   |  16 +
 .../store/jdbc/CacheAbstractJdbcStore.java  |   5 +-
 .../configuration/CacheConfiguration.java   |  39 +-
 .../configuration/IgniteConfiguration.java  |   2 -
 .../configuration/TransactionConfiguration.java |  47 +-
 .../apache/ignite/internal/IgniteKernal.java|   2 +-
 .../org/apache/ignite/internal/IgnitionEx.java  |  39 +-
 .../ignite/internal/MarshallerContextImpl.java  |  23 +-
 .../managers/communication/GridIoManager.java   |   3 +-
 .../communication/GridIoMessageFactory.java |   8 +-
 .../internal/portable/BinaryFieldAccessor.java  |   9 +-
 .../internal/portable/BinaryReaderExImpl.java   |  19 +-
 .../internal/portable/BinaryWriterExImpl.java   |  19 +-
 .../portable/PortableClassDescriptor.java   |  46 +-
 .../internal/portable/PortableContext.java  |  12 +-
 .../CacheDefaultBinaryAffinityKeyMapper.java|   2 +-
 .../processors/cache/GridCacheAdapter.java  |  65 +-
 .../cache/GridCacheConcurrentMap.java   | 734 +
 .../processors/cache/GridCacheMapEntry.java |  44 +-
 .../cache/GridCacheMapEntryFactory.java |  13 +-
 .../processors/cache/GridCacheProcessor.java|   2 +-
 .../distributed/GridDistributedCacheEntry.java  |  14 +-
 .../dht/GridDhtAffinityAssignmentResponse.java  |   2 +-
 .../distributed/dht/GridDhtCacheAdapter.java|  13 +-
 .../distributed/dht/GridDhtCacheEntry.java  |  14 +-
 .../dht/GridDhtOffHeapCacheEntry.java   |  15 +-
 .../distributed/dht/GridNoStorageCacheMap.java  |   4 +-
 .../dht/atomic/GridDhtAtomicCache.java  |  23 +-
 .../dht/atomic/GridDhtAtomicCacheEntry.java |  16 +-
 .../atomic/GridDhtAtomicOffHeapCacheEntry.java  |  15 +-
 .../dht/colocated/GridDhtColocatedCache.java|  13 +-
 .../colocated/GridDhtColocatedCacheEntry.java   |  14 +-
 .../GridDhtColocatedOffHeapCacheEntry.java  |  15 +-
 .../colocated/GridDhtDetachedCacheEntry.java|   4 +-
 .../distributed/near/GridNearCacheAdapter.java  |   8 +-
 .../distributed/near/GridNearCacheEntry.java|  16 +-
 .../near/GridNearOffHeapCacheEntry.java |  15 +-
 .../cache/jta/CacheJtaManagerAdapter.java   |   4 +-
 .../processors/cache/local/GridLocalCache.java  |   8 +-
 .../cache/local/GridLocalCacheEntry.java|  15 +-
 .../local/atomic/GridLocalAtomicCache.java  |   8 +-
 .../CacheObjectBinaryProcessorImpl.java |  41 +-
 .../cache/query/GridCacheQueryManager.java  |  46 +-
 .../internal/util/GridMessageCollection.java| 160 
 .../ignite/internal/util/IgniteUtils.java   |  18 +-
 .../internal/util/UUIDCollectionMessage.java|  42 +-
 .../util/nio/GridNioBackPressureControl.java|  14 +-
 .../optimized/OptimizedMarshallerUtils.java |  16 +-
 .../org/apache/ignite/spi/IgniteSpiThread.java  |  10 +-
 .../communication/tcp/TcpCommunicationSpi.java  |   6 +-
 .../org/apache/ignite/thread/IgniteThread.java  |  43 +-
 .../ignite/thread/IgniteThreadPoolExecutor.java |  37 +-
 .../core/src/main/resources/ignite.properties   |   2 +-
 .../portable/BinaryMarshallerSelfTest.java  |  16 +-
 ...cheAbstractFullApiMultithreadedSelfTest.java |   2 +-
 .../cache/GridCacheAbstractFullApiSelfTest.java |   4 +-
 .../cache/GridCacheAlwaysEvictionPolicy.java|   2 +-
 ...eAtomicEntryProcessorDeploymentSelfTest.java |   6 +-
 

[16/20] ignite git commit: IGNITE-2064 Fixed Usage of Optimize classloader test coverage

[sboikov]

IGNITE-2064 Fixed Usage of Optimize classloader test coverage


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

Branch: refs/heads/ignite-1537
Commit: afbb0dc0c1323b1b24d1a6f4f46fc78d255c98a4
Parents: d078655
Author: Anton Vinogradov 
Authored: Wed Dec 9 12:59:51 2015 +0300
Committer: Anton Vinogradov 
Committed: Wed Dec 9 12:59:51 2015 +0300

--
 .../internal/portable/BinaryMarshallerSelfTest.java   | 14 +-
 1 file changed, 13 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/afbb0dc0/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryMarshallerSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryMarshallerSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryMarshallerSelfTest.java
index a06e6c3..d667e07 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryMarshallerSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryMarshallerSelfTest.java
@@ -80,6 +80,7 @@ import sun.misc.Unsafe;
 
 import static 
org.apache.ignite.internal.portable.streams.PortableMemoryAllocator.INSTANCE;
 import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertNotEquals;
 
 /**
  * Portable marshaller tests.
@@ -329,6 +330,17 @@ public class BinaryMarshallerSelfTest extends 
GridCommonAbstractTest {
 /**
  * @throws Exception If failed.
  */
+public void testException() throws Exception {
+Exception ex = new RuntimeException();
+
+// Checks that Optimize marshaller will be used, because Throwable has 
writeObject method.
+// Exception's stacktrace equals to zero-length array by default and 
generates at Throwable's writeObject method.
+assertNotEquals(0, marshalUnmarshal(ex).getStackTrace().length);
+}
+
+/**
+ * @throws Exception If failed.
+ */
 public void testCollection() throws Exception {
 testCollection(new ArrayList(3));
 testCollection(new LinkedHashSet());
@@ -2406,7 +2418,7 @@ public class BinaryMarshallerSelfTest extends 
GridCommonAbstractTest {
 protected boolean compactFooter() {
 return true;
 }
-
+
 /**
  * @param marsh Marshaller.
  * @return Portable context.

[09/20] ignite git commit: ignite-1.5 Cache map refactoring. This closes #279.

[sboikov]

http://git-wip-us.apache.org/repos/asf/ignite/blob/3baf4d16/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java
index 1f494c0..5bb6794 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java
@@ -220,8 +220,6 @@ public class GridCacheConcurrentMapSelfTest extends 
GridCommonAbstractTest {
 Thread.sleep(1000);
 
 jcache().get(rand.nextInt(cnt));
-
-assertEquals(0, local().map.iteratorMapSize());
 }
 
 /**
@@ -315,8 +313,6 @@ public class GridCacheConcurrentMapSelfTest extends 
GridCommonAbstractTest {
 Thread.sleep(1000);
 
 jcache().get(rand.nextInt(cnt));
-
-assertEquals(0, local().map.iteratorMapSize());
 }
 
 /**
@@ -352,14 +348,7 @@ public class GridCacheConcurrentMapSelfTest extends 
GridCommonAbstractTest {
 System.gc();
 
 c.get(100);
-
-if (local().map.iteratorMapSize() == 0)
-break;
-else
-U.sleep(500);
 }
-
-assertEquals(0, local().map.iteratorMapSize());
 }
 }
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/3baf4d16/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridHashMapLoadTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridHashMapLoadTest.java
 
b/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridHashMapLoadTest.java
index a41f6c8..b459dde 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridHashMapLoadTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridHashMapLoadTest.java
@@ -81,7 +81,7 @@ public class GridHashMapLoadTest extends 
GridCommonAbstractTest {
 Integer val = i++;
 
 map.put(key, new GridCacheMapEntry(ctx, ctx.toCacheKeyObject(key),
-key.hashCode(), ctx.toCacheObject(val), null, 1) {
+key.hashCode(), ctx.toCacheObject(val)) {
 @Override public boolean tmLock(IgniteInternalTx tx,
 long timeout,
 @Nullable GridCacheVersion serOrder,
@@ -103,4 +103,4 @@ public class GridHashMapLoadTest extends 
GridCommonAbstractTest {
 info("Inserted objects: " + i / 2);
 }
 }
-}
\ No newline at end of file
+}

[08/20] ignite git commit: 2064 Issue url fix

[sboikov]

2064 Issue url fix


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

Branch: refs/heads/ignite-1537
Commit: c30def8f049bddb4ec272528326f84bf90a1399b
Parents: 0e81a39
Author: Anton Vinogradov 
Authored: Tue Dec 8 16:48:58 2015 +0300
Committer: Anton Vinogradov 
Committed: Tue Dec 8 16:48:58 2015 +0300

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


http://git-wip-us.apache.org/repos/asf/ignite/blob/c30def8f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
index aa64959..bfa353b 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
@@ -228,7 +228,7 @@ public class GridCacheDeploymentSelfTest extends 
GridCommonAbstractTest {
 Ignite g1 = startGrid(1);
 
 if (g1.configuration().getMarshaller() instanceof BinaryMarshaller)
-fail("http://atlassian.gridgain.com/jira/browse/GG-10791;);
+fail("https://issues.apache.org/jira/browse/IGNITE-2106;);
 
 Ignite g2 = startGrid(2);
 

[18/20] 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/3ba7e541
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3ba7e541
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3ba7e541

Branch: refs/heads/ignite-1537
Commit: 3ba7e541caa8f2dd2c4301203b07bfc58ef4cabb
Parents: e0ffc29 afbb0dc
Author: Alexey Kuznetsov 
Authored: Wed Dec 9 17:53:04 2015 +0700
Committer: Alexey Kuznetsov 
Committed: Wed Dec 9 17:53:04 2015 +0700

--
 .../portable/PortableClassDescriptor.java   | 46 ++--
 .../portable/BinaryMarshallerSelfTest.java  | 14 +-
 2 files changed, 36 insertions(+), 24 deletions(-)
--

[01/20] ignite git commit: IGNITE-2064 More test fixes

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1537 63f00fb48 -> 729c0d0cd


IGNITE-2064 More test fixes


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

Branch: refs/heads/ignite-1537
Commit: 8ca163bd0f06cc832df126733dbbe50cea35c2ac
Parents: 67ebd02
Author: Anton Vinogradov 
Authored: Tue Dec 8 15:46:10 2015 +0300
Committer: Anton Vinogradov 
Committed: Tue Dec 8 15:46:10 2015 +0300

--
 .../GridCacheConditionalDeploymentSelfTest.java | 20 
 .../cache/GridCacheDeploymentSelfTest.java  | 11 ---
 2 files changed, 20 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/8ca163bd/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConditionalDeploymentSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConditionalDeploymentSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConditionalDeploymentSelfTest.java
index c03eb08..4098225 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConditionalDeploymentSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConditionalDeploymentSelfTest.java
@@ -18,11 +18,11 @@
 package org.apache.ignite.internal.processors.cache;
 
 import org.apache.ignite.Ignite;
-import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.Ignition;
 import org.apache.ignite.configuration.CacheConfiguration;
 import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.internal.managers.communication.GridIoMessageFactory;
+import org.apache.ignite.internal.portable.BinaryMarshaller;
 import org.apache.ignite.internal.util.IgniteUtils;
 import org.apache.ignite.internal.util.typedef.CO;
 import org.apache.ignite.plugin.extensions.communication.Message;
@@ -139,19 +139,23 @@ public class GridCacheConditionalDeploymentSelfTest 
extends GridCommonAbstractTe
 public void testAddedDeploymentInfo2() throws Exception {
 GridCacheContext ctx = cacheContext();
 
-assertTrue(ctx.deploymentEnabled());
+if (grid(0).configuration().getMarshaller() instanceof 
BinaryMarshaller)
+assertFalse(ctx.deploymentEnabled());
+else {
+assertTrue(ctx.deploymentEnabled());
 
-GridCacheIoManager ioMgr = cacheIoManager();
+GridCacheIoManager ioMgr = cacheIoManager();
 
-TestMessage msg = new TestMessage();
+TestMessage msg = new TestMessage();
 
-assertNull(msg.deployInfo());
+assertNull(msg.deployInfo());
 
-msg.addDepInfo = false;
+msg.addDepInfo = false;
 
-IgniteUtils.invoke(GridCacheIoManager.class, ioMgr, "onSend", msg, 
grid(1).cluster().localNode().id());
+IgniteUtils.invoke(GridCacheIoManager.class, ioMgr, "onSend", msg, 
grid(1).cluster().localNode().id());
 
-assertNull(msg.deployInfo());
+assertNull(msg.deployInfo());
+}
 }
 
 protected GridCacheContext cacheContext() {

http://git-wip-us.apache.org/repos/asf/ignite/blob/8ca163bd/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
index e18520d..aa64959 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
@@ -26,6 +26,7 @@ import org.apache.ignite.configuration.CacheConfiguration;
 import org.apache.ignite.configuration.DeploymentMode;
 import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.configuration.NearCacheConfiguration;
+import org.apache.ignite.internal.portable.BinaryMarshaller;
 import org.apache.ignite.internal.util.typedef.T2;
 import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
@@ -207,7 +208,9 @@ public class GridCacheDeploymentSelfTest extends 
GridCommonAbstractTest {
 }
 
 assertEquals(0, g1.cache(null).localSize());
-

[15/20] ignite git commit: IGNITE-2064 Fixed Usage of Optimize classloader

[sboikov]

IGNITE-2064 Fixed Usage of Optimize classloader


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

Branch: refs/heads/ignite-1537
Commit: d0786551aef92f77cbb23097de18745399d00d69
Parents: 5ea19a4
Author: Anton Vinogradov 
Authored: Tue Dec 8 16:39:36 2015 +0300
Committer: Anton Vinogradov 
Committed: Wed Dec 9 12:55:06 2015 +0300

--
 .../portable/PortableClassDescriptor.java   | 46 ++--
 1 file changed, 23 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/d0786551/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableClassDescriptor.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableClassDescriptor.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableClassDescriptor.java
index 984f7c9..ed65e63 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableClassDescriptor.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableClassDescriptor.java
@@ -17,13 +17,6 @@
 
 package org.apache.ignite.internal.portable;
 
-import org.apache.ignite.IgniteCheckedException;
-import org.apache.ignite.internal.processors.cache.CacheObjectImpl;
-import org.apache.ignite.internal.util.typedef.internal.U;
-import org.apache.ignite.marshaller.MarshallerExclusions;
-import org.apache.ignite.marshaller.optimized.OptimizedMarshaller;
-import org.jetbrains.annotations.Nullable;
-
 import java.io.Externalizable;
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -43,10 +36,16 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.UUID;
-import org.apache.ignite.binary.BinaryObjectException;
+import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.binary.BinaryIdMapper;
-import org.apache.ignite.binary.Binarylizable;
+import org.apache.ignite.binary.BinaryObjectException;
 import org.apache.ignite.binary.BinarySerializer;
+import org.apache.ignite.binary.Binarylizable;
+import org.apache.ignite.internal.processors.cache.CacheObjectImpl;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.marshaller.MarshallerExclusions;
+import org.apache.ignite.marshaller.optimized.OptimizedMarshaller;
+import org.jetbrains.annotations.Nullable;
 
 import static java.lang.reflect.Modifier.isStatic;
 import static java.lang.reflect.Modifier.isTransient;
@@ -268,11 +267,11 @@ public class PortableClassDescriptor {
 }
 }
 }
-
+
 fields = fields0.toArray(new 
BinaryFieldAccessor[fields0.size()]);
-
+
 stableSchema = schemaBuilder.build();
-
+
 break;
 
 default:
@@ -796,19 +795,20 @@ public class PortableClassDescriptor {
  * @return {@code true} if to use, {@code false} otherwise.
  */
 private boolean initUseOptimizedMarshallerFlag() {
-   boolean use;
-
-try {
-Method writeObj = cls.getDeclaredMethod("writeObject", 
ObjectOutputStream.class);
-Method readObj = cls.getDeclaredMethod("readObject", 
ObjectInputStream.class);
+for (Class c = cls; !c.equals(Object.class); c = c.getSuperclass()) {
+try {
+Method writeObj = c.getDeclaredMethod("writeObject", 
ObjectOutputStream.class);
+Method readObj = c.getDeclaredMethod("readObject", 
ObjectInputStream.class);
 
-use = !Modifier.isStatic(writeObj.getModifiers()) && 
!Modifier.isStatic(readObj.getModifiers()) &&
-writeObj.getReturnType() == void.class && 
readObj.getReturnType() == void.class;
-}
-catch (NoSuchMethodException e) {
-use = false;
+if (!Modifier.isStatic(writeObj.getModifiers()) && 
!Modifier.isStatic(readObj.getModifiers()) &&
+writeObj.getReturnType() == void.class && 
readObj.getReturnType() == void.class)
+return true;
+}
+catch (NoSuchMethodException e) {
+// No-op.
+}
 }
 
-return use;
+return false;
 }
 }

[11/20] ignite git commit: Fix OSGi test.

[sboikov]

Fix OSGi test.

(@ProbeBuilder applies to all test classes when run from a suite).


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

Branch: refs/heads/ignite-1537
Commit: bdbe4068b3851f7a412935acb3e36860cd08efa9
Parents: 3baf4d1
Author: Raul Kripalani 
Authored: Tue Dec 8 21:04:36 2015 +0100
Committer: Raul Kripalani 
Committed: Tue Dec 8 21:04:36 2015 +0100

--
 .../test/java/org/apache/ignite/osgi/IgniteOsgiServiceTest.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/bdbe4068/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteOsgiServiceTest.java
--
diff --git 
a/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteOsgiServiceTest.java 
b/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteOsgiServiceTest.java
index 9a2e92d..4f875ed 100644
--- 
a/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteOsgiServiceTest.java
+++ 
b/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteOsgiServiceTest.java
@@ -93,7 +93,7 @@ public class IgniteOsgiServiceTest extends 
AbstractIgniteKarafTest {
  */
 @ProbeBuilder
 public TestProbeBuilder probeConfiguration(TestProbeBuilder probe) {
-probe.setHeader(Constants.IMPORT_PACKAGE, 
"*,org.apache.ignite.osgi.activators");
+probe.setHeader(Constants.IMPORT_PACKAGE, 
"*,org.apache.ignite.osgi.activators;resolution:=\"optional\"");
 
 return probe;
 }

[20/51] [abbrv] ignite git commit: ignite-1.5 Added tx mdoe configuration for IgnitePutTxBenchmark.

[akuznetsov]

ignite-1.5 Added tx mdoe configuration for IgnitePutTxBenchmark.


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

Branch: refs/heads/ignite-843-rc2
Commit: 233231de53e0d2c7d91244f7d65a13ecd515d8ce
Parents: 8033bc4
Author: sboikov 
Authored: Mon Dec 7 10:40:19 2015 +0300
Committer: sboikov 
Committed: Mon Dec 7 10:40:19 2015 +0300

--
 .../yardstick/cache/IgnitePutTxBenchmark.java   | 26 +---
 1 file changed, 22 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/233231de/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxBenchmark.java
--
diff --git 
a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxBenchmark.java
 
b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxBenchmark.java
index 9c3389f..15b7cd6 100644
--- 
a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxBenchmark.java
+++ 
b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxBenchmark.java
@@ -18,8 +18,11 @@
 package org.apache.ignite.yardstick.cache;
 
 import java.util.Map;
+import java.util.concurrent.Callable;
 import org.apache.ignite.IgniteCache;
 import org.apache.ignite.IgniteSystemProperties;
+import org.apache.ignite.IgniteTransactions;
+import org.apache.ignite.yardstick.IgniteBenchmarkUtils;
 import org.apache.ignite.yardstick.cache.model.SampleValue;
 import org.yardstickframework.BenchmarkConfiguration;
 
@@ -27,20 +30,35 @@ import org.yardstickframework.BenchmarkConfiguration;
  * Ignite benchmark that performs transactional put operations.
  */
 public class IgnitePutTxBenchmark extends 
IgniteCacheAbstractBenchmark {
+/** */
+private IgniteTransactions txs;
+
+/** */
+private Callable clo;
+
 /** {@inheritDoc} */
 @Override public void setUp(BenchmarkConfiguration cfg) throws Exception {
 super.setUp(cfg);
 
 if (!IgniteSystemProperties.getBoolean("SKIP_MAP_CHECK"))
 ignite().compute().broadcast(new WaitMapExchangeFinishCallable());
+
+txs = ignite().transactions();
+
+clo = new Callable() {
+@Override public Void call() throws Exception {
+int key = nextRandom(args.range());
+
+cache.put(key, new SampleValue(key));
+
+return null;
+}
+};
 }
 
 /** {@inheritDoc} */
 @Override public boolean test(Map ctx) throws Exception {
-int key = nextRandom(args.range());
-
-// Implicit transaction is used.
-cache.put(key, new SampleValue(key));
+IgniteBenchmarkUtils.doInTransaction(txs, args.txConcurrency(), 
args.txIsolation(), clo);
 
 return true;
 }

ignite git commit: ignite-1.5 Fixed asserts in GridTransactionalCacheQueueImpl to take into account case when queue data was lost.

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1537 729c0d0cd -> 6a0869c88


ignite-1.5 Fixed asserts in GridTransactionalCacheQueueImpl to take into 
account case when queue data was lost.


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

Branch: refs/heads/ignite-1537
Commit: 6a0869c888cd15a3301aa0c4d6e18e7e8a03b96c
Parents: 729c0d0
Author: sboikov 
Authored: Wed Dec 9 15:25:34 2015 +0300
Committer: sboikov 
Committed: Wed Dec 9 15:25:34 2015 +0300

--
 .../GridTransactionalCacheQueueImpl.java|  32 +++--
 ...eAbstractDataStructuresFailoverSelfTest.java | 138 +++
 2 files changed, 128 insertions(+), 42 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/6a0869c8/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridTransactionalCacheQueueImpl.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridTransactionalCacheQueueImpl.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridTransactionalCacheQueueImpl.java
index 32e94d3..7b80765 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridTransactionalCacheQueueImpl.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridTransactionalCacheQueueImpl.java
@@ -96,22 +96,28 @@ public class GridTransactionalCacheQueueImpl extends 
GridCacheQueueAdapter
 @Override public T call() throws Exception {
 T retVal;
 
-try (IgniteInternalTx tx = cache.txStartEx(PESSIMISTIC, 
REPEATABLE_READ)) {
-Long idx = (Long)cache.invoke(queueKey, new 
PollProcessor(id)).get();
+while (true) {
+try (IgniteInternalTx tx = 
cache.txStartEx(PESSIMISTIC, REPEATABLE_READ)) {
+Long idx = (Long)cache.invoke(queueKey, new 
PollProcessor(id)).get();
 
-if (idx != null) {
-checkRemoved(idx);
+if (idx != null) {
+checkRemoved(idx);
 
-retVal = (T)cache.getAndRemove(itemKey(idx));
+retVal = (T)cache.getAndRemove(itemKey(idx));
 
-assert retVal != null : idx;
-}
-else
-retVal = null;
+if (retVal == null) { // Possible if data was 
lost.
+tx.commit();
 
-tx.commit();
+continue;
+}
+}
+else
+retVal = null;
 
-return retVal;
+tx.commit();
+
+return retVal;
+}
 }
 }
 }).call();
@@ -188,9 +194,7 @@ public class GridTransactionalCacheQueueImpl extends 
GridCacheQueueAdapter
 if (idx != null) {
 checkRemoved(idx);
 
-boolean rmv = cache.remove(itemKey(idx));
-
-assert rmv : idx;
+cache.remove(itemKey(idx));
 }
 
 tx.commit();

http://git-wip-us.apache.org/repos/asf/ignite/blob/6a0869c8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java
index cb16aeb..1e15c15 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java
@@ -196,14 +196,14 @@ public abstract class 
GridCacheAbstractDataStructuresFailoverSelfTest extends Ig
  * 

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

[vozerov]

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

Branch: refs/heads/ignite-1.5
Commit: 3016c0f1b6084e675df36ef4e4cfab40faad0569
Parents: 01a2232 3ba7e54
Author: vozerov-gridgain 
Authored: Wed Dec 9 15:33:36 2015 +0300
Committer: vozerov-gridgain 
Committed: Wed Dec 9 15:33:36 2015 +0300

--
 .../java/org/apache/ignite/schema/Demo.java |  6 ++-
 .../store/auto/CacheAutoStoreExample.java   | 49 ++--
 2 files changed, 29 insertions(+), 26 deletions(-)
--

[1/5] ignite git commit: ignite-1.5 Fixed asserts in GridTransactionalCacheQueueImpl to take into account case when queue data was really lost.

[vozerov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-2099 7d734157e -> 1c8208e0d


ignite-1.5 Fixed asserts in GridTransactionalCacheQueueImpl to take into 
account case when queue data was really lost.


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

Branch: refs/heads/ignite-2099
Commit: add6161451d3e8b263782e52c51a0e2b34daeb3f
Parents: 3016c0f
Author: sboikov 
Authored: Wed Dec 9 16:32:48 2015 +0300
Committer: sboikov 
Committed: Wed Dec 9 16:32:48 2015 +0300

--
 .../GridTransactionalCacheQueueImpl.java|  32 +++--
 ...eAbstractDataStructuresFailoverSelfTest.java | 138 +++
 2 files changed, 128 insertions(+), 42 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/add61614/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridTransactionalCacheQueueImpl.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridTransactionalCacheQueueImpl.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridTransactionalCacheQueueImpl.java
index 32e94d3..7b80765 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridTransactionalCacheQueueImpl.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridTransactionalCacheQueueImpl.java
@@ -96,22 +96,28 @@ public class GridTransactionalCacheQueueImpl extends 
GridCacheQueueAdapter
 @Override public T call() throws Exception {
 T retVal;
 
-try (IgniteInternalTx tx = cache.txStartEx(PESSIMISTIC, 
REPEATABLE_READ)) {
-Long idx = (Long)cache.invoke(queueKey, new 
PollProcessor(id)).get();
+while (true) {
+try (IgniteInternalTx tx = 
cache.txStartEx(PESSIMISTIC, REPEATABLE_READ)) {
+Long idx = (Long)cache.invoke(queueKey, new 
PollProcessor(id)).get();
 
-if (idx != null) {
-checkRemoved(idx);
+if (idx != null) {
+checkRemoved(idx);
 
-retVal = (T)cache.getAndRemove(itemKey(idx));
+retVal = (T)cache.getAndRemove(itemKey(idx));
 
-assert retVal != null : idx;
-}
-else
-retVal = null;
+if (retVal == null) { // Possible if data was 
lost.
+tx.commit();
 
-tx.commit();
+continue;
+}
+}
+else
+retVal = null;
 
-return retVal;
+tx.commit();
+
+return retVal;
+}
 }
 }
 }).call();
@@ -188,9 +194,7 @@ public class GridTransactionalCacheQueueImpl extends 
GridCacheQueueAdapter
 if (idx != null) {
 checkRemoved(idx);
 
-boolean rmv = cache.remove(itemKey(idx));
-
-assert rmv : idx;
+cache.remove(itemKey(idx));
 }
 
 tx.commit();

http://git-wip-us.apache.org/repos/asf/ignite/blob/add61614/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java
index cb16aeb..1e15c15 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java
@@ -196,14 +196,14 @@ public abstract class 
GridCacheAbstractDataStructuresFailoverSelfTest extends Ig
 

[3/5] ignite git commit: .NET: Documentation fixes.

[vozerov]

.NET: Documentation fixes.


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

Branch: refs/heads/ignite-2099
Commit: c946c762a15122ab41e8f88b0b9bac80e5d2d135
Parents: d87ca48
Author: vozerov-gridgain 
Authored: Wed Dec 9 17:14:14 2015 +0300
Committer: vozerov-gridgain 
Committed: Wed Dec 9 17:14:14 2015 +0300

--
 .../Cache/Query/IQueryCursor.cs |  2 +-
 .../Apache.Ignite.Core/Cache/Query/QueryBase.cs |  2 +-
 .../Store/CacheParallelLoadStoreAdapter.cs  |  4 ++--
 .../Cache/Store/CacheStoreAdapter.cs| 12 +-
 .../Cache/Store/ICacheStore.cs  |  4 ++--
 .../Apache.Ignite.Core/Cluster/ICluster.cs  |  2 +-
 .../Cluster/IClusterMetrics.cs  |  6 ++---
 .../Apache.Ignite.Core/Cluster/IClusterNode.cs  |  6 ++---
 .../Apache.Ignite.Core/Compute/IComputeTask.cs  |  2 +-
 .../Datastream/IDataStreamer.cs | 12 +-
 .../Apache.Ignite.Core/Events/CacheEvent.cs |  4 ++--
 .../Apache.Ignite.Core/Events/TaskEvent.cs  |  2 +-
 .../dotnet/Apache.Ignite.Core/IIgnite.cs|  6 ++---
 .../dotnet/Apache.Ignite.Core/Ignition.cs   | 24 ++--
 .../Impl/Binary/BinaryObjectHeader.cs   | 10 
 .../Impl/Binary/BinarySystemHandlers.cs |  9 +---
 .../Impl/Binary/BinaryUtils.cs  |  1 -
 .../Impl/Binary/Metadata/BinaryTypeHolder.cs|  1 +
 .../Apache.Ignite.Core/Impl/Cache/CacheImpl.cs  |  2 --
 .../Transactions/ITransaction.cs|  2 +-
 20 files changed, 52 insertions(+), 61 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/c946c762/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/IQueryCursor.cs
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/IQueryCursor.cs 
b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/IQueryCursor.cs
index ffa0565..9ddac2a 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/IQueryCursor.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/IQueryCursor.cs
@@ -25,7 +25,7 @@ namespace Apache.Ignite.Core.Cache.Query
 /// Query result cursor. Can be processed either in iterative mode, or by 
taking
 /// all entries using  method.
 /// 
-/// Note that you get enumerator or call GetAll() method only 
once during
+/// Note that you get enumerator or call GetAll() method only once 
during
 /// cursor lifetime. Any further attempts to get enumerator or all entries 
will result 
 /// in exception.
 /// 

http://git-wip-us.apache.org/repos/asf/ignite/blob/c946c762/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/QueryBase.cs
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/QueryBase.cs 
b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/QueryBase.cs
index 1464589..5bbfc1c 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/QueryBase.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/QueryBase.cs
@@ -45,7 +45,7 @@ namespace Apache.Ignite.Core.Cache.Query
 public bool Local { get; set; }
 
 /// 
-/// Optional page size. If set to 0, then 
CacheQueryConfiguration.pageSize is used.
+/// Optional page size. If set to 0, then 
CacheQueryConfiguration.pageSize is used.
 /// 
 public int PageSize { get; set; }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/c946c762/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Store/CacheParallelLoadStoreAdapter.cs
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Store/CacheParallelLoadStoreAdapter.cs
 
b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Store/CacheParallelLoadStoreAdapter.cs
index e80f1a7..147f1bd 100644
--- 
a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Store/CacheParallelLoadStoreAdapter.cs
+++ 
b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Store/CacheParallelLoadStoreAdapter.cs
@@ -103,12 +103,12 @@ namespace Apache.Ignite.Core.Cache.Store
 /// Loads an object. Application developers should implement this 
method to customize the loading
 /// of a value for a cache entry.
 /// This method is called by a cache when a requested entry is not in 
the cache.
-/// If the object can't be loaded null should be returned.
+/// If the object can't be loaded null should be returned.
 /// 
 

ignite git commit: IGNITE-2099: Remove entry support in .NET.

[vozerov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-2099 5d401c4d6 -> 7d734157e


IGNITE-2099: Remove entry support in .NET.


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

Branch: refs/heads/ignite-2099
Commit: 7d734157b1935ffc6ed7be2b6779bd7ce8f9
Parents: 5d401c4
Author: vozerov-gridgain 
Authored: Wed Dec 9 17:02:25 2015 +0300
Committer: vozerov-gridgain 
Committed: Wed Dec 9 17:02:25 2015 +0300

--
 .../Impl/Binary/BinaryObjectBuilder.cs  |  8 +
 .../Impl/Binary/BinarySystemHandlers.cs | 34 ++--
 .../Impl/Binary/BinaryUtils.cs  | 29 +
 3 files changed, 4 insertions(+), 67 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/7d734157/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryObjectBuilder.cs
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryObjectBuilder.cs
 
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryObjectBuilder.cs
index 7ef6259..f41514f 100644
--- 
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryObjectBuilder.cs
+++ 
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryObjectBuilder.cs
@@ -972,13 +972,7 @@ namespace Apache.Ignite.Core.Impl.Binary
 }
 
 break;
-
-case BinaryUtils.TypeMapEntry:
-Mutate0(ctx, inStream, outStream, false, 0, EmptyVals);
-Mutate0(ctx, inStream, outStream, false, 0, EmptyVals);
-
-break;
-
+
 case BinaryUtils.TypeBinary:
 TransferArray(inStream, outStream, 1); // Data array.
 TransferBytes(inStream, outStream, 4); // Offset in array.

http://git-wip-us.apache.org/repos/asf/ignite/blob/7d734157/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinarySystemHandlers.cs
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinarySystemHandlers.cs
 
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinarySystemHandlers.cs
index 0af1e82..7596992 100644
--- 
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinarySystemHandlers.cs
+++ 
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinarySystemHandlers.cs
@@ -69,7 +69,6 @@ namespace Apache.Ignite.Core.Impl.Binary
 {typeof (Guid?), BinaryUtils.TypeGuid},
 {typeof (ArrayList), BinaryUtils.TypeCollection},
 {typeof (Hashtable), BinaryUtils.TypeDictionary},
-{typeof (DictionaryEntry), BinaryUtils.TypeMapEntry},
 {typeof (bool[]), BinaryUtils.TypeArrayBool},
 {typeof (byte[]), BinaryUtils.TypeArrayByte},
 {typeof (sbyte[]), BinaryUtils.TypeArrayByte},
@@ -162,11 +161,8 @@ namespace Apache.Ignite.Core.Impl.Binary
 
 // 13. Arbitrary dictionary.
 ReadHandlers[BinaryUtils.TypeDictionary] = new 
BinarySystemReader(ReadDictionary);
-
-// 15. Map entry.
-ReadHandlers[BinaryUtils.TypeMapEntry] = new 
BinarySystemReader(ReadMapEntry);
 
-// 16. Enum.
+// 14. Enum.
 ReadHandlers[BinaryUtils.TypeArrayEnum] = new 
BinarySystemReader(ReadEnumArray);
 }
 
@@ -218,8 +214,7 @@ namespace Apache.Ignite.Core.Impl.Binary
 return WriteArrayList;
 if (type == typeof(Hashtable))
 return WriteHashtable;
-if (type == typeof(DictionaryEntry))
-return WriteMapEntry;
+
 if (type.IsArray)
 {
 // We know how to write any array type.
@@ -612,16 +607,6 @@ namespace Apache.Ignite.Core.Impl.Binary
 }
 
 /**
- * Write map entry.
- */
-private static void WriteMapEntry(BinaryWriter ctx, object obj)
-{
-ctx.Stream.WriteByte(BinaryUtils.TypeMapEntry);
-
-BinaryUtils.WriteMapEntry(ctx, (DictionaryEntry)obj);
-}
-
-/**
  * Write binary object.
  */
 private static void WriteBinary(BinaryWriter ctx, object obj)
@@ -697,21 +682,6 @@ namespace Apache.Ignite.Core.Impl.Binary
 }
 
 /**
- * Read map entry.
- */
-private static object ReadMapEntry(BinaryReader ctx, Type type)
-{
-return BinaryUtils.ReadMapEntry(ctx);
-}
-
-/**
- * Add element 

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

[sboikov]

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


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

Branch: refs/heads/ignite-1.5
Commit: e2316ff9160ef8e54f8edeed47d02a0976edcac8
Parents: 637b79a 049f5be
Author: Anton Vinogradov 
Authored: Wed Dec 9 18:19:18 2015 +0300
Committer: Anton Vinogradov 
Committed: Wed Dec 9 18:19:18 2015 +0300

--
 .../src/main/java/org/apache/ignite/thread/IgniteThread.java   | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)
--

ignite git commit: ignite-1.5 Fixed javadoc.

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5 6791c5003 -> 049f5bebd


ignite-1.5 Fixed javadoc.


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

Branch: refs/heads/ignite-1.5
Commit: 049f5bebd50e1350a7bf80886da7dbda46cf3ab6
Parents: 6791c50
Author: sboikov 
Authored: Wed Dec 9 18:17:12 2015 +0300
Committer: sboikov 
Committed: Wed Dec 9 18:17:12 2015 +0300

--
 .../src/main/java/org/apache/ignite/thread/IgniteThread.java   | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/049f5beb/modules/core/src/main/java/org/apache/ignite/thread/IgniteThread.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/thread/IgniteThread.java 
b/modules/core/src/main/java/org/apache/ignite/thread/IgniteThread.java
index 974fa94..a9f1fbb 100644
--- a/modules/core/src/main/java/org/apache/ignite/thread/IgniteThread.java
+++ b/modules/core/src/main/java/org/apache/ignite/thread/IgniteThread.java
@@ -88,7 +88,11 @@ public class IgniteThread extends Thread {
 this.gridName = gridName;
 }
 
-/** {@inheritDoc} */
+/**
+ * Gets name of the grid this thread belongs to.
+ *
+ * @return Name of the grid this thread belongs to.
+ */
 public String getGridName() {
 return gridName;
 }

[14/17] ignite git commit: ignite-1.5 Fixed javadoc.

[sboikov]

ignite-1.5 Fixed javadoc.


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

Branch: refs/heads/ignite-1.5.1
Commit: 049f5bebd50e1350a7bf80886da7dbda46cf3ab6
Parents: 6791c50
Author: sboikov 
Authored: Wed Dec 9 18:17:12 2015 +0300
Committer: sboikov 
Committed: Wed Dec 9 18:17:12 2015 +0300

--
 .../src/main/java/org/apache/ignite/thread/IgniteThread.java   | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/049f5beb/modules/core/src/main/java/org/apache/ignite/thread/IgniteThread.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/thread/IgniteThread.java 
b/modules/core/src/main/java/org/apache/ignite/thread/IgniteThread.java
index 974fa94..a9f1fbb 100644
--- a/modules/core/src/main/java/org/apache/ignite/thread/IgniteThread.java
+++ b/modules/core/src/main/java/org/apache/ignite/thread/IgniteThread.java
@@ -88,7 +88,11 @@ public class IgniteThread extends Thread {
 this.gridName = gridName;
 }
 
-/** {@inheritDoc} */
+/**
+ * Gets name of the grid this thread belongs to.
+ *
+ * @return Name of the grid this thread belongs to.
+ */
 public String getGridName() {
 return gridName;
 }

[12/17] ignite git commit: .NET: Documentation fixes.

[sboikov]

.NET: Documentation fixes.


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

Branch: refs/heads/ignite-1.5.1
Commit: c946c762a15122ab41e8f88b0b9bac80e5d2d135
Parents: d87ca48
Author: vozerov-gridgain 
Authored: Wed Dec 9 17:14:14 2015 +0300
Committer: vozerov-gridgain 
Committed: Wed Dec 9 17:14:14 2015 +0300

--
 .../Cache/Query/IQueryCursor.cs |  2 +-
 .../Apache.Ignite.Core/Cache/Query/QueryBase.cs |  2 +-
 .../Store/CacheParallelLoadStoreAdapter.cs  |  4 ++--
 .../Cache/Store/CacheStoreAdapter.cs| 12 +-
 .../Cache/Store/ICacheStore.cs  |  4 ++--
 .../Apache.Ignite.Core/Cluster/ICluster.cs  |  2 +-
 .../Cluster/IClusterMetrics.cs  |  6 ++---
 .../Apache.Ignite.Core/Cluster/IClusterNode.cs  |  6 ++---
 .../Apache.Ignite.Core/Compute/IComputeTask.cs  |  2 +-
 .../Datastream/IDataStreamer.cs | 12 +-
 .../Apache.Ignite.Core/Events/CacheEvent.cs |  4 ++--
 .../Apache.Ignite.Core/Events/TaskEvent.cs  |  2 +-
 .../dotnet/Apache.Ignite.Core/IIgnite.cs|  6 ++---
 .../dotnet/Apache.Ignite.Core/Ignition.cs   | 24 ++--
 .../Impl/Binary/BinaryObjectHeader.cs   | 10 
 .../Impl/Binary/BinarySystemHandlers.cs |  9 +---
 .../Impl/Binary/BinaryUtils.cs  |  1 -
 .../Impl/Binary/Metadata/BinaryTypeHolder.cs|  1 +
 .../Apache.Ignite.Core/Impl/Cache/CacheImpl.cs  |  2 --
 .../Transactions/ITransaction.cs|  2 +-
 20 files changed, 52 insertions(+), 61 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/c946c762/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/IQueryCursor.cs
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/IQueryCursor.cs 
b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/IQueryCursor.cs
index ffa0565..9ddac2a 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/IQueryCursor.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/IQueryCursor.cs
@@ -25,7 +25,7 @@ namespace Apache.Ignite.Core.Cache.Query
 /// Query result cursor. Can be processed either in iterative mode, or by 
taking
 /// all entries using  method.
 /// 
-/// Note that you get enumerator or call GetAll() method only 
once during
+/// Note that you get enumerator or call GetAll() method only once 
during
 /// cursor lifetime. Any further attempts to get enumerator or all entries 
will result 
 /// in exception.
 /// 

http://git-wip-us.apache.org/repos/asf/ignite/blob/c946c762/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/QueryBase.cs
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/QueryBase.cs 
b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/QueryBase.cs
index 1464589..5bbfc1c 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/QueryBase.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/QueryBase.cs
@@ -45,7 +45,7 @@ namespace Apache.Ignite.Core.Cache.Query
 public bool Local { get; set; }
 
 /// 
-/// Optional page size. If set to 0, then 
CacheQueryConfiguration.pageSize is used.
+/// Optional page size. If set to 0, then 
CacheQueryConfiguration.pageSize is used.
 /// 
 public int PageSize { get; set; }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/c946c762/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Store/CacheParallelLoadStoreAdapter.cs
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Store/CacheParallelLoadStoreAdapter.cs
 
b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Store/CacheParallelLoadStoreAdapter.cs
index e80f1a7..147f1bd 100644
--- 
a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Store/CacheParallelLoadStoreAdapter.cs
+++ 
b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Store/CacheParallelLoadStoreAdapter.cs
@@ -103,12 +103,12 @@ namespace Apache.Ignite.Core.Cache.Store
 /// Loads an object. Application developers should implement this 
method to customize the loading
 /// of a value for a cache entry.
 /// This method is called by a cache when a requested entry is not in 
the cache.
-/// If the object can't be loaded null should be returned.
+/// If the object can't be loaded null should be returned.
 /// 
 

[02/17] ignite git commit: IGNITE-2064 Fixed Usage of Optimize classloader

[sboikov]

IGNITE-2064 Fixed Usage of Optimize classloader


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

Branch: refs/heads/ignite-1.5.1
Commit: d0786551aef92f77cbb23097de18745399d00d69
Parents: 5ea19a4
Author: Anton Vinogradov 
Authored: Tue Dec 8 16:39:36 2015 +0300
Committer: Anton Vinogradov 
Committed: Wed Dec 9 12:55:06 2015 +0300

--
 .../portable/PortableClassDescriptor.java   | 46 ++--
 1 file changed, 23 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/d0786551/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableClassDescriptor.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableClassDescriptor.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableClassDescriptor.java
index 984f7c9..ed65e63 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableClassDescriptor.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableClassDescriptor.java
@@ -17,13 +17,6 @@
 
 package org.apache.ignite.internal.portable;
 
-import org.apache.ignite.IgniteCheckedException;
-import org.apache.ignite.internal.processors.cache.CacheObjectImpl;
-import org.apache.ignite.internal.util.typedef.internal.U;
-import org.apache.ignite.marshaller.MarshallerExclusions;
-import org.apache.ignite.marshaller.optimized.OptimizedMarshaller;
-import org.jetbrains.annotations.Nullable;
-
 import java.io.Externalizable;
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -43,10 +36,16 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.UUID;
-import org.apache.ignite.binary.BinaryObjectException;
+import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.binary.BinaryIdMapper;
-import org.apache.ignite.binary.Binarylizable;
+import org.apache.ignite.binary.BinaryObjectException;
 import org.apache.ignite.binary.BinarySerializer;
+import org.apache.ignite.binary.Binarylizable;
+import org.apache.ignite.internal.processors.cache.CacheObjectImpl;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.marshaller.MarshallerExclusions;
+import org.apache.ignite.marshaller.optimized.OptimizedMarshaller;
+import org.jetbrains.annotations.Nullable;
 
 import static java.lang.reflect.Modifier.isStatic;
 import static java.lang.reflect.Modifier.isTransient;
@@ -268,11 +267,11 @@ public class PortableClassDescriptor {
 }
 }
 }
-
+
 fields = fields0.toArray(new 
BinaryFieldAccessor[fields0.size()]);
-
+
 stableSchema = schemaBuilder.build();
-
+
 break;
 
 default:
@@ -796,19 +795,20 @@ public class PortableClassDescriptor {
  * @return {@code true} if to use, {@code false} otherwise.
  */
 private boolean initUseOptimizedMarshallerFlag() {
-   boolean use;
-
-try {
-Method writeObj = cls.getDeclaredMethod("writeObject", 
ObjectOutputStream.class);
-Method readObj = cls.getDeclaredMethod("readObject", 
ObjectInputStream.class);
+for (Class c = cls; !c.equals(Object.class); c = c.getSuperclass()) {
+try {
+Method writeObj = c.getDeclaredMethod("writeObject", 
ObjectOutputStream.class);
+Method readObj = c.getDeclaredMethod("readObject", 
ObjectInputStream.class);
 
-use = !Modifier.isStatic(writeObj.getModifiers()) && 
!Modifier.isStatic(readObj.getModifiers()) &&
-writeObj.getReturnType() == void.class && 
readObj.getReturnType() == void.class;
-}
-catch (NoSuchMethodException e) {
-use = false;
+if (!Modifier.isStatic(writeObj.getModifiers()) && 
!Modifier.isStatic(readObj.getModifiers()) &&
+writeObj.getReturnType() == void.class && 
readObj.getReturnType() == void.class)
+return true;
+}
+catch (NoSuchMethodException e) {
+// No-op.
+}
 }
 
-return use;
+return false;
 }
 }

[09/17] 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/3016c0f1
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3016c0f1
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3016c0f1

Branch: refs/heads/ignite-1.5.1
Commit: 3016c0f1b6084e675df36ef4e4cfab40faad0569
Parents: 01a2232 3ba7e54
Author: vozerov-gridgain 
Authored: Wed Dec 9 15:33:36 2015 +0300
Committer: vozerov-gridgain 
Committed: Wed Dec 9 15:33:36 2015 +0300

--
 .../java/org/apache/ignite/schema/Demo.java |  6 ++-
 .../store/auto/CacheAutoStoreExample.java   | 49 ++--
 2 files changed, 29 insertions(+), 26 deletions(-)
--

ignite git commit: .NET: Documentation fixes.

[vozerov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5 d87ca48c0 -> c946c762a


.NET: Documentation fixes.


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

Branch: refs/heads/ignite-1.5
Commit: c946c762a15122ab41e8f88b0b9bac80e5d2d135
Parents: d87ca48
Author: vozerov-gridgain 
Authored: Wed Dec 9 17:14:14 2015 +0300
Committer: vozerov-gridgain 
Committed: Wed Dec 9 17:14:14 2015 +0300

--
 .../Cache/Query/IQueryCursor.cs |  2 +-
 .../Apache.Ignite.Core/Cache/Query/QueryBase.cs |  2 +-
 .../Store/CacheParallelLoadStoreAdapter.cs  |  4 ++--
 .../Cache/Store/CacheStoreAdapter.cs| 12 +-
 .../Cache/Store/ICacheStore.cs  |  4 ++--
 .../Apache.Ignite.Core/Cluster/ICluster.cs  |  2 +-
 .../Cluster/IClusterMetrics.cs  |  6 ++---
 .../Apache.Ignite.Core/Cluster/IClusterNode.cs  |  6 ++---
 .../Apache.Ignite.Core/Compute/IComputeTask.cs  |  2 +-
 .../Datastream/IDataStreamer.cs | 12 +-
 .../Apache.Ignite.Core/Events/CacheEvent.cs |  4 ++--
 .../Apache.Ignite.Core/Events/TaskEvent.cs  |  2 +-
 .../dotnet/Apache.Ignite.Core/IIgnite.cs|  6 ++---
 .../dotnet/Apache.Ignite.Core/Ignition.cs   | 24 ++--
 .../Impl/Binary/BinaryObjectHeader.cs   | 10 
 .../Impl/Binary/BinarySystemHandlers.cs |  9 +---
 .../Impl/Binary/BinaryUtils.cs  |  1 -
 .../Impl/Binary/Metadata/BinaryTypeHolder.cs|  1 +
 .../Apache.Ignite.Core/Impl/Cache/CacheImpl.cs  |  2 --
 .../Transactions/ITransaction.cs|  2 +-
 20 files changed, 52 insertions(+), 61 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/c946c762/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/IQueryCursor.cs
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/IQueryCursor.cs 
b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/IQueryCursor.cs
index ffa0565..9ddac2a 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/IQueryCursor.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/IQueryCursor.cs
@@ -25,7 +25,7 @@ namespace Apache.Ignite.Core.Cache.Query
 /// Query result cursor. Can be processed either in iterative mode, or by 
taking
 /// all entries using  method.
 /// 
-/// Note that you get enumerator or call GetAll() method only 
once during
+/// Note that you get enumerator or call GetAll() method only once 
during
 /// cursor lifetime. Any further attempts to get enumerator or all entries 
will result 
 /// in exception.
 /// 

http://git-wip-us.apache.org/repos/asf/ignite/blob/c946c762/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/QueryBase.cs
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/QueryBase.cs 
b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/QueryBase.cs
index 1464589..5bbfc1c 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/QueryBase.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/QueryBase.cs
@@ -45,7 +45,7 @@ namespace Apache.Ignite.Core.Cache.Query
 public bool Local { get; set; }
 
 /// 
-/// Optional page size. If set to 0, then 
CacheQueryConfiguration.pageSize is used.
+/// Optional page size. If set to 0, then 
CacheQueryConfiguration.pageSize is used.
 /// 
 public int PageSize { get; set; }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/c946c762/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Store/CacheParallelLoadStoreAdapter.cs
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Store/CacheParallelLoadStoreAdapter.cs
 
b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Store/CacheParallelLoadStoreAdapter.cs
index e80f1a7..147f1bd 100644
--- 
a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Store/CacheParallelLoadStoreAdapter.cs
+++ 
b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Store/CacheParallelLoadStoreAdapter.cs
@@ -103,12 +103,12 @@ namespace Apache.Ignite.Core.Cache.Store
 /// Loads an object. Application developers should implement this 
method to customize the loading
 /// of a value for a cache entry.
 /// This method is called by a cache when a requested entry is not in 
the cache.
-/// If the object can't be loaded null should be returned.
+   

[05/17] 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/3ba7e541
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3ba7e541
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3ba7e541

Branch: refs/heads/ignite-1.5.1
Commit: 3ba7e541caa8f2dd2c4301203b07bfc58ef4cabb
Parents: e0ffc29 afbb0dc
Author: Alexey Kuznetsov 
Authored: Wed Dec 9 17:53:04 2015 +0700
Committer: Alexey Kuznetsov 
Committed: Wed Dec 9 17:53:04 2015 +0700

--
 .../portable/PortableClassDescriptor.java   | 46 ++--
 .../portable/BinaryMarshallerSelfTest.java  | 14 +-
 2 files changed, 36 insertions(+), 24 deletions(-)
--

[10/17] ignite git commit: ignite-1.5 Fixed asserts in GridTransactionalCacheQueueImpl to take into account case when queue data was really lost.

[sboikov]

ignite-1.5 Fixed asserts in GridTransactionalCacheQueueImpl to take into 
account case when queue data was really lost.


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

Branch: refs/heads/ignite-1.5.1
Commit: add6161451d3e8b263782e52c51a0e2b34daeb3f
Parents: 3016c0f
Author: sboikov 
Authored: Wed Dec 9 16:32:48 2015 +0300
Committer: sboikov 
Committed: Wed Dec 9 16:32:48 2015 +0300

--
 .../GridTransactionalCacheQueueImpl.java|  32 +++--
 ...eAbstractDataStructuresFailoverSelfTest.java | 138 +++
 2 files changed, 128 insertions(+), 42 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/add61614/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridTransactionalCacheQueueImpl.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridTransactionalCacheQueueImpl.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridTransactionalCacheQueueImpl.java
index 32e94d3..7b80765 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridTransactionalCacheQueueImpl.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridTransactionalCacheQueueImpl.java
@@ -96,22 +96,28 @@ public class GridTransactionalCacheQueueImpl extends 
GridCacheQueueAdapter
 @Override public T call() throws Exception {
 T retVal;
 
-try (IgniteInternalTx tx = cache.txStartEx(PESSIMISTIC, 
REPEATABLE_READ)) {
-Long idx = (Long)cache.invoke(queueKey, new 
PollProcessor(id)).get();
+while (true) {
+try (IgniteInternalTx tx = 
cache.txStartEx(PESSIMISTIC, REPEATABLE_READ)) {
+Long idx = (Long)cache.invoke(queueKey, new 
PollProcessor(id)).get();
 
-if (idx != null) {
-checkRemoved(idx);
+if (idx != null) {
+checkRemoved(idx);
 
-retVal = (T)cache.getAndRemove(itemKey(idx));
+retVal = (T)cache.getAndRemove(itemKey(idx));
 
-assert retVal != null : idx;
-}
-else
-retVal = null;
+if (retVal == null) { // Possible if data was 
lost.
+tx.commit();
 
-tx.commit();
+continue;
+}
+}
+else
+retVal = null;
 
-return retVal;
+tx.commit();
+
+return retVal;
+}
 }
 }
 }).call();
@@ -188,9 +194,7 @@ public class GridTransactionalCacheQueueImpl extends 
GridCacheQueueAdapter
 if (idx != null) {
 checkRemoved(idx);
 
-boolean rmv = cache.remove(itemKey(idx));
-
-assert rmv : idx;
+cache.remove(itemKey(idx));
 }
 
 tx.commit();

http://git-wip-us.apache.org/repos/asf/ignite/blob/add61614/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java
index cb16aeb..1e15c15 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java
@@ -196,14 +196,14 @@ public abstract class 
GridCacheAbstractDataStructuresFailoverSelfTest extends Ig
  * @throws Exception If failed.
  */
 public void 

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

[sboikov]

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


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

Branch: refs/heads/ignite-1.5.1
Commit: 1a9845ee084610b03200f2bd9392bc947e005de0
Parents: e450fbb e2316ff
Author: Anton Vinogradov 
Authored: Wed Dec 9 18:23:18 2015 +0300
Committer: Anton Vinogradov 
Committed: Wed Dec 9 18:23:18 2015 +0300

--
 assembly/docfiles/ignite_logo.png   |  Bin 0 -> 24315 bytes
 assembly/release-fabric-base.xml|   25 +-
 .../java/org/apache/ignite/schema/Demo.java |6 +-
 .../store/auto/CacheAutoStoreExample.java   |   49 +-
 .../configuration/CacheConfiguration.java   |4 +-
 .../configuration/TransactionConfiguration.java |   47 +-
 .../portable/PortableClassDescriptor.java   |   46 +-
 .../cache/jta/CacheJtaManagerAdapter.java   |4 +-
 .../GridTransactionalCacheQueueImpl.java|   32 +-
 .../org/apache/ignite/thread/IgniteThread.java  |6 +-
 .../portable/BinaryMarshallerSelfTest.java  |   14 +-
 ...eAbstractDataStructuresFailoverSelfTest.java |  138 +-
 .../HibernateTransactionalDataRegion.java   |   18 +-
 .../HibernateL2CacheTransactionalSelfTest.java  |   23 +-
 modules/jta/pom.xml |9 +-
 .../cache/jta/jndi/CacheJndiTmFactory.java  |  132 +
 .../processors/cache/jta/CacheJtaManager.java   |   41 +-
 .../cache/AbstarctCacheJtaSelfTest.java |  183 ++
 .../cache/CacheJndiTmFactorySelfTest.java   |  166 ++
 ...CacheJtaConfigurationValidationSelfTest.java |4 +-
 ...CacheJtaFactoryConfigValidationSelfTest.java |  142 ++
 .../processors/cache/GridCacheJtaSelfTest.java  |  221 --
 .../cache/GridCacheReplicatedJtaSelfTest.java   |   32 -
 .../cache/GridJtaLifecycleAwareSelfTest.java|  191 ++
 .../GridPartitionedCacheJtaFactorySelfTest.java |   41 +
 ...titionedCacheJtaLookupClassNameSelfTest.java |   83 +
 .../GridReplicatedCacheJtaFactorySelfTest.java  |   32 +
 ...plicatedCacheJtaLookupClassNameSelfTest.java |   32 +
 .../GridTmLookupLifecycleAwareSelfTest.java |  122 -
 .../ignite/testsuites/IgniteJtaTestSuite.java   |   26 +-
 .../Apache.Ignite.Core.csproj   |4 +
 .../Cache/Query/IQueryCursor.cs |2 +-
 .../Apache.Ignite.Core/Cache/Query/QueryBase.cs |2 +-
 .../Store/CacheParallelLoadStoreAdapter.cs  |4 +-
 .../Cache/Store/CacheStoreAdapter.cs|   12 +-
 .../Cache/Store/ICacheStore.cs  |   36 +-
 .../Apache.Ignite.Core/Cluster/ICluster.cs  |2 +-
 .../Cluster/IClusterMetrics.cs  |6 +-
 .../Apache.Ignite.Core/Cluster/IClusterNode.cs  |6 +-
 .../Apache.Ignite.Core/Compute/IComputeTask.cs  |2 +-
 .../Datastream/IDataStreamer.cs |   12 +-
 .../Apache.Ignite.Core/Events/CacheEvent.cs |4 +-
 .../Apache.Ignite.Core/Events/TaskEvent.cs  |2 +-
 .../dotnet/Apache.Ignite.Core/IIgnite.cs|6 +-
 .../dotnet/Apache.Ignite.Core/Ignition.cs   |   24 +-
 .../Impl/Binary/BinaryObjectHeader.cs   |   10 +-
 .../Impl/Binary/BinarySystemHandlers.cs |9 +-
 .../Impl/Binary/BinaryUtils.cs  |1 -
 .../Impl/Binary/Metadata/BinaryTypeHolder.cs|1 +
 .../Apache.Ignite.Core/Impl/Cache/CacheImpl.cs  |2 -
 .../Transactions/ITransaction.cs|2 +-
 modules/platforms/dotnet/Apache.Ignite.dxg  | 2387 ++
 modules/platforms/dotnet/Apache.Ignite.sln  |1 +
 modules/platforms/dotnet/Apache.Ignite.slnrel   |   43 -
 .../platforms/dotnet/Apache.Ignite_x86.slnrel   |   43 -
 modules/platforms/dotnet/README.txt |   36 +-
 modules/platforms/dotnet/build.bat  |   94 +
 .../Apache.Ignite.Examples.csproj   |4 +-
 .../Apache.Ignite.ExamplesDll.csproj|4 +-
 modules/platforms/dotnet/examples/README.txt|8 -
 parent/pom.xml  |3 +
 61 files changed, 3941 insertions(+), 700 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/1a9845ee/modules/jta/pom.xml
--

[15/17] ignite git commit: 2064 Hotfix.

[sboikov]

2064 Hotfix.


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

Branch: refs/heads/ignite-1.5.1
Commit: 637b79ad8902da082178e3e9cb63d80beb382a63
Parents: 6791c50
Author: Anton Vinogradov 
Authored: Wed Dec 9 18:18:52 2015 +0300
Committer: Anton Vinogradov 
Committed: Wed Dec 9 18:18:52 2015 +0300

--
 .../apache/ignite/internal/portable/PortableClassDescriptor.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/637b79ad/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableClassDescriptor.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableClassDescriptor.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableClassDescriptor.java
index ed65e63..50c8bb5 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableClassDescriptor.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableClassDescriptor.java
@@ -795,7 +795,7 @@ public class PortableClassDescriptor {
  * @return {@code true} if to use, {@code false} otherwise.
  */
 private boolean initUseOptimizedMarshallerFlag() {
-for (Class c = cls; !c.equals(Object.class); c = c.getSuperclass()) {
+for (Class c = cls; c != null && !c.equals(Object.class); c = 
c.getSuperclass()) {
 try {
 Method writeObj = c.getDeclaredMethod("writeObject", 
ObjectOutputStream.class);
 Method readObj = c.getDeclaredMethod("readObject", 
ObjectInputStream.class);

[5/7] ignite git commit: IGNITE-2111: Build procedure for .NET.

[vozerov]

IGNITE-2111: Build procedure for .NET.


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

Branch: refs/heads/ignite-2099
Commit: 01a22328289f707edb5e479b3cfd03e1502f2f55
Parents: afbb0dc
Author: Pavel Tupitsyn 
Authored: Wed Dec 9 15:32:51 2015 +0300
Committer: vozerov-gridgain 
Committed: Wed Dec 9 15:32:51 2015 +0300

--
 assembly/docfiles/ignite_logo.png   |  Bin 0 -> 24315 bytes
 assembly/release-fabric-base.xml|   12 +-
 .../Apache.Ignite.Core.csproj   |4 +
 modules/platforms/dotnet/Apache.Ignite.dxg  | 2387 ++
 modules/platforms/dotnet/Apache.Ignite.sln  |1 +
 modules/platforms/dotnet/build.bat  |   94 +
 .../Apache.Ignite.Examples.csproj   |4 +-
 .../Apache.Ignite.ExamplesDll.csproj|4 +-
 parent/pom.xml  |1 +
 9 files changed, 2499 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/01a22328/assembly/docfiles/ignite_logo.png
--
diff --git a/assembly/docfiles/ignite_logo.png 
b/assembly/docfiles/ignite_logo.png
new file mode 100644
index 000..7435f01
Binary files /dev/null and b/assembly/docfiles/ignite_logo.png differ

http://git-wip-us.apache.org/repos/asf/ignite/blob/01a22328/assembly/release-fabric-base.xml
--
diff --git a/assembly/release-fabric-base.xml b/assembly/release-fabric-base.xml
index 65903ee..00dd9a4 100644
--- a/assembly/release-fabric-base.xml
+++ b/assembly/release-fabric-base.xml
@@ -87,16 +87,16 @@
 
 
 
-
+
 
-modules/platforms/dotnet/Apache.Ignite.Core
-
/platforms/dotnet/Apache.Ignite.Core
+modules/platforms/dotnet/bin
+/platforms/dotnet/bin
 
 
-
+
 
-modules/platforms/dotnet/Apache.Ignite
-/platforms/dotnet/Apache.Ignite
+modules/platforms/dotnet/doc
+/platforms/dotnet/docs
 
 
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/01a22328/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj 
b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
index 831130c..b3bd712 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
@@ -17,24 +17,28 @@
 bin\x64\Debug\
 true
 DEBUG;CODE_ANALYSIS
+bin\x64\Debug\Apache.Ignite.Core.XML
   
   
 x64
 bin\x64\Release\
 true
 true
+
bin\x64\Release\Apache.Ignite.Core.XML
   
   
 x86
 bin\x86\Debug\
 true
 DEBUG;CODE_ANALYSIS
+bin\x86\Debug\Apache.Ignite.Core.XML
   
   
 x86
 bin\x86\Release\
 true
 true
+
bin\x86\Release\Apache.Ignite.Core.XML
   
   
 true

ignite git commit: IGNITE-2111: Build procedure for .NET. - update readmes, fix RAT, remove obsolete slnrels

[vozerov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5 add616145 -> d87ca48c0


IGNITE-2111: Build procedure for .NET.
- update readmes, fix RAT, remove obsolete slnrels


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

Branch: refs/heads/ignite-1.5
Commit: d87ca48c0c6be4e806f2360f5cf1f6bcacada62a
Parents: add6161
Author: Pavel Tupitsyn 
Authored: Wed Dec 9 16:51:26 2015 +0300
Committer: Pavel Tupitsyn 
Committed: Wed Dec 9 16:51:26 2015 +0300

--
 assembly/release-fabric-base.xml| 13 --
 modules/platforms/dotnet/Apache.Ignite.slnrel   | 43 
 .../platforms/dotnet/Apache.Ignite_x86.slnrel   | 43 
 modules/platforms/dotnet/README.txt | 36 ++--
 modules/platforms/dotnet/examples/README.txt|  8 
 parent/pom.xml  |  2 +
 6 files changed, 26 insertions(+), 119 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/d87ca48c/assembly/release-fabric-base.xml
--
diff --git a/assembly/release-fabric-base.xml b/assembly/release-fabric-base.xml
index 00dd9a4..e6d4eb9 100644
--- a/assembly/release-fabric-base.xml
+++ b/assembly/release-fabric-base.xml
@@ -35,19 +35,6 @@
 ignite_x86.sln
 
 
-
-
-modules/platforms/dotnet/Apache.Ignite.slnrel
-/platforms/dotnet
-Apache.Ignite.sln
-
-
-
-modules/platforms/dotnet/Apache.Ignite_x86.slnrel
-/platforms/dotnet
-Apache.Ignite_x86.sln
-
-
 
 
 assembly/LICENSE_FABRIC

http://git-wip-us.apache.org/repos/asf/ignite/blob/d87ca48c/modules/platforms/dotnet/Apache.Ignite.slnrel
--
diff --git a/modules/platforms/dotnet/Apache.Ignite.slnrel 
b/modules/platforms/dotnet/Apache.Ignite.slnrel
deleted file mode 100644
index 2d1d35e..000
--- a/modules/platforms/dotnet/Apache.Ignite.slnrel
+++ /dev/null
@@ -1,43 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Apache.Ignite.Core", 
"Apache.Ignite.Core\Apache.Ignite.Core.csproj", 
"{4CD2F726-7E2B-46C4-A5BA-057BB82EECB6}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", 
"..\cpp\common\project\vs\common.vcxproj", 
"{4F7E4917-4612-4B96-9838-025711ADE391}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Apache.Ignite", 
"Apache.Ignite\Apache.Ignite.csproj", "{27F7F3C6-BDDE-43A9-B565-856F8395A04B}"
-EndProject
-Global
-   GlobalSection(SolutionConfigurationPlatforms) = preSolution
-   Release|x64 = Release|x64
-   EndGlobalSection
-   GlobalSection(ProjectConfigurationPlatforms) = postSolution
-   {4CD2F726-7E2B-46C4-A5BA-057BB82EECB6}.Debug|x64.ActiveCfg = 
Debug|x64
-   {4CD2F726-7E2B-46C4-A5BA-057BB82EECB6}.Debug|x64.Build.0 = 
Debug|x64
-   {4CD2F726-7E2B-46C4-A5BA-057BB82EECB6}.Debug|x86.ActiveCfg = 
Debug|x86
-   {4CD2F726-7E2B-46C4-A5BA-057BB82EECB6}.Debug|x86.Build.0 = 
Debug|x86
-   {4CD2F726-7E2B-46C4-A5BA-057BB82EECB6}.Release|x64.ActiveCfg = 
Release|x64
-   {4CD2F726-7E2B-46C4-A5BA-057BB82EECB6}.Release|x64.Build.0 = 
Release|x64
-   {4CD2F726-7E2B-46C4-A5BA-057BB82EECB6}.Release|x86.ActiveCfg = 
Release|x86
-   {4CD2F726-7E2B-46C4-A5BA-057BB82EECB6}.Release|x86.Build.0 = 
Release|x86
-   {4F7E4917-4612-4B96-9838-025711ADE391}.Debug|x64.ActiveCfg = 
Debug|x64
-   {4F7E4917-4612-4B96-9838-025711ADE391}.Debug|x64.Build.0 = 
Debug|x64
-   {4F7E4917-4612-4B96-9838-025711ADE391}.Debug|x86.ActiveCfg = 
Debug|Win32
-   {4F7E4917-4612-4B96-9838-025711ADE391}.Debug|x86.Build.0 = 
Debug|Win32
-   {4F7E4917-4612-4B96-9838-025711ADE391}.Release|x64.ActiveCfg = 
Release|x64
-   {4F7E4917-4612-4B96-9838-025711ADE391}.Release|x64.Build.0 = 
Release|x64
-   {4F7E4917-4612-4B96-9838-025711ADE391}.Release|x86.ActiveCfg = 
Release|Win32
-   {4F7E4917-4612-4B96-9838-025711ADE391}.Release|x86.Build.0 = 
Release|Win32
-   {27F7F3C6-BDDE-43A9-B565-856F8395A04B}.Debug|x64.ActiveCfg = 
Debug|x64
-   {27F7F3C6-BDDE-43A9-B565-856F8395A04B}.Debug|x64.Build.0 = 
Debug|x64
-   {27F7F3C6-BDDE-43A9-B565-856F8395A04B}.Debug|x86.ActiveCfg = 
Debug|x86
-