ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject [15/20] incubator-ignite git commit: # IGNITE-133: Fixed imports and package names in scala files.
Date Mon, 26 Jan 2015 11:20:53 GMT
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarProjectionPimp.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarProjectionPimp.scala
b/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarProjectionPimp.scala
index e587806..7962236 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarProjectionPimp.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarProjectionPimp.scala
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.pimps
+package org.apache.ignite.scalar.pimps
 
-import org.apache.ignite.cluster.{ClusterGroupEmptyException, ClusterGroup, ClusterNode}
-import org.apache.ignite.lang.{IgniteFutureCancelledException, IgniteFuture, IgnitePredicate}
 import org.apache.ignite._
+import org.apache.ignite.cluster.{ClusterGroup, ClusterGroupEmptyException, ClusterNode}
+import org.apache.ignite.lang.{IgniteFuture, IgniteFutureCancelledException, IgnitePredicate}
 import org.jetbrains.annotations._
 
 /**
@@ -118,7 +118,7 @@ class ScalarProjectionPimp[A <: ClusterGroup] extends PimpedType[A]
with Iterabl
      * Gets sequence of all nodes in this projection for given predicate.
      *
      * @param p Optional node filter predicates. It `null` provided - all nodes will be returned.
-     * @see `org.gridgain.grid.GridProjection.nodes(...)`
+     * @see `org.apache.ignite.cluster.ClusterGroup.nodes(...)`
      */
     def nodes$(@Nullable p: NF): Seq[ClusterNode] =
         toScalaSeq(forPredicate(p).nodes())
@@ -127,7 +127,7 @@ class ScalarProjectionPimp[A <: ClusterGroup] extends PimpedType[A]
with Iterabl
      * Gets sequence of all remote nodes in this projection for given predicate.
      *
      * @param p Optional node filter predicate. It `null` provided - all remote nodes will
be returned.
-     * @see `org.gridgain.grid.GridProjection.remoteNodes(...)`
+     * @see `org.apache.ignite.cluster.ClusterGroup.remoteNodes(...)`
      */
     def remoteNodes$(@Nullable p: NF = null): Seq[ClusterNode] =
         toScalaSeq(forPredicate(p).forRemotes().nodes())
@@ -138,7 +138,7 @@ class ScalarProjectionPimp[A <: ClusterGroup] extends PimpedType[A]
with Iterabl
      * @param obj Optional object to send. If `null` - this method is no-op.
      * @param p Optional node filter predicates. If none provided or `null` -
      *      all nodes in the projection will be used.
-     * @see `org.gridgain.grid.GridProjection.send(...)`
+     * @see `org.apache.ignite.cluster.ClusterGroup.send(...)`
      */
     def !<(@Nullable obj: AnyRef, @Nullable p: NF) {
         value.ignite().message(forPredicate(p)).send(null, obj)
@@ -151,7 +151,7 @@ class ScalarProjectionPimp[A <: ClusterGroup] extends PimpedType[A]
with Iterabl
      *      method is no-op.
      * @param p Optional node filter predicate. If none provided or `null` -
      *      all nodes in the projection will be used.
-     * @see `org.gridgain.grid.GridProjection.send(...)`
+     * @see `org.apache.ignite.cluster.ClusterGroup.send(...)`
      */
     def !<(@Nullable seq: Seq[AnyRef], @Nullable p: NF) {
         value.ignite().message(forPredicate(p)).send(null, seq)
@@ -163,7 +163,7 @@ class ScalarProjectionPimp[A <: ClusterGroup] extends PimpedType[A]
with Iterabl
      * @param obj Optional object to send. If `null` - this method is no-op.
      * @param p Optional node filter predicate. If none provided or `null` -
      *      all nodes in the projection will be used.
-     * @see `org.gridgain.grid.GridProjection.send(...)`
+     * @see `org.apache.ignite.cluster.ClusterGroup.send(...)`
      */
     def send$(@Nullable obj: AnyRef, @Nullable p: NF) {
         value.ignite().message(forPredicate(p)).send(null, obj)
@@ -175,7 +175,7 @@ class ScalarProjectionPimp[A <: ClusterGroup] extends PimpedType[A]
with Iterabl
      * @param seq Optional sequence of objects to send. If empty or `null` - this
      *      method is no-op.
      * @param p Optional node filter predicate. If  `null` provided - all nodes in the projection
will be used.
-     * @see `org.gridgain.grid.GridProjection.send(...)`
+     * @see `org.apache.ignite.cluster.ClusterGroup.send(...)`
      */
     def send$(@Nullable seq: Seq[AnyRef], @Nullable p: NF) {
         value.ignite().message(forPredicate(p)).send(null, seq)
@@ -218,7 +218,7 @@ class ScalarProjectionPimp[A <: ClusterGroup] extends PimpedType[A]
with Iterabl
      * @param s Optional sequence of closures to call. If empty or `null` - this method is
no-op and returns `null`.
      * @param p Optional node filter predicate. If `null` provided - all nodes in projection
will be used.
      * @return Sequence of result values from all nodes where given closures were executed
or `null` (see above).
-     * @see `org.gridgain.grid.GridProjection.call(...)`
+     * @see `org.apache.ignite.cluster.ClusterGroup.call(...)`
      */
     def #<[R](@Nullable s: Seq[Call[R]], @Nullable p: NF): Seq[R] =
         call$(s, p)
@@ -230,7 +230,7 @@ class ScalarProjectionPimp[A <: ClusterGroup] extends PimpedType[A]
with Iterabl
      * @param s Optional closure to call. If `null` - this method is no-op and returns `null`.
      * @param p Optional node filter predicate. If `null` provided - all nodes in projection
will be used.
      * @return Sequence of result values from all nodes where given closures were executed
or `null` (see above).
-     * @see `org.gridgain.grid.GridProjection.call(...)`
+     * @see `org.apache.ignite.cluster.ClusterGroup.call(...)`
      */
     def call$[R](@Nullable s: Call[R], @Nullable p: NF): Seq[R] =
         call$(Seq(s), p)
@@ -244,7 +244,7 @@ class ScalarProjectionPimp[A <: ClusterGroup] extends PimpedType[A]
with Iterabl
      * @param dflt Closure to execute if projection is empty.
      * @param p Optional node filter predicate. If `null` provided - all nodes in projection
will be used.
      * @return Sequence of result values from all nodes where given closures were executed
or `null` (see above).
-     * @see `org.gridgain.grid.GridProjection.call(...)`
+     * @see `org.apache.ignite.cluster.ClusterGroup.call(...)`
      */
     def callSafe[R](@Nullable s: Call[R], dflt: () => Seq[R], @Nullable p: NF): Seq[R]
= {
         assert(dflt != null)
@@ -263,7 +263,7 @@ class ScalarProjectionPimp[A <: ClusterGroup] extends PimpedType[A]
with Iterabl
      * @param p Optional node filter predicate. If `null` provided - all nodes in projection
will be used.
      * @return Sequence of result values from all nodes where given closures were executed
      *      or `null` (see above).
-     * @see `org.gridgain.grid.GridProjection.call(...)`
+     * @see `org.apache.ignite.cluster.ClusterGroup.call(...)`
      */
     def #<[R](@Nullable s: Call[R], @Nullable p: NF): Seq[R] =
         call$(s, p)
@@ -274,7 +274,7 @@ class ScalarProjectionPimp[A <: ClusterGroup] extends PimpedType[A]
with Iterabl
      *
      * @param s Optional sequence of closures to call. If empty or `null` - this method is
no-op.
      * @param p Optional node filter predicate. If `null` provided- all nodes in projection
will be used.
-     * @see `org.gridgain.grid.GridProjection.run(...)`
+     * @see `org.apache.ignite.cluster.ClusterGroup.run(...)`
      */
     def run$(@Nullable s: Seq[Run], @Nullable p: NF) {
         runAsync$(s, p).get
@@ -299,7 +299,7 @@ class ScalarProjectionPimp[A <: ClusterGroup] extends PimpedType[A]
with Iterabl
      *      method is no-op.
      * @param p Optional node filter predicate. If `null` provided - all nodes in projection
will be used.
      * @param dflt Closure to execute if projection is empty.
-     * @see `org.gridgain.grid.GridProjection.run(...)`
+     * @see `org.apache.ignite.cluster.ClusterGroup.run(...)`
      */
     def runSafe(@Nullable s: Seq[Run], @Nullable dflt: Run, @Nullable p: NF) {
         try {
@@ -315,7 +315,7 @@ class ScalarProjectionPimp[A <: ClusterGroup] extends PimpedType[A]
with Iterabl
      *
      * @param s Optional sequence of closures to call. If empty or `null` - this method is
no-op.
      * @param p Optional node filter predicate. If `null` provided - all nodes in projection
will be used.
-     * @see `org.gridgain.grid.GridProjection.run(...)`
+     * @see `org.apache.ignite.cluster.ClusterGroup.run(...)`
      */
     def *<(@Nullable s: Seq[Run], @Nullable p: NF) {
         run$(s, p)
@@ -327,7 +327,7 @@ class ScalarProjectionPimp[A <: ClusterGroup] extends PimpedType[A]
with Iterabl
      *
      * @param s Optional closure to call. If empty or `null` - this method is no-op.
      * @param p Optional node filter predicate. If `null` provided - all nodes in projection
will be used.
-     * @see `org.gridgain.grid.GridProjection.run(...)`
+     * @see `org.apache.ignite.cluster.ClusterGroup.run(...)`
      */
     def run$(@Nullable s: Run, @Nullable p: NF) {
         run$(Seq(s), p)
@@ -341,7 +341,7 @@ class ScalarProjectionPimp[A <: ClusterGroup] extends PimpedType[A]
with Iterabl
      * @param s Optional closure to call. If empty or `null` - this method is no-op.
      * @param dflt Closure to execute if projection is empty.
      * @param p Optional node filter predicate. If `null` provided - all nodes in projection
will be used.
-     * @see `org.gridgain.grid.GridProjection.run(...)`
+     * @see `org.apache.ignite.cluster.ClusterGroup.run(...)`
      */
     def runSafe(@Nullable s: Run, @Nullable dflt: Run, @Nullable p: NF) {
         try {
@@ -357,7 +357,7 @@ class ScalarProjectionPimp[A <: ClusterGroup] extends PimpedType[A]
with Iterabl
      *
      * @param s Optional closure to call. If empty or `null` - this method is no-op.
      * @param p Optional node filter predicate. If none provided or `null` - all nodes in
projection will be used.
-     * @see `org.gridgain.grid.GridProjection.run(...)`
+     * @see `org.apache.ignite.cluster.ClusterGroup.run(...)`
      */
     def *<(@Nullable s: Run, @Nullable p: NF) {
         run$(s, p)
@@ -372,7 +372,7 @@ class ScalarProjectionPimp[A <: ClusterGroup] extends PimpedType[A]
with Iterabl
      * @param p Optional node filter predicate. If `null` provided - all nodes in projection
will be used.
      * @return Future of Java collection containing result values from all nodes where given
      *      closures were executed or `null` (see above).
-     * @see `org.gridgain.grid.GridProjection.call(...)`
+     * @see `org.apache.ignite.cluster.ClusterGroup.call(...)`
      */
     def callAsync$[R](@Nullable s: Seq[Call[R]], @Nullable p: NF):
         IgniteFuture[java.util.Collection[R]] = {
@@ -391,7 +391,7 @@ class ScalarProjectionPimp[A <: ClusterGroup] extends PimpedType[A]
with Iterabl
      * @param p Optional node filter predicate. If `null` provided - all nodes in projection
will be used.
      * @return Future of Java collection containing result values from all nodes where given
      *      closures were executed or `null` (see above).
-     * @see `org.gridgain.grid.GridProjection.call(...)`
+     * @see `org.apache.ignite.cluster.ClusterGroup.call(...)`
      */
     def #?[R](@Nullable s: Seq[Call[R]], @Nullable p: NF): IgniteFuture[java.util.Collection[R]]
= {
         callAsync$(s, p)
@@ -406,7 +406,7 @@ class ScalarProjectionPimp[A <: ClusterGroup] extends PimpedType[A]
with Iterabl
      * @param p Optional node filter predicate. If `null` provided - all nodes in projection
will be used.
      * @return Future of Java collection containing result values from all nodes where given
      *      closures were executed or `null` (see above).
-     * @see `org.gridgain.grid.GridProjection.call(...)`
+     * @see `org.apache.ignite.cluster.ClusterGroup.call(...)`
      */
     def callAsync$[R](@Nullable s: Call[R], @Nullable p: NF): IgniteFuture[java.util.Collection[R]]
= {
         callAsync$(Seq(s), p)
@@ -420,7 +420,7 @@ class ScalarProjectionPimp[A <: ClusterGroup] extends PimpedType[A]
with Iterabl
      * @param p Optional node filter predicate. If `null` provided - all nodes in projection
will be used.
      * @return Future of Java collection containing result values from all nodes where given
      *      closures were executed or `null` (see above).
-     * @see `org.gridgain.grid.GridProjection.call(...)`
+     * @see `org.apache.ignite.cluster.ClusterGroup.call(...)`
      */
     def #?[R](@Nullable s: Call[R], @Nullable p: NF): IgniteFuture[java.util.Collection[R]]
= {
         callAsync$(s, p)
@@ -433,7 +433,7 @@ class ScalarProjectionPimp[A <: ClusterGroup] extends PimpedType[A]
with Iterabl
      * @param s Optional sequence of absolute closures to call. If empty or `null` - this
method
      *      is no-op and finished future over `null` will be returned.
      * @param p Optional node filter predicate. If `null` provided - all nodes in projection
will be used.
-     * @see `org.gridgain.grid.GridProjection.call(...)`
+     * @see `org.apache.ignite.cluster.ClusterGroup.call(...)`
      */
     def runAsync$(@Nullable s: Seq[Run], @Nullable p: NF): IgniteFuture[_] = {
         val comp = value.ignite().compute(forPredicate(p)).enableAsync()
@@ -449,7 +449,7 @@ class ScalarProjectionPimp[A <: ClusterGroup] extends PimpedType[A]
with Iterabl
      * @param s Optional sequence of absolute closures to call. If empty or `null` - this
method
      *      is no-op and finished future over `null` will be returned.
      * @param p Optional node filter predicate. If `null` provided - all nodes in projection
will be used.
-     * @see `org.gridgain.grid.GridProjection.call(...)`
+     * @see `org.apache.ignite.cluster.ClusterGroup.call(...)`
      */
     def *?(@Nullable s: Seq[Run], @Nullable p: NF): IgniteFuture[_] = {
         runAsync$(s, p)
@@ -462,7 +462,7 @@ class ScalarProjectionPimp[A <: ClusterGroup] extends PimpedType[A]
with Iterabl
      * @param s Optional absolute closure to call. If `null` - this method
      *      is no-op and finished future over `null` will be returned.
      * @param p Optional node filter predicate. If `null` provided - all nodes in projection
will be used.
-     * @see `org.gridgain.grid.GridProjection.run(...)`
+     * @see `org.apache.ignite.cluster.ClusterGroup.run(...)`
      */
     def runAsync$(@Nullable s: Run, @Nullable p: NF): IgniteFuture[_] = {
         runAsync$(Seq(s), p)
@@ -474,7 +474,7 @@ class ScalarProjectionPimp[A <: ClusterGroup] extends PimpedType[A]
with Iterabl
      * @param s Optional absolute closure to call. If `null` - this method
      *      is no-op and finished future over `null` will be returned.
      * @param p Optional node filter predicate. If `null` provided - all nodes in projection
will be used.
-     * @see `org.gridgain.grid.GridProjection.run(...)`
+     * @see `org.apache.ignite.cluster.ClusterGroup.run(...)`
      */
     def *?(@Nullable s: Run, @Nullable p: NF): IgniteFuture[_] = {
         runAsync$(s, p)
@@ -490,7 +490,7 @@ class ScalarProjectionPimp[A <: ClusterGroup] extends PimpedType[A]
with Iterabl
      *      is no-op and will return finished future over `null`.
      * @param p Optional node filter predicate. If `null` provided - all nodes in projection
will be used.
      * @return Future over the reduced result or `null` (see above).
-     * @see `org.gridgain.grid.GridProjection.reduce(...)`
+     * @see `org.apache.ignite.cluster.ClusterGroup.reduce(...)`
      */
     def reduceAsync$[R1, R2](s: Seq[Call[R1]], r: Seq[R1] => R2, @Nullable p: NF): IgniteFuture[R2]
= {
         assert(s != null && r != null)
@@ -511,7 +511,7 @@ class ScalarProjectionPimp[A <: ClusterGroup] extends PimpedType[A]
with Iterabl
      *      is no-op and will return finished future over `null`.
      * @param p Optional node filter predicate. If `null` provided - all nodes in projection
will be used.
      * @return Future over the reduced result or `null` (see above).
-     * @see `org.gridgain.grid.GridProjection.reduce(...)`
+     * @see `org.apache.ignite.cluster.ClusterGroup.reduce(...)`
      */
     def @?[R1, R2](s: Seq[Call[R1]], r: Seq[R1] => R2, @Nullable p: NF): IgniteFuture[R2]
= {
         reduceAsync$(s, r, p)
@@ -527,7 +527,7 @@ class ScalarProjectionPimp[A <: ClusterGroup] extends PimpedType[A]
with Iterabl
      *      is no-op and will return `null`.
      * @param p Optional node filter predicate. If `null` provided - all nodes in projection
will be used.
      * @return Reduced result or `null` (see above).
-     * @see `org.gridgain.grid.GridProjection.reduce(...)`
+     * @see `org.apache.ignite.cluster.ClusterGroup.reduce(...)`
      */
     def reduce$[R1, R2](@Nullable s: Seq[Call[R1]], @Nullable r: Seq[R1] => R2, @Nullable
p: NF): R2 =
         reduceAsync$(s, r, p).get
@@ -544,7 +544,7 @@ class ScalarProjectionPimp[A <: ClusterGroup] extends PimpedType[A]
with Iterabl
      * @param dflt Closure to execute if projection is empty.
      * @param p Optional node filter predicate. If `null` provided - all nodes in projection
will be used.
      * @return Reduced result or `null` (see above).
-     * @see `org.gridgain.grid.GridProjection.reduce(...)`
+     * @see `org.apache.ignite.cluster.ClusterGroup.reduce(...)`
      */
     def reduceSafe[R1, R2](@Nullable s: Seq[Call[R1]], @Nullable r: Seq[R1] => R2,
         dflt: () => R2, @Nullable p: NF): R2 = {
@@ -564,7 +564,7 @@ class ScalarProjectionPimp[A <: ClusterGroup] extends PimpedType[A]
with Iterabl
      * @param r Optional reduction function. If `null` - this method is no-op and will return
`null`.
      * @param p Optional node filter predicate. If `null` provided - all nodes in projection
will be used.
      * @return Reduced result or `null` (see above).
-     * @see `org.gridgain.grid.GridProjection.reduce(...)`
+     * @see `org.apache.ignite.cluster.ClusterGroup.reduce(...)`
      */
     def @<[R1, R2](@Nullable s: Seq[Call[R1]], @Nullable r: Seq[R1] => R2, @Nullable
p: NF): R2 =
         reduceAsync$(s, r, p).get

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarTaskThreadContext.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarTaskThreadContext.scala
b/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarTaskThreadContext.scala
index 1bb9387..1fe0352 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarTaskThreadContext.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarTaskThreadContext.scala
@@ -15,11 +15,10 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.pimps
+package org.apache.ignite.scalar.pimps
 
 import org.apache.ignite.cluster.ClusterGroup
-import org.apache.ignite._
-import org.gridgain.scalar._
+import org.apache.ignite.scalar.ScalarConversions
 import org.jetbrains.annotations._
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/main/scala/org/apache/ignite/scalar/scalar.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/scalar.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/scalar.scala
index 506d227..c90a709 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/scalar.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/scalar.scala
@@ -15,18 +15,20 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar
+package org.apache.ignite.scalar
 
-import java.net.URL
 import org.apache.ignite.cache.GridCache
 import org.apache.ignite.cache.query.{CacheQuerySqlField, CacheQueryTextField}
-import org.apache.ignite.internal.GridProductImpl
-import org.apache.ignite.{IgniteState, IgniteDataLoader, Ignition, Ignite}
 import org.apache.ignite.cluster.ClusterNode
 import org.apache.ignite.configuration.IgniteConfiguration
+import org.apache.ignite.internal.GridProductImpl
+import org.apache.ignite.{Ignite, IgniteDataLoader, IgniteState, Ignition}
 import org.jetbrains.annotations.Nullable
+
+import java.net.URL
 import java.util.UUID
-import annotation.meta.field
+
+import scala.annotation.meta.field
 
 /**
  * {{{
@@ -67,7 +69,7 @@ import annotation.meta.field
  * Scalar needs to be imported in a proper way so that necessary objects and implicit
  * conversions got available in the scope:
  * <pre name="code" class="scala">
- * import org.gridgain.scalar._
+ * import org.apache.ignite.scalar._
  * import scalar._
  * </pre>
  * This way you import object `scalar` as well as all methods declared or inherited in that

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/test/resources/spring-ping-pong-partner.xml
----------------------------------------------------------------------
diff --git a/modules/scalar/src/test/resources/spring-ping-pong-partner.xml b/modules/scalar/src/test/resources/spring-ping-pong-partner.xml
index cb13b80..337a9e6 100644
--- a/modules/scalar/src/test/resources/spring-ping-pong-partner.xml
+++ b/modules/scalar/src/test/resources/spring-ping-pong-partner.xml
@@ -110,7 +110,7 @@
                     list of addresses.
                     -->
                     <!--
-                    <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.multicast.GridTcpDiscoveryMulticastIpFinder">
+                    <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinder">
                         <property name="addresses">
                             <list>
                                 <value>host1:port1</value>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarAffinityRoutingSpec.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarAffinityRoutingSpec.scala
b/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarAffinityRoutingSpec.scala
index 989e72d..7062984 100644
--- a/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarAffinityRoutingSpec.scala
+++ b/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarAffinityRoutingSpec.scala
@@ -15,16 +15,13 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.tests
+package org.apache.ignite.scalar.tests
 
-import org.scalatest.matchers._
-import org.scalatest._
-import junit.JUnitRunner
-import org.gridgain.scalar.scalar
-import scalar._
-import collection.JavaConversions._
-import java.util.concurrent.atomic.AtomicInteger
+import org.apache.ignite.scalar.scalar
+import org.apache.ignite.scalar.scalar._
 import org.junit.runner.RunWith
+import org.scalatest._
+import org.scalatest.junit.JUnitRunner
 
 /**
  * Tests for `affinityRun..` and `affinityCall..` methods.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarCacheProjectionSpec.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarCacheProjectionSpec.scala
b/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarCacheProjectionSpec.scala
index 0714f16..b27e069 100644
--- a/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarCacheProjectionSpec.scala
+++ b/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarCacheProjectionSpec.scala
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.tests
+package org.apache.ignite.scalar.tests
 
-import org.gridgain.scalar._
-import scalar._
+import org.apache.ignite.scalar.scalar
+import org.apache.ignite.scalar.scalar._
+import org.junit.runner.RunWith
 import org.scalatest.FlatSpec
 import org.scalatest.junit.JUnitRunner
-import org.junit.runner.RunWith
 
 /**
  * Test for using grid.cache(..).projection(...) from scala code.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarCacheQueriesSpec.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarCacheQueriesSpec.scala
b/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarCacheQueriesSpec.scala
index 0bc66ea..c3bd8f9 100644
--- a/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarCacheQueriesSpec.scala
+++ b/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarCacheQueriesSpec.scala
@@ -15,15 +15,14 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.tests
+package org.apache.ignite.scalar.tests
 
 import org.apache.ignite.cache.GridCache
 import org.apache.ignite.cluster.ClusterNode
-import org.gridgain.scalar._
-import scalar._
-import org.scalatest._
-import junit.JUnitRunner
+import org.apache.ignite.scalar.scalar._
 import org.junit.runner.RunWith
+import org.scalatest._
+import org.scalatest.junit.JUnitRunner
 
 /**
  * Tests for Scalar cache queries API.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarCacheSpec.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarCacheSpec.scala
b/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarCacheSpec.scala
index 03432e6..c58deff 100644
--- a/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarCacheSpec.scala
+++ b/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarCacheSpec.scala
@@ -15,18 +15,17 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.tests
+package org.apache.ignite.scalar.tests
 
-import org.apache.ignite.events.{IgniteEventType, IgniteEvent}
+import org.apache.ignite.events.IgniteEvent
+import org.apache.ignite.events.IgniteEventType._
 import org.apache.ignite.lang.IgnitePredicate
-import org.gridgain.scalar._
-import scalar._
-import org.scalatest.matchers._
-import org.scalatest._
-import junit.JUnitRunner
-import IgniteEventType._
-import collection.JavaConversions._
+import org.apache.ignite.scalar.scalar
+import org.apache.ignite.scalar.scalar._
 import org.junit.runner.RunWith
+import org.scalatest._
+import org.scalatest.junit.JUnitRunner
+import scala.collection.JavaConversions._
 
 /**
  * Scalar cache test.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarConversionsSpec.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarConversionsSpec.scala
b/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarConversionsSpec.scala
index 596e218..b20c755 100644
--- a/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarConversionsSpec.scala
+++ b/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarConversionsSpec.scala
@@ -15,17 +15,17 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.tests
+package org.apache.ignite.scalar.tests
 
+import org.apache.ignite.internal.util.lang._
 import org.apache.ignite.lang._
+import org.apache.ignite.scalar.scalar._
+import org.junit.runner.RunWith
 import org.scalatest.FlatSpec
+import org.scalatest.junit.JUnitRunner
 import org.scalatest.matchers.ShouldMatchers
-import org.gridgain.scalar._
-import scalar._
+
 import java.util.concurrent.atomic._
-import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
-import org.apache.ignite.internal.util.lang._
 
 /**
  *

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarProjectionSpec.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarProjectionSpec.scala
b/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarProjectionSpec.scala
index 6e40436..51bb50a 100644
--- a/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarProjectionSpec.scala
+++ b/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarProjectionSpec.scala
@@ -15,19 +15,21 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.tests
+package org.apache.ignite.scalar.tests
 
 import org.apache.ignite.Ignition
 import org.apache.ignite.cluster.ClusterNode
 import org.apache.ignite.configuration.IgniteConfiguration
 import org.apache.ignite.messaging.MessagingListenActor
-import org.gridgain.scalar._
-import scalar._
+import org.apache.ignite.scalar.scalar
+import org.apache.ignite.scalar.scalar._
+import org.junit.runner.RunWith
 import org.scalatest._
-import junit.JUnitRunner
-import collection.JavaConversions._
+import org.scalatest.junit.JUnitRunner
+
 import java.util.UUID
-import org.junit.runner.RunWith
+
+import scala.collection.JavaConversions._
 
 /**
  * Scalar cache test.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarReturnableSpec.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarReturnableSpec.scala
b/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarReturnableSpec.scala
index 607db68..21e8cef 100644
--- a/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarReturnableSpec.scala
+++ b/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarReturnableSpec.scala
@@ -15,15 +15,14 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.tests
+package org.apache.ignite.scalar.tests
 
-import org.scalatest.matchers._
-import org.gridgain.scalar._
-import scalar._
+import org.apache.ignite.scalar.scalar._
+import org.junit.runner.RunWith
 import org.scalatest._
-import junit.JUnitRunner
+import org.scalatest.junit.JUnitRunner
+
 import scala.util.control.Breaks._
-import org.junit.runner.RunWith
 
 /**
  *

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarSpec.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarSpec.scala
b/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarSpec.scala
index 0dcad14..b6fc014 100644
--- a/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarSpec.scala
+++ b/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarSpec.scala
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.tests
+package org.apache.ignite.scalar.tests
 
-import org.gridgain.scalar._
-import org.scalatest._
-import junit.JUnitRunner
+import org.apache.ignite.scalar.scalar
 import org.junit.runner.RunWith
+import org.scalatest._
+import org.scalatest.junit.JUnitRunner
 
 /**
  *

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/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 e3ffd37..f17e542 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
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.scalar.testsuites
 
-import org.scalatest._
-import org.gridgain.scalar.tests._
+import org.apache.ignite.scalar.tests._
 import org.junit.runner.RunWith
+import org.scalatest._
 import org.scalatest.junit.JUnitRunner
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala
index d1507cd..2221e6b 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala
@@ -18,7 +18,6 @@
 package org.apache.ignite.visor.commands.config
 
 import org.apache.ignite.internal.util.GridUtils
-import org.apache.ignite.internal.util.typedef.internal.U
 import org.apache.ignite.internal.visor.node.VisorNodeConfigurationCollectorTask
 
 import org.apache.ignite._
@@ -45,7 +44,7 @@ import scala.util.control.Breaks._
  * When using this command from Scala code (not from REPL) you need to make sure to
  * properly import all necessary typed and implicit conversions:
  * <ex>
- * import org.gridgain.visor._
+ * import org.apache.ignite.visor._
  * import commands.config.VisorConfigurationCommand._
  * </ex>
  * Note that `VisorConfigurationCommand` object contains necessary implicit conversions so
that


Mime
View raw message