Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-92
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ba632af3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ba632af3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ba632af3 Branch: refs/heads/ignite-96 Commit: ba632af30f744309709f16be77bfb404a00de4a8 Parents: 30a6783 c0f872e Author: sboikov <semen.boi...@inria.fr> Authored: Thu Feb 12 00:07:55 2015 +0300 Committer: sboikov <semen.boi...@inria.fr> Committed: Thu Feb 12 00:07:55 2015 +0300 ---------------------------------------------------------------------- modules/clients/src/test/keystore/generate.sh | 25 ++-- .../src/main/java/org/apache/ignite/Ignite.java | 11 +- .../java/org/apache/ignite/IgniteServices.java | 2 +- .../org/apache/ignite/cache/CacheManager.java | 15 +- .../ignite/events/AuthorizationEvent.java | 2 +- .../org/apache/ignite/events/CacheEvent.java | 2 +- .../apache/ignite/events/CheckpointEvent.java | 2 +- .../apache/ignite/events/DeploymentEvent.java | 2 +- .../java/org/apache/ignite/events/JobEvent.java | 2 +- .../ignite/internal/GridJobContextImpl.java | 3 - .../ignite/internal/GridKernalContext.java | 5 - .../ignite/internal/GridKernalContextImpl.java | 13 +- .../apache/ignite/internal/GridProductImpl.java | 11 +- .../apache/ignite/internal/IgniteKernal.java | 61 +------- .../internal/managers/GridManagerAdapter.java | 14 +- .../managers/security/GridSecurityImpl.java | 95 ------------- .../processors/cache/CacheEntryEvent.java | 5 +- .../processors/cache/CacheEntryImpl.java | 6 +- .../processors/cache/CacheEntryImpl0.java | 6 +- .../processors/cache/CacheInvokeEntry.java | 8 +- .../processors/cache/GridCacheStoreManager.java | 3 +- .../processors/cache/GridCacheUtils.java | 4 +- .../processors/cache/IgniteCacheProxy.java | 6 +- .../processors/rest/GridRestProcessor.java | 2 +- .../ignite/internal/product/IgniteProduct.java | 8 ++ .../apache/ignite/internal/visor/VisorJob.java | 8 +- .../ignite/internal/visor/cache/VisorCache.java | 10 +- .../visor/cache/VisorCacheClearTask.java | 140 +++++++++++++++---- .../visor/cache/VisorCacheCompactTask.java | 2 +- .../visor/cache/VisorCacheLoadTask.java | 2 +- .../visor/cache/VisorCacheMetadataTask.java | 2 +- .../cache/VisorCacheMetricsCollectorTask.java | 2 +- .../visor/cache/VisorCachePreloadTask.java | 2 +- .../visor/cache/VisorCacheResetMetricsTask.java | 2 +- .../visor/cache/VisorCacheSwapBackupsTask.java | 2 +- .../compute/VisorComputeCancelSessionsTask.java | 4 +- .../compute/VisorComputeMonitoringHolder.java | 16 +-- .../compute/VisorComputeResetMetricsTask.java | 2 +- .../VisorComputeToggleMonitoringTask.java | 10 +- .../visor/ggfs/VisorGgfsFormatTask.java | 2 +- .../visor/ggfs/VisorGgfsProfilerClearTask.java | 4 +- .../visor/ggfs/VisorGgfsProfilerTask.java | 4 +- .../visor/ggfs/VisorGgfsResetMetricsTask.java | 2 +- .../visor/ggfs/VisorGgfsSamplingStateTask.java | 2 +- .../internal/visor/log/VisorLogSearchTask.java | 10 +- .../internal/visor/misc/VisorAckTask.java | 2 +- .../visor/misc/VisorLatestVersionTask.java | 2 +- .../visor/node/VisorGridConfiguration.java | 10 +- .../VisorNodeConfigurationCollectorJob.java | 2 +- .../visor/node/VisorNodeDataCollectorJob.java | 49 ++++--- .../node/VisorNodeEventsCollectorTask.java | 16 +-- .../internal/visor/node/VisorNodeGcTask.java | 2 +- .../internal/visor/node/VisorNodePingTask.java | 2 +- .../visor/query/VisorQueryCleanupTask.java | 2 +- .../visor/query/VisorQueryNextPageTask.java | 4 +- .../internal/visor/query/VisorQueryTask.java | 18 +-- .../streamer/VisorStreamerMetricsResetTask.java | 4 +- .../visor/streamer/VisorStreamerResetTask.java | 4 +- .../internal/visor/util/VisorTaskUtils.java | 18 +-- .../optimized/optimized-classnames.properties | 2 +- .../ignite/plugin/security/GridSecurity.java | 97 ------------- .../plugin/security/GridSecuritySubject.java | 1 - modules/core/src/test/config/tests.properties | 6 +- .../junits/GridTestKernalContext.java | 3 +- .../ignite/testframework/junits/IgniteMock.java | 6 - .../http/jetty/GridJettyRestHandler.java | 2 +- .../org/apache/ignite/IgniteSpringBean.java | 7 - .../visor/commands/ack/VisorAckCommand.scala | 4 +- .../commands/alert/VisorAlertCommand.scala | 24 ++-- .../commands/cache/VisorCacheClearCommand.scala | 17 +-- .../commands/cache/VisorCacheCommand.scala | 8 +- .../cache/VisorCacheCompactCommand.scala | 4 +- .../commands/cache/VisorCacheScanCommand.scala | 8 +- .../commands/cache/VisorCacheSwapCommand.scala | 4 +- .../config/VisorConfigurationCommand.scala | 4 +- .../commands/disco/VisorDiscoveryCommand.scala | 6 +- .../commands/events/VisorEventsCommand.scala | 4 +- .../visor/commands/gc/VisorGcCommand.scala | 6 +- .../visor/commands/kill/VisorKillCommand.scala | 10 +- .../visor/commands/node/VisorNodeCommand.scala | 2 +- .../visor/commands/ping/VisorPingCommand.scala | 4 +- .../commands/start/VisorStartCommand.scala | 4 +- .../commands/tasks/VisorTasksCommand.scala | 22 +-- .../commands/top/VisorTopologyCommand.scala | 8 +- .../visor/commands/vvm/VisorVvmCommand.scala | 6 +- .../scala/org/apache/ignite/visor/visor.scala | 68 ++++----- .../commands/tasks/VisorTasksCommandSpec.scala | 2 +- .../cache/websession/GridWebSessionFilter.java | 2 +- 88 files changed, 426 insertions(+), 591 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ba632af3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java ----------------------------------------------------------------------
