ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [3/6] incubator-ignite git commit: Merge branch 'sprint-1' into ignite-189
Date Fri, 13 Feb 2015 13:30:15 GMT
Merge branch '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/412482fc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/412482fc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/412482fc

Branch: refs/heads/ignite-189
Commit: 412482fc8cb9ad5edd3825af46bf6dbac5d1148e
Parents: 0e0951a 0f08d41
Author: vozerov-gridgain <vozerov@gridgain.com>
Authored: Fri Feb 13 16:15:15 2015 +0300
Committer: vozerov-gridgain <vozerov@gridgain.com>
Committed: Fri Feb 13 16:15:15 2015 +0300

----------------------------------------------------------------------
 config/ignite-log4j.xml                         |   2 +-
 examples/pom-standalone.xml                     |  28 +-
 .../org/apache/ignite/cache/CacheManager.java   |  32 +-
 .../apache/ignite/cache/CacheProjection.java    |   4 +-
 .../ignite/cache/CacheTypeFieldMetadata.java    |   2 +-
 .../ignite/cache/cloner/CacheBasicCloner.java   |  34 --
 .../apache/ignite/cache/cloner/CacheCloner.java |  57 ---
 .../ignite/cache/cloner/CacheDeepCloner.java    |  87 ----
 .../org/apache/ignite/cache/cloner/package.html |  24 -
 .../store/jdbc/CacheAbstractJdbcStore.java      | 100 ++--
 .../cache/store/jdbc/CacheJdbcPojoStore.java    |   8 +-
 .../configuration/CacheConfiguration.java       |  34 --
 .../configuration/IgniteConfiguration.java      |  28 +-
 .../org/apache/ignite/events/EventType.java     |  47 +-
 .../org/apache/ignite/events/LicenseEvent.java  | 116 -----
 .../ignite/internal/ClusterMetricsSnapshot.java |  79 +++-
 .../org/apache/ignite/internal/IgnitionEx.java  |   1 +
 .../managers/deployment/GridDeployment.java     |   3 -
 .../deployment/GridDeploymentManager.java       |   3 -
 .../GridDeploymentPerLoaderStore.java           |   3 -
 .../GridDeploymentPerVersionStore.java          |   7 +-
 .../cache/CacheVersionedEntryImpl.java          |   9 -
 .../processors/cache/GridCacheAdapter.java      |  66 ++-
 .../processors/cache/GridCacheAttributes.java   |  13 -
 .../processors/cache/GridCacheContext.java      |  11 +-
 .../cache/GridCacheDeploymentManager.java       |  14 +-
 .../processors/cache/GridCacheEntryEx.java      |   7 +-
 .../processors/cache/GridCacheIoManager.java    |   2 +-
 .../processors/cache/GridCacheMapEntry.java     |  48 +-
 .../processors/cache/GridCacheProcessor.java    |   8 +-
 .../cache/GridCacheProjectionImpl.java          |   8 +-
 .../processors/cache/GridCacheProxyImpl.java    |   8 +-
 .../cache/IgniteCacheExpiryPolicy.java          |   6 +
 .../processors/cache/IgniteCacheProxy.java      |   2 +-
 .../distributed/GridDistributedCacheEntry.java  |   3 -
 .../distributed/dht/GridDhtCacheAdapter.java    |  27 +-
 .../distributed/dht/GridDhtCacheEntry.java      |   3 -
 .../dht/atomic/GridDhtAtomicCache.java          |  96 +---
 .../dht/atomic/GridDhtAtomicCacheEntry.java     |   3 -
 .../dht/colocated/GridDhtColocatedCache.java    |   4 +-
 .../colocated/GridDhtColocatedCacheEntry.java   |   3 -
 .../dht/preloader/GridDhtPartitionMap.java      |  32 +-
 .../preloader/GridDhtPartitionsFullMessage.java |  47 +-
 .../dht/preloader/GridDhtPreloader.java         |  18 +-
 .../distributed/near/GridNearCacheAdapter.java  |   2 +-
 .../distributed/near/GridNearCacheEntry.java    |   3 -
 .../cache/distributed/near/GridNearTxLocal.java |  19 +-
 .../cache/local/GridLocalCacheEntry.java        |   3 -
 .../local/atomic/GridLocalAtomicCache.java      |   7 +-
 .../cache/query/GridCacheQueryManager.java      | 112 ++++-
 .../cache/transactions/IgniteTxAdapter.java     |   3 -
 .../handlers/cache/GridCacheCommandHandler.java |  11 +-
 .../shmem/IpcSharedMemoryServerEndpoint.java    |   7 +-
 .../util/lang/GridMetadataAwareAdapter.java     |   3 -
 .../visor/cache/VisorCacheConfiguration.java    | 170 +++----
 .../cache/VisorCacheTypeFieldMetadata.java      | 115 +++++
 .../visor/cache/VisorCacheTypeMetadata.java     | 320 +++++++++++++
 .../visor/event/VisorGridLicenseEvent.java      |  74 ---
 .../visor/node/VisorGridConfiguration.java      |   2 +-
 .../node/VisorNodeEventsCollectorTask.java      |   5 -
 .../internal/visor/util/VisorTaskUtils.java     |   9 -
 .../ignite/lang/IgniteProductVersion.java       |  12 +-
 .../apache/ignite/logger/java/JavaLogger.java   |   3 -
 .../optimized/optimized-classnames.properties   |   4 +-
 .../communication/tcp/TcpCommunicationSpi.java  |   3 +-
 .../discovery/tcp/TcpDiscoverySpiAdapter.java   |   2 +-
 .../store/jdbc/CacheJdbcPojoStoreTest.java      |   8 +-
 .../internal/ClusterNodeMetricsSelfTest.java    |  15 +
 .../discovery/GridDiscoveryManagerSelfTest.java |  31 ++
 .../cache/GridCacheConcurrentMapSelfTest.java   |   4 +-
 ...idCacheConfigurationConsistencySelfTest.java |  12 -
 .../cache/GridCacheLifecycleAwareSelfTest.java  |  23 -
 .../cache/GridCacheOffHeapSelfTest.java         |  46 +-
 .../processors/cache/GridCacheTestEntryEx.java  |   8 +-
 .../cache/GridCacheVersionMultinodeTest.java    | 208 +++++++++
 ...IgniteCacheAbstractExecutionContextTest.java |  96 ++++
 .../IgniteCacheAtomicExecutionContextTest.java  |  49 ++
 ...iteCachePartitionedExecutionContextTest.java |  49 ++
 ...niteCacheReplicatedExecutionContextTest.java |  49 ++
 .../IgniteCacheTxExecutionContextTest.java      |  49 ++
 .../IgniteCacheExpiryPolicyAbstractTest.java    |  20 +
 .../product/GridProductVersionSelfTest.java     |  20 +
 .../junits/logger/GridTestLog4jLogger.java      |   3 -
 .../ignite/testsuites/IgniteCacheTestSuite.java |   9 +
 .../testsuites/IgniteLangSelfTestSuite.java     |   1 -
 .../core/src/test/webapp/META-INF/gg-config.xml | 349 --------------
 .../webapp/META-INF/ignite-webapp-config.xml    | 349 ++++++++++++++
 modules/core/src/test/webapp/WEB-INF/web.xml    |   6 +-
 .../tests/p2p/CacheDeploymentTestValue.java     |   2 +-
 .../fs/hadoop/GridGgfsHadoopJclLogger.java      |   3 -
 .../GridHadoopExternalCommunication.java        |   3 +-
 .../cache/GridCacheOffHeapAndSwapSelfTest.java  |  23 +-
 .../processors/cache/GridCacheSwapSelfTest.java |  40 +-
 .../near/GridCachePartitionedQuerySelfTest.java |  33 +-
 .../query/h2/GridH2IndexRebuildTest.java        |  10 +-
 .../ignite/logger/jcl/IgniteJclLogger.java      |   3 -
 .../IgniteLog4jDailyRollingFileAppender.java    |  77 ---
 ...IgniteLog4jExternallyRolledFileAppender.java |  63 ---
 .../logger/log4j/IgniteLog4jFileAppender.java   | 107 -----
 .../logger/log4j/IgniteLog4jFileAware.java      |  32 --
 .../logger/log4j/IgniteLog4jNodeIdFilePath.java |  64 ---
 .../log4j/IgniteLog4jRollingFileAppender.java   |  90 ----
 .../log4j/Log4JDailyRollingFileAppender.java    |  77 +++
 .../Log4JExternallyRolledFileAppender.java      |  63 +++
 .../ignite/logger/log4j/Log4JFileAppender.java  | 107 +++++
 .../apache/ignite/logger/log4j/Log4JLogger.java |  12 +-
 .../ignite/logger/log4j/Log4jFileAware.java     |  32 ++
 .../logger/log4j/Log4jNodeIdFilePath.java       |  64 +++
 .../logger/log4j/Log4jRollingFileAppender.java  |  90 ++++
 .../log4j/GridLog4jCorrectFileNameTest.java     |  12 +-
 .../processors/schedule/ScheduleFutureImpl.java |   3 -
 .../ignite/logger/slf4j/GridSlf4jLogger.java    |   3 -
 .../commands/cache/VisorCacheCommand.scala      |  11 +-
 .../scala/org/apache/ignite/visor/visor.scala   |   4 -
 .../ignite/cache/websession/GridWebSession.java | 286 ------------
 .../cache/websession/GridWebSessionFilter.java  | 466 -------------------
 .../websession/GridWebSessionListener.java      | 196 --------
 .../cache/websession/IgniteWebSession.java      | 286 ++++++++++++
 .../websession/IgniteWebSessionFilter.java      | 466 +++++++++++++++++++
 .../websession/IgniteWebSessionListener.java    | 196 ++++++++
 .../internal/websession/WebSessionSelfTest.java |   8 +-
 .../websession/WebSessionServerStart.java       |   2 +-
 .../internal/websession/WebSessionTest.java     |   2 +-
 pom.xml                                         |  50 +-
 124 files changed, 3451 insertions(+), 2965 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/412482fc/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,116950f..c8e8e63
--- 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/412482fc/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
----------------------------------------------------------------------


Mime
View raw message