ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [15/18] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-238
Date Fri, 13 Feb 2015 13:49:02 GMT
Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-238


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

Branch: refs/heads/ignite-hadoop-tests
Commit: 4ba47ae5405068413dd6380ad735162d7d50ae2a
Parents: d9ce967 f0bd886
Author: sboikov <sboikov@gridgain.com>
Authored: Fri Feb 13 14:30:40 2015 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Fri Feb 13 14:30:40 2015 +0300

----------------------------------------------------------------------
 config/ignite-log4j.xml                         |   2 +-
 examples/pom-standalone.xml                     |   2 +-
 .../store/jdbc/CacheAbstractJdbcStore.java      | 100 ++--
 .../cache/store/jdbc/CacheJdbcPojoStore.java    |   8 +-
 .../configuration/IgniteConfiguration.java      |   2 +-
 .../org/apache/ignite/events/EventType.java     |   2 -
 .../managers/deployment/GridDeployment.java     |   3 -
 .../deployment/GridDeploymentManager.java       |   3 -
 .../GridDeploymentPerLoaderStore.java           |   3 -
 .../GridDeploymentPerVersionStore.java          |   3 -
 .../processors/cache/GridCacheProcessor.java    |   2 +-
 .../distributed/GridDistributedCacheEntry.java  |   3 -
 .../distributed/dht/GridDhtCacheEntry.java      |   3 -
 .../dht/atomic/GridDhtAtomicCacheEntry.java     |   3 -
 .../colocated/GridDhtColocatedCacheEntry.java   |   3 -
 .../distributed/near/GridNearCacheEntry.java    |   3 -
 .../cache/local/GridLocalCacheEntry.java        |   3 -
 .../cache/query/GridCacheQueryManager.java      |   3 -
 .../cache/transactions/IgniteTxAdapter.java     |   3 -
 .../handlers/cache/GridCacheCommandHandler.java |  11 +-
 .../shmem/IpcSharedMemoryServerEndpoint.java    |   7 +-
 .../util/lang/GridMetadataAwareAdapter.java     |   3 -
 .../ignite/internal/visor/cache/VisorCache.java |  51 --
 .../visor/cache/VisorCacheConfiguration.java    |  62 ++-
 .../visor/cache/VisorCacheTypeMetadata.java     |  16 +
 .../visor/node/VisorGridConfiguration.java      |   2 +-
 .../ignite/lang/IgniteProductVersion.java       |  12 +-
 .../apache/ignite/logger/java/JavaLogger.java   |   3 -
 .../optimized/optimized-classnames.properties   |   2 +-
 .../communication/tcp/TcpCommunicationSpi.java  |   3 +-
 .../discovery/tcp/TcpDiscoverySpiAdapter.java   |   2 +-
 .../store/jdbc/CacheJdbcPojoStoreTest.java      |   8 +-
 .../product/GridProductVersionSelfTest.java     |  20 +
 .../junits/logger/GridTestLog4jLogger.java      |   3 -
 .../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 +-
 .../fs/hadoop/GridGgfsHadoopJclLogger.java      |   3 -
 .../GridHadoopExternalCommunication.java        |   3 +-
 .../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 -
 .../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                                         |  27 +-
 66 files changed, 1943 insertions(+), 1960 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba47ae5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
----------------------------------------------------------------------


Mime
View raw message