ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [20/51] [abbrv] incubator-ignite git commit: # ignite-164 : GridNodeAttributes -> IgniteNodeAttributes (auto-renaming)
Date Wed, 04 Feb 2015 12:34:15 GMT
# ignite-164 : GridNodeAttributes -> IgniteNodeAttributes (auto-renaming)


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

Branch: refs/heads/ignite-164
Commit: d4c21ba6cd84c76d1189d343ab9db871388e9e0a
Parents: aa74616
Author: Artem SHutak <ashutak@gridgain.com>
Authored: Tue Feb 3 21:34:04 2015 +0300
Committer: Artem SHutak <ashutak@gridgain.com>
Committed: Tue Feb 3 21:34:04 2015 +0300

----------------------------------------------------------------------
 .../ClientTcpConnectivitySelfTest.java          |   6 +-
 .../CacheRendezvousAffinityFunction.java        |   2 +-
 .../client/impl/GridClientComputeImpl.java      |   2 +-
 .../ignite/client/impl/GridClientImpl.java      |   2 +-
 .../GridClientConnectionManagerAdapter.java     |   2 +-
 .../impl/connection/GridClientTopology.java     |   2 +-
 .../org/apache/ignite/cluster/ClusterNode.java  |   5 +-
 .../ignite/internal/ClusterGroupAdapter.java    |   2 +-
 .../apache/ignite/internal/GridKillTask.java    |   2 +-
 .../ignite/internal/GridNodeAttributes.java     | 145 -------------------
 .../apache/ignite/internal/IgniteKernal.java    |   2 +-
 .../ignite/internal/IgniteNodeAttributes.java   | 145 +++++++++++++++++++
 .../discovery/GridDiscoveryManager.java         |   4 +-
 .../processors/cache/GridCacheProcessor.java    |   4 +-
 .../processors/cache/GridCacheUtils.java        |   2 +-
 .../clock/GridClockSyncProcessor.java           |   2 +-
 .../dataload/IgniteDataLoaderImpl.java          |   2 +-
 .../internal/processors/fs/GridGgfsContext.java |   2 +-
 .../internal/processors/fs/GridGgfsImpl.java    |   2 +-
 .../processors/fs/IgniteFsProcessor.java        |   6 +-
 .../top/GridTopologyCommandHandler.java         |   2 +-
 .../rest/protocols/tcp/GridTcpRestProtocol.java |   6 +-
 .../streamer/GridStreamProcessor.java           |   2 +-
 .../ignite/internal/util/IgniteUtils.java       |   6 +-
 .../org/apache/ignite/spi/IgniteSpiAdapter.java |   2 +-
 .../spi/discovery/tcp/TcpDiscoverySpi.java      |  18 +--
 .../tcp/internal/TcpDiscoveryNode.java          |   6 +-
 .../GridFailoverTaskWithPredicateSelfTest.java  |   2 +-
 .../internal/GridReleaseTypeSelfTest.java       |   4 +-
 .../GridTopologyBuildVersionSelfTest.java       |   8 +-
 .../GridCacheQueueCleanupSelfTest.java          |   2 +-
 .../dht/GridCacheAtomicNearCacheSelfTest.java   |   2 +-
 ...unctionExcludeNeighborsAbstractSelfTest.java |   4 +-
 ...idCacheNearOnlyMultiNodeFullApiSelfTest.java |   2 +-
 ...bStealingCollisionSpiAttributesSelfTest.java |   2 +-
 ...alingCollisionSpiCustomTopologySelfTest.java |   2 +-
 .../GridJobStealingCollisionSpiSelfTest.java    |   2 +-
 ...obStealingCollisionSpiStartStopSelfTest.java |   2 +-
 .../GridAbstractCommunicationSelfTest.java      |   2 +-
 ...cpCommunicationSpiMultithreadedSelfTest.java |   2 +-
 ...idJobStealingFailoverSpiOneNodeSelfTest.java |   4 +-
 .../GridJobStealingFailoverSpiSelfTest.java     |   2 +-
 ...JobStealingFailoverSpiStartStopSelfTest.java |   2 +-
 .../ignite/testframework/GridTestNode.java      |   4 +-
 .../junits/common/GridCommonAbstractTest.java   |   2 +-
 .../junits/spi/GridSpiAbstractTest.java         |   2 +-
 .../util/GridTopologyHeapSizeSelfTest.java      |   2 +-
 .../http/jetty/GridJettyRestProtocol.java       |   6 +-
 .../visor/commands/kill/VisorKillCommand.scala  |   2 +-
 .../visor/commands/node/VisorNodeCommand.scala  |   2 +-
 .../commands/top/VisorTopologyCommand.scala     |   2 +-
 .../visor/commands/vvm/VisorVvmCommand.scala    |   2 +-
 .../scala/org/apache/ignite/visor/visor.scala   |   2 +-
 53 files changed, 226 insertions(+), 227 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c21ba6/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientTcpConnectivitySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientTcpConnectivitySelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientTcpConnectivitySelfTest.java
index ae3d4ff..69082de 100644
--- a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientTcpConnectivitySelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientTcpConnectivitySelfTest.java
@@ -55,17 +55,17 @@ public class ClientTcpConnectivitySelfTest extends ClientAbstractConnectivitySel
 
     /** {@inheritDoc} */
     @Override protected String restAddressAttributeName() {
-        return GridNodeAttributes.ATTR_REST_TCP_ADDRS;
+        return IgniteNodeAttributes.ATTR_REST_TCP_ADDRS;
     }
 
     /** {@inheritDoc} */
     @Override protected String restHostNameAttributeName() {
-        return GridNodeAttributes.ATTR_REST_TCP_HOST_NAMES;
+        return IgniteNodeAttributes.ATTR_REST_TCP_HOST_NAMES;
     }
 
     /** {@inheritDoc} */
     @Override protected String restPortAttributeName() {
-        return GridNodeAttributes.ATTR_REST_TCP_PORT;
+        return IgniteNodeAttributes.ATTR_REST_TCP_PORT;
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c21ba6/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/CacheRendezvousAffinityFunction.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/CacheRendezvousAffinityFunction.java b/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/CacheRendezvousAffinityFunction.java
index f86c41c..6e3e811 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/CacheRendezvousAffinityFunction.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/CacheRendezvousAffinityFunction.java
@@ -446,7 +446,7 @@ public class CacheRendezvousAffinityFunction implements CacheAffinityFunction, E
 
         // Group by mac addresses.
         for (ClusterNode node : topSnapshot) {
-            String macs = node.attribute(GridNodeAttributes.ATTR_MACS);
+            String macs = node.attribute(IgniteNodeAttributes.ATTR_MACS);
 
             Collection<ClusterNode> nodes = macMap.get(macs);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c21ba6/modules/core/src/main/java/org/apache/ignite/client/impl/GridClientComputeImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/client/impl/GridClientComputeImpl.java b/modules/core/src/main/java/org/apache/ignite/client/impl/GridClientComputeImpl.java
index 83fe893..1dadc1f 100644
--- a/modules/core/src/main/java/org/apache/ignite/client/impl/GridClientComputeImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/client/impl/GridClientComputeImpl.java
@@ -26,7 +26,7 @@ import org.jetbrains.annotations.*;
 import java.util.*;
 
 import static org.apache.ignite.client.util.GridClientUtils.*;
-import static org.apache.ignite.internal.GridNodeAttributes.*;
+import static org.apache.ignite.internal.IgniteNodeAttributes.*;
 
 /**
  * Compute projection implementation.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c21ba6/modules/core/src/main/java/org/apache/ignite/client/impl/GridClientImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/client/impl/GridClientImpl.java b/modules/core/src/main/java/org/apache/ignite/client/impl/GridClientImpl.java
index 027f18f..8f64a79 100644
--- a/modules/core/src/main/java/org/apache/ignite/client/impl/GridClientImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/client/impl/GridClientImpl.java
@@ -34,7 +34,7 @@ import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
 import java.util.logging.*;
 
-import static org.apache.ignite.internal.GridNodeAttributes.*;
+import static org.apache.ignite.internal.IgniteNodeAttributes.*;
 
 /**
  * Client implementation.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c21ba6/modules/core/src/main/java/org/apache/ignite/client/impl/connection/GridClientConnectionManagerAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/client/impl/connection/GridClientConnectionManagerAdapter.java b/modules/core/src/main/java/org/apache/ignite/client/impl/connection/GridClientConnectionManagerAdapter.java
index 2e6ca2b..d6ad676 100644
--- a/modules/core/src/main/java/org/apache/ignite/client/impl/connection/GridClientConnectionManagerAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/client/impl/connection/GridClientConnectionManagerAdapter.java
@@ -41,7 +41,7 @@ import java.util.logging.*;
 
 import static java.util.logging.Level.*;
 import static org.apache.ignite.client.impl.connection.GridClientConnectionCloseReason.*;
-import static org.apache.ignite.internal.GridNodeAttributes.*;
+import static org.apache.ignite.internal.IgniteNodeAttributes.*;
 
 /**
  * Cached connections manager.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c21ba6/modules/core/src/main/java/org/apache/ignite/client/impl/connection/GridClientTopology.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/client/impl/connection/GridClientTopology.java b/modules/core/src/main/java/org/apache/ignite/client/impl/connection/GridClientTopology.java
index ed81783..17b586d 100644
--- a/modules/core/src/main/java/org/apache/ignite/client/impl/connection/GridClientTopology.java
+++ b/modules/core/src/main/java/org/apache/ignite/client/impl/connection/GridClientTopology.java
@@ -29,7 +29,7 @@ import java.util.concurrent.*;
 import java.util.concurrent.locks.*;
 import java.util.logging.*;
 
-import static org.apache.ignite.internal.GridNodeAttributes.*;
+import static org.apache.ignite.internal.IgniteNodeAttributes.*;
 
 /**
  * Client topology cache.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c21ba6/modules/core/src/main/java/org/apache/ignite/cluster/ClusterNode.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cluster/ClusterNode.java b/modules/core/src/main/java/org/apache/ignite/cluster/ClusterNode.java
index eb4a69b..77b5bf7 100644
--- a/modules/core/src/main/java/org/apache/ignite/cluster/ClusterNode.java
+++ b/modules/core/src/main/java/org/apache/ignite/cluster/ClusterNode.java
@@ -18,7 +18,6 @@
 package org.apache.ignite.cluster;
 
 import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
 import org.apache.ignite.lang.*;
 import org.jetbrains.annotations.*;
 
@@ -130,7 +129,7 @@ public interface ClusterNode {
      * <ul>
      * <li>{@code {@link System#getProperties()}} - All system properties.</li>
      * <li>{@code {@link System#getenv(String)}} - All environment properties.</li>
-     * <li>All attributes defined in {@link GridNodeAttributes}</li>
+     * <li>All attributes defined in {@link org.apache.ignite.internal.IgniteNodeAttributes}</li>
      * </ul>
      * <p>
      * Note that attributes cannot be changed at runtime.
@@ -165,7 +164,7 @@ public interface ClusterNode {
      * <ul>
      * <li>{@code {@link System#getProperties()}} - All system properties.</li>
      * <li>{@code {@link System#getenv(String)}} - All environment properties.</li>
-     * <li>All attributes defined in {@link GridNodeAttributes}</li>
+     * <li>All attributes defined in {@link org.apache.ignite.internal.IgniteNodeAttributes}</li>
      * </ul>
      * <p>
      * Note that attributes cannot be changed at runtime.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c21ba6/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 8b8de37..a8a6190 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
@@ -31,7 +31,7 @@ import java.io.*;
 import java.util.*;
 import java.util.concurrent.*;
 
-import static org.apache.ignite.internal.GridNodeAttributes.*;
+import static org.apache.ignite.internal.IgniteNodeAttributes.*;
 
 /**
  *

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c21ba6/modules/core/src/main/java/org/apache/ignite/internal/GridKillTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKillTask.java b/modules/core/src/main/java/org/apache/ignite/internal/GridKillTask.java
index 0d56fb5..743c0d6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridKillTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKillTask.java
@@ -25,7 +25,7 @@ import org.apache.ignite.internal.util.typedef.internal.*;
 
 import java.util.*;
 
-import static org.apache.ignite.internal.GridNodeAttributes.*;
+import static org.apache.ignite.internal.IgniteNodeAttributes.*;
 
 /**
  * Special kill task that never fails over jobs.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c21ba6/modules/core/src/main/java/org/apache/ignite/internal/GridNodeAttributes.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridNodeAttributes.java b/modules/core/src/main/java/org/apache/ignite/internal/GridNodeAttributes.java
deleted file mode 100644
index da96b45..0000000
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridNodeAttributes.java
+++ /dev/null
@@ -1,145 +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;
-
-/**
- * This class defines constants (NOT enums) for <b>internally-used</b> node attributes.
- */
-public final class GridNodeAttributes {
-    /** Prefix for internally reserved attribute names. */
-    public static final String ATTR_PREFIX = "org.gridgain";
-
-    /** Node compound version. */
-    public static final String ATTR_BUILD_VER = ATTR_PREFIX + ".build.ver";
-
-    /** Internal attribute name constant. */
-    public static final String ATTR_BUILD_DATE = ATTR_PREFIX + ".build.date";
-
-    /** Internal attribute name constant. */
-    public static final String ATTR_COMPATIBLE_VERS = ATTR_PREFIX + ".compatible.vers";
-
-    /** Internal attribute name constant. */
-    public static final String ATTR_MARSHALLER = ATTR_PREFIX + ".marshaller";
-
-    /** Internal attribute name constant. */
-    public static final String ATTR_JIT_NAME = ATTR_PREFIX + ".jit.name";
-
-    /** Internal attribute name constant. */
-    public static final String ATTR_LANG_RUNTIME = ATTR_PREFIX + ".lang.rt";
-
-    /** Internal attribute name constant. */
-    public static final String ATTR_USER_NAME = ATTR_PREFIX + ".user.name";
-
-    /** Internal attribute name constant. */
-    public static final String ATTR_GRID_NAME = ATTR_PREFIX + ".grid.name";
-
-    /** Deployment mode. */
-    public static final String ATTR_DEPLOYMENT_MODE = ATTR_PREFIX + ".grid.dep.mode";
-
-    /** Peer classloading enabled flag. */
-    public static final String ATTR_PEER_CLASSLOADING = ATTR_PREFIX + ".peer.classloading.enabled";
-
-    /** Internal attribute name postfix constant. */
-    public static final String ATTR_SPI_CLASS = ATTR_PREFIX + ".spi.class";
-
-    /** Internal attribute name constant. */
-    public static final String ATTR_CACHE = ATTR_PREFIX + ".cache";
-
-    /** Internal attribute name constant. */
-    public static final String ATTR_TX_CONFIG = ATTR_PREFIX + ".tx";
-
-    /** Internal attribute name constant. */
-    @Deprecated
-    public static final String ATTR_CACHE_PORTABLE = ATTR_PREFIX + ".cache.portable";
-
-    /** Internal attribute name constant. */
-    public static final String ATTR_GGFS = ATTR_PREFIX + ".ggfs";
-
-    /** Internal attribute name constant. */
-    public static final String ATTR_MONGO = ATTR_PREFIX + ".mongo";
-
-    /** Internal attribute name constant. */
-    public static final String ATTR_DAEMON = ATTR_PREFIX + ".daemon";
-
-    /** Internal attribute name constant. */
-    public static final String ATTR_JMX_PORT = ATTR_PREFIX + ".jmx.port";
-
-    /** Internal attribute name constant. */
-    public static final String ATTR_RESTART_ENABLED = ATTR_PREFIX + ".restart.enabled";
-
-    /** Internal attribute name constant. */
-    public static final String ATTR_REST_TCP_ADDRS = ATTR_PREFIX + ".rest.tcp.addrs";
-
-    /** Internal attribute name constant. */
-    public static final String ATTR_REST_TCP_HOST_NAMES = ATTR_PREFIX + ".rest.tcp.host.names";
-
-    /** Internal attribute name constant. */
-    public static final String ATTR_REST_TCP_PORT = ATTR_PREFIX + ".rest.tcp.port";
-
-    /** Internal attribute name constant */
-    public static final String ATTR_REST_PORT_RANGE = ATTR_PREFIX + ".rest.port.range";
-
-    /** Internal attribute name constant */
-    public static final String ATTR_REST_JETTY_ADDRS = ATTR_PREFIX + ".rest.jetty.addrs";
-
-    /** Internal attribute name constant */
-    public static final String ATTR_REST_JETTY_HOST_NAMES = ATTR_PREFIX + ".rest.jetty.host.names";
-
-    /** Internal attribute name constant */
-    public static final String ATTR_REST_JETTY_PORT = ATTR_PREFIX + ".rest.jetty.port";
-
-    /** Internal attribute name constant. */
-    public static final String ATTR_IPS = ATTR_PREFIX + ".ips";
-
-    /** Internal attribute name constant. */
-    public static final String ATTR_MACS = ATTR_PREFIX + ".macs";
-
-    /** Internal attribute name constant. */
-    public static final String ATTR_PHY_RAM = ATTR_PREFIX + ".phy.ram";
-
-    /** Internal attribute name constant. */
-    public static final String ATTR_JVM_PID = ATTR_PREFIX + ".jvm.pid";
-
-    /** Internal attribute name constant. */
-    public static final String ATTR_JVM_ARGS = ATTR_PREFIX + ".jvm.args";
-
-    /** Internal attribute name constant. */
-    public static final String ATTR_STREAMER = ATTR_PREFIX + ".streamer";
-
-    /** Time server host attribute name. */
-    public static final String ATTR_TIME_SERVER_HOST = ATTR_PREFIX + ".time.host";
-
-    /** Time server port attribute name. */
-    public static final String ATTR_TIME_SERVER_PORT = ATTR_PREFIX + ".time.port";
-
-    /** Security credentials attribute name. Attribute is not available via public API. */
-    public static final String ATTR_SECURITY_CREDENTIALS = ATTR_PREFIX + ".security.cred";
-
-    /** Security subject for authenticated node. */
-    public static final String ATTR_SECURITY_SUBJECT = ATTR_PREFIX + ".security.subject";
-
-    /** Cache interceptors. */
-    public static final String ATTR_CACHE_INTERCEPTORS = ATTR_PREFIX + ".cache.interceptors";
-
-    /**
-     * Enforces singleton.
-     */
-    private GridNodeAttributes() {
-        /* No-op. */
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c21ba6/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index c348f51..c123b5f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -93,7 +93,7 @@ import java.util.concurrent.atomic.*;
 
 import static org.apache.ignite.IgniteSystemProperties.*;
 import static org.apache.ignite.internal.GridKernalState.*;
-import static org.apache.ignite.internal.GridNodeAttributes.*;
+import static org.apache.ignite.internal.IgniteNodeAttributes.*;
 import static org.apache.ignite.internal.GridProductImpl.*;
 import static org.apache.ignite.internal.IgniteComponentType.*;
 import static org.apache.ignite.internal.processors.license.GridLicenseSubsystem.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c21ba6/modules/core/src/main/java/org/apache/ignite/internal/IgniteNodeAttributes.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteNodeAttributes.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteNodeAttributes.java
new file mode 100644
index 0000000..4cec356
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteNodeAttributes.java
@@ -0,0 +1,145 @@
+/*
+ * 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;
+
+/**
+ * This class defines constants (NOT enums) for <b>internally-used</b> node attributes.
+ */
+public final class IgniteNodeAttributes {
+    /** Prefix for internally reserved attribute names. */
+    public static final String ATTR_PREFIX = "org.gridgain";
+
+    /** Node compound version. */
+    public static final String ATTR_BUILD_VER = ATTR_PREFIX + ".build.ver";
+
+    /** Internal attribute name constant. */
+    public static final String ATTR_BUILD_DATE = ATTR_PREFIX + ".build.date";
+
+    /** Internal attribute name constant. */
+    public static final String ATTR_COMPATIBLE_VERS = ATTR_PREFIX + ".compatible.vers";
+
+    /** Internal attribute name constant. */
+    public static final String ATTR_MARSHALLER = ATTR_PREFIX + ".marshaller";
+
+    /** Internal attribute name constant. */
+    public static final String ATTR_JIT_NAME = ATTR_PREFIX + ".jit.name";
+
+    /** Internal attribute name constant. */
+    public static final String ATTR_LANG_RUNTIME = ATTR_PREFIX + ".lang.rt";
+
+    /** Internal attribute name constant. */
+    public static final String ATTR_USER_NAME = ATTR_PREFIX + ".user.name";
+
+    /** Internal attribute name constant. */
+    public static final String ATTR_GRID_NAME = ATTR_PREFIX + ".grid.name";
+
+    /** Deployment mode. */
+    public static final String ATTR_DEPLOYMENT_MODE = ATTR_PREFIX + ".grid.dep.mode";
+
+    /** Peer classloading enabled flag. */
+    public static final String ATTR_PEER_CLASSLOADING = ATTR_PREFIX + ".peer.classloading.enabled";
+
+    /** Internal attribute name postfix constant. */
+    public static final String ATTR_SPI_CLASS = ATTR_PREFIX + ".spi.class";
+
+    /** Internal attribute name constant. */
+    public static final String ATTR_CACHE = ATTR_PREFIX + ".cache";
+
+    /** Internal attribute name constant. */
+    public static final String ATTR_TX_CONFIG = ATTR_PREFIX + ".tx";
+
+    /** Internal attribute name constant. */
+    @Deprecated
+    public static final String ATTR_CACHE_PORTABLE = ATTR_PREFIX + ".cache.portable";
+
+    /** Internal attribute name constant. */
+    public static final String ATTR_GGFS = ATTR_PREFIX + ".ggfs";
+
+    /** Internal attribute name constant. */
+    public static final String ATTR_MONGO = ATTR_PREFIX + ".mongo";
+
+    /** Internal attribute name constant. */
+    public static final String ATTR_DAEMON = ATTR_PREFIX + ".daemon";
+
+    /** Internal attribute name constant. */
+    public static final String ATTR_JMX_PORT = ATTR_PREFIX + ".jmx.port";
+
+    /** Internal attribute name constant. */
+    public static final String ATTR_RESTART_ENABLED = ATTR_PREFIX + ".restart.enabled";
+
+    /** Internal attribute name constant. */
+    public static final String ATTR_REST_TCP_ADDRS = ATTR_PREFIX + ".rest.tcp.addrs";
+
+    /** Internal attribute name constant. */
+    public static final String ATTR_REST_TCP_HOST_NAMES = ATTR_PREFIX + ".rest.tcp.host.names";
+
+    /** Internal attribute name constant. */
+    public static final String ATTR_REST_TCP_PORT = ATTR_PREFIX + ".rest.tcp.port";
+
+    /** Internal attribute name constant */
+    public static final String ATTR_REST_PORT_RANGE = ATTR_PREFIX + ".rest.port.range";
+
+    /** Internal attribute name constant */
+    public static final String ATTR_REST_JETTY_ADDRS = ATTR_PREFIX + ".rest.jetty.addrs";
+
+    /** Internal attribute name constant */
+    public static final String ATTR_REST_JETTY_HOST_NAMES = ATTR_PREFIX + ".rest.jetty.host.names";
+
+    /** Internal attribute name constant */
+    public static final String ATTR_REST_JETTY_PORT = ATTR_PREFIX + ".rest.jetty.port";
+
+    /** Internal attribute name constant. */
+    public static final String ATTR_IPS = ATTR_PREFIX + ".ips";
+
+    /** Internal attribute name constant. */
+    public static final String ATTR_MACS = ATTR_PREFIX + ".macs";
+
+    /** Internal attribute name constant. */
+    public static final String ATTR_PHY_RAM = ATTR_PREFIX + ".phy.ram";
+
+    /** Internal attribute name constant. */
+    public static final String ATTR_JVM_PID = ATTR_PREFIX + ".jvm.pid";
+
+    /** Internal attribute name constant. */
+    public static final String ATTR_JVM_ARGS = ATTR_PREFIX + ".jvm.args";
+
+    /** Internal attribute name constant. */
+    public static final String ATTR_STREAMER = ATTR_PREFIX + ".streamer";
+
+    /** Time server host attribute name. */
+    public static final String ATTR_TIME_SERVER_HOST = ATTR_PREFIX + ".time.host";
+
+    /** Time server port attribute name. */
+    public static final String ATTR_TIME_SERVER_PORT = ATTR_PREFIX + ".time.port";
+
+    /** Security credentials attribute name. Attribute is not available via public API. */
+    public static final String ATTR_SECURITY_CREDENTIALS = ATTR_PREFIX + ".security.cred";
+
+    /** Security subject for authenticated node. */
+    public static final String ATTR_SECURITY_SUBJECT = ATTR_PREFIX + ".security.subject";
+
+    /** Cache interceptors. */
+    public static final String ATTR_CACHE_INTERCEPTORS = ATTR_PREFIX + ".cache.interceptors";
+
+    /**
+     * Enforces singleton.
+     */
+    private IgniteNodeAttributes() {
+        /* No-op. */
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c21ba6/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
index 7b4f4be..7d51c17 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
@@ -53,7 +53,7 @@ import java.util.zip.*;
 
 import static java.util.concurrent.TimeUnit.*;
 import static org.apache.ignite.events.IgniteEventType.*;
-import static org.apache.ignite.internal.GridNodeAttributes.*;
+import static org.apache.ignite.internal.IgniteNodeAttributes.*;
 import static org.apache.ignite.plugin.segmentation.GridSegmentationPolicy.*;
 
 /**
@@ -207,7 +207,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
             // No-op.
         }
 
-        attrs.put(GridNodeAttributes.ATTR_PHY_RAM, totSysMemory);
+        attrs.put(IgniteNodeAttributes.ATTR_PHY_RAM, totSysMemory);
 
         getSpi().setNodeAttributes(attrs, ver);
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c21ba6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index b1abc8e..3b665c6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@ -63,7 +63,7 @@ import static org.apache.ignite.cache.CacheMode.*;
 import static org.apache.ignite.cache.CachePreloadMode.*;
 import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
 import static org.apache.ignite.configuration.IgniteDeploymentMode.*;
-import static org.apache.ignite.internal.GridNodeAttributes.*;
+import static org.apache.ignite.internal.IgniteNodeAttributes.*;
 import static org.apache.ignite.internal.IgniteComponentType.*;
 import static org.apache.ignite.internal.processors.cache.GridCacheUtils.*;
 import static org.apache.ignite.transactions.IgniteTxIsolation.*;
@@ -1067,7 +1067,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
             return;
 
         IgniteDeploymentMode locDepMode = ctx.config().getDeploymentMode();
-        IgniteDeploymentMode rmtDepMode = rmt.attribute(GridNodeAttributes.ATTR_DEPLOYMENT_MODE);
+        IgniteDeploymentMode rmtDepMode = rmt.attribute(IgniteNodeAttributes.ATTR_DEPLOYMENT_MODE);
 
         for (GridCacheAttributes rmtAttr : rmtAttrs) {
             for (GridCacheAttributes locAttr : locAttrs) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c21ba6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
index 5fac8f0..43de1f9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
@@ -50,7 +50,7 @@ import static org.apache.ignite.cache.CacheMode.*;
 import static org.apache.ignite.cache.CachePreloadMode.*;
 import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
 import static org.apache.ignite.cache.GridCachePeekMode.*;
-import static org.apache.ignite.internal.GridNodeAttributes.*;
+import static org.apache.ignite.internal.IgniteNodeAttributes.*;
 import static org.apache.ignite.internal.GridTopic.*;
 import static org.apache.ignite.internal.processors.cache.GridCacheOperation.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c21ba6/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockSyncProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockSyncProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockSyncProcessor.java
index 911479a..2166868 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockSyncProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockSyncProcessor.java
@@ -34,7 +34,7 @@ import java.net.*;
 import java.util.*;
 
 import static org.apache.ignite.events.IgniteEventType.*;
-import static org.apache.ignite.internal.GridNodeAttributes.*;
+import static org.apache.ignite.internal.IgniteNodeAttributes.*;
 import static org.apache.ignite.internal.GridTopic.*;
 import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c21ba6/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataLoaderImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataLoaderImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataLoaderImpl.java
index 462cf8e..1f75340 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataLoaderImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataLoaderImpl.java
@@ -46,7 +46,7 @@ import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
 
 import static org.apache.ignite.events.IgniteEventType.*;
-import static org.apache.ignite.internal.GridNodeAttributes.*;
+import static org.apache.ignite.internal.IgniteNodeAttributes.*;
 import static org.apache.ignite.internal.GridTopic.*;
 import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c21ba6/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsContext.java
index 6057e7a..8cf34d8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsContext.java
@@ -27,7 +27,7 @@ import org.jetbrains.annotations.*;
 
 import java.util.*;
 
-import static org.apache.ignite.internal.GridNodeAttributes.*;
+import static org.apache.ignite.internal.IgniteNodeAttributes.*;
 
 /**
  * GGFS context holding all required components for GGFS instance.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c21ba6/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsImpl.java
index a548358..9da410c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsImpl.java
@@ -47,7 +47,7 @@ import java.util.concurrent.atomic.*;
 
 import static org.apache.ignite.events.IgniteEventType.*;
 import static org.apache.ignite.fs.IgniteFsMode.*;
-import static org.apache.ignite.internal.GridNodeAttributes.*;
+import static org.apache.ignite.internal.IgniteNodeAttributes.*;
 import static org.apache.ignite.internal.GridTopic.*;
 import static org.apache.ignite.internal.processors.fs.GridGgfsFileInfo.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c21ba6/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgniteFsProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgniteFsProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgniteFsProcessor.java
index a9fc9a4..acc0b68 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgniteFsProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgniteFsProcessor.java
@@ -43,7 +43,7 @@ import static org.apache.ignite.IgniteSystemProperties.*;
 import static org.apache.ignite.cache.CacheMemoryMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
 import static org.apache.ignite.fs.IgniteFsMode.*;
-import static org.apache.ignite.internal.GridNodeAttributes.*;
+import static org.apache.ignite.internal.IgniteNodeAttributes.*;
 import static org.apache.ignite.internal.processors.license.GridLicenseSubsystem.*;
 
 /**
@@ -390,8 +390,8 @@ public class IgniteFsProcessor extends IgniteFsProcessorAdapter {
      * @throws IgniteCheckedException If check failed.
      */
     private void checkGgfsOnRemoteNode(ClusterNode rmtNode) throws IgniteCheckedException {
-        GridGgfsAttributes[] locAttrs = ctx.discovery().localNode().attribute(GridNodeAttributes.ATTR_GGFS);
-        GridGgfsAttributes[] rmtAttrs = rmtNode.attribute(GridNodeAttributes.ATTR_GGFS);
+        GridGgfsAttributes[] locAttrs = ctx.discovery().localNode().attribute(IgniteNodeAttributes.ATTR_GGFS);
+        GridGgfsAttributes[] rmtAttrs = rmtNode.attribute(IgniteNodeAttributes.ATTR_GGFS);
 
         if (F.isEmpty(locAttrs) || F.isEmpty(rmtAttrs))
             return;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c21ba6/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/top/GridTopologyCommandHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/top/GridTopologyCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/top/GridTopologyCommandHandler.java
index 2d2d9207..5d184b3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/top/GridTopologyCommandHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/top/GridTopologyCommandHandler.java
@@ -35,7 +35,7 @@ import org.apache.ignite.spi.*;
 import java.net.*;
 import java.util.*;
 
-import static org.apache.ignite.internal.GridNodeAttributes.*;
+import static org.apache.ignite.internal.IgniteNodeAttributes.*;
 import static org.apache.ignite.internal.processors.rest.GridRestCommand.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c21ba6/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestProtocol.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestProtocol.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestProtocol.java
index 9656937..856a1a5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestProtocol.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestProtocol.java
@@ -320,16 +320,16 @@ public class GridTcpRestProtocol extends GridRestProtocolAdapter {
 
     /** {@inheritDoc} */
     @Override protected String getAddressPropertyName() {
-        return GridNodeAttributes.ATTR_REST_TCP_ADDRS;
+        return IgniteNodeAttributes.ATTR_REST_TCP_ADDRS;
     }
 
     /** {@inheritDoc} */
     @Override protected String getHostNamePropertyName() {
-        return GridNodeAttributes.ATTR_REST_TCP_HOST_NAMES;
+        return IgniteNodeAttributes.ATTR_REST_TCP_HOST_NAMES;
     }
 
     /** {@inheritDoc} */
     @Override protected String getPortPropertyName() {
-        return GridNodeAttributes.ATTR_REST_TCP_PORT;
+        return IgniteNodeAttributes.ATTR_REST_TCP_PORT;
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c21ba6/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamProcessor.java
index 8733b01..50961da 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamProcessor.java
@@ -33,7 +33,7 @@ import javax.management.*;
 import java.util.*;
 
 import static org.apache.ignite.IgniteSystemProperties.*;
-import static org.apache.ignite.internal.GridNodeAttributes.*;
+import static org.apache.ignite.internal.IgniteNodeAttributes.*;
 import static org.apache.ignite.internal.processors.license.GridLicenseSubsystem.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c21ba6/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index 7538f12..fc4de8c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -80,7 +80,7 @@ import java.util.zip.*;
 
 import static org.apache.ignite.IgniteSystemProperties.*;
 import static org.apache.ignite.events.IgniteEventType.*;
-import static org.apache.ignite.internal.GridNodeAttributes.*;
+import static org.apache.ignite.internal.IgniteNodeAttributes.*;
 
 /**
  * Collection of utility methods used throughout the system.
@@ -1718,8 +1718,8 @@ public abstract class IgniteUtils {
         assert loc != null;
         assert rmt != null;
 
-        String locMacs = loc.attribute(GridNodeAttributes.ATTR_MACS);
-        String rmtMacs = rmt.attribute(GridNodeAttributes.ATTR_MACS);
+        String locMacs = loc.attribute(IgniteNodeAttributes.ATTR_MACS);
+        String rmtMacs = rmt.attribute(IgniteNodeAttributes.ATTR_MACS);
 
         return locMacs != null && locMacs.equals(rmtMacs);
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c21ba6/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
index 392394c..c9cfa72 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
@@ -424,7 +424,7 @@ public abstract class IgniteSpiAdapter implements IgniteSpi, IgniteSpiManagement
         if (!enabled)
             return;
 
-        String clsAttr = createSpiAttributeName(GridNodeAttributes.ATTR_SPI_CLASS);
+        String clsAttr = createSpiAttributeName(IgniteNodeAttributes.ATTR_SPI_CLASS);
 
         String name = getName();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c21ba6/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
index e1f3555..d57760a 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
@@ -46,7 +46,7 @@ import java.util.*;
 import java.util.concurrent.*;
 
 import static org.apache.ignite.events.IgniteEventType.*;
-import static org.apache.ignite.internal.GridNodeAttributes.*;
+import static org.apache.ignite.internal.IgniteNodeAttributes.*;
 import static org.apache.ignite.spi.IgnitePortProtocol.*;
 import static org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoverySpiState.*;
 import static org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryHeartbeatMessage.*;
@@ -1259,7 +1259,7 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
         }
 
         GridSecurityCredentials locCred = (GridSecurityCredentials)locNode.getAttributes()
-            .get(GridNodeAttributes.ATTR_SECURITY_CREDENTIALS);
+            .get(IgniteNodeAttributes.ATTR_SECURITY_CREDENTIALS);
 
         // Marshal credentials for backward compatibility and security.
         marshalCredentials(locNode);
@@ -1278,9 +1278,9 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
 
                     Map<String, Object> attrs = new HashMap<>(locNode.attributes());
 
-                    attrs.put(GridNodeAttributes.ATTR_SECURITY_SUBJECT,
+                    attrs.put(IgniteNodeAttributes.ATTR_SECURITY_SUBJECT,
                         ignite.configuration().getMarshaller().marshal(subj));
-                    attrs.remove(GridNodeAttributes.ATTR_SECURITY_CREDENTIALS);
+                    attrs.remove(IgniteNodeAttributes.ATTR_SECURITY_CREDENTIALS);
 
                     locNode.setAttributes(attrs);
                 }
@@ -1666,8 +1666,8 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
             // Use security-unsafe getter.
             Map<String, Object> attrs = new HashMap<>(node.getAttributes());
 
-            attrs.put(GridNodeAttributes.ATTR_SECURITY_CREDENTIALS,
-                marsh.marshal(attrs.get(GridNodeAttributes.ATTR_SECURITY_CREDENTIALS)));
+            attrs.put(IgniteNodeAttributes.ATTR_SECURITY_CREDENTIALS,
+                marsh.marshal(attrs.get(IgniteNodeAttributes.ATTR_SECURITY_CREDENTIALS)));
 
             node.setAttributes(attrs);
         }
@@ -1685,7 +1685,7 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
      */
     private GridSecurityCredentials unmarshalCredentials(TcpDiscoveryNode node) throws IgniteSpiException {
         try {
-            byte[] credBytes = (byte[])node.getAttributes().get(GridNodeAttributes.ATTR_SECURITY_CREDENTIALS);
+            byte[] credBytes = (byte[])node.getAttributes().get(IgniteNodeAttributes.ATTR_SECURITY_CREDENTIALS);
 
             if (credBytes == null)
                 return null;
@@ -3149,7 +3149,7 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
                         // Stick in authentication subject to node (use security-safe attributes for copy).
                         Map<String, Object> attrs = new HashMap<>(node.getAttributes());
 
-                        attrs.put(GridNodeAttributes.ATTR_SECURITY_SUBJECT,
+                        attrs.put(IgniteNodeAttributes.ATTR_SECURITY_SUBJECT,
                             ignite.configuration().getMarshaller().marshal(subj));
 
                         node.setAttributes(attrs);
@@ -3590,7 +3590,7 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
                             GridSecurityContext subj = nodeAuth.authenticateNode(node, cred);
 
                             GridSecurityContext coordSubj = ignite.configuration().getMarshaller().unmarshal(
-                                node.<byte[]>attribute(GridNodeAttributes.ATTR_SECURITY_SUBJECT), U.gridClassLoader());
+                                node.<byte[]>attribute(IgniteNodeAttributes.ATTR_SECURITY_SUBJECT), U.gridClassLoader());
 
                             if (!permissionsEqual(coordSubj.subject().permissions(), subj.subject().permissions())) {
                                 // Node has not pass authentication.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c21ba6/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java
index 0784f08..dfb30b7 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java
@@ -31,7 +31,7 @@ import java.io.*;
 import java.net.*;
 import java.util.*;
 
-import static org.apache.ignite.internal.GridNodeAttributes.*;
+import static org.apache.ignite.internal.IgniteNodeAttributes.*;
 
 /**
  * Node for {@link org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi}.
@@ -156,7 +156,7 @@ public class TcpDiscoveryNode extends GridMetadataAwareAdapter implements Cluste
     @SuppressWarnings("unchecked")
     @Override public <T> T attribute(String name) {
         // Even though discovery SPI removes this attribute after authentication, keep this check for safety.
-        if (GridNodeAttributes.ATTR_SECURITY_CREDENTIALS.equals(name))
+        if (IgniteNodeAttributes.ATTR_SECURITY_CREDENTIALS.equals(name))
             return null;
 
         return (T)attrs.get(name);
@@ -167,7 +167,7 @@ public class TcpDiscoveryNode extends GridMetadataAwareAdapter implements Cluste
         // Even though discovery SPI removes this attribute after authentication, keep this check for safety.
         return F.view(attrs, new IgnitePredicate<String>() {
             @Override public boolean apply(String s) {
-                return !GridNodeAttributes.ATTR_SECURITY_CREDENTIALS.equals(s);
+                return !IgniteNodeAttributes.ATTR_SECURITY_CREDENTIALS.equals(s);
             }
         });
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c21ba6/modules/core/src/test/java/org/apache/ignite/internal/GridFailoverTaskWithPredicateSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridFailoverTaskWithPredicateSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridFailoverTaskWithPredicateSelfTest.java
index fd8fe97..612319d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridFailoverTaskWithPredicateSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridFailoverTaskWithPredicateSelfTest.java
@@ -49,7 +49,7 @@ public class GridFailoverTaskWithPredicateSelfTest extends GridCommonAbstractTes
     /** Predicate to exclude the second node from topology */
     private final IgnitePredicate<ClusterNode> p = new IgnitePredicate<ClusterNode>() {
         @Override public boolean apply(ClusterNode e) {
-            return !NODE2.equals(e.attribute(GridNodeAttributes.ATTR_GRID_NAME));
+            return !NODE2.equals(e.attribute(IgniteNodeAttributes.ATTR_GRID_NAME));
         }
     };
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c21ba6/modules/core/src/test/java/org/apache/ignite/internal/GridReleaseTypeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridReleaseTypeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridReleaseTypeSelfTest.java
index 158491b..a2bb7f0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridReleaseTypeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridReleaseTypeSelfTest.java
@@ -57,9 +57,9 @@ public class GridReleaseTypeSelfTest extends GridCommonAbstractTest {
                 super.setNodeAttributes(attrs, ver);
 
                 if (idx % 2 == 0)
-                    attrs.put(GridNodeAttributes.ATTR_BUILD_VER, firstNodeVer);
+                    attrs.put(IgniteNodeAttributes.ATTR_BUILD_VER, firstNodeVer);
                 else
-                    attrs.put(GridNodeAttributes.ATTR_BUILD_VER, secondNodeVer);
+                    attrs.put(IgniteNodeAttributes.ATTR_BUILD_VER, secondNodeVer);
             }
         };
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c21ba6/modules/core/src/test/java/org/apache/ignite/internal/GridTopologyBuildVersionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridTopologyBuildVersionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridTopologyBuildVersionSelfTest.java
index 4021ef3..556135f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridTopologyBuildVersionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridTopologyBuildVersionSelfTest.java
@@ -54,14 +54,14 @@ public class GridTopologyBuildVersionSelfTest extends GridCommonAbstractTest {
             @Override public void setNodeAttributes(Map<String, Object> attrs, IgniteProductVersion ver) {
                 super.setNodeAttributes(attrs, ver);
 
-                attrs.put(GridNodeAttributes.ATTR_BUILD_VER, idx + ".0.0" + "-ent");
+                attrs.put(IgniteNodeAttributes.ATTR_BUILD_VER, idx + ".0.0" + "-ent");
 
                 if (idx < 3)
-                    attrs.remove(GridNodeAttributes.ATTR_BUILD_DATE);
+                    attrs.remove(IgniteNodeAttributes.ATTR_BUILD_DATE);
                 else
-                    attrs.put(GridNodeAttributes.ATTR_BUILD_DATE, "1385099743");
+                    attrs.put(IgniteNodeAttributes.ATTR_BUILD_DATE, "1385099743");
 
-                attrs.put(GridNodeAttributes.ATTR_COMPATIBLE_VERS, COMPATIBLE_VERS);
+                attrs.put(IgniteNodeAttributes.ATTR_COMPATIBLE_VERS, COMPATIBLE_VERS);
             }
         };
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c21ba6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueCleanupSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueCleanupSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueCleanupSelfTest.java
index 412f2e4..cae422c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueCleanupSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueCleanupSelfTest.java
@@ -97,7 +97,7 @@ public class GridCacheQueueCleanupSelfTest extends GridCacheAbstractSelfTest {
 
         // Kill node containing queue header.
 
-        final String killGridName = node.attribute(GridNodeAttributes.ATTR_GRID_NAME);
+        final String killGridName = node.attribute(IgniteNodeAttributes.ATTR_GRID_NAME);
 
         stopGrid(killGridName);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c21ba6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java
index e8aeaf7..447abee 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java
@@ -39,7 +39,7 @@ import static org.apache.ignite.cache.CacheDistributionMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
 import static org.apache.ignite.cache.CachePreloadMode.*;
 import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
-import static org.apache.ignite.internal.GridNodeAttributes.*;
+import static org.apache.ignite.internal.IgniteNodeAttributes.*;
 
 /**
  * Tests near cache with various atomic cache configuration.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c21ba6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAffinityFunctionExcludeNeighborsAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAffinityFunctionExcludeNeighborsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAffinityFunctionExcludeNeighborsAbstractSelfTest.java
index fe75028..a7853ab 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAffinityFunctionExcludeNeighborsAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAffinityFunctionExcludeNeighborsAbstractSelfTest.java
@@ -61,7 +61,7 @@ public abstract class GridCacheAffinityFunctionExcludeNeighborsAbstractSelfTest
                 // Set unique mac addresses for every group of three nodes.
                 String macAddrs = "MOCK_MACS_" + (gridInstanceNum / 3);
 
-                attrs.put(GridNodeAttributes.ATTR_MACS, macAddrs);
+                attrs.put(IgniteNodeAttributes.ATTR_MACS, macAddrs);
 
                 gridInstanceNum++;
             }
@@ -152,7 +152,7 @@ public abstract class GridCacheAffinityFunctionExcludeNeighborsAbstractSelfTest
                 Set<String> macs = new HashSet<>();
 
                 for (ClusterNode node : affNodes)
-                    macs.add((String)node.attribute(GridNodeAttributes.ATTR_MACS));
+                    macs.add((String)node.attribute(IgniteNodeAttributes.ATTR_MACS));
 
                 assertEquals(copies, macs.size());
             }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c21ba6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
index 80f8b2a..b97f08d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
@@ -94,7 +94,7 @@ public class GridCacheNearOnlyMultiNodeFullApiSelfTest extends GridCachePartitio
         for (int i = 0; i < gridCount(); i++) {
             ClusterNode node = grid(i).localNode();
 
-            GridCacheAttributes[] nodeAttrs = node.attribute(GridNodeAttributes.ATTR_CACHE);
+            GridCacheAttributes[] nodeAttrs = node.attribute(IgniteNodeAttributes.ATTR_CACHE);
 
             info("Cache attribtues for node [nodeId=" + node.id() + ", attrs=" +
                 Arrays.asList(nodeAttrs) + ']');

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c21ba6/modules/core/src/test/java/org/apache/ignite/spi/collision/jobstealing/GridJobStealingCollisionSpiAttributesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/collision/jobstealing/GridJobStealingCollisionSpiAttributesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/collision/jobstealing/GridJobStealingCollisionSpiAttributesSelfTest.java
index 031c985..c2b9331 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/collision/jobstealing/GridJobStealingCollisionSpiAttributesSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/collision/jobstealing/GridJobStealingCollisionSpiAttributesSelfTest.java
@@ -29,7 +29,7 @@ import org.apache.ignite.testframework.junits.spi.*;
 import java.io.*;
 import java.util.*;
 
-import static org.apache.ignite.internal.GridNodeAttributes.*;
+import static org.apache.ignite.internal.IgniteNodeAttributes.*;
 import static org.apache.ignite.spi.collision.jobstealing.JobStealingCollisionSpi.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c21ba6/modules/core/src/test/java/org/apache/ignite/spi/collision/jobstealing/GridJobStealingCollisionSpiCustomTopologySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/collision/jobstealing/GridJobStealingCollisionSpiCustomTopologySelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/collision/jobstealing/GridJobStealingCollisionSpiCustomTopologySelfTest.java
index 72c9f6e..e36898d 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/collision/jobstealing/GridJobStealingCollisionSpiCustomTopologySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/collision/jobstealing/GridJobStealingCollisionSpiCustomTopologySelfTest.java
@@ -31,7 +31,7 @@ import org.jetbrains.annotations.*;
 import java.io.*;
 import java.util.*;
 
-import static org.apache.ignite.internal.GridNodeAttributes.*;
+import static org.apache.ignite.internal.IgniteNodeAttributes.*;
 import static org.apache.ignite.spi.collision.jobstealing.JobStealingCollisionSpi.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c21ba6/modules/core/src/test/java/org/apache/ignite/spi/collision/jobstealing/GridJobStealingCollisionSpiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/collision/jobstealing/GridJobStealingCollisionSpiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/collision/jobstealing/GridJobStealingCollisionSpiSelfTest.java
index eccb0d2..603c787 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/collision/jobstealing/GridJobStealingCollisionSpiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/collision/jobstealing/GridJobStealingCollisionSpiSelfTest.java
@@ -32,7 +32,7 @@ import org.jetbrains.annotations.*;
 import java.io.*;
 import java.util.*;
 
-import static org.apache.ignite.internal.GridNodeAttributes.*;
+import static org.apache.ignite.internal.IgniteNodeAttributes.*;
 import static org.apache.ignite.spi.collision.jobstealing.JobStealingCollisionSpi.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c21ba6/modules/core/src/test/java/org/apache/ignite/spi/collision/jobstealing/GridJobStealingCollisionSpiStartStopSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/collision/jobstealing/GridJobStealingCollisionSpiStartStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/collision/jobstealing/GridJobStealingCollisionSpiStartStopSelfTest.java
index 9e87748..5b8b107 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/collision/jobstealing/GridJobStealingCollisionSpiStartStopSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/collision/jobstealing/GridJobStealingCollisionSpiStartStopSelfTest.java
@@ -25,7 +25,7 @@ import org.apache.ignite.testframework.junits.spi.*;
 
 import java.util.*;
 
-import static org.apache.ignite.internal.GridNodeAttributes.*;
+import static org.apache.ignite.internal.IgniteNodeAttributes.*;
 
 /**
  * Job stealing collision SPI start-stop test.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c21ba6/modules/core/src/test/java/org/apache/ignite/spi/communication/GridAbstractCommunicationSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/GridAbstractCommunicationSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/GridAbstractCommunicationSelfTest.java
index e270192..ab7c350 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/communication/GridAbstractCommunicationSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/GridAbstractCommunicationSelfTest.java
@@ -31,7 +31,7 @@ import java.net.*;
 import java.util.*;
 import java.util.Map.*;
 
-import static org.apache.ignite.internal.GridNodeAttributes.*;
+import static org.apache.ignite.internal.IgniteNodeAttributes.*;
 
 /**
  * Super class for all communication self tests.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c21ba6/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedSelfTest.java
index ec7137a..fbc6539 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedSelfTest.java
@@ -37,7 +37,7 @@ import java.util.Map.*;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
 
-import static org.apache.ignite.internal.GridNodeAttributes.*;
+import static org.apache.ignite.internal.IgniteNodeAttributes.*;
 
 /**
  * Class for multithreaded {@link TcpCommunicationSpi} test.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c21ba6/modules/core/src/test/java/org/apache/ignite/spi/failover/jobstealing/GridJobStealingFailoverSpiOneNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/failover/jobstealing/GridJobStealingFailoverSpiOneNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/failover/jobstealing/GridJobStealingFailoverSpiOneNodeSelfTest.java
index 3c05051..c815102 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/failover/jobstealing/GridJobStealingFailoverSpiOneNodeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/failover/jobstealing/GridJobStealingFailoverSpiOneNodeSelfTest.java
@@ -53,11 +53,11 @@ public class GridJobStealingFailoverSpiOneNodeSelfTest extends GridSpiAbstractTe
      */
     private ClusterNode addSpiDependency(GridTestNode node) throws Exception {
         node.addAttribute(
-            U.spiAttribute(getSpi(), GridNodeAttributes.ATTR_SPI_CLASS),
+            U.spiAttribute(getSpi(), IgniteNodeAttributes.ATTR_SPI_CLASS),
             JobStealingCollisionSpi.class.getName());
 
         node.addAttribute(
-            U.spiAttribute(getSpi(), GridNodeAttributes.ATTR_SPI_CLASS),
+            U.spiAttribute(getSpi(), IgniteNodeAttributes.ATTR_SPI_CLASS),
             JobStealingCollisionSpi.class.getName());
 
         return node;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c21ba6/modules/core/src/test/java/org/apache/ignite/spi/failover/jobstealing/GridJobStealingFailoverSpiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/failover/jobstealing/GridJobStealingFailoverSpiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/failover/jobstealing/GridJobStealingFailoverSpiSelfTest.java
index 6279655..650c9db 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/failover/jobstealing/GridJobStealingFailoverSpiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/failover/jobstealing/GridJobStealingFailoverSpiSelfTest.java
@@ -28,7 +28,7 @@ import org.apache.ignite.testframework.junits.spi.*;
 
 import java.util.*;
 
-import static org.apache.ignite.internal.GridNodeAttributes.*;
+import static org.apache.ignite.internal.IgniteNodeAttributes.*;
 import static org.apache.ignite.spi.collision.jobstealing.JobStealingCollisionSpi.*;
 import static org.apache.ignite.spi.failover.jobstealing.JobStealingFailoverSpi.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c21ba6/modules/core/src/test/java/org/apache/ignite/spi/failover/jobstealing/GridJobStealingFailoverSpiStartStopSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/failover/jobstealing/GridJobStealingFailoverSpiStartStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/failover/jobstealing/GridJobStealingFailoverSpiStartStopSelfTest.java
index b0c79e9..4a8d101 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/failover/jobstealing/GridJobStealingFailoverSpiStartStopSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/failover/jobstealing/GridJobStealingFailoverSpiStartStopSelfTest.java
@@ -50,6 +50,6 @@ public class GridJobStealingFailoverSpiStartStopSelfTest extends GridSpiStartSto
      * @param node Node to add attribute to.
      */
     private void addSpiDependency(GridTestNode node) {
-        node.addAttribute(GridNodeAttributes.ATTR_SPI_CLASS, JobStealingCollisionSpi.class.getName());
+        node.addAttribute(IgniteNodeAttributes.ATTR_SPI_CLASS, JobStealingCollisionSpi.class.getName());
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c21ba6/modules/core/src/test/java/org/apache/ignite/testframework/GridTestNode.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestNode.java b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestNode.java
index 843f621..5de1f14 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestNode.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestNode.java
@@ -76,8 +76,8 @@ public class GridTestNode extends GridMetadataAwareAdapter implements ClusterNod
 
     /** */
     private void initAttributes() {
-        attrs.put(GridNodeAttributes.ATTR_BUILD_VER, "10");
-        attrs.put(GridNodeAttributes.ATTR_GRID_NAME, "null");
+        attrs.put(IgniteNodeAttributes.ATTR_BUILD_VER, "10");
+        attrs.put(IgniteNodeAttributes.ATTR_GRID_NAME, "null");
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c21ba6/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
index 475fcc7..a461ff6 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
@@ -504,7 +504,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest {
 
         assertNotNull(node);
 
-        return grid((String)node.attribute(GridNodeAttributes.ATTR_GRID_NAME)).jcache(cacheName);
+        return grid((String)node.attribute(IgniteNodeAttributes.ATTR_GRID_NAME)).jcache(cacheName);
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c21ba6/modules/core/src/test/java/org/apache/ignite/testframework/junits/spi/GridSpiAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/spi/GridSpiAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/spi/GridSpiAbstractTest.java
index 02bdf3a..c54e9c7 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/spi/GridSpiAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/spi/GridSpiAbstractTest.java
@@ -287,7 +287,7 @@ public abstract class GridSpiAbstractTest<T extends IgniteSpi> extends GridAbstr
     private Map<String, Serializable> initSpiClassAndVersionAttributes(IgniteSpi spi) {
         Map<String, Serializable> attrs = new HashMap<>();
 
-        attrs.put(U.spiAttribute(spi, GridNodeAttributes.ATTR_SPI_CLASS), spi.getClass().getName());
+        attrs.put(U.spiAttribute(spi, IgniteNodeAttributes.ATTR_SPI_CLASS), spi.getClass().getName());
 
         return attrs;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c21ba6/modules/core/src/test/java/org/apache/ignite/util/GridTopologyHeapSizeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/util/GridTopologyHeapSizeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/util/GridTopologyHeapSizeSelfTest.java
index 878ac02..58fdff9 100644
--- a/modules/core/src/test/java/org/apache/ignite/util/GridTopologyHeapSizeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/util/GridTopologyHeapSizeSelfTest.java
@@ -30,7 +30,7 @@ import org.apache.ignite.testframework.junits.common.*;
 
 import java.util.*;
 
-import static org.apache.ignite.internal.GridNodeAttributes.*;
+import static org.apache.ignite.internal.IgniteNodeAttributes.*;
 
 /**
  * Tests for calculation logic for topology heap size.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c21ba6/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestProtocol.java
----------------------------------------------------------------------
diff --git a/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestProtocol.java b/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestProtocol.java
index 11523ba..f6db05b 100644
--- a/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestProtocol.java
+++ b/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestProtocol.java
@@ -389,17 +389,17 @@ public class GridJettyRestProtocol extends GridRestProtocolAdapter {
 
     /** {@inheritDoc} */
     @Override protected String getAddressPropertyName() {
-        return GridNodeAttributes.ATTR_REST_JETTY_ADDRS;
+        return IgniteNodeAttributes.ATTR_REST_JETTY_ADDRS;
     }
 
     /** {@inheritDoc} */
     @Override protected String getHostNamePropertyName() {
-        return GridNodeAttributes.ATTR_REST_JETTY_HOST_NAMES;
+        return IgniteNodeAttributes.ATTR_REST_JETTY_HOST_NAMES;
     }
 
     /** {@inheritDoc} */
     @Override protected String getPortPropertyName() {
-        return GridNodeAttributes.ATTR_REST_JETTY_PORT;
+        return IgniteNodeAttributes.ATTR_REST_JETTY_PORT;
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c21ba6/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/kill/VisorKillCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/kill/VisorKillCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/kill/VisorKillCommand.scala
index 12fcfa8..6cf5c9f 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/kill/VisorKillCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/kill/VisorKillCommand.scala
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.visor.commands.kill
 
-import org.apache.ignite.internal.GridNodeAttributes
+import org.apache.ignite.internal.IgniteNodeAttributes
 import GridNodeAttributes._
 
 import org.apache.ignite._

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c21ba6/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/node/VisorNodeCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/node/VisorNodeCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/node/VisorNodeCommand.scala
index 475f916..f56312d 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/node/VisorNodeCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/node/VisorNodeCommand.scala
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.visor.commands.node
 
-import org.apache.ignite.internal.GridNodeAttributes
+import org.apache.ignite.internal.IgniteNodeAttributes
 import org.apache.ignite.internal.util.IgniteUtils
 import org.apache.ignite.internal.util.typedef.internal.U
 import GridNodeAttributes._

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c21ba6/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/top/VisorTopologyCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/top/VisorTopologyCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/top/VisorTopologyCommand.scala
index 6615ec8..f83dc38 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/top/VisorTopologyCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/top/VisorTopologyCommand.scala
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.visor.commands.top
 
-import org.apache.ignite.internal.GridNodeAttributes
+import org.apache.ignite.internal.IgniteNodeAttributes
 import org.apache.ignite.internal.util.IgniteUtils
 import GridNodeAttributes._
 import org.apache.ignite.internal.util.typedef._

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c21ba6/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/vvm/VisorVvmCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/vvm/VisorVvmCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/vvm/VisorVvmCommand.scala
index a36762a..2ee8d13 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/vvm/VisorVvmCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/vvm/VisorVvmCommand.scala
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.visor.commands.vvm
 
-import org.apache.ignite.internal.GridNodeAttributes
+import org.apache.ignite.internal.IgniteNodeAttributes
 import org.apache.ignite.internal.util.IgniteUtils
 import org.apache.ignite.internal.util.typedef.internal.U
 import GridNodeAttributes._

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c21ba6/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
index 3b39821..a4da96f 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
@@ -29,7 +29,7 @@ import org.apache.ignite.configuration.IgniteConfiguration
 import org.apache.ignite.events.IgniteEventType._
 import org.apache.ignite.events.{IgniteDiscoveryEvent, IgniteEvent}
 import org.apache.ignite.internal.IgniteComponentType._
-import org.apache.ignite.internal.GridNodeAttributes._
+import org.apache.ignite.internal.IgniteNodeAttributes._
 import org.apache.ignite.internal.cluster.ClusterGroupEmptyCheckedException
 import org.apache.ignite.internal.processors.spring.IgniteSpringProcessor
 import org.apache.ignite.internal.util.lang.{GridFunc => F}


Mime
View raw message