You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2014/12/05 11:03:06 UTC
[05/32] incubator-ignite git commit: # Renaming
# 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/45a6cab3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/45a6cab3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/45a6cab3
Branch: refs/heads/master
Commit: 45a6cab3d2b3ffeced7ea9e0f33c5b067aea90db
Parents: 1f7f61e
Author: sboikov <sb...@gridgain.com>
Authored: Fri Dec 5 12:37:44 2014 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Dec 5 12:37:44 2014 +0300
----------------------------------------------------------------------
.../configuration/GridAddressResolver.java | 35 ++++++++++++++++++++
.../org/gridgain/grid/GridAddressResolver.java | 33 ------------------
.../resource/GridResourceProcessor.java | 1 +
.../tcp/GridTcpCommunicationSpi.java | 1 +
.../spi/discovery/tcp/GridTcpDiscoverySpi.java | 1 +
5 files changed, 38 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/45a6cab3/modules/core/src/main/java/org/apache/ignite/configuration/GridAddressResolver.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/GridAddressResolver.java b/modules/core/src/main/java/org/apache/ignite/configuration/GridAddressResolver.java
new file mode 100644
index 0000000..1e6cb41
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/GridAddressResolver.java
@@ -0,0 +1,35 @@
+/* @java.file.header */
+
+/* _________ _____ __________________ _____
+ * __ ____/___________(_)______ /__ ____/______ ____(_)_______
+ * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
+ * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
+ * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
+ */
+
+package org.apache.ignite.configuration;
+
+import org.gridgain.grid.*;
+
+import java.net.*;
+import java.util.*;
+
+/**
+ * Provides resolution between external and internal addresses. In some cases
+ * network routers are configured to perform address mapping between external
+ * and internal networks and the same mapping must be available to SPIs
+ * in GridGain that perform communication over IP protocols.
+ */
+public interface GridAddressResolver {
+ /**
+ * Maps internal address to a collection of external addresses.
+ *
+ * @param addr Internal (local) address.
+ * @return Collection of addresses that this local address is "known" outside.
+ * Note that if there are more than one external network the local address
+ * can be mapped differently to each and therefore may need to return
+ * multiple external addresses.
+ * @throws org.gridgain.grid.GridException Thrown if any exception occurs.
+ */
+ public Collection<InetSocketAddress> getExternalAddresses(InetSocketAddress addr) throws GridException;
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/45a6cab3/modules/core/src/main/java/org/gridgain/grid/GridAddressResolver.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/GridAddressResolver.java b/modules/core/src/main/java/org/gridgain/grid/GridAddressResolver.java
deleted file mode 100644
index 3194a10..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/GridAddressResolver.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/* @java.file.header */
-
-/* _________ _____ __________________ _____
- * __ ____/___________(_)______ /__ ____/______ ____(_)_______
- * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
- * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
- * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
- */
-
-package org.gridgain.grid;
-
-import java.net.*;
-import java.util.*;
-
-/**
- * Provides resolution between external and internal addresses. In some cases
- * network routers are configured to perform address mapping between external
- * and internal networks and the same mapping must be available to SPIs
- * in GridGain that perform communication over IP protocols.
- */
-public interface GridAddressResolver {
- /**
- * Maps internal address to a collection of external addresses.
- *
- * @param addr Internal (local) address.
- * @return Collection of addresses that this local address is "known" outside.
- * Note that if there are more than one external network the local address
- * can be mapped differently to each and therefore may need to return
- * multiple external addresses.
- * @throws GridException Thrown if any exception occurs.
- */
- public Collection<InetSocketAddress> getExternalAddresses(InetSocketAddress addr) throws GridException;
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/45a6cab3/modules/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceProcessor.java
index 26a744d..8ae3de5 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceProcessor.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceProcessor.java
@@ -11,6 +11,7 @@ package org.gridgain.grid.kernal.processors.resource;
import org.apache.ignite.*;
import org.apache.ignite.compute.*;
+import org.apache.ignite.configuration.*;
import org.apache.ignite.lifecycle.*;
import org.apache.ignite.managed.*;
import org.apache.ignite.marshaller.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/45a6cab3/modules/core/src/main/java/org/gridgain/grid/spi/communication/tcp/GridTcpCommunicationSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/communication/tcp/GridTcpCommunicationSpi.java b/modules/core/src/main/java/org/gridgain/grid/spi/communication/tcp/GridTcpCommunicationSpi.java
index b2ef6d2..2990953 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/communication/tcp/GridTcpCommunicationSpi.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/communication/tcp/GridTcpCommunicationSpi.java
@@ -11,6 +11,7 @@ package org.gridgain.grid.spi.communication.tcp;
import org.apache.ignite.*;
import org.apache.ignite.cluster.*;
+import org.apache.ignite.configuration.*;
import org.apache.ignite.events.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.marshaller.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/45a6cab3/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpi.java b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpi.java
index ef055fb..f2c8574 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpi.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpi.java
@@ -11,6 +11,7 @@ package org.gridgain.grid.spi.discovery.tcp;
import org.apache.ignite.*;
import org.apache.ignite.cluster.*;
+import org.apache.ignite.configuration.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.marshaller.*;
import org.apache.ignite.resources.*;