# gg-9470-rename
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0ea0d7c6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0ea0d7c6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0ea0d7c6 Branch: refs/heads/master Commit: 0ea0d7c66d6c775010cda379fe6bc8c8794d7579 Parents: 393486f Author: sboikov <sboi...@gridgain.com> Authored: Thu Dec 4 21:38:59 2014 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Dec 4 21:39:19 2014 +0300 ---------------------------------------------------------------------- .../failover/ComputeFailoverExample.java | 1 - .../grid/gridify/GridTestGridifyJob.java | 2 +- .../test/gridify/GridExternalGridifyTask.java | 2 +- .../spi/checkpoint/s3/GridS3CheckpointSpi.java | 2 +- .../ipfinder/s3/GridTcpDiscoveryS3IpFinder.java | 2 +- .../s3/GridS3CheckpointSpiSelfTest.java | 2 +- .../client/GridClientStartNodeTask.java | 1 - .../gridgain/client/GridClientStopNodeTask.java | 1 - .../client/GridClientTestRestServer.java | 2 +- .../processors/rest/GridTestBinaryClient.java | 2 +- .../processors/rest/GridTestMemcacheClient.java | 2 +- .../src/main/java/org/apache/ignite/Ignite.java | 1 - .../java/org/apache/ignite/IgniteLogger.java | 153 +++++++++++++++++++ .../gridify/aop/GridifyDefaultRangeTask.java | 1 - .../configuration/IgniteConfiguration.java | 2 +- .../ignite/messaging/MessagingListenActor.java | 1 - .../org/apache/ignite/plugin/PluginContext.java | 1 - .../ignite/resources/IgniteLoggerResource.java | 2 +- .../GridClientConnectionManagerAdapter.java | 2 +- .../router/GridTcpRouterConfiguration.java | 2 +- .../impl/GridRouterCommandLineStartup.java | 2 +- .../client/router/impl/GridTcpRouterImpl.java | 2 +- .../impl/GridTcpRouterNioListenerAdapter.java | 2 +- .../impl/GridTcpRouterNioListenerOsImpl.java | 2 +- ...GridCacheConsistentHashAffinityFunction.java | 1 - .../store/GridCacheLoadOnlyStoreAdapter.java | 2 +- .../store/jdbc/GridCacheJdbcBlobStore.java | 2 +- .../sender/store/fs/GridDrSenderHubFsStore.java | 2 +- .../gridgain/grid/hadoop/GridHadoopJobInfo.java | 2 +- .../gridgain/grid/kernal/GridDiagnostic.java | 2 +- .../grid/kernal/GridJobContextImpl.java | 2 +- .../org/gridgain/grid/kernal/GridKernal.java | 1 - .../gridgain/grid/kernal/GridKernalContext.java | 2 +- .../grid/kernal/GridKernalContextImpl.java | 1 - .../gridgain/grid/kernal/GridLoggerProxy.java | 2 +- .../grid/kernal/GridPerformanceSuggestions.java | 2 +- .../gridgain/grid/kernal/GridPluginContext.java | 1 - .../grid/kernal/GridUpdateNotifier.java | 2 +- .../kernal/executor/GridExecutorService.java | 1 - .../kernal/managers/GridManagerAdapter.java | 2 +- .../deployment/GridDeploymentClassLoader.java | 2 +- .../deployment/GridDeploymentCommunication.java | 2 +- .../deployment/GridDeploymentStoreAdapter.java | 2 +- .../kernal/processors/GridProcessorAdapter.java | 2 +- .../affinity/GridAffinityAssignmentCache.java | 2 +- .../processors/affinity/GridAffinityUtils.java | 1 - .../processors/cache/GridCacheAdapter.java | 1 - .../cache/GridCacheClearAllRunnable.java | 2 +- .../cache/GridCacheConcurrentMap.java | 2 +- .../processors/cache/GridCacheContext.java | 2 +- .../GridCacheDefaultAffinityKeyMapper.java | 2 +- .../GridCacheEntryInfoCollectSwapListener.java | 2 +- .../cache/GridCacheEvictionEntry.java | 2 +- .../processors/cache/GridCacheLogger.java | 2 +- .../cache/GridCacheManagerAdapter.java | 2 +- .../processors/cache/GridCacheMapEntry.java | 2 +- .../cache/GridCacheMultiTxFuture.java | 2 +- .../kernal/processors/cache/GridCacheMvcc.java | 2 +- .../processors/cache/GridCacheMvccManager.java | 2 +- .../cache/GridCachePreloaderAdapter.java | 2 +- .../cache/GridCacheSharedContext.java | 2 +- .../cache/GridCacheSharedManagerAdapter.java | 2 +- .../processors/cache/GridCacheTxAdapter.java | 2 +- .../processors/cache/GridCacheTxHandler.java | 2 +- .../kernal/processors/cache/GridCacheUtils.java | 2 +- .../cache/GridCacheWriteBehindStore.java | 2 +- .../cache/affinity/GridCacheAffinityImpl.java | 2 +- .../datastructures/GridCacheAtomicLongImpl.java | 2 +- .../GridCacheAtomicReferenceImpl.java | 2 +- .../GridCacheAtomicSequenceImpl.java | 2 +- .../GridCacheAtomicStampedImpl.java | 2 +- .../GridCacheCountDownLatchImpl.java | 2 +- .../datastructures/GridCacheQueueAdapter.java | 2 +- .../cache/datastructures/GridCacheSetImpl.java | 2 +- ...ridCacheOptimisticCheckPreparedTxFuture.java | 2 +- .../GridCachePerThreadTxCommitBuffer.java | 2 +- .../distributed/GridCacheTxFinishSync.java | 2 +- .../dht/GridClientPartitionTopology.java | 2 +- .../dht/GridDhtAssignmentFetchFuture.java | 2 +- .../cache/distributed/dht/GridDhtGetFuture.java | 2 +- .../distributed/dht/GridDhtLocalPartition.java | 2 +- .../distributed/dht/GridDhtLockFuture.java | 2 +- .../dht/GridDhtPartitionTopologyImpl.java | 2 +- .../distributed/dht/GridDhtTxFinishFuture.java | 2 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 2 +- .../dht/GridPartitionedGetFuture.java | 2 +- .../dht/atomic/GridDhtAtomicUpdateFuture.java | 2 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 2 +- .../colocated/GridDhtColocatedLockFuture.java | 2 +- .../dht/preloader/GridDhtForceKeysFuture.java | 2 +- .../preloader/GridDhtPartitionDemandPool.java | 2 +- .../preloader/GridDhtPartitionSupplyPool.java | 2 +- .../GridDhtPartitionsExchangeFuture.java | 2 +- .../distributed/near/GridNearGetFuture.java | 2 +- .../distributed/near/GridNearLockFuture.java | 2 +- .../near/GridNearTxFinishFuture.java | 2 +- .../near/GridNearTxPrepareFuture.java | 2 +- .../cache/local/GridLocalLockFuture.java | 2 +- .../cache/local/GridLocalTxFuture.java | 2 +- .../cache/query/GridCacheQueryAdapter.java | 2 +- .../query/GridCacheQueryFutureAdapter.java | 2 +- .../GridCacheContinuousQueryAdapter.java | 2 +- .../jdbc/GridCacheQueryJdbcMetadataTask.java | 1 - .../query/jdbc/GridCacheQueryJdbcTask.java | 1 - .../processors/clock/GridClockServer.java | 2 +- .../dataload/GridDataLoadUpdateJob.java | 2 +- .../dataload/IgniteDataLoaderImpl.java | 1 - .../dr/GridDrDataLoadCacheUpdater.java | 2 +- .../processors/ggfs/GridGgfsDataManager.java | 1 - .../processors/ggfs/GridGgfsDeleteWorker.java | 2 +- .../kernal/processors/ggfs/GridGgfsImpl.java | 1 - .../ggfs/GridGgfsInputStreamImpl.java | 2 +- .../processors/ggfs/GridGgfsIpcHandler.java | 2 +- .../kernal/processors/ggfs/GridGgfsJobImpl.java | 1 - .../kernal/processors/ggfs/GridGgfsManager.java | 2 +- .../processors/ggfs/GridGgfsMetaManager.java | 2 +- .../kernal/processors/ggfs/GridGgfsServer.java | 2 +- .../kernal/processors/job/GridJobWorker.java | 2 +- .../resource/GridResourceCustomInjector.java | 2 +- .../resource/GridResourceLoggerInjector.java | 2 +- .../resource/GridResourceProcessor.java | 2 +- .../handlers/GridRestCommandHandlerAdapter.java | 2 +- .../rest/protocols/GridRestProtocolAdapter.java | 2 +- .../tcp/GridTcpMemcachedNioListener.java | 2 +- .../protocols/tcp/GridTcpRestNioListener.java | 2 +- .../processors/service/GridServiceProxy.java | 1 - .../processors/spring/GridSpringProcessor.java | 2 +- .../GridStreamerStageExecutionFuture.java | 2 +- .../processors/streamer/IgniteStreamerImpl.java | 2 +- .../kernal/processors/task/GridTaskWorker.java | 2 +- .../gridgain/grid/kernal/visor/VisorJob.java | 2 +- .../gridgain/grid/logger/GridNullLogger.java | 1 + .../org/gridgain/grid/logger/IgniteLogger.java | 153 ------------------- .../grid/logger/java/GridJavaLogger.java | 1 + .../marshaller/GridMarshallerExclusions.java | 2 +- .../org/gridgain/grid/spi/GridSpiAdapter.java | 2 +- .../org/gridgain/grid/spi/GridSpiThread.java | 2 +- .../gridgain/grid/spi/GridSpiThreadFactory.java | 3 +- .../noop/GridNoopAuthenticationSpi.java | 2 +- .../cache/GridCacheCheckpointSpi.java | 2 +- .../checkpoint/jdbc/GridJdbcCheckpointSpi.java | 2 +- .../checkpoint/noop/GridNoopCheckpointSpi.java | 2 +- .../sharedfs/GridSharedFsCheckpointSpi.java | 2 +- .../sharedfs/GridSharedFsTimeoutTask.java | 2 +- .../checkpoint/sharedfs/GridSharedFsUtils.java | 2 +- .../fifoqueue/GridFifoQueueCollisionSpi.java | 2 +- .../GridJobStealingCollisionSpi.java | 2 +- .../GridPriorityQueueCollisionSpi.java | 2 +- .../tcp/GridTcpCommunicationSpi.java | 2 +- .../local/GridLocalDeploymentSpi.java | 2 +- .../spi/discovery/tcp/GridTcpDiscoverySpi.java | 2 +- .../tcp/GridTcpDiscoverySpiAdapter.java | 2 +- .../jdbc/GridTcpDiscoveryJdbcIpFinder.java | 2 +- .../GridTcpDiscoveryMulticastIpFinder.java | 2 +- .../GridTcpDiscoverySharedFsIpFinder.java | 2 +- .../ipfinder/vm/GridTcpDiscoveryVmIpFinder.java | 2 +- .../memory/GridMemoryEventStorageSpi.java | 2 +- .../failover/always/GridAlwaysFailoverSpi.java | 2 +- .../jobstealing/GridJobStealingFailoverSpi.java | 2 +- .../failover/never/GridNeverFailoverSpi.java | 2 +- .../grid/spi/indexing/GridNoopIndexingSpi.java | 2 +- .../adaptive/GridAdaptiveLoadBalancingSpi.java | 2 +- .../GridRoundRobinGlobalLoadBalancer.java | 2 +- .../GridRoundRobinLoadBalancingSpi.java | 2 +- .../GridWeightedRandomLoadBalancingSpi.java | 2 +- .../noop/GridNoopSecureSessionSpi.java | 2 +- .../swapspace/file/GridFileSwapSpaceSpi.java | 2 +- .../swapspace/noop/GridNoopSwapSpaceSpi.java | 2 +- .../org/gridgain/grid/util/GridJavaProcess.java | 2 +- .../org/gridgain/grid/util/GridLogThrottle.java | 2 +- .../java/org/gridgain/grid/util/GridUtils.java | 3 +- .../grid/util/future/GridFutureAdapter.java | 2 +- .../grid/util/ipc/GridIpcEndpointFactory.java | 2 +- .../grid/util/ipc/GridIpcToNioAdapter.java | 2 +- .../ipc/loopback/GridIpcServerTcpEndpoint.java | 2 +- .../GridIpcSharedMemoryClientEndpoint.java | 2 +- .../GridIpcSharedMemoryServerEndpoint.java | 2 +- .../ipc/shmem/GridIpcSharedMemorySpace.java | 2 +- .../nio/GridConnectionBytesVerifyFilter.java | 2 +- .../grid/util/nio/GridNioAsyncNotifyFilter.java | 2 +- .../grid/util/nio/GridNioCodecFilter.java | 2 +- .../grid/util/nio/GridNioFilterChain.java | 2 +- .../gridgain/grid/util/nio/GridNioServer.java | 2 +- .../util/nio/GridShmemCommunicationClient.java | 2 +- .../grid/util/nio/ssl/GridNioSslFilter.java | 2 +- .../grid/util/nio/ssl/GridNioSslHandler.java | 2 +- .../grid/util/nodestart/GridNodeStartUtils.java | 2 +- .../nodestart/GridRemoteStartSpecification.java | 2 +- .../gridgain/grid/util/worker/GridWorker.java | 2 +- .../grid/util/worker/GridWorkerPool.java | 2 +- .../java/org/gridgain/grid/GridTestJob.java | 2 +- .../java/org/gridgain/grid/GridTestTask.java | 2 +- .../kernal/GridCancelUnusedJobSelfTest.java | 1 - .../GridCancelledJobsMetricsSelfTest.java | 1 - .../GridCollisionJobsContextSelfTest.java | 1 - .../GridContinuousJobSiblingsSelfTest.java | 1 - .../grid/kernal/GridContinuousTaskSelfTest.java | 1 - .../grid/kernal/GridDeploymentSelfTest.java | 1 - .../GridEventStorageCheckAllEventsSelfTest.java | 1 - .../GridExplicitImplicitDeploymentSelfTest.java | 1 - .../GridFailoverCustomTopologySelfTest.java | 1 - .../kernal/GridJobCollisionCancelSelfTest.java | 1 - .../kernal/GridJobMasterLeaveAwareSelfTest.java | 1 - .../grid/kernal/GridJobStealingSelfTest.java | 1 - .../GridJobStealingZeroActiveJobsSelfTest.java | 1 - .../GridMultipleVersionsDeploymentSelfTest.java | 1 - .../GridMultithreadedJobStealingSelfTest.java | 1 - .../kernal/GridNonHistoryMetricsSelfTest.java | 1 - .../grid/kernal/GridReduceSelfTest.java | 1 - .../kernal/GridRuntimeExceptionSelfTest.java | 1 - .../grid/kernal/GridStopWithWaitSelfTest.java | 1 - .../GridTaskCancelSingleNodeSelfTest.java | 1 - .../GridTaskContinuousMapperSelfTest.java | 1 - .../grid/kernal/GridTaskFailoverSelfTest.java | 1 - .../GridTaskFutureImplStopGridSelfTest.java | 1 - .../GridTaskInstanceExecutionSelfTest.java | 1 - .../grid/kernal/GridTaskMapAsyncSelfTest.java | 1 - .../grid/kernal/GridTaskTimeoutSelfTest.java | 1 - .../GridCheckpointManagerAbstractSelfTest.java | 2 +- .../cache/GridCacheAffinityRoutingSelfTest.java | 1 - .../cache/GridCacheGroupLockPutTask.java | 1 - .../cache/GridCachePutAllFailoverSelfTest.java | 1 - .../processors/cache/GridCachePutAllTask.java | 1 - .../cache/GridCacheUtilsSelfTest.java | 2 +- .../GridCacheCountDownLatchSelfTest.java | 1 - ...dCacheSequenceMultiNodeAbstractSelfTest.java | 1 - .../distributed/dht/GridCacheDhtTestUtils.java | 1 - .../GridCachePartitionedAffinitySelfTest.java | 1 - ...achePartitionedMultiNodeCounterSelfTest.java | 1 - ...CacheReplicatedPreloadLifecycleSelfTest.java | 1 - .../closure/GridClosureProcessorSelfTest.java | 1 - .../streamer/GridStreamerSelfTest.java | 1 - .../grid/loadtest/GridSingleExecutionTest.java | 1 - .../grid/logger/java/GridJavaLoggerTest.java | 1 + .../marshaller/GridMarshallerAbstractTest.java | 3 +- .../marshaller/GridMarshallerResourceBean.java | 2 +- .../p2p/GridP2PRemoteClassLoadersSelfTest.java | 1 - .../org/gridgain/grid/p2p/GridP2PTestJob.java | 2 +- .../org/gridgain/grid/p2p/GridP2PTestTask.java | 2 +- ...SessionCancelSiblingsFromFutureSelfTest.java | 1 - ...ridSessionCancelSiblingsFromJobSelfTest.java | 1 - ...idSessionCancelSiblingsFromTaskSelfTest.java | 1 - .../GridSessionCollisionSpiSelfTest.java | 1 - ...idSessionFutureWaitJobAttributeSelfTest.java | 1 - ...dSessionFutureWaitTaskAttributeSelfTest.java | 1 - ...GridSessionJobWaitTaskAttributeSelfTest.java | 1 - .../grid/session/GridSessionLoadSelfTest.java | 1 - .../GridSessionSetFutureAttributeSelfTest.java | 1 - ...nSetFutureAttributeWaitListenerSelfTest.java | 1 - ...GridSessionSetJobAttributeOrderSelfTest.java | 1 - .../GridSessionSetJobAttributeSelfTest.java | 1 - ...sionSetJobAttributeWaitListenerSelfTest.java | 1 - .../GridSessionSetTaskAttributeSelfTest.java | 1 - ...GridSessionTaskWaitJobAttributeSelfTest.java | 1 - .../GridSessionWaitAttributeSelfTest.java | 1 - .../org/gridgain/grid/spi/GridTcpForwarder.java | 2 +- ...artupWithSpecifiedWorkDirectorySelfTest.java | 1 - ...tartupWithUndefinedGridGainHomeSelfTest.java | 1 - .../tostring/GridToStringBuilderSelfTest.java | 2 +- .../cache/GridCacheAbstractLoadTest.java | 1 - .../colocation/GridTestCacheStore.java | 1 - .../direct/session/GridSessionLoadTestJob.java | 2 +- .../direct/session/GridSessionLoadTestTask.java | 2 +- .../stealing/GridStealingLoadTestJob.java | 2 +- .../loadtests/job/GridJobLoadTestJob.java | 2 +- .../loadtests/nio/GridNioBenchmarkTest.java | 2 +- .../testframework/GridStringLogger.java | 2 +- .../GridTestSafeThreadFactory.java | 2 +- .../gridgain/testframework/GridTestUtils.java | 1 - .../testframework/junits/GridAbstractTest.java | 1 - .../junits/GridTestKernalContext.java | 2 +- .../testframework/junits/GridTestResources.java | 2 +- .../junits/logger/GridTestLog4jLogger.java | 5 +- .../tests/p2p/GridP2PAwareTestUserResource.java | 1 - .../tests/p2p/GridP2PTestTaskExternalPath1.java | 1 - .../tests/p2p/GridP2PTestTaskExternalPath2.java | 2 +- .../grid/tests/p2p/JobStealingTask.java | 1 - .../grid/hadoop/GridHadoopDefaultJobInfo.java | 2 +- .../ggfs/hadoop/GridGgfsHadoopJclLogger.java | 2 +- .../processors/hadoop/GridHadoopComponent.java | 2 +- .../GridHadoopDefaultMapReducePlanner.java | 1 - .../hadoop/shuffle/GridHadoopShuffleJob.java | 2 +- .../taskexecutor/GridHadoopExecutorService.java | 2 +- .../taskexecutor/GridHadoopRunnableTask.java | 2 +- .../GridHadoopExternalTaskExecutor.java | 2 +- .../child/GridHadoopChildProcessRunner.java | 2 +- .../child/GridHadoopExternalProcessStarter.java | 2 +- .../GridHadoopExternalCommunication.java | 2 +- .../GridHadoopIpcToNioAdapter.java | 2 +- .../processors/hadoop/v2/GridHadoopV2Job.java | 2 +- .../v2/GridHadoopV2JobResourceManager.java | 2 +- .../collections/GridHadoopAbstractMapTest.java | 2 +- ...GridHadoopExternalCommunicationSelfTest.java | 2 +- .../GridHibernateAccessStrategyAdapter.java | 1 - .../hibernate/GridHibernateRegionFactory.java | 1 - .../hibernate/GridCacheHibernateBlobStore.java | 2 +- .../grid/spi/indexing/h2/GridH2IndexingSpi.java | 2 +- .../GridIndexingSpiAbstractSelfTest.java | 2 +- .../gridgain/grid/logger/jcl/GridJclLogger.java | 2 +- .../grid/logger/jcl/GridJclLoggerTest.java | 2 +- .../cache/jta/GridCacheXAResource.java | 2 +- .../grid/logger/log4j/GridLog4jLogger.java | 5 +- .../logger/log4j/GridLog4jInitializedTest.java | 2 +- .../logger/log4j/GridLog4jLoggingFileTest.java | 2 +- .../logger/log4j/GridLog4jLoggingPathTest.java | 2 +- .../logger/log4j/GridLog4jLoggingUrlTest.java | 2 +- .../log4j/GridLog4jNotInitializedTest.java | 2 +- .../http/jetty/GridJettyRestHandler.java | 2 +- .../processors/schedule/ScheduleFutureImpl.java | 2 +- .../grid/kernal/GridScheduleSelfTest.java | 1 - .../grid/logger/slf4j/GridSlf4jLogger.java | 2 +- .../java/org/gridgain/grid/GridSpringBean.java | 1 - .../spring/GridSpringProcessorImpl.java | 2 +- .../GridAbstractUserExternalResource.java | 1 - .../resource/GridUserExternalResourceTask1.java | 2 +- .../resource/GridUserExternalResourceTask2.java | 2 +- .../grid/kernal/GridFactorySelfTest.java | 1 - .../resource/GridAbstractUserResource.java | 1 - .../resource/GridLoggerInjectionSelfTest.java | 1 - .../GridResourceEventFilterSelfTest.java | 1 - .../GridResourceFieldInjectionSelfTest.java | 1 - ...dResourceFieldOverrideInjectionSelfTest.java | 1 - ...GridResourceIsolatedClassLoaderSelfTest.java | 1 - .../GridResourceIsolatedTaskSelfTest.java | 1 - .../GridResourceMethodInjectionSelfTest.java | 1 - ...ResourceMethodOverrideInjectionSelfTest.java | 1 - .../resource/GridResourceProcessorSelfTest.java | 1 - .../GridResourceSharedUndeploySelfTest.java | 1 - .../kernal/processors/resource/TestClosure.java | 1 - .../grid/p2p/GridP2PAbstractUserResource.java | 1 - .../GridP2PContinuousLocalDeploySelfTest.java | 1 - .../util/nodestart/GridNodeCallableImpl.java | 2 +- .../GridUriDeploymentClassLoaderFactory.java | 2 +- .../uri/GridUriDeploymentFileProcessor.java | 2 +- .../uri/GridUriDeploymentJarVerifier.java | 2 +- .../deployment/uri/GridUriDeploymentSpi.java | 2 +- .../uri/GridUriDeploymentSpringParser.java | 2 +- .../uri/scanners/GridUriDeploymentScanner.java | 2 +- .../file/GridUriDeploymentFileScanner.java | 2 +- .../ftp/GridUriDeploymentFtpClient.java | 2 +- .../ftp/GridUriDeploymentFtpScanner.java | 2 +- .../http/GridUriDeploymentHttpScanner.java | 2 +- .../gridgain/visor/plugin/VisorPluginModel.java | 2 +- .../cache/websession/GridWebSessionFilter.java | 1 - .../websession/GridWebSessionListener.java | 1 - 345 files changed, 392 insertions(+), 497 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/examples/src/main/java/org/gridgain/examples/compute/failover/ComputeFailoverExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/gridgain/examples/compute/failover/ComputeFailoverExample.java b/examples/src/main/java/org/gridgain/examples/compute/failover/ComputeFailoverExample.java index 9c74eb3..b9395c3 100644 --- a/examples/src/main/java/org/gridgain/examples/compute/failover/ComputeFailoverExample.java +++ b/examples/src/main/java/org/gridgain/examples/compute/failover/ComputeFailoverExample.java @@ -15,7 +15,6 @@ import org.apache.ignite.lang.*; import org.apache.ignite.resources.*; import org.gridgain.examples.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.util.lang.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/aop/src/test/java/org/gridgain/grid/gridify/GridTestGridifyJob.java ---------------------------------------------------------------------- diff --git a/modules/aop/src/test/java/org/gridgain/grid/gridify/GridTestGridifyJob.java b/modules/aop/src/test/java/org/gridgain/grid/gridify/GridTestGridifyJob.java index f213cee..28d5418 100644 --- a/modules/aop/src/test/java/org/gridgain/grid/gridify/GridTestGridifyJob.java +++ b/modules/aop/src/test/java/org/gridgain/grid/gridify/GridTestGridifyJob.java @@ -9,10 +9,10 @@ package org.gridgain.grid.gridify; +import org.apache.ignite.*; import org.apache.ignite.compute.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import java.io.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/aop/src/test/java/org/test/gridify/GridExternalGridifyTask.java ---------------------------------------------------------------------- diff --git a/modules/aop/src/test/java/org/test/gridify/GridExternalGridifyTask.java b/modules/aop/src/test/java/org/test/gridify/GridExternalGridifyTask.java index 7a3dcb9..7e95f0f 100644 --- a/modules/aop/src/test/java/org/test/gridify/GridExternalGridifyTask.java +++ b/modules/aop/src/test/java/org/test/gridify/GridExternalGridifyTask.java @@ -9,11 +9,11 @@ package org.test.gridify; +import org.apache.ignite.*; import org.apache.ignite.compute.*; import org.apache.ignite.compute.gridify.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import java.io.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/aws/src/main/java/org/gridgain/grid/spi/checkpoint/s3/GridS3CheckpointSpi.java ---------------------------------------------------------------------- diff --git a/modules/aws/src/main/java/org/gridgain/grid/spi/checkpoint/s3/GridS3CheckpointSpi.java b/modules/aws/src/main/java/org/gridgain/grid/spi/checkpoint/s3/GridS3CheckpointSpi.java index 7b4837b..d0fcf23 100644 --- a/modules/aws/src/main/java/org/gridgain/grid/spi/checkpoint/s3/GridS3CheckpointSpi.java +++ b/modules/aws/src/main/java/org/gridgain/grid/spi/checkpoint/s3/GridS3CheckpointSpi.java @@ -13,9 +13,9 @@ import com.amazonaws.*; import com.amazonaws.auth.*; import com.amazonaws.services.s3.*; import com.amazonaws.services.s3.model.*; +import org.apache.ignite.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.marshaller.*; import org.gridgain.grid.spi.*; import org.gridgain.grid.spi.checkpoint.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/aws/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/s3/GridTcpDiscoveryS3IpFinder.java ---------------------------------------------------------------------- diff --git a/modules/aws/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/s3/GridTcpDiscoveryS3IpFinder.java b/modules/aws/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/s3/GridTcpDiscoveryS3IpFinder.java index 1fd94ec..2ba1950 100644 --- a/modules/aws/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/s3/GridTcpDiscoveryS3IpFinder.java +++ b/modules/aws/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/s3/GridTcpDiscoveryS3IpFinder.java @@ -13,9 +13,9 @@ import com.amazonaws.*; import com.amazonaws.auth.*; import com.amazonaws.services.s3.*; import com.amazonaws.services.s3.model.*; +import org.apache.ignite.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.spi.*; import org.gridgain.grid.spi.discovery.tcp.ipfinder.*; import org.gridgain.grid.util.typedef.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/aws/src/test/java/org/gridgain/grid/spi/checkpoint/s3/GridS3CheckpointSpiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/aws/src/test/java/org/gridgain/grid/spi/checkpoint/s3/GridS3CheckpointSpiSelfTest.java b/modules/aws/src/test/java/org/gridgain/grid/spi/checkpoint/s3/GridS3CheckpointSpiSelfTest.java index 2b6227a..b9d0d55 100644 --- a/modules/aws/src/test/java/org/gridgain/grid/spi/checkpoint/s3/GridS3CheckpointSpiSelfTest.java +++ b/modules/aws/src/test/java/org/gridgain/grid/spi/checkpoint/s3/GridS3CheckpointSpiSelfTest.java @@ -195,7 +195,7 @@ public class GridS3CheckpointSpiSelfTest extends GridSpiAbstractTest<GridS3Check } /** - * Wrapper around {@link GridTestUtils#retryAssert(org.gridgain.grid.logger.IgniteLogger, int, long, GridAbsClosure)}. + * Wrapper around {@link GridTestUtils#retryAssert(org.apache.ignite.IgniteLogger, int, long, GridAbsClosure)}. * Provides s3-specific timeouts. * @param assertion Closure with assertion inside. * @throws GridInterruptedException If was interrupted. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/clients/src/test/java/org/gridgain/client/GridClientStartNodeTask.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/client/GridClientStartNodeTask.java b/modules/clients/src/test/java/org/gridgain/client/GridClientStartNodeTask.java index 37a58aa..7074175 100644 --- a/modules/clients/src/test/java/org/gridgain/client/GridClientStartNodeTask.java +++ b/modules/clients/src/test/java/org/gridgain/client/GridClientStartNodeTask.java @@ -14,7 +14,6 @@ import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; import org.springframework.beans.factory.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/clients/src/test/java/org/gridgain/client/GridClientStopNodeTask.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/client/GridClientStopNodeTask.java b/modules/clients/src/test/java/org/gridgain/client/GridClientStopNodeTask.java index d2b884f..efa2326 100644 --- a/modules/clients/src/test/java/org/gridgain/client/GridClientStopNodeTask.java +++ b/modules/clients/src/test/java/org/gridgain/client/GridClientStopNodeTask.java @@ -13,7 +13,6 @@ import org.apache.ignite.*; import org.apache.ignite.compute.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.util.typedef.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/clients/src/test/java/org/gridgain/client/GridClientTestRestServer.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/client/GridClientTestRestServer.java b/modules/clients/src/test/java/org/gridgain/client/GridClientTestRestServer.java index 76518de..7308bf0 100644 --- a/modules/clients/src/test/java/org/gridgain/client/GridClientTestRestServer.java +++ b/modules/clients/src/test/java/org/gridgain/client/GridClientTestRestServer.java @@ -9,12 +9,12 @@ package org.gridgain.client; +import org.apache.ignite.*; import org.gridgain.client.marshaller.*; import org.gridgain.client.marshaller.optimized.*; import org.gridgain.grid.*; import org.gridgain.grid.kernal.processors.rest.client.message.*; import org.gridgain.grid.kernal.processors.rest.protocols.tcp.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.util.nio.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTestBinaryClient.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTestBinaryClient.java b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTestBinaryClient.java index 098ad9f..9c2e61f 100644 --- a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTestBinaryClient.java +++ b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTestBinaryClient.java @@ -9,11 +9,11 @@ package org.gridgain.grid.kernal.processors.rest; +import org.apache.ignite.*; import org.gridgain.client.marshaller.*; import org.gridgain.client.marshaller.optimized.*; import org.gridgain.grid.*; import org.gridgain.grid.kernal.processors.rest.client.message.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.logger.java.*; import org.gridgain.grid.util.*; import org.gridgain.grid.util.typedef.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTestMemcacheClient.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTestMemcacheClient.java b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTestMemcacheClient.java index 7baa481..6ed95d7 100644 --- a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTestMemcacheClient.java +++ b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTestMemcacheClient.java @@ -9,8 +9,8 @@ package org.gridgain.grid.kernal.processors.rest; +import org.apache.ignite.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.logger.java.*; import org.gridgain.grid.marshaller.*; import org.gridgain.grid.marshaller.jdk.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/apache/ignite/Ignite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/Ignite.java b/modules/core/src/main/java/org/apache/ignite/Ignite.java index b620337..64352a5 100644 --- a/modules/core/src/main/java/org/apache/ignite/Ignite.java +++ b/modules/core/src/main/java/org/apache/ignite/Ignite.java @@ -17,7 +17,6 @@ import org.gridgain.grid.cache.*; import org.gridgain.grid.dr.*; import org.gridgain.grid.ggfs.*; import org.gridgain.grid.hadoop.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.portables.*; import org.gridgain.grid.product.*; import org.gridgain.grid.security.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/apache/ignite/IgniteLogger.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteLogger.java b/modules/core/src/main/java/org/apache/ignite/IgniteLogger.java new file mode 100644 index 0000000..1ee12a7 --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/IgniteLogger.java @@ -0,0 +1,153 @@ +/* @java.file.header */ + +/* _________ _____ __________________ _____ + * __ ____/___________(_)______ /__ ____/______ ____(_)_______ + * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ + * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / + * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ + */ + +package org.apache.ignite; + +import org.gridgain.grid.util.tostring.*; +import org.jetbrains.annotations.*; + +/** + * This interface defines basic logging functionality used throughout the system. We had to + * abstract it out so that we can use whatever logging is used by the hosting environment. + * Currently, <a target=_new href="http://logging.apache.org/log4j/docs/";>log4j</a>, + * <a target=_new href="http://www.jboss.org/developers/guides/logging";>JBoss</a>, + * <a target=_new href="http://jakarta.apache.org/commons/logging/";>JCL</a> and + * console logging are provided as supported implementations. + * <p> + * GridGain logger could be configured either from code (for example log4j logger): + * <pre name="code" class="java"> + * GridConfiguration cfg = new GridConfiguration(); + * ... + * URL xml = U.resolveGridGainUrl("config/custom-log4j.xml"); + * GridLogger log = new GridLog4jLogger(xml); + * ... + * cfg.setGridLogger(log); + * </pre> + * or in grid configuration file (see JCL logger example below): + * <pre name="code" class="xml"> + * ... + * <property name="gridLogger"> + * <bean class="org.gridgain.grid.logger.jcl.GridJclLogger"> + * <constructor-arg type="org.apache.commons.logging.Log"> + * <bean class="org.apache.commons.logging.impl.Log4JLogger"> + * <constructor-arg type="java.lang.String" value="config/gridgain-log4j.xml"/> + * </bean> + * </constructor-arg> + * </bean> + * </property> + * ... + * </pre> + * It's recommended to use GridGain's logger injection instead of using/instantiating + * logger in your task/job code. See {@link org.apache.ignite.resources.IgniteLoggerResource} annotation about logger + * injection. + * <h1 class="header">Quiet Mode</h1> + * By default GridGain 3.0 and later starts in "quiet" mode suppressing {@code INFO} and {@code DEBUG} + * log output. If system property {@code GRIDGAIN_QUIET} is set to {@code false} than GridGain + * will operate in normal un-suppressed logging mode. Note that all output in "quiet" mode is + * done through standard output (STDOUT). + * <p> + * Note that GridGain's standard startup scripts <tt>$GRIDGAIN_HOME/bin/ggstart.{sh|bat}</tt> start + * by default in "quiet" mode. Both scripts accept {@code -v} arguments to turn off "quiet" mode. + */ +@GridToStringExclude +public interface IgniteLogger { + /** + * Creates new logger with given category based off the current instance. + * + * @param ctgr Category for new logger. + * @return New logger with given category. + */ + public IgniteLogger getLogger(Object ctgr); + + /** + * Logs out trace message. + * + * @param msg Trace message. + */ + public void trace(String msg); + + /** + * Logs out debug message. + * + * @param msg Debug message. + */ + public void debug(String msg); + + /** + * Logs out information message. + * + * @param msg Information message. + */ + public void info(String msg); + + /** + * Logs out warning message. + * + * @param msg Warning message. + */ + public void warning(String msg); + + /** + * Logs out warning message with optional exception. + * + * @param msg Warning message. + * @param e Optional exception (can be {@code null}). + */ + public void warning(String msg, @Nullable Throwable e); + + /** + * Logs out error message. + * + * @param msg Error message. + */ + public void error(String msg); + + /** + * Logs error message with optional exception. + * + * @param msg Error message. + * @param e Optional exception (can be {@code null}). + */ + public void error(String msg, @Nullable Throwable e); + + /** + * Tests whether {@code trace} level is enabled. + * + * @return {@code true} in case when {@code trace} level is enabled, {@code false} otherwise. + */ + public boolean isTraceEnabled(); + + /** + * Tests whether {@code debug} level is enabled. + * + * @return {@code true} in case when {@code debug} level is enabled, {@code false} otherwise. + */ + public boolean isDebugEnabled(); + + /** + * Tests whether {@code info} level is enabled. + * + * @return {@code true} in case when {@code info} level is enabled, {@code false} otherwise. + */ + public boolean isInfoEnabled(); + + /** + * Tests whether {@code info} and {@code debug} levels are turned off. + * + * @return Whether {@code info} and {@code debug} levels are turned off. + */ + public boolean isQuiet(); + + /** + * Gets name of the file being logged to if one is configured or {@code null} otherwise. + * + * @return Name of the file being logged to if one is configured or {@code null} otherwise. + */ + @Nullable public String fileName(); +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/apache/ignite/compute/gridify/aop/GridifyDefaultRangeTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/compute/gridify/aop/GridifyDefaultRangeTask.java b/modules/core/src/main/java/org/apache/ignite/compute/gridify/aop/GridifyDefaultRangeTask.java index 422e20b..0135022 100644 --- a/modules/core/src/main/java/org/apache/ignite/compute/gridify/aop/GridifyDefaultRangeTask.java +++ b/modules/core/src/main/java/org/apache/ignite/compute/gridify/aop/GridifyDefaultRangeTask.java @@ -15,7 +15,6 @@ import org.apache.ignite.compute.*; import org.apache.ignite.compute.gridify.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.util.gridify.*; import org.gridgain.grid.util.lang.*; import org.gridgain.grid.util.typedef.internal.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java index c51d1ed..a6574f3 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java @@ -9,6 +9,7 @@ package org.apache.ignite.configuration; +import org.apache.ignite.*; import org.apache.ignite.events.*; import org.apache.ignite.lang.*; import org.apache.ignite.lifecycle.*; @@ -23,7 +24,6 @@ import org.gridgain.grid.dr.hub.sender.*; import org.gridgain.grid.ggfs.*; import org.gridgain.grid.hadoop.*; import org.gridgain.grid.kernal.managers.eventstorage.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.marshaller.*; import org.gridgain.grid.marshaller.jdk.*; import org.gridgain.grid.marshaller.optimized.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/apache/ignite/messaging/MessagingListenActor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/messaging/MessagingListenActor.java b/modules/core/src/main/java/org/apache/ignite/messaging/MessagingListenActor.java index 3b5d77b..5717154 100644 --- a/modules/core/src/main/java/org/apache/ignite/messaging/MessagingListenActor.java +++ b/modules/core/src/main/java/org/apache/ignite/messaging/MessagingListenActor.java @@ -14,7 +14,6 @@ import org.apache.ignite.cluster.*; import org.apache.ignite.lang.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.util.typedef.internal.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/apache/ignite/plugin/PluginContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/PluginContext.java b/modules/core/src/main/java/org/apache/ignite/plugin/PluginContext.java index 3472e10..abe991b 100644 --- a/modules/core/src/main/java/org/apache/ignite/plugin/PluginContext.java +++ b/modules/core/src/main/java/org/apache/ignite/plugin/PluginContext.java @@ -12,7 +12,6 @@ package org.apache.ignite.plugin; import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.spi.*; import org.gridgain.grid.spi.discovery.*; import org.gridgain.grid.util.direct.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/apache/ignite/resources/IgniteLoggerResource.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/resources/IgniteLoggerResource.java b/modules/core/src/main/java/org/apache/ignite/resources/IgniteLoggerResource.java index fdddc3f..b248c71 100644 --- a/modules/core/src/main/java/org/apache/ignite/resources/IgniteLoggerResource.java +++ b/modules/core/src/main/java/org/apache/ignite/resources/IgniteLoggerResource.java @@ -14,7 +14,7 @@ import org.gridgain.grid.spi.*; import java.lang.annotation.*; /** - * Annotates a field or a setter method for injection of {@link org.gridgain.grid.logger.IgniteLogger}. Grid logger is provided to grid + * Annotates a field or a setter method for injection of {@link org.apache.ignite.IgniteLogger}. Grid logger is provided to grid * via {@link org.apache.ignite.configuration.IgniteConfiguration}. * <p> * Logger can be injected into instances of following classes: http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/client/impl/connection/GridClientConnectionManagerAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/client/impl/connection/GridClientConnectionManagerAdapter.java b/modules/core/src/main/java/org/gridgain/client/impl/connection/GridClientConnectionManagerAdapter.java index b1e8253..8a4850f 100644 --- a/modules/core/src/main/java/org/gridgain/client/impl/connection/GridClientConnectionManagerAdapter.java +++ b/modules/core/src/main/java/org/gridgain/client/impl/connection/GridClientConnectionManagerAdapter.java @@ -9,12 +9,12 @@ package org.gridgain.client.impl.connection; +import org.apache.ignite.*; import org.gridgain.client.*; import org.gridgain.client.impl.*; import org.gridgain.client.util.*; import org.gridgain.grid.*; import org.gridgain.grid.kernal.processors.rest.client.message.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.logger.java.*; import org.gridgain.grid.security.*; import org.gridgain.grid.util.direct.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/client/router/GridTcpRouterConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/client/router/GridTcpRouterConfiguration.java b/modules/core/src/main/java/org/gridgain/client/router/GridTcpRouterConfiguration.java index f9f8ebb..b2ebb52 100644 --- a/modules/core/src/main/java/org/gridgain/client/router/GridTcpRouterConfiguration.java +++ b/modules/core/src/main/java/org/gridgain/client/router/GridTcpRouterConfiguration.java @@ -1,8 +1,8 @@ package org.gridgain.client.router; +import org.apache.ignite.*; import org.apache.ignite.configuration.*; import org.gridgain.client.ssl.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.security.*; import org.gridgain.grid.util.typedef.internal.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/client/router/impl/GridRouterCommandLineStartup.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/client/router/impl/GridRouterCommandLineStartup.java b/modules/core/src/main/java/org/gridgain/client/router/impl/GridRouterCommandLineStartup.java index f4d8c79..02a2474 100644 --- a/modules/core/src/main/java/org/gridgain/client/router/impl/GridRouterCommandLineStartup.java +++ b/modules/core/src/main/java/org/gridgain/client/router/impl/GridRouterCommandLineStartup.java @@ -9,12 +9,12 @@ package org.gridgain.client.router.impl; +import org.apache.ignite.*; import org.apache.ignite.lang.*; import org.apache.ignite.lifecycle.*; import org.gridgain.client.router.*; import org.gridgain.grid.*; import org.gridgain.grid.kernal.processors.spring.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/client/router/impl/GridTcpRouterImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/client/router/impl/GridTcpRouterImpl.java b/modules/core/src/main/java/org/gridgain/client/router/impl/GridTcpRouterImpl.java index 6ffc294..fc08d5d 100644 --- a/modules/core/src/main/java/org/gridgain/client/router/impl/GridTcpRouterImpl.java +++ b/modules/core/src/main/java/org/gridgain/client/router/impl/GridTcpRouterImpl.java @@ -9,13 +9,13 @@ package org.gridgain.client.router.impl; +import org.apache.ignite.*; import org.apache.ignite.lifecycle.*; import org.gridgain.client.*; import org.gridgain.client.router.*; import org.gridgain.client.ssl.*; import org.gridgain.grid.*; import org.gridgain.grid.kernal.processors.rest.client.message.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.logger.java.*; import org.gridgain.grid.util.nio.*; import org.gridgain.grid.util.nio.ssl.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/client/router/impl/GridTcpRouterNioListenerAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/client/router/impl/GridTcpRouterNioListenerAdapter.java b/modules/core/src/main/java/org/gridgain/client/router/impl/GridTcpRouterNioListenerAdapter.java index a718400..3113ae0 100644 --- a/modules/core/src/main/java/org/gridgain/client/router/impl/GridTcpRouterNioListenerAdapter.java +++ b/modules/core/src/main/java/org/gridgain/client/router/impl/GridTcpRouterNioListenerAdapter.java @@ -9,12 +9,12 @@ package org.gridgain.client.router.impl; +import org.apache.ignite.*; import org.gridgain.client.*; import org.gridgain.client.marshaller.*; import org.gridgain.client.marshaller.jdk.*; import org.gridgain.client.marshaller.optimized.*; import org.gridgain.grid.kernal.processors.rest.client.message.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.util.nio.*; import org.gridgain.grid.util.typedef.internal.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/client/router/impl/GridTcpRouterNioListenerOsImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/client/router/impl/GridTcpRouterNioListenerOsImpl.java b/modules/core/src/main/java/org/gridgain/client/router/impl/GridTcpRouterNioListenerOsImpl.java index 56462c5..150bf4e 100644 --- a/modules/core/src/main/java/org/gridgain/client/router/impl/GridTcpRouterNioListenerOsImpl.java +++ b/modules/core/src/main/java/org/gridgain/client/router/impl/GridTcpRouterNioListenerOsImpl.java @@ -9,7 +9,7 @@ package org.gridgain.client.router.impl; -import org.gridgain.grid.logger.*; +import org.apache.ignite.*; /** * Router NIO listener. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/cache/affinity/consistenthash/GridCacheConsistentHashAffinityFunction.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/affinity/consistenthash/GridCacheConsistentHashAffinityFunction.java b/modules/core/src/main/java/org/gridgain/grid/cache/affinity/consistenthash/GridCacheConsistentHashAffinityFunction.java index 66f0e19..e026e50 100644 --- a/modules/core/src/main/java/org/gridgain/grid/cache/affinity/consistenthash/GridCacheConsistentHashAffinityFunction.java +++ b/modules/core/src/main/java/org/gridgain/grid/cache/affinity/consistenthash/GridCacheConsistentHashAffinityFunction.java @@ -16,7 +16,6 @@ import org.apache.ignite.resources.*; import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.affinity.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.util.*; import org.gridgain.grid.util.tostring.*; import org.gridgain.grid.util.typedef.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheLoadOnlyStoreAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheLoadOnlyStoreAdapter.java b/modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheLoadOnlyStoreAdapter.java index 5d2268a..e367327 100644 --- a/modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheLoadOnlyStoreAdapter.java +++ b/modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheLoadOnlyStoreAdapter.java @@ -9,11 +9,11 @@ package org.gridgain.grid.cache.store; +import org.apache.ignite.*; import org.apache.ignite.lang.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; import org.gridgain.grid.cache.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.util.typedef.internal.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/cache/store/jdbc/GridCacheJdbcBlobStore.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/store/jdbc/GridCacheJdbcBlobStore.java b/modules/core/src/main/java/org/gridgain/grid/cache/store/jdbc/GridCacheJdbcBlobStore.java index 5fed548..4e5512d 100644 --- a/modules/core/src/main/java/org/gridgain/grid/cache/store/jdbc/GridCacheJdbcBlobStore.java +++ b/modules/core/src/main/java/org/gridgain/grid/cache/store/jdbc/GridCacheJdbcBlobStore.java @@ -9,11 +9,11 @@ package org.gridgain.grid.cache.store.jdbc; +import org.apache.ignite.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.store.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.marshaller.*; import org.gridgain.grid.util.tostring.*; import org.gridgain.grid.util.typedef.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/dr/hub/sender/store/fs/GridDrSenderHubFsStore.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/dr/hub/sender/store/fs/GridDrSenderHubFsStore.java b/modules/core/src/main/java/org/gridgain/grid/dr/hub/sender/store/fs/GridDrSenderHubFsStore.java index 9df0efb..5571bde 100644 --- a/modules/core/src/main/java/org/gridgain/grid/dr/hub/sender/store/fs/GridDrSenderHubFsStore.java +++ b/modules/core/src/main/java/org/gridgain/grid/dr/hub/sender/store/fs/GridDrSenderHubFsStore.java @@ -9,11 +9,11 @@ package org.gridgain.grid.dr.hub.sender.store.fs; +import org.apache.ignite.*; import org.apache.ignite.lifecycle.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; import org.gridgain.grid.dr.hub.sender.store.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.thread.*; import org.gridgain.grid.util.*; import org.gridgain.grid.util.tostring.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/hadoop/GridHadoopJobInfo.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/hadoop/GridHadoopJobInfo.java b/modules/core/src/main/java/org/gridgain/grid/hadoop/GridHadoopJobInfo.java index 93e33ad..948093a 100644 --- a/modules/core/src/main/java/org/gridgain/grid/hadoop/GridHadoopJobInfo.java +++ b/modules/core/src/main/java/org/gridgain/grid/hadoop/GridHadoopJobInfo.java @@ -9,8 +9,8 @@ package org.gridgain.grid.hadoop; +import org.apache.ignite.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import org.jetbrains.annotations.*; import java.io.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/GridDiagnostic.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridDiagnostic.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridDiagnostic.java index b141781..c41c133 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridDiagnostic.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridDiagnostic.java @@ -9,7 +9,7 @@ package org.gridgain.grid.kernal; -import org.gridgain.grid.logger.*; +import org.apache.ignite.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; import org.gridgain.grid.util.worker.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/GridJobContextImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridJobContextImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridJobContextImpl.java index 66f2cf7..747a594 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridJobContextImpl.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridJobContextImpl.java @@ -9,6 +9,7 @@ package org.gridgain.grid.kernal; +import org.apache.ignite.*; import org.apache.ignite.compute.*; import org.apache.ignite.lang.*; import org.gridgain.grid.*; @@ -16,7 +17,6 @@ import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.affinity.*; import org.gridgain.grid.kernal.processors.job.*; import org.gridgain.grid.kernal.processors.timeout.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; import org.gridgain.grid.util.lang.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java index a20a5dd..cbc9d18 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java @@ -57,7 +57,6 @@ import org.gridgain.grid.kernal.processors.session.*; import org.gridgain.grid.kernal.processors.streamer.*; import org.gridgain.grid.kernal.processors.task.*; import org.gridgain.grid.kernal.processors.timeout.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.marshaller.*; import org.gridgain.grid.marshaller.optimized.*; import org.gridgain.grid.portables.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernalContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernalContext.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernalContext.java index 6560a12..a3bc773 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernalContext.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernalContext.java @@ -9,6 +9,7 @@ package org.gridgain.grid.kernal; +import org.apache.ignite.*; import org.apache.ignite.configuration.*; import org.apache.ignite.plugin.*; import org.gridgain.grid.*; @@ -50,7 +51,6 @@ import org.gridgain.grid.kernal.processors.session.*; import org.gridgain.grid.kernal.processors.streamer.*; import org.gridgain.grid.kernal.processors.task.*; import org.gridgain.grid.kernal.processors.timeout.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.product.*; import org.gridgain.grid.util.direct.*; import org.gridgain.grid.util.tostring.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernalContextImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernalContextImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernalContextImpl.java index 5b43e02..3cb3336 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernalContextImpl.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernalContextImpl.java @@ -54,7 +54,6 @@ import org.gridgain.grid.kernal.processors.spring.*; import org.gridgain.grid.kernal.processors.streamer.*; import org.gridgain.grid.kernal.processors.task.*; import org.gridgain.grid.kernal.processors.timeout.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.product.*; import org.gridgain.grid.util.direct.*; import org.gridgain.grid.util.lang.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/GridLoggerProxy.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridLoggerProxy.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridLoggerProxy.java index 603b6fe..2ac9916 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridLoggerProxy.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridLoggerProxy.java @@ -9,10 +9,10 @@ package org.gridgain.grid.kernal; +import org.apache.ignite.*; import org.apache.ignite.lang.*; import org.apache.ignite.lifecycle.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; import org.gridgain.grid.util.lang.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/GridPerformanceSuggestions.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridPerformanceSuggestions.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridPerformanceSuggestions.java index a2dd13a..09d04d2 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridPerformanceSuggestions.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridPerformanceSuggestions.java @@ -9,7 +9,7 @@ package org.gridgain.grid.kernal; -import org.gridgain.grid.logger.*; +import org.apache.ignite.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/GridPluginContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridPluginContext.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridPluginContext.java index c1ff20d..d86ad14 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridPluginContext.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridPluginContext.java @@ -13,7 +13,6 @@ import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.plugin.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.spi.*; import org.gridgain.grid.util.direct.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/GridUpdateNotifier.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridUpdateNotifier.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridUpdateNotifier.java index 9f5d000..51f2e59 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridUpdateNotifier.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridUpdateNotifier.java @@ -9,9 +9,9 @@ package org.gridgain.grid.kernal; +import org.apache.ignite.*; import org.gridgain.grid.*; import org.gridgain.grid.kernal.processors.license.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.product.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/executor/GridExecutorService.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/executor/GridExecutorService.java b/modules/core/src/main/java/org/gridgain/grid/kernal/executor/GridExecutorService.java index 068250e..8ea6faa 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/executor/GridExecutorService.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/executor/GridExecutorService.java @@ -14,7 +14,6 @@ import org.apache.ignite.compute.*; import org.apache.ignite.lang.*; import org.gridgain.grid.*; import org.gridgain.grid.kernal.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.util.future.*; import org.gridgain.grid.util.lang.*; import org.gridgain.grid.util.typedef.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/managers/GridManagerAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/GridManagerAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/GridManagerAdapter.java index 170d33a..392da6e 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/GridManagerAdapter.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/GridManagerAdapter.java @@ -9,6 +9,7 @@ package org.gridgain.grid.kernal.managers; +import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.events.*; import org.apache.ignite.lang.*; @@ -19,7 +20,6 @@ import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.managers.communication.*; import org.gridgain.grid.kernal.managers.eventstorage.*; import org.gridgain.grid.kernal.processors.cache.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.security.*; import org.gridgain.grid.spi.*; import org.gridgain.grid.spi.swapspace.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentClassLoader.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentClassLoader.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentClassLoader.java index c02f3e2..ee4a909 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentClassLoader.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentClassLoader.java @@ -9,11 +9,11 @@ package org.gridgain.grid.kernal.managers.deployment; +import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.lang.*; import org.gridgain.grid.*; import org.gridgain.grid.kernal.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.util.*; import org.gridgain.grid.util.tostring.*; import org.gridgain.grid.util.typedef.internal.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentCommunication.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentCommunication.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentCommunication.java index 266776a..e868343 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentCommunication.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentCommunication.java @@ -9,6 +9,7 @@ package org.gridgain.grid.kernal.managers.deployment; +import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.events.*; import org.apache.ignite.lang.*; @@ -16,7 +17,6 @@ import org.gridgain.grid.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.managers.communication.*; import org.gridgain.grid.kernal.managers.eventstorage.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.marshaller.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentStoreAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentStoreAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentStoreAdapter.java index aa377b9..1667a97 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentStoreAdapter.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentStoreAdapter.java @@ -9,10 +9,10 @@ package org.gridgain.grid.kernal.managers.deployment; +import org.apache.ignite.*; import org.apache.ignite.compute.*; import org.gridgain.grid.*; import org.gridgain.grid.kernal.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.spi.deployment.*; import org.gridgain.grid.util.typedef.internal.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/GridProcessorAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/GridProcessorAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/GridProcessorAdapter.java index 3d8ba2f..900ddb3 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/GridProcessorAdapter.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/GridProcessorAdapter.java @@ -9,10 +9,10 @@ package org.gridgain.grid.kernal.processors; +import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.gridgain.grid.*; import org.gridgain.grid.kernal.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.spi.*; import org.gridgain.grid.util.typedef.internal.*; import org.gridgain.grid.util.tostring.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityAssignmentCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityAssignmentCache.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityAssignmentCache.java index 3c6e842..25feb24 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityAssignmentCache.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityAssignmentCache.java @@ -9,6 +9,7 @@ package org.gridgain.grid.kernal.processors.affinity; +import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.events.*; import org.apache.ignite.lang.*; @@ -16,7 +17,6 @@ import org.gridgain.grid.*; import org.gridgain.grid.cache.affinity.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.processors.cache.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.portables.*; import org.gridgain.grid.util.future.*; import org.gridgain.grid.util.typedef.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityUtils.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityUtils.java index f2d519c..054ef7c 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityUtils.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityUtils.java @@ -17,7 +17,6 @@ import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.managers.deployment.*; import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.kernal.processors.task.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; import org.gridgain.grid.util.lang.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java index 9a44d85..a9034b5 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java @@ -30,7 +30,6 @@ import org.gridgain.grid.kernal.processors.cache.dr.*; import org.gridgain.grid.kernal.processors.cache.query.*; import org.gridgain.grid.kernal.processors.dr.*; import org.gridgain.grid.kernal.processors.task.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.portables.*; import org.gridgain.grid.security.*; import org.gridgain.grid.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheClearAllRunnable.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheClearAllRunnable.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheClearAllRunnable.java index a46e88c..b8fa047 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheClearAllRunnable.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheClearAllRunnable.java @@ -9,8 +9,8 @@ package org.gridgain.grid.kernal.processors.cache; +import org.apache.ignite.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.util.typedef.internal.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheConcurrentMap.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheConcurrentMap.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheConcurrentMap.java index 573ec21..add63b4 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheConcurrentMap.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheConcurrentMap.java @@ -9,10 +9,10 @@ package org.gridgain.grid.kernal.processors.cache; +import org.apache.ignite.*; import org.apache.ignite.lang.*; import org.gridgain.grid.*; import org.gridgain.grid.cache.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.util.*; import org.gridgain.grid.util.lang.*; import org.gridgain.grid.util.typedef.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheContext.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheContext.java index e82a06e..a7ed532 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheContext.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheContext.java @@ -9,6 +9,7 @@ package org.gridgain.grid.kernal.processors.cache; +import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; @@ -34,7 +35,6 @@ import org.gridgain.grid.kernal.processors.closure.*; import org.gridgain.grid.kernal.processors.offheap.*; import org.gridgain.grid.kernal.processors.portable.*; import org.gridgain.grid.kernal.processors.timeout.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.marshaller.*; import org.gridgain.grid.portables.*; import org.gridgain.grid.security.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheDefaultAffinityKeyMapper.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheDefaultAffinityKeyMapper.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheDefaultAffinityKeyMapper.java index 666d4d2..3d4a311 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheDefaultAffinityKeyMapper.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheDefaultAffinityKeyMapper.java @@ -9,11 +9,11 @@ package org.gridgain.grid.kernal.processors.cache; +import org.apache.ignite.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.affinity.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.portables.*; import org.gridgain.grid.util.*; import org.gridgain.grid.util.typedef.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryInfoCollectSwapListener.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryInfoCollectSwapListener.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryInfoCollectSwapListener.java index c82dcb2..e3d1538 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryInfoCollectSwapListener.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryInfoCollectSwapListener.java @@ -9,8 +9,8 @@ package org.gridgain.grid.kernal.processors.cache; +import org.apache.ignite.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.util.typedef.internal.*; import org.jdk8.backport.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEvictionEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEvictionEntry.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEvictionEntry.java index 59de374..a051a20 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEvictionEntry.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEvictionEntry.java @@ -9,10 +9,10 @@ package org.gridgain.grid.kernal.processors.cache; +import org.apache.ignite.*; import org.apache.ignite.lang.*; import org.gridgain.grid.*; import org.gridgain.grid.cache.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; import org.gridgain.grid.util.lang.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheLogger.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheLogger.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheLogger.java index 3ce7b19..7cc4593 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheLogger.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheLogger.java @@ -9,8 +9,8 @@ package org.gridgain.grid.kernal.processors.cache; +import org.apache.ignite.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; import org.gridgain.grid.util.lang.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheManagerAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheManagerAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheManagerAdapter.java index da93f79..e3b2882 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheManagerAdapter.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheManagerAdapter.java @@ -9,8 +9,8 @@ package org.gridgain.grid.kernal.processors.cache; +import org.apache.ignite.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.util.typedef.internal.*; import java.util.concurrent.atomic.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMapEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMapEntry.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMapEntry.java index 8d612a2..8427dbe 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMapEntry.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMapEntry.java @@ -9,6 +9,7 @@ package org.gridgain.grid.kernal.processors.cache; +import org.apache.ignite.*; import org.apache.ignite.lang.*; import org.gridgain.grid.*; import org.gridgain.grid.cache.*; @@ -17,7 +18,6 @@ import org.gridgain.grid.kernal.processors.cache.distributed.dht.*; import org.gridgain.grid.kernal.processors.cache.extras.*; import org.gridgain.grid.kernal.processors.cache.query.*; import org.gridgain.grid.kernal.processors.dr.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.util.*; import org.gridgain.grid.util.lang.*; import org.gridgain.grid.util.offheap.unsafe.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMultiTxFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMultiTxFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMultiTxFuture.java index 0cb28f0..44e9711 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMultiTxFuture.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMultiTxFuture.java @@ -9,9 +9,9 @@ package org.gridgain.grid.kernal.processors.cache; +import org.apache.ignite.*; import org.apache.ignite.lang.*; import org.gridgain.grid.cache.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.util.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvcc.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvcc.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvcc.java index 5950032..7445179 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvcc.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvcc.java @@ -9,7 +9,7 @@ package org.gridgain.grid.kernal.processors.cache; -import org.gridgain.grid.logger.*; +import org.apache.ignite.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; import org.gridgain.grid.util.tostring.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccManager.java index 68dfe3a..5b8f19f 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccManager.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccManager.java @@ -9,6 +9,7 @@ package org.gridgain.grid.kernal.processors.cache; +import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.events.*; import org.apache.ignite.lang.*; @@ -17,7 +18,6 @@ import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.managers.discovery.*; import org.gridgain.grid.kernal.managers.eventstorage.*; import org.gridgain.grid.kernal.processors.cache.distributed.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.util.*; import org.gridgain.grid.util.future.*; import org.gridgain.grid.util.tostring.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCachePreloaderAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCachePreloaderAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCachePreloaderAdapter.java index c17f724..172d062 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCachePreloaderAdapter.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCachePreloaderAdapter.java @@ -9,11 +9,11 @@ package org.gridgain.grid.kernal.processors.cache; +import org.apache.ignite.*; import org.apache.ignite.lang.*; import org.gridgain.grid.*; import org.gridgain.grid.cache.affinity.*; import org.gridgain.grid.kernal.processors.cache.distributed.dht.preloader.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.util.future.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSharedContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSharedContext.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSharedContext.java index 57f0ad8..808c117 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSharedContext.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSharedContext.java @@ -9,6 +9,7 @@ package org.gridgain.grid.kernal.processors.cache; +import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; @@ -20,7 +21,6 @@ import org.gridgain.grid.kernal.managers.deployment.*; import org.gridgain.grid.kernal.managers.discovery.*; import org.gridgain.grid.kernal.managers.eventstorage.*; import org.gridgain.grid.kernal.processors.timeout.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.marshaller.*; import org.gridgain.grid.util.future.*; import org.gridgain.grid.util.typedef.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSharedManagerAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSharedManagerAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSharedManagerAdapter.java index 815324f..14ff2dd 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSharedManagerAdapter.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSharedManagerAdapter.java @@ -9,8 +9,8 @@ package org.gridgain.grid.kernal.processors.cache; +import org.apache.ignite.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.util.typedef.internal.*; import java.util.concurrent.atomic.*;
