ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [74/74] [abbrv] incubator-ignite git commit: # IGNITE-32: merged with sprint-1
Date Mon, 26 Jan 2015 02:59:34 GMT
# IGNITE-32: merged with sprint-1


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

Branch: refs/heads/ignite-32
Commit: a9500891c3be3a09b0fd7c89028c2aff6c78783d
Parents: 5f75dd9
Author: AKuznetsov <akuznetsov@gridgain.com>
Authored: Mon Jan 26 09:57:24 2015 +0700
Committer: AKuznetsov <akuznetsov@gridgain.com>
Committed: Mon Jan 26 09:57:24 2015 +0700

----------------------------------------------------------------------
 .../cache/query/CacheQueryTypeDescriptor.java   | 135 ++++++++++++
 .../cache/query/CacheQueryTypeMetadata.java     | 149 +++++++++++--
 .../ignite/cache/store/jdbc/JdbcCacheStore.java |  48 ++---
 .../cache/store/jdbc/JdbcPojoCacheStore.java    |  14 +-
 .../store/jdbc/dialect/BasicJdbcDialect.java    |   4 +-
 .../cache/store/jdbc/dialect/DB2Dialect.java    |   2 +-
 .../cache/store/jdbc/dialect/H2Dialect.java     |   2 +-
 .../cache/store/jdbc/dialect/MySQLDialect.java  |   2 +-
 .../cache/store/jdbc/dialect/OracleDialect.java |   2 +-
 .../store/jdbc/dialect/SQLServerDialect.java    |   2 +-
 .../query/GridCacheQueryTypeDescriptor.java     | 135 ------------
 .../core/src/test/config/store/jdbc/Ignite.xml  | 207 +++++++++++++++++++
 modules/core/src/test/config/store/jdbc/all.xml |  97 ---------
 ...AbstractCacheStoreMultithreadedSelfTest.java |  10 +-
 .../PojoCacheStoreMultitreadedSelfTest.java     |  14 +-
 .../store/jdbc/PojoCacheStoreSelfTest.java      |  23 ++-
 .../cache/store/jdbc/model/Organization.java    |   2 +-
 .../cache/store/jdbc/model/OrganizationKey.java |   2 +-
 .../ignite/cache/store/jdbc/model/Person.java   |   2 +-
 .../cache/store/jdbc/model/PersonKey.java       |   2 +-
 .../ignite/schema/generator/XmlGenerator.java   |  27 ++-
 .../ignite/schema/model/PojoDescriptor.java     |  14 +-
 .../apache/ignite/schema/model/PojoField.java   |   8 +-
 .../schema/parser/DatabaseMetadataParser.java   |  14 +-
 .../apache/ignite/schema/ui/SchemaLoadApp.java  |   8 +-
 25 files changed, 578 insertions(+), 347 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9500891/modules/core/src/main/java/org/apache/ignite/cache/query/CacheQueryTypeDescriptor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/query/CacheQueryTypeDescriptor.java b/modules/core/src/main/java/org/apache/ignite/cache/query/CacheQueryTypeDescriptor.java
new file mode 100644
index 0000000..9e660cb
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/cache/query/CacheQueryTypeDescriptor.java
@@ -0,0 +1,135 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.cache.query;
+
+import org.apache.ignite.internal.util.typedef.internal.*;
+
+/**
+ * Type descriptor for field in java and database.
+ */
+public class CacheQueryTypeDescriptor {
+    /** Column name in database. */
+    private String javaName;
+
+    /** Corresponding java type. */
+    private Class<?> javaType;
+
+    /** Column name in database. */
+    private String dbName;
+
+    /** Column JDBC type in database. */
+    private int dbType;
+
+    /**
+     * Default constructor.
+     */
+    public CacheQueryTypeDescriptor() {
+        // No-op.
+    }
+
+    /**
+     * @param javaName Field name in java object.
+     * @param javaType Field java type.
+     * @param dbName Column name in database.
+     * @param dbType Column JDBC type in database.
+     */
+    public CacheQueryTypeDescriptor(String javaName, Class<?> javaType, String dbName, int dbType) {
+        this.javaName = javaName;
+        this.javaType = javaType;
+        this.dbName = dbName;
+        this.dbType = dbType;
+    }
+
+    /**
+     * @return Field name in java object.
+     */
+    public String getJavaName() {
+        return javaName;
+    }
+
+    /**
+     * @param javaName Field name in java object.
+     */
+    public void setJavaName(String javaName) {
+        this.javaName = javaName;
+    }
+
+    /**
+     * @return Field java type.
+     */
+    public Class<?> getJavaType() {
+        return javaType;
+    }
+
+    /**
+     * @param javaType Corresponding java type.
+     */
+    public void setJavaType(Class<?> javaType) {
+        this.javaType = javaType;
+    }
+
+    /**
+     * @return Column name in database.
+     */
+    public String getDbName() {
+        return dbName;
+    }
+
+    /**
+     * @param dbName Column name in database.
+     */
+    public void setDbName(String dbName) {
+        this.dbName = dbName;
+    }
+
+    /**
+     * @return Column JDBC type in database.
+     */
+    public int getDbType() {
+        return dbType;
+    }
+
+    /**
+     * @param dbType Column JDBC type in database.
+     */
+    public void setDbType(int dbType) {
+        this.dbType = dbType;
+    }
+
+     /** {@inheritDoc} */
+    @Override public boolean equals(Object o) {
+        if (this == o)
+            return true;
+
+        if (!(o instanceof CacheQueryTypeDescriptor))
+            return false;
+
+        CacheQueryTypeDescriptor that = (CacheQueryTypeDescriptor)o;
+
+        return javaName.equals(that.javaName) && dbName.equals(that.dbName) &&
+            javaType == that.javaType && dbType == that.dbType;
+    }
+
+    /** {@inheritDoc} */
+    @Override public int hashCode() {
+        int res = javaName.hashCode();
+
+        res = 31 * res + dbName.hashCode();
+        res = 31 * res + javaType.hashCode();
+        res = 31 * res + dbType;
+
+        return res;
+    }
+
+    /** {@inheritDoc} */
+    @Override public String toString() {
+        return S.toString(CacheQueryTypeDescriptor.class, this);
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9500891/modules/core/src/main/java/org/apache/ignite/cache/query/CacheQueryTypeMetadata.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/query/CacheQueryTypeMetadata.java b/modules/core/src/main/java/org/apache/ignite/cache/query/CacheQueryTypeMetadata.java
index 7b0afff..4a1d8eb 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/query/CacheQueryTypeMetadata.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/query/CacheQueryTypeMetadata.java
@@ -28,24 +28,40 @@ import java.util.*;
  */
 public class CacheQueryTypeMetadata {
     /** Type name, e.g. class name. */
-    @GridToStringInclude
     private String type;
 
+    /** Schema name in database. */
+    private String schema;
+
+    /** Table name in database. */
+    private String tbl;
+
+    /** Key class. */
+    private String keyType;
+
+    /** Type descriptors. */
+    @GridToStringInclude
+    private Collection<CacheQueryTypeDescriptor> keyDescs;
+
+    /** Type descriptors. */
+    @GridToStringInclude
+    private Collection<CacheQueryTypeDescriptor> valDescs;
+
     /** Fields to be queried, in addition to indexed fields. */
     @GridToStringInclude
-    private Map<String, Class<?>> qryFlds = new HashMap<>();
+    private Map<String, Class<?>> qryFlds;
 
     /** Fields to index in ascending order. */
     @GridToStringInclude
-    private Map<String, Class<?>> ascFlds = new HashMap<>();
+    private Map<String, Class<?>> ascFlds;
 
     /** Fields to index in descending order. */
     @GridToStringInclude
-    private Map<String, Class<?>> descFlds = new HashMap<>();
+    private Map<String, Class<?>> descFlds;
 
     /** Fields to index as text. */
     @GridToStringInclude
-    private Collection<String> txtFlds = new LinkedHashSet<>();
+    private Collection<String> txtFlds;
 
     /** Fields to create group indexes for. */
     @GridToStringInclude
@@ -55,21 +71,40 @@ public class CacheQueryTypeMetadata {
      * Default constructor.
      */
     public CacheQueryTypeMetadata() {
-        // No-op.
+        keyDescs = new ArrayList<>();
+
+        valDescs = new ArrayList<>();
+
+        qryFlds = new LinkedHashMap<>();
+
+        ascFlds = new LinkedHashMap<>();
+
+        descFlds = new LinkedHashMap<>();
+
+        txtFlds = new LinkedHashSet<>();
+
+        grps = new LinkedHashMap<>();
     }
 
     /**
      *
      */
-    public CacheQueryTypeMetadata(CacheQueryTypeMetadata src) {
+    public CacheQueryTypeMetadata( CacheQueryTypeMetadata src) {
         type = src.getType();
+        keyType = src.getKeyType();
+
+        schema = src.getSchema();
+        tbl = src.getTableName();
 
-        qryFlds = new HashMap<>(src.getQueryFields());
-        ascFlds = new HashMap<>(src.getAscendingFields());
-        descFlds = new HashMap<>(src.getDescendingFields());
-        txtFlds = new HashSet<>(src.getTextFields());
+        keyDescs = new ArrayList<>(src.getKeyDescriptors());
+        valDescs = new ArrayList<>(src.getValueDescriptors());
 
-        grps = new HashMap<>(src.getGroups());
+        qryFlds = new LinkedHashMap<>(src.getQueryFields());
+        ascFlds = new LinkedHashMap<>(src.getAscendingFields());
+        descFlds = new LinkedHashMap<>(src.getDescendingFields());
+        txtFlds = new LinkedHashSet<>(src.getTextFields());
+
+        grps = new LinkedHashMap<>(src.getGroups());
     }
 
     /**
@@ -100,6 +135,96 @@ public class CacheQueryTypeMetadata {
     }
 
     /**
+     * Gets database schema name.
+     *
+     * @return Schema name.
+     */
+    public String getSchema() {
+        return schema;
+    }
+
+    /**
+     * Sets database schema name.
+     *
+     * @param schema Schema name.
+     */
+    public void setSchema(String schema) {
+        this.schema = schema;
+    }
+
+    /**
+     * Gets table name in database.
+     *
+     * @return Table name in database.
+     */
+    public String getTableName() {
+        return tbl;
+    }
+
+    /**
+     * Table name in database.
+     *
+     * @param tbl Table name in database.
+     */
+    public void setTableName(String tbl) {
+        this.tbl = tbl;
+    }
+
+    /**
+     * Gets key type.
+     *
+     * @return Key type.
+     */
+    public String getKeyType() {
+        return keyType;
+    }
+
+    /**
+     * Sets key type.
+     *
+     * @param keyType Key type.
+     */
+    public void setKeyType(String keyType) {
+        this.keyType = keyType;
+    }
+
+    /**
+     * Gets key fields type descriptors.
+     *
+     * @return Key fields type descriptors.
+     */
+    public Collection<CacheQueryTypeDescriptor> getKeyDescriptors() {
+        return keyDescs;
+    }
+
+    /**
+     * Sets key fields type descriptors.
+     *
+     * @param keyDescs Key fields type descriptors.
+     */
+    public void setKeyDescriptors(Collection<CacheQueryTypeDescriptor> keyDescs) {
+        this.keyDescs = keyDescs;
+    }
+
+    /**
+     * Gets value fields type descriptors.
+     *
+     * @return Key value type descriptors.
+     */
+    public Collection<CacheQueryTypeDescriptor> getValueDescriptors() {
+        return valDescs;
+    }
+
+    /**
+     * Sets value fields type descriptors.
+     *
+     * @param valDescs Value fields type descriptors.
+     */
+    public void setValueDescriptors(Collection<CacheQueryTypeDescriptor> valDescs) {
+        this.valDescs = valDescs;
+    }
+
+    /**
      * Gets query-enabled fields.
      *
      * @return Collection of fields available for query.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9500891/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/JdbcCacheStore.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/JdbcCacheStore.java b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/JdbcCacheStore.java
index afdec20..64995ae 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/JdbcCacheStore.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/JdbcCacheStore.java
@@ -18,15 +18,15 @@
 package org.apache.ignite.cache.store.jdbc;
 
 import org.apache.ignite.*;
+import org.apache.ignite.cache.query.*;
 import org.apache.ignite.cache.store.*;
 import org.apache.ignite.cache.store.jdbc.dialect.*;
+import org.apache.ignite.internal.util.tostring.*;
+import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.resources.*;
 import org.apache.ignite.transactions.*;
-import org.gridgain.grid.cache.query.*;
-import org.gridgain.grid.util.tostring.*;
-import org.gridgain.grid.util.typedef.*;
-import org.gridgain.grid.util.typedef.internal.*;
 import org.jetbrains.annotations.*;
 
 import javax.cache.*;
@@ -80,26 +80,26 @@ public abstract class JdbcCacheStore<K, V> extends CacheStore<K, V> {
         private final Collection<String> cols;
 
         /** Unique value fields. */
-        private final Collection<GridCacheQueryTypeDescriptor> uniqValFields;
+        private final Collection<CacheQueryTypeDescriptor> uniqValFields;
 
         /** Type metadata. */
-        private final GridCacheQueryTypeMetadata typeMetadata;
+        private final CacheQueryTypeMetadata typeMetadata;
 
         /**
          * @param typeMetadata Type metadata.
          */
-        public EntryMapping(JdbcDialect dialect, GridCacheQueryTypeMetadata typeMetadata) {
+        public EntryMapping(JdbcDialect dialect, CacheQueryTypeMetadata typeMetadata) {
             this.dialect = dialect;
 
             this.typeMetadata = typeMetadata;
 
-            final Collection<GridCacheQueryTypeDescriptor> keyFields = typeMetadata.getKeyDescriptors();
+            final Collection<CacheQueryTypeDescriptor> keyFields = typeMetadata.getKeyDescriptors();
 
-            Collection<GridCacheQueryTypeDescriptor> valFields = typeMetadata.getValueDescriptors();
+            Collection<CacheQueryTypeDescriptor> valFields = typeMetadata.getValueDescriptors();
 
             uniqValFields = F.view(typeMetadata.getValueDescriptors(),
-                new IgnitePredicate<GridCacheQueryTypeDescriptor>() {
-                    @Override public boolean apply(GridCacheQueryTypeDescriptor desc) {
+                new IgnitePredicate<CacheQueryTypeDescriptor>() {
+                    @Override public boolean apply(CacheQueryTypeDescriptor desc) {
                         return !keyFields.contains(desc);
                     }
                 });
@@ -165,7 +165,7 @@ public abstract class JdbcCacheStore<K, V> extends CacheStore<K, V> {
          *
          * @return Key fields type descriptors.
          */
-        protected Collection<GridCacheQueryTypeDescriptor> keyDescriptors() {
+        protected Collection<CacheQueryTypeDescriptor> keyDescriptors() {
             return typeMetadata.getKeyDescriptors();
         }
 
@@ -174,7 +174,7 @@ public abstract class JdbcCacheStore<K, V> extends CacheStore<K, V> {
          *
          * @return Key value type descriptors.
          */
-        protected Collection<GridCacheQueryTypeDescriptor> valueDescriptors() {
+        protected Collection<CacheQueryTypeDescriptor> valueDescriptors() {
             return typeMetadata.getValueDescriptors();
         }
     }
@@ -221,7 +221,7 @@ public abstract class JdbcCacheStore<K, V> extends CacheStore<K, V> {
     protected ExecutorService exec;
 
     /** Type mapping description. */
-    protected Collection<GridCacheQueryTypeMetadata> typeMetadata;
+    protected Collection<CacheQueryTypeMetadata> typeMetadata;
 
     /** Cache with query by type. */
     protected Map<Object, EntryMapping> typeMeta;
@@ -255,7 +255,7 @@ public abstract class JdbcCacheStore<K, V> extends CacheStore<K, V> {
      * @param rs ResultSet.
      * @return Constructed object.
      */
-    protected abstract <R> R buildObject(String typeName, Collection<GridCacheQueryTypeDescriptor> fields, ResultSet rs)
+    protected abstract <R> R buildObject(String typeName, Collection<CacheQueryTypeDescriptor> fields, ResultSet rs)
         throws CacheLoaderException;
 
     /**
@@ -862,14 +862,14 @@ public abstract class JdbcCacheStore<K, V> extends CacheStore<K, V> {
     }
 
     /**
-     * Extract database column names from {@link GridCacheQueryTypeDescriptor}.
+     * Extract database column names from {@link CacheQueryTypeDescriptor}.
      *
-     * @param dsc collection of {@link GridCacheQueryTypeDescriptor}.
+     * @param dsc collection of {@link CacheQueryTypeDescriptor}.
      */
-    protected static Collection<String> databaseColumns(Collection<GridCacheQueryTypeDescriptor> dsc) {
-        return F.transform(dsc, new C1<GridCacheQueryTypeDescriptor, String>() {
+    protected static Collection<String> databaseColumns(Collection<CacheQueryTypeDescriptor> dsc) {
+        return F.transform(dsc, new C1<CacheQueryTypeDescriptor, String>() {
             /** {@inheritDoc} */
-            @Override public String apply(GridCacheQueryTypeDescriptor desc) {
+            @Override public String apply(CacheQueryTypeDescriptor desc) {
                 return desc.getDbName();
             }
         });
@@ -884,7 +884,7 @@ public abstract class JdbcCacheStore<K, V> extends CacheStore<K, V> {
      */
     protected int fillKeyParameters(PreparedStatement stmt, int i, EntryMapping type,
         Object key) throws CacheException {
-        for (GridCacheQueryTypeDescriptor field : type.keyDescriptors()) {
+        for (CacheQueryTypeDescriptor field : type.keyDescriptors()) {
             Object fieldVal = extractField(type.keyType(), field.getJavaName(), key);
 
             try {
@@ -920,7 +920,7 @@ public abstract class JdbcCacheStore<K, V> extends CacheStore<K, V> {
      */
     protected int fillValueParameters(PreparedStatement stmt, int i, EntryMapping type, Object val)
         throws CacheWriterException {
-        for (GridCacheQueryTypeDescriptor field : type.uniqValFields) {
+        for (CacheQueryTypeDescriptor field : type.uniqValFields) {
             Object fieldVal = extractField(type.valueType(), field.getJavaName(), val);
 
             try {
@@ -998,7 +998,7 @@ public abstract class JdbcCacheStore<K, V> extends CacheStore<K, V> {
      *
      * @param typeMetadata Type mapping description.
      */
-    public void setTypeMetadata(Collection<GridCacheQueryTypeMetadata> typeMetadata) {
+    public void setTypeMetadata(Collection<CacheQueryTypeMetadata> typeMetadata) {
         this.typeMetadata = typeMetadata;
     }
 
@@ -1079,7 +1079,7 @@ public abstract class JdbcCacheStore<K, V> extends CacheStore<K, V> {
                 int i = 1;
 
                 for (Object key : keys)
-                    for (GridCacheQueryTypeDescriptor field : m.keyDescriptors()) {
+                    for (CacheQueryTypeDescriptor field : m.keyDescriptors()) {
                         Object fieldVal = extractField(m.keyType(), field.getJavaName(), key);
 
                         if (fieldVal != null)

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9500891/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/JdbcPojoCacheStore.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/JdbcPojoCacheStore.java b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/JdbcPojoCacheStore.java
index 16a67d4..cac27b4 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/JdbcPojoCacheStore.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/JdbcPojoCacheStore.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.cache.store.jdbc;
 
+import org.apache.ignite.cache.query.*;
 import org.apache.ignite.cache.store.*;
-import org.gridgain.grid.cache.query.*;
-import org.gridgain.grid.util.typedef.internal.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
 import org.jetbrains.annotations.*;
 
 import javax.cache.*;
@@ -56,7 +56,7 @@ public class JdbcPojoCacheStore extends JdbcCacheStore<Object, Object> {
          * @param clsName Class name.
          * @param fields Fields.
          */
-        public PojoMethodsCache(String clsName, Collection<GridCacheQueryTypeDescriptor> fields) throws CacheException {
+        public PojoMethodsCache(String clsName, Collection<CacheQueryTypeDescriptor> fields) throws CacheException {
 
             try {
                 cls = Class.forName(clsName);
@@ -77,7 +77,7 @@ public class JdbcPojoCacheStore extends JdbcCacheStore<Object, Object> {
 
             getters = U.newHashMap(fields.size());
 
-            for (GridCacheQueryTypeDescriptor field : fields) {
+            for (CacheQueryTypeDescriptor field : fields) {
                 String prop = capitalFirst(field.getJavaName());
 
                 try {
@@ -139,7 +139,7 @@ public class JdbcPojoCacheStore extends JdbcCacheStore<Object, Object> {
 
         mtdsCache = U.newHashMap(typeMetadata.size() * 2);
 
-        for (GridCacheQueryTypeMetadata type : typeMetadata) {
+        for (CacheQueryTypeMetadata type : typeMetadata) {
             PojoMethodsCache keyCache = new PojoMethodsCache(type.getKeyType(), type.getKeyDescriptors());
 
             mtdsCache.put(type.getKeyType(), keyCache);
@@ -155,14 +155,14 @@ public class JdbcPojoCacheStore extends JdbcCacheStore<Object, Object> {
     }
 
     /** {@inheritDoc} */
-    @Override protected <R> R buildObject(String typeName, Collection<GridCacheQueryTypeDescriptor> fields,
+    @Override protected <R> R buildObject(String typeName, Collection<CacheQueryTypeDescriptor> fields,
         ResultSet rs) throws CacheLoaderException {
         PojoMethodsCache t = mtdsCache.get(typeName);
 
         Object obj = t.newInstance();
 
         try {
-            for (GridCacheQueryTypeDescriptor field : fields)
+            for (CacheQueryTypeDescriptor field : fields)
                 t.setters.get(field.getJavaName()).invoke(obj, rs.getObject(field.getDbName()));
 
             return (R)obj;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9500891/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/BasicJdbcDialect.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/BasicJdbcDialect.java b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/BasicJdbcDialect.java
index 03e6f8b..889d4ae 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/BasicJdbcDialect.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/BasicJdbcDialect.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.cache.store.jdbc.dialect;
 
-import org.gridgain.grid.util.typedef.*;
-import org.gridgain.grid.util.typedef.internal.*;
+import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
 
 import java.util.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9500891/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/DB2Dialect.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/DB2Dialect.java b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/DB2Dialect.java
index 4b5e7e7..fecc2ae 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/DB2Dialect.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/DB2Dialect.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.cache.store.jdbc.dialect;
 
-import org.gridgain.grid.util.typedef.*;
+import org.apache.ignite.internal.util.typedef.*;
 
 import java.util.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9500891/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/H2Dialect.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/H2Dialect.java b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/H2Dialect.java
index d6ed168..13cabe0 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/H2Dialect.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/H2Dialect.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.cache.store.jdbc.dialect;
 
-import org.gridgain.grid.util.typedef.*;
+import org.apache.ignite.internal.util.typedef.*;
 
 import java.util.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9500891/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/MySQLDialect.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/MySQLDialect.java b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/MySQLDialect.java
index 0072b31..f2a1565 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/MySQLDialect.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/MySQLDialect.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.cache.store.jdbc.dialect;
 
-import org.gridgain.grid.util.typedef.*;
+import org.apache.ignite.internal.util.typedef.*;
 
 import java.util.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9500891/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/OracleDialect.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/OracleDialect.java b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/OracleDialect.java
index 6fbc409..cc960e8 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/OracleDialect.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/OracleDialect.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.cache.store.jdbc.dialect;
 
-import org.gridgain.grid.util.typedef.*;
+import org.apache.ignite.internal.util.typedef.*;
 
 import java.util.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9500891/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/SQLServerDialect.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/SQLServerDialect.java b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/SQLServerDialect.java
index f4ca4ec..c3ce64b 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/SQLServerDialect.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/SQLServerDialect.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.cache.store.jdbc.dialect;
 
-import org.gridgain.grid.util.typedef.*;
+import org.apache.ignite.internal.util.typedef.*;
 
 import java.util.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9500891/modules/core/src/main/java/org/gridgain/grid/cache/query/GridCacheQueryTypeDescriptor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/query/GridCacheQueryTypeDescriptor.java b/modules/core/src/main/java/org/gridgain/grid/cache/query/GridCacheQueryTypeDescriptor.java
deleted file mode 100644
index 697caef..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/cache/query/GridCacheQueryTypeDescriptor.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.gridgain.grid.cache.query;
-
-import org.gridgain.grid.util.typedef.internal.*;
-
-/**
- * Type descriptor for field in java and database.
- */
-public class GridCacheQueryTypeDescriptor {
-    /** Column name in database. */
-    private String javaName;
-
-    /** Corresponding java type. */
-    private Class<?> javaType;
-
-    /** Column name in database. */
-    private String dbName;
-
-    /** Column JDBC type in database. */
-    private int dbType;
-
-    /**
-     * Default constructor.
-     */
-    public GridCacheQueryTypeDescriptor() {
-        // No-op.
-    }
-
-    /**
-     * @param javaName Field name in java object.
-     * @param javaType Field java type.
-     * @param dbName Column name in database.
-     * @param dbType Column JDBC type in database.
-     */
-    public GridCacheQueryTypeDescriptor(String javaName, Class<?> javaType, String dbName, int dbType) {
-        this.javaName = javaName;
-        this.javaType = javaType;
-        this.dbName = dbName;
-        this.dbType = dbType;
-    }
-
-    /**
-     * @return Field name in java object.
-     */
-    public String getJavaName() {
-        return javaName;
-    }
-
-    /**
-     * @param javaName Field name in java object.
-     */
-    public void setJavaName(String javaName) {
-        this.javaName = javaName;
-    }
-
-    /**
-     * @return Field java type.
-     */
-    public Class<?> getJavaType() {
-        return javaType;
-    }
-
-    /**
-     * @param javaType Corresponding java type.
-     */
-    public void setJavaType(Class<?> javaType) {
-        this.javaType = javaType;
-    }
-
-    /**
-     * @return Column name in database.
-     */
-    public String getDbName() {
-        return dbName;
-    }
-
-    /**
-     * @param dbName Column name in database.
-     */
-    public void setDbName(String dbName) {
-        this.dbName = dbName;
-    }
-
-    /**
-     * @return Column JDBC type in database.
-     */
-    public int getDbType() {
-        return dbType;
-    }
-
-    /**
-     * @param dbType Column JDBC type in database.
-     */
-    public void setDbType(int dbType) {
-        this.dbType = dbType;
-    }
-
-     /** {@inheritDoc} */
-    @Override public boolean equals(Object o) {
-        if (this == o)
-            return true;
-
-        if (!(o instanceof GridCacheQueryTypeDescriptor))
-            return false;
-
-        GridCacheQueryTypeDescriptor that = (GridCacheQueryTypeDescriptor)o;
-
-        return javaName.equals(that.javaName) && dbName.equals(that.dbName) &&
-            javaType == that.javaType && dbType == that.dbType;
-    }
-
-    /** {@inheritDoc} */
-    @Override public int hashCode() {
-        int res = javaName.hashCode();
-
-        res = 31 * res + dbName.hashCode();
-        res = 31 * res + javaType.hashCode();
-        res = 31 * res + dbType;
-
-        return res;
-    }
-
-    /** {@inheritDoc} */
-    @Override public String toString() {
-        return S.toString(GridCacheQueryTypeDescriptor.class, this);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9500891/modules/core/src/test/config/store/jdbc/Ignite.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/store/jdbc/Ignite.xml b/modules/core/src/test/config/store/jdbc/Ignite.xml
new file mode 100644
index 0000000..cc5f117
--- /dev/null
+++ b/modules/core/src/test/config/store/jdbc/Ignite.xml
@@ -0,0 +1,207 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    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.
+-->
+<!--
+    XML generated by Apache Ignite Schema Load utility: 01/26/2015
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans 
+                           http://www.springframework.org/schema/beans/spring-beans.xsd">
+    <bean class="org.apache.ignite.cache.query.CacheQueryTypeMetadata">
+        <property name="type" value="org.apache.ignite.cache.store.jdbc.model.Organization"/>
+        <property name="keyType" value="org.apache.ignite.cache.store.jdbc.model.OrganizationKey"/>
+        <property name="schema" value="PUBLIC"/>
+        <property name="tableName" value="ORGANIZATION"/>
+        <property name="keyDescriptors">
+            <list>
+                <bean class="org.apache.ignite.cache.query.CacheQueryTypeDescriptor">
+                    <property name="javaName" value="id"/>
+                    <property name="javaType" value="java.lang.Integer"/>
+                    <property name="dbName" value="ID"/>
+                    <property name="dbType" value="4"/>
+                </bean>
+            </list>
+        </property>
+        <property name="valueDescriptors">
+            <list>
+                <bean class="org.apache.ignite.cache.query.CacheQueryTypeDescriptor">
+                    <property name="javaName" value="id"/>
+                    <property name="javaType" value="java.lang.Integer"/>
+                    <property name="dbName" value="ID"/>
+                    <property name="dbType" value="4"/>
+                </bean>
+                <bean class="org.apache.ignite.cache.query.CacheQueryTypeDescriptor">
+                    <property name="javaName" value="name"/>
+                    <property name="javaType" value="java.lang.String"/>
+                    <property name="dbName" value="NAME"/>
+                    <property name="dbType" value="12"/>
+                </bean>
+                <bean class="org.apache.ignite.cache.query.CacheQueryTypeDescriptor">
+                    <property name="javaName" value="city"/>
+                    <property name="javaType" value="java.lang.String"/>
+                    <property name="dbName" value="CITY"/>
+                    <property name="dbType" value="12"/>
+                </bean>
+            </list>
+        </property>
+        <property name="queryFields">
+            <map>
+                <entry key="id" value="java.lang.Integer"/>
+                <entry key="name" value="java.lang.String"/>
+                <entry key="city" value="java.lang.String"/>
+            </map>
+        </property>
+        <property name="ascendingFields">
+            <map>
+                <entry key="id" value="java.lang.Integer"/>
+                <entry key="name" value="java.lang.String"/>
+                <entry key="city" value="java.lang.String"/>
+            </map>
+        </property>
+        <property name="groups">
+            <map>
+                <entry key="primaryKeyD">
+                    <map>
+                        <entry key="id">
+                            <bean class="org.apache.ignite.lang.IgniteBiTuple">
+                                <constructor-arg value="java.lang.Integer"/>
+                                <constructor-arg value="false"/>
+                            </bean>
+                        </entry>
+                    </map>
+                </entry>
+                <entry key="orgNameCityIdx">
+                    <map>
+                        <entry key="name">
+                            <bean class="org.apache.ignite.lang.IgniteBiTuple">
+                                <constructor-arg value="java.lang.String"/>
+                                <constructor-arg value="false"/>
+                            </bean>
+                        </entry>
+                        <entry key="city">
+                            <bean class="org.apache.ignite.lang.IgniteBiTuple">
+                                <constructor-arg value="java.lang.String"/>
+                                <constructor-arg value="false"/>
+                            </bean>
+                        </entry>
+                    </map>
+                </entry>
+                <entry key="orgNameIdx">
+                    <map>
+                        <entry key="name">
+                            <bean class="org.apache.ignite.lang.IgniteBiTuple">
+                                <constructor-arg value="java.lang.String"/>
+                                <constructor-arg value="false"/>
+                            </bean>
+                        </entry>
+                    </map>
+                </entry>
+            </map>
+        </property>
+    </bean>
+    <bean class="org.apache.ignite.cache.query.CacheQueryTypeMetadata">
+        <property name="type" value="org.apache.ignite.cache.store.jdbc.model.Person"/>
+        <property name="keyType" value="org.apache.ignite.cache.store.jdbc.model.PersonKey"/>
+        <property name="schema" value="PUBLIC"/>
+        <property name="tableName" value="PERSON"/>
+        <property name="keyDescriptors">
+            <list>
+                <bean class="org.apache.ignite.cache.query.CacheQueryTypeDescriptor">
+                    <property name="javaName" value="id"/>
+                    <property name="javaType" value="java.lang.Integer"/>
+                    <property name="dbName" value="ID"/>
+                    <property name="dbType" value="4"/>
+                </bean>
+            </list>
+        </property>
+        <property name="valueDescriptors">
+            <list>
+                <bean class="org.apache.ignite.cache.query.CacheQueryTypeDescriptor">
+                    <property name="javaName" value="id"/>
+                    <property name="javaType" value="java.lang.Integer"/>
+                    <property name="dbName" value="ID"/>
+                    <property name="dbType" value="4"/>
+                </bean>
+                <bean class="org.apache.ignite.cache.query.CacheQueryTypeDescriptor">
+                    <property name="javaName" value="orgId"/>
+                    <property name="javaType" value="java.lang.Integer"/>
+                    <property name="dbName" value="ORG_ID"/>
+                    <property name="dbType" value="4"/>
+                </bean>
+                <bean class="org.apache.ignite.cache.query.CacheQueryTypeDescriptor">
+                    <property name="javaName" value="name"/>
+                    <property name="javaType" value="java.lang.String"/>
+                    <property name="dbName" value="NAME"/>
+                    <property name="dbType" value="12"/>
+                </bean>
+            </list>
+        </property>
+        <property name="queryFields">
+            <map>
+                <entry key="id" value="java.lang.Integer"/>
+                <entry key="orgId" value="java.lang.Integer"/>
+                <entry key="name" value="java.lang.String"/>
+            </map>
+        </property>
+        <property name="ascendingFields">
+            <map>
+                <entry key="id" value="java.lang.Integer"/>
+                <entry key="name" value="java.lang.String"/>
+            </map>
+        </property>
+        <property name="descendingFields">
+            <map>
+                <entry key="name" value="java.lang.String"/>
+            </map>
+        </property>
+        <property name="groups">
+            <map>
+                <entry key="primaryKey8">
+                    <map>
+                        <entry key="id">
+                            <bean class="org.apache.ignite.lang.IgniteBiTuple">
+                                <constructor-arg value="java.lang.Integer"/>
+                                <constructor-arg value="false"/>
+                            </bean>
+                        </entry>
+                    </map>
+                </entry>
+                <entry key="personNameIdx1">
+                    <map>
+                        <entry key="name">
+                            <bean class="org.apache.ignite.lang.IgniteBiTuple">
+                                <constructor-arg value="java.lang.String"/>
+                                <constructor-arg value="false"/>
+                            </bean>
+                        </entry>
+                    </map>
+                </entry>
+                <entry key="personNameIdx2">
+                    <map>
+                        <entry key="name">
+                            <bean class="org.apache.ignite.lang.IgniteBiTuple">
+                                <constructor-arg value="java.lang.String"/>
+                                <constructor-arg value="true"/>
+                            </bean>
+                        </entry>
+                    </map>
+                </entry>
+            </map>
+        </property>
+    </bean>
+</beans>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9500891/modules/core/src/test/config/store/jdbc/all.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/store/jdbc/all.xml b/modules/core/src/test/config/store/jdbc/all.xml
deleted file mode 100644
index 4d66531..0000000
--- a/modules/core/src/test/config/store/jdbc/all.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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.
-  -->
-
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-    <bean class="org.gridgain.grid.cache.query.GridCacheQueryTypeMetadata">
-        <property name="type" value="org.apache.ignite.cache.store.jdbc.model.Person"/>
-        <property name="keyType" value="org.apache.ignite.cache.store.jdbc.model.PersonKey"/>
-        <property name="schema" value="PUBLIC"/>
-        <property name="tableName" value="PERSON"/>
-        <property name="keyDescriptors">
-            <list>
-                <bean class="org.gridgain.grid.cache.query.GridCacheQueryTypeDescriptor">
-                    <property name="javaName" value="id"/>
-                    <property name="javaType" value="java.lang.Integer"/>
-                    <property name="dbName" value="ID"/>
-                    <property name="dbType" value="4"/>
-                </bean>
-            </list>
-        </property>
-        <property name="valueDescriptors">
-            <list>
-                <bean class="org.gridgain.grid.cache.query.GridCacheQueryTypeDescriptor">
-                    <property name="javaName" value="id"/>
-                    <property name="javaType" value="java.lang.Integer"/>
-                    <property name="dbName" value="ID"/>
-                    <property name="dbType" value="4"/>
-                </bean>
-                <bean class="org.gridgain.grid.cache.query.GridCacheQueryTypeDescriptor">
-                    <property name="javaName" value="orgId"/>
-                    <property name="javaType" value="java.lang.Integer"/>
-                    <property name="dbName" value="ORG_ID"/>
-                    <property name="dbType" value="4"/>
-                </bean>
-                <bean class="org.gridgain.grid.cache.query.GridCacheQueryTypeDescriptor">
-                    <property name="javaName" value="name"/>
-                    <property name="javaType" value="java.lang.String"/>
-                    <property name="dbName" value="NAME"/>
-                    <property name="dbType" value="12"/>
-                </bean>
-            </list>
-        </property>
-    </bean>
-    <bean class="org.gridgain.grid.cache.query.GridCacheQueryTypeMetadata">
-        <property name="type" value="org.apache.ignite.cache.store.jdbc.model.Organization"/>
-        <property name="keyType" value="org.apache.ignite.cache.store.jdbc.model.OrganizationKey"/>
-        <property name="schema" value="PUBLIC"/>
-        <property name="tableName" value="ORGANIZATION"/>
-        <property name="keyDescriptors">
-            <list>
-                <bean class="org.gridgain.grid.cache.query.GridCacheQueryTypeDescriptor">
-                    <property name="javaName" value="id"/>
-                    <property name="javaType" value="java.lang.Integer"/>
-                    <property name="dbName" value="ID"/>
-                    <property name="dbType" value="4"/>
-                </bean>
-            </list>
-        </property>
-        <property name="valueDescriptors">
-            <list>
-                <bean class="org.gridgain.grid.cache.query.GridCacheQueryTypeDescriptor">
-                    <property name="javaName" value="id"/>
-                    <property name="javaType" value="java.lang.Integer"/>
-                    <property name="dbName" value="ID"/>
-                    <property name="dbType" value="4"/>
-                </bean>
-                <bean class="org.gridgain.grid.cache.query.GridCacheQueryTypeDescriptor">
-                    <property name="javaName" value="city"/>
-                    <property name="javaType" value="java.lang.String"/>
-                    <property name="dbName" value="CITY"/>
-                    <property name="dbType" value="12"/>
-                </bean>
-                <bean class="org.gridgain.grid.cache.query.GridCacheQueryTypeDescriptor">
-                    <property name="javaName" value="name"/>
-                    <property name="javaType" value="java.lang.String"/>
-                    <property name="dbName" value="NAME"/>
-                    <property name="dbType" value="12"/>
-                </bean>
-            </list>
-        </property>
-    </bean>
-</beans>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9500891/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/AbstractCacheStoreMultithreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/AbstractCacheStoreMultithreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/AbstractCacheStoreMultithreadedSelfTest.java
index 483b2c3..0eb110c 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/AbstractCacheStoreMultithreadedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/AbstractCacheStoreMultithreadedSelfTest.java
@@ -17,20 +17,18 @@
 
 package org.apache.ignite.cache.store.jdbc;
 
+import org.apache.ignite.cache.*;
 import org.apache.ignite.cache.store.jdbc.model.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.gridgain.grid.cache.*;
-import org.gridgain.grid.util.typedef.internal.*;
-import org.gridgain.testframework.junits.common.*;
+import org.apache.ignite.testframework.junits.common.*;
 import org.jetbrains.annotations.*;
 
 import java.sql.*;
 import java.util.*;
 import java.util.concurrent.*;
 
-import static org.gridgain.testframework.GridTestUtils.*;
-
 /**
  *
  */
@@ -97,7 +95,7 @@ public abstract class AbstractCacheStoreMultithreadedSelfTest<T extends JdbcCach
     public void testMultithreadedPutAll() throws Exception {
         startGrid();
 
-        runMultiThreaded(new Callable<Object>() {
+        multithreaded(new Callable<Object>() {
             private final Random rnd = new Random();
 
             @Nullable @Override public Object call() throws Exception {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9500891/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/PojoCacheStoreMultitreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/PojoCacheStoreMultitreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/PojoCacheStoreMultitreadedSelfTest.java
index e061d7a..0f2ca13 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/PojoCacheStoreMultitreadedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/PojoCacheStoreMultitreadedSelfTest.java
@@ -19,10 +19,10 @@ package org.apache.ignite.cache.store.jdbc;
 
 import org.apache.ignite.*;
 import org.apache.ignite.cache.*;
+import org.apache.ignite.cache.query.*;
 import org.apache.ignite.configuration.*;
+import org.apache.ignite.internal.util.typedef.*;
 import org.apache.ignite.spi.discovery.tcp.*;
-import org.gridgain.grid.cache.query.*;
-import org.gridgain.grid.util.typedef.*;
 import org.h2.jdbcx.*;
 import org.springframework.beans.*;
 import org.springframework.beans.factory.xml.*;
@@ -34,8 +34,8 @@ import java.io.*;
 import java.net.*;
 import java.util.*;
 
-import static org.gridgain.grid.cache.GridCacheAtomicityMode.*;
-import static org.gridgain.grid.cache.GridCacheMode.*;
+import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMode.*;
 
 /**
  *
@@ -50,7 +50,7 @@ public class PojoCacheStoreMultitreadedSelfTest extends AbstractCacheStoreMultit
         UrlResource metaUrl;
 
         try {
-            metaUrl = new UrlResource(new File("modules/core/src/test/config/store/jdbc/all.xml").toURI().toURL());
+            metaUrl = new UrlResource(new File("modules/core/src/test/config/store/jdbc/Ignite.xml").toURI().toURL());
         }
         catch (MalformedURLException e) {
             throw new IgniteCheckedException("Failed to resolve metadata path [err=" + e.getMessage() + ']', e);
@@ -63,8 +63,8 @@ public class PojoCacheStoreMultitreadedSelfTest extends AbstractCacheStoreMultit
 
             springCtx.refresh();
 
-            Collection<GridCacheQueryTypeMetadata> typeMetadata =
-                springCtx.getBeansOfType(GridCacheQueryTypeMetadata.class).values();
+            Collection<CacheQueryTypeMetadata> typeMetadata =
+                springCtx.getBeansOfType(CacheQueryTypeMetadata.class).values();
 
             store.setTypeMetadata(typeMetadata);
         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9500891/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/PojoCacheStoreSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/PojoCacheStoreSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/PojoCacheStoreSelfTest.java
index 83e95ea..146e50c 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/PojoCacheStoreSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/PojoCacheStoreSelfTest.java
@@ -18,18 +18,17 @@
 package org.apache.ignite.cache.store.jdbc;
 
 import org.apache.ignite.*;
+import org.apache.ignite.cache.query.*;
 import org.apache.ignite.cache.store.*;
 import org.apache.ignite.cache.store.jdbc.model.*;
+import org.apache.ignite.internal.processors.cache.*;
+import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.testframework.*;
+import org.apache.ignite.testframework.junits.cache.*;
+import org.apache.ignite.testframework.junits.common.*;
 import org.apache.ignite.transactions.*;
-import org.gridgain.grid.cache.query.*;
-import org.gridgain.grid.kernal.processors.cache.*;
-import org.gridgain.grid.util.typedef.*;
-import org.gridgain.grid.util.typedef.internal.*;
-import org.gridgain.testframework.*;
-import org.gridgain.testframework.junits.cache.GridAbstractCacheStoreSelfTest.*;
-import org.gridgain.testframework.junits.cache.*;
-import org.gridgain.testframework.junits.common.*;
 import org.h2.jdbcx.*;
 import org.jetbrains.annotations.*;
 import org.springframework.beans.*;
@@ -45,6 +44,8 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
 
+import static org.apache.ignite.testframework.junits.cache.GridAbstractCacheStoreSelfTest.*;
+
 /**
  * Class for {@code PojoCacheStore} tests.
  */
@@ -87,7 +88,7 @@ public class PojoCacheStoreSelfTest extends GridCommonAbstractTest {
         UrlResource metaUrl;
 
         try {
-            metaUrl = new UrlResource(new File("modules/core/src/test/config/store/jdbc/all.xml").toURI().toURL());
+            metaUrl = new UrlResource(new File("modules/core/src/test/config/store/jdbc/Ignite.xml").toURI().toURL());
         }
         catch (MalformedURLException e) {
             throw new IgniteCheckedException("Failed to resolve metadata path [err=" + e.getMessage() + ']', e);
@@ -100,8 +101,8 @@ public class PojoCacheStoreSelfTest extends GridCommonAbstractTest {
 
             springCtx.refresh();
 
-            Collection<GridCacheQueryTypeMetadata> typeMetadata =
-                springCtx.getBeansOfType(GridCacheQueryTypeMetadata.class).values();
+            Collection<CacheQueryTypeMetadata> typeMetadata =
+                springCtx.getBeansOfType(CacheQueryTypeMetadata.class).values();
 
             store.setTypeMetadata(typeMetadata);
         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9500891/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/Organization.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/Organization.java b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/Organization.java
index 92a58d3..1b9bdc8 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/Organization.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/Organization.java
@@ -22,7 +22,7 @@ import java.io.*;
 /**
  * Organization definition.
  *
- * Code generated by Apache Ignite Schema Load utility.
+ * Code generated by Apache Ignite Schema Load utility: 01/26/2015.
  */
 public class Organization implements Serializable {
     /** */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9500891/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/OrganizationKey.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/OrganizationKey.java b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/OrganizationKey.java
index 7b48aed..c14b3b0 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/OrganizationKey.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/OrganizationKey.java
@@ -22,7 +22,7 @@ import java.io.*;
 /**
  * OrganizationKey definition.
  *
- * Code generated by Apache Ignite Schema Load utility.
+ * Code generated by Apache Ignite Schema Load utility: 01/26/2015.
  */
 public class OrganizationKey implements Serializable {
     /** */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9500891/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/Person.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/Person.java b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/Person.java
index 6d8c1d2..2b1980d 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/Person.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/Person.java
@@ -22,7 +22,7 @@ import java.io.*;
 /**
  * Person definition.
  *
- * Code generated by Apache Ignite Schema Load utility.
+ * Code generated by Apache Ignite Schema Load utility: 01/26/2015.
  */
 public class Person implements Serializable {
     /** */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9500891/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/PersonKey.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/PersonKey.java b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/PersonKey.java
index 068041b..0344484 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/PersonKey.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/PersonKey.java
@@ -22,7 +22,7 @@ import java.io.*;
 /**
  * PersonKey definition.
  *
- * Code generated by Apache Ignite Schema Load utility.
+ * Code generated by Apache Ignite Schema Load utility: 01/26/2015.
  */
 public class PersonKey implements Serializable {
     /** */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9500891/modules/schema-load/src/main/java/org/apache/ignite/schema/generator/XmlGenerator.java
----------------------------------------------------------------------
diff --git a/modules/schema-load/src/main/java/org/apache/ignite/schema/generator/XmlGenerator.java b/modules/schema-load/src/main/java/org/apache/ignite/schema/generator/XmlGenerator.java
index ddeaa2a..f28b933 100644
--- a/modules/schema-load/src/main/java/org/apache/ignite/schema/generator/XmlGenerator.java
+++ b/modules/schema-load/src/main/java/org/apache/ignite/schema/generator/XmlGenerator.java
@@ -17,10 +17,10 @@
 
 package org.apache.ignite.schema.generator;
 
+import org.apache.ignite.cache.query.*;
+import org.apache.ignite.internal.util.typedef.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.schema.ui.*;
-import org.gridgain.grid.cache.query.*;
-import org.gridgain.grid.util.typedef.*;
 import org.w3c.dom.*;
 
 import javax.xml.parsers.*;
@@ -169,14 +169,14 @@ public class XmlGenerator {
      * @param descs Map with type descriptors.
      */
     private static void addTypeDescriptors(Document doc, Node parent, String name,
-        Collection<GridCacheQueryTypeDescriptor> descs) {
+        Collection<CacheQueryTypeDescriptor> descs) {
         if (!descs.isEmpty()) {
             Element prop = addProperty(doc, parent, name, null);
 
             Element list = addElement(doc, prop, "list");
 
-            for (GridCacheQueryTypeDescriptor desc : descs) {
-                Element item = addBean(doc, list, GridCacheQueryTypeDescriptor.class);
+            for (CacheQueryTypeDescriptor desc : descs) {
+                Element item = addBean(doc, list, CacheQueryTypeDescriptor.class);
 
                 addProperty(doc, item, "javaName", desc.getJavaName());
                 addProperty(doc, item, "javaType", desc.getJavaType().getName());
@@ -251,8 +251,8 @@ public class XmlGenerator {
      * @param pkg Package fo types.
      * @param meta Meta.
      */
-    private static void addTypeMetadata(Document doc, Node parent, String pkg, GridCacheQueryTypeMetadata meta) {
-        Element bean = addBean(doc, parent, GridCacheQueryTypeMetadata.class);
+    private static void addTypeMetadata(Document doc, Node parent, String pkg, CacheQueryTypeMetadata meta) {
+        Element bean = addBean(doc, parent, CacheQueryTypeMetadata.class);
 
         addProperty(doc, bean, "type", pkg + "." + meta.getType());
 
@@ -285,7 +285,7 @@ public class XmlGenerator {
      * @param out File to output result.
      * @param askOverwrite Callback to ask user to confirm file overwrite.
      */
-    public static void generate(String pkg, GridCacheQueryTypeMetadata meta, File out, ConfirmCallable askOverwrite) {
+    public static void generate(String pkg, CacheQueryTypeMetadata meta, File out, ConfirmCallable askOverwrite) {
         generate(pkg, Collections.singleton(meta), out, askOverwrite);
     }
 
@@ -297,7 +297,7 @@ public class XmlGenerator {
      * @param out File to output result.
      * @param askOverwrite Callback to ask user to confirm file overwrite.
      */
-    public static void generate(String pkg, Collection<GridCacheQueryTypeMetadata> meta, File out,
+    public static void generate(String pkg, Collection<CacheQueryTypeMetadata> meta, File out,
         ConfirmCallable askOverwrite) {
 
         try {
@@ -323,14 +323,11 @@ public class XmlGenerator {
             Element beans = addElement(doc, doc, "beans");
             beans.setAttribute("xmlns", "http://www.springframework.org/schema/beans");
             beans.setAttribute("xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance");
-            beans.setAttribute("xmlns:util", "http://www.springframework.org/schema/util");
             beans.setAttribute("xsi:schemaLocation",
                 "http://www.springframework.org/schema/beans " +
-                    "http://www.springframework.org/schema/beans/spring-beans.xsd " +
-                    "http://www.springframework.org/schema/util " +
-                    "http://www.springframework.org/schema/util/spring-util.xsd");
+                "http://www.springframework.org/schema/beans/spring-beans.xsd");
 
-            for (GridCacheQueryTypeMetadata item : meta)
+            for (CacheQueryTypeMetadata item : meta)
                 addTypeMetadata(doc, beans, pkg, item);
 
             TransformerFactory transformerFactory = TransformerFactory.newInstance();
@@ -349,7 +346,7 @@ public class XmlGenerator {
                 .replaceAll("><", ">\n<")
                 .replaceAll("\" xmlns", "\"\n       xmlns")
                 .replaceAll("\" xsi", "\"\n       xsi")
-                .replaceAll(" http://www.springframework", " \n                           http://www.springframewor")
+                .replaceAll(" http://www.springframework", " \n                           http://www.springframework")
                 .getBytes());
         }
         catch (ParserConfigurationException | TransformerException | IOException e) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9500891/modules/schema-load/src/main/java/org/apache/ignite/schema/model/PojoDescriptor.java
----------------------------------------------------------------------
diff --git a/modules/schema-load/src/main/java/org/apache/ignite/schema/model/PojoDescriptor.java b/modules/schema-load/src/main/java/org/apache/ignite/schema/model/PojoDescriptor.java
index 25db57e..d7dec61 100644
--- a/modules/schema-load/src/main/java/org/apache/ignite/schema/model/PojoDescriptor.java
+++ b/modules/schema-load/src/main/java/org/apache/ignite/schema/model/PojoDescriptor.java
@@ -20,7 +20,7 @@ package org.apache.ignite.schema.model;
 import javafx.beans.property.*;
 import javafx.beans.value.*;
 import javafx.collections.*;
-import org.gridgain.grid.cache.query.*;
+import org.apache.ignite.cache.query.*;
 
 import java.util.*;
 
@@ -47,7 +47,7 @@ public class PojoDescriptor {
     private final PojoDescriptor parent;
 
     /** Type metadata. */
-    private final GridCacheQueryTypeMetadata typeMeta;
+    private final CacheQueryTypeMetadata typeMeta;
 
     /** Children items (tables names). */
     private Collection<PojoDescriptor> children = Collections.emptyList();
@@ -68,7 +68,7 @@ public class PojoDescriptor {
      * @return New {@code PojoDescriptor} instance.
      */
     public static PojoDescriptor schema(String schema) {
-        GridCacheQueryTypeMetadata typeMeta = new GridCacheQueryTypeMetadata();
+        CacheQueryTypeMetadata typeMeta = new CacheQueryTypeMetadata();
 
         typeMeta.setSchema(schema);
         typeMeta.setTableName("");
@@ -85,7 +85,7 @@ public class PojoDescriptor {
      * @param typeMeta Type metadata descriptor.
      * @param fields List of POJO fields.
      */
-    public PojoDescriptor(PojoDescriptor prn, GridCacheQueryTypeMetadata typeMeta, List<PojoField> fields) {
+    public PojoDescriptor(PojoDescriptor prn, CacheQueryTypeMetadata typeMeta, List<PojoField> fields) {
         parent = prn;
 
         fullDbName = typeMeta.getSchema() + "." + typeMeta.getTableName();
@@ -279,13 +279,13 @@ public class PojoDescriptor {
      * @param includeKeys {@code true} if key fields should be included into value class.
      * @return Type metadata updated with user changes.
      */
-    public GridCacheQueryTypeMetadata metadata(boolean includeKeys) {
+    public CacheQueryTypeMetadata metadata(boolean includeKeys) {
         typeMeta.setKeyType(keyClsName.get());
         typeMeta.setType(valClsName.get());
 
-        Collection<GridCacheQueryTypeDescriptor> keys = new ArrayList<>();
+        Collection<CacheQueryTypeDescriptor> keys = new ArrayList<>();
 
-        Collection<GridCacheQueryTypeDescriptor> vals = new ArrayList<>();
+        Collection<CacheQueryTypeDescriptor> vals = new ArrayList<>();
 
         for (PojoField field : fields) {
             if (field.key()) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9500891/modules/schema-load/src/main/java/org/apache/ignite/schema/model/PojoField.java
----------------------------------------------------------------------
diff --git a/modules/schema-load/src/main/java/org/apache/ignite/schema/model/PojoField.java b/modules/schema-load/src/main/java/org/apache/ignite/schema/model/PojoField.java
index 0a76c72..346b1c9 100644
--- a/modules/schema-load/src/main/java/org/apache/ignite/schema/model/PojoField.java
+++ b/modules/schema-load/src/main/java/org/apache/ignite/schema/model/PojoField.java
@@ -19,7 +19,7 @@ package org.apache.ignite.schema.model;
 
 import javafx.beans.property.*;
 import javafx.collections.*;
-import org.gridgain.grid.cache.query.*;
+import org.apache.ignite.cache.query.*;
 
 import java.math.*;
 import java.net.*;
@@ -65,7 +65,7 @@ public class PojoField {
     private final ObservableList<String> conversions;
 
     /** Field type desctiptor. */
-    private final GridCacheQueryTypeDescriptor desc;
+    private final CacheQueryTypeDescriptor desc;
 
     /**
      * @param clss List of classes to get class names.
@@ -146,7 +146,7 @@ public class PojoField {
      * @param desc Field type descriptor.
      * @param nullable {@code true} if {@code NULL} is allowed for this field in database.
      */
-    public PojoField(boolean key, GridCacheQueryTypeDescriptor desc, boolean nullable) {
+    public PojoField(boolean key, CacheQueryTypeDescriptor desc, boolean nullable) {
         keyPrev = key;
 
         this.key = new SimpleBooleanProperty(key);
@@ -327,7 +327,7 @@ public class PojoField {
     /**
      * @return Field type descriptor.
      */
-    public GridCacheQueryTypeDescriptor descriptor() {
+    public CacheQueryTypeDescriptor descriptor() {
         desc.setJavaName(javaName());
         desc.setJavaType(classesMap.get(javaTypeName()));
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9500891/modules/schema-load/src/main/java/org/apache/ignite/schema/parser/DatabaseMetadataParser.java
----------------------------------------------------------------------
diff --git a/modules/schema-load/src/main/java/org/apache/ignite/schema/parser/DatabaseMetadataParser.java b/modules/schema-load/src/main/java/org/apache/ignite/schema/parser/DatabaseMetadataParser.java
index c21a1ce..98ad4c2 100644
--- a/modules/schema-load/src/main/java/org/apache/ignite/schema/parser/DatabaseMetadataParser.java
+++ b/modules/schema-load/src/main/java/org/apache/ignite/schema/parser/DatabaseMetadataParser.java
@@ -18,9 +18,9 @@
 package org.apache.ignite.schema.parser;
 
 import javafx.collections.*;
+import org.apache.ignite.cache.query.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.schema.model.*;
-import org.gridgain.grid.cache.query.*;
 
 import java.math.*;
 import java.net.*;
@@ -30,7 +30,7 @@ import java.util.*;
 import static java.sql.Types.*;
 
 /**
- * TODO: Add class description.
+ * Database metadata parser.
  */
 public class DatabaseMetadataParser {
     /**
@@ -151,12 +151,12 @@ public class DatabaseMetadataParser {
      * @param catalog Catalog name.
      * @param schema Schema name.
      * @param tbl Table name.
-     * @return New initialized instance of {@code GridCacheQueryTypeMetadata}.
+     * @return New initialized instance of {@code CacheQueryTypeMetadata}.
      * @throws SQLException If parsing failed.
      */
     private static PojoDescriptor parseTable(PojoDescriptor parent, DatabaseMetaData dbMeta, String catalog,
         String schema, String tbl) throws SQLException {
-        GridCacheQueryTypeMetadata typeMeta = new GridCacheQueryTypeMetadata();
+        CacheQueryTypeMetadata typeMeta = new CacheQueryTypeMetadata();
 
         typeMeta.setSchema(schema);
         typeMeta.setTableName(tbl);
@@ -164,8 +164,8 @@ public class DatabaseMetadataParser {
         typeMeta.setType(toJavaClassName(tbl));
         typeMeta.setKeyType(typeMeta.getType() + "Key");
 
-        Collection<GridCacheQueryTypeDescriptor> keyDescs = typeMeta.getKeyDescriptors();
-        Collection<GridCacheQueryTypeDescriptor> valDescs = typeMeta.getValueDescriptors();
+        Collection<CacheQueryTypeDescriptor> keyDescs = typeMeta.getKeyDescriptors();
+        Collection<CacheQueryTypeDescriptor> valDescs = typeMeta.getValueDescriptors();
 
         Map<String, Class<?>> qryFields = typeMeta.getQueryFields();
         Map<String, Class<?>> ascFields = typeMeta.getAscendingFields();
@@ -193,7 +193,7 @@ public class DatabaseMetadataParser {
 
                 Class<?> javaType = dataType(dbType);
 
-                GridCacheQueryTypeDescriptor desc = new GridCacheQueryTypeDescriptor(javaName, javaType, dbName, dbType);
+                CacheQueryTypeDescriptor desc = new CacheQueryTypeDescriptor(javaName, javaType, dbName, dbType);
 
                 boolean key = pkFlds.contains(dbName);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9500891/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/SchemaLoadApp.java
----------------------------------------------------------------------
diff --git a/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/SchemaLoadApp.java b/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/SchemaLoadApp.java
index c373654..12a07c8 100644
--- a/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/SchemaLoadApp.java
+++ b/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/SchemaLoadApp.java
@@ -28,10 +28,10 @@ import javafx.scene.control.*;
 import javafx.scene.layout.*;
 import javafx.stage.*;
 import javafx.util.*;
+import org.apache.ignite.cache.query.*;
 import org.apache.ignite.schema.generator.*;
 import org.apache.ignite.schema.model.*;
 import org.apache.ignite.schema.parser.*;
-import org.gridgain.grid.cache.query.*;
 
 import java.io.*;
 import java.net.*;
@@ -276,7 +276,7 @@ public class SchemaLoadApp extends Application {
         final File destFolder = new File(outFolder);
 
         Runnable task = new Task<Void>() {
-            private void checkEmpty(final PojoDescriptor pojo, Collection<GridCacheQueryTypeDescriptor> descs,
+            private void checkEmpty(final PojoDescriptor pojo, Collection<CacheQueryTypeDescriptor> descs,
                 String msg) {
                 if (descs.isEmpty()) {
                     Platform.runLater(new Runnable() {
@@ -296,7 +296,7 @@ public class SchemaLoadApp extends Application {
                 if (!destFolder.exists() && !destFolder.mkdirs())
                     throw new IOException("Failed to create output folder: " + destFolder);
 
-                Collection<GridCacheQueryTypeMetadata> all = new ArrayList<>();
+                Collection<CacheQueryTypeMetadata> all = new ArrayList<>();
 
                 boolean constructor = pojoConstructorCh.isSelected();
                 boolean includeKeys = pojoIncludeKeysCh.isSelected();
@@ -307,7 +307,7 @@ public class SchemaLoadApp extends Application {
                 // Generate XML and POJO.
                 for (PojoDescriptor pojo : selPojos) {
                     if (pojo.selected()) {
-                        GridCacheQueryTypeMetadata meta = pojo.metadata(includeKeys);
+                        CacheQueryTypeMetadata meta = pojo.metadata(includeKeys);
 
                         checkEmpty(pojo, meta.getKeyDescriptors(), "No key fields specified for type: ");
 


Mime
View raw message