# ignite-63

modules/clients/src/test/java/org/apache/ignite/jdbc/GridJdbcComplexQuerySelfTest.java

@@ -92,7 +92,7 @@ public class GridJdbcComplexQuerySelfTest extends GridCommonAbstractTest {
         personCache.put(new GridCacheAffinityKey<>("p2", "o1"), new Person(2, "Joe Black", 35, 1));
         personCache.put(new GridCacheAffinityKey<>("p3", "o2"), new Person(3, "Mike Green", 40, 2));
 
-        Class.forName("org.gridgain.jdbc.GridJdbcDriver");
+        Class.forName("org.apache.ignite.jdbc.IgniteJdbcDriver");
     }
 
     /** {@inheritDoc} */

modules/clients/src/test/java/org/apache/ignite/jdbc/GridJdbcConnectionSelfTest.java

@@ -89,7 +89,7 @@ private CacheConfiguration cacheConfiguration(@Nullable String name) throws Exce
     @Override protected void beforeTestsStarted() throws Exception {
         startGridsMultiThreaded(2);
 
-        Class.forName("org.gridgain.jdbc.GridJdbcDriver");
+        Class.forName("org.apache.ignite.jdbc.IgniteJdbcDriver");
     }
 
     /** {@inheritDoc} */

modules/clients/src/test/java/org/apache/ignite/jdbc/GridJdbcEmptyCacheSelfTest.java

@@ -73,7 +73,7 @@ public class GridJdbcEmptyCacheSelfTest extends GridCommonAbstractTest {
     @Override protected void beforeTestsStarted() throws Exception {
         startGrid();
 
-        Class.forName("org.gridgain.jdbc.GridJdbcDriver");
+        Class.forName("org.apache.ignite.jdbc.IgniteJdbcDriver");
     }
 
     /** {@inheritDoc} */

modules/clients/src/test/java/org/apache/ignite/jdbc/GridJdbcLocalCachesSelfTest.java

@@ -30,7 +30,7 @@
 
 import static org.apache.ignite.cache.GridCacheMode.*;
 import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*;
-import static org.apache.ignite.jdbc.GridJdbcDriver.*;
+import static org.apache.ignite.jdbc.IgniteJdbcDriver.*;
 
 /**
  * Test JDBC with several local caches.
@@ -92,7 +92,7 @@ public class GridJdbcLocalCachesSelfTest extends GridCommonAbstractTest {
         assert cache2.putx("key1", 3);
         assert cache2.putx("key2", 4);
 
-        Class.forName("org.gridgain.jdbc.GridJdbcDriver");
+        Class.forName("org.apache.ignite.jdbc.IgniteJdbcDriver");
     }
 
     /** {@inheritDoc} */

modules/clients/src/test/java/org/apache/ignite/jdbc/GridJdbcMetadataSelfTest.java

@@ -87,7 +87,7 @@ public class GridJdbcMetadataSelfTest extends GridCommonAbstractTest {
         personCache.put(new GridCacheAffinityKey<>("p2", "o1"), new Person("Joe Black", 35, 1));
         personCache.put(new GridCacheAffinityKey<>("p3", "o2"), new Person("Mike Green", 40, 2));
 
-        Class.forName("org.gridgain.jdbc.GridJdbcDriver");
+        Class.forName("org.apache.ignite.jdbc.IgniteJdbcDriver");
     }
 
     /** {@inheritDoc} */

modules/clients/src/test/java/org/apache/ignite/jdbc/GridJdbcPreparedStatementSelfTest.java

@@ -102,7 +102,7 @@ public class GridJdbcPreparedStatementSelfTest extends GridCommonAbstractTest {
         cache.put(1, o);
         cache.put(2, new TestObject(2));
 
-        Class.forName("org.gridgain.jdbc.GridJdbcDriver");
+        Class.forName("org.apache.ignite.jdbc.IgniteJdbcDriver");
     }
 
     /** {@inheritDoc} */

modules/clients/src/test/java/org/apache/ignite/jdbc/GridJdbcResultSetSelfTest.java

@@ -94,7 +94,7 @@ public class GridJdbcResultSetSelfTest extends GridCommonAbstractTest {
         cache.put(1, o);
         cache.put(2, new TestObject(2));
 
-        Class.forName("org.gridgain.jdbc.GridJdbcDriver");
+        Class.forName("org.apache.ignite.jdbc.IgniteJdbcDriver");
     }
 
     /** {@inheritDoc} */

modules/clients/src/test/java/org/apache/ignite/jdbc/GridJdbcStatementSelfTest.java

@@ -86,7 +86,7 @@ public class GridJdbcStatementSelfTest extends GridCommonAbstractTest {
         cache.put("p2", new Person(2, "Joe", "Black", 35));
         cache.put("p3", new Person(3, "Mike", "Green", 40));
 
-        Class.forName("org.gridgain.jdbc.GridJdbcDriver");
+        Class.forName("org.apache.ignite.jdbc.IgniteJdbcDriver");
     }
 
     /** {@inheritDoc} */

modules/core/src/main/java/org/apache/ignite/jdbc/GridJdbcConnection.java → modules/core/src/main/java/org/apache/ignite/jdbc/IgniteJdbcConnection.java

@@ -25,12 +25,12 @@
 
 import static java.sql.ResultSet.*;
 import static java.util.concurrent.TimeUnit.*;
-import static org.apache.ignite.jdbc.GridJdbcDriver.*;
+import static org.apache.ignite.jdbc.IgniteJdbcDriver.*;
 
 /**
  * JDBC connection implementation.
  */
-class GridJdbcConnection implements Connection {
+class IgniteJdbcConnection implements Connection {
     /** Validation task name. */
     private static final String VALID_TASK_NAME =
         "org.apache.ignite.internal.processors.cache.query.jdbc.GridCacheQueryJdbcValidationTask";
@@ -60,7 +60,7 @@ class GridJdbcConnection implements Connection {
      * @param props Additional properties.
      * @throws SQLException In case GridGain client failed to start.
      */
-    GridJdbcConnection(String url, Properties props) throws SQLException {
+    IgniteJdbcConnection(String url, Properties props) throws SQLException {
         assert url != null;
         assert props != null;
 
@@ -167,7 +167,7 @@ class GridJdbcConnection implements Connection {
     @Override public DatabaseMetaData getMetaData() throws SQLException {
         ensureNotClosed();
 
-        return new GridJdbcDatabaseMetadata(this);
+        return new IgniteJdbcDatabaseMetadata(this);
     }
 
     /** {@inheritDoc} */
@@ -315,7 +315,7 @@ class GridJdbcConnection implements Connection {
         if (resSetHoldability != HOLD_CURSORS_OVER_COMMIT)
             throw new SQLFeatureNotSupportedException("Invalid holdability (transactions are not supported).");
 
-        GridJdbcStatement stmt = new GridJdbcStatement(this);
+        IgniteJdbcStatement stmt = new IgniteJdbcStatement(this);
 
         if (timeout > 0)
             stmt.timeout(timeout);
@@ -337,7 +337,7 @@ class GridJdbcConnection implements Connection {
         if (resSetHoldability != HOLD_CURSORS_OVER_COMMIT)
             throw new SQLFeatureNotSupportedException("Invalid holdability (transactions are not supported).");
 
-        GridJdbcPreparedStatement stmt = new GridJdbcPreparedStatement(this, sql);
+        IgniteJdbcPreparedStatement stmt = new IgniteJdbcPreparedStatement(this, sql);
 
         if (timeout > 0)
             stmt.timeout(timeout);
@@ -541,7 +541,7 @@ private void ensureNotClosed() throws SQLException {
      * @return Internal statement.
      * @throws SQLException In case of error.
      */
-    GridJdbcStatement createStatement0() throws SQLException {
-        return (GridJdbcStatement)createStatement();
+    IgniteJdbcStatement createStatement0() throws SQLException {
+        return (IgniteJdbcStatement)createStatement();
     }
 }

modules/core/src/main/java/org/apache/ignite/jdbc/GridJdbcConnectionInfo.java → modules/core/src/main/java/org/apache/ignite/jdbc/IgniteJdbcConnectionInfo.java

@@ -20,7 +20,7 @@
 /**
  * Connection properties.
  */
-class GridJdbcConnectionInfo {
+class IgniteJdbcConnectionInfo {
     /** URL. */
     private final String url;
 
@@ -36,7 +36,7 @@ class GridJdbcConnectionInfo {
     /**
      * @param url URL.
      */
-    GridJdbcConnectionInfo(String url) {
+    IgniteJdbcConnectionInfo(String url) {
         this.url = url;
     }