Repository: incubator-ignite Updated Branches: refs/heads/ignite-63 08623ee2a -> 9520f006c
# ignite-63 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9520f006 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9520f006 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9520f006 Branch: refs/heads/ignite-63 Commit: 9520f006c1baafa81c066500e23ec0c06423970d Parents: 08623ee Author: sboikov <sboi...@gridgain.com> Authored: Fri Jan 23 13:42:58 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Fri Jan 23 13:42:58 2015 +0300 ---------------------------------------------------------------------- .../scalar/tests/examples/ScalarExamplesMultiNodeSelfTest.scala | 2 +- .../ignite/scalar/tests/examples/ScalarExamplesSelfTest.scala | 2 +- .../ignite/scalar/testsuites/ScalarExamplesSelfTestSuite.scala | 5 ++--- .../src/test/java/org/test/gridify/GridExternalGridifyTask.java | 1 - .../cache/store/hibernate/GridCacheHibernateBlobStore.java | 3 ++- .../store/hibernate/GridCacheHibernateBlobStoreSelfTest.java | 4 ++-- .../org/apache/ignite/cache/store/hibernate/hibernate.cfg.xml | 2 +- .../apache/ignite/scalar/testsuites/ScalarSelfTestSuite.scala | 2 +- 8 files changed, 10 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9520f006/examples/src/test/scala/org/apache/ignite/scalar/tests/examples/ScalarExamplesMultiNodeSelfTest.scala ---------------------------------------------------------------------- diff --git a/examples/src/test/scala/org/apache/ignite/scalar/tests/examples/ScalarExamplesMultiNodeSelfTest.scala b/examples/src/test/scala/org/apache/ignite/scalar/tests/examples/ScalarExamplesMultiNodeSelfTest.scala index 3ca89b2..57efe97 100644 --- a/examples/src/test/scala/org/apache/ignite/scalar/tests/examples/ScalarExamplesMultiNodeSelfTest.scala +++ b/examples/src/test/scala/org/apache/ignite/scalar/tests/examples/ScalarExamplesMultiNodeSelfTest.scala @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.gridgain.scalar.tests.examples +package org.apache.ignite.scalar.tests.examples /** * Scalar examples multi-node self test. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9520f006/examples/src/test/scala/org/apache/ignite/scalar/tests/examples/ScalarExamplesSelfTest.scala ---------------------------------------------------------------------- diff --git a/examples/src/test/scala/org/apache/ignite/scalar/tests/examples/ScalarExamplesSelfTest.scala b/examples/src/test/scala/org/apache/ignite/scalar/tests/examples/ScalarExamplesSelfTest.scala index e86a3d4..e29a063 100644 --- a/examples/src/test/scala/org/apache/ignite/scalar/tests/examples/ScalarExamplesSelfTest.scala +++ b/examples/src/test/scala/org/apache/ignite/scalar/tests/examples/ScalarExamplesSelfTest.scala @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.gridgain.scalar.tests.examples +package org.apache.ignite.scalar.tests.examples import org.gridgain.scalar.examples._ import org.gridgain.scalar.scalar http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9520f006/examples/src/test/scala/org/apache/ignite/scalar/testsuites/ScalarExamplesSelfTestSuite.scala ---------------------------------------------------------------------- diff --git a/examples/src/test/scala/org/apache/ignite/scalar/testsuites/ScalarExamplesSelfTestSuite.scala b/examples/src/test/scala/org/apache/ignite/scalar/testsuites/ScalarExamplesSelfTestSuite.scala index f7bd28f..ead0554 100644 --- a/examples/src/test/scala/org/apache/ignite/scalar/testsuites/ScalarExamplesSelfTestSuite.scala +++ b/examples/src/test/scala/org/apache/ignite/scalar/testsuites/ScalarExamplesSelfTestSuite.scala @@ -15,12 +15,11 @@ * limitations under the License. */ -package org.gridgain.scalar.testsuites +package org.apache.ignite.scalar.testsuites import org.apache.ignite.IgniteSystemProperties +import org.apache.ignite.scalar.tests.examples.{ScalarExamplesMultiNodeSelfTest, ScalarExamplesSelfTest} import org.scalatest._ -import org.gridgain.scalar.tests._ -import examples.{ScalarExamplesMultiNodeSelfTest, ScalarExamplesSelfTest} import org.junit.runner.RunWith import org.scalatest.junit.JUnitRunner import IgniteSystemProperties._ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9520f006/modules/aop/src/test/java/org/test/gridify/GridExternalGridifyTask.java ---------------------------------------------------------------------- diff --git a/modules/aop/src/test/java/org/test/gridify/GridExternalGridifyTask.java b/modules/aop/src/test/java/org/test/gridify/GridExternalGridifyTask.java index e59badd..8e1092d 100644 --- a/modules/aop/src/test/java/org/test/gridify/GridExternalGridifyTask.java +++ b/modules/aop/src/test/java/org/test/gridify/GridExternalGridifyTask.java @@ -21,7 +21,6 @@ import org.apache.ignite.*; import org.apache.ignite.compute.*; import org.apache.ignite.compute.gridify.*; import org.apache.ignite.resources.*; -import org.gridgain.grid.*; import java.io.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9520f006/modules/hibernate/src/main/java/org/apache/ignite/cache/store/hibernate/GridCacheHibernateBlobStore.java ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/store/hibernate/GridCacheHibernateBlobStore.java b/modules/hibernate/src/main/java/org/apache/ignite/cache/store/hibernate/GridCacheHibernateBlobStore.java index b460790..048ab0f 100644 --- a/modules/hibernate/src/main/java/org/apache/ignite/cache/store/hibernate/GridCacheHibernateBlobStore.java +++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/store/hibernate/GridCacheHibernateBlobStore.java @@ -161,7 +161,8 @@ public class GridCacheHibernateBlobStore<K, V> extends CacheStoreAdapter<K, V> { private static final String ATTR_SES = "HIBERNATE_STORE_SESSION"; /** Name of Hibarname mapping resource. */ - private static final String MAPPING_RESOURCE = "org/gridgain/grid/cache/store/hibernate/GridCacheHibernateBlobStoreEntry.hbm.xml"; + private static final String MAPPING_RESOURCE = + "org/apache/ignite/cache/store/hibernate/GridCacheHibernateBlobStoreEntry.hbm.xml"; /** Init guard. */ @GridToStringExclude http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9520f006/modules/hibernate/src/test/java/org/apache/ignite/cache/store/hibernate/GridCacheHibernateBlobStoreSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/test/java/org/apache/ignite/cache/store/hibernate/GridCacheHibernateBlobStoreSelfTest.java b/modules/hibernate/src/test/java/org/apache/ignite/cache/store/hibernate/GridCacheHibernateBlobStoreSelfTest.java index 99c3439..f4aa804 100644 --- a/modules/hibernate/src/test/java/org/apache/ignite/cache/store/hibernate/GridCacheHibernateBlobStoreSelfTest.java +++ b/modules/hibernate/src/test/java/org/apache/ignite/cache/store/hibernate/GridCacheHibernateBlobStoreSelfTest.java @@ -69,7 +69,7 @@ public class GridCacheHibernateBlobStoreSelfTest extends */ public void testConfigurationByUrl() throws Exception { URL url = U.resolveGridGainUrl( - "modules/hibernate/src/test/java/org/gridgain/grid/cache/store/hibernate/hibernate.cfg.xml"); + "modules/hibernate/src/test/java/org/apache/ignite/cache/store/hibernate/hibernate.cfg.xml"); assert url != null; @@ -84,7 +84,7 @@ public class GridCacheHibernateBlobStoreSelfTest extends */ public void testConfigurationByFile() throws Exception { URL url = U.resolveGridGainUrl( - "modules/hibernate/src/test/java/org/gridgain/grid/cache/store/hibernate/hibernate.cfg.xml"); + "modules/hibernate/src/test/java/org/apache/ignite/cache/store/hibernate/hibernate.cfg.xml"); assert url != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9520f006/modules/hibernate/src/test/java/org/apache/ignite/cache/store/hibernate/hibernate.cfg.xml ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/test/java/org/apache/ignite/cache/store/hibernate/hibernate.cfg.xml b/modules/hibernate/src/test/java/org/apache/ignite/cache/store/hibernate/hibernate.cfg.xml index 67c98a8..d2166e2 100644 --- a/modules/hibernate/src/test/java/org/apache/ignite/cache/store/hibernate/hibernate.cfg.xml +++ b/modules/hibernate/src/test/java/org/apache/ignite/cache/store/hibernate/hibernate.cfg.xml @@ -35,6 +35,6 @@ <property name="hibernate.dialect">org.hibernate.dialect.H2Dialect</property> <!-- Mappings. --> - <mapping resource="org/gridgain/grid/cache/store/hibernate/GridCacheHibernateBlobStoreEntry.hbm.xml"/> + <mapping resource="org/apache/ignite/cache/store/hibernate/GridCacheHibernateBlobStoreEntry.hbm.xml"/> </session-factory> </hibernate-configuration> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9520f006/modules/scalar/src/test/scala/org/apache/ignite/scalar/testsuites/ScalarSelfTestSuite.scala ---------------------------------------------------------------------- diff --git a/modules/scalar/src/test/scala/org/apache/ignite/scalar/testsuites/ScalarSelfTestSuite.scala b/modules/scalar/src/test/scala/org/apache/ignite/scalar/testsuites/ScalarSelfTestSuite.scala index 12b0bd4..e3ffd37 100644 --- a/modules/scalar/src/test/scala/org/apache/ignite/scalar/testsuites/ScalarSelfTestSuite.scala +++ b/modules/scalar/src/test/scala/org/apache/ignite/scalar/testsuites/ScalarSelfTestSuite.scala @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.gridgain.scalar.testsuites +package org.apache.ignite.scalar.testsuites import org.scalatest._ import org.gridgain.scalar.tests._
