ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [38/50] [abbrv] incubator-ignite git commit: GridEx -> IgniteEx GridKernal -> IgniteKernal
Date Thu, 29 Jan 2015 12:26:30 GMT
GridEx -> IgniteEx
GridKernal -> IgniteKernal


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

Branch: refs/heads/ignite-67
Commit: c323a8e7b5302d3fe0affbbbb957774b393e5097
Parents: d5bef13
Author: Yakov Zhdanov <yzhdanov@gridgain.com>
Authored: Thu Jan 29 12:41:40 2015 +0300
Committer: Yakov Zhdanov <yzhdanov@gridgain.com>
Committed: Thu Jan 29 12:41:41 2015 +0300

----------------------------------------------------------------------
 .../ClientAbstractMultiThreadedSelfTest.java    |    2 +-
 .../ClientAbstractMultiNodeSelfTest.java        |    4 +-
 .../rest/RestBinaryProtocolSelfTest.java        |    2 +-
 .../rest/TaskCommandHandlerSelfTest.java        |    2 +-
 .../ignite/fs/mapreduce/IgniteFsTask.java       |    2 +-
 .../ignite/internal/ClusterGroupAdapter.java    |    2 +-
 .../java/org/apache/ignite/internal/GridEx.java |  143 -
 .../org/apache/ignite/internal/GridGainEx.java  |   20 +-
 .../org/apache/ignite/internal/GridKernal.java  | 3322 ------------------
 .../ignite/internal/GridKernalContext.java      |    2 +-
 .../ignite/internal/GridKernalContextImpl.java  |    6 +-
 .../ignite/internal/GridUpdateNotifier.java     |    2 +-
 .../ignite/internal/IgniteClusterAsyncImpl.java |    4 +-
 .../org/apache/ignite/internal/IgniteEx.java    |  143 +
 .../apache/ignite/internal/IgniteKernal.java    | 3322 ++++++++++++++++++
 .../processors/affinity/GridAffinityUtils.java  |    2 +-
 .../processors/cache/GridCacheAdapter.java      |    6 +-
 .../processors/cache/GridCacheContext.java      |    4 +-
 .../GridCacheDataStructuresManager.java         |    4 +-
 .../cache/query/GridCacheQueryManager.java      |    2 +-
 .../jdbc/GridCacheQueryJdbcMetadataTask.java    |    2 +-
 .../query/jdbc/GridCacheQueryJdbcTask.java      |    2 +-
 .../dr/GridDrDataLoadCacheUpdater.java          |    2 +-
 .../internal/processors/fs/GridGgfsImpl.java    |    2 +-
 .../resource/GridResourceProcessor.java         |    2 +-
 .../handlers/cache/GridCacheCommandHandler.java |    6 +-
 .../handlers/task/GridTaskCommandHandler.java   |    2 +-
 .../processors/service/GridServiceProxy.java    |    2 +-
 .../apache/ignite/internal/visor/VisorJob.java  |    2 +-
 .../internal/visor/VisorMultiNodeTask.java      |    2 +-
 .../ignite/internal/visor/cache/VisorCache.java |    2 +-
 .../compute/VisorComputeMonitoringHolder.java   |   10 +-
 .../visor/node/VisorBasicConfiguration.java     |    2 +-
 .../visor/node/VisorGridConfiguration.java      |    2 +-
 .../visor/node/VisorNodeDataCollectorJob.java   |    2 +-
 .../internal/visor/query/VisorQueryTask.java    |    2 +-
 .../StreamerCacheAffinityEventRouter.java       |    2 +-
 .../ignite/GridExceptionHelpLinksSelfTest.java  |  106 -
 .../ignite/GridExternalizableAbstractTest.java  |   41 -
 .../IgniteExceptionHelpLinksSelfTest.java       |  106 +
 .../IgniteExternalizableAbstractTest.java       |   41 +
 ...CachePartitionFairAffinityNodesSelfTest.java |    6 +-
 ...CacheJdbcBlobStoreMultithreadedSelfTest.java |    2 +-
 .../ignite/fs/GridGgfsFragmentizerSelfTest.java |    2 +-
 .../internal/GridDiscoveryEventSelfTest.java    |    3 +-
 .../ignite/internal/GridDiscoverySelfTest.java  |    4 +-
 .../internal/GridExecutorServiceTest.java       |  315 --
 .../GridExplicitImplicitDeploymentSelfTest.java |  476 ---
 .../ignite/internal/GridKernalTestUtils.java    |    3 +-
 .../internal/GridListenActorSelfTest.java       |    3 +-
 .../GridTopicExternalizableSelfTest.java        |    3 +-
 .../GridTopologyBuildVersionSelfTest.java       |    2 +-
 .../internal/GridUpdateNotifierSelfTest.java    |    3 +-
 .../internal/IgniteExecutorServiceTest.java     |  315 ++
 ...gniteExplicitImplicitDeploymentSelfTest.java |  476 +++
 .../GridCheckpointManagerAbstractSelfTest.java  |    2 +-
 .../GridCommunicationSendMessageSelfTest.java   |    4 +-
 .../GridDiscoveryManagerAliveCacheSelfTest.java |    2 +-
 .../discovery/GridDiscoveryManagerSelfTest.java |    6 +-
 .../swapspace/GridSwapSpaceManagerSelfTest.java |    2 +-
 .../GridAffinityProcessorAbstractSelfTest.java  |    6 +-
 .../cache/GridCacheAbstractFullApiSelfTest.java |    4 +-
 .../cache/GridCacheAbstractSelfTest.java        |    2 +-
 .../cache/GridCacheAffinityApiSelfTest.java     |    4 +-
 .../GridCacheConcurrentTxMultiNodeTest.java     |    4 +-
 .../cache/GridCacheEntryVersionSelfTest.java    |    4 +-
 .../GridCacheFinishPartitionsSelfTest.java      |    4 +-
 .../GridCacheGroupLockAbstractSelfTest.java     |    4 +-
 .../processors/cache/GridCacheLeakTest.java     |    2 +-
 ...GridCacheMixedPartitionExchangeSelfTest.java |    2 +-
 .../cache/GridCacheMultiUpdateLockSelfTest.java |    2 +-
 .../cache/GridCacheMvccFlagsTest.java           |    4 +-
 .../cache/GridCacheMvccManagerSelfTest.java     |    4 +-
 .../cache/GridCacheMvccPartitionedSelfTest.java |    4 +-
 .../processors/cache/GridCacheMvccSelfTest.java |    4 +-
 .../cache/GridCacheNestedTxAbstractTest.java    |    2 +-
 .../cache/GridCacheObjectToStringSelfTest.java  |    2 +-
 .../GridCacheOrderedPreloadingSelfTest.java     |    2 +-
 .../cache/GridCacheP2PUndeploySelfTest.java     |    6 +-
 .../cache/GridCachePartitionedGetSelfTest.java  |    2 +-
 .../GridCachePreloadingEvictionsSelfTest.java   |    6 +-
 .../GridCacheQueryInternalKeysSelfTest.java     |    2 +-
 .../cache/GridCacheSlowTxWarnTest.java          |    4 +-
 .../cache/GridCacheStoreValueBytesSelfTest.java |    4 +-
 .../cache/GridCacheSwapReloadSelfTest.java      |    2 +-
 .../cache/GridCacheTtlManagerLoadTest.java      |    2 +-
 .../cache/GridCacheTtlManagerSelfTest.java      |    2 +-
 .../IgniteCacheEntryListenerAbstractTest.java   |    2 +-
 .../processors/cache/IgniteTxAbstractTest.java  |    2 +-
 .../IgniteTxConcurrentGetAbstractTest.java      |    3 +-
 .../IgniteTxExceptionAbstractSelfTest.java      |    2 +-
 .../cache/IgniteTxMultiNodeAbstractTest.java    |    6 +-
 .../IgniteTxStoreExceptionAbstractSelfTest.java |    2 +-
 ...actQueueFailoverDataConsistencySelfTest.java |    2 +-
 .../GridCacheCountDownLatchSelfTest.java        |    2 +-
 .../GridCacheQueueCleanupSelfTest.java          |    2 +-
 .../GridCacheSetAbstractSelfTest.java           |    8 +-
 .../GridCacheSetFailoverAbstractSelfTest.java   |    2 +-
 .../GridCacheAtomicTimeoutSelfTest.java         |    2 +-
 .../distributed/GridCacheEventAbstractTest.java |    2 +-
 ...heExpiredEntriesPreloadAbstractSelfTest.java |    2 +-
 .../GridCacheMultiNodeLockAbstractTest.java     |    2 +-
 ...iteTxConsistencyRestartAbstractSelfTest.java |    4 +-
 ...xOriginatingNodeFailureAbstractSelfTest.java |   10 +-
 ...cOriginatingNodeFailureAbstractSelfTest.java |   20 +-
 .../dht/GridCacheAtomicNearCacheSelfTest.java   |    2 +-
 .../dht/GridCacheColocatedDebugTest.java        |    6 +-
 .../dht/GridCacheDhtEntrySelfTest.java          |    2 +-
 ...GridCacheDhtEvictionNearReadersSelfTest.java |    4 +-
 .../dht/GridCacheDhtEvictionSelfTest.java       |    4 +-
 .../dht/GridCacheDhtMappingSelfTest.java        |    2 +-
 .../dht/GridCacheDhtPreloadDelayedSelfTest.java |    2 +-
 .../GridCacheDhtPreloadStartStopSelfTest.java   |    2 +-
 ...dCachePartitionedTopologyChangeSelfTest.java |   32 +-
 ...itionedTxOriginatingNodeFailureSelfTest.java |    8 +-
 ...eAtomicInvalidPartitionHandlingSelfTest.java |    2 +-
 .../atomic/GridCacheAtomicPreloadSelfTest.java  |    4 +-
 .../near/GridCacheNearMultiNodeSelfTest.java    |    6 +-
 .../near/GridCacheNearReadersSelfTest.java      |    4 +-
 .../near/GridCacheNearTxMultiNodeSelfTest.java  |    2 +-
 .../GridCachePartitionedFullApiSelfTest.java    |    4 +-
 ...achePartitionedMultiNodeCounterSelfTest.java |    2 +-
 .../GridCachePartitionedProjectionSelfTest.java |    4 +-
 .../GridCachePartitionedTxSalvageSelfTest.java  |    2 +-
 .../IgniteCacheExpiryPolicyAbstractTest.java    |    2 +-
 ...ridCacheContinuousQueryAbstractSelfTest.java |    4 +-
 .../clock/GridTimeSyncProcessorSelfTest.java    |    6 +-
 .../continuous/GridEventConsumeSelfTest.java    |    2 +-
 .../processors/fs/GridGgfsAbstractSelfTest.java |    2 +-
 .../processors/fs/GridGgfsModesSelfTest.java    |    4 +-
 .../fs/GridGgfsProcessorSelfTest.java           |    2 +-
 ...IpcEndpointRegistrationAbstractSelfTest.java |    2 +-
 .../processors/fs/GridGgfsSizeSelfTest.java     |    8 +-
 .../cache/GridCacheCommandHandlerSelfTest.java  |    6 +-
 .../GridServiceReassignmentSelfTest.java        |    2 +-
 .../util/future/GridFinishedFutureSelfTest.java |    2 +-
 .../communication/GridIoManagerBenchmark.java   |   10 +-
 .../communication/GridIoManagerBenchmark0.java  |   12 +-
 .../ignite/loadtests/dsi/GridDsiPerfJob.java    |    2 +-
 .../marshaller/GridMarshallerAbstractTest.java  |    6 +-
 .../tcp/GridTcpDiscoveryMultiThreadedTest.java  |    2 +-
 .../discovery/tcp/GridTcpDiscoverySelfTest.java |   14 +-
 .../ignite/testframework/GridTestUtils.java     |    4 +-
 .../testframework/junits/GridAbstractTest.java  |   12 +-
 .../junits/GridTestKernalContext.java           |    2 +-
 .../junits/common/GridCommonAbstractTest.java   |   22 +-
 .../ignite/testsuites/IgniteBasicTestSuite.java |    2 +-
 .../testsuites/IgniteComputeGridTestSuite.java  |    4 +-
 .../GridHadoopDefaultMapReducePlanner.java      |    2 +-
 .../GridGgfsHadoopFileSystemClientSelfTest.java |    2 +-
 ...idHadoopDefaultMapReducePlannerSelfTest.java |    4 +-
 .../hadoop/GridHadoopJobTrackerSelfTest.java    |    2 +-
 .../cache/GridCacheAbstractQuerySelfTest.java   |    6 +-
 .../cache/GridCacheOffHeapAndSwapSelfTest.java  |    4 +-
 .../cache/GridCacheQueryLoadSelfTest.java       |    2 +-
 .../GridCacheQueryMultiThreadedSelfTest.java    |    8 +-
 .../GridCacheReplicatedFieldsQuerySelfTest.java |    2 +-
 .../GridCacheReplicatedQuerySelfTest.java       |    4 +-
 .../query/h2/sql/GridQueryParsingTest.java      |    2 +-
 .../tcp/GridOrderedMessageCancelSelfTest.java   |    2 +-
 .../GridTmLookupLifecycleAwareSelfTest.java     |    2 +-
 .../cache/spring/SpringDynamicCacheManager.java |    2 +-
 .../scala/org/apache/ignite/visor/visor.scala   |    6 +-
 163 files changed, 4701 insertions(+), 4707 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/clients/src/test/java/org/apache/ignite/client/ClientAbstractMultiThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/client/ClientAbstractMultiThreadedSelfTest.java
b/modules/clients/src/test/java/org/apache/ignite/client/ClientAbstractMultiThreadedSelfTest.java
index b5c5a85..e72e684 100644
--- a/modules/clients/src/test/java/org/apache/ignite/client/ClientAbstractMultiThreadedSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/client/ClientAbstractMultiThreadedSelfTest.java
@@ -506,7 +506,7 @@ public abstract class ClientAbstractMultiThreadedSelfTest extends GridCommonAbst
     private void printAffinityState(Iterable<Ignite> grids) {
         for (Ignite g : grids) {
             GridAffinityAssignmentCache affCache = getFieldValue(
-                ((GridKernal)g).internalCache(PARTITIONED_CACHE_NAME).context().affinity(),
+                ((IgniteKernal)g).internalCache(PARTITIONED_CACHE_NAME).context().affinity(),
                 "aff");
 
             CacheAffinityFunction aff = getFieldValue(affCache, "aff");

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractMultiNodeSelfTest.java
b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractMultiNodeSelfTest.java
index 363bfbc..d1f3319 100644
--- a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractMultiNodeSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractMultiNodeSelfTest.java
@@ -399,7 +399,7 @@ public abstract class ClientAbstractMultiNodeSelfTest extends GridCommonAbstract
      * @throws Exception If failed.
      */
     public void testInvalidateFlag() throws Exception {
-        GridEx g0 = grid(0);
+        IgniteEx g0 = grid(0);
 
         GridCache<String, String> cache = g0.cache(PARTITIONED_CACHE_NAME);
 
@@ -783,7 +783,7 @@ public abstract class ClientAbstractMultiNodeSelfTest extends GridCommonAbstract
             if (!(o instanceof GridDistributedLockRequest))
                 return;
 
-            GridKernal g = (GridKernal)G.ignite(ignite.configuration().getNodeId());
+            IgniteKernal g = (IgniteKernal)G.ignite(ignite.configuration().getNodeId());
 
             GridCacheContext<Object, Object> cacheCtx = g.internalCache(REPLICATED_ASYNC_CACHE_NAME).context();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java
b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java
index f14a4ad..3e3a36c 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java
@@ -181,7 +181,7 @@ public class RestBinaryProtocolSelfTest extends GridCommonAbstractTest
{
      * @throws Exception If failed.
      */
     public void testFailure() throws Exception {
-        GridKernal kernal = ((GridKernal)grid());
+        IgniteKernal kernal = ((IgniteKernal)grid());
 
         GridRestProcessor proc = kernal.context().rest();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java
b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java
index 1f15f1d..84656de 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java
@@ -159,7 +159,7 @@ public class TaskCommandHandlerSelfTest extends GridCommonAbstractTest
{
 
         GridClientFactory.stop(client.id(), true);
 
-        GridKernal g = (GridKernal)grid(0);
+        IgniteKernal g = (IgniteKernal)grid(0);
 
         Map<GridRestCommand, GridRestCommandHandler> handlers = U.field(g.context().rest(),
"handlers");
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/main/java/org/apache/ignite/fs/mapreduce/IgniteFsTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/fs/mapreduce/IgniteFsTask.java b/modules/core/src/main/java/org/apache/ignite/fs/mapreduce/IgniteFsTask.java
index 29a5fb5..ce51c3d 100644
--- a/modules/core/src/main/java/org/apache/ignite/fs/mapreduce/IgniteFsTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/fs/mapreduce/IgniteFsTask.java
@@ -89,7 +89,7 @@ public abstract class IgniteFsTask<T, R> extends ComputeTaskAdapter<IgniteFsTask
         assert args != null;
 
         IgniteFs ggfs = ignite.fileSystem(args.ggfsName());
-        IgniteFsProcessorAdapter ggfsProc = ((GridKernal) ignite).context().ggfs();
+        IgniteFsProcessorAdapter ggfsProc = ((IgniteKernal) ignite).context().ggfs();
 
         Map<ComputeJob, ClusterNode> splitMap = new HashMap<>();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/main/java/org/apache/ignite/internal/ClusterGroupAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/ClusterGroupAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/ClusterGroupAdapter.java
index 1086fbf..b3f8cc0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/ClusterGroupAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/ClusterGroupAdapter.java
@@ -638,7 +638,7 @@ public class ClusterGroupAdapter implements ClusterGroupEx, Externalizable
{
      */
     protected Object readResolve() throws ObjectStreamException {
         try {
-            GridKernal g = GridGainEx.gridx(gridName);
+            IgniteKernal g = GridGainEx.gridx(gridName);
 
             return ids != null ? new ClusterGroupAdapter(g, g.context(), subjId, ids) :
                 p != null ? new ClusterGroupAdapter(g, g.context(), subjId, p) : g;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/main/java/org/apache/ignite/internal/GridEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridEx.java b/modules/core/src/main/java/org/apache/ignite/internal/GridEx.java
deleted file mode 100644
index 6e004fc..0000000
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridEx.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal;
-
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.internal.processors.interop.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-
-/**
- * Extended Grid interface which provides some additional methods required for kernal and
Visor.
- */
-public interface GridEx extends Ignite, ClusterGroupEx, IgniteCluster {
-    /**
-     * Gets utility cache.
-     *
-     * @param keyCls Key class.
-     * @param valCls Value class.
-     * @return Utility cache.
-     */
-    public <K extends GridCacheUtilityKey, V> GridCacheProjectionEx<K, V> utilityCache(Class<K>
keyCls, Class<V> valCls);
-
-    /**
-     * Gets the cache instance for the given name if one is configured or
-     * <tt>null</tt> otherwise returning even non-public caches.
-     *
-     * @param <K> Key type.
-     * @param <V> Value type.
-     * @param name Cache name.
-     * @return Cache instance for given name or <tt>null</tt> if one does not
exist.
-     */
-    @Nullable public <K, V> GridCache<K, V> cachex(@Nullable String name);
-
-    /**
-     * Gets default cache instance if one is configured or <tt>null</tt> otherwise
returning even non-public caches.
-     * The {@link org.apache.ignite.cache.GridCache#name()} method on default instance returns
<tt>null</tt>.
-     *
-     * @param <K> Key type.
-     * @param <V> Value type.
-     * @return Default cache instance.
-     */
-    @Nullable public <K, V> GridCache<K, V> cachex();
-
-    /**
-     * Gets configured cache instance that satisfy all provided predicates including non-public
caches. If no
-     * predicates provided - all configured caches will be returned.
-     *
-     * @param p Predicates. If none provided - all configured caches will be returned.
-     * @return Configured cache instances that satisfy all provided predicates.
-     */
-    public Collection<GridCache<?, ?>> cachesx(@Nullable IgnitePredicate<?
super GridCache<?, ?>>... p);
-
-    /**
-     * Checks if the event type is user-recordable.
-     *
-     * @param type Event type to check.
-     * @return {@code true} if passed event should be recorded, {@code false} - otherwise.
-     */
-    public boolean eventUserRecordable(int type);
-
-    /**
-     * Checks whether all provided events are user-recordable.
-     * <p>
-     * Note that this method supports only predefined GridGain events.
-     *
-     * @param types Event types.
-     * @return Whether all events are recordable.
-     * @throws IllegalArgumentException If {@code types} contains user event type.
-     */
-    public boolean allEventsUserRecordable(int[] types);
-
-    /**
-     * Gets list of compatible versions.
-     *
-     * @return Compatible versions.
-     */
-    public Collection<String> compatibleVersions();
-
-    /**
-     * @return Grace period left in minutes if bursting or {@code -1} otherwise.
-     */
-    public long licenseGracePeriodLeft();
-
-    /**
-     * Whether or not remote JMX management is enabled for this node.
-     *
-     * @return {@code True} if remote JMX management is enabled - {@code false} otherwise.
-     */
-    public boolean isJmxRemoteEnabled();
-
-    /**
-     * Whether or not node restart is enabled.
-     *
-     * @return {@code True} if restart mode is enabled, {@code false} otherwise.
-     */
-    public boolean isRestartEnabled();
-
-    /**
-     * Whether or not SMTP is configured.
-     *
-     * @return {@code True} if SMTP is configured - {@code false} otherwise.
-     */
-    public boolean isSmtpEnabled();
-
-    /**
-     * Schedule sending of given email to all configured admin emails.
-     */
-    IgniteInternalFuture<Boolean> sendAdminEmailAsync(String subj, String body, boolean
html);
-
-    /**
-     * Get GGFS instance returning null if it doesn't exist.
-     *
-     * @param name GGFS name.
-     * @return GGFS.
-     */
-    @Nullable public IgniteFs ggfsx(@Nullable String name);
-
-    /**
-     * Gets interop processor.
-     *
-     * @return Interop processor.
-     */
-    public GridInteropProcessor interop();
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/main/java/org/apache/ignite/internal/GridGainEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridGainEx.java b/modules/core/src/main/java/org/apache/ignite/internal/GridGainEx.java
index 553d874..65c2776 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridGainEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridGainEx.java
@@ -920,7 +920,7 @@ public class GridGainEx {
         GridNamedInstance dfltGrid0 = dfltGrid;
 
         if (dfltGrid0 != null) {
-            GridKernal g = dfltGrid0.grid();
+            IgniteKernal g = dfltGrid0.grid();
 
             if (g != null)
                 allIgnites.add(g);
@@ -947,14 +947,14 @@ public class GridGainEx {
         GridNamedInstance dfltGrid0 = dfltGrid;
 
         if (dfltGrid0 != null) {
-            GridKernal g = dfltGrid0.grid();
+            IgniteKernal g = dfltGrid0.grid();
 
             if (g != null && g.getLocalNodeId().equals(locNodeId))
                 return g;
         }
 
         for (GridNamedInstance grid : grids.values()) {
-            GridKernal g = grid.grid();
+            IgniteKernal g = grid.grid();
 
             if (g != null && g.getLocalNodeId().equals(locNodeId))
                 return g;
@@ -998,10 +998,10 @@ public class GridGainEx {
      * @param name Grid name.
      * @return Grid instance.
      */
-    public static GridKernal gridx(@Nullable String name) {
+    public static IgniteKernal gridx(@Nullable String name) {
         GridNamedInstance grid = name != null ? grids.get(name) : dfltGrid;
 
-        GridKernal res;
+        IgniteKernal res;
 
         if (grid == null || (res = grid.gridx()) == null)
             throw new IllegalStateException("Grid instance was not properly started or was
already stopped: " + name);
@@ -1151,7 +1151,7 @@ public class GridGainEx {
         private final String name;
 
         /** Grid instance. */
-        private volatile GridKernal grid;
+        private volatile IgniteKernal grid;
 
         /** Executor service. */
         private ExecutorService execSvc;
@@ -1255,7 +1255,7 @@ public class GridGainEx {
          *
          * @return Grid instance.
          */
-        GridKernal grid() {
+        IgniteKernal grid() {
             if (starterThread != Thread.currentThread())
                 U.awaitQuiet(startLatch);
 
@@ -1267,7 +1267,7 @@ public class GridGainEx {
          *
          * @return Grid instance.
          */
-        public GridKernal gridx() {
+        public IgniteKernal gridx() {
             return grid;
         }
 
@@ -1930,7 +1930,7 @@ public class GridGainEx {
             boolean started = false;
 
             try {
-                GridKernal grid0 = new GridKernal(startCtx.springContext());
+                IgniteKernal grid0 = new IgniteKernal(startCtx.springContext());
 
                 // Init here to make grid available to lifecycle listeners.
                 grid = grid0;
@@ -2103,7 +2103,7 @@ public class GridGainEx {
          *      should be cancelled.
          */
         private synchronized void stop0(boolean cancel) {
-            GridKernal grid0 = grid;
+            IgniteKernal grid0 = grid;
 
             // Double check.
             if (grid0 == null) {


Mime
View raw message