diff --git a/modules/cassandra/README.txt b/modules/cassandra/README.txt
index cc2134d5e6738..146e5d44465fb 100644
--- a/modules/cassandra/README.txt
+++ b/modules/cassandra/README.txt
@@ -1,16 +1,12 @@
Apache Ignite Cassandra Module
------------------------
-Apache Ignite Cassandra module provides CacheStore implementation backed by Cassandra database.
-
-To enable Cassandra module when starting a standalone node, move 'optional/ignite-cassandra' folder to
-'libs' folder before running 'ignite.{sh|bat}' script. The content of the module folder will
-be added to classpath in this case.
+Apache Ignite Cassandra module, used just as a parent container for other Cassandra related modules.
Importing Cassandra Module In Maven Project
-------------------------------------
-If you are using Maven to manage dependencies of your project, you can add Cassandra module
+If you are using Maven to manage dependencies of your project, you can add Cassandra Store module
dependency like this (replace '${ignite.version}' with actual Ignite version you are
interested in):
diff --git a/modules/cassandra/pom.xml b/modules/cassandra/pom.xml
index cb2fc55f99054..733d53c71f002 100644
--- a/modules/cassandra/pom.xml
+++ b/modules/cassandra/pom.xml
@@ -31,311 +31,22 @@
ignite-cassandra
+ pom1.8.0-SNAPSHOThttp://ignite.apache.org
-
- 1.8.3
- 3.0.0
- 3.3
- 3.0.3
- 1.10.1
- 1.3.0
- 5.0.3
- 2.1
- 4.0.33.Final
- 19.0
- 3.0.2
-
-
-
-
-
- commons-beanutils
- commons-beanutils
- ${commons-beanutils.version}
-
-
-
-
- com.esotericsoftware
- kryo
- ${kryo.version}
-
-
-
- com.esotericsoftware
- reflectasm
- ${reflectasm.version}
-
-
-
- com.esotericsoftware
- minlog
- ${minlog.version}
-
-
-
- org.ow2.asm
- asm
- ${asm.version}
-
-
-
- org.objenesis
- objenesis
- ${objenesis.version}
-
-
-
-
- org.apache.ignite
- ignite-core
- ${project.version}
-
-
-
- org.apache.ignite
- ignite-spring
- ${project.version}
-
-
-
- org.apache.ignite
- ignite-log4j
- ${project.version}
- test
-
-
-
-
- com.datastax.cassandra
- cassandra-driver-core
- ${cassandra-driver.version}
-
-
-
- io.netty
- netty-handler
- ${netty.version}
-
-
-
- io.netty
- netty-buffer
- ${netty.version}
-
-
-
- io.netty
- netty-common
- ${netty.version}
-
-
-
- io.netty
- netty-transport
- ${netty.version}
-
-
-
- io.netty
- netty-codec
- ${netty.version}
-
-
-
- com.google.guava
- guava
- ${guava.version}
-
-
-
- com.codahale.metrics
- metrics-core
- ${metrics-core.version}
-
-
-
- org.apache.cassandra
- cassandra-all
- ${cassandra-all.version}
- test
-
-
- log4j-over-slf4j
- org.slf4j
-
-
-
-
-
-
- log4j
- log4j
- test
-
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
- 3.2
-
-
- 1.7
- 1.7
- UTF-8
- true
- false
- lines,vars,source
- 256
- 512
-
-
-
-
- org.apache.maven.plugins
- maven-dependency-plugin
- 2.10
-
-
- copy-all-dependencies
- package
-
- copy-dependencies
-
-
- ${project.build.directory}/tests-package/lib
- false
- false
- true
-
- netty-all,cassandra-all,snappy-java,lz4,compress-lzf,commons-codec,commons-lang3,commons-math3,
- concurrentlinkedhashmap-lru,antlr,ST4,antlr-runtime,jcl-over-slf4j,jackson-core-asl,
- jackson-mapper-asl,json-simple,high-scale-lib,snakeyaml,jbcrypt,reporter-config3,
- reporter-config-base,hibernate-validator,validation-api,jboss-logging,thrift-server,
- disruptor,stream,fastutil,logback-core,logback-classic,libthrift,httpclient,httpcore,
- cassandra-thrift,jna,jamm,joda-time,sigar,ecj,tools
-
-
-
-
-
- copy-main-dependencies
- package
-
- copy-dependencies
-
-
- ${project.build.directory}/libs
- false
- false
- true
- true
-
- org.apache.ignite,org.springframework,org.gridgain
-
-
- commons-logging,slf4j-api,cache-api,slf4j-api,aopalliance
-
- runtime
-
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-antrun-plugin
- 1.8
-
-
- ant-contrib
- ant-contrib
- 1.0b3
-
-
- ant
- ant
-
-
-
-
-
-
- package-tests
- package
-
- run
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ ignite-cassandra-store
+ org.apache.ignite
+ ${project.version}
+
+
+
+
+
+ store
+ serializers
+
diff --git a/modules/cassandra/serializers/README.txt b/modules/cassandra/serializers/README.txt
new file mode 100644
index 0000000000000..01948eca63bc8
--- /dev/null
+++ b/modules/cassandra/serializers/README.txt
@@ -0,0 +1,33 @@
+Apache Ignite Cassandra Serializers Module
+------------------------
+
+Apache Ignite Cassandra Serializers module provides additional serializers to store objects as BLOBs in Cassandra. The
+module could be used as an addition to Ignite Cassandra Store module.
+
+To enable Cassandra Serializers module when starting a standalone node, move 'optional/ignite-cassandra-serializers' folder to
+'libs' folder before running 'ignite.{sh|bat}' script. The content of the module folder will
+be added to classpath in this case.
+
+Importing Cassandra Serializers Module In Maven Project
+-------------------------------------
+
+If you are using Maven to manage dependencies of your project, you can add Cassandra Store module
+dependency like this (replace '${ignite.version}' with actual Ignite version you are
+interested in):
+
+
+ ...
+
+ ...
+
+ org.apache.ignite
+ ignite-cassandra-serializers
+ ${ignite.version}
+
+ ...
+
+ ...
+
diff --git a/modules/cassandra/licenses/apache-2.0.txt b/modules/cassandra/serializers/licenses/apache-2.0.txt
similarity index 100%
rename from modules/cassandra/licenses/apache-2.0.txt
rename to modules/cassandra/serializers/licenses/apache-2.0.txt
diff --git a/modules/cassandra/serializers/pom.xml b/modules/cassandra/serializers/pom.xml
new file mode 100644
index 0000000000000..33be131ce7b3c
--- /dev/null
+++ b/modules/cassandra/serializers/pom.xml
@@ -0,0 +1,129 @@
+
+
+
+
+
+
+ 4.0.0
+
+
+ org.apache.ignite
+ ignite-cassandra
+ 1.8.0-SNAPSHOT
+ ..
+
+
+ ignite-cassandra-serializers
+ 1.8.0-SNAPSHOT
+ http://ignite.apache.org
+
+
+ 3.0.3
+ 1.10.1
+ 1.3.0
+ 5.0.3
+ 2.1
+
+
+
+
+ ignite-cassandra-store
+ org.apache.ignite
+
+
+
+
+ com.esotericsoftware
+ kryo
+ ${kryo.version}
+
+
+
+ com.esotericsoftware
+ reflectasm
+ ${reflectasm.version}
+
+
+
+ com.esotericsoftware
+ minlog
+ ${minlog.version}
+
+
+
+ org.ow2.asm
+ asm
+ ${asm.version}
+
+
+
+ org.objenesis
+ objenesis
+ ${objenesis.version}
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+ 3.2
+
+
+ 1.7
+ 1.7
+ UTF-8
+ true
+ false
+ lines,vars,source
+ 256
+ 512
+
+
+
+
+ org.apache.maven.plugins
+ maven-dependency-plugin
+ 2.10
+
+
+ copy-main-dependencies
+ package
+
+ copy-dependencies
+
+
+ ${project.build.directory}/libs
+ false
+ false
+ true
+ true
+
+ ignite-cassandra-store
+
+ runtime
+
+
+
+
+
+
+
diff --git a/modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/serializer/KryoSerializer.java b/modules/cassandra/serializers/src/main/java/org/apache/ignite/cache/store/cassandra/serializer/KryoSerializer.java
similarity index 91%
rename from modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/serializer/KryoSerializer.java
rename to modules/cassandra/serializers/src/main/java/org/apache/ignite/cache/store/cassandra/serializer/KryoSerializer.java
index 88379de054d3d..50cb9a28ede1b 100644
--- a/modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/serializer/KryoSerializer.java
+++ b/modules/cassandra/serializers/src/main/java/org/apache/ignite/cache/store/cassandra/serializer/KryoSerializer.java
@@ -20,11 +20,11 @@
import com.esotericsoftware.kryo.Kryo;
import com.esotericsoftware.kryo.io.Input;
import com.esotericsoftware.kryo.io.Output;
+import org.apache.ignite.internal.util.typedef.internal.U;
+
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.nio.ByteBuffer;
-import org.apache.ignite.IgniteException;
-import org.apache.ignite.internal.util.typedef.internal.U;
/**
* Serializer based on Kryo serialization.
@@ -63,7 +63,7 @@ protected Kryo initialValue() {
return ByteBuffer.wrap(stream.toByteArray());
}
catch (Throwable e) {
- throw new IgniteException("Failed to serialize object of the class '" + obj.getClass().getName() + "'", e);
+ throw new IllegalStateException("Failed to serialize object of the class '" + obj.getClass().getName() + "'", e);
}
finally {
U.closeQuiet(out);
@@ -83,7 +83,7 @@ protected Kryo initialValue() {
return kryos.get().readClassAndObject(in);
}
catch (Throwable e) {
- throw new IgniteException("Failed to deserialize object from byte stream", e);
+ throw new IllegalStateException("Failed to deserialize object from byte stream", e);
}
finally {
U.closeQuiet(in);
diff --git a/modules/cassandra/serializers/src/test/java/org/apache/ignite/tests/KryoSerializerTest.java b/modules/cassandra/serializers/src/test/java/org/apache/ignite/tests/KryoSerializerTest.java
new file mode 100644
index 0000000000000..66f6c6a638ac8
--- /dev/null
+++ b/modules/cassandra/serializers/src/test/java/org/apache/ignite/tests/KryoSerializerTest.java
@@ -0,0 +1,41 @@
+package org.apache.ignite.tests;
+
+import org.apache.ignite.cache.store.cassandra.serializer.KryoSerializer;
+import org.junit.Test;
+
+import java.nio.ByteBuffer;
+import java.util.Date;
+
+public class KryoSerializerTest {
+ @Test public void simpleTest() {
+ MyPojo pojo1 = new MyPojo("123", 1, 123423453467L, new Date(), null);
+
+ KryoSerializer ser = new KryoSerializer();
+
+ ByteBuffer buff = ser.serialize(pojo1);
+ MyPojo pojo2 = (MyPojo)ser.deserialize(buff);
+
+ if (!pojo1.equals(pojo2))
+ throw new RuntimeException("Kryo simple serialization test failed");
+ }
+
+ @Test public void cyclicStructureTest() {
+ MyPojo pojo1 = new MyPojo("123", 1, 123423453467L, new Date(), null);
+ MyPojo pojo2 = new MyPojo("321", 2, 123456L, new Date(), pojo1);
+ pojo1.setRef(pojo2);
+
+ KryoSerializer ser = new KryoSerializer();
+
+ ByteBuffer buff1 = ser.serialize(pojo1);
+ ByteBuffer buff2 = ser.serialize(pojo2);
+
+ MyPojo pojo3 = (MyPojo)ser.deserialize(buff1);
+ MyPojo pojo4 = (MyPojo)ser.deserialize(buff2);
+
+ if (!pojo1.equals(pojo3) || !pojo1.getRef().equals(pojo3.getRef()))
+ throw new RuntimeException("Kryo cyclic structure serialization test failed");
+
+ if (!pojo2.equals(pojo4) || !pojo2.getRef().equals(pojo4.getRef()))
+ throw new RuntimeException("Kryo cyclic structure serialization test failed");
+ }
+}
diff --git a/modules/cassandra/serializers/src/test/java/org/apache/ignite/tests/MyPojo.java b/modules/cassandra/serializers/src/test/java/org/apache/ignite/tests/MyPojo.java
new file mode 100644
index 0000000000000..2161f25bdc69d
--- /dev/null
+++ b/modules/cassandra/serializers/src/test/java/org/apache/ignite/tests/MyPojo.java
@@ -0,0 +1,48 @@
+package org.apache.ignite.tests;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class MyPojo implements Serializable {
+ private String field1;
+ private int field2;
+ private long field3;
+ private Date field4;
+ private MyPojo ref;
+
+ public MyPojo() {
+ }
+
+ public MyPojo(String field1, int field2, long field3, Date field4, MyPojo ref) {
+ this.field1 = field1;
+ this.field2 = field2;
+ this.field3 = field3;
+ this.field4 = field4;
+ this.ref = ref;
+ }
+
+ public boolean equals(Object obj) {
+ if (!(obj instanceof MyPojo))
+ return false;
+
+ MyPojo myObj = (MyPojo)obj;
+
+ if ((field1 == null && myObj.field1 != null) ||
+ (field1 != null && !field1.equals(myObj.field1)))
+ return false;
+
+ if ((field4 == null && myObj.field4 != null) ||
+ (field4 != null && !field4.equals(myObj.field4)))
+ return false;
+
+ return field2 == myObj.field2 && field3 == myObj.field3;
+ }
+
+ public void setRef(MyPojo ref) {
+ this.ref = ref;
+ }
+
+ public MyPojo getRef() {
+ return ref;
+ }
+}
diff --git a/modules/cassandra/store/README.txt b/modules/cassandra/store/README.txt
new file mode 100644
index 0000000000000..fd72dea4f20d9
--- /dev/null
+++ b/modules/cassandra/store/README.txt
@@ -0,0 +1,32 @@
+Apache Ignite Cassandra Store Module
+------------------------
+
+Apache Ignite Cassandra Store module provides CacheStore implementation backed by Cassandra database.
+
+To enable Cassandra Store module when starting a standalone node, move 'optional/ignite-cassandra-store' folder to
+'libs' folder before running 'ignite.{sh|bat}' script. The content of the module folder will
+be added to classpath in this case.
+
+Importing Cassandra Store Module In Maven Project
+-------------------------------------
+
+If you are using Maven to manage dependencies of your project, you can add Cassandra Store module
+dependency like this (replace '${ignite.version}' with actual Ignite version you are
+interested in):
+
+
+ ...
+
+ ...
+
+ org.apache.ignite
+ ignite-cassandra-store
+ ${ignite.version}
+
+ ...
+
+ ...
+
diff --git a/modules/cassandra/store/licenses/apache-2.0.txt b/modules/cassandra/store/licenses/apache-2.0.txt
new file mode 100644
index 0000000000000..d645695673349
--- /dev/null
+++ b/modules/cassandra/store/licenses/apache-2.0.txt
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed 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.
diff --git a/modules/cassandra/store/pom.xml b/modules/cassandra/store/pom.xml
new file mode 100644
index 0000000000000..0b233fa105623
--- /dev/null
+++ b/modules/cassandra/store/pom.xml
@@ -0,0 +1,305 @@
+
+
+
+
+
+
+ 4.0.0
+
+
+ org.apache.ignite
+ ignite-cassandra
+ 1.8.0-SNAPSHOT
+ ..
+
+
+ ignite-cassandra-store
+ 1.8.0-SNAPSHOT
+ http://ignite.apache.org
+
+
+ 1.8.3
+ 3.0.0
+ 3.3
+ 4.0.33.Final
+ 19.0
+ 3.0.2
+
+
+
+
+
+ commons-beanutils
+ commons-beanutils
+ ${commons-beanutils.version}
+
+
+
+
+ org.apache.ignite
+ ignite-core
+ ${project.version}
+
+
+
+ org.apache.ignite
+ ignite-spring
+ ${project.version}
+
+
+
+ org.apache.ignite
+ ignite-log4j
+ ${project.version}
+ test
+
+
+
+
+ com.datastax.cassandra
+ cassandra-driver-core
+ ${cassandra-driver.version}
+
+
+
+ io.netty
+ netty-handler
+ ${netty.version}
+
+
+
+ io.netty
+ netty-buffer
+ ${netty.version}
+
+
+
+ io.netty
+ netty-common
+ ${netty.version}
+
+
+
+ io.netty
+ netty-transport
+ ${netty.version}
+
+
+
+ io.netty
+ netty-codec
+ ${netty.version}
+
+
+
+ com.google.guava
+ guava
+ ${guava.version}
+
+
+
+ com.codahale.metrics
+ metrics-core
+ ${metrics-core.version}
+
+
+
+ org.apache.cassandra
+ cassandra-all
+ ${cassandra-all.version}
+ test
+
+
+ log4j-over-slf4j
+ org.slf4j
+
+
+
+
+
+
+ log4j
+ log4j
+ test
+
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+ 3.2
+
+
+ 1.7
+ 1.7
+ UTF-8
+ true
+ false
+ lines,vars,source
+ 256
+ 512
+
+
+
+
+ org.apache.maven.plugins
+ maven-dependency-plugin
+ 2.10
+
+
+ copy-all-dependencies
+ package
+
+ copy-dependencies
+
+
+ ${project.build.directory}/tests-package/lib
+ false
+ false
+ true
+
+ netty-all,cassandra-all,snappy-java,lz4,compress-lzf,commons-codec,commons-lang3,commons-math3,
+ concurrentlinkedhashmap-lru,antlr,ST4,antlr-runtime,jcl-over-slf4j,jackson-core-asl,
+ jackson-mapper-asl,json-simple,high-scale-lib,snakeyaml,jbcrypt,reporter-config3,
+ reporter-config-base,hibernate-validator,validation-api,jboss-logging,thrift-server,
+ disruptor,stream,fastutil,logback-core,logback-classic,libthrift,httpclient,httpcore,
+ cassandra-thrift,jna,jamm,joda-time,sigar,ecj,tools
+
+
+
+
+
+ copy-main-dependencies
+ package
+
+ copy-dependencies
+
+
+ ${project.build.directory}/libs
+ false
+ false
+ true
+ true
+
+ org.apache.ignite,org.springframework,org.gridgain
+
+
+ commons-logging,slf4j-api,cache-api,slf4j-api,aopalliance
+
+ runtime
+
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-antrun-plugin
+ 1.8
+
+
+ ant-contrib
+ ant-contrib
+ 1.0b3
+
+
+ ant
+ ant
+
+
+
+
+
+
+ package-tests
+ package
+
+ run
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/CassandraCacheStore.java b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/CassandraCacheStore.java
similarity index 100%
rename from modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/CassandraCacheStore.java
rename to modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/CassandraCacheStore.java
diff --git a/modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/CassandraCacheStoreFactory.java b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/CassandraCacheStoreFactory.java
similarity index 100%
rename from modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/CassandraCacheStoreFactory.java
rename to modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/CassandraCacheStoreFactory.java
diff --git a/modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/common/CassandraHelper.java b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/common/CassandraHelper.java
similarity index 100%
rename from modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/common/CassandraHelper.java
rename to modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/common/CassandraHelper.java
diff --git a/modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/common/PropertyMappingHelper.java b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/common/PropertyMappingHelper.java
similarity index 100%
rename from modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/common/PropertyMappingHelper.java
rename to modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/common/PropertyMappingHelper.java
diff --git a/modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/common/RandomSleeper.java b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/common/RandomSleeper.java
similarity index 100%
rename from modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/common/RandomSleeper.java
rename to modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/common/RandomSleeper.java
diff --git a/modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/common/SystemHelper.java b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/common/SystemHelper.java
similarity index 100%
rename from modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/common/SystemHelper.java
rename to modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/common/SystemHelper.java
diff --git a/modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/common/package-info.java b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/common/package-info.java
similarity index 100%
rename from modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/common/package-info.java
rename to modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/common/package-info.java
diff --git a/modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/datasource/Credentials.java b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/datasource/Credentials.java
similarity index 100%
rename from modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/datasource/Credentials.java
rename to modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/datasource/Credentials.java
diff --git a/modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/datasource/DataSource.java b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/datasource/DataSource.java
similarity index 100%
rename from modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/datasource/DataSource.java
rename to modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/datasource/DataSource.java
diff --git a/modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/datasource/PlainCredentials.java b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/datasource/PlainCredentials.java
similarity index 100%
rename from modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/datasource/PlainCredentials.java
rename to modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/datasource/PlainCredentials.java
diff --git a/modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/datasource/package-info.java b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/datasource/package-info.java
similarity index 100%
rename from modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/datasource/package-info.java
rename to modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/datasource/package-info.java
diff --git a/modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/package-info.java b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/package-info.java
similarity index 100%
rename from modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/package-info.java
rename to modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/package-info.java
diff --git a/modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/KeyPersistenceSettings.java b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/KeyPersistenceSettings.java
similarity index 100%
rename from modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/KeyPersistenceSettings.java
rename to modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/KeyPersistenceSettings.java
diff --git a/modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/KeyValuePersistenceSettings.java b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/KeyValuePersistenceSettings.java
similarity index 100%
rename from modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/KeyValuePersistenceSettings.java
rename to modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/KeyValuePersistenceSettings.java
diff --git a/modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/PersistenceController.java b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/PersistenceController.java
similarity index 100%
rename from modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/PersistenceController.java
rename to modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/PersistenceController.java
diff --git a/modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/PersistenceSettings.java b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/PersistenceSettings.java
similarity index 100%
rename from modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/PersistenceSettings.java
rename to modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/PersistenceSettings.java
diff --git a/modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/PersistenceStrategy.java b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/PersistenceStrategy.java
similarity index 100%
rename from modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/PersistenceStrategy.java
rename to modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/PersistenceStrategy.java
diff --git a/modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/PojoField.java b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/PojoField.java
similarity index 100%
rename from modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/PojoField.java
rename to modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/PojoField.java
diff --git a/modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/PojoKeyField.java b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/PojoKeyField.java
similarity index 100%
rename from modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/PojoKeyField.java
rename to modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/PojoKeyField.java
diff --git a/modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/PojoValueField.java b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/PojoValueField.java
similarity index 100%
rename from modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/PojoValueField.java
rename to modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/PojoValueField.java
diff --git a/modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/ValuePersistenceSettings.java b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/ValuePersistenceSettings.java
similarity index 100%
rename from modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/ValuePersistenceSettings.java
rename to modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/ValuePersistenceSettings.java
diff --git a/modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/package-info.java b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/package-info.java
similarity index 100%
rename from modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/package-info.java
rename to modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/package-info.java
diff --git a/modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/serializer/JavaSerializer.java b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/serializer/JavaSerializer.java
similarity index 90%
rename from modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/serializer/JavaSerializer.java
rename to modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/serializer/JavaSerializer.java
index e9f93a0b6d9e8..44d2d47019f26 100644
--- a/modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/serializer/JavaSerializer.java
+++ b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/serializer/JavaSerializer.java
@@ -23,7 +23,6 @@
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.nio.ByteBuffer;
-import org.apache.ignite.IgniteException;
import org.apache.ignite.internal.util.typedef.internal.U;
/**
@@ -51,7 +50,7 @@ public class JavaSerializer implements Serializer {
return ByteBuffer.wrap(stream.toByteArray());
}
catch (IOException e) {
- throw new IgniteException("Failed to serialize object of the class '" + obj.getClass().getName() + "'", e);
+ throw new IllegalStateException("Failed to serialize object of the class '" + obj.getClass().getName() + "'", e);
}
finally {
U.closeQuiet(out);
@@ -71,7 +70,7 @@ public class JavaSerializer implements Serializer {
return in.readObject();
}
catch (Throwable e) {
- throw new IgniteException("Failed to deserialize object from byte stream", e);
+ throw new IllegalStateException("Failed to deserialize object from byte stream", e);
}
finally {
U.closeQuiet(in);
diff --git a/modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/serializer/Serializer.java b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/serializer/Serializer.java
similarity index 100%
rename from modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/serializer/Serializer.java
rename to modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/serializer/Serializer.java
diff --git a/modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/serializer/package-info.java b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/serializer/package-info.java
similarity index 100%
rename from modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/serializer/package-info.java
rename to modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/serializer/package-info.java
diff --git a/modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/session/BatchExecutionAssistant.java b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/session/BatchExecutionAssistant.java
similarity index 100%
rename from modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/session/BatchExecutionAssistant.java
rename to modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/session/BatchExecutionAssistant.java
diff --git a/modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/session/BatchLoaderAssistant.java b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/session/BatchLoaderAssistant.java
similarity index 100%
rename from modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/session/BatchLoaderAssistant.java
rename to modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/session/BatchLoaderAssistant.java
diff --git a/modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/session/CassandraSession.java b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/session/CassandraSession.java
similarity index 100%
rename from modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/session/CassandraSession.java
rename to modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/session/CassandraSession.java
diff --git a/modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/session/CassandraSessionImpl.java b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/session/CassandraSessionImpl.java
similarity index 100%
rename from modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/session/CassandraSessionImpl.java
rename to modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/session/CassandraSessionImpl.java
diff --git a/modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/session/ExecutionAssistant.java b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/session/ExecutionAssistant.java
similarity index 100%
rename from modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/session/ExecutionAssistant.java
rename to modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/session/ExecutionAssistant.java
diff --git a/modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/session/GenericBatchExecutionAssistant.java b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/session/GenericBatchExecutionAssistant.java
similarity index 100%
rename from modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/session/GenericBatchExecutionAssistant.java
rename to modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/session/GenericBatchExecutionAssistant.java
diff --git a/modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/session/LoadCacheCustomQueryWorker.java b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/session/LoadCacheCustomQueryWorker.java
similarity index 100%
rename from modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/session/LoadCacheCustomQueryWorker.java
rename to modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/session/LoadCacheCustomQueryWorker.java
diff --git a/modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/session/package-info.java b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/session/package-info.java
similarity index 100%
rename from modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/session/package-info.java
rename to modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/session/package-info.java
diff --git a/modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/session/pool/SessionPool.java b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/session/pool/SessionPool.java
similarity index 100%
rename from modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/session/pool/SessionPool.java
rename to modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/session/pool/SessionPool.java
diff --git a/modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/session/pool/SessionWrapper.java b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/session/pool/SessionWrapper.java
similarity index 100%
rename from modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/session/pool/SessionWrapper.java
rename to modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/session/pool/SessionWrapper.java
diff --git a/modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/session/pool/package-info.java b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/session/pool/package-info.java
similarity index 100%
rename from modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/session/pool/package-info.java
rename to modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/session/pool/package-info.java
diff --git a/modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/utils/DDLGenerator.java b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/utils/DDLGenerator.java
similarity index 100%
rename from modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/utils/DDLGenerator.java
rename to modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/utils/DDLGenerator.java
diff --git a/modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/utils/package-info.java b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/utils/package-info.java
similarity index 100%
rename from modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/utils/package-info.java
rename to modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/utils/package-info.java
diff --git a/modules/cassandra/src/test/bootstrap/aws/README.txt b/modules/cassandra/store/src/test/bootstrap/aws/README.txt
similarity index 97%
rename from modules/cassandra/src/test/bootstrap/aws/README.txt
rename to modules/cassandra/store/src/test/bootstrap/aws/README.txt
index 4457d81abbf93..a61b235132fd2 100644
--- a/modules/cassandra/src/test/bootstrap/aws/README.txt
+++ b/modules/cassandra/store/src/test/bootstrap/aws/README.txt
@@ -1,13 +1,13 @@
-Shell scripts to spin up Ignite, Cassandra and Load tests clusters in AWS.
-
-1) cassandra - bootstrap scripts for Cassandra cluster nodes
-2) ganglia - bootstrap scripts for Ganglia master and agents
-3) ignite - bootstrap scripts for Ignite cluster nodes
-4) tests - bootstrap scripts for Load Tests cluster nodes
-5) common.sh - definitions for common functions
-6) env.sh - definitions for common variables
-7) log-collector.sh - log collector daemon script, to collect logs and upload them to S3
-
-For more details please look at the documentation:
-
+Shell scripts to spin up Ignite, Cassandra and Load tests clusters in AWS.
+
+1) cassandra - bootstrap scripts for Cassandra cluster nodes
+2) ganglia - bootstrap scripts for Ganglia master and agents
+3) ignite - bootstrap scripts for Ignite cluster nodes
+4) tests - bootstrap scripts for Load Tests cluster nodes
+5) common.sh - definitions for common functions
+6) env.sh - definitions for common variables
+7) log-collector.sh - log collector daemon script, to collect logs and upload them to S3
+
+For more details please look at the documentation:
+
https://apacheignite.readme.io/docs/aws-infrastructure-deployment
\ No newline at end of file
diff --git a/modules/cassandra/src/test/bootstrap/aws/cassandra/cassandra-bootstrap.sh b/modules/cassandra/store/src/test/bootstrap/aws/cassandra/cassandra-bootstrap.sh
similarity index 100%
rename from modules/cassandra/src/test/bootstrap/aws/cassandra/cassandra-bootstrap.sh
rename to modules/cassandra/store/src/test/bootstrap/aws/cassandra/cassandra-bootstrap.sh
diff --git a/modules/cassandra/src/test/bootstrap/aws/cassandra/cassandra-env.sh b/modules/cassandra/store/src/test/bootstrap/aws/cassandra/cassandra-env.sh
similarity index 100%
rename from modules/cassandra/src/test/bootstrap/aws/cassandra/cassandra-env.sh
rename to modules/cassandra/store/src/test/bootstrap/aws/cassandra/cassandra-env.sh
diff --git a/modules/cassandra/src/test/bootstrap/aws/cassandra/cassandra-start.sh b/modules/cassandra/store/src/test/bootstrap/aws/cassandra/cassandra-start.sh
similarity index 100%
rename from modules/cassandra/src/test/bootstrap/aws/cassandra/cassandra-start.sh
rename to modules/cassandra/store/src/test/bootstrap/aws/cassandra/cassandra-start.sh
diff --git a/modules/cassandra/src/test/bootstrap/aws/cassandra/cassandra-template.yaml b/modules/cassandra/store/src/test/bootstrap/aws/cassandra/cassandra-template.yaml
similarity index 100%
rename from modules/cassandra/src/test/bootstrap/aws/cassandra/cassandra-template.yaml
rename to modules/cassandra/store/src/test/bootstrap/aws/cassandra/cassandra-template.yaml
diff --git a/modules/cassandra/src/test/bootstrap/aws/common.sh b/modules/cassandra/store/src/test/bootstrap/aws/common.sh
similarity index 100%
rename from modules/cassandra/src/test/bootstrap/aws/common.sh
rename to modules/cassandra/store/src/test/bootstrap/aws/common.sh
diff --git a/modules/cassandra/src/test/bootstrap/aws/env.sh b/modules/cassandra/store/src/test/bootstrap/aws/env.sh
similarity index 97%
rename from modules/cassandra/src/test/bootstrap/aws/env.sh
rename to modules/cassandra/store/src/test/bootstrap/aws/env.sh
index aff4694e8232f..031c5c3a1628a 100644
--- a/modules/cassandra/src/test/bootstrap/aws/env.sh
+++ b/modules/cassandra/store/src/test/bootstrap/aws/env.sh
@@ -82,7 +82,7 @@ export S3_CASSANDRA_FIRST_NODE_LOCK=$S3_CASSANDRA_SYSTEM/first-node-lock
export S3_CASSANDRA_NODES_JOIN_LOCK=$S3_CASSANDRA_SYSTEM/join-lock
# Ignite related settings
-export IGNITE_DOWNLOAD_URL=$S3_DOWNLOADS/apache-ignite-fabric-1.7.0-SNAPSHOT-bin.zip
+export IGNITE_DOWNLOAD_URL=$S3_DOWNLOADS/apache-ignite-fabric-1.8.0-SNAPSHOT-bin.zip
export S3_IGNITE_BOOTSTRAP_SUCCESS=$S3_IGNITE_SYSTEM/success
export S3_IGNITE_BOOTSTRAP_FAILURE=$S3_IGNITE_SYSTEM/failure
export S3_IGNITE_NODES_DISCOVERY=$S3_IGNITE_SYSTEM/discovery
@@ -90,7 +90,7 @@ export S3_IGNITE_FIRST_NODE_LOCK=$S3_IGNITE_SYSTEM/first-node-lock
export S3_IGNITE_NODES_JOIN_LOCK=$S3_IGNITE_SYSTEM/i-join-lock
# Tests related settings
-export TESTS_PACKAGE_DONLOAD_URL=$S3_DOWNLOADS/ignite-cassandra-tests-1.7.0-SNAPSHOT.zip
+export TESTS_PACKAGE_DONLOAD_URL=$S3_DOWNLOADS/ignite-cassandra-tests-1.8.0-SNAPSHOT.zip
export S3_TESTS_TRIGGER=$S3_SYSTEM/tests-trigger
export S3_TESTS_NODES_DISCOVERY=$S3_TESTS_SYSTEM/discovery
export S3_TESTS_SUCCESS=$S3_TESTS_SYSTEM/success
diff --git a/modules/cassandra/src/test/bootstrap/aws/ganglia/agent-start.sh b/modules/cassandra/store/src/test/bootstrap/aws/ganglia/agent-start.sh
similarity index 100%
rename from modules/cassandra/src/test/bootstrap/aws/ganglia/agent-start.sh
rename to modules/cassandra/store/src/test/bootstrap/aws/ganglia/agent-start.sh
diff --git a/modules/cassandra/src/test/bootstrap/aws/ganglia/ganglia-bootstrap.sh b/modules/cassandra/store/src/test/bootstrap/aws/ganglia/ganglia-bootstrap.sh
similarity index 100%
rename from modules/cassandra/src/test/bootstrap/aws/ganglia/ganglia-bootstrap.sh
rename to modules/cassandra/store/src/test/bootstrap/aws/ganglia/ganglia-bootstrap.sh
diff --git a/modules/cassandra/src/test/bootstrap/aws/ignite/ignite-bootstrap.sh b/modules/cassandra/store/src/test/bootstrap/aws/ignite/ignite-bootstrap.sh
similarity index 100%
rename from modules/cassandra/src/test/bootstrap/aws/ignite/ignite-bootstrap.sh
rename to modules/cassandra/store/src/test/bootstrap/aws/ignite/ignite-bootstrap.sh
diff --git a/modules/cassandra/src/test/bootstrap/aws/ignite/ignite-cassandra-server-template.xml b/modules/cassandra/store/src/test/bootstrap/aws/ignite/ignite-cassandra-server-template.xml
similarity index 100%
rename from modules/cassandra/src/test/bootstrap/aws/ignite/ignite-cassandra-server-template.xml
rename to modules/cassandra/store/src/test/bootstrap/aws/ignite/ignite-cassandra-server-template.xml
diff --git a/modules/cassandra/src/test/bootstrap/aws/ignite/ignite-env.sh b/modules/cassandra/store/src/test/bootstrap/aws/ignite/ignite-env.sh
similarity index 100%
rename from modules/cassandra/src/test/bootstrap/aws/ignite/ignite-env.sh
rename to modules/cassandra/store/src/test/bootstrap/aws/ignite/ignite-env.sh
diff --git a/modules/cassandra/src/test/bootstrap/aws/ignite/ignite-start.sh b/modules/cassandra/store/src/test/bootstrap/aws/ignite/ignite-start.sh
similarity index 100%
rename from modules/cassandra/src/test/bootstrap/aws/ignite/ignite-start.sh
rename to modules/cassandra/store/src/test/bootstrap/aws/ignite/ignite-start.sh
diff --git a/modules/cassandra/src/test/bootstrap/aws/logs-collector.sh b/modules/cassandra/store/src/test/bootstrap/aws/logs-collector.sh
similarity index 100%
rename from modules/cassandra/src/test/bootstrap/aws/logs-collector.sh
rename to modules/cassandra/store/src/test/bootstrap/aws/logs-collector.sh
diff --git a/modules/cassandra/src/test/bootstrap/aws/tests/ignite-cassandra-client-template.xml b/modules/cassandra/store/src/test/bootstrap/aws/tests/ignite-cassandra-client-template.xml
similarity index 100%
rename from modules/cassandra/src/test/bootstrap/aws/tests/ignite-cassandra-client-template.xml
rename to modules/cassandra/store/src/test/bootstrap/aws/tests/ignite-cassandra-client-template.xml
diff --git a/modules/cassandra/src/test/bootstrap/aws/tests/tests-bootstrap.sh b/modules/cassandra/store/src/test/bootstrap/aws/tests/tests-bootstrap.sh
similarity index 100%
rename from modules/cassandra/src/test/bootstrap/aws/tests/tests-bootstrap.sh
rename to modules/cassandra/store/src/test/bootstrap/aws/tests/tests-bootstrap.sh
diff --git a/modules/cassandra/src/test/bootstrap/aws/tests/tests-manager.sh b/modules/cassandra/store/src/test/bootstrap/aws/tests/tests-manager.sh
similarity index 100%
rename from modules/cassandra/src/test/bootstrap/aws/tests/tests-manager.sh
rename to modules/cassandra/store/src/test/bootstrap/aws/tests/tests-manager.sh
diff --git a/modules/cassandra/src/test/bootstrap/aws/tests/tests-report.sh b/modules/cassandra/store/src/test/bootstrap/aws/tests/tests-report.sh
similarity index 100%
rename from modules/cassandra/src/test/bootstrap/aws/tests/tests-report.sh
rename to modules/cassandra/store/src/test/bootstrap/aws/tests/tests-report.sh
diff --git a/modules/cassandra/src/test/java/org/apache/ignite/tests/CassandraDirectPersistenceLoadTest.java b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/CassandraDirectPersistenceLoadTest.java
similarity index 100%
rename from modules/cassandra/src/test/java/org/apache/ignite/tests/CassandraDirectPersistenceLoadTest.java
rename to modules/cassandra/store/src/test/java/org/apache/ignite/tests/CassandraDirectPersistenceLoadTest.java
diff --git a/modules/cassandra/src/test/java/org/apache/ignite/tests/CassandraDirectPersistenceTest.java b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/CassandraDirectPersistenceTest.java
similarity index 100%
rename from modules/cassandra/src/test/java/org/apache/ignite/tests/CassandraDirectPersistenceTest.java
rename to modules/cassandra/store/src/test/java/org/apache/ignite/tests/CassandraDirectPersistenceTest.java
diff --git a/modules/cassandra/src/test/java/org/apache/ignite/tests/DDLGeneratorTest.java b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/DDLGeneratorTest.java
similarity index 100%
rename from modules/cassandra/src/test/java/org/apache/ignite/tests/DDLGeneratorTest.java
rename to modules/cassandra/store/src/test/java/org/apache/ignite/tests/DDLGeneratorTest.java
diff --git a/modules/cassandra/src/test/java/org/apache/ignite/tests/IgnitePersistentStoreLoadTest.java b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/IgnitePersistentStoreLoadTest.java
similarity index 100%
rename from modules/cassandra/src/test/java/org/apache/ignite/tests/IgnitePersistentStoreLoadTest.java
rename to modules/cassandra/store/src/test/java/org/apache/ignite/tests/IgnitePersistentStoreLoadTest.java
diff --git a/modules/cassandra/src/test/java/org/apache/ignite/tests/IgnitePersistentStoreTest.java b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/IgnitePersistentStoreTest.java
similarity index 100%
rename from modules/cassandra/src/test/java/org/apache/ignite/tests/IgnitePersistentStoreTest.java
rename to modules/cassandra/store/src/test/java/org/apache/ignite/tests/IgnitePersistentStoreTest.java
diff --git a/modules/cassandra/src/test/java/org/apache/ignite/tests/LoadTestsCassandraArtifactsCreator.java b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/LoadTestsCassandraArtifactsCreator.java
similarity index 100%
rename from modules/cassandra/src/test/java/org/apache/ignite/tests/LoadTestsCassandraArtifactsCreator.java
rename to modules/cassandra/store/src/test/java/org/apache/ignite/tests/LoadTestsCassandraArtifactsCreator.java
diff --git a/modules/cassandra/src/test/java/org/apache/ignite/tests/load/Generator.java b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/load/Generator.java
similarity index 100%
rename from modules/cassandra/src/test/java/org/apache/ignite/tests/load/Generator.java
rename to modules/cassandra/store/src/test/java/org/apache/ignite/tests/load/Generator.java
diff --git a/modules/cassandra/src/test/java/org/apache/ignite/tests/load/IntGenerator.java b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/load/IntGenerator.java
similarity index 100%
rename from modules/cassandra/src/test/java/org/apache/ignite/tests/load/IntGenerator.java
rename to modules/cassandra/store/src/test/java/org/apache/ignite/tests/load/IntGenerator.java
diff --git a/modules/cassandra/src/test/java/org/apache/ignite/tests/load/LoadTestDriver.java b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/load/LoadTestDriver.java
similarity index 100%
rename from modules/cassandra/src/test/java/org/apache/ignite/tests/load/LoadTestDriver.java
rename to modules/cassandra/store/src/test/java/org/apache/ignite/tests/load/LoadTestDriver.java
diff --git a/modules/cassandra/src/test/java/org/apache/ignite/tests/load/LongGenerator.java b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/load/LongGenerator.java
similarity index 100%
rename from modules/cassandra/src/test/java/org/apache/ignite/tests/load/LongGenerator.java
rename to modules/cassandra/store/src/test/java/org/apache/ignite/tests/load/LongGenerator.java
diff --git a/modules/cassandra/src/test/java/org/apache/ignite/tests/load/PersonGenerator.java b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/load/PersonGenerator.java
similarity index 100%
rename from modules/cassandra/src/test/java/org/apache/ignite/tests/load/PersonGenerator.java
rename to modules/cassandra/store/src/test/java/org/apache/ignite/tests/load/PersonGenerator.java
diff --git a/modules/cassandra/src/test/java/org/apache/ignite/tests/load/PersonIdGenerator.java b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/load/PersonIdGenerator.java
similarity index 100%
rename from modules/cassandra/src/test/java/org/apache/ignite/tests/load/PersonIdGenerator.java
rename to modules/cassandra/store/src/test/java/org/apache/ignite/tests/load/PersonIdGenerator.java
diff --git a/modules/cassandra/src/test/java/org/apache/ignite/tests/load/StringGenerator.java b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/load/StringGenerator.java
similarity index 100%
rename from modules/cassandra/src/test/java/org/apache/ignite/tests/load/StringGenerator.java
rename to modules/cassandra/store/src/test/java/org/apache/ignite/tests/load/StringGenerator.java
diff --git a/modules/cassandra/src/test/java/org/apache/ignite/tests/load/Worker.java b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/load/Worker.java
similarity index 100%
rename from modules/cassandra/src/test/java/org/apache/ignite/tests/load/Worker.java
rename to modules/cassandra/store/src/test/java/org/apache/ignite/tests/load/Worker.java
diff --git a/modules/cassandra/src/test/java/org/apache/ignite/tests/load/cassandra/BulkReadWorker.java b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/load/cassandra/BulkReadWorker.java
similarity index 100%
rename from modules/cassandra/src/test/java/org/apache/ignite/tests/load/cassandra/BulkReadWorker.java
rename to modules/cassandra/store/src/test/java/org/apache/ignite/tests/load/cassandra/BulkReadWorker.java
diff --git a/modules/cassandra/src/test/java/org/apache/ignite/tests/load/cassandra/BulkWriteWorker.java b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/load/cassandra/BulkWriteWorker.java
similarity index 100%
rename from modules/cassandra/src/test/java/org/apache/ignite/tests/load/cassandra/BulkWriteWorker.java
rename to modules/cassandra/store/src/test/java/org/apache/ignite/tests/load/cassandra/BulkWriteWorker.java
diff --git a/modules/cassandra/src/test/java/org/apache/ignite/tests/load/cassandra/ReadWorker.java b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/load/cassandra/ReadWorker.java
similarity index 100%
rename from modules/cassandra/src/test/java/org/apache/ignite/tests/load/cassandra/ReadWorker.java
rename to modules/cassandra/store/src/test/java/org/apache/ignite/tests/load/cassandra/ReadWorker.java
diff --git a/modules/cassandra/src/test/java/org/apache/ignite/tests/load/cassandra/WriteWorker.java b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/load/cassandra/WriteWorker.java
similarity index 100%
rename from modules/cassandra/src/test/java/org/apache/ignite/tests/load/cassandra/WriteWorker.java
rename to modules/cassandra/store/src/test/java/org/apache/ignite/tests/load/cassandra/WriteWorker.java
diff --git a/modules/cassandra/src/test/java/org/apache/ignite/tests/load/cassandra/package-info.java b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/load/cassandra/package-info.java
similarity index 100%
rename from modules/cassandra/src/test/java/org/apache/ignite/tests/load/cassandra/package-info.java
rename to modules/cassandra/store/src/test/java/org/apache/ignite/tests/load/cassandra/package-info.java
diff --git a/modules/cassandra/src/test/java/org/apache/ignite/tests/load/ignite/BulkReadWorker.java b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/load/ignite/BulkReadWorker.java
similarity index 100%
rename from modules/cassandra/src/test/java/org/apache/ignite/tests/load/ignite/BulkReadWorker.java
rename to modules/cassandra/store/src/test/java/org/apache/ignite/tests/load/ignite/BulkReadWorker.java
diff --git a/modules/cassandra/src/test/java/org/apache/ignite/tests/load/ignite/BulkWriteWorker.java b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/load/ignite/BulkWriteWorker.java
similarity index 100%
rename from modules/cassandra/src/test/java/org/apache/ignite/tests/load/ignite/BulkWriteWorker.java
rename to modules/cassandra/store/src/test/java/org/apache/ignite/tests/load/ignite/BulkWriteWorker.java
diff --git a/modules/cassandra/src/test/java/org/apache/ignite/tests/load/ignite/ReadWorker.java b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/load/ignite/ReadWorker.java
similarity index 100%
rename from modules/cassandra/src/test/java/org/apache/ignite/tests/load/ignite/ReadWorker.java
rename to modules/cassandra/store/src/test/java/org/apache/ignite/tests/load/ignite/ReadWorker.java
diff --git a/modules/cassandra/src/test/java/org/apache/ignite/tests/load/ignite/WriteWorker.java b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/load/ignite/WriteWorker.java
similarity index 100%
rename from modules/cassandra/src/test/java/org/apache/ignite/tests/load/ignite/WriteWorker.java
rename to modules/cassandra/store/src/test/java/org/apache/ignite/tests/load/ignite/WriteWorker.java
diff --git a/modules/cassandra/src/test/java/org/apache/ignite/tests/load/ignite/package-info.java b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/load/ignite/package-info.java
similarity index 100%
rename from modules/cassandra/src/test/java/org/apache/ignite/tests/load/ignite/package-info.java
rename to modules/cassandra/store/src/test/java/org/apache/ignite/tests/load/ignite/package-info.java
diff --git a/modules/cassandra/src/test/java/org/apache/ignite/tests/load/package-info.java b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/load/package-info.java
similarity index 100%
rename from modules/cassandra/src/test/java/org/apache/ignite/tests/load/package-info.java
rename to modules/cassandra/store/src/test/java/org/apache/ignite/tests/load/package-info.java
diff --git a/modules/cassandra/src/test/java/org/apache/ignite/tests/package-info.java b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/package-info.java
similarity index 100%
rename from modules/cassandra/src/test/java/org/apache/ignite/tests/package-info.java
rename to modules/cassandra/store/src/test/java/org/apache/ignite/tests/package-info.java
diff --git a/modules/cassandra/src/test/java/org/apache/ignite/tests/pojos/Person.java b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/pojos/Person.java
similarity index 100%
rename from modules/cassandra/src/test/java/org/apache/ignite/tests/pojos/Person.java
rename to modules/cassandra/store/src/test/java/org/apache/ignite/tests/pojos/Person.java
diff --git a/modules/cassandra/src/test/java/org/apache/ignite/tests/pojos/PersonId.java b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/pojos/PersonId.java
similarity index 100%
rename from modules/cassandra/src/test/java/org/apache/ignite/tests/pojos/PersonId.java
rename to modules/cassandra/store/src/test/java/org/apache/ignite/tests/pojos/PersonId.java
diff --git a/modules/cassandra/src/test/java/org/apache/ignite/tests/pojos/package-info.java b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/pojos/package-info.java
similarity index 100%
rename from modules/cassandra/src/test/java/org/apache/ignite/tests/pojos/package-info.java
rename to modules/cassandra/store/src/test/java/org/apache/ignite/tests/pojos/package-info.java
diff --git a/modules/cassandra/src/test/java/org/apache/ignite/tests/utils/CacheStoreHelper.java b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/utils/CacheStoreHelper.java
similarity index 100%
rename from modules/cassandra/src/test/java/org/apache/ignite/tests/utils/CacheStoreHelper.java
rename to modules/cassandra/store/src/test/java/org/apache/ignite/tests/utils/CacheStoreHelper.java
diff --git a/modules/cassandra/src/test/java/org/apache/ignite/tests/utils/CassandraAdminCredentials.java b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/utils/CassandraAdminCredentials.java
similarity index 100%
rename from modules/cassandra/src/test/java/org/apache/ignite/tests/utils/CassandraAdminCredentials.java
rename to modules/cassandra/store/src/test/java/org/apache/ignite/tests/utils/CassandraAdminCredentials.java
diff --git a/modules/cassandra/src/test/java/org/apache/ignite/tests/utils/CassandraHelper.java b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/utils/CassandraHelper.java
similarity index 100%
rename from modules/cassandra/src/test/java/org/apache/ignite/tests/utils/CassandraHelper.java
rename to modules/cassandra/store/src/test/java/org/apache/ignite/tests/utils/CassandraHelper.java
diff --git a/modules/cassandra/src/test/java/org/apache/ignite/tests/utils/CassandraLifeCycleBean.java b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/utils/CassandraLifeCycleBean.java
similarity index 100%
rename from modules/cassandra/src/test/java/org/apache/ignite/tests/utils/CassandraLifeCycleBean.java
rename to modules/cassandra/store/src/test/java/org/apache/ignite/tests/utils/CassandraLifeCycleBean.java
diff --git a/modules/cassandra/src/test/java/org/apache/ignite/tests/utils/CassandraRegularCredentials.java b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/utils/CassandraRegularCredentials.java
similarity index 100%
rename from modules/cassandra/src/test/java/org/apache/ignite/tests/utils/CassandraRegularCredentials.java
rename to modules/cassandra/store/src/test/java/org/apache/ignite/tests/utils/CassandraRegularCredentials.java
diff --git a/modules/cassandra/src/test/java/org/apache/ignite/tests/utils/TestCacheSession.java b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/utils/TestCacheSession.java
similarity index 100%
rename from modules/cassandra/src/test/java/org/apache/ignite/tests/utils/TestCacheSession.java
rename to modules/cassandra/store/src/test/java/org/apache/ignite/tests/utils/TestCacheSession.java
diff --git a/modules/cassandra/src/test/java/org/apache/ignite/tests/utils/TestsHelper.java b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/utils/TestsHelper.java
similarity index 100%
rename from modules/cassandra/src/test/java/org/apache/ignite/tests/utils/TestsHelper.java
rename to modules/cassandra/store/src/test/java/org/apache/ignite/tests/utils/TestsHelper.java
diff --git a/modules/cassandra/src/test/java/org/apache/ignite/tests/utils/package-info.java b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/utils/package-info.java
similarity index 100%
rename from modules/cassandra/src/test/java/org/apache/ignite/tests/utils/package-info.java
rename to modules/cassandra/store/src/test/java/org/apache/ignite/tests/utils/package-info.java
diff --git a/modules/cassandra/src/test/resources/log4j.properties b/modules/cassandra/store/src/test/resources/log4j.properties
similarity index 100%
rename from modules/cassandra/src/test/resources/log4j.properties
rename to modules/cassandra/store/src/test/resources/log4j.properties
diff --git a/modules/cassandra/src/test/resources/org/apache/ignite/tests/cassandra/connection-settings.xml b/modules/cassandra/store/src/test/resources/org/apache/ignite/tests/cassandra/connection-settings.xml
similarity index 100%
rename from modules/cassandra/src/test/resources/org/apache/ignite/tests/cassandra/connection-settings.xml
rename to modules/cassandra/store/src/test/resources/org/apache/ignite/tests/cassandra/connection-settings.xml
diff --git a/modules/cassandra/src/test/resources/org/apache/ignite/tests/cassandra/connection.properties b/modules/cassandra/store/src/test/resources/org/apache/ignite/tests/cassandra/connection.properties
similarity index 100%
rename from modules/cassandra/src/test/resources/org/apache/ignite/tests/cassandra/connection.properties
rename to modules/cassandra/store/src/test/resources/org/apache/ignite/tests/cassandra/connection.properties
diff --git a/modules/cassandra/src/test/resources/org/apache/ignite/tests/cassandra/credentials.properties b/modules/cassandra/store/src/test/resources/org/apache/ignite/tests/cassandra/credentials.properties
similarity index 100%
rename from modules/cassandra/src/test/resources/org/apache/ignite/tests/cassandra/credentials.properties
rename to modules/cassandra/store/src/test/resources/org/apache/ignite/tests/cassandra/credentials.properties
diff --git a/modules/cassandra/src/test/resources/org/apache/ignite/tests/cassandra/embedded-cassandra.yaml b/modules/cassandra/store/src/test/resources/org/apache/ignite/tests/cassandra/embedded-cassandra.yaml
similarity index 100%
rename from modules/cassandra/src/test/resources/org/apache/ignite/tests/cassandra/embedded-cassandra.yaml
rename to modules/cassandra/store/src/test/resources/org/apache/ignite/tests/cassandra/embedded-cassandra.yaml
diff --git a/modules/cassandra/src/test/resources/org/apache/ignite/tests/cassandra/keyspaces.properties b/modules/cassandra/store/src/test/resources/org/apache/ignite/tests/cassandra/keyspaces.properties
similarity index 100%
rename from modules/cassandra/src/test/resources/org/apache/ignite/tests/cassandra/keyspaces.properties
rename to modules/cassandra/store/src/test/resources/org/apache/ignite/tests/cassandra/keyspaces.properties
diff --git a/modules/cassandra/src/test/resources/org/apache/ignite/tests/persistence/blob/ignite-config.xml b/modules/cassandra/store/src/test/resources/org/apache/ignite/tests/persistence/blob/ignite-config.xml
similarity index 100%
rename from modules/cassandra/src/test/resources/org/apache/ignite/tests/persistence/blob/ignite-config.xml
rename to modules/cassandra/store/src/test/resources/org/apache/ignite/tests/persistence/blob/ignite-config.xml
diff --git a/modules/cassandra/src/test/resources/org/apache/ignite/tests/persistence/blob/persistence-settings-1.xml b/modules/cassandra/store/src/test/resources/org/apache/ignite/tests/persistence/blob/persistence-settings-1.xml
similarity index 100%
rename from modules/cassandra/src/test/resources/org/apache/ignite/tests/persistence/blob/persistence-settings-1.xml
rename to modules/cassandra/store/src/test/resources/org/apache/ignite/tests/persistence/blob/persistence-settings-1.xml
diff --git a/modules/cassandra/src/test/resources/org/apache/ignite/tests/persistence/blob/persistence-settings-2.xml b/modules/cassandra/store/src/test/resources/org/apache/ignite/tests/persistence/blob/persistence-settings-2.xml
similarity index 100%
rename from modules/cassandra/src/test/resources/org/apache/ignite/tests/persistence/blob/persistence-settings-2.xml
rename to modules/cassandra/store/src/test/resources/org/apache/ignite/tests/persistence/blob/persistence-settings-2.xml
diff --git a/modules/cassandra/src/test/resources/org/apache/ignite/tests/persistence/blob/persistence-settings-3.xml b/modules/cassandra/store/src/test/resources/org/apache/ignite/tests/persistence/blob/persistence-settings-3.xml
similarity index 97%
rename from modules/cassandra/src/test/resources/org/apache/ignite/tests/persistence/blob/persistence-settings-3.xml
rename to modules/cassandra/store/src/test/resources/org/apache/ignite/tests/persistence/blob/persistence-settings-3.xml
index 905c3e504c3dc..e872201fcc180 100644
--- a/modules/cassandra/src/test/resources/org/apache/ignite/tests/persistence/blob/persistence-settings-3.xml
+++ b/modules/cassandra/store/src/test/resources/org/apache/ignite/tests/persistence/blob/persistence-settings-3.xml
@@ -24,6 +24,6 @@
diff --git a/modules/cassandra/src/test/resources/org/apache/ignite/tests/persistence/pojo/ignite-config.xml b/modules/cassandra/store/src/test/resources/org/apache/ignite/tests/persistence/pojo/ignite-config.xml
similarity index 100%
rename from modules/cassandra/src/test/resources/org/apache/ignite/tests/persistence/pojo/ignite-config.xml
rename to modules/cassandra/store/src/test/resources/org/apache/ignite/tests/persistence/pojo/ignite-config.xml
diff --git a/modules/cassandra/src/test/resources/org/apache/ignite/tests/persistence/pojo/persistence-settings-1.xml b/modules/cassandra/store/src/test/resources/org/apache/ignite/tests/persistence/pojo/persistence-settings-1.xml
similarity index 100%
rename from modules/cassandra/src/test/resources/org/apache/ignite/tests/persistence/pojo/persistence-settings-1.xml
rename to modules/cassandra/store/src/test/resources/org/apache/ignite/tests/persistence/pojo/persistence-settings-1.xml
diff --git a/modules/cassandra/src/test/resources/org/apache/ignite/tests/persistence/pojo/persistence-settings-2.xml b/modules/cassandra/store/src/test/resources/org/apache/ignite/tests/persistence/pojo/persistence-settings-2.xml
similarity index 100%
rename from modules/cassandra/src/test/resources/org/apache/ignite/tests/persistence/pojo/persistence-settings-2.xml
rename to modules/cassandra/store/src/test/resources/org/apache/ignite/tests/persistence/pojo/persistence-settings-2.xml
diff --git a/modules/cassandra/src/test/resources/org/apache/ignite/tests/persistence/pojo/persistence-settings-3.xml b/modules/cassandra/store/src/test/resources/org/apache/ignite/tests/persistence/pojo/persistence-settings-3.xml
similarity index 99%
rename from modules/cassandra/src/test/resources/org/apache/ignite/tests/persistence/pojo/persistence-settings-3.xml
rename to modules/cassandra/store/src/test/resources/org/apache/ignite/tests/persistence/pojo/persistence-settings-3.xml
index dd8eac55208cd..b3dc4e693bddc 100644
--- a/modules/cassandra/src/test/resources/org/apache/ignite/tests/persistence/pojo/persistence-settings-3.xml
+++ b/modules/cassandra/store/src/test/resources/org/apache/ignite/tests/persistence/pojo/persistence-settings-3.xml
@@ -146,7 +146,7 @@ Attributes:
-->
+ serializer="org.apache.ignite.cache.store.cassandra.serializer.JavaSerializer">