date:20151208

[49/50] [abbrv] ignite git commit: ignite-10 Fix ignite instance [de]serialization

2015-12-08 Thread 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-1.5.1
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
---

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

2015-12-08 Thread sboikov

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


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

Branch: refs/heads/ignite-1.5.1
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
+}

ignite git commit: 1.5.1-b2-SNAPSHOT

2015-12-08 Thread sboikov

Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5.1 ebb4aa63b -> e450fbbd4


1.5.1-b2-SNAPSHOT


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

Branch: refs/heads/ignite-1.5.1
Commit: e450fbbd40137c3f29c13982f3ebb89b8b3888a2
Parents: ebb4aa6
Author: Ignite Teamcity 
Authored: Wed Dec 9 10:42:52 2015 +0300
Committer: Ignite Teamcity 
Committed: Wed Dec 9 10:42:52 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   | 2 +-
 modules/osgi-paxlogging/pom.xml  | 2 +-
 modules/osgi/pom.xml | 2 +-
 modules/platforms/cpp/common/configure.ac| 2 +-
 modules/platforms/cpp/core-test/configure.ac | 2 +-
 modules/platforms/cpp/core/configure.ac  | 2 +-
 modules/platforms/cpp/examples/configure.ac  | 2 +-
 modules/platforms/cpp/ignite/configure.ac| 2 +-
 .../dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs   | 4 ++--
 .../Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs  | 4 ++--
 .../dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs   | 4 ++--
 .../dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs | 4 ++--
 .../platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs| 4 ++--
 .../examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs   | 4 ++--
 .../Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs | 4 ++--
 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

ignite git commit: ignite-2030 Fixed issue with JAVA_HOME containing parenthesis

2015-12-08 Thread sboikov

Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5 bdbe4068b -> 69047243b


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-1.5
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

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

2015-12-08 Thread sboikov

Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5 69047243b -> 0adee3ae0


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-1.5
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

ignite git commit: IGNITE-843 Minor fixes of caches metadata watch.

2015-12-08 Thread akuznetsov

Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc2 87a4e8d84 -> 4c36b82a8


IGNITE-843 Minor fixes of caches metadata watch.


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

Branch: refs/heads/ignite-843-rc2
Commit: 4c36b82a8d472242a497b43e3090a6c9ec739c32
Parents: 87a4e8d
Author: Alexey Kuznetsov 
Authored: Wed Dec 9 10:43:12 2015 +0700
Committer: Alexey Kuznetsov 
Committed: Wed Dec 9 10:43:12 2015 +0700

--
 .../main/js/controllers/caches-controller.js| 66 ++--
 1 file changed, 34 insertions(+), 32 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/4c36b82a/modules/control-center-web/src/main/js/controllers/caches-controller.js
--
diff --git 
a/modules/control-center-web/src/main/js/controllers/caches-controller.js 
b/modules/control-center-web/src/main/js/controllers/caches-controller.js
index 8429071..161f197 100644
--- a/modules/control-center-web/src/main/js/controllers/caches-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/caches-controller.js
@@ -135,15 +135,15 @@ consoleModule.controller('cachesController', [
 
 var memoryMode = backupItem.memoryMode;
 
-var onHeapTired = memoryMode == 'ONHEAP_TIERED';
-var offHeapTired = memoryMode == 'OFFHEAP_TIERED';
+var onHeapTired = memoryMode === 'ONHEAP_TIERED';
+var offHeapTired = memoryMode === 'OFFHEAP_TIERED';
 
 var offHeapMaxMemory = backupItem.offHeapMaxMemory;
 
-if (model == 'offHeapMaxMemory' && offHeapTired)
+if (model === 'offHeapMaxMemory' && offHeapTired)
 return true;
 
-if (model == 'evictionPolicy.kind' && onHeapTired)
+if (model === 'evictionPolicy.kind' && onHeapTired)
 return backupItem.swapEnabled || 
($common.isDefined(offHeapMaxMemory) && offHeapMaxMemory >= 0);
 }
 
@@ -166,9 +166,9 @@ consoleModule.controller('cachesController', [
 
 if ($common.isDefined(model)) {
 model.forEach(function (val, ix) {
-if (ix != index && val.split('=')[0] == key)
+if (ix !== index && val.split('=')[0] === key)
 exist = true;
-})
+});
 }
 
 if (exist)
@@ -186,7 +186,7 @@ consoleModule.controller('cachesController', [
 var idx = _.indexOf(model, fx);
 
 // Found duplicate.
-if (idx >= 0 && idx != index)
+if (idx >= 0 && idx !== index)
 return showPopoverMessage(null, null, 
$table.tableFieldId(index, 'SqlFx'), 'SQL function with such class name already 
exists!');
 }
 }
@@ -207,11 +207,11 @@ consoleModule.controller('cachesController', [
 
 if ($common.isDefined(model)) {
 var idx = _.findIndex(model, function (pair) {
-return pair.keyClass == pairValue.key && 
pair.valueClass == pairValue.value;
+return pair.keyClass === pairValue.key && 
pair.valueClass === pairValue.value;
 });
 
 // Found duplicate.
-if (idx >= 0 && idx != index)
+if (idx >= 0 && idx !== index)
 return showPopoverMessage(null, null, 
$table.tableFieldId(index, 'ValueIndexedType'), 'Indexed type with such key and 
value classes already exists!');
 }
 
@@ -244,7 +244,7 @@ consoleModule.controller('cachesController', [
 $scope.caches = data.caches;
 $scope.clusters = data.clusters;
 $scope.metadatas = 
_.sortBy(_.map(validFilter(data.metadatas, true, false), function (meta) {
-return {value: meta._id, label: meta.valueType, kind: 
meta.kind, meta: meta}
+return {value: meta._id, label: meta.valueType, kind: 
meta.kind, meta: meta};
 }), 'label');
 
 // Load page descriptor.
@@ -324,28 +324,30 @@ consoleModule.controller('cachesController', [
 }
 }, true);

ignite git commit: IGNITE-843 Migrate from ag-grid to ui-grid.

2015-12-08 Thread anovikov

Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc2 4c36b82a8 -> da50f0c6c


IGNITE-843 Migrate from ag-grid to ui-grid.


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

Branch: refs/heads/ignite-843-rc2
Commit: da50f0c6cb3ce1e46ff63eafddd46a5a65f08a05
Parents: 4c36b82
Author: Andrey 
Authored: Wed Dec 9 12:09:41 2015 +0700
Committer: Andrey 
Committed: Wed Dec 9 12:10:29 2015 +0700

--
 .../control-center-web/src/main/js/app/index.js |   5 +-
 .../control-center-web/src/main/js/config.js|  19 ++-
 .../main/js/controllers/caches-controller.js|  14 +-
 .../main/js/controllers/clusters-controller.js  |  16 ++-
 .../src/main/js/controllers/common-module.js| 129 +--
 .../main/js/controllers/metadata-controller.js  |  14 +-
 .../src/main/js/controllers/sql-controller.js   |  73 ++-
 .../src/main/js/gulpfile.js/index.js|   5 +-
 .../src/main/js/gulpfile.js/tasks/connect.js|   1 +
 .../src/main/js/gulpfile.js/tasks/copy.js   |  11 +-
 .../src/main/js/gulpfile.js/tasks/jade.js   |  12 +-
 .../control-center-web/src/main/js/package.json |  20 ++-
 .../src/main/js/public/stylesheets/style.scss   | 122 ++
 .../src/main/js/views/configuration/caches.jade |   2 +-
 .../main/js/views/configuration/clusters.jade   |   2 +-
 .../src/main/js/views/configuration/igfs.jade   |   2 +-
 .../js/views/configuration/metadata-load.jade   |   8 +-
 .../main/js/views/configuration/metadata.jade   |   4 +-
 .../main/js/views/configuration/summary.jade|   2 +-
 .../src/main/js/views/includes/controls.jade|   6 +-
 .../src/main/js/views/sql/sql.jade  |   4 +-
 21 files changed, 163 insertions(+), 308 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/da50f0c6/modules/control-center-web/src/main/js/app/index.js
--
diff --git a/modules/control-center-web/src/main/js/app/index.js 
b/modules/control-center-web/src/main/js/app/index.js
index 1305fa3..4174425 100644
--- a/modules/control-center-web/src/main/js/app/index.js
+++ b/modules/control-center-web/src/main/js/app/index.js
@@ -19,6 +19,7 @@ import jQuery from 'jquery'
 import _ from 'lodash'
 import ace from 'ace'
 import angular from 'angular';
+import pdfMake from 'pdfmake';
 
 import 'angular-ui-router'
 import 'angular-strap'
@@ -27,7 +28,7 @@ import 'angular-tree-control'
 import 'angular-smart-table'
 import 'angular-animate'
 import 'angular-sanitize'
-import 'angular-ag-grid'
+import 'angular-ui-grid'
 import 'angular-loading'
 import 'angular-drag-and-drop-lists'
 import 'angular-nvd3'
@@ -42,7 +43,7 @@ import 'public/stylesheets/style.css!'
 import 'nvd3/build/nv.d3.css!'
 import 'angular-tree-control/css/tree-control-attribute.css!'
 import 'angular-tree-control/css/tree-control.css!'
-import 'angular-ag-grid/dist/ag-grid.css!'
+import 'angular-ui-grid/ui-grid.css!'
 import 'angular-loading/angular-loading.css!'
 import 'angular-motion/dist/angular-motion.css!'
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/da50f0c6/modules/control-center-web/src/main/js/config.js
--
diff --git a/modules/control-center-web/src/main/js/config.js 
b/modules/control-center-web/src/main/js/config.js
index fec475b..5f11590 100644
--- a/modules/control-center-web/src/main/js/config.js
+++ b/modules/control-center-web/src/main/js/config.js
@@ -24,12 +24,13 @@ System.config({
 "angular-grid": "github:ceolter/ag-grid@2.3.5",
 "angular-loading": "github:darthwade/angular-loading@0.1.4",
 "angular-motion": "github:mgcrea/angular-motion@0.4.3",
-"angular-nvd3": "github:krispo/angular-nvd3@1.0.4",
+"angular-nvd3": "github:krispo/angular-nvd3@1.0.5",
 "angular-sanitize": "github:angular/bower-angular-sanitize@1.4.8",
 "angular-smart-table": "github:lorenzofox3/Smart-Table@2.1.5",
 "angular-strap": "github:akuznetsov-gridgain/angular-strap@fix-1852-2.3.6",
 "angular-tree-control": "github:wix/angular-tree-control@0.2.22",
 "angular-ui-ace": "github:angular-ui/ui-ace@0.2.3",
+"angular-ui-grid": "github:angular-ui/bower-ui-grid@3.0.7",
 "angular-ui-router": "github:angular-ui/ui-router@0.2.15",
 "babel": "npm:babel-core@5.8.34",
 "babel-runtime": "npm:babel-runtime@5.8.34",
@@ -40,12 +41,13 @@ System.config({
 "core-js": "npm:core-js@1.2.6",
 "css": "github:systemjs/plugin-css@0.1.20",
 "file-saver": "github:eligrey/FileSaver.js@master",
-"font-awesome": "npm:font-awesome@4.4.0",

[49/50] [abbrv] ignite git commit: ignite-10 Fix ignite instance [de]serialization

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

ignite git commit: 1.5.1-b2-SNAPSHOT

ignite git commit: ignite-2030 Fixed issue with JAVA_HOME containing parenthesis

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

ignite git commit: IGNITE-843 Minor fixes of caches metadata watch.

ignite git commit: IGNITE-843 Migrate from ag-grid to ui-grid.

< 1 2

101 - 107 of 107 matches

Site Navigation

Mail list logo

Footer information