ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [26/27] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-189
Date Fri, 13 Feb 2015 06:25:01 GMT
Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-189


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

Branch: refs/heads/ignite-189
Commit: 8669623fd5135960ff05e2cb633f749f0e029398
Parents: cc118e8 322408f
Author: ivasilinets <ivasilinets@gridgain.com>
Authored: Fri Feb 13 09:21:32 2015 +0300
Committer: ivasilinets <ivasilinets@gridgain.com>
Committed: Fri Feb 13 09:21:32 2015 +0300

----------------------------------------------------------------------
 .../org/apache/ignite/cache/CacheManager.java   |  32 +-
 .../ignite/cache/CacheTypeFieldMetadata.java    |   2 +-
 .../configuration/IgniteConfiguration.java      |  26 ++
 .../org/apache/ignite/events/EventType.java     |  45 +--
 .../org/apache/ignite/events/LicenseEvent.java  | 116 -------
 .../org/apache/ignite/internal/IgnitionEx.java  |   1 +
 .../GridDeploymentPerVersionStore.java          |   4 +-
 .../cache/CacheVersionedEntryImpl.java          |   9 -
 .../cache/GridCacheDeploymentManager.java       |  14 +-
 .../processors/cache/GridCacheIoManager.java    |   2 +-
 .../processors/cache/GridCacheMapEntry.java     |  12 +-
 .../dht/preloader/GridDhtPartitionMap.java      |  32 +-
 .../preloader/GridDhtPartitionsFullMessage.java |  47 +--
 .../dht/preloader/GridDhtPreloader.java         |  18 +-
 .../ignite/internal/visor/cache/VisorCache.java |  51 ++++
 .../cache/VisorCacheTypeFieldMetadata.java      | 115 +++++++
 .../visor/cache/VisorCacheTypeMetadata.java     | 304 +++++++++++++++++++
 .../visor/event/VisorGridLicenseEvent.java      |  74 -----
 .../node/VisorNodeEventsCollectorTask.java      |   5 -
 .../internal/visor/util/VisorTaskUtils.java     |   9 -
 .../optimized/optimized-classnames.properties   |   2 +-
 .../discovery/GridDiscoveryManagerSelfTest.java |  31 ++
 .../cache/GridCacheConcurrentMapSelfTest.java   |   4 +-
 .../cache/GridCacheOffHeapSelfTest.java         |  46 ++-
 ...IgniteCacheAbstractExecutionContextTest.java |  96 ++++++
 .../IgniteCacheAtomicExecutionContextTest.java  |  49 +++
 ...iteCachePartitionedExecutionContextTest.java |  49 +++
 ...niteCacheReplicatedExecutionContextTest.java |  49 +++
 .../IgniteCacheTxExecutionContextTest.java      |  49 +++
 .../ignite/testsuites/IgniteCacheTestSuite.java |   8 +
 .../testsuites/IgniteLangSelfTestSuite.java     |   1 -
 .../tests/p2p/CacheDeploymentTestValue.java     |   2 +-
 .../cache/GridCacheOffHeapAndSwapSelfTest.java  |  23 +-
 .../processors/cache/GridCacheSwapSelfTest.java |  40 ++-
 .../near/GridCachePartitionedQuerySelfTest.java |  33 +-
 .../query/h2/GridH2IndexRebuildTest.java        |  10 +-
 .../scala/org/apache/ignite/visor/visor.scala   |   4 -
 pom.xml                                         |  19 +-
 38 files changed, 987 insertions(+), 446 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8669623f/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
index 4467a76,95e0a0f..809102c
--- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
@@@ -38,10 -37,17 +38,14 @@@ import org.apache.ignite.spi.deployment
  import org.apache.ignite.spi.discovery.*;
  import org.apache.ignite.spi.eventstorage.*;
  import org.apache.ignite.spi.failover.*;
 -import org.apache.ignite.spi.indexing.*;
  import org.apache.ignite.spi.loadbalancing.*;
 -import org.apache.ignite.spi.securesession.*;
  import org.apache.ignite.spi.swapspace.*;
 -import org.apache.ignite.streamer.*;
  
  import javax.management.*;
+ import javax.cache.processor.*;
+ import javax.cache.expiry.*;
+ import javax.cache.integration.*;
+ import javax.cache.event.*;
  import java.lang.management.*;
  import java.util.*;
  

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8669623f/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8669623f/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/optimized-classnames.properties
----------------------------------------------------------------------


Mime
View raw message