# ignite-164 : rest of gridgain renaming in [clients] module
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4de0be91 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4de0be91 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4de0be91 Branch: refs/heads/ignite-111 Commit: 4de0be91b74cf6dd777ba64fea56b182f32cada6 Parents: 9c53ad4 Author: Artem Shutak <[email protected]> Authored: Thu Feb 5 18:58:39 2015 +0300 Committer: Artem Shutak <[email protected]> Committed: Thu Feb 5 18:58:39 2015 +0300 ---------------------------------------------------------------------- modules/clients/readme.md | 8 ++++---- .../org/apache/ignite/client/ClientDefaultCacheSelfTest.java | 2 +- .../processors/rest/JettyRestProcessorAbstractSelfTest.java | 2 +- .../processors/rest/JettyRestProcessorSignedSelfTest.java | 4 ++-- .../org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java | 2 +- .../java/org/apache/ignite/jdbc/JdbcConnectionSelfTest.java | 2 +- .../java/org/apache/ignite/jdbc/JdbcEmptyCacheSelfTest.java | 2 +- .../java/org/apache/ignite/jdbc/JdbcLocalCachesSelfTest.java | 2 +- .../java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java | 2 +- .../apache/ignite/jdbc/JdbcPreparedStatementSelfTest.java | 2 +- .../java/org/apache/ignite/jdbc/JdbcResultSetSelfTest.java | 2 +- .../java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java | 2 +- modules/clients/src/test/resources/log4j.xml | 2 +- 13 files changed, 17 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4de0be91/modules/clients/readme.md ---------------------------------------------------------------------- diff --git a/modules/clients/readme.md b/modules/clients/readme.md index f15c65f..e64c123 100644 --- a/modules/clients/readme.md +++ b/modules/clients/readme.md @@ -1,13 +1,13 @@ <center> - + </center> ## Java Client README -Java Client is a **lightweight gateway** to GridGain nodes. +Java Client is a **lightweight gateway** to Ignite nodes. -Client communicates with grid nodes via REST interface and provides reduced but powerful subset of GridGain API. -Java Client allows to use GridGain features from devices and environments where fully-functional GridGain node +Client communicates with grid nodes via REST interface and provides reduced but powerful subset of Ignite API. +Java Client allows to use Ignite features from devices and environments where fully-functional Ignite node could not (*or should not*) be started. ## Client vs Grid Node http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4de0be91/modules/clients/src/test/java/org/apache/ignite/client/ClientDefaultCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/client/ClientDefaultCacheSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/ClientDefaultCacheSelfTest.java index 8452a99..4beb190 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/ClientDefaultCacheSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/ClientDefaultCacheSelfTest.java @@ -57,7 +57,7 @@ public class ClientDefaultCacheSelfTest extends GridCommonAbstractTest { private static final int HTTP_PORT = 8081; /** Url address to send HTTP request. */ - private static final String TEST_URL = "http://"; + HOST + ":" + HTTP_PORT + "/gridgain"; + private static final String TEST_URL = "http://"; + HOST + ":" + HTTP_PORT + "/ignite"; /** Used to sent request charset. */ private static final String CHARSET = StandardCharsets.UTF_8.name(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4de0be91/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java index a29b0db..9de7f54 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java @@ -65,7 +65,7 @@ abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestProcessorS * @throws Exception If failed. */ private String content(Map<String, String> params) throws Exception { - String addr = "http://"; + LOC_HOST + ":" + restPort() + "/gridgain?"; + String addr = "http://"; + LOC_HOST + ":" + restPort() + "/ignite?"; for (Map.Entry<String, String> e : params.entrySet()) addr += e.getKey() + '=' + e.getValue() + '&'; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4de0be91/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorSignedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorSignedSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorSignedSelfTest.java index 6a522e5..1246d67 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorSignedSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorSignedSelfTest.java @@ -51,7 +51,7 @@ public class JettyRestProcessorSignedSelfTest extends JettyRestProcessorAbstract * @throws Exception If failed. */ public void testUnauthorized() throws Exception { - String addr = "http://"; + LOC_HOST + ":" + restPort() + "/gridgain?cmd=top"; + String addr = "http://"; + LOC_HOST + ":" + restPort() + "/ignite?cmd=top"; URL url = new URL(addr); @@ -63,7 +63,7 @@ public class JettyRestProcessorSignedSelfTest extends JettyRestProcessorAbstract assert ((HttpURLConnection)conn).getResponseCode() == 401; // Request with authentication info. - addr = "http://"; + LOC_HOST + ":" + restPort() + "/gridgain?cmd=top"; + addr = "http://"; + LOC_HOST + ":" + restPort() + "/ignite?cmd=top"; url = new URL(addr); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4de0be91/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java index e01143e..1643bf8 100644 --- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java @@ -43,7 +43,7 @@ public class JdbcComplexQuerySelfTest extends GridCommonAbstractTest { private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); /** URL. */ - private static final String URL = "jdbc:gridgain://127.0.0.1/"; + private static final String URL = "jdbc:ignite://127.0.0.1/"; /** Statement. */ private Statement stmt; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4de0be91/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcConnectionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcConnectionSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcConnectionSelfTest.java index 733714e..4d85a7e 100644 --- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcConnectionSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcConnectionSelfTest.java @@ -43,7 +43,7 @@ public class JdbcConnectionSelfTest extends GridCommonAbstractTest { private static final int CUSTOM_PORT = 11212; /** URL prefix. */ - private static final String URL_PREFIX = "jdbc:gridgain://"; + private static final String URL_PREFIX = "jdbc:ignite://"; /** Host. */ private static final String HOST = "127.0.0.1"; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4de0be91/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcEmptyCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcEmptyCacheSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcEmptyCacheSelfTest.java index daac5f8..94dcd81 100644 --- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcEmptyCacheSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcEmptyCacheSelfTest.java @@ -40,7 +40,7 @@ public class JdbcEmptyCacheSelfTest extends GridCommonAbstractTest { private static final String CACHE_NAME = "cache"; /** URL. */ - private static final String URL = "jdbc:gridgain://127.0.0.1/" + CACHE_NAME; + private static final String URL = "jdbc:ignite://127.0.0.1/" + CACHE_NAME; /** Statement. */ private Statement stmt; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4de0be91/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcLocalCachesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcLocalCachesSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcLocalCachesSelfTest.java index 244133f..e691b62 100644 --- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcLocalCachesSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcLocalCachesSelfTest.java @@ -43,7 +43,7 @@ public class JdbcLocalCachesSelfTest extends GridCommonAbstractTest { private static final String CACHE_NAME = "cache"; /** URL. */ - private static final String URL = "jdbc:gridgain://127.0.0.1/" + CACHE_NAME; + private static final String URL = "jdbc:ignite://127.0.0.1/" + CACHE_NAME; /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4de0be91/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java index 82a5a54..bd30a14 100644 --- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java @@ -43,7 +43,7 @@ public class JdbcMetadataSelfTest extends GridCommonAbstractTest { private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); /** URL. */ - private static final String URL = "jdbc:gridgain://127.0.0.1/"; + private static final String URL = "jdbc:ignite://127.0.0.1/"; /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4de0be91/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcPreparedStatementSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcPreparedStatementSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcPreparedStatementSelfTest.java index 5850f5a..de4e5ad 100644 --- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcPreparedStatementSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcPreparedStatementSelfTest.java @@ -43,7 +43,7 @@ public class JdbcPreparedStatementSelfTest extends GridCommonAbstractTest { private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); /** URL. */ - private static final String URL = "jdbc:gridgain://127.0.0.1/"; + private static final String URL = "jdbc:ignite://127.0.0.1/"; /** Connection. */ private Connection conn; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4de0be91/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcResultSetSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcResultSetSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcResultSetSelfTest.java index 9155742..d11a1d4 100644 --- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcResultSetSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcResultSetSelfTest.java @@ -47,7 +47,7 @@ public class JdbcResultSetSelfTest extends GridCommonAbstractTest { private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); /** URL. */ - private static final String URL = "jdbc:gridgain://127.0.0.1/"; + private static final String URL = "jdbc:ignite://127.0.0.1/"; /** SQL query. */ private static final String SQL = http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4de0be91/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java index 082f980..6377104 100644 --- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java @@ -40,7 +40,7 @@ public class JdbcStatementSelfTest extends GridCommonAbstractTest { private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); /** URL. */ - private static final String URL = "jdbc:gridgain://127.0.0.1/"; + private static final String URL = "jdbc:ignite://127.0.0.1/"; /** SQL query. */ private static final String SQL = "select * from Person where age > 30"; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4de0be91/modules/clients/src/test/resources/log4j.xml ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/resources/log4j.xml b/modules/clients/src/test/resources/log4j.xml index e4e8298..c2f8737 100644 --- a/modules/clients/src/test/resources/log4j.xml +++ b/modules/clients/src/test/resources/log4j.xml @@ -70,7 +70,7 @@ --> <appender name="FILE" class="org.apache.log4j.RollingFileAppender"> <param name="Threshold" value="DEBUG"/> - <param name="File" value="${IGNITE_HOME}/work/log/gridgain.log"/> + <param name="File" value="${IGNITE_HOME}/work/log/ignite.log"/> <param name="Append" value="true"/> <param name="MaxFileSize" value="10MB"/> <param name="MaxBackupIndex" value="10"/>
